7249 files changed, 49552 insertions, 171121 deletions

diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 3a2c43686a..c9f11acf3c 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediaitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 90d432a53d..22adfdec74 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediaplayer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 6da465ee4b..97b50f6bb1 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediatoolbox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 116987699c..8643318631 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediawindow.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 4ce7f12962..1f7ffb6172 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.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: helpids.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/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 6a257d59fa..0574e4a709 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediacontrol.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/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 12956725b7..34669d3e9f 100644
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 218740f0d1..178ee237ee 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediacontrol.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/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index e940b6a3af..ef9ddc2a1b 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.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: mediacontrol.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/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 109647e7e0..f56e1bbeae 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.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: mediacontrol.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/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 3ebfc5b74a..9d53c0d3e3 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediaitem.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/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index f52cabf231..89786eb221 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediamisc.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/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index bb77f8602d..669f8616af 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediaplayer.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/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 5e94fb34fc..7cca17a416 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediatoolbox.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/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index aa6044fe12..1e2a1f9f16 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soundhandler.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/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 8aa6780099..4a707c507a 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soundhandler.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 1ff044d57b..db5a72d925 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediamisc.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/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
index 40ee5816a0..a3ad559aa9 100644
--- a/avmedia/source/java/FrameGrabber.java
+++ b/avmedia/source/java/FrameGrabber.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: FrameGrabber.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/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
index 0b3bb19dda..a85a5176a1 100644
--- a/avmedia/source/java/Manager.java
+++ b/avmedia/source/java/Manager.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: Manager.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/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
index 89413ce930..004ae7cf68 100644
--- a/avmedia/source/java/MediaUno.java
+++ b/avmedia/source/java/MediaUno.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: MediaUno.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/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
index a5b1aacddd..d35be5cc1a 100644
--- a/avmedia/source/java/Player.java
+++ b/avmedia/source/java/Player.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: Player.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/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
index 590228f59c..4bc9db4ac7 100644
--- a/avmedia/source/java/PlayerWindow.java
+++ b/avmedia/source/java/PlayerWindow.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: PlayerWindow.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/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
index b06c4bb4cc..053b37e1bd 100644
--- a/avmedia/source/java/WindowAdapter.java
+++ b/avmedia/source/java/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/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index f207713ac4..37c53a7211 100644
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#     
+#
 #**************************************************************************
 
 # Builds the Java Canvas implementation.
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
index 9767816ad4..1d2f143add 100644
--- a/avmedia/source/java/win/SystemWindowAdapter.java
+++ b/avmedia/source/java/win/SystemWindowAdapter.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: SystemWindowAdapter.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/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
index b6229515a7..6cada42982 100644
--- a/avmedia/source/java/x11/SystemWindowAdapter.java
+++ b/avmedia/source/java/x11/SystemWindowAdapter.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: SystemWindowAdapter.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/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index 51dc28069c..29f652c3c0 100644
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/avmedia/source/quicktime/framegrabber.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framegrabber.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/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index c4d83cadb4..6ddee8493c 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framegrabber.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/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index a087e80075..088f3b5d0e 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
index 59e790159f..e4c093988b 100644
--- a/avmedia/source/quicktime/manager.cxx
+++ b/avmedia/source/quicktime/manager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: manager.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/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 662ada13b3..cbb7ab2bd9 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: manager.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index aa2d86d340..3e8498b6d1 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: player.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/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index ccc360e5ef..a4d04b32b7 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: player.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index b6f6474175..ac0507bf9d 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: quicktimecommon.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/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index 16cc8caf18..641b7df67b 100644
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: quicktimeuno.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/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 9fff6d77ff..053dea581d 100644
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 90933ceed8..95921259f5 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
index 2e80253d98..8d5d6a5df5 100644
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/source/viewer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index c450e09785..ded5471e82 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediaevent_impl.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/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index c02a4c26b1..501501bdbb 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_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: mediaevent_impl.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/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 4cf91bd3d1..edc9ee5154 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediawindow.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/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 7fbea4595f..4cadd3fac8 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.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: mediawindow.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/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 9ea9742402..24d17abe4d 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediawindow_impl.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/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index e84f4c2c83..1b6f8c60b7 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_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: mediawindow_impl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 8fb63bdfc5..fdfa0b5ae5 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediawindowbase_impl.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/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index dd76564913..0cef83a473 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_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: mediawindowbase_impl.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/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index a7d1b6bf26..28fc885c4f 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framegrabber.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/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 7922bc8a0f..b9e7e63aaf 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framegrabber.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/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index d31c544ebb..5d2e65553a 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interface.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/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index a4f503910d..b70841e8bd 100644
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 8c839de0c1..9b661b9bbd 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: manager.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/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index e7be1914f1..110b3d2600 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: manager.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index c5ee611b83..12c2bfe728 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: player.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/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index bacba92688..793da23b09 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: player.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/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index f16dabf4d0..8396303be1 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wincommon.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/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index b771504f7d..030bfee04c 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 74906cb75e..758289954e 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index cef4891651..288950f6d0 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: winuno.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/avmedia/source/xine/makefile.mk b/avmedia/source/xine/makefile.mk
index 2b462a53c9..3ba341c0d3 100644
--- a/avmedia/source/xine/makefile.mk
+++ b/avmedia/source/xine/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/avmedia/source/xine/manager.cxx b/avmedia/source/xine/manager.cxx
index be4a5623af..fdf5655134 100644
--- a/avmedia/source/xine/manager.cxx
+++ b/avmedia/source/xine/manager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: manager.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/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx
index 518549f4e9..9969aef01f 100644
--- a/avmedia/source/xine/manager.hxx
+++ b/avmedia/source/xine/manager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: manager.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/avmedia/source/xine/player.cxx b/avmedia/source/xine/player.cxx
index 5b44d7ae1c..d4956c1b00 100644
--- a/avmedia/source/xine/player.cxx
+++ b/avmedia/source/xine/player.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: player.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/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx
index 0bd99aae77..45678d7819 100644
--- a/avmedia/source/xine/player.hxx
+++ b/avmedia/source/xine/player.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: player.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/avmedia/source/xine/window.cxx b/avmedia/source/xine/window.cxx
index 3c34e36ff0..bdee960263 100644
--- a/avmedia/source/xine/window.cxx
+++ b/avmedia/source/xine/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx
index 9db6885b95..75d6b690cc 100644
--- a/avmedia/source/xine/window.hxx
+++ b/avmedia/source/xine/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/source/xine/xinecommon.hxx b/avmedia/source/xine/xinecommon.hxx
index cbff2d1757..ca87f8d189 100644
--- a/avmedia/source/xine/xinecommon.hxx
+++ b/avmedia/source/xine/xinecommon.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xinecommon.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/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx
index 6c54cd1af3..87c0b53298 100644
--- a/avmedia/source/xine/xineuno.cxx
+++ b/avmedia/source/xine/xineuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xineuno.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/avmedia/util/hidother.src b/avmedia/util/hidother.src
index b29ccade41..c8352e29cb 100755
--- a/avmedia/util/hidother.src
+++ b/avmedia/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index 67aa2135d4..b0d0a6816c 100644
--- a/avmedia/util/makefile.mk
+++ b/avmedia/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.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index 63d76a60cb..964b76c9e2 100644
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicmanagerrepository.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/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 03bb45d288..5bbe7d31c2 100644
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicrt.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 2e0c1ea7df..886aa7f544 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmgr.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/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index 400c520403..8695c63291 100644
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basrdll.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/basic/inc/basic/dispdefs.hxx b/basic/inc/basic/dispdefs.hxx
index 89dd6839fb..e9dcc1fd4d 100644
--- a/basic/inc/basic/dispdefs.hxx
+++ b/basic/inc/basic/dispdefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispdefs.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index c455783448..b3964fac25 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mybasic.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index ccc0e003a0..066e87aefc 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index f7367c9364..4be25089b4 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbdef.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index bd0196708c..250eac5b5c 100644
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sberrors.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 2e1a8a1133..38319ac4e6 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbmeth.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/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index b309179ea5..a46a1a20e2 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbmod.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index b28225dcf6..e7ac3bf3fe 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbprop.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 0d61e9bad6..f354d8c7b5 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbstar.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/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx
index a4e3e1e826..b3a3c99fa7 100644
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/basic/inc/basic/sbstdobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbstdobj.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/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx
index b4f9f4b61f..38008dcb1c 100644
--- a/basic/inc/basic/sbuno.hxx
+++ b/basic/inc/basic/sbuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbuno.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/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 70ee8a2b7f..3f5a49f522 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbx.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/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index e3f72c7c79..c4519a9a86 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxbase.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 2a424d94d2..df156dae97 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxcore.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/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 8797d8e912..cf45aa8d03 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxdef.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index 8354ff0b23..b410ed3a53 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxfac.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index 326fb83acc..46eb030eb8 100644
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxform.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/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index 27accc0edd..b2c84a3440 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxmeth.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
index 658feefefb..1ffdceea62 100644
--- a/basic/inc/basic/sbxmstrm.hxx
+++ b/basic/inc/basic/sbxmstrm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxmstrm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 2792d6e5d4..4d17fe4a56 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxobj.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index 3543b3e1e6..3c31d9f90e 100644
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxprop.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 57648fc025..2f890a01b8 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxvar.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/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index f8d65bce9e..9a299d35b1 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basic/ttglobal.hrc b/basic/inc/basic/ttglobal.hrc
index a79ca954da..4fa6130c7c 100644
--- a/basic/inc/basic/ttglobal.hrc
+++ b/basic/inc/basic/ttglobal.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: ttglobal.hrc,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/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 09f8d61a91..4eb42f3a3e 100644
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ttstrhlp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index be041f3ada..883b2c973b 100644
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basrid.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/basic/inc/makefile.mk b/basic/inc/makefile.mk
index 5910bba963..1b56b67748 100644
--- a/basic/inc/makefile.mk
+++ b/basic/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/basic/inc/modsizeexceeded.hxx b/basic/inc/modsizeexceeded.hxx
index 16c91c1027..9b347a3cae 100644
--- a/basic/inc/modsizeexceeded.hxx
+++ b/basic/inc/modsizeexceeded.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modsizeexceeded.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/inc/pch/precompiled_basic.cxx b/basic/inc/pch/precompiled_basic.cxx
index 9ea2571c99..0746e87f95 100644
--- a/basic/inc/pch/precompiled_basic.cxx
+++ b/basic/inc/pch/precompiled_basic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_basic.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/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index f1c120b261..4d3f6399fb 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_basic.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/basic/inc/sb.hrc b/basic/inc/sb.hrc
index 6caf7ade5c..340b594bf0 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.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: sb.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/basic/inc/sb.hxx b/basic/inc/sb.hxx
index 219b341806..e194719866 100644
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sb.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/basic/inc/svtmsg.hrc b/basic/inc/svtmsg.hrc
index e9cb0c715a..f94fca403d 100644
--- a/basic/inc/svtmsg.hrc
+++ b/basic/inc/svtmsg.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: svtmsg.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/basic/inc/testtool.hrc b/basic/inc/testtool.hrc
index 5316574a0c..c61c2282f2 100644
--- a/basic/inc/testtool.hrc
+++ b/basic/inc/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/basic/inc/ttmsg.hrc b/basic/inc/ttmsg.hrc
index 8d203d7ea9..07da20096a 100644
--- a/basic/inc/ttmsg.hrc
+++ b/basic/inc/ttmsg.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: ttmsg.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/basic/source/app/app.cxx b/basic/source/app/app.cxx
index b1a4d6c2e4..f8b2d66239 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.cxx,v $
- * $Revision: 1.79.14.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -194,41 +191,6 @@ BOOL IsTTSignatureForUnicodeTextfile( String aLine )
 
 BasicApp aBasicApp; // Application instance
 
-static const char * const components[] =
-{
-    SAL_MODULENAME( "ucb1" )    // KSO, ABI
-    , SAL_MODULENAME( "ucpfile1" )
-    , "configmgr2.uno" SAL_DLLEXTENSION
-    , "sax.uno" SAL_DLLEXTENSION
-    , "stocservices.uno" SAL_DLLEXTENSION
-    , SAL_MODULENAME( "fileacc" )
-    , SAL_MODULENAME( "mcnttype" )  		// Clipboard   Ask Oliver Braun
-    , "i18npool.uno" SAL_DLLEXTENSION
-        // Reading of files in specific encodings like UTF-8 using
-        // createUnoService( "com.sun.star.io.TextInputStream" ) and such
-    , "textinstream.uno" SAL_DLLEXTENSION
-    , "textoutstream.uno" SAL_DLLEXTENSION
-    , "introspection.uno" SAL_DLLEXTENSION
-    , "reflection.uno" SAL_DLLEXTENSION
-        // RemoteUno
-    , "connector.uno" SAL_DLLEXTENSION
-    , "bridgefac.uno" SAL_DLLEXTENSION
-    , "remotebridge.uno" SAL_DLLEXTENSION
-#ifdef SAL_UNX
-#ifdef QUARTZ
-    , SVLIBRARY( "dtransaqua" )  // Mac OS X Aqua uses a dedicated libdtransaqua
-#else
-    , SVLIBRARY( "dtransX11" )        // OBR
-#endif
-#endif
-#ifdef SAL_W32
-    , SAL_MODULENAME( "sysdtrans" )
-    , SAL_MODULENAME( "ftransl" )
-    , SAL_MODULENAME( "dnd" )
-#endif
-    , 0
-};
-
 uno::Reference< XContentProviderManager > InitializeUCB( void )
 {
     uno::Reference< XMultiServiceFactory > xSMgr;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index b30b7261c2..32b3a051da 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.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/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 657b44e55a..f8377ea440 100644
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appbased.cxx,v $
- * $Revision: 1.13.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx
index f12b805240..eb9bf71aa1 100644
--- a/basic/source/app/appbased.hxx
+++ b/basic/source/app/appbased.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appbased.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/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index b2e3942d36..7a919c3416 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appedit.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/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx
index 3eb128da77..92187ff599 100644
--- a/basic/source/app/appedit.hxx
+++ b/basic/source/app/appedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appedit.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/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index d6bb483588..239b6b4049 100644
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: apperror.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/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index c560b1fd7d..af1cc67a61 100644
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: apperror.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/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index ad65d45395..a3d7f37513 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appwin.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index 95439f2f06..c9550d16b4 100644
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appwin.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/basic/source/app/basic.hrc b/basic/source/app/basic.hrc
index f4351c41d5..634d86f30e 100644
--- a/basic/source/app/basic.hrc
+++ b/basic/source/app/basic.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: basic.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/basic/source/app/basic.src b/basic/source/app/basic.src
index 0efffe42e2..1e520add50 100644
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.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: basic.src,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/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx
index a2aa1ff9c9..bca8c516ff 100644
--- a/basic/source/app/basicrt.cxx
+++ b/basic/source/app/basicrt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicrt.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/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc
index 5c69689e58..e3accf183b 100644
--- a/basic/source/app/basmsg.hrc
+++ b/basic/source/app/basmsg.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: basmsg.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/basic/source/app/basmsg.src b/basic/source/app/basmsg.src
index 90bfbec5ce..af24ea93a1 100644
--- a/basic/source/app/basmsg.src
+++ b/basic/source/app/basmsg.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: basmsg.src,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/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index ca75c2dd03..499ea30ff3 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brkpnts.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/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index efb19594c1..a5e3b444ad 100644
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brkpnts.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/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx
index cdf6ba679a..74a0c256e9 100644
--- a/basic/source/app/dataedit.hxx
+++ b/basic/source/app/dataedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dataedit.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/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 2fc7baffe1..4236555b87 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialogs.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index bc7df5ad76..9b681bc87e 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialogs.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/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index 3a52f402b3..07ceed6e51 100644
--- a/basic/source/app/makefile.mk
+++ b/basic/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.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index beabe69afe..0e592d8e8e 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgedit.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 764228341b..997b575dc2 100644
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgedit.hxx,v $
- * $Revision: 1.11.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 335db6c21c..203e85d125 100644
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mybasic.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/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index d7ceedcf4f..ed314d1f0b 100644
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printer.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/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index af6770e94b..5251ebcd5d 100644
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 01491f9e9d..1ed7f7b3aa 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/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.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index 9caf34148c..285c84795b 100644
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: processw.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/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index ce8d0dcde0..648716fa84 100644
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: processw.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/basic/source/app/resids.hrc b/basic/source/app/resids.hrc
index 110fa888ec..115c88e769 100644
--- a/basic/source/app/resids.hrc
+++ b/basic/source/app/resids.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: resids.hrc,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index 6a90321b0d..d10f84ead3 100644
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/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.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/status.hxx b/basic/source/app/status.hxx
index 9daa9229aa..c0e686e919 100644
--- a/basic/source/app/status.hxx
+++ b/basic/source/app/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index 9619cc04ec..6b98fd2c97 100644
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.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: svtmsg.src,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/basic/source/app/testbasi.cxx b/basic/source/app/testbasi.cxx
index 0223888c54..50f4518168 100644
--- a/basic/source/app/testbasi.cxx
+++ b/basic/source/app/testbasi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testbasi.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/basic/source/app/testtool.idl b/basic/source/app/testtool.idl
index 5d01db1d56..980b165b39 100644
--- a/basic/source/app/testtool.idl
+++ b/basic/source/app/testtool.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index faf0372380..5157e3ecb2 100644
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/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.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index e07cc90885..0d0ec1ed66 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textedit.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/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index d31d013e36..78ca701592 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textedit.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/basic/source/app/ttbasic.cxx b/basic/source/app/ttbasic.cxx
index 993105f89e..a53dbc712e 100644
--- a/basic/source/app/ttbasic.cxx
+++ b/basic/source/app/ttbasic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ttbasic.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/basic/source/app/ttbasic.hxx b/basic/source/app/ttbasic.hxx
index e3d1235c2c..da443f083b 100644
--- a/basic/source/app/ttbasic.hxx
+++ b/basic/source/app/ttbasic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ttbasic.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/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index 2618461730..6ea5f0aa24 100644
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.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: ttmsg.src,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/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 3a0be2efa4..4ecaec7302 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicmanagerrepository.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/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 196965e2ef..41c596dedb 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmgr.cxx,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/basmgr/makefile.mk b/basic/source/basmgr/makefile.mk
index 4252099d26..e08e9cc753 100644
--- a/basic/source/basmgr/makefile.mk
+++ b/basic/source/basmgr/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 0e5a376bac..cdb9c78523 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: disas.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/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index b0c8f4b3c3..0335b3e746 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventatt.cxx,v $
- * $Revision: 1.35.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index d799050724..c04cfef38b 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/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.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index 92d0f1194f..eb5486f02a 100644
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index f54cdc800d..91564e74ac 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propacc.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a217ebc49c..1b52880f23 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sb.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/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 5b1454d654..b80133553b 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.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: sb.src,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 41707c6436..da156b2afd 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbintern.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/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 06c29a5f2d..8580b3f5a4 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbunoobj.cxx,v $
- * $Revision: 1.54 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index bbb529b733..fb52d92c50 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxmod.cxx,v $
- * $Revision: 1.44.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -592,7 +589,7 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
 {
     // #67781 Rueckgabewerte der Uno-Methoden loeschen
     clearUnoMethods();
-    clearUnoServiceCtors();

+    clearUnoServiceCtors();
 
     ClearUnoObjectsInRTL_Impl_Rek( pBasic );
 
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index 9b26c9747f..322d57a32c 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: buffer.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/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index a3ead5e305..f6cb11bce3 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: codegen.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/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index dfb9637d06..36bbb8d551 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dim.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -241,12 +238,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             DefEnum( bPrivate );
             return;
         }
-        else if( eCurTok == DECLARE )

-        {

-            Next();

-            DefDeclare( bPrivate ); 

-            return;

-        }

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

-                {

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

-                    if ( pDim->GetSize() )

-                    {

-                        // Dimension the target array

-

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

-                        {

-                            INT32 ub = -1;

-                            INT32 lb = nBase;

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

-                            ub = pNode->GetNumber();

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

-                            {

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

-                                    StarBASIC::FatalError( SbERR_INTERNAL_ERROR );

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

-                                lb = ub;

-                                ub = pNode->GetNumber();

-                            }

-                            else if ( !bCompatible )

-                                ub += nBase;

-                            pArray->AddDim32( lb, ub );      

-                        }

-                        pArray->setHasFixedSize( true );

-                    }

-                    else

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

-                    USHORT nSavFlags = pTypeElem->GetFlags();

-                    // need to reset the FIXED flag 

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

-                    pTypeElem->ResetFlag( SBX_FIXED );

-                    pTypeElem->PutObject( pArray );

-                    pTypeElem->SetFlags( nSavFlags );

-                }

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

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

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

-}

-

-void SbiParser::DefDeclare( BOOL bPrivate )

-{

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

-                pDef->SetPublic( !bPrivate );

+            if ( pDef )
+                pDef->SetPublic( !bPrivate );
         }
     }
 }
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 5da3c41b73..5e28d95ac0 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exprgen.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/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 80fda09ff7..2ae9903fec 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exprnode.cxx,v $
- * $Revision: 1.19.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index b40ae4d1df..eafe38dcdb 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exprtree.cxx,v $
- * $Revision: 1.24.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 3d979656f0..7575381c24 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: io.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/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 624e8604d2..20480ec45c 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loops.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/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index ef0e24ad28..bd3c750df3 100644
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index c6e9b42c45..69643715a9 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/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.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 34342b57fc..c91624de5e 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbcomp.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 07033cd7ea..61ca92108b 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scanner.cxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -196,7 +193,7 @@ BOOL SbiScanner::NextSym()
     }
 
     // Leerstellen weg:
-    while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) )

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

-        bool bRes = NextSym();

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

-        {

-            // object _

-            //    .Method

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

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

-            bSpaces = FALSE; 

-        }

-        return bRes;

+        pLine = NULL; 
+        bool bRes = NextSym();
+        if( bVBASupportOn && aSym.GetBuffer()[0] == '.' )
+        {
+            // object _
+            //    .Method
+            // ^^^  <- spaces is legal in MSO VBA
+            OSL_TRACE("*** resetting bSpaces***"); 
+            bSpaces = FALSE; 
+        }
+        return bRes;
     }
     else
     {
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 1d34698104..08703e7036 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: symtbl.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/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 5846c8c663..a41944c852 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.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/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index bfc0f5f612..8ec5cdf85f 100644
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: buffer.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/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index 3f6130bd30..f6896df51d 100644
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: codegen.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/basic/source/inc/collelem.hxx b/basic/source/inc/collelem.hxx
index 5279ec3475..5ea7348fbf 100644
--- a/basic/source/inc/collelem.hxx
+++ b/basic/source/inc/collelem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: collelem.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/basic/source/inc/disas.hxx b/basic/source/inc/disas.hxx
index 3295c4b41d..e3abac76a6 100644
--- a/basic/source/inc/disas.hxx
+++ b/basic/source/inc/disas.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: disas.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/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index f2d6164836..b5387ce483 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgcont.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/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index b41d5aba30..712ae8b606 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: expr.hxx,v $
- * $Revision: 1.15.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -144,7 +141,7 @@ public:
     SbiExprNode* GetRealNode();		// letzter Knoten in x.y.z
     short GetDepth();               // Tiefe eines Baumes berechnen
     const String& GetString() 		{ return aStrVal; }
-    short GetNumber() 				{ return (short)nVal; }

+    short GetNumber() 				{ return (short)nVal; }
     SbiExprList* GetParameters()	{ return aVar.pPar; }
     SbiExprListVector* GetMoreParameters()	{ return aVar.pvMorePar; }
 
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index f42455282f..7fab709849 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filefmt.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/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 7035e85360..ea79c0c918 100644
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/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.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 791439771f..50f7b01dcf 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iosys.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/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index a5e52845ff..cdc6cf4968 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namecont.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/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
index 31863b8bd6..3de6ff8ee8 100644
--- a/basic/source/inc/object.hxx
+++ b/basic/source/inc/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.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index 4d2685e346..f82c8854ba 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opcodes.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/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 8c00ca2592..04c0269388 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/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.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,7 +63,7 @@ class SbiParser : public SbiTokenizer
     void StmntBlock( SbiToken ); 	// Statement-Block abarbeiten
     void DefType( BOOL bPrivate );	// Parse type declaration
     void DefEnum( BOOL bPrivate );	// Parse enum declaration
-    void DefDeclare( BOOL bPrivate );

+    void DefDeclare( BOOL bPrivate );
     void EnableCompatibility();	
 public:
     SbxArrayRef	  rTypeArray;		// das Type-Array
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index c6517459aa..4fc67883aa 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propacc.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/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 409f0d76d6..71997dae2f 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: runtime.hxx,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx
index feafa4aa46..7adbfeafcf 100644
--- a/basic/source/inc/sbcomp.hxx
+++ b/basic/source/inc/sbcomp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbcomp.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/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index bfe59e9d38..3423f99a84 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbintern.hxx,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/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 2f151b80f5..b5abb18e8b 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbjsmeth.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/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 4fa1171027..b809803888 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbjsmod.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/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 5780113482..f9d857c6a1 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbunoobj.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/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index d27167143a..099f9836fb 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scanner.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/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 1475f2e91f..a3c07dd5b5 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scriptcont.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/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index d18c1c294f..020b47e8f5 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stdobj.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/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index e2510b0272..cb1301bf83 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: symtbl.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/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 1220f7e133..737075a797 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.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/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 929a71a942..329a8df3e5 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basrdll.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/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 10a74a6748..e36fd66cb5 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ddectrl.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/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index 9276a51ee4..66f73d4330 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ddectrl.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/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx
index 3e85432da8..092548b36f 100644
--- a/basic/source/runtime/dllmgr.cxx
+++ b/basic/source/runtime/dllmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dllmgr.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/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index f8689ddd10..c57e05e3fc 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dllmgr.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/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 78445d39af..7afad32a3e 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputbox.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/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e4d667ecc0..c656767d03 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iosys.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index 9c9886e05f..c0b4bd3bdc 100644
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6621e6c3f0..c32abbd1c3 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: methods.cxx,v $
- * $Revision: 1.82 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1786,9 +1783,9 @@ INT16 implGetDateYear( double aDate )
 
 BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
 {
-    if ( nYear < 30 && SbiRuntime::isVBAEnabled() )

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

+    else if ( nYear < 100 )
         nYear += 1900;
     Date aCurDate( nDay, nMonth, nYear );
     if ((nYear < 100 || nYear > 9999) )  
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 3f2b72af39..bf55a97d47 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: methods1.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/os2.asm b/basic/source/runtime/os2.asm
index 1dd5a296d6..a56f0b74b8 100644
--- a/basic/source/runtime/os2.asm
+++ b/basic/source/runtime/os2.asm
@@ -2,14 +2,10 @@
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.asm,v $
-;
-; $Revision: 1.4 $
-;
 ; This file is part of OpenOffice.org.
 ;
 ; OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index df5098ebe0..fad64d68c0 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: props.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/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index 4ee88b3fb6..485abe4794 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtlproto.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/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index a7cf7277c0..d0751547eb 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: runtime.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/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 01f4777a7f..5d3573de09 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stdobj.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/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 20698ad332..cca55de2ba 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stdobj1.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/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index f4fe09a0df..83b610eef1 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: step0.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/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index f7c1086304..3fe4d4542d 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: step1.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/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index dbc8712063..fb79d2f863 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: step2.cxx,v $
- * $Revision: 1.35 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/win.asm b/basic/source/runtime/win.asm
index 252bb43b5d..dea597a4ce 100644
--- a/basic/source/runtime/win.asm
+++ b/basic/source/runtime/win.asm
@@ -2,14 +2,10 @@
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ; 
-; Copyright 2008 by Sun Microsystems, Inc.
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
 ; OpenOffice.org - a multi-platform office productivity suite
 ;
-; $RCSfile: win.asm,v $
-;
-; $Revision: 1.4 $
-;
 ; This file is part of OpenOffice.org.
 ;
 ; OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
index b42c5278c7..1168804102 100644
--- a/basic/source/runtime/wnt-mingw.s
+++ b/basic/source/runtime/wnt-mingw.s
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wnt.asm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -17,7 +13,7 @@
 # only, as published by the Free Software Foundation.
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY# without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
diff --git a/basic/source/runtime/wnt.asm b/basic/source/runtime/wnt.asm
index b4d1bd15d2..3824daae96 100644
--- a/basic/source/runtime/wnt.asm
+++ b/basic/source/runtime/wnt.asm
@@ -2,14 +2,10 @@
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ; 
-; Copyright 2008 by Sun Microsystems, Inc.
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
 ; OpenOffice.org - a multi-platform office productivity suite
 ;
-; $RCSfile: wnt.asm,v $
-;
-; $Revision: 1.4 $
-;
 ; This file is part of OpenOffice.org.
 ;
 ; OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/sample/collelem.cxx b/basic/source/sample/collelem.cxx
index 577f039c70..7b7634e601 100644
--- a/basic/source/sample/collelem.cxx
+++ b/basic/source/sample/collelem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: collelem.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/basic/source/sample/makefile.mk b/basic/source/sample/makefile.mk
index f1802b0e75..9aeb8e3534 100644
--- a/basic/source/sample/makefile.mk
+++ b/basic/source/sample/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index 5f18a51f01..87e134472e 100644
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/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/basic/source/sbx/format.src b/basic/source/sbx/format.src
index afdd3f8522..dc07317cae 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.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: format.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/basic/source/sbx/makefile.mk b/basic/source/sbx/makefile.mk
index 357ce64df6..dfd8e72bf4 100644
--- a/basic/source/sbx/makefile.mk
+++ b/basic/source/sbx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 5aef2609dd..cbcd5d97d3 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxarray.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/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 9543817268..2a7849cb82 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxbase.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/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index fc9d4616c1..38ca84eddf 100644
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxbool.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/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index a11f346e42..12ec2fd3c6 100644
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxbyte.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/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index 3e8f9e9e45..9f0bb41ce6 100644
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxchar.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/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 64af3ac8e0..a8f1fc9fa9 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxcoll.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/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 2429839be2..57c42889a0 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxconv.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/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index ea906ccc01..db21871188 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxcurr.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/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index cdfeb2dd3c..a653b77a9b 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxdate.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/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 8cccdc54c2..9c28864c0d 100644
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxdbl.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/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 0ca63122e3..72c6b14f5b 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxdec.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/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index bec0b9f845..3fb31e6860 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxdec.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/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index 234befbff0..1ee1090566 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxexec.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -94,7 +91,7 @@ static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const S
         {
             rSym = p;
             // Dann darf es Buchstaben, Zahlen oder Underlines enthalten
-            while( *p && (rCharClass.isAlphaNumeric( *p ) || *p == '_') )

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

+        while( refVar.Is() && (*p == '.' || *p == '!') )
         {
             // Es folgt noch ein Objektelement. Das aktuelle Element
             // muss also ein SBX-Objekt sein oder liefern!
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 42f2d80c7d..b847646957 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxform.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/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 28bcebf5da..f831040a1d 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxint.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/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 537694ecca..a36fd1fc49 100644
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxlng.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/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
index de975626df..f9db6de140 100644
--- a/basic/source/sbx/sbxmstrm.cxx
+++ b/basic/source/sbx/sbxmstrm.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxmstrm.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/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index e977456814..c96d9b5b35 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxobj.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/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index fa900265d4..b450bf6faa 100644
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxres.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/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index 9ef1e1ca1a..0d4ad5f39e 100644
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxres.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/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 041e14b983..58ec573dc1 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxscan.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/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 80d796495f..d3b873b96a 100644
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxsng.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/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index fe8ebd5b0b..73167aafb2 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxstr.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/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 5674fd6a5f..008677959d 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxuint.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/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index eaf7b86b43..aa9f18f7da 100644
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxulng.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/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx
index b5a27e3718..acf7bbd4d0 100644
--- a/basic/source/sbx/sbxvals.cxx
+++ b/basic/source/sbx/sbxvals.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxvals.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/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 4779a85443..34ca872679 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxvalue.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1573,9 +1570,9 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
         {
             aL.eType = aR.eType = SbxDOUBLE;
             //if( Get( aL ) && rOp.Get( aR ) )
-            bool bGetL = Get( aL );

-            bool bGetR = rOp.Get( aR );

-            if( bGetL && bGetR )

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

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

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

-            else if ( bGetR || bGetL )

-            {

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

-                {

-                    ResetError();

-                    bRes = FALSE;

-                }

-            }

+            // at least one value was got
+            // if this is VBA then a conversion error for one
+            // side will yield a false result of an equality test
+            else if ( bGetR || bGetL )
+            {
+                if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )
+                {
+                    ResetError();
+                    bRes = FALSE;
+                }
+            }
         }
     }
     if( eOld != SbxERR_OK )
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index b391023c20..fe9734c84e 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbxvar.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/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 2ed3a5ca1f..4bbcb31359 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgcont.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/basic/source/uno/makefile.mk b/basic/source/uno/makefile.mk
index c77ad7a2d5..52e7f7004c 100644
--- a/basic/source/uno/makefile.mk
+++ b/basic/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index 1686ed6403..8bd4875cbd 100644
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modsizeexceeded.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/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 1809701d92..657ecd03f4 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: namecont.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/basic/source/uno/sbmodule.cxx b/basic/source/uno/sbmodule.cxx
index 001a2e98d1..922b503baf 100644
--- a/basic/source/uno/sbmodule.cxx
+++ b/basic/source/uno/sbmodule.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbmodule.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/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx
index d297e9a81f..10e027fdf1 100644
--- a/basic/source/uno/sbmodule.hxx
+++ b/basic/source/uno/sbmodule.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbmodule.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/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index a2a4ded10d..c57c888f29 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbservices.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/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index c744e6bc2f..89e9f6cc85 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scriptcont.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/basic/util/makefile.mk b/basic/util/makefile.mk
index 76385e91c1..645c9b6a3c 100644
--- a/basic/util/makefile.mk
+++ b/basic/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.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/workben/basmgr.src b/basic/workben/basmgr.src
index 94f406d745..e53efc8246 100644
--- a/basic/workben/basmgr.src
+++ b/basic/workben/basmgr.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: basmgr.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/basic/workben/makefile.mk b/basic/workben/makefile.mk
index 9ab482d837..6ec2a9971b 100644
--- a/basic/workben/makefile.mk
+++ b/basic/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index fb02dda748..aff81c0e9d 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mgrtest.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/configmgr/inc/configmgr/detail/configmgrdllapi.hxx b/configmgr/inc/configmgr/detail/configmgrdllapi.hxx
new file mode 100644
index 0000000000..6eb2ea7bc9
--- /dev/null
+++ b/configmgr/inc/configmgr/detail/configmgrdllapi.hxx
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_DETAIL_CONFIGMGRDLLAPI_HXX
+#define INCLUDED_CONFIGMGR_DETAIL_CONFIGMGRDLLAPI_HXX
+
+#include "sal/config.h"
+
+#include "sal/types.h"
+
+#if defined OOO_DLLIMPLEMENTATION_CONFIGMGR
+#define OOO_DLLPUBLIC_CONFIGMGR SAL_DLLPUBLIC_EXPORT
+#else
+#define OOO_DLLPUBLIC_CONFIGMGR SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
diff --git a/configmgr/inc/configmgr/update.hxx b/configmgr/inc/configmgr/update.hxx
new file mode 100644
index 0000000000..b27a324874
--- /dev/null
+++ b/configmgr/inc/configmgr/update.hxx
@@ -0,0 +1,51 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_UPDATE_HXX
+#define INCLUDED_CONFIGMGR_UPDATE_HXX
+
+#include "sal/config.h"
+
+#include "configmgr/detail/configmgrdllapi.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+namespace update {
+
+OOO_DLLPUBLIC_CONFIGMGR void insertExtensionXcsFile(
+    bool shared, rtl::OUString const & fileUri);
+
+OOO_DLLPUBLIC_CONFIGMGR void insertExtensionXcuFile(
+    bool shared, rtl::OUString const & fileUri);
+
+}
+
+}
+
+#endif
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
index 5637340c04..3dd2fc4d48 100644
--- a/configmgr/inc/makefile.mk
+++ b/configmgr/inc/makefile.mk
@@ -1,14 +1,9 @@
 #*************************************************************************
-#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -26,27 +21,18 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=configmgr
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+#***********************************************************************/
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ = ..
+PRJNAME = configmgr
+TARGET = inc
 
-.INCLUDE :  target.mk
+ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
 
+.IF "$(ENABLE_PCH)" != ""
+ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
+.ENDIF
diff --git a/configmgr/inc/pch/precompiled_configmgr.cxx b/configmgr/inc/pch/precompiled_configmgr.cxx
index 7f5bcb8fb3..abfb44ccb7 100644
--- a/configmgr/inc/pch/precompiled_configmgr.cxx
+++ b/configmgr/inc/pch/precompiled_configmgr.cxx
@@ -1,32 +1,28 @@
 /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: precompiled_configmgr.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.
- *
- ************************************************************************/
+*
+* 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_configmgr.hxx"
-
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index 114a355290..7561fe89f7 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -1,248 +1,32 @@
 /*************************************************************************
- *
- * DO NOT 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_configmgr.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.
- *
- ************************************************************************/
+*
+* 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.
+*
+************************************************************************/
+
+#if defined PRECOMPILED_HEADERS
 
-// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:35.077252
-
-#ifdef PRECOMPILED_HEADERS
-
-//---MARKER---
 #include "sal/config.h"
-#include "sal/types.h"
-
-#include "com/sun/star/beans/IllegalTypeException.hpp"
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/beans/Property.hpp"
-#include "com/sun/star/beans/PropertyAttribute.hpp"
-#include "com/sun/star/beans/PropertyExistException.hpp"
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/beans/PropertyVetoException.hpp"
-#include "com/sun/star/beans/UnknownPropertyException.hpp"
-#include "com/sun/star/beans/XExactName.hpp"
-#include "com/sun/star/beans/XHierarchicalPropertySet.hpp"
-#include "com/sun/star/beans/XMultiHierarchicalPropertySet.hpp"
-#include "com/sun/star/beans/XMultiPropertySet.hpp"
-#include "com/sun/star/beans/XMultiPropertyStates.hpp"
-#include "com/sun/star/beans/XPropertiesChangeListener.hpp"
-#include "com/sun/star/beans/XProperty.hpp"
-#include "com/sun/star/beans/XPropertyChangeListener.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/beans/XPropertySetInfo.hpp"
-#include "com/sun/star/beans/XPropertyState.hpp"
-#include "com/sun/star/beans/XPropertyWithState.hpp"
-#include "com/sun/star/beans/XVetoableChangeListener.hpp"
-#include "com/sun/star/configuration/CannotLoadConfigurationException.hpp"
-#include "com/sun/star/configuration/InstallationIncompleteException.hpp"
-#include "com/sun/star/configuration/InvalidBootstrapFileException.hpp"
-#include "com/sun/star/configuration/MissingBootstrapFileException.hpp"
-#include "com/sun/star/configuration/XTemplateContainer.hpp"
-#include "com/sun/star/configuration/XTemplateInstance.hpp"
-#include "com/sun/star/configuration/backend/AuthenticationFailedException.hpp"
-#include "com/sun/star/configuration/backend/BackendAccessException.hpp"
-#include "com/sun/star/configuration/backend/BackendSetupException.hpp"
-#include "com/sun/star/configuration/backend/CannotConnectException.hpp"
-#include "com/sun/star/configuration/backend/ComponentChangeEvent.hpp"
-#include "com/sun/star/configuration/backend/ConnectionLostException.hpp"
-#include "com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp"
-#include "com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.hpp"
-#include "com/sun/star/configuration/backend/MalformedDataException.hpp"
-#include "com/sun/star/configuration/backend/MergeRecoveryRequest.hpp"
-#include "com/sun/star/configuration/backend/NodeAttribute.hpp"
-#include "com/sun/star/configuration/backend/PropertyInfo.hpp"
-#include "com/sun/star/configuration/backend/SchemaAttribute.hpp"
-#include "com/sun/star/configuration/backend/StratumCreationException.hpp"
-#include "com/sun/star/configuration/backend/TemplateIdentifier.hpp"
-#include "com/sun/star/configuration/backend/XBackend.hpp"
-#include "com/sun/star/configuration/backend/XBackendChangesListener.hpp"
-#include "com/sun/star/configuration/backend/XBackendChangesNotifier.hpp"
-#include "com/sun/star/configuration/backend/XBackendEntities.hpp"
-#include "com/sun/star/configuration/backend/XCompositeLayer.hpp"
-#include "com/sun/star/configuration/backend/XLayer.hpp"
-#include "com/sun/star/configuration/backend/XLayerContentDescriber.hpp"
-#include "com/sun/star/configuration/backend/XLayerHandler.hpp"
-#include "com/sun/star/configuration/backend/XLayerImporter.hpp"
-#include "com/sun/star/configuration/backend/XMultiLayerStratum.hpp"
-#include "com/sun/star/configuration/backend/XSchema.hpp"
-#include "com/sun/star/configuration/backend/XSchemaHandler.hpp"
-#include "com/sun/star/configuration/backend/XSchemaSupplier.hpp"
-#include "com/sun/star/configuration/backend/XSingleLayerStratum.hpp"
-#include "com/sun/star/configuration/backend/XUpdatableLayer.hpp"
-#include "com/sun/star/configuration/backend/XUpdateHandler.hpp"
-#include "com/sun/star/configuration/backend/XVersionedSchemaSupplier.hpp"
-#include "com/sun/star/container/ElementExistException.hpp"
-#include "com/sun/star/container/NoSuchElementException.hpp"
-#include "com/sun/star/container/XChild.hpp"
-#include "com/sun/star/container/XContainer.hpp"
-#include "com/sun/star/container/XContainerListener.hpp"
-#include "com/sun/star/container/XContentEnumerationAccess.hpp"
-#include "com/sun/star/container/XEnumeration.hpp"
-#include "com/sun/star/container/XHierarchicalName.hpp"
-#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/container/XNameContainer.hpp"
-#include "com/sun/star/container/XNameReplace.hpp"
-#include "com/sun/star/container/XNamed.hpp"
-#include "com/sun/star/io/BufferSizeExceededException.hpp"
-#include "com/sun/star/io/IOException.hpp"
-#include "com/sun/star/io/UnexpectedEOFException.hpp"
-#include "com/sun/star/io/WrongFormatException.hpp"
-#include "com/sun/star/io/XActiveDataControl.hpp"
-#include "com/sun/star/io/XActiveDataSink.hpp"
-#include "com/sun/star/io/XActiveDataSource.hpp"
-#include "com/sun/star/io/XDataExporter.hpp"
-#include "com/sun/star/io/XDataImporter.hpp"
-#include "com/sun/star/io/XDataInputStream.hpp"
-#include "com/sun/star/io/XDataOutputStream.hpp"
-#include "com/sun/star/io/XDataTransferEventListener.hpp"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/io/XOutputStream.hpp"
-#include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/lang/IllegalAccessException.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "com/sun/star/lang/Locale.hpp"
-#include "com/sun/star/lang/NoSupportException.hpp"
-#include "com/sun/star/lang/NullPointerException.hpp"
-#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
-#include "com/sun/star/lang/WrappedTargetException.hpp"
-#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
-#include "com/sun/star/lang/XComponent.hpp"
-#include "com/sun/star/lang/XEventListener.hpp"
-#include "com/sun/star/lang/XInitialization.hpp"
-#include "com/sun/star/lang/XLocalizable.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/lang/XSingleServiceFactory.hpp"
-#include "com/sun/star/lang/XTypeProvider.hpp"
-#include "com/sun/star/lang/XUnoTunnel.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "com/sun/star/registry/XSimpleRegistry.hpp"
-#include "com/sun/star/script/FailReason.hpp"
-#include "com/sun/star/script/XTypeConverter.hpp"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionApprove.hpp"
-#include "com/sun/star/task/XInteractionDisapprove.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/task/XInteractionRequest.hpp"
-#include "com/sun/star/task/XInteractionRetry.hpp"
-#include "com/sun/star/task/XJob.hpp"
-#include "com/sun/star/uno/Any.h"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Exception.hpp"
-#include "com/sun/star/uno/Reference.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.h"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/TypeClass.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XCurrentContext.hpp"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/util/XChangesBatch.hpp"
-#include "com/sun/star/util/XChangesListener.hpp"
-#include "com/sun/star/util/XChangesNotifier.hpp"
-#include "com/sun/star/util/XFlushable.hpp"
-#include "com/sun/star/util/XRefreshable.hpp"
-#include "com/sun/star/util/XStringEscape.hpp"
-#include "com/sun/star/util/XTimeStamped.hpp"
-#include "com/sun/star/util/logging/LogLevel.hpp"
-#include "com/sun/star/util/logging/XLogger.hpp"
-#include "com/sun/star/xml/sax/InputSource.hpp"
-#include "com/sun/star/xml/sax/SAXException.hpp"
-#include "com/sun/star/xml/sax/SAXParseException.hpp"
-#include "com/sun/star/xml/sax/XAttributeList.hpp"
-#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
-#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"
-#include "com/sun/star/xml/sax/XParser.hpp"
-
-#include "comphelper/processfactory.hxx"
-#include "comphelper/propertycontainer.hxx"
-#include "comphelper/sequence.hxx"
-#include "comphelper/stl_types.hxx"
-
-#include "cppuhelper/bootstrap.hxx"
-#include "cppuhelper/component_context.hxx"
-#include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/interfacecontainer.hxx"
-#include "cppuhelper/propshlp.hxx"
-#include "cppuhelper/queryinterface.hxx"
-#include "cppuhelper/servicefactory.hxx"
-#include "cppuhelper/typeprovider.hxx"
-#include "cppuhelper/weak.hxx"
-
-#include "osl/conditn.hxx"
-#include "osl/diagnose.h"
-#include "osl/file.h"
-#include "osl/file.hxx"
-#include "osl/interlck.h"
-#include "osl/module.hxx"
-#include "osl/mutex.hxx"
-#include "osl/process.h"
-#include "osl/thread.h"
-#include "osl/time.h"
-
-#include "rtl/alloc.h"
-#include "rtl/bootstrap.h"
-#include "rtl/bootstrap.hxx"
-#include "rtl/logfile.hxx"
-#include "rtl/process.h"
-#include "rtl/ref.hxx"
-#include "rtl/strbuf.hxx"
-#include "rtl/string.h"
-#include "rtl/string.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-
-#include "sal/main.h"
-
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "sys/timeb.h"
-
-#include "typelib/typedescription.hxx"
-
-#include "uno/any2.h"
-#include "uno/current_context.hxx"
-
-
-
-#include "vos/conditn.hxx"
-#include "vos/pipe.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
-#include "vos/socket.hxx"
-#include "vos/thread.hxx"
-#include "vos/timer.hxx"
-//---MARKER---
 
 #endif
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index a3d93b598a..2fd4e03fa4 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,18 +1,3 @@
-cg	configmgr	: BOOST:boost offapi comphelper cppuhelper salhelper tools vos NULL
-cg	configmgr								usr1	-	all	cg_mkout NULL
-cg	configmgr\inc							nmake	-	all	cg_inc NULL
-cg	configmgr\source\misc					nmake	-	all	cg_misc cg_inc NULL
-cg	configmgr\source\data					nmake	-	all	cg_data cg_inc NULL
-cg	configmgr\source\tree					nmake	-	all	cg_tree cg_inc NULL
-cg	configmgr\source\treecache				nmake	-	all	cg_trcache cg_inc NULL
-cg	configmgr\source\xml					nmake	-	all	cg_xml cg_inc NULL
-cg	configmgr\source\backend				nmake	-	all	cg_backend cg_inc NULL
-cg	configmgr\source\backendhelper			nmake	-	all	cg_backendhelper cg_inc NULL
-cg	configmgr\source\api					nmake	-	all	cg_api cg_inc NULL
-cg	configmgr\source\api2					nmake	-	all	cg_api2 cg_inc NULL
-cg	configmgr\source\treemgr				nmake	-	all	cg_treemgr cg_inc NULL
-cg	configmgr\source\registry				nmake	-	all	cg_reg cg_inc NULL
-cg	configmgr\source\platformbe				nmake	-	all	cg_platformbe cg_inc NULL
-cg	configmgr\util							nmake	-	all	cg_util cg_platformbe cg_api cg_api2 cg_misc cg_reg cg_trcache cg_data cg_tree cg_treemgr cg_xml cg_backend cg_localbe NULL
-cg	configmgr\source\localbe				nmake	-	all	cg_localbe cg_inc NULL
-
+cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper stlport NULL
+cg configmgr\inc nmake - all cg_inc NULL
+cg configmgr\source nmake - all cg_source cg_inc NULL
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index 3f4a1d35a1..a9d91980b2 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,10 +1,8 @@
 mkdir: %_DEST%\inc%_EXT%\configmgr
-..\%__SRC%\lib\behelper.uno.so %_DEST%\lib%_EXT%\behelper.uno.so
-..\%__SRC%\lib\configmgr*.uno.so %_DEST%\lib%_EXT%\configmgr*.uno.so
-..\%__SRC%\lib\sysmgr*.uno.so %_DEST%\lib%_EXT%\sysmgr*.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\behelper*.dll %_DEST%\bin%_EXT%\behelper*.dll
-..\%__SRC%\bin\configmg*.dll %_DEST%\bin%_EXT%\configmg*.dll
-..\%__SRC%\bin\sysmgr*.dll %_DEST%\bin%_EXT%\sysmgr*.dll
-
-..\%__SRC%\misc\configmgr2.uno.xml %_DEST%\xml%_EXT%\configmgr2.uno.xml
+mkdir: %_DEST%\inc%_EXT%\configmgr\detail
+..\%__SRC%\bin\configmgr.dll %_DEST%\bin%_EXT%\configmgr.dll
+..\%__SRC%\lib\iconfigmgr.lib %_DEST%\lib%_EXT%\iconfigmgr.lib
+..\%__SRC%\lib\libconfigmgr.dylib %_DEST%\lib%_EXT%\libconfigmgr.dylib
+..\%__SRC%\lib\libconfigmgr.so %_DEST%\lib%_EXT%\libconfigmgr.so
+..\inc\configmgr\detail\configmgrdllapi.hxx %_DEST%\inc%_EXT%\configmgr\detail\configmgrdllapi.hxx
+..\inc\configmgr\update.hxx %_DEST%\inc%_EXT%\configmgr\update.hxx
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx
deleted file mode 100644
index 7d5be65928..0000000000
--- a/configmgr/qa/unit/common.hxx
+++ /dev/null
@@ -1,114 +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: common.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.
- *
- ************************************************************************/
-
-#include "sal/config.h"
-#include <cstdlib>
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/beans/XPropertyState.hpp"
-#include "com/sun/star/lang/XComponent.hpp"
-#include "com/sun/star/lang/XMultiComponentFactory.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/container/XNameReplace.hpp"
-#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "com/sun/star/util/XChangesBatch.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/component_context.hxx"
-#include "cppuhelper/servicefactory.hxx"
-#include "testshl/simpleheader.hxx"
-#include "osl/file.hxx"
-#include "osl/thread.h"
-#include "osl/process.h"
-#include "rtl/string.h"
-#include "rtl/bootstrap.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-
-namespace css = com::sun::star;
-
-#define CATCH_FAIL(msg) \
-    catch (const css::uno::Exception &e) { \
-        t_print ("msg '%s'\n", rtl::OUStringToOString (e.Message, RTL_TEXTENCODING_UTF8).getStr()); \
-        CPPUNIT_FAIL( msg ); \
-        throw; \
-    }
-
-class Magic
-{
-    rtl::OUString maTempDir;
-  public:
-    Magic();
-    ~Magic();
-};
-
-class Test: public CppUnit::TestFixture {
-    Magic *mpMagic;
-public:
-    // init
-    virtual void setUp();
-    virtual void tearDown();
-
-    // helpers
-    void normalizePathKey (rtl::OString &rPath, rtl::OString &rKey);
-    css::uno::Reference< css::uno::XInterface > createView(const sal_Char *pNodepath, bool bUpdate);
-    css::uno::Any getKey (const sal_Char *pPath, rtl::OUString aName);
-    css::uno::Any getKey (const sal_Char *pPath, const sal_Char *pName)
-        { return getKey (pPath, rtl::OUString::createFromAscii (pName)); }
-    void setKey (const sal_Char *pPath, rtl::OUString aName, css::uno::Any a);
-    void resetKey (const sal_Char *pPath, rtl::OUString aName);
-
-    // tests
-    void keyFetch();
-    void keySet();
-    void keyReset();
-    void readCommands();
-    void threadTests();
-    void recursiveTests();
-    void eventTests();
-
-    CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(keyFetch);
-    CPPUNIT_TEST(keySet);
-    CPPUNIT_TEST(keyReset);
-    CPPUNIT_TEST(readCommands);
-    CPPUNIT_TEST(threadTests);
-    CPPUNIT_TEST(recursiveTests);
-    CPPUNIT_TEST(eventTests);
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-    css::uno::Reference< css::uno::XComponentContext > mxContext;
-    css::uno::Reference< css::lang::XMultiServiceFactory > mxProvider;
-};
-
-void disposeComponent (const css::uno::Reference<css::uno::XInterface> &xComp);
diff --git a/configmgr/qa/unit/configmgrrc b/configmgr/qa/unit/configmgrrc
deleted file mode 100644
index b162e77c2e..0000000000
--- a/configmgr/qa/unit/configmgrrc
+++ /dev/null
@@ -1,22 +0,0 @@
-[Bootstrap]
-CFG_ServerType=uno
-BootstrapFile=$ORIGIN/bootstraprc
-VersionFile=$ORIGIN/versionrc
-UnoFile=$ORIGIN/unorc
-BaseInstallation=${$BootstrapFile:BaseInstallation}
-UserInstallation=${$BootstrapFile:UserInstallation}
-CFG_SchemaVersion=${$VersionFile:buildid}
-CFG_SchemaDataUrl=$BaseInstallation/schema
-CFG_DefaultLayerUrls=$BaseInstallation
-CFG_CacheDisposeDelay=900
-CFG_CacheDisposeInterval=60
-CFG_CacheWriteInterval=2
-CFG_UserLayerUrl=$UserInstallation
-CFG_CacheUrl=$BaseInstallation/cache
-CFG_DefaultLayerUrl=$BaseInstallation
-CFG_BackendService=com.sun.star.comp.configuration.backend.MultiStratumBackend
-CFG_SchemaSupplier=com.sun.star.comp.configuration.backend.LocalSchemaSupplier
-CFG_LocalDataSvc=com.sun.star.comp.configuration.backend.LocalStratum
-CFG_LocalModuleDataSvc=com.sun.star.comp.configuration.backend.LocalMultiStratum
-# CFG_Strata=${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UserLayerUrl
-CFG_Strata=${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalDataSvc}:$CFG_UserLayerUrl
diff --git a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu b/configmgr/qa/unit/data.xcd
index 512b759478..506a82928e 100644
--- a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu
+++ b/configmgr/qa/unit/data.xcd
@@ -1,34 +1,150 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: GenericCommands.xcu,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.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Setup" oor:package="org.openoffice" xml:lang="en-US">
+	<info>
+		<author>mmeeks</author>
+		<desc >Setup prefs (for configmgr) and unit test schema bits.</desc>
+	</info>
+	<component>
+		<group oor:name="L10N">
+			<info>
+				<author>PB</author>
+				<desc>Specifies the installation locales.</desc>
+			</info>
+			<prop oor:name="ooLocale" oor:type="xs:string">
+				<info>
+					<author>PB</author>
+					<desc>Indicates the Office language selected by the user.</desc>
+					<label>Locale</label>
+				</info>
+				<value/>
+			</prop>
+		</group>
+		<group oor:name="Test">
+			<info>
+				<author>mmeeks</author>
+				<desc>Misc test pieces</desc>
+			</info>
+			<prop oor:name="ABoolean" oor:type="xs:boolean">
+				<info>
+					<author>mmeeks</author>
+					<desc>A boolean</desc>
+					<label>Boolean</label>
+				</info>
+				<value>false</value>
+			</prop>
+			<prop oor:name="AString" oor:type="xs:string">
+				<info>
+					<author>mmeeks</author>
+					<desc>A string</desc>
+					<label>String</label>
+				</info>
+				<value>Foo</value>
+			</prop>
+		</group>
+	</component>
+</oor:component-schema>
+
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Commands" oor:package="org.openoffice.UI" xml:lang="en-US"> <info>
+		<author>CD</author>
+		<desc >Contains general information about ~ and rules, and about actions based on office commands.</desc>
+	</info>
+	<templates>
+        <group oor:name="LabelType">
+            <info>
+                <desc>Provides a mapping between commands and their textual representation on the user interface.</desc>
+            </info>
+            <prop oor:name="Label" oor:type="xs:string" oor:localized="true">
+                <info>
+                    <desc>A localized text that describes the command or identifier. Can be used as a label inside a menu or as short tool tip help.</desc>
+                </info>
+            </prop>
+            <prop oor:name="ContextLabel" oor:type="xs:string" oor:localized="true">
+                <info>
+                    <desc>A localized text that describes the identifier of a command in a structured menu.  </desc>
+                </info>
+            </prop>
+            <prop oor:name="Properties" oor:type="xs:int">
+                <info>
+                    <desc>
+                    Additional information about a single command.
+                    Bit 0 = Command has an image.
+                    Bit 1 = Image must be mirrored  (CTL/vertical text).
+                    Bit 2 = Image must be rotated (CTL/vertical text).
+                    </desc>
+                </info>
+                <value>0</value>
+            </prop>
+        </group>
+	</templates>
+	<component/>
+</oor:component-schema>
+
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="GenericCommands" oor:package="org.openoffice.UI" xml:lang="en-US">
+    <info>
+	<author>CD</author>
+	<desc >Contains general information about ~ and rules, and about actions based on office commands.</desc>
+    </info>
+    <import oor:component="org.openoffice.UI.Commands"/>
+    <uses oor:component="org.openoffice.UI.Commands"/>
+    <templates/>
+    <component>
+	<group oor:name="UserInterface">
+	    <info>
+		<desc>Contains user interface data for Office commands and identifiers that are used by the user interface."</desc>
+	    </info>
+	    <set oor:name="Commands" oor:node-type="LabelType" oor:component="org.openoffice.UI.Commands">
+		<info>
+		    <desc>Contains label text for Office commands and identifiers that are used by the user interface."</desc>
+		</info>
+	    </set>
+	</group>
+    </component>
+</oor:component-schema>
+
+<oor:component-data oor:name="Setup" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<node oor:name="L10N">
+		<prop oor:name="ooLocale" oor:type="xs:string">
+			<value>en-US</value>
+		</prop>
+	</node>
+	<node oor:name="Test">
+		<prop oor:name="ABoolean" oor:type="xs:boolean">
+			<value>true</value>
+		</prop>
+		<prop oor:name="AString" oor:type="xs:string">
+			<value>Foo</value>
+		</prop>
+	</node>
+</oor:component-data>
+
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="GenericCommands" oor:package="org.openoffice.UI">
   <node oor:name="UserInterface">
     <node oor:name="Commands">
@@ -5070,3 +5186,5 @@
     </node>
   </node>
 </oor:component-data>
+
+</oor:data>
diff --git a/configmgr/qa/unit/data/org/openoffice/Setup.xcu b/configmgr/qa/unit/data/org/openoffice/Setup.xcu
deleted file mode 100644
index 28ef05e707..0000000000
--- a/configmgr/qa/unit/data/org/openoffice/Setup.xcu
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Setup.xcu,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.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
-<oor:component-data oor:name="Setup" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <node oor:name="L10N">
-        <prop oor:name="ooLocale" oor:type="xs:string">
-            <value>en-US</value>
-        </prop>
-    </node>
-    <node oor:name="Test">
-        <prop oor:name="ABoolean" oor:type="xs:boolean">
-            <value>true</value>
-        </prop>
-        <prop oor:name="AString" oor:type="xs:string">
-            <value>Foo</value>
-        </prop>
-    </node>
-</oor:component-data>
diff --git a/configmgr/qa/unit/export.map b/configmgr/qa/unit/export.map
deleted file mode 100644
index 4ca70fa854..0000000000
--- a/configmgr/qa/unit/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3.0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index aededf799d..916c40ffed 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun 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
@@ -27,37 +23,69 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
+#***********************************************************************/
 
-PRJ := ..$/..
-PRJNAME := configmgr
-TARGET := qa_unit
+PRJ = ../..
+PRJNAME = configmgr
+TARGET = unit
 
-ENABLE_EXCEPTIONS := TRUE
+ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
-DLLPRE = # no leading "lib" on .so files
+SLOFILES = $(SLO)/test.obj
 
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
-SHL1VERSIONMAP = export.map
-SHL1IMPLIB = i$(SHL1TARGET)
+SHL1OBJS = $(SLOFILES)
+SHL1STDLIBS = \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(CPPUNITLIB) \
+    $(SALLIB) \
+    $(TESTSHL2LIB)
+SHL1TARGET = unit
+SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
 
-SLOFILES = $(SHL1OBJS)
-
 .INCLUDE: target.mk
 
-ALLTAR: test
+ALLTAR: TEST
+
+.IF "$(OS)" == "OS2" || "$(OS)" == "WNT"
+MY_INI = .ini
+.ELSE
+MY_INI = rc
+.ENDIF
 
-$(MISC)$/$(TARGET).rdb .ERRREMOVE:
-    $(COPY) $(SOLARBINDIR)$/types.rdb $@
-    $(REGCOMP) -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/configmgr2.uno$(DLLPOST))
-    $(REGCOMP) -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/sax.uno$(DLLPOST))
-    $(REGCOMP) -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/stocservices.uno$(DLLPOST))
-    $(REGCOMP) -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/streams.uno$(DLLPOST))
+$(MISC)/unit.rdb .ERRREMOVE:
+    cp $(SOLARBINDIR)/types.rdb $@
+    $(REGCOMP) -register -r $@ -c $(DLLDEST)/$(DLLPRE)configmgr$(DLLPOST)
 
-test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
-    $(AUGMENT_LIBRARY_PATH) testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET).rdb#$(PWD)$/$(MISC)$/$(TARGET).registry"
+TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit.rdb
+    rm -rf $(MISC)/unitdata
+    mkdir $(MISC)/unitdata
+    cp urebootstrap.ini $(MISC)/unitdata
+    mkdir $(MISC)/unitdata/basis
+    mkdir $(MISC)/unitdata/basis/program
+    echo '[Bootstrap]' > $(MISC)/unitdata/basis/program/uno$(MY_INI)
+    echo 'UNO_SHARED_PACKAGES_CACHE = $$OOO_BASE_DIR' \
+        >> $(MISC)/unitdata/basis/program/uno$(MY_INI)
+    echo 'UNO_USER_PACKAGES_CACHE =' \
+        '$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
+        >> $(MISC)/unitdata/basis/program/uno$(MY_INI)
+    mkdir $(MISC)/unitdata/basis/share
+    mkdir $(MISC)/unitdata/basis/share/registry
+    cp data.xcd $(MISC)/unitdata/basis/share/registry
+    mkdir $(MISC)/unitdata/brand
+    mkdir $(MISC)/unitdata/brand/program
+    echo '[Bootstrap]' > $(MISC)/unitdata/brand/program/bootstrap$(MY_INI)
+    echo 'UserInstallation = $$ORIGIN/../../user' \
+        >> $(MISC)/unitdata/brand/program/bootstrap$(MY_INI)
+.IF "$(USE_SHELL)" == "bash"
+    export \
+        URE_BOOTSTRAP=vnd.sun.star.pathname:$(MISC)/unitdata/urebootstrap.ini \
+        && $(TESTSHL2) $(SHL1TARGETN) -forward $(MISC)/unit.rdb
+.ELSE
+    setenv \
+        URE_BOOTSTRAP vnd.sun.star.pathname:$(MISC)/unitdata/urebootstrap.ini \
+        && $(TESTSHL2) $(SHL1TARGETN) -forward $(MISC)/unit.rdb
+.ENDIF
diff --git a/connectivity/util/delzip b/configmgr/qa/unit/no_localization
index e69de29bb2..e69de29bb2 100755..100644
--- a/connectivity/util/delzip
+++ b/configmgr/qa/unit/no_localization
diff --git a/configmgr/qa/unit/performance.cxx b/configmgr/qa/unit/performance.cxx
deleted file mode 100644
index 7a3e0475a4..0000000000
--- a/configmgr/qa/unit/performance.cxx
+++ /dev/null
@@ -1,271 +0,0 @@
-// To debug me use:
-// $ export ENVCFGFLAGS='-me -ti -tw -tp -td'
-
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: performance.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 "common.hxx"
-
-void Test::setUp()
-{
-    mpMagic = new Magic();
-
-    char const * f = getForwardString();
-    rtl::OUString args(
-        f, rtl_str_getLength(f), osl_getThreadTextEncoding());
-        //TODO: handle conversion failure
-    sal_Int32 i = args.indexOf('#');
-    if (i < 0)
-        std::abort();
-
-    rtl::OUString rdb(args.copy(0, i));
-    rtl::OUString regpath(args.copy(i + 1));
-    rtl::OUString regurl;
-    if (osl::FileBase::getFileURLFromSystemPath(regpath, regurl) !=
-        osl::FileBase::E_None)
-        std::abort();
-
-    css::uno::Reference< css::beans::XPropertySet > factory(
-        cppu::createRegistryServiceFactory(rdb), css::uno::UNO_QUERY_THROW);
-    css::uno::Reference< css::uno::XComponentContext > context(
-        factory->getPropertyValue(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))),
-        css::uno::UNO_QUERY_THROW);
-    cppu::ContextEntry_Init entry(
-        rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "/modules/com.sun.star.configuration/bootstrap/Strata")),
-        css::uno::makeAny(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.comp.configuration.backend.LocalStratum:"))
-            + regurl));
-    mxContext = cppu::createComponentContext(&entry, 1, context);
-
-    CPPUNIT_ASSERT_MESSAGE ("component context is valid", mxContext.is());
-
-    try {
-        mxProvider = css::uno::Reference< css::lang::XMultiServiceFactory >(
-            (css::uno::Reference< css::lang::XMultiComponentFactory >(
-                mxContext->getServiceManager(), css::uno::UNO_QUERY_THROW)->
-             createInstanceWithContext(
-                 rtl::OUString(
-                     RTL_CONSTASCII_USTRINGPARAM(
-                         "com.sun.star.configuration.ConfigurationProvider")),
-                 mxContext)),
-            css::uno::UNO_QUERY_THROW);
-        
-    } catch (css::uno::Exception&e) {
-        CPPUNIT_FAIL( "exception creating provider" );
-        throw;
-    }
-}
-
-css::uno::Reference< css::uno::XInterface >
-Test::createView(const sal_Char *pNodepath, bool bUpdate)
-{
-    rtl::OUString aNodePath = rtl::OUString::createFromAscii(pNodepath);
-    static const rtl::OUString kInfoViewService( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")) ;
-    static const rtl::OUString kUpdateViewService( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")) ;
-    static const rtl::OUString kNodepath(RTL_CONSTASCII_USTRINGPARAM("nodepath")) ;
-    static const rtl::OUString kAsync(RTL_CONSTASCII_USTRINGPARAM("EnableAsync")) ;
-    
-    const rtl::OUString & kViewService = bUpdate ? kUpdateViewService : kInfoViewService;
-    css::uno::Sequence< css::uno::Any > aViewArgs(2);
-    aViewArgs[0] <<= css::beans::NamedValue( kNodepath, css::uno::makeAny(aNodePath) );
-    aViewArgs[1] <<= css::beans::NamedValue( kAsync, css::uno::makeAny(sal_False) );
-
-    css::uno::Reference< css::uno::XInterface > xView(
-        mxProvider->createInstanceWithArguments( kViewService, aViewArgs ) );
-    return xView;
-}
-
-void disposeComponent (const css::uno::Reference<css::uno::XInterface> &xComp)
-{
-    css::uno::Reference< css::lang::XComponent >(
-        xComp, css::uno::UNO_QUERY_THROW)->dispose();
-}
-
-void Test::tearDown()
-{
-    disposeComponent (mxProvider);
-    disposeComponent (mxContext);
-
-    delete mpMagic;
-}
-
-void Test::normalizePathKey (rtl::OString &rPath, rtl::OString &rKey)
-{
-    sal_Int32 idx = rKey.lastIndexOf("/");
-    if (idx > 0) {
-        rPath += "/";
-        rPath += rKey.copy (0, idx);
-        rKey = rKey.copy (idx + 1);
-//        t_print ("write to '%s' '%s'\n", (const sal_Char *)rPath,
-//                 (const sal_Char *)rKey);
-    }
-}
-
-css::uno::Any Test::getKey (const sal_Char *pPath, rtl::OUString aName)
-{
-    css::uno::Reference< css::container::XHierarchicalNameAccess > xNameAccess( 
-        createView(pPath, false), css::uno::UNO_QUERY_THROW);
-    css::uno::Any aVal;
-    aVal = xNameAccess->getByHierarchicalName (aName);
-    disposeComponent (xNameAccess);
-    return aVal;
-}
-
-void Test::setKey (const sal_Char *pPath, rtl::OUString aName, css::uno::Any a)
-{
-    css::uno::Reference< css::util::XChangesBatch > xAppView;
-    
-    xAppView = css::uno::Reference< css::util::XChangesBatch > (
-        createView(pPath, true), css::uno::UNO_QUERY_THROW );
-    css::uno::Reference< css::container::XNameReplace > xSettings(xAppView, css::uno::UNO_QUERY_THROW);
-    rtl::OUString aStr;
-    
-    // set key
-    xSettings->replaceByName(aName, a);
-    xAppView->commitChanges();
-    
-    disposeComponent(xAppView);
-}
-
-void Test::resetKey (const sal_Char *pPath, rtl::OUString aName)
-{
-    css::uno::Reference< css::util::XChangesBatch > xAppView;
-
-    // reset to default
-    xAppView = css::uno::Reference< css::util::XChangesBatch > ( createView(pPath, true), css::uno::UNO_QUERY_THROW );
-    css::uno::Reference< css::container::XNameReplace > xSettings(xAppView, css::uno::UNO_QUERY_THROW);
-    
-    css::uno::Reference< css::beans::XPropertyState > xSettingsState(xSettings, css::uno::UNO_QUERY);
-    xSettingsState->setPropertyToDefault(aName);
-    xAppView->commitChanges();
-    
-    disposeComponent(xAppView);
-}
-
-void Test::keyFetch()
-{
-    try {
-        rtl::OUString aStr;
-        if (!(getKey ("/org.openoffice.Setup", "L10N/ooLocale") >>= aStr))
-            CPPUNIT_FAIL("to fetch key");
-        if (!(getKey ("/org.openoffice.Setup", "Test/AString") >>= aStr))
-            CPPUNIT_FAIL("to fetch key");
-    } CATCH_FAIL ("fetching key")
-}
-
-void Test::keySet()
-{
-    try {
-        setKey ("/org.openoffice.Setup/Test",
-                rtl::OUString::createFromAscii("AString"),
-                css::uno::makeAny (rtl::OUString::createFromAscii("baa")));
-
-        // check value
-        rtl::OUString aStr;
-        if (!(getKey ("/org.openoffice.Setup/Test", "AString") >>= aStr))
-            CPPUNIT_FAIL("to fetch key");
-        
-        CPPUNIT_ASSERT_MESSAGE ("check set value valid", aStr.equalsAscii("baa"));
-    } CATCH_FAIL ("exception setting keys" )
-}
-
-void Test::keyReset()
-{
-    try {
-        resetKey ("/org.openoffice.Setup/Test",
-                  rtl::OUString::createFromAscii("AString"));
-
-        // check value
-        rtl::OUString aStr;
-        if (!(getKey ("/org.openoffice.Setup/Test", "AString") >>= aStr))
-            CPPUNIT_FAIL("to fetch key");
-        
-        CPPUNIT_ASSERT_MESSAGE ("check default value valid",
-                                aStr == rtl::OUString::createFromAscii("Foo"));
-    } CATCH_FAIL ("exception setting keys" )
-}
-
-// This simulates the framework UI description code paths
-void Test::readCommands()
-{
-    rtl::OUString aPropUILabel( RTL_CONSTASCII_USTRINGPARAM( "Label" ));
-    rtl::OUString aPropUIContextLabel( RTL_CONSTASCII_USTRINGPARAM( "ContextLabel" ));
-    rtl::OUString aPropProperties( RTL_CONSTASCII_USTRINGPARAM( "Properties" ));
-
-    try {
-        css::uno::Reference< css::container::XNameAccess > xNameAccess ( 
-            createView("/org.openoffice.UI.GenericCommands/UserInterface/Commands", false),
-            css::uno::UNO_QUERY_THROW);
-        
-        CPPUNIT_ASSERT_MESSAGE ("fetched UI generic commands", xNameAccess.is());
-        
-        css::uno::Any a;
-        css::uno::Sequence< rtl::OUString > aNameSeq = xNameAccess->getElementNames();
-
-        CPPUNIT_ASSERT_MESSAGE ("right element / sequence", aNameSeq.getLength() == 696);
-        sal_uInt32 end, start = osl_getGlobalTimer();
-        for ( sal_Int32 j = 0; j < 8; j++ )
-        {
-            for ( sal_Int32 i = 0; i < aNameSeq.getLength(); i++ )
-            {
-                try
-                {
-                    {
-                        css::uno::Reference< css::container::XNameAccess > xChildNameAccess;
-                        // This is the slow bit ! ...
-                        // Creating the @#$@#$ing XNameAccess object [ 650 times ]
-                        // which we then use to 'getByName' etc.
-                        a = xNameAccess->getByName( aNameSeq[i] );
-                        if ( a >>= xChildNameAccess )
-                        {
-                            a = xChildNameAccess->getByName( aPropUILabel );
-                            a = xChildNameAccess->getByName( aPropUIContextLabel );
-                            a = xChildNameAccess->getByName( aPropProperties );
-                        }
-                    }
-                } CATCH_FAIL( "fetching keys" );
-            }
-        }
-        end = osl_getGlobalTimer();
-        t_print ("Reading elements took %d ms\n", (int)(end-start));
-        disposeComponent (xNameAccess);
-    } CATCH_FAIL( "accessing commands" );
-}
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
-
-NOADDITIONAL;
diff --git a/configmgr/qa/unit/schema/org/openoffice/Setup.xcs b/configmgr/qa/unit/schema/org/openoffice/Setup.xcs
deleted file mode 100644
index f126025b88..0000000000
--- a/configmgr/qa/unit/schema/org/openoffice/Setup.xcs
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Setup.xcs,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.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Setup" oor:package="org.openoffice" xml:lang="en-US">
-	<info>
-		<author>mmeeks</author>
-		<desc >Setup prefs (for configmgr) and unit test schema bits.</desc>
-	</info>
-	<component>
-		<group oor:name="L10N">
-			<info>
-				<author>PB</author>
-				<desc>Specifies the installation locales.</desc>
-			</info>
-			<prop oor:name="ooLocale" oor:type="xs:string">
-				<info>
-					<author>PB</author>
-					<desc>Indicates the Office language selected by the user.</desc>
-					<label>Locale</label>
-				</info>
-				<value/>
-			</prop>
-		</group>
-		<group oor:name="Test">
-			<info>
-				<author>mmeeks</author>
-				<desc>Misc test pieces</desc>
-			</info>
-			<prop oor:name="ABoolean" oor:type="xs:boolean">
-				<info>
-					<author>mmeeks</author>
-					<desc>A boolean</desc>
-					<label>Boolean</label>
-				</info>
-				<value>false</value>
-			</prop>
-			<prop oor:name="AString" oor:type="xs:string">
-				<info>
-					<author>mmeeks</author>
-					<desc>A string</desc>
-					<label>String</label>
-				</info>
-				<value>Foo</value>
-			</prop>
-		</group>
-	</component>
-</oor:component-schema>
diff --git a/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs b/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs
deleted file mode 100644
index b4f1d66758..0000000000
--- a/configmgr/qa/unit/schema/org/openoffice/UI/Commands.xcs
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Commands.xcs,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.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Commands" oor:package="org.openoffice.UI" xml:lang="en-US"> <info>
-		<author>CD</author>
-		<desc >Contains general information about ~ and rules, and about actions based on office commands.</desc>
-	</info>
-	<templates>
-        <group oor:name="LabelType">
-            <info>
-                <desc>Provides a mapping between commands and their textual representation on the user interface.</desc>
-            </info>
-            <prop oor:name="Label" oor:type="xs:string" oor:localized="true">
-                <info>
-                    <desc>A localized text that describes the command or identifier. Can be used as a label inside a menu or as short tool tip help.</desc>
-                </info>
-            </prop>
-            <prop oor:name="ContextLabel" oor:type="xs:string" oor:localized="true">
-                <info>
-                    <desc>A localized text that describes the identifier of a command in a structured menu.  </desc>
-                </info>
-            </prop>
-            <prop oor:name="Properties" oor:type="xs:int">
-                <info>
-                    <desc>
-                    Additional information about a single command.
-                    Bit 0 = Command has an image.
-                    Bit 1 = Image must be mirrored  (CTL/vertical text).
-                    Bit 2 = Image must be rotated (CTL/vertical text).
-                    </desc>
-                </info>
-                <value>0</value>
-            </prop>
-        </group>
-	</templates>
-	<component/>
-</oor:component-schema>
diff --git a/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs b/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs
deleted file mode 100644
index 39edfdce8f..0000000000
--- a/configmgr/qa/unit/schema/org/openoffice/UI/GenericCommands.xcs
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: GenericCommands.xcs,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.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="GenericCommands" oor:package="org.openoffice.UI" xml:lang="en-US">
-    <info>
-	<author>CD</author>
-	<desc >Contains general information about ~ and rules, and about actions based on office commands.</desc>
-    </info>
-    <import oor:component="org.openoffice.UI.Commands"/>
-    <uses oor:component="org.openoffice.UI.Commands"/>
-    <templates/>
-    <component>
-	<group oor:name="UserInterface">
-	    <info>
-		<desc>Contains user interface data for Office commands and identifiers that are used by the user interface."</desc>
-	    </info>
-	    <set oor:name="Commands" oor:node-type="LabelType" oor:component="org.openoffice.UI.Commands">
-		<info>
-		    <desc>Contains label text for Office commands and identifiers that are used by the user interface."</desc>
-		</info>
-	    </set>
-	</group>
-    </component>
-</oor:component-schema>
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
new file mode 100644
index 0000000000..8e5e873103
--- /dev/null
+++ b/configmgr/qa/unit/test.cxx
@@ -0,0 +1,678 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <cstddef>
+
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "osl/conditn.hxx"
+#include "osl/thread.h"
+#include "osl/thread.hxx"
+#include "osl/time.h"
+#include "rtl/ref.hxx"
+#include "rtl/string.h"
+#include "rtl/textcvt.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "testshl/simpleheader.hxx"
+
+namespace {
+
+namespace css = com::sun::star;
+
+void normalize(
+    rtl::OUString const & path, rtl::OUString const & relative,
+    rtl::OUString * normalizedPath, rtl::OUString * name)
+{
+    sal_Int32 i = relative.lastIndexOf('/');
+    if (i == -1) {
+        *normalizedPath = path;
+        *name = relative;
+    } else {
+        rtl::OUStringBuffer buf(path);
+        buf.append(sal_Unicode('/'));
+        buf.append(relative.copy(0, i));
+        *normalizedPath = buf.makeStringAndClear();
+        *name = relative.copy(i + 1);
+    }
+}
+
+class Test: public CppUnit::TestFixture {
+public:
+    virtual void setUp();
+
+    virtual void tearDown();
+
+    void testKeyFetch();
+
+    void testKeySet();
+
+    void testKeyReset();
+
+    void testSetSetMemberName();
+
+    void testReadCommands();
+
+    void testThreads();
+
+    void testRecursive();
+
+    void testCrossThreads();
+
+    css::uno::Any getKey(
+        rtl::OUString const & path, rtl::OUString const & relative) const;
+
+    void setKey(
+        rtl::OUString const & path, rtl::OUString const & name,
+        css::uno::Any const & value) const;
+
+    bool resetKey(rtl::OUString const & path, rtl::OUString const & name) const;
+
+    css::uno::Reference< css::uno::XInterface > createViewAccess(
+        rtl::OUString const & path) const;
+
+    css::uno::Reference< css::uno::XInterface > createUpdateAccess(
+        rtl::OUString const & path) const;
+
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(testKeyFetch);
+    CPPUNIT_TEST(testKeySet);
+    CPPUNIT_TEST(testKeyReset);
+    CPPUNIT_TEST(testSetSetMemberName);
+    CPPUNIT_TEST(testReadCommands);
+    CPPUNIT_TEST(testThreads);
+    CPPUNIT_TEST(testRecursive);
+    CPPUNIT_TEST(testCrossThreads);
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    css::uno::Reference< css::uno::XComponentContext > context_;
+    css::uno::Reference< css::lang::XMultiServiceFactory > provider_;
+};
+
+class TestThread: public osl::Thread {
+public:
+    TestThread(osl::Condition & stop);
+
+    bool getSuccess() const;
+
+protected:
+    virtual bool iteration() = 0;
+
+private:
+    virtual void SAL_CALL run();
+
+    osl::Condition & stop_;
+    bool success_;
+};
+
+TestThread::TestThread(
+    osl::Condition & stop):
+    stop_(stop), success_(true)
+{}
+
+bool TestThread::getSuccess() const {
+    return success_;
+}
+
+void TestThread::run() {
+    try {
+        while (!stop_.check()) {
+            if (!iteration()) {
+                success_ = false;
+            }
+        }
+    } catch (...) {
+        success_ = false;
+    }
+}
+
+class ReaderThread: public TestThread {
+public:
+    ReaderThread(
+        osl::Condition & stop, Test const & test, rtl::OUString const & path,
+        rtl::OUString const & relative);
+
+private:
+    virtual bool iteration();
+
+    Test const & test_;
+    rtl::OUString path_;
+    rtl::OUString relative_;
+};
+
+ReaderThread::ReaderThread(
+    osl::Condition & stop, Test const & test, rtl::OUString const & path,
+    rtl::OUString const & relative):
+    TestThread(stop), test_(test), path_(path), relative_(relative)
+{
+    create();
+}
+
+bool ReaderThread::iteration() {
+    return test_.getKey(path_, relative_).hasValue();
+}
+
+class WriterThread: public TestThread {
+public:
+    WriterThread(
+        osl::Condition & stop, Test const & test, rtl::OUString const & path,
+        rtl::OUString const & relative);
+
+private:
+    virtual bool iteration();
+
+    Test const & test_;
+    rtl::OUString path_;
+    rtl::OUString name_;
+    std::size_t index_;
+};
+
+WriterThread::WriterThread(
+    osl::Condition & stop, Test const & test, rtl::OUString const & path,
+    rtl::OUString const & relative):
+    TestThread(stop), test_(test), index_(0)
+{
+    normalize(path, relative, &path_, &name_);
+    create();
+}
+
+bool WriterThread::iteration() {
+    rtl::OUString options[] = {
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fish")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("chips")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("kippers")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bloaters")) };
+    test_.setKey(path_, name_, css::uno::makeAny(options[index_]));
+    index_ = (index_ + 1) % (sizeof options / sizeof (rtl::OUString));
+    return true;
+}
+
+class RecursiveTest:
+    public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >
+{
+public:
+    RecursiveTest(Test const & theTest, int count, bool * destroyed);
+
+    void test();
+
+protected:
+    virtual ~RecursiveTest();
+
+    virtual void step() const = 0;
+
+    Test const & test_;
+
+private:
+    virtual void SAL_CALL disposing(css::lang::EventObject const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL propertyChange(
+        css::beans::PropertyChangeEvent const &)
+        throw (css::uno::RuntimeException);
+
+    int count_;
+    bool * destroyed_;
+    css::uno::Reference< css::beans::XPropertySet > properties_;
+};
+
+RecursiveTest::RecursiveTest(
+    Test const & theTest, int count, bool * destroyed):
+    test_(theTest), count_(count), destroyed_(destroyed)
+{}
+
+void RecursiveTest::test() {
+    properties_ = css::uno::Reference< css::beans::XPropertySet >(
+        test_.createUpdateAccess(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                    "dotuno:WebHtml"))),
+        css::uno::UNO_QUERY_THROW);
+    properties_->addPropertyChangeListener(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), this);
+    step();
+    CPPUNIT_ASSERT(count_ == 0);
+    css::uno::Reference< css::lang::XComponent >(
+        properties_, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+RecursiveTest::~RecursiveTest() {
+    *destroyed_ = true;
+}
+
+void RecursiveTest::disposing(css::lang::EventObject const & Source)
+    throw (css::uno::RuntimeException)
+{
+    CPPUNIT_ASSERT(properties_.is() && Source.Source == properties_);
+    properties_.clear();
+}
+
+void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt)
+    throw (css::uno::RuntimeException)
+{
+    CPPUNIT_ASSERT(
+        evt.Source == properties_ &&
+        evt.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Label")));
+    if (count_ > 0) {
+        --count_;
+        step();
+    }
+}
+
+class SimpleRecursiveTest: public RecursiveTest {
+public:
+    SimpleRecursiveTest(Test const & theTest, int count, bool * destroyed);
+
+private:
+    virtual void step() const;
+};
+
+SimpleRecursiveTest::SimpleRecursiveTest(
+    Test const & theTest, int count, bool * destroyed):
+    RecursiveTest(theTest, count, destroyed)
+{}
+
+void SimpleRecursiveTest::step() const {
+    test_.setKey(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                "dotuno:WebHtml")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
+        css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("step"))));
+}
+
+class CrossThreadTest: public RecursiveTest {
+public:
+    CrossThreadTest(Test const & theTest, int count, bool * destroyed);
+
+private:
+    virtual void step() const;
+};
+
+CrossThreadTest::CrossThreadTest(
+    Test const & theTest, int count, bool * destroyed):
+    RecursiveTest(theTest, count, destroyed)
+{}
+
+void CrossThreadTest::step() const {
+    osl::Condition stop;
+    stop.set();
+    WriterThread(
+        stop, test_,
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                "dotuno:WebHtml")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))).join();
+    test_.resetKey(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                "dotuno:WebHtml")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")));
+}
+
+void Test::setUp() {
+    char const * forward = getForwardString();
+    rtl_uString * registry = 0;
+    CPPUNIT_ASSERT(
+        rtl_convertStringToUString(
+            &registry, forward, rtl_str_getLength(forward),
+            osl_getThreadTextEncoding(),
+            (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
+             RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
+             RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)));
+    context_ = css::uno::Reference< css::uno::XComponentContext >(
+        css::uno::Reference< css::beans::XPropertySet >(
+            cppu::createRegistryServiceFactory(
+                rtl::OUString(registry, SAL_NO_ACQUIRE)),
+            css::uno::UNO_QUERY_THROW)->getPropertyValue(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))),
+        css::uno::UNO_QUERY_THROW);
+    CPPUNIT_ASSERT(
+        context_->getValueByName(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "/singletons/"
+                    "com.sun.star.configuration.theDefaultProvider"))) >>=
+        provider_);
+}
+
+void Test::tearDown() {
+    css::uno::Reference< css::lang::XComponent >(
+        context_, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+void Test::testKeyFetch() {
+    rtl::OUString s;
+    CPPUNIT_ASSERT(
+        getKey(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale"))) >>=
+        s);
+    CPPUNIT_ASSERT(
+        getKey(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString"))) >>=
+        s);
+}
+
+void Test::testKeySet() {
+    setKey(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString")),
+        css::uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("baa"))));
+    rtl::OUString s;
+    CPPUNIT_ASSERT(
+        getKey(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
+        s);
+    CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("baa")));
+}
+
+void Test::testKeyReset() {
+    if (resetKey(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))))
+    {
+        rtl::OUString s;
+        CPPUNIT_ASSERT(
+            getKey(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Test")),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AString"))) >>=
+            s);
+        CPPUNIT_ASSERT(s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Foo")));
+    }
+}
+
+void Test::testSetSetMemberName() {
+    rtl::OUString s;
+    CPPUNIT_ASSERT(
+        getKey(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                    ".uno:FontworkShapeType")),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
+        s);
+    CPPUNIT_ASSERT(
+        s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Shape")));
+
+    css::uno::Reference< css::container::XNameAccess > access(
+        createUpdateAccess(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "/org.openoffice.UI.GenericCommands/UserInterface/"
+                    "Commands"))),
+        css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::container::XNamed > member;
+    access->getByName(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(".uno:FontworkGalleryFloater"))) >>=
+        member;
+    CPPUNIT_ASSERT(member.is());
+    member->setName(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(".uno:FontworkShapeType")));
+    css::uno::Reference< css::util::XChangesBatch >(
+        access, css::uno::UNO_QUERY_THROW)->commitChanges();
+    css::uno::Reference< css::lang::XComponent >(
+        access, css::uno::UNO_QUERY_THROW)->dispose();
+
+    CPPUNIT_ASSERT(
+        getKey(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                    ".uno:FontworkShapeType")),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label"))) >>=
+        s);
+    CPPUNIT_ASSERT(
+        s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Fontwork Gallery")));
+}
+
+void Test::testReadCommands() {
+    css::uno::Reference< css::container::XNameAccess > access(
+        createViewAccess(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "/org.openoffice.UI.GenericCommands/UserInterface/"
+                    "Commands"))),
+        css::uno::UNO_QUERY_THROW);
+    css::uno::Sequence< rtl::OUString > names(access->getElementNames());
+    CPPUNIT_ASSERT(names.getLength() == 695);
+        // testSetSetMemberName() already removed ".uno:FontworkGalleryFloater"
+    sal_uInt32 n = osl_getGlobalTimer();
+    for (int i = 0; i < 8; ++i) {
+        for (sal_Int32 j = 0; j < names.getLength(); ++j) {
+            css::uno::Reference< css::container::XNameAccess > child;
+            if (access->getByName(names[j]) >>= child) {
+                CPPUNIT_ASSERT(child.is());
+                child->getByName(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")));
+                child->getByName(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContextLabel")));
+                child->getByName(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Properties")));
+            }
+        }
+    }
+    n = osl_getGlobalTimer() - n;
+    t_print("Reading elements took %" SAL_PRIuUINT32 " ms\n", n);
+    css::uno::Reference< css::lang::XComponent >(
+        access, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+void Test::testThreads() {
+    struct Entry { rtl::OUString path; rtl::OUString relative; };
+    Entry list[] = {
+        { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
+          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString")) },
+        { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
+          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/AString")) },
+        { rtl::OUString(
+              RTL_CONSTASCII_USTRINGPARAM(
+                  "/org.openoffice.UI.GenericCommands")),
+          rtl::OUString(
+              RTL_CONSTASCII_USTRINGPARAM(
+                  "UserInterface/Commands/dotuno:WebHtml/Label")) },
+        { rtl::OUString(
+              RTL_CONSTASCII_USTRINGPARAM(
+                  "/org.openoffice.UI.GenericCommands")),
+          rtl::OUString(
+              RTL_CONSTASCII_USTRINGPARAM(
+                  "UserInterface/Commands/dotuno:NewPresentation/Label")) },
+        { rtl::OUString(
+              RTL_CONSTASCII_USTRINGPARAM(
+                  "/org.openoffice.UI.GenericCommands")),
+          rtl::OUString(
+              RTL_CONSTASCII_USTRINGPARAM(
+                  "UserInterface/Commands/dotuno:RecentFileList/Label")) },
+        { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
+          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")) },
+        { rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")),
+          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Test/ABoolean")) }
+    };
+    std::size_t const numReaders = sizeof list / sizeof (Entry);
+    std::size_t const numWriters = numReaders - 2;
+    ReaderThread * readers[numReaders];
+    WriterThread * writers[numWriters];
+    osl::Condition stop;
+    for (std::size_t i = 0; i < numReaders; ++i) {
+        CPPUNIT_ASSERT(getKey(list[i].path, list[i].relative).hasValue());
+        readers[i] = new ReaderThread(
+            stop, *this, list[i].path, list[i].relative);
+    }
+    for (std::size_t i = 0; i < numWriters; ++i) {
+        writers[i] = new WriterThread(
+            stop, *this, list[i].path, list[i].relative);
+    }
+    for (int i = 0; i < 5; ++i) {
+        for (std::size_t j = 0; j < numReaders; ++j) {
+            rtl::OUString path;
+            rtl::OUString name;
+            normalize(list[j].path, list[j].relative, &path, &name);
+            resetKey(path, name);
+            osl::Thread::yield();
+        }
+    }
+    stop.set();
+    bool success = true;
+    for (std::size_t i = 0; i < numReaders; ++i) {
+        readers[i]->join();
+        success = success && readers[i]->getSuccess();
+        delete readers[i];
+    }
+    for (std::size_t i = 0; i < numWriters; ++i) {
+        writers[i]->join();
+        success = success && writers[i]->getSuccess();
+        delete writers[i];
+    }
+    CPPUNIT_ASSERT(success);
+}
+
+void Test::testRecursive() {
+    bool destroyed = false;
+    rtl::Reference< RecursiveTest >(
+        new SimpleRecursiveTest(*this, 100, &destroyed))->test();
+    CPPUNIT_ASSERT(destroyed);
+}
+
+void Test::testCrossThreads() {
+    bool destroyed = false;
+    rtl::Reference< RecursiveTest >(
+        new SimpleRecursiveTest(*this, 10, &destroyed))->test();
+    CPPUNIT_ASSERT(destroyed);
+}
+
+css::uno::Any Test::getKey(
+    rtl::OUString const & path, rtl::OUString const & relative) const
+{
+    css::uno::Reference< css::container::XHierarchicalNameAccess > access(
+        createViewAccess(path), css::uno::UNO_QUERY_THROW);
+    css::uno::Any value(access->getByHierarchicalName(relative));
+    css::uno::Reference< css::lang::XComponent >(
+        access, css::uno::UNO_QUERY_THROW)->dispose();
+    return value;
+}
+
+void Test::setKey(
+    rtl::OUString const & path, rtl::OUString const & name,
+    css::uno::Any const & value) const
+{
+    css::uno::Reference< css::container::XNameReplace > access(
+        createUpdateAccess(path), css::uno::UNO_QUERY_THROW);
+    access->replaceByName(name, value);
+    css::uno::Reference< css::util::XChangesBatch >(
+        access, css::uno::UNO_QUERY_THROW)->commitChanges();
+    css::uno::Reference< css::lang::XComponent >(
+        access, css::uno::UNO_QUERY_THROW)->dispose();
+}
+
+bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name)
+    const
+{
+    //TODO: support setPropertyToDefault
+    css::uno::Reference< css::util::XChangesBatch > access(
+        createUpdateAccess(path), css::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::beans::XPropertyState > state(
+        access, css::uno::UNO_QUERY);
+    if (!state.is()) {
+        return false;
+    }
+    state->setPropertyToDefault(name);
+    access->commitChanges();
+    css::uno::Reference< css::lang::XComponent >(
+        access, css::uno::UNO_QUERY_THROW)->dispose();
+    return true;
+}
+
+css::uno::Reference< css::uno::XInterface > Test::createViewAccess(
+    rtl::OUString const & path) const
+{
+    css::uno::Any arg(
+        css::uno::makeAny(
+            css::beans::NamedValue(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+                css::uno::makeAny(path))));
+    return provider_->createInstanceWithArguments(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationAccess")),
+        css::uno::Sequence< css::uno::Any >(&arg, 1));
+}
+
+css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess(
+    rtl::OUString const & path) const
+{
+    css::uno::Any arg(
+        css::uno::makeAny(
+            css::beans::NamedValue(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+                css::uno::makeAny(path))));
+    return provider_->createInstanceWithArguments(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationUpdateAccess")),
+        css::uno::Sequence< css::uno::Any >(&arg, 1));
+}
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltest");
+
+}
+
+NOADDITIONAL;
diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx
deleted file mode 100644
index 68baee1c68..0000000000
--- a/configmgr/qa/unit/threading.cxx
+++ /dev/null
@@ -1,262 +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: threading.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 "common.hxx"
-#include <osl/thread.hxx>
-#include <osl/conditn.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include "com/sun/star/beans/XPropertyChangeListener.hpp"
-
-class KeyTester : public osl::Thread
-{
-    osl::Condition *m_pCond;
-  protected:
-    rtl::OString    m_aPath;
-    rtl::OString    m_aKey;
-    Test           *m_pTest;
-  public:
-    KeyTester (osl::Condition *pCond, Test *pTest,
-               const char *pPath, const char *pKey)
-        : m_pCond (pCond)
-        , m_aPath (pPath)
-        , m_aKey (pKey)
-        , m_pTest (pTest)
-    {
-    }
-    virtual ~KeyTester ()
-    {
-    }
-    virtual void SAL_CALL run ()
-    {
-        testIteration();
-        while (!m_pCond->check())
-            testIteration();
-    }
-    virtual void testIteration()
-    {
-        css::uno::Any a = m_pTest->getKey (m_aPath, m_aKey);
-        CPPUNIT_ASSERT_MESSAGE ("no value", a.hasValue());
-    }
-};
-
-class KeyReader : public KeyTester
-{
-public:
-    KeyReader (osl::Condition *pCond, Test *pTest,
-               const char *pPath, const char *pKey)
-        : KeyTester (pCond, pTest, pPath, pKey)
-    {
-        // to ensure we have the right vtable when we hit 'run'
-        create();
-    }
-};
-
-class KeyWriter : public KeyTester
-{
-    int curOpt;
-  public:
-    KeyWriter (osl::Condition *pCond, Test *pTest,
-               const char *pPath, const char *pKey)
-        : KeyTester (pCond, pTest, pPath, pKey)
-        , curOpt(0)
-    {
-        m_pTest->normalizePathKey (m_aPath, m_aKey);
-        create();
-    }
-    virtual void testIteration ()
-    {
-        try {
-            static const char *options[] = { "fish", "chips", "kippers", "bloaters" };
-//            fprintf (stderr, "set key %d\n",
-//                     (int) osl_getThreadIdentifier(NULL));
-            m_pTest->setKey (m_aPath, rtl::OUString::createFromAscii (m_aKey),
-                             css::uno::makeAny (rtl::OUString::createFromAscii(options[(curOpt++ & 3)])));
-        } CATCH_FAIL ("setting keys")
-    }
-};
-
-void Test::threadTests()
-{
-    osl::Condition stop;
-    stop.reset();
-
-    struct {
-        const char *pPath;
-        const char *pKey;
-    } keyList[] = {
-        { "/org.openoffice.Setup", "Test/AString" },
-        { "/org.openoffice.Setup", "Test/AString" },
-        { "/org.openoffice.UI.GenericCommands", "UserInterface/Commands/dotuno:WebHtml/Label" },
-        { "/org.openoffice.UI.GenericCommands", "UserInterface/Commands/dotuno:NewPresentation/Label" },
-        { "/org.openoffice.UI.GenericCommands", "UserInterface/Commands/dotuno:RecentFileList/Label" },
-
-        { "/org.openoffice.Setup", "L10N/ooLocale" },
-        { "/org.openoffice.Setup", "Test/ABoolean" }
-    };
-    const int numReaders = sizeof (keyList) / sizeof (keyList[0]);
-    const int numWriters = (sizeof (keyList) / sizeof (keyList[0])) - 2;
-    KeyReader *pReaders[numReaders];
-    KeyWriter *pWriters[numReaders];
-
-    int i;
-    try {
-        for (i = 0; i < numReaders; i++) {
-            css::uno::Any a = getKey (keyList[i].pPath, keyList[i].pKey);
-            CPPUNIT_ASSERT_MESSAGE ("check key", a.hasValue());
-        }
-
-        // a few readers
-        for (i = 0; i < numReaders; i++)
-            pReaders[i] = new KeyReader (&stop, this, keyList[i].pPath,
-                                         keyList[i].pKey);
-        // a few writers
-        for (i = 0; i < numWriters; i++)
-            pWriters[i] = new KeyWriter (&stop, this, keyList[i].pPath,
-                                         keyList[i].pKey);
-
-        // Threads are running ...
-        const int numIters = 5;
-        for (int j = 0; j < numIters; j++) {
-            for (i = 0; i < numReaders; i++)
-            {
-                try {
-                    rtl::OString aPath (keyList[i].pPath);
-                    rtl::OString aKey (keyList[i].pKey);
-                    normalizePathKey (aPath, aKey);
-                    resetKey (aPath, rtl::OUString::createFromAscii (aKey));
-                    osl::Thread::yield();
-                } CATCH_FAIL ("resetting keys");
-            }
-        }
-        stop.set();
-
-        for (i = 0; i < numReaders; i++) {
-            pReaders[i]->join();
-            delete pReaders[i];
-        }
-        for (i = 0; i < numWriters; i++) {
-            pWriters[i]->join();
-            delete pWriters[i];
-        }
-
-    } CATCH_FAIL ("checking keys exist")
-}
-
-class RecursiveListener : public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >
-{
-public:
-    sal_Int32 m_nRecurse;
-    css::uno::Reference< css::beans::XPropertySet > mxPropSet;
-  protected:
-    Test *m_pTest;
-    rtl::OString m_pPath;
-    rtl::OString m_pKey;
-  public:
-    RecursiveListener (Test *pTest, int nCount,
-                       const char *pPath, const char *pKey)
-        : m_nRecurse (nCount)
-        , m_pTest (pTest)
-        , m_pPath (pPath)
-        , m_pKey (pKey)
-    {
-        mxPropSet = css::uno::Reference< css::beans::XPropertySet > (
-            pTest->createView (pPath, true), css::uno::UNO_QUERY_THROW );
-
-        CPPUNIT_ASSERT_MESSAGE ("is prop set", mxPropSet.is());
-        mxPropSet->addPropertyChangeListener (rtl::OUString::createFromAscii (m_pKey),
-                                              css::uno::Reference<css::beans::XPropertyChangeListener>(this));
-    }
-    virtual ~RecursiveListener()
-    {
-        disposeComponent (mxPropSet);
-    }
-
-    virtual void SAL_CALL acquire() throw() { cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >::acquire(); }
-    virtual void SAL_CALL release() throw() { cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >::acquire(); }
-    // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const ::css::beans::PropertyChangeEvent& ) throw (::css::uno::RuntimeException)
-    {
-        if (m_nRecurse-- > 0)
-            runTest();
-    }
-    // XEventListener
-    virtual void SAL_CALL disposing( const ::css::lang::EventObject& ) throw (::css::uno::RuntimeException)
-    {
-    }
-    virtual void runTest()
-    {
-        m_pTest->setKey (m_pPath, rtl::OUString::createFromAscii (m_pKey),
-                         css::uno::makeAny(
-                             rtl::OUString::valueOf (m_nRecurse) ) );
-    }
-};
-
-class CrossThreadListener : public RecursiveListener
-{
-  public:
-    CrossThreadListener (Test *pTest, int nCount,
-                         const char *pPath, const char *pKey)
-        : RecursiveListener (pTest, nCount, pPath, pKey)
-    {
-    }
-    virtual ~CrossThreadListener()
-    {
-    }
-    virtual void runTest()
-    {
-        osl::Condition stopAfterOne;
-        stopAfterOne.set();
-        KeyWriter aWriter (&stopAfterOne, m_pTest, m_pPath, m_pKey);
-        aWriter.join();
-
-        rtl::OString aPath (m_pPath), aKey (m_pKey);
-        m_pTest->normalizePathKey (aPath, aKey);
-        m_pTest->resetKey (aPath, rtl::OUString::createFromAscii (aKey));
-    }
-};
-
-void Test::recursiveTests()
-{
-    RecursiveListener *pList = new RecursiveListener(this, 100,
-                                                     "/org.openoffice.UI.GenericCommands/UserInterface/Commands/dotuno:WebHtml",
-                                                     "Label");
-    css::uno::Reference< css::beans::XPropertyChangeListener > xListener(pList);
-    pList->runTest();
-}
-
-void Test::eventTests()
-{
-    CrossThreadListener *pList = new CrossThreadListener(this, 10,
-                                                         "/org.openoffice.UI.GenericCommands/UserInterface/Commands/dotuno:WebHtml",
-                                                         "Label");
-    css::uno::Reference< css::beans::XPropertyChangeListener > xListener(pList);
-    pList->runTest();
-}
-
diff --git a/configmgr/qa/unit/ubootstrap.cxx b/configmgr/qa/unit/ubootstrap.cxx
deleted file mode 100644
index 907f05c43b..0000000000
--- a/configmgr/qa/unit/ubootstrap.cxx
+++ /dev/null
@@ -1,123 +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: ubootstrap.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 "common.hxx"
-#include <osl/file.hxx>
-
-// Do all those evil things to make the tests actually work ...
-Magic::Magic()
-{
-    rtl_uString *curWd = NULL;
-    osl_getProcessWorkingDir( &curWd );
-
-    rtl::OUString aKey;
-    rtl::OUString aValue( curWd );
-
-    // Unless you do this, obviously you don't want your paths to be correct 
-    // or file access to work properly
-    aKey = rtl::OUString::createFromAscii( "BaseInstallation" );
-    rtl_bootstrap_set( aKey.pData, aValue.pData );
-    // Unless you do this, obviously you don't deserve to have anything work
-    aKey = rtl::OUString::createFromAscii( "CFG_INIFILE" );
-    aValue += rtl::OUString::createFromAscii( "/configmgrrc" );
-    rtl_bootstrap_set( aKey.pData, aValue.pData );
-
-    // FIXME: Create a safe /tmp directory - unfotunately that
-    // either requires dependencies we don't have, or some cut &
-    // paste action of unotools/source/ucbhelper/tempfile.cxx
-    if (osl::File::getTempDirURL(maTempDir) != osl::FileBase::E_None) {
-        t_print ("no tmp dir");
-        CPPUNIT_FAIL ("no tmp dir");
-    }
-    maTempDir += rtl::OUString::createFromAscii("/unittstconfig");
-    osl::FileBase::RC err = osl::Directory::create (maTempDir);
-                            
-    if (err != osl::FileBase::E_None) {
-        t_print ("tmp dir '%s' already exists\n",
-                 rtl::OUStringToOString (maTempDir, RTL_TEXTENCODING_UTF8).getStr());
-        CPPUNIT_FAIL ("tmp user config dir already exists!");
-    }
-
-    aKey = rtl::OUString::createFromAscii( "UserInstallation" );
-    rtl_bootstrap_set( aKey.pData, maTempDir.pData );
-}
-
-void removeRecursive (const rtl::OUString& aPath)
-{
-    sal_Int32 nMask = FileStatusMask_Type | FileStatusMask_FileURL;
-
-//    fprintf (stderr, "Remove recursive '%s'\n", rtl::OUStringToOString (aPath, RTL_TEXTENCODING_UTF8).getStr());
-    
-    osl::DirectoryItem aItem;
-    osl::FileStatus aStatus( nMask );
-    osl::FileBase::RC nError;
-
-    nError = osl::DirectoryItem::get( aPath, aItem );
-    CPPUNIT_ASSERT_MESSAGE ("invalid path", nError == osl::FileBase::E_None);
-
-    nError = aItem.getFileStatus( aStatus );
-    CPPUNIT_ASSERT_MESSAGE ("invalid file", nError == osl::FileBase::E_None);
-
-    if (aStatus.getFileType() == osl::FileStatus::Regular ||
-        aStatus.getFileType() == osl::FileStatus::Link )
-    {
-        nError = osl::File::remove( aPath );
-//        fprintf (stderr, "Remove file '%s'\n", rtl::OUStringToOString (aPath, RTL_TEXTENCODING_UTF8).getStr());
-        CPPUNIT_ASSERT_MESSAGE ("removing file", nError == osl::FileBase::E_None);
-    }
-    else if (aStatus.getFileType() == osl::FileStatus::Directory)
-    {
-        osl::Directory aDirectory (aPath);
-        nError = aDirectory.open();
-        CPPUNIT_ASSERT_MESSAGE ("opening dir", nError == osl::FileBase::E_None);
-
-        rtl::OUString name;
-
-        while (true) {
-            nError = aDirectory.getNextItem( aItem );
-            if ( nError != osl::FileBase::E_None )
-                break;
-              nError = aItem.getFileStatus( aStatus );
-            CPPUNIT_ASSERT_MESSAGE ("getting status", nError == osl::FileBase::E_None);
-            removeRecursive (aStatus.getFileURL());
-        }
-          aDirectory.close();
-
-        nError = osl::Directory::remove( aPath );
-//        fprintf (stderr, "Remove dir '%s'\n", rtl::OUStringToOString (aPath, RTL_TEXTENCODING_UTF8).getStr());
-
-        CPPUNIT_ASSERT_MESSAGE ("removing directory", nError == osl::FileBase::E_None);
-    }
-}
-
-Magic::~Magic()
-{
-    removeRecursive (maTempDir);
-}
diff --git a/configmgr/source/registry/makefile.mk b/configmgr/qa/unit/urebootstrap.ini
index 3a8c12c8f5..c413645d0f 100644
--- a/configmgr/source/registry/makefile.mk
+++ b/configmgr/qa/unit/urebootstrap.ini
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -27,26 +23,8 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source$/inc
-PRJNAME=configmgr
-TARGET=registry
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-# --- Files -------------------------------------
-
-SLOFILES=\
-        $(SLO)$/configregistry.obj \
-        $(SLO)$/cfgregistrykey.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+#***********************************************************************/
 
+[Bootstrap]
+OOO_BASE_DIR = $ORIGIN/basis
+BRAND_BASE_DIR = $ORIGIN/brand
diff --git a/configmgr/version.mk b/configmgr/qa/unit/version.map
index d5886b08b2..6b30413b89 100644
--- a/configmgr/version.mk
+++ b/configmgr/qa/unit/version.map
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -27,24 +23,12 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
-
-# ----------------------------CFGMGR settings------------------------------------#
-# target
-CFGMGR_TARGET=configmgr
-
-# the major 
-CFGMGR_MAJOR=2
-# the minor 
-CFGMGR_MINOR=0
-# the micro 
-CFGMGR_MICRO=0
-
-# this is a c++ compatible library 
-CFGMGR_CPP=1
-
-CFGMGR=$(CFGMGR_TARGET_TARGET)_$(CMPEXT)
-
-
+#***********************************************************************/
 
+UDK_3_0_0 {
+    global:
+        registerAllTestFunction;
 
+    local:
+        *;
+};
diff --git a/configmgr/qa/unoapi/cfgmgr2.sce b/configmgr/qa/unoapi/cfgmgr2.sce
deleted file mode 100644
index e7c4adcb6e..0000000000
--- a/configmgr/qa/unoapi/cfgmgr2.sce
+++ /dev/null
@@ -1,34 +0,0 @@
--o cfgmgr2.LocalSchemaSupplier
--o cfgmgr2.LocalSingleStratum
--o cfgmgr2.MultiStratumBackend
--o sysmgr1.SystemIntegration
-#i46913# -o cfgmgr2.BootstrapContext
--o cfgmgr2.LayerUpdateMerger
--o cfgmgr2.LayerWriter
--o cfgmgr2.LocalDataImporter
--o cfgmgr2.LocalHierarchyBrowser
--o cfgmgr2.LocalSingleBackend
--o cfgmgr2.MergeImporter
--o cfgmgr2.OConfigurationRegistry
--o cfgmgr2.OInnerGroupInfoAccess
--o cfgmgr2.OInnerGroupUpdateAccess
--o cfgmgr2.OInnerSetInfoAccess
-#i46185# -o cfgmgr2.OInnerTreeSetUpdateAccess
--o cfgmgr2.OInnerValueSetUpdateAccess
--o cfgmgr2.ORootElementGroupInfoAccess
--o cfgmgr2.ORootElementGroupUpdateAccess
--o cfgmgr2.ORootElementSetInfoAccess
-#i46185# -o cfgmgr2.ORootElementTreeSetUpdateAccess
--o cfgmgr2.ORootElementValueSetUpdateAccess
--o cfgmgr2.OSetElementGroupInfoAccess
--o cfgmgr2.OSetElementGroupUpdateAccess
--o cfgmgr2.OSetElementSetInfoAccess
-#i46185# -o cfgmgr2.OSetElementTreeSetUpdateAccess
-#i84221# -o cfgmgr2.OSetElementValueSetUpdateAccess
--o cfgmgr2.SchemaParser
--o cfgmgr2.SingleBackendAdapter
--o cfgmgr2.ConfigurationProviderWrapper
-#i87744# -o cfgmgr2.LayerParser
--o cfgmgr2.CopyImporter
--o cfgmgr2.AdministrationProvider
--o cfgmgr2.ConfigurationProvider
diff --git a/configmgr/qa/unoapi/knownissues.xcl b/configmgr/qa/unoapi/knownissues.xcl
deleted file mode 100644
index d8956a6e8d..0000000000
--- a/configmgr/qa/unoapi/knownissues.xcl
+++ /dev/null
@@ -1,55 +0,0 @@
-### i84222 ###
-cfgmgr2.LocalSingleBackend::com::sun::star::configuration::backend::XMultiLayerStratum
-
-### i23145 ###
-cfgmgr2.OSetElementGroupUpdateAccess::com::sun::star::container::XChild
-
-### i38211 ###
-cfgmgr2.ConfigurationProvider::com::sun::star::lang::XComponent
-
-### i46185 ###
-cfgmgr2.OInnerTreeSetUpdateAccess::com::sun::star::container::XNameContainer
-cfgmgr2.OSetElementTreeSetUpdateAccess::com::sun::star::container::XNameContainer
-cfgmgr2.ORootElementTreeSetUpdateAccess::com::sun::star::container::XNameContainer
-# -> test is disbaled in cfgmgr2.sce
-
-### i46913 ###
-cfgmgr2.BootstrapContext::com::sun::star::uno::XComponentContext
-# -> test is disbaled in cfgmgr2.sce
-
-### i83881 ###
-cfgmgr2.OInnerValueSetUpdateAccess::com::sun::star::container::XNameReplace
-
-### i65847 ###
-cfgmgr2.OInnerTreeSetUpdateAccess::com::sun::star::beans::XPropertyWithState
-# -> test is disbaled in cfgmgr2.sce
-
-### i68673 ###
-cfgmgr2.ORootElementTreeSetUpdateAccess::com::sun::star::beans::XPropertyWithState
-# -> test is disbaled in cfgmgr2.sce
-
-### i79114 ###
-sysmgr1.SystemIntegration::com::sun::star::configuration::backend::XBackend
-
-### i83880 ###
-cfgmgr2.ORootElementValueSetUpdateAccess::com::sun::star::container::XNameReplace 
-
-### i84221 ### 
-cfgmgr2.OSetElementValueSetUpdateAccess
-
-### i87744 ###
-cfgmgr2.LayerParser
-# -> test is disbaled in cfgmgr2.sce
-
-### i88358 ###
-cfgmgr2.OInnerValueSetUpdateAccess::com::sun::star::container::XHierarchicalNameAccess
-cfgmgr2.OInnerValueSetUpdateAccess::com::sun::star::beans::XExactName
-
-### i88360 ###
-cfgmgr2.ORootElementValueSetUpdateAccess::com::sun::star::util::XChangesBatch
-
-### i89412 ###
-cfgmgr2.OInnerValueSetUpdateAccess::com::sun::star::container::XElementAccess
-
-### i89413 ###
-cfgmgr2.ORootElementValueSetUpdateAccess::com::sun::star::container::XHierarchicalNameAccess
diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk
index 6be9331b2c..5af6b07296 100644
--- a/configmgr/qa/unoapi/makefile.mk
+++ b/configmgr/qa/unoapi/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -27,22 +23,16 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
-PRJNAME=configmgr
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = configmgr
+TARGET = unoapi
 
 .INCLUDE: settings.mk
-
 .INCLUDE: target.mk
 
-ALLTAR : UNOAPI_TEST
+ALLTAR: TEST
 
-UNOAPI_TEST:
-    +$(SOLARENV)$/bin$/checkapi -sce cfgmgr2.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
-    @echo =======================================================================
-    @echo In case of problems with sysmgr1.SystemIntegration make sure that you 
-    @echo =======================================================================
-    @echo built and registered qadevOOo/testsdocs/backend/org/openoffice/JavaSystemBackend 
-    @echo =======================================================================			
+TEST .PHONY:
+    $(SOLARENV)/bin/checkapi -sce module.sce
diff --git a/configmgr/source/data/makefile.mk b/configmgr/qa/unoapi/module.sce
index 5745979c1b..d9b1c8b540 100644
--- a/configmgr/source/data/makefile.mk
+++ b/configmgr/qa/unoapi/module.sce
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -27,28 +23,7 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source$/inc
-PRJNAME=configmgr
-TARGET=data
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-        $(SLO)$/anydata.obj	\
-        $(SLO)$/sequence.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+#***********************************************************************/
 
+-o configmgr.ConfigurationProvider
+-o configmgr.DefaultProvider
diff --git a/configmgr/source/README b/configmgr/source/README
new file mode 100644
index 0000000000..6d19a3b786
--- /dev/null
+++ b/configmgr/source/README
@@ -0,0 +1,156 @@
+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+Source Overview
+===============
+
+configurationprovider.cxx
+configurationregistry.cxx
+defaultprovider.cxx
+services.cxx
+ UNO service implementations.
+
+access.cxx
+childaccess.cxx
+rootaccess.cxx
+ UNO objects passed to clients.
+
+components.cxx
+ Central singleton that aggregates all data (reads in the XML files, manages
+ modifications and global notifications).
+
+groupnode.cxx
+localizedpropertynode.cxx
+localizedvaluenode.cxx
+node.cxx
+propertynode.cxx
+setnode.cxx
+ Internal representations of data nodes.
+
+pad.cxx
+parsemanager.cxx
+parser.hxx
+span.hxx
+valueparser.cxx
+xcdparser.cxx
+xcsparser.cxx
+xcuparser.cxx
+xmldata.cxx
+xmlreader.cxx
+ XML file reading.
+
+modifications.cxx
+writemodfile.cxx
+ Modification management.
+
+broadcaster.cxx
+ Notification management.
+
+update.cxx
+ Extension manager interface.
+
+data.cxx
+lock.cxx
+nodemap.cxx
+path.hxx
+type.cxx
+ Utilities.
+
+
+Mandatory Set Members
+=====================
+
+- A set member can be marked as "mandatory," meaning that a member of that name
+must always be present in a set.
+
+- The above definition implies that calling replaceByName on a mandatory set
+member is OK.
+
+- The XCU format can contain oor:mandatory attributes on nodes.  (The XCS format
+does not support them.  In the registrymodifications file, oor:mandatory
+attributes should never be needed, as being mandatory cannot be controlled via
+the UNO API.)  The XCU reading code only evaluates the oor:mandatory attribute
+for set members, and ignores it everywhere else.
+
+- Only true sets support mandatory members.  A localized property for the "*"
+locale, though acting much like a set, does not support mandatory members.
+
+- The OpenOffice.org Registry Format document claims that group extension
+properties are implicitly mandatory, but at least the new configmgr code does
+not treat them like that (i.e., they can be removed again).
+
+- For simplicity, setMandatory/getMandatory are available as virtual functions
+at the base Node, even though they can only make sense for GroupNodes and
+SetNodes that are set members.  The default getMandatory implementation returns
+NO_LAYER, meaning oor:mandatory is not set to true in any layer.  (Returning
+NO_LAYER simplifies the code, e.g., removeByName does not have to check whether
+getMandatory is called on a member of a true set to decide whether to forbid
+removal.)
+
+- When committing changes (made through the UNO API), the "mandatory" status of
+inserted nodes must be updated (in case the insert is due to a replaceByName, or
+the "mandatory" flag was added by a concurrent modification of a lower layer).
+Also, for to-be-removed nodes, removal is ignored for (newly; due to concurrent
+modification of a lower layer) mandatory nodes (but still recorded in
+registrymodifications, so may take effect once the lower layer addition is
+removed again---whether or not that is a good idea).
+
+
+XcuParser Modification Recording
+================================
+
+- XcuParser records modifications when reading user layer data
+(valueParser_.getLayer() == Data::NO_LAYER).
+
+- oor:finalized and oor:mandatory attributes cannot be set via the UNO API, so
+it is assumed that user layer data does not contain them (for one, they are not
+written by writeModFile; for another, the logic to record modifications expects
+a locprop(modify,fuse) to be followed by one or more value(fuse,remove), which
+would not necessarily be true if the locprop were only present in the user layer
+data to flag it as finalized).
+
+- The logic to record modifications considers the top of the XML element stack.
+In the following list of all possible cases, items marked with an asterisk are
+recorded:
+ ... group(modify,fuse) - group(modify,fuse) - ...
+ ... group(modify,fuse) - set(modify,fuse) - ...
+ ... group(modify,fuse) - *prop(modify,fuse,replace) - value(fuse)
+ ... group(modify,fuse) - *prop(remove)
+ ... group(modify,fuse) - locprop(modify,fuse) - *value(fuse)
+ ... group(modify,fuse) - locprop(modify,fuse) - *value(remove)
+ ... group(modify,fuse) - *locprop(replace) ...
+ ... set(modify,fuse,replace) - group(modify/fuse) - ...
+ ... set(modify,fuse,replace) - *group(replace/fuse) - ...
+ ... set(modify,fuse,replace) - *group(remove)
+ ... set(modify,fuse,replace) - set(modify/fuse) - ...
+ ... set(modify,fuse,replace) - *set(replace/fuse) - ...
+ ... set(modify,fuse,replace) - *set(remove)
+Legend: "...": zero or more further items
+        "- ...": one or more further items
+        "modify,fuse" etc.: any of those operations
+        "modify/fuse": a modify or a fuse on an existing member
+        "replace/fuse": a replace or a fuse on a non-existing member
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
new file mode 100644
index 0000000000..7af9c1f8d9
--- /dev/null
+++ b/configmgr/source/access.cxx
@@ -0,0 +1,2186 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <vector>
+
+#include "com/sun/star/beans/Property.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XExactName.hpp"
+#include "com/sun/star/beans/XHierarchicalPropertySet.hpp"
+#include "com/sun/star/beans/XHierarchicalPropertySetInfo.hpp"
+#include "com/sun/star/beans/XMultiHierarchicalPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XPropertiesChangeListener.hpp"
+#include "com/sun/star/beans/XProperty.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XVetoableChangeListener.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/container/XElementAccess.hpp"
+#include "com/sun/star/container/XHierarchicalName.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/TypeClass.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XWeak.hpp"
+#include "com/sun/star/util/ElementChange.hpp"
+#include "comphelper/sequenceasvector.hxx"
+#include "cppu/unotype.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "osl/interlck.h"
+#include "osl/mutex.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "access.hxx"
+#include "broadcaster.hxx"
+#include "childaccess.hxx"
+#include "components.hxx"
+#include "data.hxx"
+#include "groupnode.hxx"
+#include "localizedpropertynode.hxx"
+#include "localizedvaluenode.hxx"
+#include "lock.hxx"
+#include "modifications.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "path.hxx"
+#include "propertynode.hxx"
+#include "rootaccess.hxx"
+#include "setnode.hxx"
+#include "type.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+oslInterlockedCount Access::acquireCounting() {
+    return osl_incrementInterlockedCount(&m_refCount);
+}
+
+void Access::releaseNondeleting() {
+    osl_decrementInterlockedCount(&m_refCount);
+}
+
+bool Access::isValue() {
+    rtl::Reference< Node > p(getNode());
+    switch (p->kind()) {
+    case Node::KIND_PROPERTY:
+    case Node::KIND_LOCALIZED_VALUE:
+        return true;
+    case Node::KIND_LOCALIZED_PROPERTY:
+        return !Components::allLocales(getRootAccess()->getLocale());
+    default:
+        return false;
+    }
+}
+
+void Access::markChildAsModified(rtl::Reference< ChildAccess > const & child) {
+    OSL_ASSERT(child.is() && child->getParentAccess() == this);
+    modifiedChildren_[child->getNameInternal()] = ModifiedChild(child, true);
+    for (rtl::Reference< Access > p(this);;) {
+        rtl::Reference< Access > parent(p->getParentAccess());
+        if (!parent.is()) {
+            break;
+        }
+        OSL_ASSERT(dynamic_cast< ChildAccess * >(p.get()) != 0);
+        parent->modifiedChildren_.insert(
+            ModifiedChildren::value_type(
+                p->getNameInternal(),
+                ModifiedChild(dynamic_cast< ChildAccess * >(p.get()), false)));
+        p = parent;
+    }
+}
+
+void Access::releaseChild(rtl::OUString const & name) {
+    cachedChildren_.erase(name);
+}
+
+void Access::initBroadcaster(
+    Modifications::Node const & modifications, Broadcaster * broadcaster)
+{
+    initBroadcasterAndChanges(modifications, broadcaster, 0);
+}
+
+Access::Access(Components & components):
+    components_(components), disposed_(false)
+{}
+
+Access::~Access() {}
+
+void Access::initDisposeBroadcaster(Broadcaster * broadcaster) {
+    OSL_ASSERT(broadcaster != 0);
+    for (DisposeListeners::iterator i(disposeListeners_.begin());
+         i != disposeListeners_.end(); ++i)
+    {
+        broadcaster->addDisposeNotification(
+            *i,
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    }
+    for (ContainerListeners::iterator i(containerListeners_.begin());
+         i != containerListeners_.end(); ++i)
+    {
+        broadcaster->addDisposeNotification(
+            i->get(),
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    }
+    for (PropertyChangeListeners::iterator i(propertyChangeListeners_.begin());
+         i != propertyChangeListeners_.end(); ++i)
+    {
+        for (PropertyChangeListenersElement::iterator j(i->second.begin());
+             j != i->second.end(); ++j)
+        {
+            broadcaster->addDisposeNotification(
+                j->get(),
+                css::lang::EventObject(
+                    static_cast< cppu::OWeakObject * >(this)));
+        }
+    }
+    for (VetoableChangeListeners::iterator i(vetoableChangeListeners_.begin());
+         i != vetoableChangeListeners_.end(); ++i)
+    {
+        for (VetoableChangeListenersElement::iterator j(i->second.begin());
+             j != i->second.end(); ++j)
+        {
+            broadcaster->addDisposeNotification(
+                j->get(),
+                css::lang::EventObject(
+                    static_cast< cppu::OWeakObject * >(this)));
+        }
+    }
+    for (PropertiesChangeListeners::iterator i(
+             propertiesChangeListeners_.begin());
+         i != propertiesChangeListeners_.end(); ++i)
+    {
+        broadcaster->addDisposeNotification(
+            i->get(),
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    }
+    //TODO: iterate over children w/ listeners (incl. unmodified ones):
+    for (ModifiedChildren::iterator i(modifiedChildren_.begin());
+         i != modifiedChildren_.end(); ++i)
+    {
+        rtl::Reference< ChildAccess > child(getModifiedChild(i));
+        if (child.is()) {
+            child->initDisposeBroadcaster(broadcaster);
+        }
+    }
+}
+
+void Access::clearListeners() throw() {
+    disposeListeners_.clear();
+    containerListeners_.clear();
+    propertyChangeListeners_.clear();
+    vetoableChangeListeners_.clear();
+    propertiesChangeListeners_.clear();
+    //TODO: iterate over children w/ listeners (incl. unmodified ones):
+    for (ModifiedChildren::iterator i(modifiedChildren_.begin());
+         i != modifiedChildren_.end(); ++i)
+    {
+        rtl::Reference< ChildAccess > child(getModifiedChild(i));
+        if (child.is()) {
+            child->clearListeners();
+        }
+    }
+}
+
+css::uno::Any Access::queryInterface(css::uno::Type const & aType)
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Any res(OWeakObject::queryInterface(aType));
+    if (res.hasValue()) {
+        return res;
+    }
+    res = cppu::queryInterface(
+        aType, static_cast< css::lang::XTypeProvider * >(this),
+        static_cast< css::lang::XServiceInfo * >(this),
+        static_cast< css::lang::XComponent * >(this),
+        static_cast< css::container::XHierarchicalNameAccess * >(this),
+        static_cast< css::container::XContainer * >(this),
+        static_cast< css::beans::XExactName * >(this),
+        static_cast< css::container::XHierarchicalName * >(this),
+        static_cast< css::container::XNamed * >(this),
+        static_cast< css::beans::XProperty * >(this),
+        static_cast< css::container::XElementAccess * >(this),
+        static_cast< css::container::XNameAccess * >(this));
+    if (res.hasValue()) {
+        return res;
+    }
+    if (getNode()->kind() == Node::KIND_GROUP) {
+        res = cppu::queryInterface(
+            aType, static_cast< css::beans::XPropertySetInfo * >(this),
+            static_cast< css::beans::XPropertySet * >(this),
+            static_cast< css::beans::XMultiPropertySet * >(this),
+            static_cast< css::beans::XHierarchicalPropertySet * >(this),
+            static_cast< css::beans::XMultiHierarchicalPropertySet * >(this),
+            static_cast< css::beans::XHierarchicalPropertySetInfo * >(this));
+        if (res.hasValue()) {
+            return res;
+        }
+    }
+    if (getRootAccess()->isUpdate()) {
+        res = cppu::queryInterface(
+            aType, static_cast< css::container::XNameReplace * >(this));
+        if (res.hasValue()) {
+            return res;
+        }
+        if (getNode()->kind() != Node::KIND_GROUP ||
+            dynamic_cast< GroupNode * >(getNode().get())->isExtensible())
+        {
+            res = cppu::queryInterface(
+                aType, static_cast< css::container::XNameContainer * >(this));
+            if (res.hasValue()) {
+                return res;
+            }
+        }
+        if (getNode()->kind() == Node::KIND_SET) {
+            res = cppu::queryInterface(
+                aType, static_cast< css::lang::XSingleServiceFactory * >(this));
+        }
+    }
+    return res;
+}
+
+Components & Access::getComponents() const {
+    return components_;
+}
+
+void Access::checkLocalizedPropertyAccess() {
+    if (getNode()->kind() == Node::KIND_LOCALIZED_PROPERTY &&
+        !Components::allLocales(getRootAccess()->getLocale()))
+    {
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr Access to specialized LocalizedPropertyNode")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+}
+
+rtl::Reference< Node > Access::getParentNode() {
+    rtl::Reference< Access > parent(getParentAccess());
+    return parent.is() ? parent->getNode() : rtl::Reference< Node >();
+}
+
+rtl::Reference< ChildAccess > Access::getChild(rtl::OUString const & name) {
+    ModifiedChildren::iterator i(modifiedChildren_.find(name));
+    return i == modifiedChildren_.end()
+        ? getUnmodifiedChild(name) : getModifiedChild(i);
+}
+
+std::vector< rtl::Reference< ChildAccess > > Access::getAllChildren() {
+    std::vector< rtl::Reference< ChildAccess > > vec;
+    NodeMap & members = getNode()->getMembers();
+    for (NodeMap::iterator i(members.begin()); i != members.end(); ++i) {
+        if (modifiedChildren_.find(i->first) == modifiedChildren_.end()) {
+            vec.push_back(getUnmodifiedChild(i->first));
+            OSL_ASSERT(vec.back().is());
+        }
+    }
+    for (ModifiedChildren::iterator i(modifiedChildren_.begin());
+         i != modifiedChildren_.end(); ++i)
+    {
+        rtl::Reference< ChildAccess > child(getModifiedChild(i));
+        if (child.is()) {
+            vec.push_back(child);
+        }
+    }
+    return vec;
+}
+
+void Access::checkValue(css::uno::Any const & value, Type type, bool nillable) {
+    bool ok;
+    switch (type) {
+    case TYPE_NIL:
+        OSL_ASSERT(false);
+        // fall through (cannot happen)
+    case TYPE_ERROR:
+        ok = false;
+        break;
+    case TYPE_ANY:
+        switch (getDynamicType(value)) {
+        case TYPE_ANY:
+            OSL_ASSERT(false);
+            // fall through (cannot happen)
+        case TYPE_ERROR:
+            ok = false;
+            break;
+        case TYPE_NIL:
+            ok = nillable;
+            break;
+        default:
+            ok = true;
+            break;
+        }
+        break;
+    default:
+        ok = value.hasValue() ? value.isExtractableTo(mapType(type)) : nillable;
+        break;
+    }
+    if (!ok) {
+        throw css::lang::IllegalArgumentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr inappropriate property value")),
+            static_cast< cppu::OWeakObject * >(this), -1);
+    }
+}
+
+void Access::insertLocalizedValueChild(
+    rtl::OUString const & name, css::uno::Any const & value,
+    Modifications * localModifications)
+{
+    OSL_ASSERT(localModifications != 0);
+    LocalizedPropertyNode * locprop = dynamic_cast< LocalizedPropertyNode * >(
+        getNode().get());
+    checkValue(value, locprop->getStaticType(), locprop->isNillable());
+    rtl::Reference< ChildAccess > child(
+        new ChildAccess(
+            components_, getRootAccess(), this, name,
+            new LocalizedValueNode(Data::NO_LAYER, value)));
+    markChildAsModified(child);
+    localModifications->add(child->getRelativePath());
+}
+
+void Access::reportChildChanges(
+    std::vector< css::util::ElementChange > * changes)
+{
+    OSL_ASSERT(changes != 0);
+    for (ModifiedChildren::iterator i(modifiedChildren_.begin());
+         i != modifiedChildren_.end(); ++i)
+    {
+        rtl::Reference< ChildAccess > child(getModifiedChild(i));
+        if (child.is()) {
+            child->reportChildChanges(changes);
+            changes->push_back(css::util::ElementChange());
+                //TODO: changed value and/or inserted node
+        } else {
+            changes->push_back(css::util::ElementChange()); //TODO: removed node
+        }
+    }
+}
+
+void Access::commitChildChanges(
+    bool valid, Modifications * globalModifications)
+{
+    OSL_ASSERT(globalModifications != 0);
+    while (!modifiedChildren_.empty()) {
+        bool childValid = valid;
+        ModifiedChildren::iterator i(modifiedChildren_.begin());
+        rtl::Reference< ChildAccess > child(getModifiedChild(i));
+        if (child.is()) {
+            childValid = childValid && !child->isFinalized();
+            child->commitChanges(childValid, globalModifications);
+                //TODO: currently, this is called here for directly inserted
+                // children as well as for children whose sub-children were
+                // modified (and should never be called for directly removed
+                // children); clarify what exactly should happen here for
+                // directly inserted children
+        }
+        NodeMap & members = getNode()->getMembers();
+        NodeMap::iterator j(members.find(i->first));
+        if (child.is()) {
+            // Inserted:
+            if (j != members.end()) {
+                childValid = childValid &&
+                    j->second->getFinalized() == Data::NO_LAYER;
+                if (childValid) {
+                    child->getNode()->setMandatory(j->second->getMandatory());
+                }
+            }
+            if (childValid) {
+                members[i->first] = child->getNode();
+            }
+        } else {
+            // Removed:
+            childValid = childValid && j != members.end() &&
+                j->second->getFinalized() == Data::NO_LAYER &&
+                j->second->getMandatory() == Data::NO_LAYER;
+            if (childValid) {
+                members.erase(j);
+            }
+        }
+        if (childValid && i->second.directlyModified) {
+            Path path(getAbsolutePath());
+            path.push_back(i->first);
+            components_.addModification(path);
+            globalModifications->add(path);
+        }
+        i->second.child->committed();
+        modifiedChildren_.erase(i);
+    }
+}
+
+void Access::initBroadcasterAndChanges(
+    Modifications::Node const & modifications, Broadcaster * broadcaster,
+    std::vector< css::util::ElementChange > * allChanges)
+{
+    OSL_ASSERT(broadcaster != 0);
+    comphelper::SequenceAsVector< css::beans::PropertyChangeEvent > propChanges;
+    bool collectPropChanges = !propertiesChangeListeners_.empty();
+    for (Modifications::Node::Children::const_iterator i(
+             modifications.children.begin());
+         i != modifications.children.end(); ++i)
+    {
+        rtl::Reference< ChildAccess > child(getChild(i->first));
+        if (child.is()) {
+            switch (child->getNode()->kind()) {
+            case Node::KIND_LOCALIZED_PROPERTY:
+                if (!i->second.children.empty()) {
+                    if (Components::allLocales(getRootAccess()->getLocale())) {
+                        child->initBroadcasterAndChanges(
+                            i->second, broadcaster, allChanges);
+                            //TODO: if allChanges==0, recurse only into children
+                            // w/ listeners
+                    } else {
+                        //TODO: filter child mods that are irrelevant for
+                        // locale:
+                        for (ContainerListeners::iterator j(
+                                 containerListeners_.begin());
+                             j != containerListeners_.end(); ++j)
+                        {
+                            broadcaster->
+                                addContainerElementReplacedNotification(
+                                    *j,
+                                    css::container::ContainerEvent(
+                                        static_cast< cppu::OWeakObject * >(
+                                            this),
+                                        css::uno::makeAny(i->first),
+                                        css::uno::Any(), css::uno::Any()));
+                                //TODO: non-void Element, ReplacedElement
+                        }
+                        PropertyChangeListeners::iterator j(
+                            propertyChangeListeners_.find(i->first));
+                        if (j != propertyChangeListeners_.end()) {
+                            for (PropertyChangeListenersElement::iterator k(
+                                     j->second.begin());
+                                 k != j->second.end(); ++k)
+                            {
+                                broadcaster->addPropertyChangeNotification(
+                                    *k,
+                                    css::beans::PropertyChangeEvent(
+                                        static_cast< cppu::OWeakObject * >(
+                                            this),
+                                        i->first, false, -1, css::uno::Any(),
+                                        css::uno::Any()));
+                            }
+                        }
+                        j = propertyChangeListeners_.find(rtl::OUString());
+                        if (j != propertyChangeListeners_.end()) {
+                            for (PropertyChangeListenersElement::iterator k(
+                                     j->second.begin());
+                                 k != j->second.end(); ++k)
+                            {
+                                broadcaster->addPropertyChangeNotification(
+                                    *k,
+                                    css::beans::PropertyChangeEvent(
+                                        static_cast< cppu::OWeakObject * >(
+                                            this),
+                                        i->first, false, -1, css::uno::Any(),
+                                        css::uno::Any()));
+                            }
+                        }
+                        if (allChanges != 0) {
+                            allChanges->push_back(
+                                css::util::ElementChange(
+                                    css::uno::makeAny(
+                                        child->getRelativePathRepresentation()),
+                                    css::uno::Any(), css::uno::Any()));
+                                //TODO: non-void Element, ReplacedElement
+                        }
+                        if (collectPropChanges) {
+                            propChanges.push_back(
+                                css::beans::PropertyChangeEvent(
+                                    static_cast< cppu::OWeakObject * >(this),
+                                    i->first, false, -1, css::uno::Any(),
+                                    css::uno::Any()));
+                        }
+                    }
+                }
+                // else: spurious Modifications::Node not representing a change
+                break;
+            case Node::KIND_LOCALIZED_VALUE:
+                OSL_ASSERT(
+                    Components::allLocales(getRootAccess()->getLocale()));
+                for (ContainerListeners::iterator j(
+                         containerListeners_.begin());
+                     j != containerListeners_.end(); ++j)
+                {
+                    broadcaster->addContainerElementReplacedNotification(
+                        *j,
+                        css::container::ContainerEvent(
+                            static_cast< cppu::OWeakObject * >(this),
+                            css::uno::makeAny(i->first), child->asValue(),
+                            css::uno::Any()));
+                        //TODO: distinguish add/modify; non-void ReplacedElement
+                }
+                if (allChanges != 0) {
+                    allChanges->push_back(
+                        css::util::ElementChange(
+                            css::uno::makeAny(
+                                child->getRelativePathRepresentation()),
+                            child->asValue(), css::uno::Any()));
+                        //TODO: non-void ReplacedElement
+                }
+                OSL_ASSERT(!collectPropChanges);
+                break;
+            case Node::KIND_PROPERTY:
+                {
+                    for (ContainerListeners::iterator j(
+                             containerListeners_.begin());
+                         j != containerListeners_.end(); ++j)
+                    {
+                        broadcaster->addContainerElementReplacedNotification(
+                            *j,
+                            css::container::ContainerEvent(
+                                static_cast< cppu::OWeakObject * >(this),
+                                css::uno::makeAny(i->first), child->asValue(),
+                                css::uno::Any()));
+                            //TODO: distinguish add/remove/modify; non-void
+                            // ReplacedElement
+                    }
+                    PropertyChangeListeners::iterator j(
+                        propertyChangeListeners_.find(i->first));
+                    if (j != propertyChangeListeners_.end()) {
+                        for (PropertyChangeListenersElement::iterator k(
+                                 j->second.begin());
+                             k != j->second.end(); ++k)
+                        {
+                            broadcaster->addPropertyChangeNotification(
+                                *k,
+                                css::beans::PropertyChangeEvent(
+                                    static_cast< cppu::OWeakObject * >(this),
+                                    i->first, false, -1, css::uno::Any(),
+                                    css::uno::Any()));
+                        }
+                    }
+                    j = propertyChangeListeners_.find(rtl::OUString());
+                    if (j != propertyChangeListeners_.end()) {
+                        for (PropertyChangeListenersElement::iterator k(
+                                 j->second.begin());
+                             k != j->second.end(); ++k)
+                        {
+                            broadcaster->addPropertyChangeNotification(
+                                *k,
+                                css::beans::PropertyChangeEvent(
+                                    static_cast< cppu::OWeakObject * >(this),
+                                    i->first, false, -1, css::uno::Any(),
+                                    css::uno::Any()));
+                        }
+                    }
+                    if (allChanges != 0) {
+                        allChanges->push_back(
+                            css::util::ElementChange(
+                                css::uno::makeAny(
+                                    child->getRelativePathRepresentation()),
+                                child->asValue(), css::uno::Any()));
+                            //TODO: non-void ReplacedElement
+                    }
+                    if (collectPropChanges) {
+                        propChanges.push_back(
+                            css::beans::PropertyChangeEvent(
+                                static_cast< cppu::OWeakObject * >(this),
+                                i->first, false, -1, css::uno::Any(),
+                                css::uno::Any()));
+                    }
+                }
+                break;
+            case Node::KIND_GROUP:
+            case Node::KIND_SET:
+                if (i->second.children.empty()) {
+                    if (child->getNode()->getTemplateName().getLength() != 0) {
+                        for (ContainerListeners::iterator j(
+                                 containerListeners_.begin());
+                             j != containerListeners_.end(); ++j)
+                        {
+                            broadcaster->
+                                addContainerElementInsertedNotification(
+                                    *j,
+                                    css::container::ContainerEvent(
+                                        static_cast< cppu::OWeakObject * >(
+                                            this),
+                                        css::uno::makeAny(i->first),
+                                        child->asValue(), css::uno::Any()));
+                        }
+                        if (allChanges != 0) {
+                            allChanges->push_back(
+                                css::util::ElementChange(
+                                    css::uno::makeAny(
+                                        child->getRelativePathRepresentation()),
+                                    css::uno::Any(), css::uno::Any()));
+                                //TODO: non-void Element, ReplacedElement
+                        }
+                    }
+                    // else: spurious Modifications::Node not representing a
+                    // change
+                } else {
+                    child->initBroadcasterAndChanges(
+                        i->second, broadcaster, allChanges);
+                        //TODO: if allChanges==0, recurse only into children w/
+                        // listeners
+                }
+                break;
+            }
+        } else {
+            switch (getNode()->kind()) {
+            case Node::KIND_LOCALIZED_PROPERTY:
+                // Removed localized property value:
+                OSL_ASSERT(
+                    Components::allLocales(getRootAccess()->getLocale()));
+                for (ContainerListeners::iterator j(
+                         containerListeners_.begin());
+                     j != containerListeners_.end(); ++j)
+                {
+                    broadcaster->addContainerElementRemovedNotification(
+                        *j,
+                        css::container::ContainerEvent(
+                            static_cast< cppu::OWeakObject * >(this),
+                            css::uno::makeAny(i->first), css::uno::Any(),
+                            css::uno::Any()));
+                        //TODO: non-void ReplacedElement
+                }
+                if (allChanges != 0) {
+                    rtl::OUStringBuffer path(getRelativePathRepresentation());
+                    if (path.getLength() != 0) {
+                        path.append(sal_Unicode('/'));
+                    }
+                    path.append(
+                        Data::createSegment(
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")),
+                            i->first));
+                    allChanges->push_back(
+                        css::util::ElementChange(
+                            css::uno::makeAny(path.makeStringAndClear()),
+                            css::uno::Any(), css::uno::Any()));
+                        //TODO: non-void ReplacedElement
+                }
+                OSL_ASSERT(!collectPropChanges);
+                break;
+            case Node::KIND_GROUP:
+                {
+                    // Removed (non-localized) extension property:
+                    for (ContainerListeners::iterator j(
+                             containerListeners_.begin());
+                         j != containerListeners_.end(); ++j)
+                    {
+                        broadcaster->addContainerElementRemovedNotification(
+                            *j,
+                            css::container::ContainerEvent(
+                                static_cast< cppu::OWeakObject * >(this),
+                                css::uno::makeAny(i->first), css::uno::Any(),
+                                css::uno::Any()));
+                            //TODO: non-void ReplacedElement
+                    }
+                    PropertyChangeListeners::iterator j(
+                        propertyChangeListeners_.find(i->first));
+                    if (j != propertyChangeListeners_.end()) {
+                        for (PropertyChangeListenersElement::iterator k(
+                                 j->second.begin());
+                             k != j->second.end(); ++k)
+                        {
+                            broadcaster->addPropertyChangeNotification(
+                                *k,
+                                css::beans::PropertyChangeEvent(
+                                    static_cast< cppu::OWeakObject * >(this),
+                                    i->first, false, -1, css::uno::Any(),
+                                    css::uno::Any()));
+                        }
+                    }
+                    j = propertyChangeListeners_.find(rtl::OUString());
+                    if (j != propertyChangeListeners_.end()) {
+                        for (PropertyChangeListenersElement::iterator k(
+                                 j->second.begin());
+                             k != j->second.end(); ++k)
+                        {
+                            broadcaster->addPropertyChangeNotification(
+                                *k,
+                                css::beans::PropertyChangeEvent(
+                                    static_cast< cppu::OWeakObject * >(this),
+                                    i->first, false, -1, css::uno::Any(),
+                                    css::uno::Any()));
+                        }
+                    }
+                    if (allChanges != 0) {
+                        rtl::OUStringBuffer path(
+                            getRelativePathRepresentation());
+                        if (path.getLength() != 0) {
+                            path.append(sal_Unicode('/'));
+                        }
+                        path.append(i->first);
+                        allChanges->push_back(
+                            css::util::ElementChange(
+                                css::uno::makeAny(path.makeStringAndClear()),
+                                css::uno::Any(), css::uno::Any()));
+                            //TODO: non-void ReplacedElement
+                    }
+                    if (collectPropChanges) {
+                        propChanges.push_back(
+                            css::beans::PropertyChangeEvent(
+                                static_cast< cppu::OWeakObject * >(this),
+                                i->first, false, -1, css::uno::Any(),
+                                css::uno::Any()));
+                    }
+                }
+                break;
+            case Node::KIND_SET:
+                // Removed set member:
+                if (i->second.children.empty()) {
+                    for (ContainerListeners::iterator j(
+                             containerListeners_.begin());
+                         j != containerListeners_.end(); ++j)
+                    {
+                        broadcaster->addContainerElementRemovedNotification(
+                            *j,
+                            css::container::ContainerEvent(
+                                static_cast< cppu::OWeakObject * >(this),
+                                css::uno::makeAny(i->first),
+                                css::uno::Any(), css::uno::Any()));
+                            //TODO: non-void ReplacedElement
+                    }
+                    //TODO: if (allChanges != 0) {
+                    //  allChanges->push_back(
+                    //      css::util::ElementChange(
+                    //          css::uno::makeAny(...),
+                    //          css::uno::Any(), css::uno::Any()));
+                    //      //TODO: non-void ReplacedElement
+                    //}
+                }
+                // else: spurious Modifications::Node not representing a change
+                break;
+            default:
+                OSL_ASSERT(false); // this cannot happen
+                break;
+            }
+        }
+    }
+    if (!propChanges.empty()) {
+        css::uno::Sequence< css::beans::PropertyChangeEvent > seq(
+            propChanges.getAsConstList());
+        for (PropertiesChangeListeners::iterator i(
+                 propertiesChangeListeners_.begin());
+             i != propertiesChangeListeners_.end(); ++i)
+        {
+            broadcaster->addPropertiesChangeNotification(*i, seq);
+        }
+    }
+}
+
+bool Access::isDisposed() const {
+    return disposed_;
+}
+
+Access::ModifiedChild::ModifiedChild() {}
+
+Access::ModifiedChild::ModifiedChild(
+    rtl::Reference< ChildAccess > const & theChild, bool theDirectlyModified):
+    child(theChild), directlyModified(theDirectlyModified)
+{}
+
+css::uno::Sequence< css::uno::Type > Access::getTypes()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    comphelper::SequenceAsVector< css::uno::Type > types;
+    types.push_back(cppu::UnoType< css::uno::XInterface >::get());
+    types.push_back(cppu::UnoType< css::uno::XWeak >::get());
+    types.push_back(cppu::UnoType< css::lang::XTypeProvider >::get());
+    types.push_back(cppu::UnoType< css::lang::XServiceInfo >::get());
+    types.push_back(cppu::UnoType< css::lang::XComponent >::get());
+    types.push_back(
+        cppu::UnoType< css::container::XHierarchicalNameAccess >::get());
+    types.push_back(cppu::UnoType< css::container::XContainer >::get());
+    types.push_back(cppu::UnoType< css::beans::XExactName >::get());
+    types.push_back(cppu::UnoType< css::container::XHierarchicalName >::get());
+    types.push_back(cppu::UnoType< css::container::XNamed >::get());
+    types.push_back(cppu::UnoType< css::beans::XProperty >::get());
+    types.push_back(cppu::UnoType< css::container::XElementAccess >::get());
+    types.push_back(cppu::UnoType< css::container::XNameAccess >::get());
+    if (getNode()->kind() == Node::KIND_GROUP) {
+        types.push_back(cppu::UnoType< css::beans::XPropertySetInfo >::get());
+        types.push_back(cppu::UnoType< css::beans::XPropertySet >::get());
+        types.push_back(cppu::UnoType< css::beans::XMultiPropertySet >::get());
+        types.push_back(
+            cppu::UnoType< css::beans::XHierarchicalPropertySet >::get());
+        types.push_back(
+            cppu::UnoType< css::beans::XMultiHierarchicalPropertySet >::get());
+        types.push_back(
+            cppu::UnoType< css::beans::XHierarchicalPropertySetInfo >::get());
+    }
+    if (getRootAccess()->isUpdate()) {
+        types.push_back(cppu::UnoType< css::container::XNameReplace >::get());
+        if (getNode()->kind() != Node::KIND_GROUP ||
+            dynamic_cast< GroupNode * >(getNode().get())->isExtensible())
+        {
+            types.push_back(
+                cppu::UnoType< css::container::XNameContainer >::get());
+        }
+        if (getNode()->kind() == Node::KIND_SET) {
+            types.push_back(
+                cppu::UnoType< css::lang::XSingleServiceFactory >::get());
+        }
+    }
+    addTypes(&types);
+    return types.getAsConstList();
+}
+
+css::uno::Sequence< sal_Int8 > Access::getImplementationId()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return css::uno::Sequence< sal_Int8 >();
+}
+
+rtl::OUString Access::getImplementationName() throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "configmgr Access has no service implementation name")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    css::uno::Sequence< rtl::OUString > names(getSupportedServiceNames());
+    for (sal_Int32 i = 0; i < names.getLength(); ++i) {
+        if (names[i] == ServiceName) {
+            return true;
+        }
+    }
+    return false;
+}
+
+css::uno::Sequence< rtl::OUString > Access::getSupportedServiceNames()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    comphelper::SequenceAsVector< rtl::OUString > services;
+    services.push_back(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationAccess")));
+    if (getRootAccess()->isUpdate()) {
+        services.push_back(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationUpdateAccess")));
+    }
+    services.push_back(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.HierarchyAccess")));
+    services.push_back(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.HierarchyElement")));
+    if (getNode()->kind() == Node::KIND_GROUP) {
+        services.push_back(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.GroupAccess")));
+        services.push_back(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.PropertyHierarchy")));
+        if (getRootAccess()->isUpdate()) {
+            services.push_back(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.GroupUpdate")));
+        }
+    } else {
+        services.push_back(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.SetAccess")));
+        services.push_back(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.SimpleSetAccess")));
+        if (getRootAccess()->isUpdate()) {
+            services.push_back(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.SetUpdate")));
+            services.push_back(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.SimpleSetUpdate")));
+        }
+    }
+    addSupportedServiceNames(&services);
+    return services.getAsConstList();
+}
+
+void Access::dispose() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_ANY));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        if (getParentAccess().is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr dispose inappropriate Access")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (disposed_) {
+            return;
+        }
+        initDisposeBroadcaster(&bc);
+        clearListeners();
+        disposed_ = true;
+    }
+    bc.send();
+}
+
+void Access::addEventListener(
+    css::uno::Reference< css::lang::XEventListener > const & xListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        if (!xListener.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (!disposed_) {
+            disposeListeners_.insert(xListener);
+            return;
+        }
+    }
+    try {
+        xListener->disposing(
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    } catch (css::lang::DisposedException &) {}
+}
+
+void Access::removeEventListener(
+    css::uno::Reference< css::lang::XEventListener > const & aListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    DisposeListeners::iterator i(disposeListeners_.find(aListener));
+    if (i != disposeListeners_.end()) {
+        disposeListeners_.erase(i);
+    }
+}
+
+css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    rtl::Reference< Node > p(getNode());
+    switch (p->kind()) {
+    case Node::KIND_LOCALIZED_PROPERTY:
+        return mapType(
+            dynamic_cast< LocalizedPropertyNode * >(p.get())->getStaticType());
+    case Node::KIND_GROUP:
+        //TODO: Should a specific type be returned for a non-extensible group
+        // with homogeneous members or for an extensible group that currently
+        // has only homegeneous members?
+        return cppu::UnoType< cppu::UnoVoidType >::get();
+    case Node::KIND_SET:
+        return cppu::UnoType< cppu::UnoVoidType >::get(); //TODO: correct?
+    default:
+        OSL_ASSERT(false);
+        throw css::uno::RuntimeException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+}
+
+sal_Bool Access::hasElements() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return !getAllChildren().empty(); //TODO: optimize
+}
+
+css::uno::Any Access::getByName(rtl::OUString const & aName)
+    throw (
+        css::container::NoSuchElementException,
+        css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    rtl::Reference< ChildAccess > child(getChild(aName));
+    if (!child.is()) {
+        throw css::container::NoSuchElementException(
+            aName, static_cast< cppu::OWeakObject * >(this));
+    }
+    return child->asValue();
+}
+
+css::uno::Sequence< rtl::OUString > Access::getElementNames()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
+    comphelper::SequenceAsVector< rtl::OUString > names;
+    for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
+             children.begin());
+         i != children.end(); ++i)
+    {
+        names.push_back((*i)->getNameInternal());
+    }
+    return names.getAsConstList();
+}
+
+sal_Bool Access::hasByName(rtl::OUString const & aName)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return getChild(aName).is();
+}
+
+css::uno::Any Access::getByHierarchicalName(rtl::OUString const & aName)
+    throw (css::container::NoSuchElementException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    rtl::Reference< ChildAccess > child(getSubChild(aName));
+    if (!child.is()) {
+        throw css::container::NoSuchElementException(
+            aName, static_cast< cppu::OWeakObject * >(this));
+    }
+    return child->asValue();
+}
+
+sal_Bool Access::hasByHierarchicalName(rtl::OUString const & aName)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return getSubChild(aName).is();
+}
+
+void Access::addContainerListener(
+    css::uno::Reference< css::container::XContainerListener > const & xListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        if (!xListener.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (!disposed_) {
+            containerListeners_.insert(xListener);
+            return;
+        }
+    }
+    try {
+        xListener->disposing(
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    } catch (css::lang::DisposedException &) {}
+}
+
+void Access::removeContainerListener(
+    css::uno::Reference< css::container::XContainerListener > const & xListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    ContainerListeners::iterator i(containerListeners_.find(xListener));
+    if (i != containerListeners_.end()) {
+        containerListeners_.erase(i);
+    }
+}
+
+rtl::OUString Access::getExactName(rtl::OUString const & aApproximateName)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return aApproximateName;
+}
+
+css::uno::Sequence< css::beans::Property > Access::getProperties()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
+    comphelper::SequenceAsVector< css::beans::Property > properties;
+    for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
+             children.begin());
+         i != children.end(); ++i)
+    {
+        properties.push_back((*i)->asProperty());
+    }
+    return properties.getAsConstList();
+}
+
+css::beans::Property Access::getPropertyByName(rtl::OUString const & aName)
+    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    rtl::Reference< ChildAccess > child(getChild(aName));
+    if (!child.is()) {
+        throw css::beans::UnknownPropertyException(
+            aName, static_cast< cppu::OWeakObject * >(this));
+    }
+    return child->asProperty();
+}
+
+sal_Bool Access::hasPropertyByName(rtl::OUString const & Name)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    return getChild(Name).is();
+}
+
+rtl::OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return getRelativePathRepresentation();
+}
+
+rtl::OUString Access::composeHierarchicalName(
+    rtl::OUString const & aRelativeName)
+    throw (
+        css::lang::IllegalArgumentException, css::lang::NoSupportException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    if (aRelativeName.getLength() == 0 || aRelativeName[0] == '/') {
+        throw css::lang::IllegalArgumentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr composeHierarchicalName inappropriate relative"
+                    " name")),
+            static_cast< cppu::OWeakObject * >(this), -1);
+    }
+    rtl::OUStringBuffer path(getRelativePathRepresentation());
+    if (path.getLength() != 0) {
+        path.append(sal_Unicode('/'));
+    }
+    path.append(aRelativeName);
+    return path.makeStringAndClear();
+}
+
+rtl::OUString Access::getName() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return getNameInternal();
+}
+
+void Access::setName(rtl::OUString const & aName)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        checkFinalized();
+        Modifications localMods;
+        switch (getNode()->kind()) {
+        case Node::KIND_GROUP:
+        case Node::KIND_SET:
+            {
+                rtl::Reference< Access > parent(getParentAccess());
+                if (parent.is()) {
+                    rtl::Reference< Node > node(getNode());
+                    if (node->getTemplateName().getLength() != 0) {
+                        rtl::Reference< ChildAccess > other(
+                            parent->getChild(aName));
+                        if (other.get() == this) {
+                            break;
+                        }
+                        if (node->getMandatory() == Data::NO_LAYER &&
+                            !(other.is() && other->isFinalized()))
+                        {
+                            rtl::Reference< RootAccess > root(getRootAccess());
+                            rtl::Reference< ChildAccess > childAccess(
+                                dynamic_cast< ChildAccess * >(this));
+                            localMods.add(getRelativePath());
+                            // unbind() modifies the parent chain that
+                            // markChildAsModified() walks, so order is
+                            // important:
+                            parent->markChildAsModified(childAccess);
+                                //TODO: must not throw
+                            childAccess->unbind(); // must not throw
+                            if (other.is()) {
+                                other->unbind(); // must not throw
+                            }
+                            childAccess->bind(root, parent, aName);
+                                // must not throw
+                            parent->markChildAsModified(childAccess);
+                                //TODO: must not throw
+                            localMods.add(getRelativePath());
+                            break;
+                        }
+                    }
+                }
+            }
+            // fall through
+        case Node::KIND_LOCALIZED_PROPERTY:
+            // renaming a property could only work for an extension property,
+            // but a localized property is never an extension property
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setName inappropriate node")),
+                static_cast< cppu::OWeakObject * >(this));
+        default:
+            OSL_ASSERT(false); // this cannot happen
+            break;
+        }
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return asProperty();
+}
+
+css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    return this;
+}
+
+void Access::setPropertyValue(
+    rtl::OUString const & aPropertyName, css::uno::Any const & aValue)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        if (!getRootAccess()->isUpdate()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setPropertyValue on non-update access")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        Modifications localMods;
+        if (!setChildProperty(aPropertyName, aValue, &localMods)) {
+            throw css::beans::UnknownPropertyException(
+                aPropertyName, static_cast< cppu::OWeakObject * >(this));
+        }
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+css::uno::Any Access::getPropertyValue(rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    rtl::Reference< ChildAccess > child(getChild(PropertyName));
+    if (!child.is()) {
+        throw css::beans::UnknownPropertyException(
+            PropertyName, static_cast< cppu::OWeakObject * >(this));
+    }
+    return child->asValue();
+}
+
+void Access::addPropertyChangeListener(
+    rtl::OUString const & aPropertyName,
+    css::uno::Reference< css::beans::XPropertyChangeListener > const &
+        xListener)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    {
+        osl::MutexGuard g(lock);
+        if (!xListener.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        checkKnownProperty(aPropertyName);
+        if (!disposed_) {
+            propertyChangeListeners_[aPropertyName].insert(xListener);
+            return;
+        }
+    }
+    try {
+        xListener->disposing(
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    } catch (css::lang::DisposedException &) {}
+}
+
+void Access::removePropertyChangeListener(
+    rtl::OUString const & aPropertyName,
+    css::uno::Reference< css::beans::XPropertyChangeListener > const &
+        aListener)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    checkKnownProperty(aPropertyName);
+    PropertyChangeListeners::iterator i(
+        propertyChangeListeners_.find(aPropertyName));
+    if (i != propertyChangeListeners_.end()) {
+        PropertyChangeListenersElement::iterator j(i->second.find(aListener));
+        if (j != i->second.end()) {
+            i->second.erase(j);
+            if (i->second.empty()) {
+                propertyChangeListeners_.erase(i);
+            }
+        }
+    }
+}
+
+void Access::addVetoableChangeListener(
+    rtl::OUString const & PropertyName,
+    css::uno::Reference< css::beans::XVetoableChangeListener > const &
+        aListener)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    {
+        osl::MutexGuard g(lock);
+        if (!aListener.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        checkKnownProperty(PropertyName);
+        if (!disposed_) {
+            vetoableChangeListeners_[PropertyName].insert(aListener);
+            //TODO: actually call vetoableChangeListeners_
+            return;
+        }
+    }
+    try {
+        aListener->disposing(
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    } catch (css::lang::DisposedException &) {}
+}
+
+void Access::removeVetoableChangeListener(
+    rtl::OUString const & PropertyName,
+    css::uno::Reference< css::beans::XVetoableChangeListener > const &
+        aListener)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    checkKnownProperty(PropertyName);
+    VetoableChangeListeners::iterator i(
+        vetoableChangeListeners_.find(PropertyName));
+    if (i != vetoableChangeListeners_.end()) {
+        VetoableChangeListenersElement::iterator j(i->second.find(aListener));
+        if (j != i->second.end()) {
+            i->second.erase(j);
+            if (i->second.empty()) {
+                vetoableChangeListeners_.erase(i);
+            }
+        }
+    }
+}
+
+void Access::setPropertyValues(
+    css::uno::Sequence< rtl::OUString > const & aPropertyNames,
+    css::uno::Sequence< css::uno::Any > const & aValues)
+    throw (
+        css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
+        css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        if (!getRootAccess()->isUpdate()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setPropertyValues on non-update access")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (aPropertyNames.getLength() != aValues.getLength()) {
+            throw css::lang::IllegalArgumentException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setPropertyValues: aPropertyNames/aValues of"
+                        " different length")),
+                static_cast< cppu::OWeakObject * >(this), -1);
+        }
+        Modifications localMods;
+        for (sal_Int32 i = 0; i < aPropertyNames.getLength(); ++i) {
+            if (!setChildProperty(aPropertyNames[i], aValues[i], &localMods)) {
+                throw css::lang::IllegalArgumentException(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "configmgr setPropertyValues inappropriate property"
+                            " name")),
+                    static_cast< cppu::OWeakObject * >(this), -1);
+            }
+        }
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
+    css::uno::Sequence< rtl::OUString > const & aPropertyNames)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    css::uno::Sequence< css::uno::Any > vals(aPropertyNames.getLength());
+    for (sal_Int32 i = 0; i < aPropertyNames.getLength(); ++i) {
+        rtl::Reference< ChildAccess > child(getChild(aPropertyNames[i]));
+        if (!child.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr getPropertyValues inappropriate property"
+                        " name")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        vals[i] = child->asValue();
+    }
+    return vals;
+}
+
+void Access::addPropertiesChangeListener(
+    css::uno::Sequence< rtl::OUString > const &,
+    css::uno::Reference< css::beans::XPropertiesChangeListener > const &
+        xListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    {
+        osl::MutexGuard g(lock);
+        if (!xListener.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (!disposed_) {
+            propertiesChangeListeners_.insert(xListener);
+            return;
+        }
+    }
+    try {
+        xListener->disposing(
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    } catch (css::lang::DisposedException &) {}
+}
+
+void Access::removePropertiesChangeListener(
+    css::uno::Reference< css::beans::XPropertiesChangeListener > const &
+        xListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    PropertiesChangeListeners::iterator i(
+        propertiesChangeListeners_.find(xListener));
+    if (i != propertiesChangeListeners_.end()) {
+        propertiesChangeListeners_.erase(i);
+    }
+}
+
+void Access::firePropertiesChangeEvent(
+    css::uno::Sequence< rtl::OUString > const & aPropertyNames,
+    css::uno::Reference< css::beans::XPropertiesChangeListener > const &
+        xListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    css::uno::Sequence< css::beans::PropertyChangeEvent > events(
+        aPropertyNames.getLength());
+    for (sal_Int32 i = 0; i < events.getLength(); ++i) {
+        events[i].Source = static_cast< cppu::OWeakObject * >(this);
+        events[i].PropertyName = aPropertyNames[i];
+        events[i].Further = false;
+        events[i].PropertyHandle = -1;
+    }
+    xListener->propertiesChange(events);
+}
+
+css::uno::Reference< css::beans::XHierarchicalPropertySetInfo >
+Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_GROUP));
+    return this;
+}
+
+void Access::setHierarchicalPropertyValue(
+    rtl::OUString const & aHierarchicalPropertyName,
+    css::uno::Any const & aValue)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        if (!getRootAccess()->isUpdate()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setHierarchicalPropertyName on non-update"
+                        " access")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        rtl::Reference< ChildAccess > child(
+            getSubChild(aHierarchicalPropertyName));
+        if (!child.is()) {
+            throw css::beans::UnknownPropertyException(
+                aHierarchicalPropertyName,
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        child->checkFinalized();
+        Modifications localMods;
+        child->setProperty(aValue, &localMods);
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+css::uno::Any Access::getHierarchicalPropertyValue(
+    rtl::OUString const & aHierarchicalPropertyName)
+    throw (
+        css::beans::UnknownPropertyException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    rtl::Reference< ChildAccess > child(getSubChild(aHierarchicalPropertyName));
+    if (!child.is()) {
+        throw css::beans::UnknownPropertyException(
+            aHierarchicalPropertyName,
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    return child->asValue();
+}
+
+void Access::setHierarchicalPropertyValues(
+    css::uno::Sequence< rtl::OUString > const & aHierarchicalPropertyNames,
+    css::uno::Sequence< css::uno::Any > const & Values)
+    throw (
+        css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
+        css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        if (!getRootAccess()->isUpdate()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setPropertyValues on non-update access")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (aHierarchicalPropertyNames.getLength() != Values.getLength()) {
+            throw css::lang::IllegalArgumentException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr setHierarchicalPropertyValues:"
+                        " aHierarchicalPropertyNames/Values of different"
+                        " length")),
+                static_cast< cppu::OWeakObject * >(this), -1);
+        }
+        Modifications localMods;
+        for (sal_Int32 i = 0; i < aHierarchicalPropertyNames.getLength(); ++i) {
+            rtl::Reference< ChildAccess > child(
+                getSubChild(aHierarchicalPropertyNames[i]));
+            if (!child.is()) {
+                throw css::lang::IllegalArgumentException(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "configmgr setHierarchicalPropertyValues"
+                            " inappropriate property name")),
+                    static_cast< cppu::OWeakObject * >(this), -1);
+            }
+            child->checkFinalized();
+            child->setProperty(Values[i], &localMods);
+        }
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
+    css::uno::Sequence< rtl::OUString > const & aHierarchicalPropertyNames)
+    throw (
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    css::uno::Sequence< css::uno::Any > vals(
+        aHierarchicalPropertyNames.getLength());
+    for (sal_Int32 i = 0; i < aHierarchicalPropertyNames.getLength(); ++i) {
+        rtl::Reference< ChildAccess > child(
+            getSubChild(aHierarchicalPropertyNames[i]));
+        if (!child.is()) {
+            throw css::lang::IllegalArgumentException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "configmgr getHierarchicalPropertyValues inappropriate"
+                        " hierarchical property name")),
+                static_cast< cppu::OWeakObject * >(this), -1);
+        }
+        vals[i] = child->asValue();
+    }
+    return vals;
+}
+
+css::beans::Property Access::getPropertyByHierarchicalName(
+    rtl::OUString const & aHierarchicalName)
+    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    rtl::Reference< ChildAccess > child(getSubChild(aHierarchicalName));
+    if (!child.is()) {
+        throw css::beans::UnknownPropertyException(
+            aHierarchicalName, static_cast< cppu::OWeakObject * >(this));
+    }
+    return child->asProperty();
+}
+
+sal_Bool Access::hasPropertyByHierarchicalName(
+    rtl::OUString const & aHierarchicalName)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_GROUP));
+    osl::MutexGuard g(lock);
+    return getSubChild(aHierarchicalName).is();
+}
+
+void Access::replaceByName(
+    rtl::OUString const & aName, css::uno::Any const & aElement)
+    throw (
+        css::lang::IllegalArgumentException,
+        css::container::NoSuchElementException,
+        css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_UPDATE));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        rtl::Reference< ChildAccess > child(getChild(aName));
+        if (!child.is()) {
+            throw css::container::NoSuchElementException(
+                aName, static_cast< cppu::OWeakObject * >(this));
+        }
+        child->checkFinalized();
+        Modifications localMods;
+        switch (getNode()->kind()) {
+        case Node::KIND_LOCALIZED_PROPERTY:
+        case Node::KIND_GROUP:
+            child->setProperty(aElement, &localMods);
+            break;
+        case Node::KIND_SET:
+            {
+                rtl::Reference< ChildAccess > freeAcc(
+                    getFreeSetMember(aElement));
+                rtl::Reference< RootAccess > root(getRootAccess());
+                localMods.add(child->getRelativePath());
+                child->unbind(); // must not throw
+                freeAcc->bind(root, this, aName); // must not throw
+                markChildAsModified(freeAcc); //TODO: must not throw
+            }
+            break;
+        default:
+            OSL_ASSERT(false); // this cannot happen
+            break;
+        }
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+void Access::insertByName(
+    rtl::OUString const & aName, css::uno::Any const & aElement)
+    throw (
+        css::lang::IllegalArgumentException,
+        css::container::ElementExistException,
+        css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_EXTENSIBLE|IS_UPDATE));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        checkFinalized();
+        if (getChild(aName).is()) {
+            throw css::container::ElementExistException(
+                aName, static_cast< cppu::OWeakObject * >(this));
+        }
+        Modifications localMods;
+        switch (getNode()->kind()) {
+        case Node::KIND_LOCALIZED_PROPERTY:
+            insertLocalizedValueChild(aName, aElement, &localMods);
+            break;
+        case Node::KIND_GROUP:
+            {
+                checkValue(aElement, TYPE_ANY, true);
+                rtl::Reference< ChildAccess > child(
+                    new ChildAccess(
+                        components_, getRootAccess(), this, aName,
+                        new PropertyNode(
+                            Data::NO_LAYER, TYPE_ANY, true, aElement, true)));
+                markChildAsModified(child);
+                localMods.add(child->getRelativePath());
+            }
+            break;
+        case Node::KIND_SET:
+            {
+                rtl::Reference< ChildAccess > freeAcc(
+                    getFreeSetMember(aElement));
+                freeAcc->bind(getRootAccess(), this, aName); // must not throw
+                markChildAsModified(freeAcc); //TODO: must not throw
+                localMods.add(freeAcc->getRelativePath());
+            }
+            break;
+        default:
+            OSL_ASSERT(false); // this cannot happen
+            break;
+        }
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+void Access::removeByName(rtl::OUString const & aName)
+    throw (
+        css::container::NoSuchElementException,
+        css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_EXTENSIBLE|IS_UPDATE));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        rtl::Reference< ChildAccess > child(getChild(aName));
+        if (!child.is() || child->isFinalized() ||
+            child->getNode()->getMandatory() != Data::NO_LAYER)
+        {
+            throw css::container::NoSuchElementException(
+                aName, static_cast< cppu::OWeakObject * >(this));
+        }
+        if (getNode()->kind() == Node::KIND_GROUP) {
+            rtl::Reference< Node > p(child->getNode());
+            if (p->kind() != Node::KIND_PROPERTY ||
+                !dynamic_cast< PropertyNode * >(p.get())->isExtension())
+            {
+                throw css::container::NoSuchElementException(
+                    aName, static_cast< cppu::OWeakObject * >(this));
+            }
+        }
+        Modifications localMods;
+        localMods.add(child->getRelativePath());
+        // unbind() modifies the parent chain that markChildAsModified() walks,
+        // so order is important:
+        markChildAsModified(child); //TODO: must not throw
+        child->unbind();
+        getNotificationRoot()->initBroadcaster(localMods.getRoot(), &bc);
+    }
+    bc.send();
+}
+
+css::uno::Reference< css::uno::XInterface > Access::createInstance()
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_SET|IS_UPDATE));
+    rtl::OUString tmplName(
+        dynamic_cast< SetNode * >(getNode().get())->getDefaultTemplateName());
+    rtl::Reference< Node > tmpl(
+        components_.getTemplate(Data::NO_LAYER, tmplName));
+    if (!tmpl.is()) {
+        throw css::uno::Exception(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown template ")) +
+             tmplName),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    rtl::Reference< Node > node(tmpl->clone());
+    node->setLayer(Data::NO_LAYER);
+    return static_cast< cppu::OWeakObject * >(
+        new ChildAccess(components_, getRootAccess(), node));
+}
+
+css::uno::Reference< css::uno::XInterface > Access::createInstanceWithArguments(
+    css::uno::Sequence< css::uno::Any > const & aArguments)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_SET|IS_UPDATE));
+    if (aArguments.getLength() != 0) {
+        throw css::uno::Exception(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configuration SimpleSetUpdate createInstanceWithArguments"
+                    " must not specify any arguments")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    return createInstance();
+}
+
+rtl::Reference< ChildAccess > Access::getModifiedChild(
+    ModifiedChildren::iterator const & childIterator)
+{
+    return (childIterator->second.child->getParentAccess() == this &&
+            (childIterator->second.child->getNameInternal() ==
+             childIterator->first))
+        ? childIterator->second.child : rtl::Reference< ChildAccess >();
+}
+
+rtl::Reference< ChildAccess > Access::getUnmodifiedChild(
+    rtl::OUString const & name)
+{
+    OSL_ASSERT(modifiedChildren_.find(name) == modifiedChildren_.end());
+    rtl::Reference< Node > node(getNode()->getMember(name));
+    if (!node.is()) {
+        return rtl::Reference< ChildAccess >();
+    }
+    WeakChildMap::iterator i(cachedChildren_.find(name));
+    if (i != cachedChildren_.end()) {
+        rtl::Reference< ChildAccess > child;
+        if (i->second->acquireCounting() > 1) {
+            child.set(i->second); // must not throw
+        }
+        i->second->releaseNondeleting();
+        if (child.is()) {
+            child->setNode(node);
+            return child;
+        }
+    }
+    rtl::Reference< ChildAccess > child(
+        new ChildAccess(components_, getRootAccess(), this, name, node));
+    cachedChildren_[name] = child.get();
+    return child;
+}
+
+rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
+    rtl::OUString name;
+    bool setElement;
+    rtl::OUString templateName;
+    sal_Int32 i = Data::parseSegment(
+        path, 0, &name, &setElement, &templateName);
+    if (i == -1 || (i != path.getLength() && path[i] != '/')) {
+        return rtl::Reference< ChildAccess >();
+    }
+    rtl::Reference< ChildAccess > child(getChild(name));
+    if (!child.is()) {
+        return rtl::Reference< ChildAccess >();
+    }
+    if (setElement) {
+        rtl::Reference< Node > p(getNode());
+        switch (p->kind()) {
+        case Node::KIND_LOCALIZED_PROPERTY:
+            if (!Components::allLocales(getRootAccess()->getLocale()) ||
+                templateName.getLength() != 0)
+            {
+                return rtl::Reference< ChildAccess >();
+            }
+            break;
+        case Node::KIND_SET:
+            if (templateName.getLength() != 0 &&
+                !dynamic_cast< SetNode * >(p.get())->isValidTemplate(
+                    templateName))
+            {
+                return rtl::Reference< ChildAccess >();
+            }
+            break;
+        default:
+            return rtl::Reference< ChildAccess >();
+        }
+    }
+    // For backwards compatibility, ignore a final slash after non-value nodes:
+    return child->isValue()
+        ? (i == path.getLength() ? child : rtl::Reference< ChildAccess >())
+        : (i >= path.getLength() - 1
+           ? child : child->getSubChild(path.copy(i + 1)));
+}
+
+bool Access::setChildProperty(
+    rtl::OUString const & name, css::uno::Any const & value,
+    Modifications * localModifications)
+{
+    OSL_ASSERT(localModifications != 0);
+    rtl::Reference< ChildAccess > child(getChild(name));
+    if (!child.is()) {
+        return false;
+    }
+    child->checkFinalized();
+    child->setProperty(value, localModifications);
+    return true;
+}
+
+css::beans::Property Access::asProperty() {
+    css::uno::Type type;
+    bool nillable;
+    bool removable;
+    rtl::Reference< Node > p(getNode());
+    switch (p->kind()) {
+    case Node::KIND_PROPERTY:
+        {
+            PropertyNode * prop = dynamic_cast< PropertyNode * >(p.get());
+            type = mapType(prop->getStaticType());
+            nillable = prop->isNillable();
+            removable = prop->isExtension();
+        }
+        break;
+    case Node::KIND_LOCALIZED_PROPERTY:
+        {
+            LocalizedPropertyNode * locprop =
+                dynamic_cast< LocalizedPropertyNode *>(p.get());
+            if (Components::allLocales(getRootAccess()->getLocale())) {
+                type = cppu::UnoType< css::uno::XInterface >::get();
+                    //TODO: correct?
+                removable = false;
+            } else {
+                type = mapType(locprop->getStaticType());
+                removable = false; //TODO ???
+            }
+            nillable = locprop->isNillable();
+        }
+        break;
+    case Node::KIND_LOCALIZED_VALUE:
+        {
+            LocalizedPropertyNode * locprop =
+                dynamic_cast< LocalizedPropertyNode * >(getParentNode().get());
+            type = mapType(locprop->getStaticType());
+            nillable = locprop->isNillable();
+            removable = false; //TODO ???
+        }
+        break;
+    default:
+        type = cppu::UnoType< css::uno::XInterface >::get(); //TODO: correct?
+        nillable = false;
+        removable = getParentNode()->kind() == Node::KIND_SET;
+        break;
+    }
+    return css::beans::Property(
+        getNameInternal(), -1, type,
+        (css::beans::PropertyAttribute::BOUND | //TODO: correct for group/set?
+         css::beans::PropertyAttribute::CONSTRAINED |
+         (nillable ? css::beans::PropertyAttribute::MAYBEVOID : 0) |
+         (getRootAccess()->isUpdate()
+          ? (removable ? css::beans::PropertyAttribute::REMOVEABLE : 0)
+          : css::beans::PropertyAttribute::READONLY))); //TODO: MAYBEDEFAULT
+}
+
+void Access::checkFinalized() {
+    if (isFinalized()) {
+        throw css::lang::IllegalArgumentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr modification of finalized item")),
+            static_cast< cppu::OWeakObject * >(this), -1);
+    }
+}
+
+void Access::checkKnownProperty(rtl::OUString const & descriptor) {
+    if (descriptor.getLength() == 0) {
+        return;
+    }
+    rtl::Reference< ChildAccess > child(getChild(descriptor));
+    if (child.is()) {
+        switch (child->getNode()->kind()) {
+        case Node::KIND_PROPERTY:
+            return;
+        case Node::KIND_LOCALIZED_PROPERTY:
+            if (!Components::allLocales(getRootAccess()->getLocale())) {
+                return;
+            }
+            break;
+        case Node::KIND_LOCALIZED_VALUE:
+            if (Components::allLocales(getRootAccess()->getLocale())) {
+                return;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    throw css::beans::UnknownPropertyException(
+        descriptor, static_cast< cppu::OWeakObject * >(this));
+}
+
+rtl::Reference< ChildAccess > Access::getFreeSetMember(
+    css::uno::Any const & value)
+{
+    rtl::Reference< ChildAccess > freeAcc;
+    css::uno::Reference< css::lang::XUnoTunnel > tunnel;
+    value >>= tunnel;
+    if (tunnel.is()) {
+        freeAcc.set(
+            reinterpret_cast< ChildAccess * >(
+                tunnel->getSomething(ChildAccess::getTunnelId())));
+    }
+    if (!freeAcc.is() || freeAcc->getParentAccess().is() ||
+        (freeAcc->isInTransaction() &&
+         freeAcc->getRootAccess() != getRootAccess()))
+    {
+        throw css::lang::IllegalArgumentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr inappropriate set element")),
+            static_cast< cppu::OWeakObject * >(this), 1);
+    }
+    OSL_ASSERT(dynamic_cast< SetNode * >(getNode().get()) != 0);
+    if (!dynamic_cast< SetNode * >(getNode().get())->isValidTemplate(
+            freeAcc->getNode()->getTemplateName()))
+    {
+        throw css::lang::IllegalArgumentException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr inappropriate set element")),
+            static_cast< cppu::OWeakObject * >(this), 1);
+    }
+    return freeAcc;
+}
+
+rtl::Reference< Access > Access::getNotificationRoot() {
+    for (rtl::Reference< Access > p(this);;) {
+        rtl::Reference< Access > parent(p->getParentAccess());
+        if (!parent.is()) {
+            return p;
+        }
+        p = parent;
+    }
+}
+
+#if OSL_DEBUG_LEVEL > 0
+bool Access::thisIs(int what) {
+    osl::MutexGuard g(lock);
+    rtl::Reference< Node > p(getNode());
+    Node::Kind k(p->kind());
+    return k != Node::KIND_PROPERTY && k != Node::KIND_LOCALIZED_VALUE &&
+        ((what & IS_GROUP) == 0 || k == Node::KIND_GROUP) &&
+        ((what & IS_SET) == 0 || k == Node::KIND_SET) &&
+        ((what & IS_EXTENSIBLE) == 0 || k != Node::KIND_GROUP ||
+         dynamic_cast< GroupNode * >(p.get())->isExtensible()) &&
+        ((what & IS_GROUP_MEMBER) == 0 ||
+         getParentNode()->kind() == Node::KIND_GROUP) ||
+        ((what & IS_SET_MEMBER) == 0 ||
+         getParentNode()->kind() == Node::KIND_SET) ||
+        ((what & IS_UPDATE) == 0 || getRootAccess()->isUpdate());
+}
+#endif
+
+}
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
new file mode 100644
index 0000000000..8c10aa8cce
--- /dev/null
+++ b/configmgr/source/access.hxx
@@ -0,0 +1,582 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_ACCESS_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_ACCESS_HXX
+
+#include "sal/config.h"
+
+#include <map>
+#include <set>
+#include <vector>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XExactName.hpp"
+#include "com/sun/star/beans/XHierarchicalPropertySet.hpp"
+#include "com/sun/star/beans/XHierarchicalPropertySetInfo.hpp"
+#include "com/sun/star/beans/XMultiHierarchicalPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XProperty.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/container/ElementExistException.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XHierarchicalName.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/interlck.h"
+#include "rtl/ref.hxx"
+#include "sal/types.h"
+
+#include "modifications.hxx"
+#include "path.hxx"
+#include "type.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XHierarchicalPropertySetInfo;
+        class XPropertiesChangeListener;
+        class XPropertyChangeListener;
+        class XVetoableChangeListener;
+        struct Property;
+    }
+    namespace container { class XContainerListener; }
+    namespace lang { class XEventListener; }
+    namespace uno {
+        class Any;
+        class Type;
+        class XInterface;
+    }
+    namespace util { struct ElementChange; }
+} } }
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Broadcaster;
+class Change;
+class ChildAccess;
+class Components;
+class Node;
+class RootAccess;
+
+class Access:
+    public cppu::OWeakObject, public com::sun::star::lang::XTypeProvider,
+    public com::sun::star::lang::XServiceInfo,
+    public com::sun::star::lang::XComponent,
+    public com::sun::star::container::XHierarchicalNameAccess,
+    public com::sun::star::container::XContainer,
+    public com::sun::star::beans::XExactName,
+    public com::sun::star::beans::XPropertySetInfo,
+    public com::sun::star::container::XHierarchicalName,
+    public com::sun::star::container::XNamed,
+    public com::sun::star::beans::XProperty,
+    public com::sun::star::beans::XPropertySet,
+    public com::sun::star::beans::XMultiPropertySet,
+    public com::sun::star::beans::XHierarchicalPropertySet,
+    public com::sun::star::beans::XMultiHierarchicalPropertySet,
+    public com::sun::star::beans::XHierarchicalPropertySetInfo,
+    public com::sun::star::container::XNameContainer,
+    public com::sun::star::lang::XSingleServiceFactory,
+    private boost::noncopyable
+{
+public:
+    oslInterlockedCount acquireCounting();
+
+    void releaseNondeleting();
+
+    bool isValue();
+
+    void markChildAsModified(rtl::Reference< ChildAccess > const & child);
+
+    void releaseChild(rtl::OUString const & name);
+
+    virtual Path getAbsolutePath() = 0;
+
+    virtual Path getRelativePath() = 0;
+
+    virtual rtl::OUString getRelativePathRepresentation() = 0;
+
+    virtual rtl::Reference< Node > getNode() = 0;
+
+    virtual bool isFinalized() = 0;
+
+    virtual void initBroadcaster(
+        Modifications::Node const & modifications, Broadcaster * broadcaster);
+
+    using OWeakObject::acquire;
+    using OWeakObject::release;
+
+protected:
+    Access(Components & components);
+
+    virtual ~Access();
+
+    virtual rtl::OUString getNameInternal() = 0;
+
+    virtual rtl::Reference< RootAccess > getRootAccess() = 0;
+
+    virtual rtl::Reference< Access > getParentAccess() = 0;
+
+    virtual void addTypes(std::vector< com::sun::star::uno::Type > * types)
+        const = 0;
+
+    virtual void addSupportedServiceNames(
+        std::vector< rtl::OUString > * services) = 0;
+
+    virtual void initDisposeBroadcaster(Broadcaster * broadcaster);
+
+    virtual void clearListeners() throw ();
+
+    virtual com::sun::star::uno::Any SAL_CALL queryInterface(
+        com::sun::star::uno::Type const & aType)
+        throw (com::sun::star::uno::RuntimeException);
+
+    Components & getComponents() const;
+
+    void checkLocalizedPropertyAccess();
+
+    rtl::Reference< Node > getParentNode();
+
+    rtl::Reference< ChildAccess > getChild(rtl::OUString const & name);
+
+    std::vector< rtl::Reference< ChildAccess > > getAllChildren();
+
+    void checkValue(
+        com::sun::star::uno::Any const & value, Type type, bool nillable);
+
+    void insertLocalizedValueChild(
+        rtl::OUString const & name, com::sun::star::uno::Any const & value,
+        Modifications * localModifications);
+
+    void reportChildChanges(
+        std::vector< com::sun::star::util::ElementChange > * changes);
+
+    void commitChildChanges(bool valid, Modifications * globalModifications);
+
+    void initBroadcasterAndChanges(
+        Modifications::Node const & modifications, Broadcaster * broadcaster,
+        std::vector< com::sun::star::util::ElementChange > * changes);
+
+    bool isDisposed() const;
+
+private:
+    struct ModifiedChild {
+        rtl::Reference< ChildAccess > child;
+        bool directlyModified;
+
+        ModifiedChild();
+
+        ModifiedChild(
+            rtl::Reference< ChildAccess > const & theChild,
+            bool theDirectlyModified);
+    };
+
+    typedef std::map< rtl::OUString, ModifiedChild > ModifiedChildren;
+
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    getTypes() throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+    getImplementationId() throw (com::sun::star::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL dispose()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addEventListener(
+        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+            const & xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removeEventListener(
+        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+            const & aListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Type SAL_CALL getElementType()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasElements()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Any SAL_CALL getByName(
+        rtl::OUString const & aName)
+        throw (
+            com::sun::star::container::NoSuchElementException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    getElementNames() throw (com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasByName(rtl::OUString const & aName)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Any SAL_CALL getByHierarchicalName(
+        rtl::OUString const & aName)
+        throw (
+            com::sun::star::container::NoSuchElementException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addContainerListener(
+        com::sun::star::uno::Reference<
+            com::sun::star::container::XContainerListener > const & xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removeContainerListener(
+        com::sun::star::uno::Reference<
+            com::sun::star::container::XContainerListener > const & xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getExactName(
+        rtl::OUString const & aApproximateName)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
+    SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::beans::Property SAL_CALL getPropertyByName(
+        rtl::OUString const & aName)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getHierarchicalName()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL composeHierarchicalName(
+        rtl::OUString const & aRelativeName)
+        throw (
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::NoSupportException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getName()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setName(rtl::OUString const & aName)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::beans::Property SAL_CALL getAsProperty()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual
+    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
+    SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setPropertyValue(
+        rtl::OUString const & aPropertyName,
+        com::sun::star::uno::Any const & aValue)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::beans::PropertyVetoException,
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(
+        rtl::OUString const & PropertyName)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addPropertyChangeListener(
+        rtl::OUString const & aPropertyName,
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertyChangeListener > const & xListener)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removePropertyChangeListener(
+        rtl::OUString const & aPropertyName,
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertyChangeListener > const & aListener)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addVetoableChangeListener(
+        rtl::OUString const & PropertyName,
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XVetoableChangeListener > const & aListener)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removeVetoableChangeListener(
+        rtl::OUString const & PropertyName,
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XVetoableChangeListener > const & aListener)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setPropertyValues(
+        com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames,
+        com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+            aValues)
+        throw (
+            com::sun::star::beans::PropertyVetoException,
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL
+    getPropertyValues(
+        com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addPropertiesChangeListener(
+        com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames,
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertiesChangeListener > const &
+                xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removePropertiesChangeListener(
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertiesChangeListener > const &
+                xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL firePropertiesChangeEvent(
+        com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames,
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertiesChangeListener > const &
+                xListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual
+    com::sun::star::uno::Reference<
+        com::sun::star::beans::XHierarchicalPropertySetInfo > SAL_CALL
+    getHierarchicalPropertySetInfo()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setHierarchicalPropertyValue(
+        rtl::OUString const & aHierarchicalPropertyName,
+        com::sun::star::uno::Any const & aValue)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::beans::PropertyVetoException,
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Any SAL_CALL getHierarchicalPropertyValue(
+        rtl::OUString const & aHierarchicalPropertyName)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setHierarchicalPropertyValues(
+        com::sun::star::uno::Sequence< rtl::OUString > const &
+            aHierarchicalPropertyNames,
+        com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+            Values)
+        throw (
+            com::sun::star::beans::PropertyVetoException,
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL
+    getHierarchicalPropertyValues(
+        com::sun::star::uno::Sequence< rtl::OUString > const &
+            aHierarchicalPropertyNames)
+        throw (
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::beans::Property SAL_CALL
+    getPropertyByHierarchicalName(rtl::OUString const & aHierarchicalName)
+        throw (
+            com::sun::star::beans::UnknownPropertyException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName(
+        rtl::OUString const & aHierarchicalName)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL replaceByName(
+        rtl::OUString const & aName, com::sun::star::uno::Any const & aElement)
+        throw (
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::container::NoSuchElementException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL insertByName(
+        rtl::OUString const & aName, com::sun::star::uno::Any const & aElement)
+        throw (
+            com::sun::star::lang::IllegalArgumentException,
+            com::sun::star::container::ElementExistException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removeByName(rtl::OUString const & aName)
+        throw (
+            com::sun::star::container::NoSuchElementException,
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+    SAL_CALL createInstance()
+        throw (
+            com::sun::star::uno::Exception,
+            com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+    SAL_CALL createInstanceWithArguments(
+        com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
+            aArguments)
+        throw (
+            com::sun::star::uno::Exception,
+            com::sun::star::uno::RuntimeException);
+
+    rtl::Reference< ChildAccess > getModifiedChild(
+        ModifiedChildren::iterator const & childIterator);
+
+    rtl::Reference< ChildAccess > getUnmodifiedChild(
+        rtl::OUString const & name);
+
+    rtl::Reference< ChildAccess > getSubChild(rtl::OUString const & path);
+
+    bool setChildProperty(
+        rtl::OUString const & name, com::sun::star::uno::Any const & value,
+        Modifications * localModifications);
+
+    com::sun::star::beans::Property asProperty();
+
+    void checkFinalized();
+
+    void checkKnownProperty(rtl::OUString const & descriptor);
+
+    rtl::Reference< ChildAccess > getFreeSetMember(
+        com::sun::star::uno::Any const & value);
+
+    rtl::Reference< Access > getNotificationRoot();
+
+    typedef std::map< rtl::OUString, ChildAccess * > WeakChildMap;
+
+    typedef
+        std::multiset<
+            com::sun::star::uno::Reference<
+                com::sun::star::lang::XEventListener > >
+        DisposeListeners;
+
+    typedef
+        std::multiset<
+            com::sun::star::uno::Reference<
+                com::sun::star::container::XContainerListener > >
+        ContainerListeners;
+
+    typedef
+        std::multiset<
+            com::sun::star::uno::Reference<
+                com::sun::star::beans::XPropertyChangeListener > >
+        PropertyChangeListenersElement;
+
+    typedef std::map< rtl::OUString, PropertyChangeListenersElement >
+        PropertyChangeListeners;
+
+    typedef
+        std::multiset<
+            com::sun::star::uno::Reference<
+                com::sun::star::beans::XVetoableChangeListener > >
+        VetoableChangeListenersElement;
+
+    typedef std::map< rtl::OUString, VetoableChangeListenersElement >
+        VetoableChangeListeners;
+
+    typedef
+        std::multiset<
+            com::sun::star::uno::Reference<
+                com::sun::star::beans::XPropertiesChangeListener > >
+        PropertiesChangeListeners;
+
+    Components & components_;
+    ModifiedChildren modifiedChildren_;
+    WeakChildMap cachedChildren_;
+    DisposeListeners disposeListeners_;
+    ContainerListeners containerListeners_;
+    PropertyChangeListeners propertyChangeListeners_;
+    VetoableChangeListeners vetoableChangeListeners_;
+    PropertiesChangeListeners propertiesChangeListeners_;
+    bool disposed_;
+
+#if OSL_DEBUG_LEVEL > 0
+protected:
+    enum {
+        IS_ANY = 0, IS_GROUP = 0x01, IS_SET = 0x02, IS_EXTENSIBLE = 0x04,
+        IS_GROUP_MEMBER = 0x08, IS_SET_MEMBER = 0x10, IS_UPDATE = 0x20 };
+    bool thisIs(int what);
+#endif
+};
+
+}
+
+#endif
diff --git a/configmgr/source/api/confevents.cxx b/configmgr/source/api/confevents.cxx
deleted file mode 100644
index b99cd9b1f7..0000000000
--- a/configmgr/source/api/confevents.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: confevents.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_configmgr.hxx"
-
-#include <stdio.h>
-#include <string.h>
-#include "confevents.hxx"
-#include "configexcept.hxx"
-#include "treechangelist.hxx"
-#include <osl/diagnose.h>
-namespace configmgr
-{
-    /////////////////////////////////////////////////////////////////////////
-    ConfigChangeBroadcastHelper::ConfigChangeBroadcastHelper()
-    {
-    }
-
-    ConfigChangeBroadcastHelper::~ConfigChangeBroadcastHelper()
-    {
-        OSL_ENSURE(m_aListeners.begin() == m_aListeners.end(), "Remaining listeners found - forgot to dispose ?");
-        OSL_ENSURE(m_aPathMap.empty(), "Spurious mappings found");
-    }
-
-    /////////////////////////////////////////////////////////////////////////
-    void ConfigChangeBroadcastHelper::dispose(TreeManager * pSource)
-    {
-        disposing(pSource);
-    }
-
-    /////////////////////////////////////////////////////////////////////////
-    void ConfigChangeBroadcastHelper::addListener(configuration::AbsolutePath const& aName, rtl::Reference<INodeListener> const& pHandler)	
-    { 
-        add(aName, pHandler); 
-    }
-
-    void ConfigChangeBroadcastHelper::removeListener(rtl::Reference<INodeListener> const& pHandler)						
-    { 
-        remove(pHandler); 
-    }
-
-    /////////////////////////////////////////////////////////////////////////
-    void ConfigChangeBroadcastHelper::broadcast(TreeChangeList const& anUpdate, sal_Bool bError, TreeManager * pSource)
-    {
-        dispatch(anUpdate, bError, pSource);
-    }
-
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::add(configuration::AbsolutePath const& aName, rtl::Reference<INodeListener> const& pListener) 
-{
-    osl::MutexGuard aGuard(m_aListeners.mutex);
-
-    internal::BroadcastImplHelper<internal::NodeListenerInfo>::Interfaces::iterator aAdded = m_aListeners.addListener(internal::NodeListenerInfo(pListener));
-    aAdded->addPath(aName);
-    m_aPathMap.insert(PathMap::value_type(aName,aAdded));
-}
-
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::remove(rtl::Reference<INodeListener> const& pListener) 
-{
-    osl::MutexGuard aGuard(m_aListeners.mutex);
-
-    internal::BroadcastImplHelper<internal::NodeListenerInfo>::Interfaces::const_iterator const iter = m_aListeners.find(pListener);
-    if (iter != m_aListeners.end())
-    {
-        internal::NodeListenerInfo::Pathes const& pathes = iter->pathList();
-
-        // first clear the Path Map
-        for(internal::NodeListenerInfo::Pathes::iterator itPath = pathes.begin(); itPath != pathes.end(); ++itPath)
-        {
-            std::pair<PathMap::iterator, PathMap::iterator> aRange = m_aPathMap.equal_range(*itPath);
-            while (aRange.first != aRange.second)
-            {
-                PathMap::iterator cur = aRange.first++;
-                if (cur->second == iter)
-                    m_aPathMap.erase(cur);
-            }
-        }
-
-        // the remove the broadcast helper entry
-        m_aListeners.removeListener(pListener);
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////
-// This should actually be available from the TreeChangeList
-/////////////////////////////////////////////////////////////////////////
-
-static Change const* resolvePath(Change const& rChange, configuration::RelativePath& aRelativePath, RemoveNode const*& pRemoveNode)
-{
-    std::vector<configuration::Path::Component>::const_reverse_iterator aIter;
-
-    OSL_ASSERT(pRemoveNode == NULL);
-    pRemoveNode = NULL;
-
-    Change const* pChange = &rChange;
-    pRemoveNode = dynamic_cast<RemoveNode const*>(pChange);
-
-    std::vector<configuration::Path::Component>::const_reverse_iterator const aEnd(aRelativePath.end());
-
-    for( aIter = aRelativePath.begin();
-         aIter != aEnd;
-         ++aIter)
-    {
-        OSL_ASSERT( pChange != NULL );
-
-        pChange = pChange->getSubChange(aIter->getName());
-
-        if (pChange == NULL) break;
-
-        OSL_ASSERT(pRemoveNode == NULL);
-        OSL_ASSERT(aIter->getName() == pChange->getNodeName());
-
-        pRemoveNode = dynamic_cast<RemoveNode const*>(pChange);
-    }
-
-    if (pRemoveNode)
-    {
-        aRelativePath = configuration::RelativePath( configuration::Path::Rep(aRelativePath.begin(),aIter) );
-        OSL_ASSERT( aRelativePath.getLocalName().getName() == pRemoveNode->getNodeName());
-    }
-    else 
-        OSL_ASSERT( pChange == 0 || configuration::matches(aRelativePath, configuration::RelativePath( configuration::Path::Rep(aRelativePath.begin(),aIter) )) );
-
-    return pChange;
-}
-
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::dispatchInner
-(
-    rtl::Reference<INodeListener> const& pTarget, 
-    configuration::AbsolutePath const& _aTargetPath,
-    Change const& rBaseChange, 
-    configuration::AbsolutePath const& _aChangeLocation,
-    sal_Bool , //_bError, 
-    TreeManager * pSource
-)
-{
-    try
-    {
-        OSL_ASSERT(pTarget.is());
-        OSL_ASSERT( configuration::Path::hasPrefix( _aTargetPath, _aChangeLocation ) );
-
-        configuration::RelativePath aLocalPath = configuration::Path::stripPrefix( _aTargetPath, _aChangeLocation );
-
-        RemoveNode const* pRemoved = 0;
-        Change const* pTargetChange = resolvePath(rBaseChange, aLocalPath, pRemoved );
-
-        OSL_ASSERT( !pTargetChange || matches(_aChangeLocation.compose(aLocalPath),_aTargetPath) );
-
-        if (pRemoved)
-            pTarget->nodeDeleted(_aChangeLocation.compose(aLocalPath), pSource);
-
-        else if (pTargetChange)
-            pTarget->nodeChanged(*pTargetChange, _aTargetPath, pSource);
-
-    }
-    catch (configuration::InvalidName& )
-    {
-        OSL_ENSURE(false,"ConfigChangeBroadcastHelper: Could not dispatch notification: context path mismatch");
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::dispatchOuter
-(
-    rtl::Reference<INodeListener> const& pTarget, 
-    configuration::AbsolutePath const& _aTargetPath,
-    Change const& rBaseChange, 
-    configuration::AbsolutePath const& _aChangeLocation,
-    sal_Bool , //_bError, 
-    TreeManager * pSource
-)
-{
-    { (void)_aTargetPath; }
-    OSL_ASSERT(pTarget.is());
-    OSL_ASSERT( configuration::Path::hasPrefix( _aChangeLocation, _aTargetPath) );
-
-    pTarget->nodeChanged(rBaseChange, _aChangeLocation, pSource);
-}
-
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::dispatch(TreeChangeList const& rList_, sal_Bool _bError, TreeManager * pSource)
-{
-    dispatch(rList_.root, rList_.getRootNodePath(),_bError, pSource);
-}
-
-/////////////////////////////////////////////////////////////////////////
-namespace
-{
-    struct DispatchTarget
-    {
-        DispatchTarget(rtl::Reference<INodeListener> _pTarget, configuration::AbsolutePath const* _pDispatchPath)
-        : pTarget(_pTarget), pDispatchPath( _pDispatchPath) {}
-
-        rtl::Reference<INodeListener>    pTarget;
-        configuration::AbsolutePath const* pDispatchPath;
-    };
-}
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::dispatch
-(
-    Change const& rBaseChange, 
-    configuration::AbsolutePath const& _aChangeLocation,
-    sal_Bool _bError, 
-    TreeManager * pSource
-) 
-{
-    OSL_ENSURE(!_aChangeLocation.isRoot(),"Cannot dispatch changes directly to the root node");
-
-    // listeners registered under multiple sub-pathes will be called multiple times !
-
-    // Collect the targets
-    osl::ClearableMutexGuard aGuard(m_aListeners.mutex);
-
-    // Dispatch listeners to ancestors of the change root
-    std::vector<DispatchTarget> aOuterTargets;
-    if (_aChangeLocation.getDepth() > 1)
-    {
-        configuration::AbsolutePath const aModulePath( configuration::Path::Rep(*_aChangeLocation.begin()) );
-
-        PathMap::const_iterator itOuter = m_aPathMap.lower_bound( aModulePath ); 
-        PathMap::const_iterator const endOuter = m_aPathMap.upper_bound(_aChangeLocation.getParentPath());
-
-        // TODO: Both loops are so similar - they should be a single function
-        while (itOuter != endOuter)
-        {
-            OSL_ASSERT( m_aListeners.find(itOuter->second->get()) != m_aListeners.end() );
-
-            // check whether this should be dispatched at all
-            if ( configuration::Path::hasPrefix(_aChangeLocation,itOuter->first) )
-            {
-                aOuterTargets.push_back( DispatchTarget(itOuter->second->get(), &itOuter->first) );
-            }
-            ++itOuter;
-        }
-    }
-
-    // Dispatch listeners to descendants of the change root
-    std::vector<DispatchTarget> aInnerTargets;
-    {
-        PathMap::const_iterator itInner = m_aPathMap.lower_bound(_aChangeLocation);
-
-        while(	itInner != m_aPathMap.end() && configuration::Path::hasPrefix(itInner->first,_aChangeLocation) )
-        {
-            OSL_ASSERT( m_aListeners.find(itInner->second->get()) != m_aListeners.end() );
-
-            aInnerTargets.push_back( DispatchTarget(itInner->second->get(), &itInner->first) );
-
-            ++itInner;
-        }
-    }
-
-    aGuard.clear();
-
-    {for (std::vector<DispatchTarget>::const_iterator it = aOuterTargets.begin(); it != aOuterTargets.end(); ++it){
-        this->dispatchOuter(it->pTarget, *it->pDispatchPath, rBaseChange, _aChangeLocation, _bError, pSource);
-    }}
-    {for (std::vector<DispatchTarget>::const_iterator it = aInnerTargets.begin(); it != aInnerTargets.end(); ++it){
-        this->dispatchInner(it->pTarget, *it->pDispatchPath, rBaseChange, _aChangeLocation, _bError, pSource);
-    }}
-}
-
-/////////////////////////////////////////////////////////////////////////
-void ConfigChangeBroadcastHelper::disposing(TreeManager * pSource) 
-{
-    osl::ClearableMutexGuard aGuard(m_aListeners.mutex);
-    m_aPathMap.clear();
-
-    aGuard.clear();
-    m_aListeners.disposing(pSource);
-}
-
-} // namespace
-
-
-
diff --git a/configmgr/source/api/confsvccomponent.cxx b/configmgr/source/api/confsvccomponent.cxx
deleted file mode 100644
index a47cf2a7c1..0000000000
--- a/configmgr/source/api/confsvccomponent.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: confsvccomponent.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_configmgr.hxx"
-
-#include "confsvccomponent.hxx"
-#include "datalock.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <cppuhelper/typeprovider.hxx>
-#include <osl/mutex.hxx>
-#include "utility.hxx"
-
-#include <map>
-
-namespace configmgr {
-
-
-    ServiceComponentImpl::ServiceComponentImpl(ServiceImplementationInfo const* aInfo)
-        : ::cppu::WeakComponentImplHelper1< lang::XServiceInfo >(UnoApiLock::getLock())
-        , m_info(aInfo)
-    {
-    }
-
-    void ServiceComponentImpl::disposing()
-    {
-        ::cppu::WeakComponentImplHelper1< lang::XServiceInfo >::disposing();
-    }
-    void ServiceComponentImpl::checkAlive() throw (uno::RuntimeException)
-    {
-        checkAlive("Object was disposed");
-    }
-    void ServiceComponentImpl::checkAlive(rtl::OUString const& sMessage) throw (uno::RuntimeException)
-    {
-        if (rBHelper.bDisposed)
-            throw lang::DisposedException(sMessage, *this);
-    }
-
-    // XTypeProvider
-    uno::Sequence<sal_Int8> ServiceComponentImpl::getStaticImplementationId(ServiceImplementationInfo const* pServiceInfo) 
-        throw(uno::RuntimeException)
-    {
-        static osl::Mutex aMapMutex;
-        static std::map<ServiceImplementationInfo const*, ::cppu::OImplementationId> aIdMap;
-
-        osl::MutexGuard aMapGuard(aMapMutex);
-        return aIdMap[pServiceInfo].getImplementationId();
-    }
-
-    uno::Sequence<sal_Int8> SAL_CALL ServiceComponentImpl::getImplementationId() 
-        throw(uno::RuntimeException)
-    {
-        return getStaticImplementationId(m_info);
-    }
-
-    // XServiceInfo
-    rtl::OUString SAL_CALL ServiceComponentImpl::getImplementationName(  ) throw(uno::RuntimeException)
-    {
-        return ServiceInfoHelper(m_info).getImplementationName();
-    }
-
-    sal_Bool SAL_CALL ServiceComponentImpl::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException)
-    {
-        return ServiceInfoHelper(m_info).supportsService( ServiceName );
-    }
-
-    uno::Sequence< rtl::OUString > SAL_CALL ServiceComponentImpl::getSupportedServiceNames(  ) throw(uno::RuntimeException)
-    {
-        return ServiceInfoHelper(m_info).getSupportedServiceNames( );
-    }
-
-    //ServiceComponentImpl::
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/accessimpl.cxx b/configmgr/source/api2/accessimpl.cxx
deleted file mode 100644
index 69098d7c12..0000000000
--- a/configmgr/source/api2/accessimpl.cxx
+++ /dev/null
@@ -1,807 +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: accessimpl.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_configmgr.hxx"
-#include <stdio.h>
-
-#include "accessimpl.hxx"
-#include "apinodeaccess.hxx"
-#include "valueref.hxx"
-#include "anynoderef.hxx"
-#include "noderef.hxx"
-#include "configset.hxx"
-#include "confignotifier.hxx"
-#include "propertyinfohelper.hxx"
-#include "treeiterators.hxx"
-#include "attributes.hxx"
-#include "apitypes.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/beans/PropertyVetoException.hpp>
-#include <osl/diagnose.h>
-#include <rtl/logfile.hxx>
-
-#define RTL_LOGFILE_OU2A(rtlOUString)	(::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), RTL_TEXTENCODING_ASCII_US).getStr())
-
-namespace configmgr
-{
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------------
-        namespace lang = css::lang;
-        namespace util = css::util;
-
-//-----------------------------------------------------------------------------------
-// Constructors
-//-----------------------------------------------------------------------------------
-
-// Interface methods
-//-----------------------------------------------------------------------------------
-
-
-// XHierarchicalName
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString implGetHierarchicalName( NodeAccess& rNode ) throw(uno::RuntimeException)
-{
-    // RTL_LOGFILE_CONTEXT(aLog, "Configmgr::API::implGetHierarchicalName()");
-
-    rtl::OUString sRet;
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree());
-
-        configuration::AbsolutePath const aFullPath  = aTree->getAbsolutePath(lock.getNode());
-        sRet = aFullPath.toString();
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    return sRet;
-}
-
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString implComposeHierarchicalName(NodeGroupInfoAccess& rNode, const rtl::OUString& sRelativeName )
-    throw(css::lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException)
-{
-    rtl::OUString sRet;
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-        configuration::NodeRef aNode( lock.getNode() );
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-
-        configuration::RelativePath const aAddedPath = configuration::validateRelativePath(sRelativeName, aTree, aNode);
-
-        // TODO: add (relative) name validation based on node type - may then need provider lock
-        configuration::AbsolutePath const aFullPath = aTree->getAbsolutePath(aNode).compose(aAddedPath);
-
-        sRet = aFullPath.toString();
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.illegalArgument(1);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-
-    return sRet;
-}
-
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString implComposeHierarchicalName(NodeSetInfoAccess& rNode, const rtl::OUString& sElementName )
-    throw(css::lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException)
-{
-    rtl::OUString sRet;
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-        configuration::NodeRef aNode( lock.getNode() );
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-
-        configuration::Path::Component const aAddedName = configuration::validateElementPathComponent(sElementName, aTree, aNode);
-
-        // TODO: add (relative) name validation based on node type - may then need provider lock
-        configuration::AbsolutePath const aFullPath = aTree->getAbsolutePath(aNode).compose(aAddedName);
-
-        sRet = aFullPath.toString();
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.illegalArgument(1);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-
-    return sRet;
-}
-
-//------------------------------------------------------------------------------------------------------------------
-
-// XElementAccess, base class of XNameAccess (and XHierarchicalNameAccess ? )
-//-----------------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------------
-// for group nodes
-uno::Type implGetElementType(NodeGroupInfoAccess& rNode) throw(uno::RuntimeException)
-{
-    rNode.checkAlive();
-    // group nodes have a mix of types
-    // TODO(?): Discover single common type
-    return ::getCppuType( static_cast< uno::Any const*>(0) );
-}
-
-// for set nodes
-uno::Type implGetElementType(NodeSetInfoAccess& rNode) throw(uno::RuntimeException)
-{
-    uno::Type aRet;
-    try
-    {
-        GuardedNodeData<NodeSetInfoAccess> lock( rNode );
-
-        aRet = rNode.getElementInfo()->getInstanceType();
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    return aRet;
-}
-
-//-----------------------------------------------------------------------------------
-// for group nodes
-sal_Bool implHasElements(NodeGroupInfoAccess& rNode) throw(uno::RuntimeException)
-{
-    //	rNode.checkAlive();
-//	return true;	// group nodes always have children
-
-// Better: cater for the case where we are reaching the depth limit
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode ); // no provider lock needed
-
-        rtl::Reference< configuration::Tree > aThisTree( lock.getTree() );
-        configuration::NodeRef aThisNode( lock.getNode() );
-        OSL_ASSERT( !aThisTree->hasElements(aThisNode) );
-        return aThisTree->hasChildren(aThisNode);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    // unreachable, but still there to make compiler happy
-    OSL_ASSERT(!"Unreachable code");
-    return false;
-}
-
-// for set nodes
-sal_Bool implHasElements(NodeSetInfoAccess& rNode) throw(uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode ); // provider lock needed
-
-        rtl::Reference< configuration::Tree > aThisTree( lock.getTree() );
-        configuration::NodeRef aThisNode( lock.getNode() );
-        OSL_ASSERT( !aThisTree->hasChildren(aThisNode) );
-        return aThisTree->hasElements(aThisNode);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    // unreachable, but still there to make compiler happy
-    OSL_ASSERT(!"Unreachable code");
-    return false;
-}
-
-// XExactName
-//-----------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------------------------------------------
-namespace internal
-{
-    struct SearchExactName : private configuration::NodeVisitor
-    {
-    protected:
-        // warning: order dependency
-        configuration::RelativePath aSearchPath;
-        std::vector<configuration::Path::Component>::reverse_iterator pSearchComponent;
-    public:
-        explicit
-        SearchExactName(const configuration::RelativePath& aLookFor)
-        : aSearchPath(aLookFor)
-        , pSearchComponent(aSearchPath.begin_mutate())
-        {}
-
-        bool complete() { return aSearchPath.end_mutate() == pSearchComponent; }
-
-        bool search(configuration::NodeRef const& aNode, rtl::Reference< configuration::Tree > const& aTree);
-
-        configuration::RelativePath const& getBestMatch() const { return aSearchPath; }
-
-    private:
-        bool findMatch(configuration::NodeRef& aNode, rtl::Reference< configuration::Tree > & aTree);
-        virtual Result handle(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const&); // NodeVisitor
-        virtual Result handle(rtl::Reference< configuration::Tree > const& aTree, configuration::ValueRef const&); // NodeVisitor
-    };
-//..................................................................................................................
-    bool SearchExactName::findMatch(configuration::NodeRef& aNode, rtl::Reference< configuration::Tree > & aTree)
-    {
-        OSL_ASSERT( !complete() );
-
-        if ( !aNode.isValid() ) return false;
-
-        // exact match ?
-        if (!configuration::hasChildOrElement(aTree,aNode,*pSearchComponent))
-        {
-            if (aTree->dispatchToChildren(aNode,*this) == CONTINUE) // not found there
-                return false;
-        }
-        OSL_ASSERT(configuration::hasChildOrElement(aTree,aNode,*pSearchComponent));
-
-        if (! configuration::findInnerChildOrAvailableElement(aTree,aNode,pSearchComponent->getName()) )
-            aNode = configuration::NodeRef(); // will stop recursion (value or unloaded element found)
-        ++pSearchComponent;
-
-        return true;
-    }
-    //..................................................................................................................
-    // helper
-    static configuration::Path::Component getExtendedNodeName(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode, rtl::OUString const& aSimpleNodeName)
-    {
-        OSL_PRECOND( !configuration::isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires valid tree" );
-        OSL_PRECOND( !aNode.isValid() || aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match tree" );
-
-        if (aTree->isRootNode(aNode))
-            return aTree->getExtendedRootName();
-
-        else
-            return configuration::Path::wrapSimpleName(aSimpleNodeName);
-    }
-    //..................................................................................................................
-    configuration::NodeVisitor::Result SearchExactName::handle(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-    {
-        OSL_ASSERT( aNode.isValid() );
-        OSL_ASSERT( !complete() );
-
-        // find inexact match (the first one, but the order is unspecified)
-        // TODO: Add support for node-type-specific element names
-        rtl::OUString aNodeName = aTree->getSimpleNodeName(aNode.getOffset());
-        rtl::OUString aSearchName = pSearchComponent->getName();
-        if (aNodeName.equalsIgnoreAsciiCase(aSearchName))
-        {
-            *pSearchComponent = getExtendedNodeName(aTree,aNode,aNodeName);
-            return DONE; // for this level
-        }
-        else
-            return CONTINUE;
-    }
-    //..................................................................................................................
-    configuration::NodeVisitor::Result SearchExactName::handle(rtl::Reference< configuration::Tree > const&, configuration::ValueRef const& aNode)
-    {
-        OSL_ASSERT( aNode.isValid() );
-        OSL_ASSERT( !complete() );
-
-        // find inexact match (the first one, but the order is unspecified)
-        // TODO: Add support for node-type-specific element names
-        rtl::OUString aNodeName = aNode.m_sNodeName;
-        OSL_ASSERT( configuration::isSimpleName(aNodeName) );
-
-        // value refs are group members and thus have to have simple names
-        if (aNodeName.equalsIgnoreAsciiCase(pSearchComponent->getName()))
-        {
-            *pSearchComponent = configuration::Path::wrapSimpleName(aNodeName);
-            return DONE; // for this level
-        }
-        else
-            return CONTINUE;
-    }
-//..................................................................................................................
-    bool SearchExactName::search(configuration::NodeRef const & aNode, rtl::Reference< configuration::Tree > const & aTree)
-    {
-        if (!aNode.isValid()) return false;
-
-        rtl::Reference< configuration::Tree > aSearchTree(aTree);
-        configuration::NodeRef aSearchNode(aNode);
-
-        while (!complete())
-            if (! findMatch(aSearchNode, aSearchTree))
-                break;
-
-        return complete();
-    }
-
-} // namespace internal
-
-//..................................................................................................................
-rtl::OUString implGetExactName(NodeGroupInfoAccess& rNode, const rtl::OUString& rApproximateName ) throw(uno::RuntimeException)
-{
-    // here we try to support both tree-fragment-local pathes and simple names (the latter ones are just an instance of the first)
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree(lock.getTree());
-        configuration::NodeRef aNode(lock.getNode());
-
-        configuration::RelativePath aApproximatePath = configuration::validateRelativePath(rApproximateName,aTree,aNode);
-
-        internal::SearchExactName aSearch(aApproximatePath);
-
-        aSearch.search(aNode, aTree);
-
-        OSL_ENSURE( aSearch.getBestMatch().getDepth() == aApproximatePath.getDepth(),
-                    "Search for exact names changed number of path components !?");
-
-        return aSearch.getBestMatch().toString();
-    }
-    catch (configuration::InvalidName& )
-    {
-        OSL_TRACE("WARNING: Configuration::getExactName: query uses locally invalid Path");
-        return rApproximateName;
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    // unreachable, but still there to make compiler happy
-    OSL_ASSERT(!"Unreachable code");
-    return rApproximateName;
-}
-
-//..................................................................................................................
-rtl::OUString implGetExactName(NodeSetInfoAccess& rNode, const rtl::OUString& rApproximateName ) throw(uno::RuntimeException)
-{
-
-    // here we can support only local names
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree(lock.getTree());
-        configuration::NodeRef aNode(lock.getNode());
-
-        configuration::Path::Component aApproximateName = configuration::validateElementPathComponent(rApproximateName,aTree,aNode);
-
-        internal::SearchExactName aSearch(aApproximateName);
-
-        aSearch.search(aNode, aTree);
-
-        OSL_ENSURE( aSearch.getBestMatch().getDepth() == 1,
-                    "Search for exact names changed number of path components !?");
-
-        return aSearch.getBestMatch().getLocalName().getName();
-    }
-    catch (configuration::InvalidName& )
-    {
-        OSL_TRACE("WARNING: Configuration::getExactName: query uses locally invalid Path");
-        return rApproximateName;
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    // unreachable, but still there to make compiler happy
-    OSL_ASSERT(!"Unreachable code");
-    return rApproximateName;
-}
-
-// XProperty
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-beans::Property implGetAsProperty(NodeAccess& rNode)
-    throw(uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree());
-        configuration::NodeRef aNode( lock.getNode());
-
-        rtl::OUString aName       = aTree->getSimpleNodeName(aNode.getOffset());
-        node::Attributes	aAttributes = aTree->getAttributes(aNode);
-        uno::Type	aApiType    = getUnoInterfaceType();
-
-        return helperMakeProperty( aName,aAttributes,aApiType, aTree->hasNodeDefault(aNode) );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return beans::Property();
-}
-// XPropertySetInfo
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< css::beans::Property > implGetProperties( NodeAccess& rNode ) throw (uno::RuntimeException)
-{
-    CollectPropertyInfo aCollect;
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        lock.getTree()->dispatchToChildren(lock.getNode(), aCollect);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    return makeSequence( aCollect.list() );
-}
-
-//-----------------------------------------------------------------------------------
-css::beans::Property implGetPropertyByName( NodeAccess& rNode, const rtl::OUString& aName )
-    throw (css::beans::UnknownPropertyException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildOrElementName(aName,aTree,aNode);
-
-        configuration::AnyNodeRef aChildNode = configuration::getChildOrElement(aTree,aNode, aChildName);
-
-        if (!aChildNode.isValid())
-        {
-            OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Property. Property '") );
-            sMessage += aName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' could not be found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw css::beans::UnknownPropertyException( sMessage, xContext );
-        }
-
-        node::Attributes	aChildAttributes = aTree->getAttributes(aChildNode);
-        uno::Type	aApiType = aChildNode.isNode() ? getUnoInterfaceType() : aTree->getUnoType(aChildNode.toValue());
-
-        return helperMakeProperty( aChildName,aChildAttributes,aApiType, aTree->hasNodeDefault(aChildNode) );
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw css::beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return css::beans::Property();
-}
-
-
-//-----------------------------------------------------------------------------------
-sal_Bool implHasPropertyByName( NodeAccess& rNode, const rtl::OUString& name ) throw (uno::RuntimeException)
-{
-    return implHasByName(rNode, name);
-}
-
-// XNameAccess
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// TODO: optimization - cache the node found (for subsequent getByName)
-// TODO: optimization - less locking for group nodes
-//-----------------------------------------------------------------------------------
-sal_Bool implHasByName(NodeAccess& rNode, const rtl::OUString& sName ) throw(uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::OUString aChildName(sName);
-
-        return configuration::hasChildOrElement(lock.getTree(), lock.getNode(), aChildName);
-    }
-#if OSL_DEBUG_LEVEL > 0
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        OSL_ENSURE(false,"configmgr: BasicAccess::hasByName: Unexpected exception <InvalidName>");
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-#endif
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    // unreachable, but still there to make compiler happy
-    OSL_ASSERT(!"Unreachable code");
-    return false;
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any implGetByName(NodeAccess& rNode, const rtl::OUString& sName )
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-        configuration::NodeRef aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildOrElementName(sName,aTree,aNode);
-
-        configuration::AnyNodeRef aChildNode = configuration::getChildOrElement(aTree,aNode, aChildName);
-        if (!aChildNode.isValid())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Child Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw com::sun::star::container::NoSuchElementException( sMessage, xContext );
-        }
-        OSL_ASSERT(aNode.isValid());
-
-        return configapi::makeElement( rNode.getFactory(), aTree, aChildNode );
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw com::sun::star::container::NoSuchElementException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return uno::Any();
-}
-
-//-----------------------------------------------------------------------------------
-// TODO: optimization - less locking for group nodes
-//-----------------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > implGetElementNames( NodeAccess& rNode ) throw( uno::RuntimeException)
-{
-    CollectNodeNames aCollect;
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        lock.getTree()->dispatchToChildren(lock.getNode(), aCollect);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    return makeSequence( aCollect.list() );
-}
-
-// XHierarchicalNameAccess
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// TO DO: optimization - cache the node found for subsequent getByHierarchicalName()
-//-----------------------------------------------------------------------------------
-sal_Bool implHasByHierarchicalName(NodeAccess& rNode, const rtl::OUString& sHierarchicalName ) throw(uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-        configuration::NodeRef aNode( lock.getNode() );
-
-        configuration::RelativePath aRelPath = configuration::validateAndReducePath( sHierarchicalName, aTree, aNode );
-
-        return configuration::getDeepDescendant(aTree, aNode, aRelPath).isValid();
-    }
-    catch (configuration::InvalidName& )
-    {
-        OSL_TRACE("WARNING: Configuration::hasByHierarchicalName: query uses locally invalid Path");
-        return false;
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return false;
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any implGetByHierarchicalName(NodeAccess& rNode, const rtl::OUString& sHierarchicalName )
-    throw(css::container::NoSuchElementException, uno::RuntimeException)
-{
-    // rtl::OUString aTmpStr(implGetHierarchicalName(rNode));
-    // RTL_LOGFILE_CONTEXT_TRACE2(aLog, "Node: %s HierachicalName: %s",RTL_LOGFILE_OU2A(aTmpStr), RTL_LOGFILE_OU2A(sHierarchicalName));
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-        configuration::NodeRef aNode( lock.getNode() );
-
-        configuration::RelativePath aRelPath = configuration::validateAndReducePath( sHierarchicalName, aTree, aNode );
-
-        configuration::AnyNodeRef aNestedNode = configuration::getDeepDescendant( aTree, aNode, aRelPath );
-        if (!aNestedNode.isValid())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Descendant Element '") );
-            sMessage += aRelPath.toString();
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in Node ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw com::sun::star::container::NoSuchElementException( sMessage, xContext );
-        }
-
-        OSL_ASSERT(aNode.isValid());
-        return configapi::makeElement( rNode.getFactory(), aTree, aNestedNode );
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw com::sun::star::container::NoSuchElementException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return uno::Any();
-}
-
-// XPropertyWithState
-//---------------------------------------------------------------------
-css::beans::PropertyState implGetStateAsProperty(NodeAccess& rNode)
-    throw (uno::RuntimeException)
-{
-    css::beans::PropertyState aRet = css::beans::PropertyState_AMBIGUOUS_VALUE;
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        if ( lock.getTree()->isNodeDefault( lock.getNode() ) )
-            aRet = css::beans::PropertyState_DEFAULT_VALUE;
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-    return aRet;
-}
-
-uno::Reference< uno::XInterface > implGetDefaultAsProperty(NodeAccess& )
-    throw (css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    // not really supported
-
-    /* possible, but nor really useful:
-    GuardedNodeAccess lock( rNode );
-    if (implGetStateAsProperty(rNode) == PropertyState_DEFAULT_VALUE)
-        return rNode.getUnoInstance();
-    */
-
-    return uno::Reference< uno::XInterface >();
-}
-
-
-// set-specific Interfaces
-//-----------------------------------------------------------------------------------
-
-
-// XTemplateContainer
-//-----------------------------------------------------------------------------------
-rtl::OUString SAL_CALL implGetElementTemplateName(NodeSetInfoAccess& rNode)
-    throw(uno::RuntimeException)
-{
-    GuardedNodeData<NodeSetInfoAccess> lock(rNode);
-    return rNode.getElementInfo()->getPathString();
-}
-
-//-----------------------------------------------------------------------------------
-    } // namespace configapi
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/accessimpl.hxx b/configmgr/source/api2/accessimpl.hxx
deleted file mode 100644
index b168338b6b..0000000000
--- a/configmgr/source/api2/accessimpl.hxx
+++ /dev/null
@@ -1,139 +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: accessimpl.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 CONFIGMGR_API_BASEACCESSIMPL_HXX_
-#define CONFIGMGR_API_BASEACCESSIMPL_HXX_
-
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/configuration/XTemplateInstance.hpp>
-#include <com/sun/star/configuration/XTemplateContainer.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XProperty.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/XPropertyWithState.hpp>
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-    /* implementations of the interfaces supported by a (parent) node
-        within the configuration tree.
-        (read-only operation)
-    */
-    namespace configapi
-    {
-        class NodeAccess; 
-        class NodeSetInfoAccess; 
-        class NodeGroupInfoAccess; 
-
-        // XHierarchicalName
-        rtl::OUString implGetHierarchicalName(NodeAccess& rNode) 
-            throw(uno::RuntimeException);
-
-        rtl::OUString implComposeHierarchicalName(NodeGroupInfoAccess& rNode, const rtl::OUString& aRelativeName ) 
-            throw(css::lang::IllegalArgumentException, css::lang::NoSupportException, uno::RuntimeException);
-
-        rtl::OUString implComposeHierarchicalName(NodeSetInfoAccess& rNode, const rtl::OUString& aRelativeName ) 
-            throw(css::lang::IllegalArgumentException, css::lang::NoSupportException, uno::RuntimeException);
-
-        // XElementAccess, base class of XNameAccess 
-        uno::Type implGetElementType(NodeGroupInfoAccess& rNode) 
-            throw(uno::RuntimeException);
-
-        uno::Type implGetElementType(NodeSetInfoAccess& rNode) 
-            throw(uno::RuntimeException);
-
-        sal_Bool implHasElements(NodeGroupInfoAccess& rNode) 
-            throw(uno::RuntimeException);
-
-        sal_Bool implHasElements(NodeSetInfoAccess& rNode) 
-            throw(uno::RuntimeException);
-
-        // XNameAccess
-        uno::Any implGetByName(NodeAccess& rNode, const rtl::OUString& aName ) 
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
- 
-        uno::Sequence< rtl::OUString > implGetElementNames(NodeAccess& rNode) 
-            throw( uno::RuntimeException);
-
-        sal_Bool implHasByName(NodeAccess& rNode, const rtl::OUString& aName ) 
-            throw(uno::RuntimeException);
-
-        // XHierarchicalNameAccess
-        uno::Any implGetByHierarchicalName(NodeAccess& rNode, const rtl::OUString& aName ) 
-            throw(css::container::NoSuchElementException, uno::RuntimeException);
-
-        sal_Bool implHasByHierarchicalName(NodeAccess& rNode, const rtl::OUString& aName ) 
-            throw(uno::RuntimeException);
- 
-        // XExactName
-        rtl::OUString implGetExactName(NodeGroupInfoAccess& rNode, const rtl::OUString& aApproximateName ) 
-            throw(uno::RuntimeException);
-
-        rtl::OUString implGetExactName(NodeSetInfoAccess& rNode, const rtl::OUString& aApproximateName ) 
-            throw(uno::RuntimeException);
-
-        // XProperty
-        css::beans::Property implGetAsProperty(NodeAccess& rNode) 
-            throw(uno::RuntimeException);
-
-        // XPropertySetInfo
-        uno::Sequence< css::beans::Property > implGetProperties( NodeAccess& rNode ) 
-            throw (uno::RuntimeException);
-
-        css::beans::Property implGetPropertyByName( NodeAccess& rNode, const rtl::OUString& aName ) 
-            throw (css::beans::UnknownPropertyException, uno::RuntimeException);
-        
-        sal_Bool implHasPropertyByName( NodeAccess& rNode, const rtl::OUString& name ) 
-            throw (uno::RuntimeException);
-
-
-        // XPropertyWithState
-        css::beans::PropertyState implGetStateAsProperty(NodeAccess& rNode) 
-            throw (uno::RuntimeException);
-
-        uno::Reference< uno::XInterface > implGetDefaultAsProperty(NodeAccess& rNode) 
-            throw (css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // set-specific interfaces
-
-        // XTemplateContainer
-        rtl::OUString SAL_CALL implGetElementTemplateName(NodeSetInfoAccess& rNode) 
-            throw(uno::RuntimeException);
-
-    }
-
-}
-#endif // CONFIGMGR_API_BASEACCESSIMPL_HXX_
-
-
diff --git a/configmgr/source/api2/apiaccessobj.cxx b/configmgr/source/api2/apiaccessobj.cxx
deleted file mode 100644
index d595653359..0000000000
--- a/configmgr/source/api2/apiaccessobj.cxx
+++ /dev/null
@@ -1,293 +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: apiaccessobj.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_configmgr.hxx"
-#include <stdio.h>
-#include "apiaccessobj.hxx"
-
-#include "apiserviceinfo.hxx"
-#include "confsvccomponent.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//========================================================================
-//= service infos
-//========================================================================
-/*
-const AsciiServiceName c_aUserContainerServices[] = 
-{
-    "com.sun.star.configuration.UserAdministration",
-    "com.sun.star.configuration.ConfigurationContainer",
-    "com.sun.star.configuration.ConfigurationUpdateAccess",
-    "com.sun.star.configuration.ConfigurationAccess",
-    NULL
-};
-const AsciiServiceName c_aContainerServices[] = 
-{
-    "com.sun.star.configuration.ConfigurationContainer",
-    "com.sun.star.configuration.ConfigurationUpdateAccess",
-    "com.sun.star.configuration.ConfigurationAccess",
-    NULL
-};
-const AsciiServiceName c_aUpdateServices[] = 
-{
-    "com.sun.star.configuration.ConfigurationUpdateAccess", 
-    "com.sun.star.configuration.ConfigurationAccess", 
-    NULL
-};
-
-const AsciiServiceName c_aAccessServices[] = 
-{
-    "com.sun.star.configuration.ConfigurationAccess", 
-    NULL
-};
-
-const AsciiServiceName c_aNoServices[] = 
-{
-    NULL
-};
-//-----------------------------------------------------------------------------
-
-ServiceInfo const aInnerGroupInfoSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OInnerGroupInfoAccess", 
-    c_aNoServices 
-};
-ServiceInfo const aInnerGroupUpdateSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OInnerGroupUpdateAccess", 
-    c_aNoServices 
-};
-ServiceInfo const aInnerSetInfoSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OInnerSetInfoAccess", 
-    c_aNoServices 
-};
-ServiceInfo const aInnerTreeSetSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OInnerTreeSetUpdateAccess", 
-    c_aNoServices 
-};
-ServiceInfo const aInnerValueSetSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OInnerValueSetUpdateAccess", 
-    c_aNoServices 
-};
-//-----------------------------------------------------------------------------
-
-ServiceInfo const aSetElementGroupInfoSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OSetElementGroupInfoAccess", 
-    c_aAccessServices 
-};
-ServiceInfo const aSetElementGroupUpdateSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OSetElementGroupUpdateAccess", 
-    c_aUpdateServices 
-};
-ServiceInfo const aSetElementSetInfoSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OSetElementSetInfoAccess", 
-    c_aAccessServices 
-};
-ServiceInfo const aSetElementTreeSetSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OSetElementTreeSetUpdateAccess", 
-    c_aContainerServices 
-};
-ServiceInfo const aSetElementValueSetSI =  
-{ 
-    "com.sun.star.configuration.configmgr.OSetElementValueSetUpdateAccess", 
-    c_aContainerServices 
-};
-//-----------------------------------------------------------------------------
-
-ServiceInfo const aRootElementGroupInfoSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementGroupInfoAccess", 
-    c_aAccessServices 
-};
-ServiceInfo const aRootElementGroupUpdateSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementGroupUpdateAccess", 
-    c_aUpdateServices 
-};
-ServiceInfo const aRootElementSetInfoSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementSetInfoAccess", 
-    c_aAccessServices 
-};
-ServiceInfo const aRootElementTreeSetUpdateSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementTreeSetUpdateAccess", 
-    c_aContainerServices 
-};
-ServiceInfo const aRootElementValueSetUpdateSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementValueSetUpdateAccess", 
-    c_aContainerServices 
-};
-//-----------------------------------------------------------------------------
-
-ServiceInfo const aRootElementReadAccessSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementReadAccess", 
-    c_aAccessServices 
-};
-ServiceInfo const aRootElementUpdateAccessSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementUpdateAccess", 
-    c_aUpdateServices 
-};
-ServiceInfo const aRootElementAdminAccessSI =  
-{ 
-    "com.sun.star.configuration.configmgr.ORootElementUserAdminAccess", 
-    c_aUserContainerServices 
-};*/
-
-//========================================================================
-//= service info static members
-//========================================================================
-
-//-----------------------------------------------------------------------------
-// Inner Elements
-//-----------------------------------------------------------------------------
-
-template <> 
-ServiceImplementationInfo const * 
-const OInnerElement<NodeGroupInfoAccess>::s_pServiceInfo = &aInnerGroupInfoSI;
-
-template <> 
-ServiceImplementationInfo const * 
-const OInnerElement<NodeGroupAccess>::s_pServiceInfo = &aInnerGroupUpdateSI;
-
-template <> 
-ServiceImplementationInfo const * 
-const OInnerElement<NodeSetInfoAccess>::s_pServiceInfo = &aInnerSetInfoSI;
-
-template <> 
-ServiceImplementationInfo const * 
-const OInnerElement<NodeTreeSetAccess>::s_pServiceInfo = &aInnerTreeSetSI;
-
-template <> 
-ServiceImplementationInfo const * 
-const OInnerElement<NodeValueSetAccess>::s_pServiceInfo = &aInnerValueSetSI; 
-
-
-//-----------------------------------------------------------------------------
-// Set Elements
-//-----------------------------------------------------------------------------
-
-template <> 
-ServiceImplementationInfo const * 
-const OSetElement<NodeGroupInfoAccess>::s_pServiceInfo = &aSetElementGroupInfoSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OSetElement<NodeGroupAccess>::s_pServiceInfo = &aSetElementGroupUpdateSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OSetElement<NodeSetInfoAccess>::s_pServiceInfo = &aSetElementSetInfoSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OSetElement<NodeTreeSetAccess>::s_pServiceInfo = &aSetElementTreeSetSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OSetElement<NodeValueSetAccess>::s_pServiceInfo = &aSetElementValueSetSI; 
-
-//-----------------------------------------------------------------------------
-// Root Elements
-//-----------------------------------------------------------------------------
-
-template <> 
-ServiceImplementationInfo const * 
-const OReadRootElement<NodeGroupInfoAccess>::s_pServiceInfo = &aRootElementGroupInfoSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OUpdateRootElement<NodeGroupAccess>::s_pServiceInfo = &aRootElementGroupUpdateSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OReadRootElement<NodeSetInfoAccess>::s_pServiceInfo = &aRootElementSetInfoSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OUpdateRootElement<NodeTreeSetAccess>::s_pServiceInfo = &aRootElementTreeSetUpdateSI; 
-
-template <> 
-ServiceImplementationInfo const * 
-const OUpdateRootElement<NodeValueSetAccess>::s_pServiceInfo = &aRootElementValueSetUpdateSI; 
-
-
-
-//========================================================================
-//= Instantiations
-//========================================================================
-/*
-//-----------------------------------------------------------------------------
-// Inner Elements
-//-----------------------------------------------------------------------------
-
-template class OInnerElement<NodeGroupInfoAccess>;	// OInnerGroupInfoAccess
-template class OInnerElement<NodeGroupAccess>;		// OInnerGroupUpdateAccess
-template class OInnerElement<NodeSetInfoAccess>;	// OInnerSetInfoAccess
-template class OInnerElement<NodeTreeSetAccess>;	// OInnerTreeSetUpdateAccess
-template class OInnerElement<NodeValueSetAccess>;	// OInnerValueSetUpdateAccess
-
-//-----------------------------------------------------------------------------
-// Set Elements
-//-----------------------------------------------------------------------------
-template class OSetElement<NodeGroupInfoAccess>;	// OSetElementGroupInfoAccess
-template class OSetElement<NodeGroupAccess>;		// OSetElementGroupUpdateAccess
-template class OSetElement<NodeSetInfoAccess>;		// OSetElementSetInfoAccess
-template class OSetElement<NodeTreeSetAccess>;		// OSetElementTreeSetUpdateAccess
-template class OSetElement<NodeValueSetAccess>;		// OSetElementValueSetUpdateAccess
-    
-//-----------------------------------------------------------------------------
-// Root Elements
-//-----------------------------------------------------------------------------
-
-template class OReadRootElement<NodeGroupInfoAccess>;	// ORootElementGroupInfoAccess
-template class OUpdateRootElement<NodeGroupAccess>;		// ORootElementGroupUpdateAccess
-template class OReadRootElement<NodeSetInfoAccess>;		// ORootElementSetInfoAccess
-template class OUpdateRootElement<NodeTreeSetAccess>;	// ORootElementTreeSetUpdateAccess
-template class OUpdateRootElement<NodeValueSetAccess>;	// ORootElementValueSetUpdateAccess
-*/
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/api2/apiaccessobj.hxx b/configmgr/source/api2/apiaccessobj.hxx
deleted file mode 100644
index 85832c27aa..0000000000
--- a/configmgr/source/api2/apiaccessobj.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: apiaccessobj.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_ACCESSOBJECTS_HXX_
-#define CONFIGMGR_API_ACCESSOBJECTS_HXX_
-
-#include "apitreeaccess.hxx"
-#include "apinodeaccess.hxx"
-#include "apinodeupdate.hxx"
-
-#include "apitreeimplobj.hxx"
-#include "noderef.hxx"
-
-#include "apiserviceinfo.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-// Inner Elements
-//-----------------------------------------------------------------------------
-
-        template <class NodeClass>
-        class OInnerElement : public InnerElement, public NodeClass
-        {
-            static ServiceImplementationInfo const*const s_pServiceInfo;
-
-            uno::XInterface*	m_pUnoThis;
-            ApiTreeImpl&	m_rTree;
-            configuration::NodeRef			m_aNode;
-        public:
-            inline OInnerElement(uno::XInterface*	pUnoThis,ApiTreeImpl& rTree, configuration::NodeRef const& aNode);
-            inline ~OInnerElement();
-
-            virtual inline configuration::NodeRef			doGetNode() const;
-            virtual inline ApiTreeImpl&		getApiTree() const;
-
-            virtual inline uno::XInterface*		doGetUnoInstance() const;
-            virtual inline ServiceImplementationInfo const*	doGetServiceInfo() const;
-
-            static inline ServiceImplementationInfo const* getStaticServiceInfo();
-        };
-
-//-----------------------------------------------------------------------------
-// Set Elements
-//-----------------------------------------------------------------------------
-
-        template <class NodeClass>
-        class OSetElement : public SetElement, public NodeClass
-        {
-            static ServiceImplementationInfo const*const s_pServiceInfo;
-
-            mutable ApiTreeImpl 	m_aTree;
-        public:
-            OSetElement(uno::XInterface* pUnoThis, rtl::Reference< configuration::Tree > const& aTree, ApiProvider& rProvider, ApiTreeImpl* pParentTree = 0)
-            : m_aTree(pUnoThis, rProvider,aTree,pParentTree)
-            {}
-
-            virtual inline configuration::NodeRef			doGetNode() const;
-            virtual inline ApiTreeImpl&		getApiTree() const;
-
-            virtual inline uno::XInterface*		doGetUnoInstance() const;
-            virtual inline ServiceImplementationInfo const*	doGetServiceInfo() const;
-
-            static inline ServiceImplementationInfo const* getStaticServiceInfo();
-        };
-
-//-----------------------------------------------------------------------------
-// Root Elements
-//-----------------------------------------------------------------------------
-
-        template <class NodeClass>
-        class OReadRootElement : public RootElement, public NodeClass
-        {
-            static ServiceImplementationInfo const*const s_pServiceInfo;
-            mutable ApiRootTreeImpl 	m_aRootTree;
-        public:
-            OReadRootElement(uno::XInterface* pUnoThis, ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-                : m_aRootTree(pUnoThis, rProvider,aTree, _xOptions)
-            {}
-
-            virtual inline configuration::NodeRef			doGetNode() const;
-            virtual inline ApiTreeImpl&		getApiTree() const;
-            virtual inline ApiRootTreeImpl&	getRootTree();
-
-            virtual inline uno::XInterface*		doGetUnoInstance() const;
-            virtual inline ServiceImplementationInfo const*	doGetServiceInfo() const;
-
-            static inline ServiceImplementationInfo const* getStaticServiceInfo();
-        };
-    //-------------------------------------------------------------------------
-
-        template <class NodeClass>
-        class OUpdateRootElement : public UpdateRootElement, public NodeClass
-        {
-            static ServiceImplementationInfo const*const s_pServiceInfo;
-
-            mutable ApiRootTreeImpl 	m_aRootTree;
-        public:
-            OUpdateRootElement(uno::XInterface* pUnoThis, ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-            : m_aRootTree(pUnoThis, rProvider,aTree,_xOptions)
-            {}
-
-            virtual inline configuration::NodeRef			doGetNode() const;
-            virtual inline ApiTreeImpl&		getApiTree() const;
-            virtual inline ApiRootTreeImpl&	getRootTree();
-
-            virtual inline uno::XInterface*		doGetUnoInstance() const;
-            virtual inline ServiceImplementationInfo const*	doGetServiceInfo() const;
-
-            static inline ServiceImplementationInfo const* getStaticServiceInfo();
-        };
-    }
-}
-//-----------------------------------------------------------------------------
-#include "apiaccessobj.inl"
-//-----------------------------------------------------------------------------
-
-#endif // CONFIGMGR_API_ACCESSOBJECTS_HXX_
diff --git a/configmgr/source/api2/apiaccessobj.inl b/configmgr/source/api2/apiaccessobj.inl
deleted file mode 100644
index 1f1eaf2c21..0000000000
--- a/configmgr/source/api2/apiaccessobj.inl
+++ /dev/null
@@ -1,263 +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: apiaccessobj.inl,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.
- *
- ************************************************************************/
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-
-//========================================================================
-//= member functions
-//========================================================================
-
-//-----------------------------------------------------------------------------
-// Inner Elements
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-OInnerElement<NodeClass>::OInnerElement(uno::XInterface*	pUnoThis,ApiTreeImpl& rTree, configuration::NodeRef const& aNode)
-: m_pUnoThis(pUnoThis) 
-, m_rTree(rTree)
-, m_aNode(aNode) 
-{ 
-    m_rTree.setNodeInstance(aNode,pUnoThis); 
-    m_rTree.getUnoInstance()->acquire();
-}
-
-template <class NodeClass>
-OInnerElement<NodeClass>::~OInnerElement()
-{
-    m_rTree.getUnoInstance()->release();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-configuration::NodeRef OInnerElement<NodeClass>::doGetNode() const
-{
-    return m_aNode;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ApiTreeImpl& OInnerElement<NodeClass>::getApiTree() const
-{
-    return m_rTree;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-uno::XInterface* OInnerElement<NodeClass>::doGetUnoInstance() const
-{
-    return m_pUnoThis;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OInnerElement<NodeClass>::doGetServiceInfo() const
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OInnerElement<NodeClass>::getStaticServiceInfo()
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Set Elements
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-configuration::NodeRef OSetElement<NodeClass>::doGetNode() const
-{
-    return m_aTree.getTree()->getRootNode();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ApiTreeImpl& OSetElement<NodeClass>::getApiTree() const
-{
-    return m_aTree;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-uno::XInterface* OSetElement<NodeClass>::doGetUnoInstance() const
-{
-    return m_aTree.getUnoInstance();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OSetElement<NodeClass>::doGetServiceInfo() const
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OSetElement<NodeClass>::getStaticServiceInfo()
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Read-only Root Elements
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-configuration::NodeRef OReadRootElement<NodeClass>::doGetNode() const
-{
-    return m_aRootTree.getApiTree().getTree()->getRootNode();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ApiTreeImpl& OReadRootElement<NodeClass>::getApiTree() const
-{
-    return m_aRootTree.getApiTree();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ApiRootTreeImpl& OReadRootElement<NodeClass>::getRootTree()
-{
-    return m_aRootTree;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-uno::XInterface* OReadRootElement<NodeClass>::doGetUnoInstance() const
-{
-    return m_aRootTree.getApiTree().getUnoInstance();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OReadRootElement<NodeClass>::doGetServiceInfo() const
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OReadRootElement<NodeClass>::getStaticServiceInfo()
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Update Root Elements
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-configuration::NodeRef OUpdateRootElement<NodeClass>::doGetNode() const
-{
-    return m_aRootTree.getApiTree().getTree()->getRootNode();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ApiTreeImpl& OUpdateRootElement<NodeClass>::getApiTree() const
-{
-    return m_aRootTree.getApiTree();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ApiRootTreeImpl& OUpdateRootElement<NodeClass>::getRootTree()
-{
-    return m_aRootTree;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-uno::XInterface* OUpdateRootElement<NodeClass>::doGetUnoInstance() const
-{
-    return m_aRootTree.getApiTree().getUnoInstance();
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OUpdateRootElement<NodeClass>::doGetServiceInfo() const
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-template <class NodeClass>
-ServiceImplementationInfo const* OUpdateRootElement<NodeClass>::getStaticServiceInfo()
-{
-    return s_pServiceInfo;
-}
-//-----------------------------------------------------------------------------
-
-//========================================================================
-//= Instantiations
-//========================================================================
-/*
-//-----------------------------------------------------------------------------
-// Inner Elements
-//-----------------------------------------------------------------------------
-
-template class OInnerElement<NodeGroupInfoAccess>;	// OInnerGroupInfoAccess
-template class OInnerElement<NodeGroupAccess>;		// OInnerGroupUpdateAccess
-template class OInnerElement<NodeSetInfoAccess>;	// OInnerSetInfoAccess
-template class OInnerElement<NodeTreeSetAccess>;	// OInnerTreeSetUpdateAccess
-template class OInnerElement<NodeValueSetAccess>;	// OInnerValueSetUpdateAccess
-
-//-----------------------------------------------------------------------------
-// Set Elements
-//-----------------------------------------------------------------------------
-template class OSetElement<NodeGroupInfoAccess>;	// OSetElementGroupInfoAccess
-template class OSetElement<NodeGroupAccess>;		// OSetElementGroupUpdateAccess
-template class OSetElement<NodeSetInfoAccess>;		// OSetElementSetInfoAccess
-template class OSetElement<NodeTreeSetAccess>;		// OSetElementTreeSetUpdateAccess
-template class OSetElement<NodeValueSetAccess>;		// OSetElementValueSetUpdateAccess
-    
-//-----------------------------------------------------------------------------
-// Root Elements
-//-----------------------------------------------------------------------------
-
-template class OReadRootElement<NodeGroupInfoAccess>;	// ORootElementGroupInfoAccess
-template class OUpdateRootElement<NodeGroupAccess>;		// ORootElementGroupUpdateAccess
-template class OReadRootElement<NodeSetInfoAccess>;		// ORootElementSetInfoAccess
-template class OUpdateRootElement<NodeTreeSetAccess>;	// ORootElementTreeSetUpdateAccess
-template class OUpdateRootElement<NodeValueSetAccess>;	// ORootElementValueSetUpdateAccess
-*/
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/api2/apifactory.cxx b/configmgr/source/api2/apifactory.cxx
deleted file mode 100644
index 418d5ce756..0000000000
--- a/configmgr/source/api2/apifactory.cxx
+++ /dev/null
@@ -1,338 +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: apifactory.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_configmgr.hxx"
-
-#include "apifactory.hxx"
-#include "objectregistry.hxx"
-
-#include "apitreeaccess.hxx"
-#include "apitreeimplobj.hxx"
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-
-#include "noderef.hxx"
-#include "anynoderef.hxx"
-
-#include "configexcept.hxx"
-#include "configset.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace css = ::com::sun::star;
-    namespace uno	= css::uno;
-    namespace lang	= css::lang;
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-ObjectRegistry::~ObjectRegistry()
-{
-    OSL_ENSURE(m_aMap.empty(),"WARNING: Configuration Object Map: Some Objects were not revoked correctly");
-}
-
-//-----------------------------------------------------------------------------
-
-Factory::Factory(rtl::Reference<ObjectRegistry> pRegistry)
-: m_pRegistry(pRegistry)
-, m_aTunnelID()
-{
-    OSL_ENSURE(pRegistry.is(), "ERROR: Factory requires a Object Registry");
-}
-//-----------------------------------------------------------------------------
-
-Factory::~Factory()
-{
-}
-//-----------------------------------------------------------------------------
-inline
-NodeElement* Factory::implFind(configuration::NodeID const& aNode)
-{
-    return m_pRegistry->findElement(aNode);
-}
-//-----------------------------------------------------------------------------
-inline
-void Factory::doRegisterElement(configuration::NodeID const& aNode, NodeElement* pElement)
-{
-    m_pRegistry->registerElement(aNode,pElement);
-}
-//-----------------------------------------------------------------------------
-inline
-void Factory::doRevokeElement(configuration::NodeID const& aNode, NodeElement* pElement)
-{
-    m_pRegistry->revokeElement(aNode,pElement);
-}
-//-----------------------------------------------------------------------------
-
-ApiTreeImpl& Factory::getImplementation(NodeElement& rElement)
-{
-    return rElement.getApiTree();
-}
-//-----------------------------------------------------------------------------
-
-inline
-rtl::Reference<configuration::Template> Factory::implGetSetElementTemplate(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-{
-    rtl::Reference<configuration::Template> aRet;
-    if (configuration::isSetNode(aTree,aNode))	
-    {
-        aRet = aTree->extractElementInfo(aNode);
-    }
-    else if (!configuration::isGroupNode(aTree,aNode))
-    {
-        OSL_ENSURE( !configuration::isStructuralNode(aTree,aNode), "ERROR: Configuration: unknown kind of object");
-        throw configuration::Exception("INTERNAL ERROR: Cannot create template - Unexpected node type");
-    }
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-inline
-uno::Reference< uno::XInterface > Factory::implToUno(NodeElement* pElement)
-{
-    if ( pElement )
-        return uno::Reference< uno::XInterface >(pElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-    else
-        return uno::Reference< uno::XInterface >();
-}
-//-----------------------------------------------------------------------------
-inline
-void Factory::implHaveNewElement(configuration::NodeID aNodeID, NodeElement* pElement)
-{
-    OSL_ENSURE(pElement ,"WARNING: New API object could not be created");
-
-    if (pElement)
-    {
-        doRegisterElement(aNodeID,pElement);
-        OSL_ENSURE(implFind(aNodeID) == pElement,"WARNING: New API object could not be registered with its factory");
-    }
-}
-//-----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > Factory::makeUnoElement(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-{
-    return implToUno(makeElement(aTree,aNode));
-}
-//-----------------------------------------------------------------------------
-NodeElement* Factory::makeElement(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-{
-    OSL_PRECOND( !configuration::isEmpty(aTree.get()) == aNode.isValid(), "ERROR: Configuration: Making element from tree requires valid node");
-    if (configuration::isEmpty(aTree.get())) 
-        return 0;
-
-    OSL_PRECOND( aNode.isValid() && aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-    OSL_PRECOND( configuration::isStructuralNode(aTree,aNode), "ERROR: Configuration: Cannot make object for value node");
-
-    configuration::NodeID aNodeID(aTree,aNode);
-    NodeElement* pRet = findElement(aNodeID);
-    if (pRet == 0)
-    {
-        rtl::Reference<configuration::Template> aTemplate = implGetSetElementTemplate(aTree,aNode);
-
-        if (!aTree->isRootNode(aNode))
-        {
-            pRet = doCreateGroupMember(aTree,aNode,aTemplate.get());
-        }
-        else
-        {
-            rtl::Reference< configuration::ElementTree > aElementTree(dynamic_cast< configuration::ElementTree * >(aTree.get()));
-            if (aElementTree.is())
-            {
-                pRet = doCreateSetElement(aElementTree,aTemplate.get());
-            }
-            else
-            {
-                OSL_ENSURE(configuration::isEmpty(aTree->getContextTree()),"INTERNAL ERROR: Found tree (not a set element) with a parent tree.");
-                pRet = doCreateAccessRoot(aTree,aTemplate.get(), vos::ORef< OOptions >());
-            }
-        }
-        implHaveNewElement(aNodeID,pRet);
-    }
-    return pRet;
-}
-//-----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > Factory::findUnoElement(configuration::NodeID const& aNodeID)
-{
-    return implToUno(findElement(aNodeID));
-}
-//-----------------------------------------------------------------------------
-NodeElement* Factory::findElement(configuration::NodeID const& aNodeID)
-{
-    NodeElement* pReturn = implFind(aNodeID);
-    if (pReturn) pReturn->getUnoInstance()->acquire();
-    return pReturn;
-}
-//-----------------------------------------------------------------------------
-
-void Factory::revokeElement(configuration::NodeID const& aNodeID)
-{
-    if (NodeElement* pElement = implFind(aNodeID))
-        doRevokeElement(aNodeID, pElement);
-}
-//-----------------------------------------------------------------------------
-
-TreeElement* Factory::makeAccessRoot(rtl::Reference< configuration::Tree > const& aTree, RequestOptions const& _aOptions)
-{
-    OSL_PRECOND( !configuration::isEmpty(aTree.get()) , "ERROR: Configuration: Making element from tree requires valid tree");
-    if (configuration::isEmpty(aTree.get())) return 0;
-
-    OSL_ENSURE(configuration::isEmpty(aTree->getContextTree()),"INTERNAL ERROR: Tree with parent tree should not be used for an access root");
-    OSL_ENSURE(dynamic_cast< configuration::ElementTree * >(aTree.get()) == 0, "INTERNAL ERROR: Element Tree should not be used for an access root");
-
-    configuration::NodeRef aRoot = aTree->getRootNode();
-    OSL_ENSURE(aRoot.isValid(),"INTERNAL ERROR: Tree has no root node");
-
-    OSL_PRECOND( configuration::isStructuralNode(aTree,aRoot), "ERROR: Configuration: Cannot make object for value node");
-
-    configuration::NodeID aNodeID(aTree,aRoot);
-    // must be a tree element if it is a tree root
-    TreeElement* pRet = static_cast<TreeElement*>(findElement(aNodeID));
-    if (0 == pRet)
-    {
-        rtl::Reference<configuration::Template> aTemplate = implGetSetElementTemplate(aTree,aRoot);
-        vos::ORef<OOptions> xOptions = new OOptions(_aOptions);
-        pRet = doCreateAccessRoot(aTree,aTemplate.get(), xOptions);
-        implHaveNewElement (aNodeID,pRet);
-    }
-    return pRet;
-}
-//-----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > Factory::makeUnoSetElement(rtl::Reference< configuration::ElementTree > const& aElementTree)
-{
-    uno::Reference< uno::XInterface > aRet = implToUno(makeSetElement(aElementTree));
-    OSL_ENSURE( uno::Reference<lang::XUnoTunnel>::query(aRet).is(),"ERROR: API set element has no UnoTunnel");
-    OSL_ENSURE( uno::Reference<lang::XUnoTunnel>::query(aRet).is() && 
-                0 != uno::Reference<lang::XUnoTunnel>::query(aRet)->getSomething(doGetElementTunnelID()),
-                "ERROR: API set element does not support the right tunnel ID");
-
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-
-SetElement* Factory::makeSetElement(rtl::Reference< configuration::ElementTree > const& aElementTree)
-{
-    OSL_PRECOND( aElementTree.is() , "ERROR: Configuration: Making element from tree requires valid tree");
-    if (!aElementTree.is()) return 0;
-
-    rtl::Reference< configuration::Tree > aTree(aElementTree.get());
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()),"INTERNAL ERROR: Element Tree has no Tree");
-
-    configuration::NodeRef aRoot = aTree->getRootNode();
-    OSL_ENSURE(aRoot.isValid(),"INTERNAL ERROR: Tree has no root node");
-
-    OSL_ENSURE( configuration::isStructuralNode(aTree,aRoot), "ERROR: Configuration: Cannot make object for value node");
-
-    configuration::NodeID aNodeID(aTree,aRoot);
-    // must be a set element if it wraps a ElementTree
-    SetElement* pRet = static_cast<SetElement*>( findElement(aNodeID) );
-    if (0 == pRet)
-    {
-        rtl::Reference<configuration::Template> aTemplate = implGetSetElementTemplate(aTree,aRoot);
-
-        pRet = doCreateSetElement(aElementTree,aTemplate.get());
-
-        implHaveNewElement(aNodeID,pRet);
-    }
-    return pRet;
-}
-//-----------------------------------------------------------------------------
-
-SetElement* Factory::findSetElement(rtl::Reference< configuration::ElementTree > const& aElement)
-{
-    OSL_PRECOND( aElement.is() , "ERROR: Configuration: Making element from tree requires valid tree");
-    if (!aElement.is()) return 0;
-
-    rtl::Reference< configuration::Tree > aTree(aElement.get());
-    OSL_ENSURE(!isEmpty(aTree.get()),"INTERNAL ERROR: Element Tree has no Tree");
-
-    configuration::NodeRef aRoot = aTree->getRootNode();
-    OSL_ENSURE(aRoot.isValid(),"INTERNAL ERROR: Tree has no root node");
-    
-    configuration::NodeID aNodeID(aTree,aRoot);
-    // must be a set element if it wraps a ElementTree
-    SetElement* pRet = static_cast<SetElement*>( findElement(aNodeID) );
-
-    return pRet;
-}
-//-----------------------------------------------------------------------------
-
-SetElement* Factory::extractSetElement(uno::Any const& aElement)
-{
-    SetElement* pTunneledImpl = 0;
-
-    uno::Reference< lang::XUnoTunnel > xElementTunnel;
-    if ( aElement.hasValue() && (aElement >>= xElementTunnel) )
-    {
-        OSL_ASSERT( xElementTunnel.is() );
-
-        sal_Int64 nSomething = xElementTunnel->getSomething(doGetElementTunnelID());
-        if (0 != nSomething)
-        {
-            void* pVoid = reinterpret_cast<void*>(nSomething);
-            pTunneledImpl = static_cast<SetElement*>(pVoid);
-        }
-    }
-    return pTunneledImpl;
-}
-//-----------------------------------------------------------------------------
-
-bool Factory::tunnelSetElement(sal_Int64& nSomething, SetElement& rElement, uno::Sequence< sal_Int8 > const& aTunnelID)
-{
-    if (aTunnelID == doGetElementTunnelID())
-    {
-        void* pVoid = &rElement;
-        nSomething = reinterpret_cast<sal_Int64>(pVoid);
-
-        return true;
-    }
-    else
-        return false;
-}
-
-//-----------------------------------------------------------------------------
-
-ApiTreeImpl const* Factory::findDescendantTreeImpl(configuration::NodeID const& aNode, ApiTreeImpl const* pImpl)
-{
-    ApiTreeImpl* pRet = 0;
-    if (pImpl)
-    {
-        if ( NodeElement* pElement = pImpl->getFactory().implFind( aNode ) )
-            pRet = &pElement->getApiTree();
-    }
-    return pRet;
-}
-
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/api2/apifactory.hxx b/configmgr/source/api2/apifactory.hxx
deleted file mode 100644
index 62b8d41065..0000000000
--- a/configmgr/source/api2/apifactory.hxx
+++ /dev/null
@@ -1,122 +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: apifactory.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 CONFIGMGR_API_FACTORY_HXX_
-#define CONFIGMGR_API_FACTORY_HXX_
-
-#include "options.hxx"
-#include "utility.hxx"
-#include <boost/utility.hpp>
-#include <rtl/ref.hxx>
-#include <vos/ref.hxx>
-#include <cppuhelper/typeprovider.hxx>
-
-namespace configmgr
-{
-    namespace configuration 
-    {
-        class NodeID;
-        class NodeRef;
-        class ElementTree;
-        class Template;
-        class Tree;
-    }
-    namespace configapi 
-    {
-        namespace uno = com::sun::star::uno;
-
-        class ApiTreeImpl;
-        class NodeElement;
-        class InnerElement;
-        class TreeElement;
-        class SetElement;
-        class RootElement;
-
-    // used to register objects
-        class ObjectRegistry;
-
-    // used to create UNO objects
-        class Factory : private boost::noncopyable
-        {
-            rtl::Reference<ObjectRegistry> m_pRegistry;
-            cppu::OImplementationId	const m_aTunnelID;
-
-        private:
-            /// return the element _without_ acquiring it
-            NodeElement*	implFind(configuration::NodeID const& aNode);
-
-        public:
-            Factory(rtl::Reference<ObjectRegistry> pRegistry);
-            virtual ~Factory();
-
-            uno::Reference< uno::XInterface > makeUnoElement(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode);
-            uno::Reference< uno::XInterface > findUnoElement(configuration::NodeID const& aNode);
-
-            uno::Reference< uno::XInterface > makeUnoSetElement(rtl::Reference< configuration::ElementTree > const& aTree);
-
-            NodeElement* makeElement(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode);
-            NodeElement* findElement(configuration::NodeID const& aNode);
-
-            TreeElement*	makeAccessRoot(rtl::Reference< configuration::Tree > const& aTree, RequestOptions const& _aOptions);
-            SetElement*		makeSetElement(rtl::Reference< configuration::ElementTree > const& aTree);
-
-            SetElement*		findSetElement(rtl::Reference< configuration::ElementTree > const& aElement);
-
-            /// check for the existence of an element
-            sal_Bool		hasElement(configuration::NodeID const& _rNode) { return NULL != implFind(_rNode); }
-
-            void	revokeElement(configuration::NodeID const& aNode);
-
-            SetElement* extractSetElement(uno::Any const& aElement);
-            bool tunnelSetElement(sal_Int64& nSomething, SetElement& rElement, uno::Sequence< sal_Int8 > const& aTunnelID);
-            // registry operations
-
-            static ApiTreeImpl const* findDescendantTreeImpl(configuration::NodeID const& aNode, ApiTreeImpl const* pImpl);
-        protected:
-            void			doRegisterElement(configuration::NodeID const& aNode, NodeElement* pElement);
-            void			doRevokeElement(configuration::NodeID const& aNode, NodeElement* pElement);
-
-            uno::Sequence< sal_Int8 > doGetElementTunnelID() const { return m_aTunnelID.getImplementationId(); }
-
-            virtual NodeElement*	doCreateGroupMember(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode, configuration::Template* pSetElementTemplate) = 0;
-            virtual TreeElement*	doCreateAccessRoot(rtl::Reference< configuration::Tree > const& aTree, configuration::Template* pSetElementTemplate, vos::ORef< OOptions >const& _xOptions) = 0;
-            virtual SetElement*		doCreateSetElement(rtl::Reference< configuration::ElementTree > const& aTree, configuration::Template* pSetElementTemplate) = 0;
-
-            static ApiTreeImpl& getImplementation(NodeElement& pElement);
-        private:
-            static rtl::Reference<configuration::Template> implGetSetElementTemplate(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode);
-            static uno::Reference< uno::XInterface > implToUno(NodeElement* pNode);
-            void implHaveNewElement(configuration::NodeID aNodeID, NodeElement* pNode);
-        };
-
-    }
-}
-
-#endif // CONFIGMGR_API_FACTORY_HXX_
diff --git a/configmgr/source/api2/apifactoryimpl.cxx b/configmgr/source/api2/apifactoryimpl.cxx
deleted file mode 100644
index 8a64373153..0000000000
--- a/configmgr/source/api2/apifactoryimpl.cxx
+++ /dev/null
@@ -1,355 +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: apifactoryimpl.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-#include <stdio.h>
-#include "apifactoryimpl.hxx"
-
-#include "setobjects.hxx"
-#include "groupobjects.hxx"
-
-#include "configset.hxx"
-#include "configpath.hxx"
-#include "template.hxx"
-#include "noderef.hxx"
-#include "objectregistry.hxx"
-#include "attributes.hxx"
-
-namespace configmgr
-{
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-// class ReadOnlyObjectFactory
-//-----------------------------------------------------------------------------
-
-ReadOnlyObjectFactory::ReadOnlyObjectFactory(ApiProvider& rProvider,rtl::Reference<ObjectRegistry> pRegistry)
-: Factory(pRegistry)
-, m_rProvider(rProvider)
-{
-}
-//-----------------------------------------------------------------------------
-
-ReadOnlyObjectFactory::~ReadOnlyObjectFactory()
-{
-}
-//-----------------------------------------------------------------------------
-
-NodeElement* ReadOnlyObjectFactory::doCreateGroupMember(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode, configuration::Template* pSetElementTemplate)
-{
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create a group member without a tree");
-    OSL_ENSURE(aNode.isValid(), "ERROR: trying to create a group member without a node");
-    OSL_ENSURE(aTree->isValidNode(aNode.getOffset()), "ERROR: node does not match tree , while trying to create a group member");
-    OSL_ENSURE(!aTree->isRootNode(aNode), "ERROR: trying to create a group member on a root node");
-    if (aTree->isRootNode(aNode))
-        return 0;
-
-    NodeElement* pRootElement = makeElement(aTree,aTree->getRootNode());
-    OSL_ENSURE(pRootElement, "Could not create root element of tree - cannot create group member object");
-    if (!pRootElement)
-        return 0;
-
-    uno::Reference<uno::XInterface> aRootRelease(pRootElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-    ApiTreeImpl& rRootContext = getImplementation(*pRootElement);
-
-    NodeElement * pResult = 0;
-    if (!pSetElementTemplate)
-    {
-         OInnerGroupInfo * pNewObject = new OInnerGroupInfo(rRootContext, aNode);
-         pNewObject->acquire();
-         pResult = &pNewObject->getElementClass();
-    }
-    else
-    {
-         OInnerSetInfo * pNewObject = new OInnerSetInfo(rRootContext, aNode);
-         pNewObject->acquire();
-         pResult = &pNewObject->getElementClass();
-    }
-
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-
-TreeElement* ReadOnlyObjectFactory::doCreateAccessRoot(rtl::Reference< configuration::Tree > const& aTree, configuration::Template* pSetElementTemplate, vos::ORef< OOptions >const& _xOptions)
-{
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create a root object without a tree");
-
-    TreeElement * pResult = 0;
-    if (!pSetElementTemplate)
-    {
-         ORootElementGroupInfo * pNewObject = new ORootElementGroupInfo(m_rProvider, aTree, _xOptions);
-         pNewObject->acquire();
-         pResult = &pNewObject->getElementClass();
-    }
-    else
-    {
-         ORootElementSetInfo * pNewObject = new ORootElementSetInfo(m_rProvider, aTree, _xOptions);
-         pNewObject->acquire();
-         pResult = &pNewObject->getElementClass();
-    }
-    return pResult;
-}
-
-//-----------------------------------------------------------------------------
-SetElement* ReadOnlyObjectFactory::doCreateSetElement(rtl::Reference< configuration::ElementTree > const& aElementTree, configuration::Template* pSetElementTemplate)
-{
-    OSL_ENSURE(aElementTree.is(), "ERROR: trying to create a set element object without a tree");
-
-    rtl::Reference< configuration::Tree > aTree( aElementTree.get() );
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create a set element object without a tree");
-
-    ApiTreeImpl * pParentContext = 0;
-    uno::Reference<uno::XInterface> aParentRelease;
-
-    rtl::Reference< configuration::Tree > aParentTree = aTree->getContextTree();
-    if (!configuration::isEmpty(aParentTree.get()))
-    {
-        //configuration::NodeRef aParentNode = aTree.getContextNode(); 
-        configuration::NodeRef aParentRoot = aParentTree->getRootNode(); 
-        if (NodeElement* pParentRootElement = makeElement(aParentTree,aParentRoot) )
-        {
-            aParentRelease = uno::Reference<uno::XInterface>(pParentRootElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-            pParentContext = &getImplementation(*pParentRootElement);
-        }
-    }
-
-    SetElement * pResult = 0;
-    if (!pSetElementTemplate)
-    {
-         OSetElementGroupInfo * pNewObject = new OSetElementGroupInfo(aTree,m_rProvider,pParentContext);
-         pNewObject->acquire();
-         pResult = &pNewObject->getElementClass();
-    }
-    else
-    {
-         OSetElementSetInfo * pNewObject = new OSetElementSetInfo(aTree,m_rProvider,pParentContext);
-         pNewObject->acquire();
-         pResult = &pNewObject->getElementClass();
-    }
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class UpdateObjectFactory
-//-----------------------------------------------------------------------------
-
-UpdateObjectFactory::UpdateObjectFactory(ApiProvider& rProvider,rtl::Reference<ObjectRegistry> pRegistry)
-: Factory(pRegistry)
-, m_rProvider(rProvider)
-{
-}
-//-----------------------------------------------------------------------------
-
-UpdateObjectFactory::~UpdateObjectFactory()
-{
-}
-//-----------------------------------------------------------------------------
-            
-bool UpdateObjectFactory::implIsReadOnly(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-{
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create an object without a tree");
-    OSL_ENSURE(aNode.isValid(), "ERROR: trying to create an object without a node");
-    OSL_ENSURE(aTree->isValidNode(aNode.getOffset()), "ERROR: node does not match tree , while trying to create an object");
-
-    return aTree->getAttributes(aNode).isReadonly();
-}
-//-----------------------------------------------------------------------------
-
-NodeElement* UpdateObjectFactory::doCreateGroupMember(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode, configuration::Template* pSetElementTemplate)
-{
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create a group member without a tree");
-    OSL_ENSURE(aNode.isValid(), "ERROR: trying to create a group member without a node");
-    OSL_ENSURE(aTree->isValidNode(aNode.getOffset()), "ERROR: node does not match tree , while trying to create a group");
-
-    NodeElement* pRootElement = makeElement(aTree,aTree->getRootNode());
-    OSL_ENSURE(pRootElement, "Could not create root element of tree - cannot create group member object");
-    if (!pRootElement)
-        return 0;
-
-    uno::Reference<uno::XInterface> aRootRelease(pRootElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-    ApiTreeImpl& rRootContext = getImplementation(*pRootElement);
-
-    NodeElement * pResult = 0;
-
-    if (implIsReadOnly(aTree,aNode))
-    {
-        if (!pSetElementTemplate)
-        {
-             OInnerGroupInfo * pNewObject = new OInnerGroupInfo(rRootContext, aNode);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else
-        {
-             OInnerSetInfo * pNewObject = new OInnerSetInfo(rRootContext, aNode);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-    }
-    else
-    {
-        if (!pSetElementTemplate)
-        {
-             OInnerGroupUpdate * pNewObject = new OInnerGroupUpdate(rRootContext, aNode);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else if (pSetElementTemplate->isInstanceValue())
-        {
-             OInnerValueSetUpdate * pNewObject = new OInnerValueSetUpdate(rRootContext, aNode);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else
-        {
-             OInnerTreeSetUpdate * pNewObject = new OInnerTreeSetUpdate(rRootContext, aNode);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-    }
-
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-
-TreeElement* UpdateObjectFactory::doCreateAccessRoot(rtl::Reference< configuration::Tree > const& aTree, configuration::Template* pSetElementTemplate, vos::ORef< OOptions >const& _xOptions)
-{
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create a root object without a tree");
-    
-    TreeElement * pResult = 0;
-    if (implIsReadOnly(aTree,aTree->getRootNode()))
-    {
-        OSL_ENSURE(false, "WARNING: Trying to create an 'Update Access' on a read-only tree/node");
-        if (!pSetElementTemplate)
-        {
-             ORootElementGroupInfo * pNewObject = new ORootElementGroupInfo(m_rProvider, aTree, _xOptions);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else
-        {
-             ORootElementSetInfo * pNewObject = new ORootElementSetInfo(m_rProvider, aTree, _xOptions);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-    }
-    else
-    {
-        if (!pSetElementTemplate)
-        {
-             ORootElementGroupUpdate * pNewObject = new ORootElementGroupUpdate(m_rProvider, aTree, _xOptions);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else if (pSetElementTemplate->isInstanceValue())
-        {
-             ORootElementValueSetUpdate * pNewObject = new ORootElementValueSetUpdate(m_rProvider, aTree, _xOptions);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else
-        {
-             ORootElementTreeSetUpdate * pNewObject = new ORootElementTreeSetUpdate(m_rProvider, aTree, _xOptions);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-    }
-
-    return pResult;
-}
-
-//-----------------------------------------------------------------------------
-SetElement* UpdateObjectFactory::doCreateSetElement(rtl::Reference< configuration::ElementTree > const& aElementTree, configuration::Template* pSetElementTemplate)
-{
-    OSL_ENSURE(aElementTree.is(), "ERROR: trying to create a set element object without a tree");
-
-    rtl::Reference< configuration::Tree > aTree( aElementTree.get() );
-    OSL_ENSURE(!configuration::isEmpty(aTree.get()), "ERROR: trying to create a set element object without a tree");
-
-    ApiTreeImpl * pParentContext = 0;
-    uno::Reference<uno::XInterface> aParentRelease;
-
-    rtl::Reference< configuration::Tree > aParentTree = aTree->getContextTree();
-    if (!configuration::isEmpty(aParentTree.get()))
-    {
-        //configuration::NodeRef aParentNode = aTree.getContextNode(); 
-        configuration::NodeRef aParentRoot = aParentTree->getRootNode(); 
-        if (NodeElement* pParentRootElement = makeElement(aParentTree,aParentRoot) )
-        {
-            aParentRelease = uno::Reference<uno::XInterface>(pParentRootElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-            pParentContext = &getImplementation(*pParentRootElement);
-        }
-    }
-
-    SetElement * pResult = 0;
-    if (implIsReadOnly(aTree,aTree->getRootNode()))
-    {
-        if (!pSetElementTemplate)
-        {
-             OSetElementGroupInfo * pNewObject = new OSetElementGroupInfo(aTree,m_rProvider,pParentContext);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else
-        {
-             OSetElementSetInfo * pNewObject = new OSetElementSetInfo(aTree,m_rProvider,pParentContext);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-    }
-    else
-    {
-        if (!pSetElementTemplate)
-        {
-             OSetElementGroupUpdate * pNewObject = new OSetElementGroupUpdate(aTree,m_rProvider,pParentContext);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else if (pSetElementTemplate->isInstanceValue())
-        {
-             OSetElementValueSetUpdate * pNewObject = new OSetElementValueSetUpdate(aTree,m_rProvider,pParentContext);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-        else
-        {
-             OSetElementTreeSetUpdate * pNewObject = new OSetElementTreeSetUpdate(aTree,m_rProvider,pParentContext);
-             pNewObject->acquire();
-             pResult = &pNewObject->getElementClass();
-        }
-    }
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/api2/apifactoryimpl.hxx b/configmgr/source/api2/apifactoryimpl.hxx
deleted file mode 100644
index dc355f5b71..0000000000
--- a/configmgr/source/api2/apifactoryimpl.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: apifactoryimpl.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 CONFIGMGR_API_FACTORYIMPL_HXX_
-#define CONFIGMGR_API_FACTORYIMPL_HXX_
-
-#include "apifactory.hxx"
-
-namespace configmgr
-{
-    namespace configapi 
-    {
-        class ApiProvider;
-        // used to create UNO objects
-        class ReadOnlyObjectFactory : public Factory
-        {
-            ApiProvider& m_rProvider;
-        public:
-            ReadOnlyObjectFactory(ApiProvider& rProvider,rtl::Reference<ObjectRegistry> pRegistry);
-            ~ReadOnlyObjectFactory();
-
-            virtual NodeElement*	doCreateGroupMember(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode, configuration::Template* pSetElementTemplate);
-            virtual TreeElement*	doCreateAccessRoot(rtl::Reference< configuration::Tree > const& aTree, configuration::Template* pSetElementTemplate, vos::ORef< OOptions >const& _xOptions);
-            virtual SetElement*	doCreateSetElement(rtl::Reference< configuration::ElementTree > const& aTree, configuration::Template* pSetElementTemplate);
-        };
-        // used to create UNO objects
-        class UpdateObjectFactory : public Factory
-        {
-            ApiProvider& m_rProvider;
-        public:
-            UpdateObjectFactory(ApiProvider& rProvider,rtl::Reference<ObjectRegistry> pRegistry);
-            ~UpdateObjectFactory();
-
-            virtual NodeElement*	doCreateGroupMember(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode, configuration::Template* pSetElementTemplate);
-            virtual TreeElement*	doCreateAccessRoot(rtl::Reference< configuration::Tree > const& aTree, configuration::Template* pSetElementTemplate, vos::ORef< OOptions >const& _xOptions);
-            virtual SetElement*	doCreateSetElement(rtl::Reference< configuration::ElementTree > const& aTree, configuration::Template* pSetElementTemplate);
-        private:
-            bool implIsReadOnly(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode);
-        };
-
-    }
-}
-
-#endif // CONFIGMGR_API_FACTORYIMPL_HXX_
diff --git a/configmgr/source/api2/apinodeaccess.cxx b/configmgr/source/api2/apinodeaccess.cxx
deleted file mode 100644
index c5f9cd0717..0000000000
--- a/configmgr/source/api2/apinodeaccess.cxx
+++ /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: apinodeaccess.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_configmgr.hxx"
-#include <stdio.h>
-#include "apinodeaccess.hxx"
-
-#include "apitreeimplobj.hxx"
-#include "apifactory.hxx"
-
-#include "apitreeaccess.hxx"
-#include "noderef.hxx"
-
-#include "anynoderef.hxx"
-#include "valueref.hxx"
-
-#include "configset.hxx"
-#include "configpath.hxx"
-#include "confignotifier.hxx"
-
-namespace configmgr
-{
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-
-NodeAccess::~NodeAccess()
-{
-}
-//-----------------------------------------------------------------------------
-
-configuration::NodeRef NodeAccess::getNodeRef() const
-{
-    return doGetNode();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::Tree > NodeAccess::getTreeRef() const
-{
-    return getApiTree().getTree();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::Tree > NodeAccess::getTree() const
-{
-    return getApiTree().getTree();
-}
-//-----------------------------------------------------------------------------
-
-void NodeAccess::checkAlive() const
-{
-    getApiTree().checkAlive();
-}
-//-----------------------------------------------------------------------------
-
-void NodeAccess::disposeNode()
-{
-    getApiTree().disposeNode(getNodeRef(), getUnoInstance());
-}
-//-----------------------------------------------------------------------------
-
-
-Factory& NodeAccess::getFactory() const
-{
-    return getApiTree().getFactory();
-}
-//-----------------------------------------------------------------------------
-
-Notifier NodeAccess::getNotifier() const
-{
-    return getApiTree().getNotifier();
-}
-
-//-----------------------------------------------------------------------------
-
-uno::Any	makeElement(configapi::Factory& rFactory, rtl::Reference< configuration::Tree > const& aTree, configuration::AnyNodeRef const& aNode)
-{
-    if (!configuration::isEmpty(aTree.get()) && aNode.isValid())
-    {
-        if (aNode.isNode())
-        {
-            configuration::NodeRef aInnerNode = aNode.toNode();
-
-            if (configuration::isStructuralNode(aTree,aInnerNode))
-                return uno::makeAny( rFactory.makeUnoElement(aTree,aInnerNode) );
-
-            else
-                return configuration::getSimpleElementValue(aTree,aInnerNode);
-        }
-        else
-        {
-            return configuration::getSimpleValue(aTree,aNode.toValue());
-        }
-    }
-
-    return uno::Any();
-}
-//-----------------------------------------------------------------------------
-
-uno::Any	makeInnerElement(configapi::Factory& rFactory, rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-{
-    if (!configuration::isEmpty(aTree.get()) && aNode.isValid())
-    {
-        OSL_ENSURE(configuration::isStructuralNode(aTree,aNode), "Trying to makeInnerElement for a simple value");
-
-        return uno::makeAny( rFactory.makeUnoElement(aTree,aNode) );
-    }
-
-    return uno::Any();
-}
-//-----------------------------------------------------------------------------
-
-uno::Any	makeElement(configapi::Factory& rFactory, rtl::Reference< configuration::ElementTree > const& aTree)
-{
-    if (aTree.is())
-    {
-        return uno::makeAny( rFactory.makeUnoSetElement(aTree) );
-    }
-
-    return uno::Any();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::ElementTree > extractElementTree(configapi::Factory& rFactory, uno::Any const& aElement, rtl::Reference< configuration::Template > const& aTemplate )
-{
-    OSL_ENSURE(aTemplate.is(), "ERROR: Need a template to extract a matching set element");
-
-    if (SetElement* pSetElement = rFactory.extractSetElement(aElement))
-    {
-        rtl::Reference<configuration::Template> aFoundTemplate = pSetElement->getTemplateInfo();
-        if (aFoundTemplate.is())
-        {
-            if (aFoundTemplate != aTemplate)
-                throw configuration::TypeMismatch(aFoundTemplate->getPathString(), aTemplate->getPathString());
-
-            return pSetElement->getElementRef( );
-        }
-    }
-    return rtl::Reference< configuration::ElementTree >();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::Template > NodeSetInfoAccess::getElementInfo() const
-{
-    rtl::Reference<configuration::Template> aTemplate = getTree()->extractElementInfo(getNodeRef());
-
-    OSL_ENSURE(aTemplate.is(), "ERROR: Set must have an element template");
-
-    return aTemplate;
-}
-
-}
-}
diff --git a/configmgr/source/api2/apinodeaccess.hxx b/configmgr/source/api2/apinodeaccess.hxx
deleted file mode 100644
index c0c80fe386..0000000000
--- a/configmgr/source/api2/apinodeaccess.hxx
+++ /dev/null
@@ -1,175 +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: apinodeaccess.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_NODEACCESS_HXX_
-#define CONFIGMGR_API_NODEACCESS_HXX_
-
-#include "sal/config.h"
-
-#include "boost/utility.hpp"
-
-#include "datalock.hxx"
-#include "utility.hxx"
-#include "noderef.hxx"
-
-namespace osl { class Mutex; }
-
-namespace configmgr
-{
-    namespace configuration
-    {
-        class AnyNodeRef;
-        class NodeRef;
-        class Tree;
-    }
-    namespace configapi
-    {
-        class Factory;
-        class Notifier;
-        class SetElement;
-
-        class ApiTreeImpl;
-
-        namespace uno = com::sun::star::uno;
-
-        // API object implementation wrappers
-        // these objects just provide the pieces needed to navigate and manipulate trees and nodes
-
-        // The common part of all nodes, provides all you need to read and listen
-        class NodeAccess : private boost::noncopyable
-        {
-        public:
-            virtual ~NodeAccess();
-
-        // model access
-            configuration::NodeRef	getNodeRef() const;
-            rtl::Reference< configuration::Tree > getTreeRef() const;
-            rtl::Reference< configuration::Tree > getTree() const;
-
-        // self-locked methods for dispose handling
-            void checkAlive() const;
-            void disposeNode();
-
-        // api object handling
-            uno::XInterface*			getUnoInstance() const
-            { return doGetUnoInstance(); }
-            Factory&				getFactory() const;
-            Notifier				getNotifier() const;
-
-        protected:
-            virtual configuration::NodeRef	doGetNode() const = 0;
-            virtual uno::XInterface*	doGetUnoInstance() const = 0;
-            virtual ApiTreeImpl&	getApiTree() const = 0;
-        };
-
-        /** builds a Uno <type scope='com::sun::star::uno'>Any</type> representing node <var>aNode</var>.
-            <p>	Uses the <type scope='configmgr::configapi'>Factory</type> provided
-                to create service implementations wrapping inner nodes</p>
-            <p>	returns VOID if <var>aNode</var> is empty.</p>
-        */
-        uno::Any	makeElement(configapi::Factory& rFactory, rtl::Reference< configuration::Tree > const& aTree, configuration::AnyNodeRef const& aNode);
-
-        /** builds a Uno <type scope='com::sun::star::uno'>Any</type> representing inner node <var>aNode</var>.
-            <p>	Uses the <type scope='configmgr::configapi'>Factory</type> provided
-                to create service implementations wrapping inner nodes</p>
-            <p>	returns VOID if <var>aNode</var> is empty.</p>
-        */
-        uno::Any	makeInnerElement(configapi::Factory& rFactory, rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode);
-
-        /** builds a Uno <type scope='com::sun::star::uno'>Any</type> representing set element <var>aElement</var>.
-            <p>	Uses the <type scope='configmgr::configapi'>Factory</type> provided
-                to create service implementations wrapping inner nodes</p>
-            <p>	returns VOID if <var>aNode</var> is empty.</p>
-        */
-        uno::Any	makeElement(configapi::Factory& rFactory, rtl::Reference< configuration::ElementTree > const& aTree);
-
-
-        // Info interfaces for Group Nodes
-        class NodeGroupInfoAccess : public NodeAccess
-        {
-        public:
-            // currently only used for tagging group nodes
-        };
-
-        // Info interfaces for Set Nodes
-        class NodeSetInfoAccess : public NodeAccess
-        {
-            friend class SetElement;
-        public:
-            rtl::Reference< configuration::Template > getElementInfo() const;
-        };
-
-        /** extracts a <type scope='configmgr::configuration'>ElementTree</type> from a <type scope='com::sun::star::uno'>Any</type>
-            which must contain an object which wraps an instance of the template available in <var>aTemplate</var>.
-            <p>	Uses the <type scope='configmgr::configapi'>Factory</type> provided
-                to resolve inner nodes (which may suppose that the object was created using the same factory)</p>
-            <p>	returns an empty tree if <var>aElement</var> is empty.</p>
-            <p>	May throw exceptions if the type doesn't match the template.</p>
-        */
-        rtl::Reference< configuration::ElementTree > extractElementTree(Factory& rFactory, uno::Any const& aElement, rtl::Reference< configuration::Template > const& aTemplate );
-
-        /// wraps a NodeAccess; provides both object and provider (read) locks,
-        // ensures object was not disposed
-        template <class Access>
-        class GuardedNodeData
-        {
-            UnoApiLock              m_aLock;
-            Access & m_rNode;
-        public:
-            GuardedNodeData(Access& rNode);
-        public:
-            Access&	get()		 const { return m_rNode; }
-
-            rtl::Reference< configuration::Tree > getTree() const;
-            configuration::NodeRef  getNode() const;
-        };
-
-        template <class Access>
-        GuardedNodeData<Access>::GuardedNodeData(Access& rNode)
-        : m_rNode(rNode)
-        {
-            rNode.checkAlive();
-        }
-
-        template <class Access>
-        rtl::Reference< configuration::Tree > GuardedNodeData<Access>::getTree() const
-        {
-            return m_rNode.getTree();
-        }
-
-        template <class Access>
-        configuration::NodeRef GuardedNodeData<Access>::getNode() const
-        {
-            return m_rNode.getNodeRef();
-        }
-    }
-}
-
-#endif // CONFIGMGR_API_NODEACCESS_HXX_
diff --git a/configmgr/source/api2/apinodeupdate.cxx b/configmgr/source/api2/apinodeupdate.cxx
deleted file mode 100644
index d7cf1d409c..0000000000
--- a/configmgr/source/api2/apinodeupdate.cxx
+++ /dev/null
@@ -1,172 +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: apinodeupdate.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-#include <stdio.h>
-#include "apinodeupdate.hxx"
-#include "apitreeimplobj.hxx"
-#include "apitreeaccess.hxx"
-#include "noderef.hxx"
-#include "configset.hxx"
-#include "configgroup.hxx"
-#include "configpath.hxx"
-#include "apifactory.hxx"
-
-namespace configmgr
-{
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-
-NodeGroupAccess& withDefaultData(NodeGroupAccess& _aGroup)
-{
-    configuration::GroupDefaulter::ensureDataAvailable(_aGroup.getTreeRef(),_aGroup.getNodeRef(), 
-                                                        _aGroup.getApiTree().getDefaultProvider());
-    return _aGroup;
-}
-//-----------------------------------------------------------------------------
-
-configuration::GroupUpdater NodeGroupAccess::getNodeUpdater()
-{
-    return configuration::GroupUpdater(getTree(),getNodeRef(), getApiTree().getProvider().getTypeConverter());
-}
-//-----------------------------------------------------------------------------
-
-configuration::GroupDefaulter NodeGroupAccess::getNodeDefaulter()
-{
-    return configuration::GroupDefaulter(getTree(),getNodeRef(), getApiTree().getDefaultProvider());
-}
-//-----------------------------------------------------------------------------
-
-configuration::SetElementFactory NodeTreeSetAccess::getElementFactory()
-{
-    configuration::TemplateProvider aProvider = configuration::SetElementFactory::findTemplateProvider(getTree(),getNodeRef());
-    return configuration::SetElementFactory(aProvider);
-}
-//-----------------------------------------------------------------------------
-
-configuration::SetDefaulter NodeSetAccess::getNodeDefaulter()
-{
-    return configuration::SetDefaulter(getTree(),getNodeRef(), getApiTree().getDefaultProvider());
-}
-//-----------------------------------------------------------------------------
-
-configuration::TreeSetUpdater NodeTreeSetAccess::getNodeUpdater()
-{
-    return configuration::TreeSetUpdater(getTree(),getNodeRef(),getElementInfo());
-}
-//-----------------------------------------------------------------------------
-
-
-configuration::ValueSetUpdater NodeValueSetAccess::getNodeUpdater()
-{
-    return configuration::ValueSetUpdater(getTree(),getNodeRef(),getElementInfo(), getApiTree().getProvider().getTypeConverter());
-}
-//-----------------------------------------------------------------------------
-
-void attachSetElement(NodeTreeSetAccess& aSet, SetElement& aElement)
-{
-    OSL_ENSURE( configuration::NodeID(aSet.getTreeRef(),aSet.getNodeRef()) == 
-                configuration::NodeID(rtl::Reference< configuration::Tree >(aElement.getTreeRef()->getContextTree()),aElement.getTreeRef()->getContextNodeRef()),
-                "ERROR: Attaching an unrelated SetElement to a SetInfoAccess");
-    
-    aElement.haveNewParent(&aSet);
-}
-//-----------------------------------------------------------------------------
-    
-bool attachSetElement(NodeTreeSetAccess& aSet, rtl::Reference< configuration::ElementTree > const& aElementTree)
-{
-    OSL_ENSURE( configuration::NodeID(aSet.getTreeRef(),aSet.getNodeRef()) == 
-                configuration::NodeID(rtl::Reference< configuration::Tree >(aElementTree->getContextTree()), aElementTree->getContextNodeRef()),
-                "ERROR: Attaching an unrelated ElementTree to a SetInfoAccess");
-
-    Factory& rFactory = aSet.getFactory();
-    if (SetElement* pSetElement = rFactory.findSetElement(aElementTree))
-    {
-        // the factory always does an extra acquire
-        uno::Reference<uno::XInterface> xReleaseSetElement(pSetElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-
-        attachSetElement(aSet, *pSetElement);
-        return true;
-    }
-    else
-        return false;
-    
-}
-//-----------------------------------------------------------------------------
-
-void detachSetElement(SetElement& aElement)
-{
-    OSL_ENSURE( configuration::isEmpty(aElement.getTreeRef()->getContextTree()),
-                "ERROR: Detaching a SetElement that has a parent");
-
-    aElement.haveNewParent(0);
-}
-//-----------------------------------------------------------------------------
-
-bool detachSetElement(Factory& rFactory, rtl::Reference< configuration::ElementTree > const& aElementTree)
-{
-    OSL_ENSURE( configuration::isEmpty(aElementTree->getContextTree()),
-                "ERROR: Detaching an ElementTree that has a parent");
-
-    if (SetElement* pSetElement = rFactory.findSetElement(aElementTree))
-    {
-        // the factory always does an extra acquire
-        uno::Reference<uno::XInterface> xReleaseSetElement(pSetElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-
-        detachSetElement(*pSetElement);
-        return true;
-    }
-    else
-        return false;
-    
-}
-//-----------------------------------------------------------------------------
-
-UpdateGuardImpl::UpdateGuardImpl(NodeGroupAccess& rNode)
-: m_rNode(rNode)
-{
-    rNode.checkAlive();
-}
-//-----------------------------------------------------------------------------
-
-UpdateGuardImpl::UpdateGuardImpl(NodeSetAccess& rNode)
-: m_rNode(rNode)
-{
-}
-//-----------------------------------------------------------------------------
-
-UpdateGuardImpl::~UpdateGuardImpl() throw ()
-{
-}
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/api2/apinodeupdate.hxx b/configmgr/source/api2/apinodeupdate.hxx
deleted file mode 100644
index bade3975f3..0000000000
--- a/configmgr/source/api2/apinodeupdate.hxx
+++ /dev/null
@@ -1,177 +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: apinodeupdate.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 CONFIGMGR_API_NODEUPDATE_HXX_
-#define CONFIGMGR_API_NODEUPDATE_HXX_
-
-#include "sal/config.h"
-
-#include "boost/utility.hpp"
-
-#include "apinodeaccess.hxx"
-#include "utility.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-        class GroupUpdater;
-        class GroupDefaulter;
-        class TreeSetUpdater;
-        class ValueSetUpdater;
-        class SetDefaulter;
-        class SetElementFactory;
-
-        class NodeUpdate;
-    }
-    namespace configapi
-    {
-        class SetElement;
-
-    // API object implementation wrappers
-        // these objects just provide the pieces needed to navigate and manipulate trees and nodes
-
-        // Updating access for Group Nodes
-        class NodeGroupAccess : public NodeGroupInfoAccess
-        {
-        public:
-            typedef configuration::GroupUpdater     NodeUpdater;
-            typedef configuration::GroupDefaulter   NodeDefaulter;
-            NodeUpdater     getNodeUpdater();
-            NodeDefaulter   getNodeDefaulter();
-
-            /** ensures that the default data for a group is loaded (if possible)
-                <p>Must be called outside of any locks !</p>
-            */
-            friend NodeGroupAccess& withDefaultData(NodeGroupAccess& aGroup);
-        };
-
-        // Updating access for Set Nodes
-        class NodeSetAccess : public NodeSetInfoAccess
-        {
-        public:
-            typedef struct SetUpdater_PlaceHolder   NodeUpdater;
-            typedef configuration::SetDefaulter     NodeDefaulter;
-            NodeDefaulter     getNodeDefaulter();
-        };
-
-        // Updating access for Set Nodes containing whole trees
-        class NodeTreeSetAccess : public NodeSetAccess
-        {
-        public:
-            typedef configuration::TreeSetUpdater     NodeUpdater;
-            NodeUpdater     getNodeUpdater();
-
-            configuration::SetElementFactory	getElementFactory();
-        };
-
-        // Updating access for Set Nodes containing simple values
-        class NodeValueSetAccess : public NodeSetAccess
-        {
-        public:
-            typedef configuration::ValueSetUpdater     NodeUpdater;
-            NodeUpdater     getNodeUpdater();
-        };
-
-        /// informs a <type>SetElement</type> that it should now link to the given SetElement
-        void attachSetElement(NodeTreeSetAccess& aSet, SetElement& aElement);
-
-        /// informs a <type>SetElement</type> that it should now link to the given SetElement
-        bool attachSetElement(NodeTreeSetAccess& aSet, rtl::Reference< configuration::ElementTree > const& aElementTree);
-
-        /// informs a <type>SetElement</type> that it should now unlink from its owning SetElement
-        void detachSetElement(SetElement& aElement);
-
-        /// informs a <type>SetElement</type> that it should now unlink from its owning SetElement
-        bool detachSetElement(Factory& rFactory, rtl::Reference< configuration::ElementTree > const& aElementTree);
-
-        /// Guarding and locking implementations
-        /// guards a NodeGroupAccess, or NodeSetAccess; provides an object (write)/provider(read) lock; ensures object was not disposed
-        class UpdateGuardImpl : private boost::noncopyable
-        {
-            NodeAccess&      m_rNode;
-        public:
-            UpdateGuardImpl(NodeGroupAccess& rNode);
-            UpdateGuardImpl(NodeSetAccess& rNode);
-            ~UpdateGuardImpl() throw ();
-        public:
-            NodeAccess&	get()		 const { return m_rNode; }
-
-            void downgrade() {  }
-        };
-
-    // Thin Wrappers around NodeAccesses: Provide guarding and convenient access
-        /// wraps a NodeAccess; provides an object (write)/provider(read) lock, ensures object was not disposed
-        template <class Access>
-        class GuardedNodeUpdate
-        {
-            UnoApiLock      m_aLock;
-            UpdateGuardImpl m_aImpl;
-        public:
-            GuardedNodeUpdate(Access& rNode) : m_aImpl(rNode) {}
-        public:
-            Access&	get()		 const { return static_cast<Access&>(m_aImpl.get()); }
-
-            rtl::Reference< configuration::Tree > getTree() const;
-            configuration::NodeRef  getNode() const;
-
-            typename Access::NodeUpdater    getNodeUpdater() const;
-            typename Access::NodeDefaulter  getNodeDefaulter() const;
-
-            void clearForBroadcast() { m_aImpl.downgrade(); }
-        };
-
-        template <class Access>
-        rtl::Reference< configuration::Tree > GuardedNodeUpdate<Access>::getTree() const
-        {
-            return get().getTree();
-        }
-
-        template <class Access>
-        configuration::NodeRef GuardedNodeUpdate<Access>::getNode() const
-        {
-            return get().getNodeRef();
-        }
-
-        template <class Access>
-        typename Access::NodeUpdater GuardedNodeUpdate<Access>::getNodeUpdater() const
-        {
-            return get().getNodeUpdater();
-        }
-
-        template <class Access>
-        typename Access::NodeDefaulter GuardedNodeUpdate<Access>::getNodeDefaulter() const
-        {
-            return get().getNodeDefaulter();
-        }
-    }
-}
-
-#endif // CONFIGMGR_API_NODEUPDATE_HXX_
diff --git a/configmgr/source/api2/apinotifierimpl.cxx b/configmgr/source/api2/apinotifierimpl.cxx
deleted file mode 100644
index 8dca2a44a0..0000000000
--- a/configmgr/source/api2/apinotifierimpl.cxx
+++ /dev/null
@@ -1,332 +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: apinotifierimpl.cxx,v $
- * $Revision: 1.8.20.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_configmgr.hxx"
-
-#include "apinotifierimpl.hxx"
-#include "apinodeaccess.hxx"
-#include "noderef.hxx"
-#include "valueref.hxx"
-#include "confignotifier.hxx"
-#include "configexcept.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------------
-        namespace lang = css::lang;
-        namespace util = css::util;
-        namespace beans = css::beans;
-
-// Generic Notifier Support Implementations 
-//-----------------------------------------------------------------------------------
-
-/// add a Listener to the notifier of a NodeAccess
-template <class Listener>
-inline
-void genericAddListener(NodeAccess& rNode, const uno::Reference< Listener >& xListener ) 
-{
-    GuardedNotifier	aGuardedNotifier( rNode );	// guard the notifier
-    aGuardedNotifier->add(rNode.getNodeRef(), xListener);
-}
-
-/// remove a Listener from the notifier of a NodeAccess
-template <class Listener>
-inline
-void genericRemoveListener(NodeAccess& rNode, const uno::Reference< Listener >& xListener ) 
-{
-    GuardedNotifier	aGuardedNotifier( rNode );	// guard the notifier
-    aGuardedNotifier->remove(rNode.getNodeRef(), xListener);
-}
-
-
-/** add a Listener for all or some children of a NodeAccess to its notifier
-    <p>	If the name given is empty, the listener will be added to all children of the node</p>
-    @returns 
-        <TRUE/>  if the node was found, or the name was empty
-        <FALSE/> if the named node wasn't found
-*/
-template <class Listener>
-inline
-bool genericAddChildListener(NodeGroupInfoAccess& rNode, const uno::Reference< Listener >& xListener, const rtl::OUString& sName ) 
-{
-    if (sName.getLength() != 0)
-    {
-        GuardedNodeData<NodeAccess>		aGuardedNode( rNode );		// guard access to children
-        GuardedNotifier				aGuardedNotifier( rNode );	// guard the notifier
-
-        rtl::Reference< configuration::Tree > aTree( aGuardedNode.getTree() );
-        configuration::NodeRef		aNode( aGuardedNode.getNode() );
-
-        rtl::OUString        aChildName = configuration::validateChildName(sName,aTree,aNode);
-
-        if (!aTree->hasChild(aNode,aChildName)) return false;
-
-        aGuardedNotifier->addForOne(aNode, xListener, aChildName);
-    }
-    else
-    {
-        GuardedNotifier	 aGuardedNotifier( rNode );	// guard the notifier
-
-        aGuardedNotifier->addForAll(rNode.getNodeRef(), xListener);
-
-        // always ok, as we addreess no specific NodeRef
-    }
-    return true; 
-}
-
-/** remove a Listener from all or some children of a NodeAccess to its notifier
-    <p>	If the name given is empty, the listener will be removed from any children of the node</p>
-    @returns 
-        <TRUE/>  if the node was found, or the name was empty
-        <FALSE/> if the named node wasn't found
-*/
-template <class Listener>
-inline
-bool genericRemoveChildListener(NodeGroupInfoAccess& rNode, const uno::Reference< Listener >& xListener, const rtl::OUString& sName ) 
-{
-    if (sName.getLength() != 0)
-    {
-        GuardedNodeData<NodeAccess>	    aGuardedNode( rNode );		// guard access to children
-        GuardedNotifier				aGuardedNotifier( rNode );	// guard the notifier
-
-        rtl::Reference< configuration::Tree > aTree( aGuardedNode.getTree() );
-        configuration::NodeRef		aNode( aGuardedNode.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildName(sName,aTree,aNode);
-
-        if (!aTree->hasChild(aNode,aChildName)) return false;
-
-        aGuardedNotifier->removeForOne(aNode, xListener, aChildName);
-    }
-    else
-    {
-        GuardedNotifier	 aGuardedNotifier( rNode );	// guard the notifier
-
-        aGuardedNotifier->removeForAll(rNode.getNodeRef(), xListener);
-
-        // always ok, as we addreess no specific NodeRef
-    }
-    return true; 
-}
-
-
-
-// XComponent
-//-----------------------------------------------------------------------------------
-void implAddListener(NodeAccess& rNode, const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericAddListener(rNode,xListener);
-}
-
-void implRemoveListener(NodeAccess& rNode, const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericRemoveListener(rNode,xListener);
-}
-    
-// XContainer
-//-----------------------------------------------------------------------------------
-void implAddListener(NodeAccess& rNode, const uno::Reference< css::container::XContainerListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericAddListener(rNode,xListener);
-}
-
-void implRemoveListener(NodeAccess& rNode, const uno::Reference< css::container::XContainerListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericRemoveListener(rNode,xListener);
-}
-    
-// XChangesNotifier
-//-----------------------------------------------------------------------------------
-
-void implAddListener(NodeAccess& rNode, const uno::Reference< css::util::XChangesListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericAddListener(rNode,xListener);
-}
-
-void implRemoveListener(NodeAccess& rNode, const uno::Reference< css::util::XChangesListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericRemoveListener(rNode,xListener);
-}
-
-// XMultiPropertySet
-//-----------------------------------------------------------------------------------
-
-void implAddListener( NodeAccess& rNode, const uno::Reference< beans::XPropertiesChangeListener >& xListener, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(uno::RuntimeException)
-{
-
-    GuardedNotifier impl( rNode );
-
-    // TODO: is an exception for unknown names allowed/needed ? 
-    impl->add(rNode.getNodeRef(), xListener, aPropertyNames);
-}
-
-
-void implRemoveListener( NodeAccess& rNode, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    genericRemoveListener(rNode,xListener);
-}
-
-// XPropertySet (manages listeners associated with named child node)
-//-----------------------------------------------------------------------------------
-
-// XPropertySet - VetoableChangeListeners
-//-----------------------------------------------------------------------------------
-
-void implAddListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans::XVetoableChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        if (!genericAddChildListener(rNode,xListener,sPropertyName))
-        {
-            throw css::beans::UnknownPropertyException(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot add listener - node not found !")),
-                    rNode.getUnoInstance() );
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        throw css::beans::UnknownPropertyException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot add listener - node not found:")) += ex.message(),
-                rNode.getUnoInstance() );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-
-}
-
-
-void implRemoveListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans::XVetoableChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        if (!genericRemoveChildListener(rNode,xListener,sPropertyName))
-        {
-            throw css::beans::UnknownPropertyException(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot remove listener - node not found !")),
-                    rNode.getUnoInstance() );
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        throw css::beans::UnknownPropertyException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot remove listener - node not found:")) += ex.message(),
-                rNode.getUnoInstance() );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-}
-
-// XPropertySet - PropertyChangeListeners
-//-----------------------------------------------------------------------------------
-
-void implAddListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans::XPropertyChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        if (!genericAddChildListener(rNode,xListener,sPropertyName))
-        {
-            throw css::beans::UnknownPropertyException(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot add listener - node not found !")),
-                    rNode.getUnoInstance() );
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        throw css::beans::UnknownPropertyException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot add listener - node not found:")) += ex.message(),
-                rNode.getUnoInstance() );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-}
-
-void implRemoveListener( NodeGroupInfoAccess& rNode, const uno::Reference< beans::XPropertyChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        if (!genericRemoveChildListener(rNode,xListener,sPropertyName))
-        {
-            throw css::beans::UnknownPropertyException(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot remove listener - node not found !")),
-                    rNode.getUnoInstance() );
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        throw css::beans::UnknownPropertyException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: cannot remove listener - node not found:")) += ex.message(),
-                rNode.getUnoInstance() );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.unhandled();
-    }
-}
-
-//-----------------------------------------------------------------------------------
-    } // namespace configapi
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/apinotifierimpl.hxx b/configmgr/source/api2/apinotifierimpl.hxx
deleted file mode 100644
index 4a19118395..0000000000
--- a/configmgr/source/api2/apinotifierimpl.hxx
+++ /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: apinotifierimpl.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 CONFIGMGR_API_NOTIFIERIMPL_HXX_
-#define CONFIGMGR_API_NOTIFIERIMPL_HXX_
-
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
-#include <com/sun/star/container/XChild.hpp>
-#endif
-#include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-    /* implementations of the event notification interfaces 
-        supported by a node within the configuration tree.
-    */
-    namespace configapi
-    {
-        class NodeAccess; 
-        class NodeSetInfoAccess; 
-        class NodeGroupInfoAccess; 
-
-        // Notification support
-
-        // XComponent
-        void implAddListener(NodeAccess& rNode, const uno::Reference< css::lang::XEventListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-        void implRemoveListener(NodeAccess& rNode, const uno::Reference< css::lang::XEventListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-        // XContainer
-        void implAddListener(NodeAccess& rNode, const uno::Reference< css::container::XContainerListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-        void implRemoveListener(NodeAccess& rNode, const uno::Reference< css::container::XContainerListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-        // XChangesNotifier
-        void implAddListener(NodeAccess& rNode, const uno::Reference< css::util::XChangesListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-        void implRemoveListener(NodeAccess& rNode, const uno::Reference< css::util::XChangesListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-        // XPropertySet - VetoableChangeListeners
-        void implAddListener( NodeGroupInfoAccess& rNode, const uno::Reference< css::beans::XVetoableChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, uno::RuntimeException);
-  
-        void implRemoveListener( NodeGroupInfoAccess& rNode, const uno::Reference< css::beans::XVetoableChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XPropertySet
-        void implAddListener( NodeGroupInfoAccess& rNode, const uno::Reference< css::beans::XPropertyChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-         void implRemoveListener( NodeGroupInfoAccess& rNode, const uno::Reference< css::beans::XPropertyChangeListener >& xListener, const rtl::OUString& sPropertyName ) 
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XMultiPropertySet
-        void implAddListener( NodeAccess& rNode, const uno::Reference< css::beans::XPropertiesChangeListener >& xListener, const uno::Sequence< rtl::OUString >& sPropertyNames ) 
-            throw(uno::RuntimeException);
-
-        void implRemoveListener( NodeAccess& rNode, const uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-    }
-
-}
-#endif // CONFIGMGR_API_NOTIFIERIMPL_HXX_
-
-
diff --git a/configmgr/source/api2/apiserviceinfo.cxx b/configmgr/source/api2/apiserviceinfo.cxx
deleted file mode 100644
index 21f9db4b8c..0000000000
--- a/configmgr/source/api2/apiserviceinfo.cxx
+++ /dev/null
@@ -1,340 +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: apiserviceinfo.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_configmgr.hxx"
-#include "apiserviceinfo.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//========================================================================
-//= service names
-//========================================================================
- 
-//========================================================================
-//= service infos
-//========================================================================
-
-//-- ACCESS (CONTAINER) ROLES -----------------------------
-
-#define CFG_SVCLIST_SETACCESS \
-    "com.sun.star.configuration.ConfigurationAccess",	\
-    "com.sun.star.configuration.SetAccess",				\
-    "com.sun.star.configuration.HierarchyAccess",		\
-    "com.sun.star.configuration.SimpleSetAccess"
-
-#define CFG_SVCLIST_GROUPACCESS \
-    "com.sun.star.configuration.ConfigurationAccess",	\
-    "com.sun.star.configuration.GroupAccess",			\
-    "com.sun.star.configuration.HierarchyAccess",		\
-    "com.sun.star.configuration.PropertyHierarchy"
-
-#define CFG_SVCLIST_SETUPDATE \
-    "com.sun.star.configuration.ConfigurationUpdateAccess",	\
-    "com.sun.star.configuration.SetUpdate",					\
-    "com.sun.star.configuration.SimpleSetUpdate",			\
-    "com.sun.star.configuration.ConfigurationContainer", /* Obsolete */ \
-    CFG_SVCLIST_SETACCESS
-
-#define CFG_SVCLIST_GROUPUPDATE \
-    "com.sun.star.configuration.ConfigurationUpdateAccess",	\
-    "com.sun.star.configuration.GroupUpdate",				\
-    CFG_SVCLIST_GROUPACCESS
-
-//-- ELEMENT ROLES ----------------------------------------
-
-#define CFG_SVCLIST_SETELEMENT \
-    "com.sun.star.configuration.SetElement",		\
-    "com.sun.star.configuration.HierarchyElement"
-
-#define CFG_SVCLIST_GROUPELEMENT \
-    "com.sun.star.configuration.GroupElement",		\
-    "com.sun.star.configuration.HierarchyElement"
-
-#define CFG_SVCLIST_ACCESSROOTELEMENT \
-    "com.sun.star.configuration.AccessRootElement",	\
-    "com.sun.star.configuration.HierarchyElement"
-
-#define CFG_SVCLIST_UPDATEROOTELEMENT \
-    "com.sun.star.configuration.UpdateRootElement",	\
-    CFG_SVCLIST_ACCESSROOTELEMENT
-
-//-----------------------------------------------------------------------------
-
-sal_Char const * const c_aNoServices[] = 
-{
-    NULL
-};
-
-//-----------------------------------------------------------------------------
-
-sal_Char const * const c_aCreateAccessServiceNames[] =
-{
-    "com.sun.star.configuration.ConfigurationAccess",
-    "com.sun.star.configuration.HierarchyAccess",
-    "com.sun.star.configuration.HierarchyElement",
-    NULL
-};
-
-sal_Char const * const c_aCreateUpdateServiceNames[] =
-{
-    "com.sun.star.configuration.ConfigurationUpdateAccess",
-    "com.sun.star.configuration.ConfigurationAccess",
-    "com.sun.star.configuration.HierarchyAccess",
-    "com.sun.star.configuration.HierarchyElement",
-    NULL
-};
-
-//-----------------------------------------------------------------------------
-
-sal_Char const * const c_aUserAdministrationServices[] = 
-{
-    "com.sun.star.configuration.UserAdministration",
-    "com.sun.star.configuration.SimpleSetUpdate",
-    "com.sun.star.configuration.SimpleSetAccess",
-    "com.sun.star.configuration.ConfigurationContainer", // Obsolete
-    NULL
-};
-
-sal_Char const * const c_aGroupAdministrationServices[] = 
-{
-    "com.sun.star.configuration.GroupAdministration",
-    "com.sun.star.configuration.SimpleSetUpdate",
-    "com.sun.star.configuration.SimpleSetAccess",
-    "com.sun.star.configuration.ConfigurationContainer", // Obsolete
-    NULL
-};
-
-//-- ROLE COMBINATIONS ------------------
-
-//-- GroupElements
-
-sal_Char const * const c_aInnerGroupAccessServices[] = 
-{
-    CFG_SVCLIST_GROUPACCESS,
-    CFG_SVCLIST_GROUPELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aInnerGroupUpdateServices[] = 
-{
-    CFG_SVCLIST_GROUPUPDATE,
-    CFG_SVCLIST_GROUPELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aInnerSetAccessServices[] = 
-{
-    CFG_SVCLIST_SETACCESS,
-    CFG_SVCLIST_GROUPELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aInnerSetUpdateServices[] = 
-{
-    CFG_SVCLIST_SETUPDATE,
-    CFG_SVCLIST_GROUPELEMENT,
-    NULL
-};
-
-//-- SetElements
-
-sal_Char const * const c_aSetElementGroupAccessServices[] = 
-{
-    CFG_SVCLIST_GROUPACCESS,
-    CFG_SVCLIST_SETELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aSetElementGroupUpdateServices[] = 
-{
-    CFG_SVCLIST_GROUPUPDATE,
-    CFG_SVCLIST_SETELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aSetElementSetAccessServices[] = 
-{
-    CFG_SVCLIST_SETACCESS,
-    CFG_SVCLIST_SETELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aSetElementSetUpdateServices[] = 
-{
-    CFG_SVCLIST_SETUPDATE,
-    CFG_SVCLIST_SETELEMENT,
-    NULL
-};
-
-//-- RootElements
-
-sal_Char const * const c_aRootGroupAccessServices[] = 
-{
-    CFG_SVCLIST_GROUPACCESS,
-    CFG_SVCLIST_ACCESSROOTELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aRootGroupUpdateServices[] = 
-{
-    CFG_SVCLIST_GROUPUPDATE,
-    CFG_SVCLIST_UPDATEROOTELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aRootSetAccessServices[] = 
-{
-    CFG_SVCLIST_SETACCESS,
-    CFG_SVCLIST_ACCESSROOTELEMENT,
-    NULL
-};
-
-sal_Char const * const c_aRootSetUpdateServices[] = 
-{
-    CFG_SVCLIST_SETUPDATE,
-    CFG_SVCLIST_UPDATEROOTELEMENT,
-    NULL
-};
-//-----------------------------------------------------------------------------
-
-ServiceImplementationInfo const aInnerGroupInfoSI =  
-{ 
-    "com.sun.star.comp.configuration.OInnerGroupInfoAccess", 
-    c_aInnerGroupAccessServices,
-    NULL
-};
-ServiceImplementationInfo const aInnerGroupUpdateSI =  
-{ 
-    "com.sun.star.comp.configuration.OInnerGroupUpdateAccess", 
-    c_aInnerGroupUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aInnerSetInfoSI =  
-{ 
-    "com.sun.star.comp.configuration.OInnerSetInfoAccess", 
-    c_aInnerSetAccessServices,
-    NULL
-};
-ServiceImplementationInfo const aInnerTreeSetSI =  
-{ 
-    "com.sun.star.comp.configuration.OInnerTreeSetUpdateAccess", 
-    c_aInnerSetUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aInnerValueSetSI =  
-{ 
-    "com.sun.star.comp.configuration.OInnerValueSetUpdateAccess", 
-    c_aInnerSetUpdateServices,
-    NULL
-};
-//-----------------------------------------------------------------------------
-
-ServiceImplementationInfo const aSetElementGroupInfoSI =  
-{ 
-    "com.sun.star.comp.configuration.OSetElementGroupInfoAccess", 
-    c_aSetElementGroupUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aSetElementGroupUpdateSI =  
-{ 
-    "com.sun.star.comp.configuration.OSetElementGroupUpdateAccess", 
-    c_aSetElementGroupUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aSetElementSetInfoSI =  
-{ 
-    "com.sun.star.comp.configuration.OSetElementSetInfoAccess", 
-    c_aSetElementSetAccessServices,
-    NULL
-};
-ServiceImplementationInfo const aSetElementTreeSetSI =  
-{ 
-    "com.sun.star.comp.configuration.OSetElementTreeSetUpdateAccess", 
-    c_aSetElementSetUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aSetElementValueSetSI =  
-{ 
-    "com.sun.star.comp.configuration.OSetElementValueSetUpdateAccess", 
-    c_aSetElementSetUpdateServices,
-    NULL
-};
-//-----------------------------------------------------------------------------
-
-ServiceImplementationInfo const aRootElementGroupInfoSI =  
-{ 
-    "com.sun.star.comp.configuration.ORootElementGroupInfoAccess", 
-    c_aRootGroupAccessServices,
-    NULL
-};
-ServiceImplementationInfo const aRootElementGroupUpdateSI =  
-{ 
-    "com.sun.star.comp.configuration.ORootElementGroupUpdateAccess", 
-    c_aRootGroupUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aRootElementSetInfoSI =  
-{ 
-    "com.sun.star.comp.configuration.ORootElementSetInfoAccess", 
-    c_aRootSetAccessServices,
-    NULL
-};
-ServiceImplementationInfo const aRootElementTreeSetUpdateSI =  
-{ 
-    "com.sun.star.comp.configuration.ORootElementTreeSetUpdateAccess", 
-    c_aRootSetUpdateServices,
-    NULL
-};
-ServiceImplementationInfo const aRootElementValueSetUpdateSI =  
-{ 
-    "com.sun.star.comp.configuration.ORootElementValueSetUpdateAccess", 
-    c_aRootSetUpdateServices,
-    NULL
-};
-//-----------------------------------------------------------------------------
-
-ServiceRegistrationInfo const aCreateReadAccessSI =  
-{ 
-    NULL, //"com.sun.star.comp.configuration.ORootElementReadAccess", 
-    c_aCreateAccessServiceNames 
-};
-ServiceRegistrationInfo const aCreateUpdateAccessSI =  
-{ 
-    NULL, //"com.sun.star.comp.configuration.ORootElementUpdateAccess", 
-    c_aCreateUpdateServiceNames 
-};
-//-----------------------------------------------------------------------------
-
-    }
-}
diff --git a/configmgr/source/api2/apiserviceinfo.hxx b/configmgr/source/api2/apiserviceinfo.hxx
deleted file mode 100644
index c7bef47c43..0000000000
--- a/configmgr/source/api2/apiserviceinfo.hxx
+++ /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: apiserviceinfo.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 CONFIGMGR_API_SERVICEINFO_HXX_
-#define CONFIGMGR_API_SERVICEINFO_HXX_
-
-#include "serviceinfohelper.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-
- extern sal_Char const * const c_aUserAdministrationServices[];
- extern sal_Char const * const c_aGroupAdministrationServices[];
- 
-//-----------------------------------------------------------------------------
- extern ServiceImplementationInfo const aInnerGroupInfoSI;
- extern ServiceImplementationInfo const aInnerGroupUpdateSI;
- extern ServiceImplementationInfo const aInnerSetInfoSI;
- extern ServiceImplementationInfo const aInnerTreeSetSI;
- extern ServiceImplementationInfo const aInnerValueSetSI; 
- extern ServiceImplementationInfo const aSetElementGroupInfoSI;
- extern ServiceImplementationInfo const aSetElementGroupUpdateSI; 
- extern ServiceImplementationInfo const aSetElementSetInfoSI;
- extern ServiceImplementationInfo const aSetElementTreeSetSI;  
- extern ServiceImplementationInfo const aSetElementValueSetSI; 
- extern ServiceImplementationInfo const aRootElementGroupInfoSI; 
- extern ServiceImplementationInfo const aRootElementGroupUpdateSI; 
- extern ServiceImplementationInfo const aRootElementSetInfoSI;
- extern ServiceImplementationInfo const aRootElementTreeSetUpdateSI;
- extern ServiceImplementationInfo const aRootElementValueSetUpdateSI; 
-
-//-----------------------------------------------------------------------------
- extern ServiceRegistrationInfo const aCreateReadAccessSI;
- extern ServiceRegistrationInfo const aCreateUpdateAccessSI; 
-
-//-----------------------------------------------------------------------------
-    }
-}
-//-----------------------------------------------------------------------------
-
-#endif // CONFIGMGR_API_SERVICEINFO_HXX_
diff --git a/configmgr/source/api2/apitreeaccess.cxx b/configmgr/source/api2/apitreeaccess.cxx
deleted file mode 100644
index 14c222618d..0000000000
--- a/configmgr/source/api2/apitreeaccess.cxx
+++ /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: apitreeaccess.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_configmgr.hxx"
-#include <stdio.h>
-#include "apitreeaccess.hxx"
-
-#include "apitreeimplobj.hxx"
-#include "configset.hxx"
-#include "confignotifier.hxx"
-#include "committer.hxx"
-#include "apinodeaccess.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-
-        // self-locked methods for dispose handling
-void NodeElement::checkAlive() const
-{
-    getApiTree().checkAlive();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::Tree > TreeElement::getTree() const
-{
-    return getTreeRef();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::Tree > TreeElement::getTreeRef() const
-{
-    return getApiTree().getTree();
-}
-//-----------------------------------------------------------------------------
-        // self-locked methods for dispose handling
-bool SetElement::disposeTree(bool bForce)
-{
-    return getApiTree().disposeTree(bForce);
-}
-//-----------------------------------------------------------------------------
-Factory& TreeElement::getFactory()
-{
-    return getApiTree().getFactory();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::ElementTree > SetElement::getElementRef() const
-{
-    return dynamic_cast< configuration::ElementTree * >(getTreeRef().get());
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< configuration::Template > SetElement::getTemplateInfo() const
-{
-    rtl::Reference< configuration::ElementTree > aTree(dynamic_cast< configuration::ElementTree * >(getTreeRef().get()));
-    OSL_ENSURE(aTree.is(), "This really must be a set element");
-    return aTree->getTemplate();
-}
-//-----------------------------------------------------------------------------
-
-void SetElement::haveNewParent(NodeSetInfoAccess* pNewParent)
-{
-    ApiTreeImpl* pNewParentImpl = pNewParent ? &pNewParent->getApiTree() : 0; 
-
-    this->getApiTree().haveNewParent( pNewParentImpl );
-}
-//-----------------------------------------------------------------------------
-
-bool RootElement::disposeTree() 
-{
-    return getRootTree().disposeTree();
-}
-//-----------------------------------------------------------------------------
-
-Committer UpdateRootElement::getCommitter()
-{
-    return Committer(getRootTree());
-}
-    }
-}
-
diff --git a/configmgr/source/api2/apitreeaccess.hxx b/configmgr/source/api2/apitreeaccess.hxx
deleted file mode 100644
index a0d8659c02..0000000000
--- a/configmgr/source/api2/apitreeaccess.hxx
+++ /dev/null
@@ -1,179 +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: apitreeaccess.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_TREEACCESS_HXX_
-#define CONFIGMGR_API_TREEACCESS_HXX_
-
-#include "sal/config.h"
-
-#include "boost/utility.hpp"
-#include "rtl/ref.hxx"
-
-#include "datalock.hxx"
-#include "options.hxx"
-#include "utility.hxx"
-
-namespace osl { class Mutex; }
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    struct ServiceImplementationInfo;
-//-----------------------------------------------------------------------------
-    namespace configuration 
-    {
-        class ElementTree;
-        class Template;
-        class Tree;
-    }
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-        namespace uno = com::sun::star::uno;
-//-----------------------------------------------------------------------------
-        class Factory;
-        class Notifier;
-        class Committer;
-        class NodeSetInfoAccess;
-//-----------------------------------------------------------------------------
-    // API object implementation wrappers 
-    //-------------------------------------------------------------------------
-        class ApiTreeImpl;
-        class ApiRootTreeImpl;
-
-        // these objects just provide the pieces needed to navigate and manipulate trees and nodes
-
-        // A common base class for 'element' classes
-        class NodeElement: private boost::noncopyable
-        {
-        public:
-            virtual ~NodeElement() {}
-
-        // self-locked methods for dispose handling
-            void checkAlive() const;
-
-        // api object handling
-            uno::XInterface* getUnoInstance() const
-            { return doGetUnoInstance(); }
-
-            ServiceImplementationInfo const * getServiceInfo() const 
-            { return doGetServiceInfo(); }
-        private:
-            virtual uno::XInterface* doGetUnoInstance() const = 0;
-            virtual ServiceImplementationInfo const* doGetServiceInfo() const = 0;
-            virtual ApiTreeImpl& getApiTree() const = 0;
-
-            friend class Factory;
-        };
-//-----------------------------------------------------------------------------
-
-        // A class for tagging inner nodes
-        class InnerElement : public NodeElement
-        {
-        public:
-            // Only used as a tag
-        };
-//-----------------------------------------------------------------------------
-
-        // A common base class for tree-owning elemnt classes
-        class TreeElement : public NodeElement
-        {
-        public:
-        // model access
-            rtl::Reference< configuration::Tree > getTreeRef() const;
-            rtl::Reference< configuration::Tree > getTree() const;
-
-        // api object handling
-            Factory&					getFactory();
-
-        protected:
-            virtual ApiTreeImpl& getApiTree() const = 0;
-        };
-//-----------------------------------------------------------------------------
-
-        // Info interfaces for Set Elements 
-        class SetElement : public TreeElement
-        {
-        public:
-        // self-locked methods for dispose handling
-            bool disposeTree(bool bForceDispose);
-
-            void haveNewParent(NodeSetInfoAccess* pNewParent);
-
-            rtl::Reference< configuration::ElementTree > getElementRef() const;
-            rtl::Reference< configuration::Template > getTemplateInfo() const;
-        };
-//-----------------------------------------------------------------------------
-
-        // Info interfaces for Set Elements 
-        class RootElement : public TreeElement
-        {
-        public:
-            bool disposeTree();
-        protected:
-            virtual ApiRootTreeImpl& getRootTree() = 0;
-        };
-//-----------------------------------------------------------------------------
-
-        // Info interfaces for Set Elements 
-        class UpdateRootElement : public RootElement
-        {
-        public:
-            Committer getCommitter();
-        };
-
-    // Thin Wrappers around TreeElements: Provide guarding and convenient access
-        /// wraps a TreeElement; provides an object (read) lock, ensures object was not disposed
-        class GuardedTreeElement {
-            UnoApiLock m_aLock;
-            TreeElement & m_rTree;
-
-        public:
-            explicit GuardedTreeElement(TreeElement & rTree): m_rTree(rTree)
-            { rTree.checkAlive(); }
-
-            TreeElement & get() const { return m_rTree; }
-        };
-
-        class GuardedRootElement {
-            UnoApiLock m_aLock;
-            RootElement & m_rTree;
-
-        public:
-            explicit GuardedRootElement(RootElement & rTree): m_rTree(rTree)
-            { rTree.checkAlive(); }
-
-            RootElement & get() const { return m_rTree; }
-        };
-    }
-}
-
-#endif // CONFIGMGR_API_TREEACCESS_HXX_
diff --git a/configmgr/source/api2/apitreeimplobj.cxx b/configmgr/source/api2/apitreeimplobj.cxx
deleted file mode 100644
index ff0453f17e..0000000000
--- a/configmgr/source/api2/apitreeimplobj.cxx
+++ /dev/null
@@ -1,1004 +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: apitreeimplobj.cxx,v $
- * $Revision: 1.44 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-
-#include "apitreeimplobj.hxx"
-#include "confignotifier.hxx"
-#include "notifierimpl.hxx"
-#include "apifactory.hxx"
-#include "apitreeaccess.hxx"
-#include "nodechangeinfo.hxx"
-#include "broadcaster.hxx"
-#include "change.hxx"
-#include "providerimpl.hxx"
-#include "roottree.hxx"
-#include "noderef.hxx"
-#include "anynoderef.hxx"
-#include "tracer.hxx"
-#include "treemanager.hxx"
-#include <cppuhelper/queryinterface.hxx>
-#include <vos/refernce.hxx>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-        namespace lang = ::com::sun::star::lang;
-//-----------------------------------------------------------------------------
-        class Factory;
-        class Notifier;
-//-----------------------------------------------------------------------------
-class ApiTreeImpl::ComponentAdapter : public lang::XEventListener
-{
-    vos::ORefCount m_refs;
-
-    ApiTreeImpl* pOwner;
-
-    uno::Reference< lang::XComponent > xProvider;
-    uno::Reference< lang::XComponent > xParent;
-public:
-    ComponentAdapter(ApiTreeImpl& rParent) : pOwner(&rParent) {}
-    virtual ~ComponentAdapter() {}
-
-    void clear();
-
-    void setProvider(uno::Reference< lang::XComponent > const& xProvider);
-    void setParent(uno::Reference< lang::XComponent > const& xParent);
-    uno::Reference< lang::XComponent > getProvider() const;
-
-// XEventListener
-    virtual void SAL_CALL acquire() throw();
-    virtual void SAL_CALL release() throw();
-private:
-    void setComponent(uno::Reference< lang::XComponent >& rxSlot,uno::Reference< lang::XComponent > const& xComp);
-    uno::Reference< lang::XComponent > getComponent(uno::Reference< lang::XComponent > const& rxSlot) const;
-
-    virtual uno::Any SAL_CALL queryInterface(uno::Type const& rType) throw();
-    virtual void SAL_CALL disposing(com::sun::star::lang::EventObject const& rEvt) throw();
-};
-//-----------------------------------------------------------------------------
-inline
-uno::Reference< lang::XComponent >
-    ApiTreeImpl::ComponentAdapter::getComponent(
-        uno::Reference< lang::XComponent > const& rxSlot
-    ) const
-{
-    return rxSlot;
-}
-//-----------------------------------------------------------------------------
-inline
-void ApiTreeImpl::ComponentAdapter::setComponent(
-        uno::Reference< lang::XComponent >& rxSlot,
-        uno::Reference< lang::XComponent > const& xComp
-    )
-{
-    UnoApiLockClearable aGuard;
-
-    uno::Reference< lang::XComponent > xOld = rxSlot;
-    if (xOld != xComp)
-    {
-        rxSlot = xComp;
-
-        aGuard.clear();
-
-        if (xOld.is())  try { xOld->removeEventListener(this); } catch (uno::Exception & ) {}
-        if (xComp.is()) xComp->addEventListener(this);
-    }
-}
-//-----------------------------------------------------------------------------
-uno::Reference< lang::XComponent > ApiTreeImpl::ComponentAdapter::getProvider() const
-{
-    return this->getComponent( this->xProvider );
-}
-void ApiTreeImpl::ComponentAdapter::setProvider(uno::Reference< lang::XComponent > const& rProvider)
-{
-    this->setComponent( this->xProvider, rProvider);
-}
-void ApiTreeImpl::ComponentAdapter::setParent(uno::Reference< lang::XComponent > const& rParent)
-{
-    this->setComponent( this->xParent, rParent);
-}
-//-----------------------------------------------------------------------------
-
-void SAL_CALL ApiTreeImpl::ComponentAdapter::acquire() throw()
-{
-    ++m_refs;
-}
-//-------------------------------------------------------------------------
-
-void SAL_CALL ApiTreeImpl::ComponentAdapter::release() throw()
-{
-    if (--m_refs == 0)
-        delete this;
-}
-//-------------------------------------------------------------------------
-
-uno::Any SAL_CALL ApiTreeImpl::ComponentAdapter::queryInterface(uno::Type const& rType) throw()
-{
-    return cppu::queryInterface( rType
-                , static_cast< com::sun::star::lang::XEventListener*>(this)
-                , static_cast< uno::XInterface*>(this)
-            );
-}
-//-------------------------------------------------------------------------
-
-void SAL_CALL ApiTreeImpl::ComponentAdapter::disposing(com::sun::star::lang::EventObject const& rEvt) throw()
-{
-    UnoApiLockClearable aGuard;
-
-    if (this->pOwner != NULL)
-    {
-        CFG_TRACE_INFO("ApiTreeImpl:ComponentAdapter: Providing UNO object is disposed - relaying to my owner");
-        // ensure our owner stays alive
-        uno::Reference<uno::XInterface> xKeepOwnerAlive( this->pOwner->getUnoInstance() );
-        // and we stay alive too
-        rtl::Reference< ApiTreeImpl::ComponentAdapter > xKeepAlive( this );
-
-        aGuard.clear();
-
-        pOwner->disposing( rEvt );
-
-        UnoApiLock aClearGuard;
-        if (rEvt.Source == this->xParent) this->xParent.clear();
-        if (rEvt.Source == this->xProvider) this->xProvider.clear();
-    }
-    else
-        CFG_TRACE_INFO("ApiTreeImpl:ComponentAdapter: Providing UNO object is disposed - but my owner is already gone");
-}
-
-//-------------------------------------------------------------------------
-
-void ApiTreeImpl::ComponentAdapter::clear()
-{
-    UnoApiLockClearable aGuard;
-
-    this->pOwner = 0;
-
-    uno::Reference< lang::XComponent > aProvider = this->xProvider;
-    uno::Reference< lang::XComponent > aParent   = this->xParent;
-    this->xProvider = 0;
-    this->xParent = 0;
-
-    aGuard.clear();
-
-    if (aParent.is())   try { aParent  ->removeEventListener(this); } catch (uno::Exception & ) {}
-    if (aProvider.is()) try { aProvider->removeEventListener(this); } catch (uno::Exception & ) {}
-}
-
-//-----------------------------------------------------------------------------
-class ApiRootTreeImpl::NodeListener : public INodeListener
-{
-    ApiRootTreeImpl*	pParent;
-    TreeManager * pSource;
-
-    vos::ORef< OOptions >           m_xOptions;
-    configuration::AbsolutePath    	  m_aLocationPath;
-public:
-    NodeListener(ApiRootTreeImpl& _rParent)
-        : pParent(&_rParent)
-        , pSource(NULL)
-        , m_aLocationPath( configuration::AbsolutePath::root() )
-    {}
-    ~NodeListener()
-    {
-        unbind();
-    }
-
-    TreeManager * getSource()
-    {
-        UnoApiLock aGuard;
-        return pSource;
-    }
-
-    void setSource(TreeManager * pNew)
-    {
-        UnoApiLock aGuard;
-        if (pParent)
-        {
-            if (pNew != pSource)
-            {
-                OSL_ENSURE(m_xOptions.isValid(),"Cannot set IConfigListener without Options");
-                if (m_xOptions.isValid())
-                {
-                    if (pSource)
-                        pSource->removeListener(m_xOptions->getRequestOptions(), this);
-
-                    pSource = pNew;
-                    if (pNew)
-                    {
-                        OSL_ENSURE(!m_aLocationPath.isRoot(), "Cannot register for notifications: no location set");
-                        pNew->addListener(m_aLocationPath, m_xOptions->getRequestOptions(), this);
-                    }
-                }
-                else
-                    pSource = 0;
-            }
-        }
-    }
-
-    void setLocation(configuration::AbsolutePath const& _aLocation, vos::ORef< OOptions > const& _xOptions)
-    {
-        OSL_ASSERT(_xOptions.isValid());
-
-        UnoApiLock aGuard;
-
-        if (pSource && pParent)
-        {
-            OSL_ASSERT(m_xOptions.isValid());
-            pSource->removeListener(m_xOptions->getRequestOptions(), this);
-        }
-
-        m_aLocationPath = _aLocation;
-        m_xOptions = _xOptions;
-
-        if (pSource && pParent)
-            pSource->addListener(m_aLocationPath, m_xOptions->getRequestOptions(), this);
-    }
-
-    void unbind()
-    {
-        UnoApiLock aGuard;
-        OSL_ASSERT(pParent == 0);
-        pParent = 0;
-        if (pSource)
-        {
-            OSL_ASSERT(m_xOptions.isValid());
-            pSource->removeListener(m_xOptions->getRequestOptions(), this);
-            m_xOptions.unbind();
-            m_aLocationPath = configuration::AbsolutePath::root();
-        }
-
-    }
-
-    void clearParent()
-    {
-        UnoApiLockClearable aGuard;
-        if (pParent)
-        {
-            pParent = 0;
-
-            if (pSource)
-            {
-                TreeManager * pOrgSource = pSource;
-                vos::ORef< OOptions > xOptions = m_xOptions;
-
-                pSource = 0;
-                m_xOptions.unbind();
-                m_aLocationPath = configuration::AbsolutePath::root();
-
-                aGuard.clear();
-
-                OSL_ASSERT(xOptions.isValid());
-                pOrgSource->removeListener(xOptions->getRequestOptions(), this);
-            }
-        }
-    }
-
-    // Interfaces
-    virtual void disposing(TreeManager * pSource);
-    virtual void nodeChanged(Change const& aChange, configuration::AbsolutePath const& sPath, TreeManager * pSource);
-    virtual void nodeDeleted(configuration::AbsolutePath const& sPath, TreeManager * pSource);
-};
-
-//-------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// API object implementation wrappers
-//-------------------------------------------------------------------------
-ApiProvider::ApiProvider(Factory& rFactory, OProviderImpl& rProviderImpl )
-    : m_rFactory(rFactory)
-    , m_rProviderImpl(rProviderImpl)
-{}
-//-------------------------------------------------------------------------
-
-uno::Reference<com::sun::star::script::XTypeConverter> ApiProvider::getTypeConverter() const
-{
-    return m_rProviderImpl.getTypeConverter();
-}
-//-------------------------------------------------------------------------
-static
-inline
-configuration::DefaultProvider createDefaultProvider(
-                                    ApiProvider& rProvider,
-                                    rtl::Reference< configuration::Tree > const& aTree,
-                                    vos::ORef< OOptions > const& _xOptions
-                               )
-{
-    OProviderImpl& rProviderImpl        = rProvider.getProviderImpl();
-    rtl::Reference< TreeManager > xDefaultProvider  = rProviderImpl.getDefaultProvider();
-
-    OSL_ASSERT(_xOptions.isValid());
-    RequestOptions const aOptions = _xOptions.isValid() ? _xOptions->getRequestOptions() : RequestOptions();
-
-    return configuration::DefaultProvider::create(aTree,aOptions,xDefaultProvider,&rProviderImpl);
-}
-//-------------------------------------------------------------------------
-static
-inline
-configuration::DefaultProvider extractDefaultProvider(ApiTreeImpl* pParentTree)
-{
-    if (pParentTree)
-        return pParentTree->getDefaultProvider();
-
-    else
-        return configuration::DefaultProvider::createEmpty();
-}
-//-------------------------------------------------------------------------
-ApiTreeImpl::ApiTreeImpl(uno::XInterface* pInstance, ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, ApiTreeImpl* pParentTree)
-: m_aTree(aTree)
-, m_aNotifier(new NotifierImpl(aTree))
-, m_aDefaultProvider(extractDefaultProvider(pParentTree))
-, m_xProvider()
-, m_rProvider(rProvider)
-, m_pParentTree(0)
-, m_pInstance(pInstance)
-{
-    OSL_ENSURE(pParentTree == NULL || &rProvider == &pParentTree->m_rProvider,"WARNING: Parent tree has a different provider - trouble may be ahead");
-    setNodeInstance(aTree->getRootNode(), pInstance);
-    init(pParentTree);
-}
-//-------------------------------------------------------------------------
-ApiTreeImpl::ApiTreeImpl(uno::XInterface* _pInstance, ApiProvider& _rProvider, rtl::Reference< configuration::Tree > const& _aTree, configuration::DefaultProvider const& _aDefaultProvider)
-: m_aTree(_aTree)
-, m_aNotifier(new NotifierImpl(_aTree))
-, m_aDefaultProvider(_aDefaultProvider)
-, m_xProvider()
-, m_rProvider(_rProvider)
-, m_pParentTree(0)
-, m_pInstance(_pInstance)
-{
-    setNodeInstance(_aTree->getRootNode(), _pInstance);
-    init(NULL);
-}
-//-------------------------------------------------------------------------
-
-ApiTreeImpl::~ApiTreeImpl()
-{
-    OSL_ENSURE(m_aNotifier->m_aListeners.isDisposed(),"ApiTree Object was not disposed properly");
-    deinit();
-}
-//-------------------------------------------------------------------------
-
-ApiRootTreeImpl::ApiRootTreeImpl(uno::XInterface* pInstance, ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions > const& _xOptions)
-: m_aTreeImpl(pInstance, rProvider, aTree, createDefaultProvider(rProvider, aTree, _xOptions))
-, m_aLocationPath( configuration::Path::Rep() )
-, m_pNotificationListener(NULL)
-, m_xOptions(_xOptions)
-{
-    implSetLocation(aTree);
-    enableNotification(true);
-}
-//-------------------------------------------------------------------------
-ApiRootTreeImpl::~ApiRootTreeImpl()
-{
-    if (m_pNotificationListener.is())
-    {
-        m_pNotificationListener->setSource(0);
-        m_pNotificationListener->clearParent();
-    }
-}
-//-------------------------------------------------------------------------
-
-void ApiTreeImpl::setNodeInstance(configuration::NodeRef const& aNode, uno::XInterface* pInstance)
-{
-    OSL_ENSURE(aNode.isValid(),"ERROR: adding invalid node to ApiTree");
-    OSL_ENSURE(m_aTree->isValidNode(aNode.getOffset()),"ERROR: foreign node being added to ApiTree");
-    m_aNotifier->m_aListeners.setObjectAt( configuration::NodeID(m_aTree, aNode).toIndex(), pInstance );
-}
-
-//-------------------------------------------------------------------------
-
-bool ApiTreeImpl::isAlive() const
-{
-    return m_aNotifier->m_aListeners.isAlive();
-}
-//-------------------------------------------------------------------------
-void ApiTreeImpl::checkAlive() const
-{
-    m_aNotifier->m_aListeners.checkAlive( getUnoInstance() );
-}
-
-//-------------------------------------------------------------------------
-
-Notifier ApiTreeImpl::getNotifier() const
-{
-    return Notifier(m_aNotifier,this);
-}
-//-------------------------------------------------------------------------
-
-bool ApiRootTreeImpl::enableNotification(bool bEnable)
-{
-    TreeManager * pSource = bEnable ? getApiTree().getProvider().getProviderImpl().getNotifier() : 0;
-
-    TreeManager * pOld = this->implSetNotificationSource(pSource);
-
-    return pOld != 0;
-}
-//-------------------------------------------------------------------------
-
-bool ApiTreeImpl::disposeTree(bool bForce)
-{
-    CFG_TRACE_INFO("ApiTreeImpl: Disposing Tree (may throw if already disposed)");
-
-    // ensure our provider stays alive
-    uno::Reference<uno::XInterface> xKeepParentAlive(this->getParentComponent());
-    // ensure we stay alive too
-    uno::Reference<uno::XInterface> xKeepAlive(this->getUnoInstance());
-
-    // #109077# If already disposed, we may have no source data or data lock
-    if (!isAlive())
-        return false;
-
-    if (!bForce)
-    {
-        if (m_pParentTree != 0)
-            return false;
-
-        // recheck after having the mutex
-        checkAlive(); // may throw
-    }
-    else if (m_pParentTree)
-        setParentTree(NULL);
-
-    implDisposeTree();
-    OSL_ASSERT(!isAlive()); // post condition
-
-    return true;
-}
-//-------------------------------------------------------------------------
-
-bool ApiTreeImpl::disposeTreeNow()
-{
-    CFG_TRACE_INFO("ApiTreeImpl: Disposing Tree Now (unless disposed)");
-    if (isAlive() )
-        return implDisposeTree();
-    else
-        return false;
-}
-//-------------------------------------------------------------------------
-bool ApiRootTreeImpl::disposeTree()
-{
-    CFG_TRACE_INFO("Api Root Tree: Disposing Tree And Releasing (unless disposed)");
-    // ensure our provider stays alive
-    uno::Reference<uno::XInterface> xKeepProvider( m_aTreeImpl.getUnoProviderInstance() );
-
-    rtl::Reference<NodeListener> xListener = m_pNotificationListener;
-    if (xListener.is())
-    {
-        xListener->clearParent();
-        xListener.clear();
-    }
-
-    bool bDisposed = m_aTreeImpl.disposeTreeNow();
-
-    if (bDisposed) releaseData();
-
-    if (!m_xOptions.isEmpty())
-    {
-        OSL_ENSURE(!bDisposed, "Disposing/Releasing should clear the options");
-        CFG_TRACE_INFO2("Api Root Tree: data was not released in disposeTree");
-    }
-
-    return bDisposed;
-}
-//-------------------------------------------------------------------------
-bool ApiTreeImpl::implDisposeTree()
-{
-    OSL_ENSURE(m_pParentTree == 0,"WARNING: Disposing a tree that still has a parent tree set");
-
-    SpecialListenerContainer <configuration::SubNodeID,SubNodeHash,SubNodeEq,SubNodeToIndex>& aContainer = m_aNotifier->m_aListeners;
-    if (aContainer.beginDisposing())
-    {
-        CFG_TRACE_INFO("ApiTreeImpl: Tree is now disposed");
-
-        Factory& rFactory = getFactory();
-
-        std::vector<configuration::NodeID> aChildNodes;
-        configuration::getAllContainedNodes( m_aTree, aChildNodes);
-
-        for (std::vector<configuration::NodeID>::reverse_iterator it = aChildNodes.rbegin(), stop = aChildNodes.rend();
-            it != stop;
-            ++it)
-        {
-            rFactory.revokeElement( *it );
-        }
-
-        CFG_TRACE_INFO_NI("ApiTreeImpl: Listeners are now informed");
-        aContainer.notifyDisposing();
-
-        OSL_ASSERT(!aContainer.isDisposed());
-
-        CFG_TRACE_INFO_NI("ApiTreeImpl: Deinitializing");
-        deinit(); // releases the provider and parent
-        aContainer.endDisposing();
-
-        OSL_ASSERT(aContainer.isDisposed());
-
-        return true;
-    }
-    else
-    {
-        CFG_TRACE_INFO("ApiTreeImpl: Tree was already disposed.");
-        return false;
-    }
-}
-//-------------------------------------------------------------------------
-void ApiTreeImpl::disposeNode(configuration::NodeRef const& aNode, uno::XInterface* pInstance)
-{
-    // This used to contain 3 nested 'isAlive()' calls; why !?
-    if (isAlive())
-        implDisposeNode(aNode,pInstance);
-}
-//-------------------------------------------------------------------------
-void ApiTreeImpl::implDisposeNode(configuration::NodeRef const& aNode, uno::XInterface* )
-{
-    CFG_TRACE_INFO("ApiTreeImpl: Disposing a single node.");
-    OSL_ENSURE(aNode.isValid(),"INTERNAL ERROR: Disposing NULL node");
-    OSL_ENSURE(m_aTree->isValidNode(aNode.getOffset()),"INTERNAL ERROR: Disposing: node does not match tree");
-    OSL_ENSURE( !m_aTree->isRootNode(aNode),"INTERNAL ERROR: Disposing the root node of the tree");
-
-    configuration::NodeID aNodeID(m_aTree,aNode);
-
-    if (m_aNotifier->m_aListeners.disposeOne(aNodeID.toIndex()) )
-    {
-        getFactory().revokeElement(aNodeID);
-    }
-}
-//-------------------------------------------------------------------------
-void ApiTreeImpl::init(ApiTreeImpl*	pParentTree)
-{
-    m_xProvider = new ComponentAdapter(*this);
-    m_xProvider->setProvider( this->getProviderComponent() );
-
-    OSL_ENSURE(m_xProvider->getProvider().is(),"WARNING: Provider is no Component - Lifetime trouble ahead");
-
-    OSL_ASSERT(m_pParentTree == 0);
-    setParentTree(pParentTree);
-}
-//-------------------------------------------------------------------------
-void ApiTreeImpl::deinit()
-{
-    setParentTree(0);
-
-    uno::Reference<ComponentAdapter> xAdapter = m_xProvider;
-    m_xProvider.clear();
-
-    if (xAdapter.is())
-        xAdapter->clear();
-}
-//-------------------------------------------------------------------------
-void ApiTreeImpl::haveNewParent(ApiTreeImpl* pNewParent) // public interface
-{
-    setParentTree(pNewParent);
-}
-
-//-------------------------------------------------------------------------
-
-ApiTreeImpl const* ApiTreeImpl::getRootTreeImpl() const
-{
-    ApiTreeImpl const* pRet = this;
-    while (pRet->m_pParentTree)
-        pRet = pRet->m_pParentTree;
-
-    return pRet;
-}
-
-//-------------------------------------------------------------------------
-void ApiTreeImpl::setParentTree(ApiTreeImpl*	pParentTree) // internal implementation
-{
-#if OSL_DEBUG_LEVEL > 0
-    if (pParentTree)
-    {
-        rtl::Reference< configuration::Tree > aContext = m_aTree->getContextTree();
-        rtl::Reference< configuration::Tree > aParent = pParentTree->m_aTree;
-
-        configuration::NodeID aContextID( aContext, aContext->getRootNode() );
-        configuration::NodeID aParentID( aParent, aParent->getRootNode() );
-
-        OSL_ENSURE( aContextID == aParentID, "Parent relationship mismatch !");
-    }
-#endif
-
-    if (m_pParentTree != pParentTree)
-    {
-        uno::Reference<ComponentAdapter> xAdapter = m_xProvider;
-
-        m_pParentTree = pParentTree;
-
-        uno::Reference<com::sun::star::lang::XComponent> xNew = getParentComponent();
-        OSL_ENSURE( xNew.is() == (pParentTree != 0), "WARNING: Parent Tree is no Component");
-
-        if (xAdapter.is())
-            xAdapter->setParent(xNew);
-        else
-            OSL_ENSURE( pParentTree == 0, "ERROR: Setting New Parent at deinitialized ApiTreeImpl");
-
-    }
-}
-//-------------------------------------------------------------------------
-
-uno::Reference<uno::XInterface> ApiTreeImpl::getUnoProviderInstance() const
-{
-    uno::Reference<ComponentAdapter> xAdapter = m_xProvider;
-
-    uno::Reference<uno::XInterface> xReturn;
-    if (xAdapter.is())
-        xReturn = xAdapter->getProvider();
-    return xReturn;
-}
-
-//-------------------------------------------------------------------------
-uno::Reference<com::sun::star::lang::XComponent> ApiTreeImpl::getParentComponent()
-{
-    uno::XInterface* pInterface = m_pParentTree ? m_pParentTree->getUnoInstance() : 0;
-    return uno::Reference<com::sun::star::lang::XComponent>::query(pInterface);
-}
-//-------------------------------------------------------------------------
-
-uno::Reference<com::sun::star::lang::XComponent> ApiTreeImpl::getProviderComponent()
-{
-    uno::XInterface* pInterface = m_rProvider.getProviderImpl().getProviderInstance();
-    return uno::Reference<com::sun::star::lang::XComponent>::query(pInterface);
-}
-
-//-------------------------------------------------------------------------
-
-void ApiTreeImpl::disposing(com::sun::star::lang::EventObject const& ) throw()
-{
-    // this is a non-UNO external entry point - we need to keep this object alive for the duration of the call
-    CFG_TRACE_INFO("ApiTreeImpl: Providing UNO object is disposed - disposing the tree");
-
-    // Tree write Lock should be set by sender
-
-    CFG_TRACE_INFO_NI("Clearing parent reference");
-    setParentTree(0);
-
-    CFG_TRACE_INFO_NI("Trying to dispose");
-    //implDisposeTree();
-    disposeTreeNow();
-
-    CFG_TRACE_INFO_NI("Done disposing Tree");
-    // uno::Reference<com::sun::star::lang::XComponent> xThis(getUnoInstance(),UNO_QUERY);
-    // if (xThis.is()) xThis->dispose();
-}
-//-------------------------------------------------------------------------
-TreeManager * ApiRootTreeImpl::implSetNotificationSource(TreeManager * pNew)
-{
-    TreeManager * pOld = m_pNotificationListener.is() ? m_pNotificationListener->getSource() : 0;
-    if (pOld != pNew)
-    {
-        OSL_ENSURE(m_xOptions.isValid(), "Cannot change notification source without options");
-
-        if (!m_pNotificationListener.is())
-            m_pNotificationListener = new NodeListener(*this);
-
-        m_pNotificationListener->setSource(pNew);
-
-    }
-    return pOld;
-}
-// ---------------------------------------------------------------------------------------------------
-
-void ApiRootTreeImpl::implSetLocation(rtl::Reference< configuration::Tree > const& _aTree)
-{
-    OSL_ASSERT(_aTree == getApiTree().getTree());
-    if (!configuration::isEmpty(_aTree.get()))
-    {
-        m_aLocationPath = _aTree->getRootPath();
-        OSL_ENSURE(!m_aLocationPath.isRoot(), "Setting up a root tree without location");
-    }
-    else
-    {
-        OSL_ENSURE(false, "Setting up a root tree without data");
-        m_aLocationPath = configuration::AbsolutePath::root();
-    }
-
-    if (!m_pNotificationListener.is())
-        m_pNotificationListener = new NodeListener(*this);
-
-    OSL_ENSURE(!m_aLocationPath.isRoot() && !m_aLocationPath.isDetached(), "Cannot reregister for notifications: setting empty location");
-    OSL_ENSURE( m_xOptions.isValid(), "Cannot reregister for notifications: no options available" );
-
-    m_pNotificationListener->setLocation(m_aLocationPath, m_xOptions);
-}
-// ---------------------------------------------------------------------------------------------------
-
-void ApiRootTreeImpl::releaseData()
-{
-    CFG_TRACE_INFO("Api Root Tree at %s: releasing the Data",OUSTRING2ASCII(m_aLocationPath.toString()));
-    rtl::Reference< configuration::Tree > aTree( m_aTreeImpl.getTree() );
-
-    if (aTree.is()) {
-        aTree->disposeData();
-    }
-    OSL_ASSERT(configuration::isEmpty(aTree.get()));
-
-    OSL_ENSURE( !m_aLocationPath.isRoot() && !m_aLocationPath.isDetached(), "Location still needed to release data" );
-    OSL_ENSURE( m_xOptions.isValid(), "Options still needed to release data" );
-
-    getApiTree().getProvider().getProviderImpl().releaseSubtree(m_aLocationPath,m_xOptions->getRequestOptions());
-    m_xOptions.unbind();
-
-    m_aLocationPath = configuration::AbsolutePath::detachedRoot();
-}
-// ---------------------------------------------------------------------------------------------------
-
-void ApiRootTreeImpl::NodeListener::disposing(TreeManager * _pSource)
-{
-    UnoApiLockClearable aGuard;
-
-    OSL_ASSERT( !pSource || _pSource == pSource );
-    if (pParent)
-    {
-        // this is a non-UNO external entry point - we need to keep this object alive for the duration of the call
-        uno::Reference<uno::XInterface> xKeepAlive( pParent->m_aTreeImpl.getUnoInstance() );
-        ApiRootTreeImpl* pKeepParent = pParent;
-        aGuard.clear();
-
-        pKeepParent->disposing(_pSource);
-    }
-}
-void ApiRootTreeImpl::disposing(TreeManager *)
-{
-    CFG_TRACE_INFO("Api Root Tree at %s: Cache data is disposed - dispose and release own data",
-                    OUSTRING2ASCII(m_aLocationPath.toString()));
-        // ensure our provider stays alive
-    uno::Reference<uno::XInterface> xKeepProvider( m_aTreeImpl.getUnoProviderInstance() );
-
-    rtl::Reference<NodeListener> xListener = m_pNotificationListener;
-    if (xListener.is())
-    {
-        xListener->clearParent();
-        xListener.clear();
-    }
-
-    if (m_aTreeImpl.disposeTreeNow())
-        releaseData(); // not really needed: the whole data is going away anyways
-}
-// ---------------------------------------------------------------------------------------------------
-
-static
-void disposeOneRemovedNode(configuration::NodeChangeInformation const& aRemoveInfo, Factory& aFactory)
-{
-    if (aRemoveInfo.change.element.oldValue.is())
-    {
-        OSL_ENSURE(aRemoveInfo.change.element.isDataChange(), "ERROR: Disposing replaced element: Element did not really change !");
-
-        rtl::Reference< configuration::ElementTree > aElementRef( aRemoveInfo.change.element.oldValue.get() );
-
-        SetElement* pSetElement = aFactory.findSetElement(aElementRef );
-        if (pSetElement)
-        {
-            // factory always does an extra acquire
-            uno::Reference<uno::XInterface> xReleaseSetElement(pSetElement->getUnoInstance(), uno::UNO_REF_NO_ACQUIRE);
-
-            pSetElement->haveNewParent(0);
-            pSetElement->disposeTree(true);
-        }
-    }
-    else
-    {
-        // This must apply to a node for which no element tree had been loaded in this view
-        // thus there should not be one now after the change (even if the change was replacing)
-        OSL_ENSURE(!aRemoveInfo.change.element.newValue.is(), "Cannot dispose replaced element: No tree object available");
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-
-static
-void disposeRemovedNodes(configuration::NodeChangesInformation const& aChanges, Factory& aFactory)
-{
-    for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != aChanges.end(); ++it)
-    {
-        switch (it->change.type)
-        {
-        case configuration::NodeChangeData::eReplaceElement:
-            // check if element is actually unchanged !
-            // (cannot dispose of the tree, if it is still in use)
-            if (! it->change.element.isDataChange()) break;
-
-            // else dispose the old one: fall thru
-
-        case configuration::NodeChangeData::eRemoveElement:
-            disposeOneRemovedNode( *it, aFactory );
-            break;
-
-        default: break;
-        }
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-//INodeListener : IConfigListener
-void ApiRootTreeImpl::NodeListener::nodeChanged(Change const& aChange, configuration::AbsolutePath const& sPath, TreeManager * _pSource)
-{
-    UnoApiLockClearable aGuard;
-
-    OSL_ASSERT( !pSource || _pSource == pSource );
-    if (pParent)
-    {
-        // this is a non-UNO external entry point - we need to keep this object alive for the duration of the call
-        uno::Reference<uno::XInterface> xKeepAlive( pParent->m_aTreeImpl.getUnoInstance() );
-        ApiRootTreeImpl* pKeepParent = pParent;
-        aGuard.clear();
-
-        pKeepParent->nodeChanged(aChange,sPath,_pSource);
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-
-//INodeListener : IConfigListener
-void ApiRootTreeImpl::nodeChanged(Change const& aChange, configuration::AbsolutePath const& aChangePath, TreeManager *)
-{
-    // do not dipatch if we are dying/dead anyway
-    if (m_aTreeImpl.isAlive())
-    try
-    {
-        rtl::Reference< configuration::Tree > aTree(m_aTreeImpl.getTree());
-
-        OSL_ENSURE(configuration::Path::hasPrefix(aChangePath, m_aLocationPath),
-                    "'changed' Path does not indicate this tree or its context: ");
-
-        configuration::RelativePath aLocalChangePath = configuration::Path::stripPrefix(aChangePath,m_aLocationPath);
-
-        // find the node and change
-        configuration::NodeRef  aNode;
-
-        if ( !aLocalChangePath.isEmpty() )
-        {
-            configuration::NodeRef aBaseNode = aTree->getRootNode();
-
-#ifdef DBG_UTIL
-            try {
-                configuration::RelativePath aLocalPathOld = configuration::validateAndReducePath(aChangePath.toString(), aTree, aBaseNode);
-                OSL_ENSURE( configuration::matches(aLocalPathOld,aLocalChangePath),
-                            "New local path different from validateAndReducePath(...) result in notification dispatch");
-            }
-            catch (configuration::Exception& e) {
-                rtl::OString sMsg("Cannot validate new path handling for notification dispatch: ");
-                sMsg += e.what();
-                OSL_ENSURE(false, sMsg.getStr() );
-            }
-#endif // DBG_UTIL
-
-            configuration::AnyNodeRef aFoundNode = configuration::getDeepDescendant(aTree, aBaseNode, aLocalChangePath);
-            if ( aFoundNode.isValid() )
-            {
-                if (aFoundNode.isNode())
-                {
-                    aNode = aFoundNode.toNode();
-                }
-                else
-                {
-                    // TODO: Notify using parent node and temporary dummy change
-                    OSL_ENSURE( false, "Notification broken: Node being adressed is a Value");
-                }
-            }
-        }
-        else
-        {
-            aNode = aTree->getRootNode();
-        }
-
-        SubtreeChange const* pTreeChange = NULL;
-        if (aNode.isValid())
-        {
-            pTreeChange = dynamic_cast<SubtreeChange const*>(&aChange);
-            OSL_ENSURE(pTreeChange != 0, "Notification broken: Change to inner node is not a subtree change"); // TODO: Notify set change using parent (if available) and temporary dummy change
-        }
-
-        if (pTreeChange != NULL) // implies aNode.isValid()
-        {
-            OSL_ENSURE( aChange.getNodeName() == aTree->getSimpleNodeName(aNode.getOffset()),
-                        "Change's node-name does not match found node's name - erratic notification");
-
-            configuration::NodeChangesInformation aChanges;
-
-            if (configuration::adjustToChanges(aChanges, aTree,aNode, *pTreeChange))
-            {
-                OSL_ASSERT(aChanges.size() > 0);
-
-                Broadcaster aSender(m_aTreeImpl.getNotifier(),aChanges,false);
-
-    // Should be improved later. Maybe this is the wrong lock for disposeTree ?
-    //			aLocalGuard.downgrade(); // partial clear for broadcast
-
-                aSender.notifyListeners(aChanges, false);
-
-                disposeRemovedNodes(aChanges, m_aTreeImpl.getFactory());
-            }
-        }
-    }
-    catch (configuration::InvalidName& i)
-    {
-        rtl::OString sMsg("Cannot locate change within this tree: ");
-        sMsg += i.what();
-        OSL_ENSURE(false, sMsg.getStr() );
-    }
-    catch (configuration::Exception& e)
-    {
-        rtl::OString sMsg("Unexpected error trying to react on update: ");
-        sMsg += e.what();
-        OSL_ENSURE(false, sMsg.getStr() );
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-
-void ApiRootTreeImpl::NodeListener::nodeDeleted(configuration::AbsolutePath const& _aPath, TreeManager * _pSource)
-{
-    UnoApiLockClearable aGuard;
-
-    OSL_ASSERT( !pSource || _pSource == pSource );
-    if (pParent)
-    {
-        // this is a non-UNO external entry point - we need to keep this object alive for the duration of the call
-        uno::Reference<uno::XInterface> xKeepAlive( pParent->m_aTreeImpl.getUnoInstance() );
-        ApiRootTreeImpl* pKeepParent = pParent;
-        aGuard.clear();
-
-        pKeepParent->nodeDeleted(_aPath,_pSource);
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-void ApiRootTreeImpl::nodeDeleted(configuration::AbsolutePath const& _aDeletedPath, TreeManager *)
-{
-    { (void)_aDeletedPath; }
-
-    // this is a non-UNO external entry point - we need to keep this object alive for the duration of the call
-    uno::Reference<uno::XInterface> xKeepAlive( m_aTreeImpl.getUnoInstance() );
-
-#ifdef DBG_UTIL
-    OSL_ENSURE(configuration::Path::hasPrefix(m_aLocationPath, _aDeletedPath),
-               "'deleted' Path does not indicate this tree or its context: ");
-#endif
-    // ensure our provider stays alive
-    uno::Reference<uno::XInterface> xKeepProvider( m_aTreeImpl.getUnoProviderInstance() );
-
-    rtl::Reference<NodeListener> xListener = m_pNotificationListener;
-    if (xListener.is())
-    {
-        xListener->clearParent();
-        xListener.clear();
-    }
-
-    if (m_aTreeImpl.disposeTreeNow())
-        releaseData();
-}
-
-// ---------------------------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/api2/apitreeimplobj.hxx b/configmgr/source/api2/apitreeimplobj.hxx
deleted file mode 100644
index 087893e817..0000000000
--- a/configmgr/source/api2/apitreeimplobj.hxx
+++ /dev/null
@@ -1,192 +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: apitreeimplobj.hxx,v $
- * $Revision: 1.27 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 CONFIGMGR_API_TREEIMPLOBJECTS_HXX_
-#define CONFIGMGR_API_TREEIMPLOBJECTS_HXX_
-
-#include "noderef.hxx"
-#include "configset.hxx"
-#include "configdefaultprovider.hxx"
-#include "confevents.hxx"
-#include "options.hxx"
-#include "utility.hxx"
-#include <boost/utility.hpp>
-#include <vos/ref.hxx>
-#include <rtl/ref.hxx>
-#include <osl/mutex.hxx>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-
-namespace com { namespace sun { namespace star {
-    namespace script { class XTypeConverter; } 
-} } }
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class OProviderImpl;
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    {
-//-----------------------------------------------------------------------------
-        class Factory;
-        class Notifier;
-        class NotifierImpl;
-//-----------------------------------------------------------------------------
-        class ObjectRegistry;
-//-----------------------------------------------------------------------------
-// API object implementation wrappers 
-//-------------------------------------------------------------------------
-        class ApiProvider: private boost::noncopyable
-        {
-            Factory&					m_rFactory;
-            OProviderImpl&				m_rProviderImpl;
-        public:
-            ApiProvider(Factory& rFactory, OProviderImpl& rProviderImpl );
-
-            ~ApiProvider()
-            {}
-
-            uno::Reference<com::sun::star::script::XTypeConverter>			getTypeConverter() const;
-            Factory&					getFactory()		{ return m_rFactory; }
-            OProviderImpl&				getProviderImpl()	{ return m_rProviderImpl; }
-        };
-
-    //-----------------------------------------------------------------------------
-
-    //-------------------------------------------------------------------------
-        class ApiTreeImpl: private boost::noncopyable
-        {
-            class ComponentAdapter;
-
-            rtl::Reference< configuration::Tree > m_aTree;
-            vos::ORef<NotifierImpl>	m_aNotifier;
-            configuration::DefaultProvider     m_aDefaultProvider;
-            uno::Reference<ComponentAdapter>		m_xProvider;
-            ApiProvider&		m_rProvider;
-            ApiTreeImpl*		m_pParentTree;
-            uno::XInterface*		m_pInstance;
-
-        public:
-            explicit ApiTreeImpl(uno::XInterface* pInstance, ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, ApiTreeImpl* pParentTree);
-            explicit ApiTreeImpl(uno::XInterface* _pInstance, ApiProvider& _rProvider, rtl::Reference< configuration::Tree > const& _aTree, configuration::DefaultProvider const & _aDefaultProvider);
-            ~ApiTreeImpl();
-
-        // initialization
-            void setNodeInstance(configuration::NodeRef const& aNode, uno::XInterface* pInstance);
-
-        // model access
-            rtl::Reference< configuration::Tree > getTree() const { return m_aTree; }
-
-        // self-locked methods for dispose handling
-            bool isAlive()	const;
-            void checkAlive()	const;
-            bool disposeTree(bool bForce);
-            bool disposeTreeNow();
-            void disposeNode(configuration::NodeRef const& aNode, uno::XInterface* pInstance);
-
-        // api object handling
-            Factory&					getFactory()	const	{ return m_rProvider.getFactory(); }
-            Notifier					getNotifier()	const;
-            configuration::DefaultProvider				getDefaultProvider()	const { return m_aDefaultProvider; }
-
-        // needs external locking
-            ApiTreeImpl const*			getRootTreeImpl() const;
-
-            uno::XInterface*			getUnoInstance() const	{ return m_pInstance; }
-            ApiProvider&				getProvider()			{ return m_rProvider; }
-            uno::Reference<uno::XInterface>				getUnoProviderInstance() const; //	{ return m_xProvider; }
-            
-            /// wire this to a new parent tree
-            void						haveNewParent(ApiTreeImpl* pNewParent);
-        private:
-            void init(ApiTreeImpl*	pParentTree);
-            void setParentTree(ApiTreeImpl*	pNewParentTree);
-            void deinit();
-
-            bool implDisposeTree();
-            void implDisposeNode(configuration::NodeRef const& aNode, uno::XInterface* pInstance);
-
-            friend class ComponentAdapter;
-            void disposing(com::sun::star::lang::EventObject const& rEvt) throw();
-            uno::Reference<com::sun::star::lang::XComponent> getProviderComponent();
-            uno::Reference<com::sun::star::lang::XComponent> getParentComponent();
-
-        };
-
-    //-----------------------------------------------------------------------------
-        class ApiRootTreeImpl 
-        {
-        public:
-            explicit ApiRootTreeImpl(uno::XInterface* pInstance, ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions > const& _xOptions);
-            ~ApiRootTreeImpl();
-
-            ApiTreeImpl& getApiTree() { return m_aTreeImpl; }
-            ApiTreeImpl const& getApiTree() const { return m_aTreeImpl; }
-
-            configuration::AbsolutePath const & getLocation() const { return m_aLocationPath; }
-            vos::ORef< OOptions > getOptions() const { return m_xOptions; }
-
-        // self-locked methods for dispose handling
-            bool disposeTree();
-
-            /// toggle whether this object relays notifications from the base provider
-            bool enableNotification(bool bEnable);
-        private:
-            TreeManager * implSetNotificationSource(TreeManager * pNew);
-            void implSetLocation(rtl::Reference< configuration::Tree > const& _aTree);
-            void releaseData();
-
-        private:
-            class NodeListener;
-            friend class NodeListener;
-            
-        // IConfigListener
-            void disposing(TreeManager * pSource) ;
-        //INodeListener : IConfigListener
-            void nodeChanged(Change const& aChange, configuration::AbsolutePath const& aPath, TreeManager * pSource);
-            void nodeDeleted(configuration::AbsolutePath const& aPath, TreeManager * pSource);
-
-        private:
-            ApiTreeImpl				    m_aTreeImpl;
-            configuration::AbsolutePath	            m_aLocationPath;
-            rtl::Reference<NodeListener> m_pNotificationListener;
-            vos::ORef< OOptions > m_xOptions;
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_API_TREEIMPLOBJECTS_HXX_
diff --git a/configmgr/source/api2/broadcaster.cxx b/configmgr/source/api2/broadcaster.cxx
deleted file mode 100644
index 71b29177c5..0000000000
--- a/configmgr/source/api2/broadcaster.cxx
+++ /dev/null
@@ -1,1229 +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: broadcaster.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_configmgr.hxx"
-
-#include "broadcaster.hxx"
-#include "notifierimpl.hxx"
-#include "confignotifier.hxx"
-#include "noderef.hxx"
-#include "nodechange.hxx"
-#include "nodechangeinfo.hxx"
-#include "translatechanges.hxx"
-#include "apifactory.hxx"
-#include "apitreeaccess.hxx"
-#include "apitreeimplobj.hxx"
-#include <vos/refernce.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-#ifndef INCLUDED_SET
-#include <set>
-#define INCLUDED_SET
-#endif
-#ifndef INCLUDED_FUNCTIONAL
-#include <functional>
-#define INCLUDED_FUNCTIONAL
-#endif
-
-namespace configmgr
-{
-    namespace configapi
-    {
-// ---------------------------------------------------------------------------------------------------
-// Broadcaster implementation
-// ---------------------------------------------------------------------------------------------------
-    class BroadcasterHelper
-    {
-    public:
-        static vos::ORef<NotifierImpl> getImpl(Notifier const& aNotifier) { return aNotifier.m_aImpl; }
-    };
-// ---------------------------------------------------------------------------------------------------
-
-    namespace
-    {
-    // -----------------------------------------------------------------------------------------------
-        template <class T>
-        struct LessORefBodyPtr
-        {
-            bool operator()(vos::ORef<T> const& lhs, vos::ORef<T> const& rhs) const
-            { 
-                return ptr_less(lhs.getBodyPtr(), rhs.getBodyPtr()); 
-            }
-
-            std::less<T*> ptr_less;
-        };
-    // -----------------------------------------------------------------------------------------------
-        class ApiTreeRef
-        {
-            ApiTreeImpl const*  m_pApiTree;
-            uno::Reference<uno::XInterface>     m_xKeepAlive;
-        public:
-            explicit ApiTreeRef(ApiTreeImpl const* _pApiTree = NULL)
-            : m_pApiTree(_pApiTree)
-            , m_xKeepAlive()
-            {
-                if (m_pApiTree) m_xKeepAlive = m_pApiTree->getUnoInstance();
-            }
-
-            bool is() const 
-            { 
-                OSL_ASSERT(!m_pApiTree == !m_xKeepAlive.is()); 
-                return m_pApiTree != NULL; 
-            }
-
-            ApiTreeImpl const* get()        const { return m_pApiTree; }
-            ApiTreeImpl const* operator->() const { return m_pApiTree; }
-
-            friend bool operator==(ApiTreeRef const& lhs,ApiTreeRef const& rhs)
-            { return lhs.m_pApiTree == rhs.m_pApiTree; }
-
-            friend bool operator!=(ApiTreeRef const& lhs,ApiTreeRef const& rhs)
-            { return lhs.m_pApiTree != rhs.m_pApiTree; }
-        };
-    // -----------------------------------------------------------------------------------------------
-        typedef std::map< vos::ORef<NotifierImpl>, ApiTreeRef, LessORefBodyPtr<NotifierImpl> > NotifierSet;
-    // -----------------------------------------------------------------------------------------------
-
-    }
-// ---------------------------------------------------------------------------------------------------
-// class Broadcaster::Impl
-// ---------------------------------------------------------------------------------------------------
-    class Broadcaster::Impl : public vos::OReference
-    {
-    private:
-        NotifierSet::value_type m_aNotifierData;
-    public:
-        Impl(NotifierSet::value_type const& aNotifierData) : m_aNotifierData(aNotifierData) {}
-
-        NotifierSet::value_type getNotifierData() const { return m_aNotifierData; }
-
-        bool translateChanges(configuration::NodeChangesInformation& aInfos, configuration::NodeChanges const& aChanges, bool bSingleBase) const;
-        bool translateChanges(configuration::NodeChangesInformation& aInfos, configuration::NodeChangesInformation const& aChanges, bool bSingleBase) const;
-
-        void queryConstraints(configuration::NodeChangesInformation const& aChanges)	{ this->doQueryConstraints(aChanges); }
-        void notifyListeners(configuration::NodeChangesInformation const& aChanges)	{ this->doNotifyListeners(aChanges); }
-
-        void notifyRootListeners(configuration::NodeChangesInformation const& aChanges);
-
-        static vos::ORef<Impl> create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChange const& aChange, bool bLocal);
-        static vos::ORef<Impl> create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChanges const& aChange, bool bLocal);
-        static vos::ORef<Impl> create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChangeInformation const& aChange, bool bLocal);
-        static vos::ORef<Impl> create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChangesInformation const& aChange, bool bLocal);
-
-    private:
-        virtual void doQueryConstraints(configuration::NodeChangesInformation const& aChanges) = 0;
-        virtual void doNotifyListeners(configuration::NodeChangesInformation const& aChanges) = 0;
-    };
-// ---------------------------------------------------------------------------------------------------
-    namespace
-    {
-    // -----------------------------------------------------------------------------------------------
-        
-        class EmptyBroadcaster_Impl : public Broadcaster::Impl
-        {
-            EmptyBroadcaster_Impl(NotifierSet::value_type const& rNotifierData)
-            : Broadcaster::Impl(rNotifierData)
-            {
-            }
-        public:
-            static 
-            vos::ORef< Broadcaster::Impl > create(NotifierSet::value_type const& rRootNotifier)
-            {
-                return new EmptyBroadcaster_Impl(rRootNotifier);
-            }
-        private:
-            virtual void doQueryConstraints(configuration::NodeChangesInformation const& aChanges);
-            virtual void doNotifyListeners(configuration::NodeChangesInformation const& aChanges);
-        };
-        
-        void EmptyBroadcaster_Impl::doQueryConstraints(configuration::NodeChangesInformation const&) {}
-        void EmptyBroadcaster_Impl::doNotifyListeners(configuration::NodeChangesInformation const&) {}
-    // -----------------------------------------------------------------------------------------------
-
-        class NodeLocalBroadcaster_Impl : public Broadcaster::Impl
-        {
-            configuration::NodeID		aAffectedNode;
-
-        public:
-            NodeLocalBroadcaster_Impl(NotifierSet::value_type const& rTreeNotifierData, configuration::NodeID const& aAffectedID)
-            : Broadcaster::Impl(rTreeNotifierData)
-            , aAffectedNode(aAffectedID)
-            {
-            }
-
-            configuration::NodeID getAffectedNodeID() const { return aAffectedNode; }
-            unsigned int getNodeIndex() const { return aAffectedNode.toIndex(); }
-
-        protected:
-            void querySingleConstraint(configuration::NodeChangeInformation const& aChange, bool bMore);
-            void notifySingleChange(configuration::NodeChangeInformation const& aChange, bool bMore, css::beans::PropertyChangeEvent*& pCurEvent);
-        };
-    // -----------------------------------------------------------------------------------------------
-        
-        class SingleChangeBroadcaster_Impl : public NodeLocalBroadcaster_Impl
-        {
-            configuration::SubNodeID m_aChangingValue;
-
-            SingleChangeBroadcaster_Impl(NotifierSet::value_type const& rTreeNotifierData, configuration::NodeID const& aAffectedID, configuration::SubNodeID const& aChangedValue);
-
-        public:
-            static 
-            NodeLocalBroadcaster_Impl* create(
-                        NotifierSet::value_type const& rLocalNotifier, 
-                        configuration::NodeChangeLocation const& aChange);
-            static 
-            NodeLocalBroadcaster_Impl* create(
-                        NotifierSet::value_type const& rLocalNotifier, 
-                        configuration::NodeID const& aAffectedID, 
-                        configuration::NodeChangeLocation const& aChange);
-            static 
-            NodeLocalBroadcaster_Impl* create(
-                        NotifierSet::value_type const& rLocalNotifier, 
-                        configuration::NodeID const& aAffectedID, 
-                        configuration::SubNodeID const& aChangedNode, 
-                        configuration::NodeChangeLocation const& aChange);
-        private:
-            virtual void doQueryConstraints(configuration::NodeChangesInformation const& aChanges);
-            virtual void doNotifyListeners(configuration::NodeChangesInformation const& aChanges);
-        };
-
-    // -----------------------------------------------------------------------------------------------
-        class MultiChangeBroadcaster_Impl : public NodeLocalBroadcaster_Impl
-        {
-            std::set< configuration::SubNodeID >	m_aChangingNodes;
-
-            MultiChangeBroadcaster_Impl(NotifierSet::value_type const& rTreeNotifierData, configuration::NodeID const& aAffectedID, std::set< configuration::SubNodeID >& aChangedNodes);
-
-        public:
-            static 
-            NodeLocalBroadcaster_Impl* create(
-                        NotifierSet::value_type const& rLocalNotifier, 
-                        configuration::NodeChangesInformation const& aChanges);
-            static 
-            NodeLocalBroadcaster_Impl* create(
-                        NotifierSet::value_type const& rLocalNotifier, 
-                        configuration::NodeID const& aAffectedID, 
-                        configuration::NodeChangesInformation const& aChanges);
-        private:
-            virtual void doQueryConstraints(configuration::NodeChangesInformation const& aChanges);
-            virtual void doNotifyListeners(configuration::NodeChangesInformation const& aChanges);
-        };
-    // -----------------------------------------------------------------------------------------------
-        class SingleTreeBroadcaster_Impl : public Broadcaster::Impl
-        {
-            std::vector< vos::ORef<NodeLocalBroadcaster_Impl> > m_aBroadcasters;
-
-            SingleTreeBroadcaster_Impl(NotifierSet::value_type const& rTreeNotifierData, std::vector< vos::ORef<NodeLocalBroadcaster_Impl> >& aBroadcasters);
-
-        public:
-        //--------------------------
-            static 
-            vos::ORef< Broadcaster::Impl > create(
-                        NotifierSet::value_type const& rRootNotifier, 
-                        NotifierSet::value_type const& rLocalNotifier, 
-                        configuration::NodeChangesInformation const& aChanges);
-
-            static bool selectChanges(configuration::NodeChangesInformation& rSelected, configuration::NodeChangesInformation const& aOriginal, configuration::NodeID const& aSelector);			
-        //--------------------------
-        private:
-            virtual void doQueryConstraints(configuration::NodeChangesInformation const& aChanges);
-            virtual void doNotifyListeners(configuration::NodeChangesInformation const& aChanges);
-        };
-    // -----------------------------------------------------------------------------------------------
-        class MultiTreeBroadcaster_Impl : public Broadcaster::Impl
-        {
-            std::vector< vos::ORef< Broadcaster::Impl > > m_aBroadcasters;
-
-            MultiTreeBroadcaster_Impl(NotifierSet::value_type const& rRootNotifierData, std::vector< vos::ORef< Broadcaster::Impl > >& aBroadcasters);
-        public:
-        //--------------------------
-            static 
-            vos::ORef< Broadcaster::Impl > create(
-                        NotifierSet::value_type const& rRootNotifier, 
-                        NotifierSet const& rNotifiers, 
-                        configuration::NodeChangesInformation const& aChanges);
-
-            static bool selectChanges(configuration::NodeChangesInformation& rSelected, configuration::NodeChangesInformation const& aOriginal, NotifierSet::value_type const& aSelector);
-        //--------------------------
-        private:
-            virtual void doQueryConstraints(configuration::NodeChangesInformation const& aChanges);
-            virtual void doNotifyListeners(configuration::NodeChangesInformation const& aChanges);
-        };
-
-    // -----------------------------------------------------------------------------------------------
-
-        inline configuration::NodeID makeRootID( rtl::Reference< configuration::Tree > const& aTree ) { return configuration::NodeID( aTree, aTree->getRootNode() ); }
-        inline configuration::NodeID makeRootID( ApiTreeRef const& pTreeImpl ) { return makeRootID( pTreeImpl->getTree() ); }
-    // -----------------------------------------------------------------------------------------------
-        NotifierSet::value_type findNotifier(configuration::NodeChangeLocation const& aChange, ApiTreeRef const& pTreeImpl)
-        {
-            OSL_ENSURE(aChange.isValidData(),"Invalid change location - cannot find notifier");
-
-            configuration::NodeID aAffectedNode = aChange.getAffectedNodeID();
-            if (aAffectedNode.isEmpty())
-                return NotifierSet::value_type();
-
-            ApiTreeRef aAffectedImpl( Factory::findDescendantTreeImpl(aAffectedNode, pTreeImpl.get()) );
-            if (aAffectedImpl.is())
-            {
-                vos::ORef<NotifierImpl> aAffectedNotifier = BroadcasterHelper::getImpl(aAffectedImpl->getNotifier());
-
-                return  NotifierSet::value_type(aAffectedNotifier, aAffectedImpl);
-            }
-            else
-                return NotifierSet::value_type();
-        }
-    // -----------------------------------------------------------------------------------------------
-        inline
-        NotifierSet::value_type findNotifier(configuration::NodeChangeInformation const& aChange, ApiTreeRef const& pTreeImpl)
-        {
-            return findNotifier(aChange.location,pTreeImpl);
-        }
-    // -----------------------------------------------------------------------------------------------
-
-        void findNotifiers(NotifierSet& aNotifiers, configuration::NodeChangesInformation const& aChanges, ApiTreeRef const& pTreeImpl )
-        {
-            for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != aChanges.end(); ++it)
-            {
-                NotifierSet::value_type aNotifierData( findNotifier(*it,pTreeImpl) );
-
-                if (aNotifierData.first.isValid())
-                {
-                    aNotifiers.insert( aNotifierData );
-                    OSL_ENSURE( aNotifiers[aNotifierData.first] == aNotifierData.second, "Different Api Trees for the same notifier" );
-                }
-            }
-        }
-    // -----------------------------------------------------------------------------------------------
-    // NodeLocalBroadcaster_Impl
-    // -----------------------------------------------------------------------------------------------
-        void NodeLocalBroadcaster_Impl::querySingleConstraint(configuration::NodeChangeInformation const& aChange, bool bMore)
-        {
-            uno::Reference< css::beans::XVetoableChangeListener > const * const SelectListener = 0;
-
-            vos::ORef<NotifierImpl> pNotifierImpl = getNotifierData().first;
-
-            cppu::OInterfaceContainerHelper* pListeners	= pNotifierImpl->m_aListeners.getContainer( getNodeIndex(), getCppuType(SelectListener) );
-            cppu::OInterfaceContainerHelper* pSpecial		= pNotifierImpl->m_aListeners.getSpecialContainer( aChange.location.getChangingValueID() );
-
-            if (pSpecial || pListeners)
-            {
-                css::beans::PropertyChangeEvent aEvent;
-                aEvent.Source = pNotifierImpl->m_aListeners.getObjectAt( getNodeIndex() );
-
-                if (configapi::fillEventDataFromResolved(aEvent,aChange,bMore))
-                {
-                    // Catch only RuntimeExceptions here: vetoableChange issues its veto by throwing 
-                    // a PropertyVetoException (which is not a RuntimeException)
-                    if (pListeners)
-                    {
-                        ListenerContainerIterator< css::beans::XVetoableChangeListener > aIterator(*pListeners);
-
-                        UnoApiLockReleaser aGuardReleaser;
-                        while (aIterator.hasMoreElements())
-                        try
-                        {
-                            aIterator.next()->vetoableChange(aEvent);
-                        }
-                        catch (uno::RuntimeException & )
-                        {}
-                    }
-                    if (pSpecial)
-                    {
-                        ListenerContainerIterator< css::beans::XVetoableChangeListener > aIterator(*pSpecial);
-
-                        UnoApiLockReleaser aGuardReleaser;
-                        while (aIterator.hasMoreElements())
-                        try
-                        {
-                            aIterator.next()->vetoableChange(aEvent);
-                        }
-                        catch (uno::RuntimeException & )
-                        {}
-                    }
-                }
-            }
-
-        }
-    // -----------------------------------------------------------------------------------------------
-        void NodeLocalBroadcaster_Impl::notifySingleChange(configuration::NodeChangeInformation const& aChange, bool bMore, css::beans::PropertyChangeEvent*& pCurEvent)
-        {
-            uno::Reference< css::beans::XPropertyChangeListener > const * const		SelectPropertyListener = 0;
-            uno::Reference< css::container::XContainerListener > const * const			SelectContainerListener = 0;
-
-            vos::ORef<NotifierImpl> pNotifierImpl = getNotifierData().first;
-
-            cppu::OInterfaceContainerHelper* pContainerListeners	= pNotifierImpl->m_aListeners.getContainer( getNodeIndex(), getCppuType(SelectContainerListener) );
-
-            if (pContainerListeners)
-            {
-                css::container::ContainerEvent aEvent;
-                aEvent.Source = pNotifierImpl->m_aListeners.getObjectAt( getNodeIndex() );
-
-                if (configapi::fillEventDataFromResolved(aEvent,aChange))
-                {
-                    
-                    ListenerContainerIterator< css::container::XContainerListener > aIterator(*pContainerListeners);
-
-                    UnoApiLockReleaser aGuardReleaser;
-                    while (aIterator.hasMoreElements())
-                    try
-                    {
-                        uno::Reference<css::container::XContainerListener> xListener( aIterator.next() );
-                        OSL_ASSERT( xListener.is() );
-
-                        switch (aChange.change.type)
-                        {
-                        case configuration::NodeChangeData::eSetValue:
-                        case configuration::NodeChangeData::eSetDefault:
-                        case configuration::NodeChangeData::eReplaceElement:
-                            xListener->elementReplaced(aEvent);
-                            break;
-
-                        case configuration::NodeChangeData::eInsertElement:
-                            xListener->elementInserted(aEvent);
-                            break;
-
-                        case configuration::NodeChangeData::eRemoveElement:
-                            xListener->elementRemoved(aEvent);
-                            break;
-
-
-                        case configuration::NodeChangeData::eResetSetDefault:
-                        case configuration::NodeChangeData::eRenameElementTree:
-                        case configuration::NodeChangeData::eNoChange: 
-                            OSL_ASSERT(false); 
-                            break;
-                        }
-                    }
-                    catch (uno::Exception &)
-                    {}
-                }
-            }
-
-
-            OSL_ASSERT(pCurEvent);
-            css::beans::PropertyChangeEvent& rEvent = *pCurEvent;
-
-            rEvent.Source = pNotifierImpl->m_aListeners.getObjectAt( getNodeIndex() );
-
-            if (configapi::fillEventDataFromResolved(rEvent,aChange,bMore))
-            {
-                cppu::OInterfaceContainerHelper* pPropertyListeners	= pNotifierImpl->m_aListeners.getContainer( getNodeIndex(), getCppuType(SelectPropertyListener) );
-                if (pPropertyListeners)
-                {
-                    ListenerContainerIterator< css::beans::XPropertyChangeListener > aIterator(*pPropertyListeners);
-                    UnoApiLockReleaser aGuardReleaser;
-                    while (aIterator.hasMoreElements())
-                        try { aIterator.next()->propertyChange(rEvent); } catch (uno::Exception & ) {}
-                }
-
-                cppu::OInterfaceContainerHelper* pSpecialListeners	= pNotifierImpl->m_aListeners.getSpecialContainer( aChange.location.getChangingValueID() );
-                if (pSpecialListeners)
-                {
-                    ListenerContainerIterator< css::beans::XPropertyChangeListener > aIterator(*pSpecialListeners);
-                    UnoApiLockReleaser aGuardReleaser;
-                    while (aIterator.hasMoreElements())
-                        try { aIterator.next()->propertyChange(rEvent); } catch (uno::Exception & ) {}
-                }
-
-                ++pCurEvent;
-            }
-
-        }
-    // -----------------------------------------------------------------------------------------------
-
-    // -----------------------------------------------------------------------------------------------
-    // SingleBroadcaster_Impl
-    // -----------------------------------------------------------------------------------------------
-        SingleChangeBroadcaster_Impl::SingleChangeBroadcaster_Impl(
-            NotifierSet::value_type const& rTreeNotifierData, 
-            configuration::NodeID const& aAffectedID, configuration::SubNodeID const& aChangedNode
-        )
-        : NodeLocalBroadcaster_Impl(rTreeNotifierData,aAffectedID)
-        , m_aChangingValue(aChangedNode)
-        {
-        }
-    // -----------------------------------------------------------------------------------------------
-        NodeLocalBroadcaster_Impl* SingleChangeBroadcaster_Impl::create(
-                    NotifierSet::value_type const& rLocalNotifier, 
-                    configuration::NodeChangeLocation const& aChange)
-        {
-            OSL_ENSURE(rLocalNotifier.second->getTree() == aChange.getAffectedTreeRef(),
-                        "ERROR: Tree Mismatch creating Single Broadcaster");
-
-            OSL_ENSURE(aChange.isValidData(), "ERROR: Invalid Change Location for Broadcaster");
-
-            configuration::NodeID aAffectedNodeID = aChange.getAffectedNodeID();
-            if (aAffectedNodeID.isEmpty())
-                return 0;
-
-            return create(rLocalNotifier,aAffectedNodeID,aChange.getChangingValueID(),aChange);
-        }
-    // -----------------------------------------------------------------------------------------------
-        NodeLocalBroadcaster_Impl* SingleChangeBroadcaster_Impl::create(
-                    NotifierSet::value_type const& rLocalNotifier,
-                    configuration::NodeID const& aAffectedID,  
-                    configuration::NodeChangeLocation const& aChange)
-        {
-
-            return create(rLocalNotifier,aAffectedID,aChange.getChangingValueID(),aChange);
-        }
-    // -----------------------------------------------------------------------------------------------
-        NodeLocalBroadcaster_Impl* SingleChangeBroadcaster_Impl::create(
-                    NotifierSet::value_type const& rLocalNotifier,
-                    configuration::NodeID const& aAffectedID,  
-                    configuration::SubNodeID const& aChangedNodeID,  
-                    configuration::NodeChangeLocation const& aChange)
-        {
-                    { (void)aChange; }                    
-            OSL_ENSURE(aChange.isValidData(), "ERROR: Invalid Change Location for Broadcaster");
-            OSL_ENSURE(aAffectedID.isValidNode(),"Cannot broadcast without affected node");
-
-            OSL_ENSURE(rLocalNotifier.second->getTree() == aChange.getAffectedTreeRef(),
-                        "ERROR: Tree Mismatch creating Single Broadcaster");
-            OSL_ENSURE( aChange.getAffectedNodeID() == aAffectedID, 
-                        "ERROR: Node Mismatch creating Single Broadcaster");
-            OSL_ENSURE( aChange.getChangingValueID() == aChangedNodeID, 
-                        "ERROR: Value Node Mismatch creating Single Broadcaster");
-
-            return new SingleChangeBroadcaster_Impl(rLocalNotifier,aAffectedID,aChangedNodeID);
-        }
-    // -----------------------------------------------------------------------------------------------
-        void SingleChangeBroadcaster_Impl::doQueryConstraints(configuration::NodeChangesInformation const& aChanges)
-        {
-            OSL_ASSERT(aChanges.size() <= 1);
-            if (!aChanges.empty())
-            {
-                std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin();
-
-                OSL_ENSURE( m_aChangingValue == it->location.getChangingValueID(), "Broadcasting unanticipated change");
-                
-                querySingleConstraint(*it, false);
-            }
-
-        }
-    // -----------------------------------------------------------------------------------------------
-        void SingleChangeBroadcaster_Impl::doNotifyListeners(configuration::NodeChangesInformation const& aChanges)
-        {
-            OSL_ASSERT(aChanges.size() <= 1);
-            if (!aChanges.empty())
-            {
-                css::beans::PropertyChangeEvent aEvent;
-                css::beans::PropertyChangeEvent * pEventNext = &aEvent;
-            
-                std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin();
-
-                OSL_ENSURE( m_aChangingValue == it->location.getChangingValueID(), "Broadcasting unanticipated change");
-                
-                notifySingleChange(*it, false, pEventNext);
-            
-                if (pEventNext != &aEvent)
-                {
-                    uno::Sequence< css::beans::PropertyChangeEvent > aPropertyEvents(&aEvent,1);
-
-                    uno::Reference< css::beans::XPropertiesChangeListener > const * const SelectListener = 0;
-
-                    vos::ORef<NotifierImpl> pNotifierImpl = getNotifierData().first;
-
-                    cppu::OInterfaceContainerHelper* pContainer = pNotifierImpl->m_aListeners.getContainer( getNodeIndex(), getCppuType(SelectListener) );
-
-                    if (pContainer)
-                    {
-                        ListenerContainerIterator< css::beans::XPropertiesChangeListener > aIterator(*pContainer);
-                        UnoApiLockReleaser aGuardReleaser;
-                        while (aIterator.hasMoreElements())
-                            try { aIterator.next()->propertiesChange(aPropertyEvents); } catch (uno::Exception & ) {}
-                    }
-                }
-            }
-        }
-
-    // -----------------------------------------------------------------------------------------------
-    // MultiChangeBroadcaster_Impl
-    // -----------------------------------------------------------------------------------------------
-
-        MultiChangeBroadcaster_Impl::MultiChangeBroadcaster_Impl(
-            NotifierSet::value_type const& rTreeNotifierData, 
-            configuration::NodeID const& aAffectedID, std::set< configuration::SubNodeID >& aChangedNodes
-        )
-        : NodeLocalBroadcaster_Impl(rTreeNotifierData,aAffectedID)
-        , m_aChangingNodes()
-        {
-            m_aChangingNodes.swap(aChangedNodes);
-        }
-    // -----------------------------------------------------------------------------------------------
-        NodeLocalBroadcaster_Impl* MultiChangeBroadcaster_Impl::create(
-                    NotifierSet::value_type const& rLocalNotifier, 
-                    configuration::NodeChangesInformation const& aChanges)
-        {
-            if (aChanges.empty())
-                return 0;
-
-            OSL_ENSURE(aChanges.begin()->hasValidLocation(), "ERROR: Invalid Change Location for Broadcaster");
-
-            configuration::NodeID aAffectedNodeID = aChanges.begin()->location.getAffectedNodeID();
-            if (aAffectedNodeID.isEmpty())
-                return 0;
-
-            return create(rLocalNotifier, aAffectedNodeID, aChanges);
-        }
-    // -----------------------------------------------------------------------------------------------
-        NodeLocalBroadcaster_Impl* MultiChangeBroadcaster_Impl::create(
-                    NotifierSet::value_type const& rLocalNotifier, 
-                    configuration::NodeID const& aAffectedNodeID,
-                    configuration::NodeChangesInformation const& aChanges)
-        {
-            if (aChanges.empty())
-                return 0;
-
-            else if (aChanges.size() == 1)
-                return SingleChangeBroadcaster_Impl::create(rLocalNotifier,aAffectedNodeID,aChanges.begin()->location);
-
-            else
-            {
-                OSL_ENSURE(aAffectedNodeID.isValidNode(),"Cannot broadcast without affected node");
-
-                std::set< configuration::SubNodeID > aChangedNodes;
-                for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != aChanges.end(); ++it)
-                {
-                    OSL_ENSURE(it->hasValidLocation(), "ERROR: Invalid Change Location for Broadcaster");
-
-                    OSL_ENSURE(it->location.getAffectedNodeID() == aAffectedNodeID, "ERROR: Change is not local to affected node (as advertised)");
-                    OSL_ENSURE(rLocalNotifier.second->getTree() == it->location.getAffectedTreeRef(),
-                                "ERROR: Tree Mismatch creating Multi Change Broadcaster");
-
-                    configuration::SubNodeID aChangedValueID = it->location.getChangingValueID();
-
-                    aChangedNodes.insert(aChangedValueID);
-                }
-                OSL_ENSURE(!aChangedNodes.empty(), "Changes don't affect any nodes");
-
-                if (aChangedNodes.size() == 1) OSL_TRACE("WARNING: Different changes all affect the same node !");
-                
-                return new MultiChangeBroadcaster_Impl(rLocalNotifier, aAffectedNodeID, aChangedNodes);
-            }
-        }
-    // -----------------------------------------------------------------------------------------------
-        void MultiChangeBroadcaster_Impl::doQueryConstraints(configuration::NodeChangesInformation const& aChanges)
-        {
-            std::vector< configuration::NodeChangeInformation >::const_iterator const stop = aChanges.end(), last = stop-1;
-
-            for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != stop; ++it)
-            {
-                OSL_ENSURE( m_aChangingNodes.find( it->location.getChangingValueID() ) != m_aChangingNodes.end(), "Broadcasting unanticipated change");
-                
-                querySingleConstraint(*it, it != last);
-            }
-
-        }
-    // -----------------------------------------------------------------------------------------------
-        void MultiChangeBroadcaster_Impl::doNotifyListeners(configuration::NodeChangesInformation const& aChanges)
-        {
-            uno::Sequence< css::beans::PropertyChangeEvent > aPropertyEvents(aChanges.size());
-            
-            css::beans::PropertyChangeEvent * const pEventStart = aPropertyEvents.getArray();
-            css::beans::PropertyChangeEvent * pEventNext = pEventStart;
-
-            std::vector< configuration::NodeChangeInformation >::const_iterator const stop = aChanges.end(), last = stop-1;
-
-            for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != stop; ++it)
-            {
-                // #92463# Skip nodes that are not in the tree 
-                if (it->location.getAffectedNodeID().isEmpty()) continue;
-
-                OSL_ENSURE( m_aChangingNodes.find( it->location.getChangingValueID() ) != m_aChangingNodes.end(), "Broadcasting unanticipated change");
-
-                notifySingleChange(*it, it != last, pEventNext);
-            }
-            
-            sal_Int32 nPropertyEvents = pEventNext-pEventStart;
-
-            if (nPropertyEvents > 0)
-            {
-                OSL_ASSERT(nPropertyEvents <= aPropertyEvents.getLength());
-                if (nPropertyEvents != aPropertyEvents.getLength())
-                    aPropertyEvents.realloc(nPropertyEvents);
-
-                uno::Reference< css::beans::XPropertiesChangeListener > const * const SelectListener = 0;
-
-                vos::ORef<NotifierImpl> pNotifierImpl = getNotifierData().first;
-
-                cppu::OInterfaceContainerHelper* pContainer = pNotifierImpl->m_aListeners.getContainer( getNodeIndex(), getCppuType(SelectListener) );
-
-                if (pContainer)
-                {
-                    ListenerContainerIterator< css::beans::XPropertiesChangeListener > aIterator(*pContainer);
-                    UnoApiLockReleaser aGuardReleaser;
-                    while (aIterator.hasMoreElements())
-                        try { aIterator.next()->propertiesChange(aPropertyEvents); } catch (uno::Exception & ) {}
-                }
-            }
-        }
-    // -----------------------------------------------------------------------------------------------
-    // TreeLocalBroadcaster_Impl
-    // -----------------------------------------------------------------------------------------------
-
-        SingleTreeBroadcaster_Impl::SingleTreeBroadcaster_Impl(
-            NotifierSet::value_type const& aTreeNotifierData, 
-            std::vector< vos::ORef<NodeLocalBroadcaster_Impl> >& aBroadcasters
-        )
-        : Broadcaster::Impl(aTreeNotifierData)
-        , m_aBroadcasters()
-        {
-            m_aBroadcasters.swap(aBroadcasters);
-        }
-
-    // -----------------------------------------------------------------------------------------------
-            
-        bool SingleTreeBroadcaster_Impl::selectChanges(configuration::NodeChangesInformation& rSelected, configuration::NodeChangesInformation const& aOriginal, configuration::NodeID const& aSelector)
-        {
-            OSL_ASSERT(rSelected.empty()); // nothing in there yet
-
-            for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aOriginal.begin(); it != aOriginal.end(); ++it)
-            {
-                if ( it->location.getAffectedNodeID() == aSelector )
-                {
-                    rSelected.push_back(*it);
-                }
-            }
-            return !rSelected.empty();
-        }
-    // -----------------------------------------------------------------------------------------------
-
-        vos::ORef< Broadcaster::Impl > SingleTreeBroadcaster_Impl::create(
-                    NotifierSet::value_type const& rRootNotifier, 
-                    NotifierSet::value_type const& rLocalNotifier, 
-                    configuration::NodeChangesInformation const& aChanges)
-        {
-            std::set< configuration::NodeID > aNodes;
-            for (std::vector< configuration::NodeChangeInformation >::const_iterator itChanges = aChanges.begin(); itChanges != aChanges.end(); ++itChanges)
-            {
-                OSL_ENSURE(itChanges->hasValidLocation(), "ERROR: Invalid Change Location for Broadcaster");
-
-                configuration::NodeID aAffectedNodeID = itChanges->location.getAffectedNodeID();
-                if (!aAffectedNodeID.isEmpty())
-                    aNodes.insert(aAffectedNodeID);
-            }
-
-            std::vector< vos::ORef<NodeLocalBroadcaster_Impl> > aNodecasters;
-            for (std::set< configuration::NodeID >::const_iterator itNodes = aNodes.begin(); itNodes != aNodes.end(); ++itNodes)
-            {
-                OSL_ASSERT(itNodes->isValidNode()); // filtered empty ones above
-
-                configuration::NodeChangesInformation aSelectedChanges;
-                if ( selectChanges(aSelectedChanges, aChanges, *itNodes))
-                {
-                    NodeLocalBroadcaster_Impl* pSelectedImpl = MultiChangeBroadcaster_Impl::create(rLocalNotifier, *itNodes, aSelectedChanges);
-                    if (pSelectedImpl)
-                        aNodecasters.push_back(pSelectedImpl);
-                }
-            }
-
-            if (aNodecasters.empty())
-                return 0;
-
-            else if (aNodecasters.size() == 1)
-                return aNodecasters.begin()->getBodyPtr();
-
-            else
-                return new SingleTreeBroadcaster_Impl(rRootNotifier, aNodecasters);
-        }
-    // -----------------------------------------------------------------------------------------------
-        void SingleTreeBroadcaster_Impl::doQueryConstraints(configuration::NodeChangesInformation const& aChanges)
-        {
-            for(std::vector< vos::ORef<NodeLocalBroadcaster_Impl> >::iterator it = m_aBroadcasters.begin(); it != m_aBroadcasters.end(); ++it)
-            {
-                configuration::NodeChangesInformation aSelectedInfos;
-                if ( selectChanges(aSelectedInfos, aChanges, (*it)->getAffectedNodeID()) )
-                    (*it)->queryConstraints(aSelectedInfos);
-            }
-        }
-    // -----------------------------------------------------------------------------------------------
-        void SingleTreeBroadcaster_Impl::doNotifyListeners(configuration::NodeChangesInformation const& aChanges)
-        {
-            for(std::vector< vos::ORef<NodeLocalBroadcaster_Impl> >::iterator it = m_aBroadcasters.begin(); it != m_aBroadcasters.end(); ++it)
-            {
-                configuration::NodeChangesInformation aSelectedInfos;
-                if ( selectChanges(aSelectedInfos, aChanges, (*it)->getAffectedNodeID()) )
-                    (*it)->notifyListeners(aSelectedInfos);
-            }
-        }
-    // -----------------------------------------------------------------------------------------------
-    // MultiTreeBroadcaster_Impl
-    // -----------------------------------------------------------------------------------------------
-        MultiTreeBroadcaster_Impl::MultiTreeBroadcaster_Impl(NotifierSet::value_type const& aRootSelector, std::vector< vos::ORef< Broadcaster::Impl > >& aBroadcasters)
-        : Broadcaster::Impl(aRootSelector)
-        , m_aBroadcasters()
-        {
-            m_aBroadcasters.swap(aBroadcasters);
-        }
-
-    // -----------------------------------------------------------------------------------------------
-            
-        bool MultiTreeBroadcaster_Impl::selectChanges(configuration::NodeChangesInformation& rSelected, configuration::NodeChangesInformation const& aOriginal, NotifierSet::value_type const& aSelector)
-        {
-            OSL_ASSERT(aSelector.first.isValid());
-            OSL_ASSERT(aSelector.second.is());
-
-            OSL_ASSERT(rSelected.empty()); // nothing in there yet
-            
-            rtl::Reference< configuration::Tree > const aSelectedTree( aSelector.second->getTree() );
-
-            for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aOriginal.begin(); it != aOriginal.end(); ++it)
-            {
-                if (it->location.getAffectedTreeRef() == aSelectedTree)
-                {
-                    rSelected.push_back(*it);
-                }
-            }
-            return !rSelected.empty();
-        }
-        // -------------------------------------------------------------------------------------------
-                        
-        vos::ORef< Broadcaster::Impl > MultiTreeBroadcaster_Impl::create(NotifierSet::value_type const& rRootNotifier, NotifierSet const& rNotifiers, configuration::NodeChangesInformation const& aChanges)
-        {
-            std::vector< vos::ORef< Broadcaster::Impl > > aTreecasters;
-            for (NotifierSet::const_iterator it = rNotifiers.begin(); it != rNotifiers.end(); ++it)
-            {
-                configuration::NodeChangesInformation aSelectedChanges;
-                if ( selectChanges(aSelectedChanges, aChanges, *it))
-                {
-                    vos::ORef< Broadcaster::Impl > pSelectedImpl = SingleTreeBroadcaster_Impl::create(rRootNotifier, *it, aSelectedChanges);
-                    if (pSelectedImpl.isValid())
-                        aTreecasters.push_back(pSelectedImpl);
-                }
-            }
-
-            if (aTreecasters.empty())
-                return 0;
-
-            else if (aTreecasters.size() == 1)
-                return *aTreecasters.begin();
-
-            else
-                return new MultiTreeBroadcaster_Impl(rRootNotifier, aTreecasters);
-        }
-        // -------------------------------------------------------------------------------------------
-
-        void MultiTreeBroadcaster_Impl::doQueryConstraints(configuration::NodeChangesInformation const& aChanges)
-        {
-            for(std::vector< vos::ORef< Broadcaster::Impl > >::iterator it = m_aBroadcasters.begin(); it != m_aBroadcasters.end(); ++it)
-            {
-                configuration::NodeChangesInformation aSelectedInfos;
-                if ( selectChanges(aSelectedInfos, aChanges, (*it)->getNotifierData()) )
-                    (*it)->queryConstraints(aSelectedInfos);
-            }
-        }
-        // -------------------------------------------------------------------------------------------
-
-        void MultiTreeBroadcaster_Impl::doNotifyListeners(configuration::NodeChangesInformation const& aChanges)
-        {
-            for(std::vector< vos::ORef< Broadcaster::Impl > >::iterator it = m_aBroadcasters.begin(); it != m_aBroadcasters.end(); ++it)
-            {
-                configuration::NodeChangesInformation aSelectedInfos;
-                if ( selectChanges(aSelectedInfos, aChanges, (*it)->getNotifierData()) )
-                    (*it)->notifyListeners(aSelectedInfos);
-            }
-        }
-    // -----------------------------------------------------------------------------------------------
-    }
-// ---------------------------------------------------------------------------------------------------
-
-    vos::ORef< Broadcaster::Impl > Broadcaster::Impl::create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChange const& aChange, bool bLocal)
-    {
-        OSL_ASSERT(pTreeImpl.is());
-
-        vos::ORef< Broadcaster::Impl > pRet;
-
-        configuration::NodeChangeLocation aLocation;
-        if (aChange.getChangeLocation(aLocation))
-        {
-            if (bLocal)
-            {
-                pRet = SingleChangeBroadcaster_Impl::create( NotifierSet::value_type(rNotifierImpl,pTreeImpl), aLocation);
-            }
-            else
-            {
-                NotifierSet::value_type aAffectedNotifier( findNotifier(aLocation, pTreeImpl) );			
-                if (aAffectedNotifier.second.is()) // only if we found a notifier we are able to create a broadcaster (DG)
-                    pRet = SingleChangeBroadcaster_Impl::create( aAffectedNotifier, aLocation);
-            }
-        }
-        else
-        {
-            OSL_ENSURE(false, "Invalid change location set in node change - cannot broadcast");
-            // can't create a matching change - must still create an empty one
-        }
-
-        if (pRet.isEmpty())
-            pRet = EmptyBroadcaster_Impl::create( NotifierSet::value_type(rNotifierImpl,pTreeImpl) );
-
-        return pRet;
-    }
-// ---------------------------------------------------------------------------------------------------
-    
-    vos::ORef< Broadcaster::Impl > Broadcaster::Impl::create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChanges const& aChanges, bool bLocal)
-    {
-        NotifierSet::value_type aRootData(rNotifierImpl, pTreeImpl);
-
-        configuration::NodeChangesInformation aChangeInfos;
-        if (aChanges.getChangesInfos(aChangeInfos))
-        {
-            return create(rNotifierImpl,pTreeImpl,aChangeInfos,bLocal);
-        }
-        else
-        {
-            OSL_ENSURE(aChanges.isEmpty(), "Cannot get information for changes - cannot notify");
-
-            // make an empty one below
-            vos::ORef< Broadcaster::Impl > pRet = EmptyBroadcaster_Impl::create( aRootData );
-
-            return pRet;
-        }
-
-    }
-// ---------------------------------------------------------------------------------------------------
-
-    vos::ORef< Broadcaster::Impl > Broadcaster::Impl::create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChangeInformation const& aChange, bool bLocal)
-    {
-        OSL_ASSERT(pTreeImpl.is());
-
-        vos::ORef< Broadcaster::Impl > pRet;
-
-        if (aChange.hasValidLocation())
-        {
-            if (bLocal)
-            {
-                pRet = SingleChangeBroadcaster_Impl::create( NotifierSet::value_type(rNotifierImpl,pTreeImpl), aChange.location);
-            }
-            else
-            {
-                NotifierSet::value_type aAffectedNotifier( findNotifier(aChange.location, pTreeImpl) );			
-                if (aAffectedNotifier.second.is()) // only if we found a notifier we are able to create a broadcaster (DG)
-                    pRet = SingleChangeBroadcaster_Impl::create( aAffectedNotifier, aChange.location);
-            }
-        }
-        else
-        {
-            OSL_ENSURE(false, "Invalid change location set in node change - cannot broadcast");
-            // can't create a matching change - must still create an empty one
-        }
-
-        if (pRet.isEmpty())
-            pRet = EmptyBroadcaster_Impl::create( NotifierSet::value_type(rNotifierImpl,pTreeImpl) );
-
-        return pRet;
-    }
-// ---------------------------------------------------------------------------------------------------
-    
-    vos::ORef< Broadcaster::Impl > Broadcaster::Impl::create(vos::ORef<NotifierImpl> const& rNotifierImpl, ApiTreeRef const& pTreeImpl, configuration::NodeChangesInformation const& aChanges, bool bLocal)
-    {
-        vos::ORef< Broadcaster::Impl > pRet;
-
-        NotifierSet::value_type aRootData(rNotifierImpl, pTreeImpl);
-
-        if (aChanges.size() == 1)
-        {
-            pRet = create(rNotifierImpl, pTreeImpl, *aChanges.begin(), bLocal);
-        }
-        else if (bLocal)
-        {
-            pRet = MultiChangeBroadcaster_Impl::create( aRootData, aChanges);
-        }
-        else 
-        {
-            NotifierSet aNotifiers;
-            findNotifiers( aNotifiers, aChanges, pTreeImpl);
-
-            if (aNotifiers.size() > 1)
-            {
-                pRet = MultiTreeBroadcaster_Impl::create(aRootData, aNotifiers, aChanges);
-            }
-            else if (!aNotifiers.empty())
-            {
-                pRet = SingleTreeBroadcaster_Impl::create(aRootData, *aNotifiers.begin(), aChanges);
-            }
-            // else: empty
-        }
-
-        if (pRet.isEmpty())
-            pRet = EmptyBroadcaster_Impl::create( aRootData );
-
-        return pRet;
-    }
-// ---------------------------------------------------------------------------------------------------
-    
-       bool Broadcaster::Impl::translateChanges(configuration::NodeChangesInformation& _rInfos, configuration::NodeChanges const& aChanges, bool /*bSingleBase*/) const
-    {
-        rtl::Reference< configuration::Tree > aBaseTree = m_aNotifierData.second->getTree();
-        Factory& rFactory = m_aNotifierData.second->getFactory();
-
-        configuration::NodeChangesInformation aRawInfos;
-
-        sal_uInt32 nChanges = aChanges.getChangesInfos(aRawInfos);
-
-        OSL_ENSURE(nChanges, "Cannot get info(s) for change - skipping for notification");
-        OSL_ENSURE(nChanges == aRawInfos.size(), "Incorrect change count returned");
-
-        configuration::NodeChangesInformation aNewInfos;
-        aNewInfos.reserve(nChanges);
-
-        for (std::vector< configuration::NodeChangeInformation >::const_iterator pos = aRawInfos.begin(); pos != aRawInfos.end(); ++pos)
-        {
-            configuration::NodeChangeInformation aInfo = *pos;
-            if( !configapi::rebaseChange(aInfo.location,aBaseTree) )	
-            {
-                OSL_TRACE("Change is not within expected tree - skipping for notification");
-                continue;
-            }
-        
-            OSL_ENSURE(!pos->isEmptyChange(), "Empty Change Found for Notification");
-            // it actually is expected that elements may not be found - thus ignoring result
-            configapi::resolveToUno(aInfo.change, rFactory);
-            
-            aNewInfos.push_back( aInfo );
-        }
-        
-        aNewInfos.swap(_rInfos);
-
-        return !_rInfos.empty();
-    }
-
-// ---------------------------------------------------------------------------------------------------
-
-       bool Broadcaster::Impl::translateChanges(configuration::NodeChangesInformation& aInfos, configuration::NodeChangesInformation const& aChanges, bool /*bSingleBase*/) const
-    {
-        configuration::NodeChangesInformation aNewInfos;
-        aNewInfos.reserve( aChanges.size() );
-
-        rtl::Reference< configuration::Tree > aBaseTree = m_aNotifierData.second->getTree();
-        Factory& rFactory = m_aNotifierData.second->getFactory();
-
-        for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != aChanges.end(); ++it)
-        {
-            configuration::NodeChangeInformation aInfo(*it);
-            if( !configapi::rebaseChange(aInfo.location,aBaseTree) )	
-            {
-                OSL_TRACE("Change is not within expected tree - skipping for notification");
-                continue;
-            }
-
-            if( !configapi::resolveToUno(aInfo.change,rFactory) )
-            {
-                // it actually is expected that elements may not be found
-                // OSL_TRACE("Cannot find affected elements of Change");
-            }
-
-            aNewInfos.push_back( aInfo );
-        }
-        
-        aNewInfos.swap(aInfos);
-        return !aInfos.empty();
-    }
-
-// ---------------------------------------------------------------------------------------------------
-    void Broadcaster::Impl::notifyRootListeners(configuration::NodeChangesInformation const& aChanges)
-    {
-        if (aChanges.empty()) return;
-
-        ApiTreeRef pRootTree( m_aNotifierData.second->getRootTreeImpl() );
-        if (pRootTree.is())
-        {
-            vos::ORef<NotifierImpl> aRootNotifier = BroadcasterHelper::getImpl(pRootTree->getNotifier());
-            if (aRootNotifier.isValid())
-            {
-                uno::Reference< css::util::XChangesListener > const * const pSelect = 0;
-
-                configuration::NodeID aNotifiedNode = makeRootID( pRootTree );
-
-                if (cppu::OInterfaceContainerHelper* pContainer = aRootNotifier->m_aListeners.getContainer(aNotifiedNode.toIndex(), ::getCppuType(pSelect)) )
-                {
-                    css::util::ChangesEvent aEvent;
-                    aEvent.Source = pRootTree->getUnoInstance();
-
-                    uno::Reference<uno::XInterface> xBaseInstance = m_aNotifierData.second->getUnoInstance();
-                    aEvent.Base <<= xBaseInstance;
-
-                    // translate and collect the changes
-                    aEvent.Changes.realloc(aChanges.size());
-                    css::util::ElementChange* pChange = aEvent.Changes.getArray();
-
-                    for (std::vector< configuration::NodeChangeInformation >::const_iterator it = aChanges.begin(); it != aChanges.end(); ++it)
-                    {
-                        fillChangeFromResolved(*pChange, *it);
-                        ++pChange;
-                    }
-
-                    // now notify
-                    ListenerContainerIterator< css::util::XChangesListener > aIter(*pContainer);
-
-                    UnoApiLockReleaser aGuardReleaser;
-                    while (aIter.hasMoreElements())
-                        try { aIter.next()->changesOccurred(aEvent); } catch (uno::Exception & ) {}
-                }
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------------------------------
-// class Broadcaster
-// ---------------------------------------------------------------------------------------------------
-Broadcaster::Broadcaster(Notifier const& aNotifier, configuration::NodeChange const& aChange, bool bLocal)
-: m_pImpl( Impl::create(aNotifier.m_aImpl,ApiTreeRef(aNotifier.m_pTree),aChange,bLocal) )
-{
-    OSL_ASSERT(m_pImpl.isValid());
-}
-// ---------------------------------------------------------------------------------------------------
-Broadcaster::Broadcaster(Notifier const& aNotifier, configuration::NodeChanges const& aChanges, bool bLocal)
-: m_pImpl( Impl::create(aNotifier.m_aImpl,ApiTreeRef(aNotifier.m_pTree),aChanges,bLocal) )
-{
-    OSL_ASSERT(m_pImpl.isValid());
-}
-// ---------------------------------------------------------------------------------------------------
-Broadcaster::Broadcaster(Notifier const& aNotifier, configuration::NodeChangesInformation const& aChanges, bool bLocal)
-: m_pImpl( Impl::create(aNotifier.m_aImpl,ApiTreeRef(aNotifier.m_pTree),aChanges,bLocal) )
-{
-    OSL_ASSERT(m_pImpl.isValid());
-}
-// ---------------------------------------------------------------------------------------------------
-
-Broadcaster::Broadcaster(Broadcaster const& aOther)
-: m_pImpl(aOther.m_pImpl)
-{
-    OSL_ASSERT(m_pImpl.isValid());
-}
-// ---------------------------------------------------------------------------------------------------
-
-Broadcaster::~Broadcaster()
-{
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Broadcaster::queryConstraints(configuration::NodeChange const& aChange) throw(beans::PropertyVetoException)
-{
-    OSL_ENSURE(aChange.isChange(),"Constraint query without a change !");
-
-    configuration::NodeChanges aChanges;
-    aChanges.add(aChange);
-    this->queryConstraints(aChanges,true);
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Broadcaster::queryConstraints(configuration::NodeChanges const& aChanges, bool bSingleBase) throw(beans::PropertyVetoException)
-{
-    OSL_ENSURE(!aChanges.isEmpty(),"Constraint query without a change !");
-        
-    try
-    {
-        configuration::NodeChangesInformation aInfos;
-        if (m_pImpl->translateChanges(aInfos,aChanges,bSingleBase))
-        {
-            m_pImpl->queryConstraints(aInfos);
-        }
-    }
-    catch (beans::PropertyVetoException & )
-    {
-        throw;
-    }
-    catch (uno::Exception & )
-    {
-        OSL_ENSURE(false, "configmgr::Broadcaster: Unexpected UNO exception in notifyListeners");
-    }
-    catch (configuration::Exception & )
-    {
-        OSL_ENSURE(false, "configmgr::Broadcaster: Unexpected internal exception in notifyListeners");
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Broadcaster::notifyListeners(configuration::NodeChange const& aChange) throw()
-{
-    OSL_ENSURE(aChange.isChange(),"Notifying without a change !");
-
-    configuration::NodeChanges aChanges;
-    aChanges.add(aChange);
-    this->notifyListeners(aChanges, true);
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Broadcaster::notifyListeners(configuration::NodeChanges const& aChanges, bool bSingleBase) throw()
-{
-    OSL_ENSURE(!aChanges.isEmpty(),"Notifying without a change !");
-
-    try
-    {
-        configuration::NodeChangesInformation aInfos;
-        if (m_pImpl->translateChanges(aInfos,aChanges, bSingleBase))
-        {
-            m_pImpl->notifyListeners(aInfos);
-            m_pImpl->notifyRootListeners(aInfos);
-        }
-    }
-    catch (uno::Exception & )
-    {
-        OSL_ENSURE(false, "configmgr::Broadcaster: Unexpected UNO exception in notifyListeners");
-    }
-    catch (configuration::Exception & )
-    {
-        OSL_ENSURE(false, "configmgr::Broadcaster: Unexpected internal exception in notifyListeners");
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Broadcaster::notifyListeners(configuration::NodeChangesInformation const& aChanges, bool bSingleBase) throw()
-{
-    OSL_ENSURE(!aChanges.empty(),"Notifying without a change !");
-
-    try
-    {
-        configuration::NodeChangesInformation aInfos;
-        if (m_pImpl->translateChanges(aInfos,aChanges, bSingleBase))
-        {
-            m_pImpl->notifyListeners(aInfos);
-            m_pImpl->notifyRootListeners(aInfos);
-        }
-    }
-    catch (uno::Exception & )
-    {
-        OSL_ENSURE(false, "configmgr::Broadcaster: Unexpected UNO exception in notifyListeners");
-    }
-    catch (configuration::Exception & )
-    {
-        OSL_ENSURE(false, "configmgr::Broadcaster: Unexpected internal exception in notifyListeners");
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/api2/broadcaster.hxx b/configmgr/source/api2/broadcaster.hxx
deleted file mode 100644
index 280e894bc2..0000000000
--- a/configmgr/source/api2/broadcaster.hxx
+++ /dev/null
@@ -1,91 +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: broadcaster.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 CONFIGMGR_API_BROADCASTER_HXX_
-#define CONFIGMGR_API_BROADCASTER_HXX_
-
-#include <com/sun/star/beans/PropertyVetoException.hpp>
-
-#include <vos/ref.hxx>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-// ---------------------------------------------------------------------------------------------------
-        class NodeChange;
-        class NodeChanges;
-        class NodeChangeInformation;
-        class NodeChangesInformation;
-    }
-// ---------------------------------------------------------------------------------------------------
-    namespace configapi
-    {
-        class Notifier;
-
-        namespace css = ::com::sun::star;
-// ---------------------------------------------------------------------------------------------------
-
-        /// broadcasts events for changes to a single config node or several sibling nodes
-        class Broadcaster
-        {
-        public:
-            /// construct a broadcaster
-            Broadcaster(Notifier const& aNotifier, configuration::NodeChange const& aChange, bool bLocal);
-            Broadcaster(Notifier const& aNotifier, configuration::NodeChanges const& aChanges, bool bLocal);
-            Broadcaster(Notifier const& aNotifier, configuration::NodeChangesInformation const& aChanges, bool bLocal);
-            Broadcaster(Broadcaster const& aOther);
-            ~Broadcaster();
-
-            /// give all property veto listeners on the affected node a chance to veto 
-            void queryConstraints(configuration::NodeChange const& aChange) throw(css::beans::PropertyVetoException);
-            /// give all property veto listeners on any of the affected nodes a chance to veto 
-            void queryConstraints(configuration::NodeChanges const& aChanges, bool bSingleBase = true) throw(css::beans::PropertyVetoException);
-
-            /// notify all listeners which are affected by this change  
-            void notifyListeners(configuration::NodeChange const& aChange) throw();
-            /// notify all listeners which are affected by any of these changes (potentially from many different bases)
-            void notifyListeners(configuration::NodeChanges const& aChanges, bool bSingleBase) throw();
-            /// notify all listeners which are affected by any of these changes (potentially from many different bases)
-            void notifyListeners(configuration::NodeChangesInformation const& aChanges, bool bSingleBase = false) throw();
-            
-            class Impl;
-        private:
-            vos::ORef<Impl> m_pImpl;			
-        private:
-            void operator=(Broadcaster const& aOther);
-        };
-
-// ---------------------------------------------------------------------------------------------------
-
-    }
-}
-
-#endif // CONFIGMGR_API_BROADCASTER_HXX_
diff --git a/configmgr/source/api2/committer.cxx b/configmgr/source/api2/committer.cxx
deleted file mode 100644
index ffbd3bebe6..0000000000
--- a/configmgr/source/api2/committer.cxx
+++ /dev/null
@@ -1,133 +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: committer.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_configmgr.hxx"
-#include <stdio.h>
-#include "committer.hxx"
-#include "apitreeimplobj.hxx"
-#include "providerimpl.hxx"
-#include "roottree.hxx"
-#include "treechangelist.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-namespace
-{
-    //-------------------------------------------------------------------------
-    struct NotifyDisabler
-    {
-        ApiRootTreeImpl& m_rTree;
-        bool m_bOldState;
-
-        NotifyDisabler(ApiRootTreeImpl& rTree)
-        : m_rTree(rTree)
-        , m_bOldState(rTree .enableNotification(false) )
-        {
-        }
-
-        ~NotifyDisabler()
-        {
-            m_rTree.enableNotification(m_bOldState);
-        }
-    };
-    //-------------------------------------------------------------------------
-}
-
-//-----------------------------------------------------------------------------
-// class Committer
-//-----------------------------------------------------------------------------
-
-Committer::Committer(ApiRootTreeImpl& rTree)
-: m_rTree(rTree)
-{}
-//-----------------------------------------------------------------------------
-            
-OProviderImpl * Committer::getUpdateProvider()
-{
-    return &m_rTree.getApiTree().getProvider().getProviderImpl();
-}
-
-//-----------------------------------------------------------------------------
-void Committer::commit()
-{
-    ApiTreeImpl& rApiTree = m_rTree.getApiTree();
-    
-    OSL_PRECOND(!m_rTree.getLocation().isRoot(),"INTERNAL ERROR: Empty location used.");
-    OSL_PRECOND(m_rTree.getOptions().isValid(),"INTERNAL ERROR: Invalid Options used.");
-
-    if (!m_rTree.getOptions().isValid()) return;
-
-    RequestOptions aOptions = m_rTree.getOptions()->getRequestOptions();
-
-    OProviderImpl * pUpdateProvider = getUpdateProvider();
-    OSL_ASSERT(pUpdateProvider);
-
-    rtl::Reference< configuration::Tree > aTree( rApiTree.getTree());
-    if (!aTree->hasChanges()) return;	
-    
-    TreeChangeList	aChangeList(aOptions,
-                    aTree->getRootPath(),
-                    aTree->getAttributes(aTree->getRootNode()));	
-
-    // now do the commit
-    configuration::CommitHelper	aHelper(rApiTree.getTree());
-    if (aHelper.prepareCommit(aChangeList))
-    try
-    {
-        pUpdateProvider->updateTree(aChangeList);
-
-        aHelper.finishCommit(aChangeList);
-
-        NotifyDisabler  aDisableNotify(m_rTree);        // do not notify self
-        pUpdateProvider->saveAndNotifyUpdate(aChangeList);
-    }
-    catch(...)
-    {
-        // should be a special clean-up routine, but for now we just need a consistent state
-        try
-        {
-            aHelper.failedCommit(aChangeList);
-        }
-        catch(configuration::Exception&)
-        {
-            OSL_ENSURE(false, "Cleanup really should not throw");
-        }
-        throw;
-    }
-}
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/api2/committer.hxx b/configmgr/source/api2/committer.hxx
deleted file mode 100644
index 88011297c3..0000000000
--- a/configmgr/source/api2/committer.hxx
+++ /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: committer.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 CONFIGMGR_API_COMMITTER_HXX_
-#define CONFIGMGR_API_COMMITTER_HXX_
-
-namespace configmgr
-{
-    class OProviderImpl;
-//-----------------------------------------------------------------------------
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-
-        class ApiRootTreeImpl;
-//-----------------------------------------------------------------------------
-
-        /// allows to update values of a simple type within a <type>NodeRef</type> that refers to a Group
-        class Committer 
-        {
-            ApiRootTreeImpl& m_rTree;
-        public:
-            Committer(ApiRootTreeImpl& rTree);
-
-            void commit();
-        private:
-            OProviderImpl * getUpdateProvider();
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_API_COMMITTER_HXX_
diff --git a/configmgr/source/api2/confignotifier.cxx b/configmgr/source/api2/confignotifier.cxx
deleted file mode 100644
index 59413e0f4c..0000000000
--- a/configmgr/source/api2/confignotifier.cxx
+++ /dev/null
@@ -1,246 +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: confignotifier.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_configmgr.hxx"
-
-#include "confignotifier.hxx"
-
-#include "notifierimpl.hxx"
-#include "broadcaster.hxx"
-
-#include "noderef.hxx"
-#include "valueref.hxx"
-#include "nodechange.hxx"
-
-#include "apinodeaccess.hxx"
-#include "apitreeaccess.hxx"
-#include "apitreeimplobj.hxx"
-
-#include <set>
-#include <functional>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-// ---------------------------------------------------------------------------------------------------
-// class Notifier (-Impl)
-// ---------------------------------------------------------------------------------------------------
-
-Notifier::Notifier(vos::ORef<NotifierImpl> const& aImpl,ApiTreeImpl const* pTree)
-: m_aImpl(aImpl)
-, m_pTree(pTree)
-{
-    OSL_ENSURE(aImpl.isValid(),"Invalid initialization of a Notifier: No impl");
-    OSL_ENSURE(pTree,"Invalid initialization of a Notifier: No tree");
-}
-// ---------------------------------------------------------------------------------------------------
-
-Notifier::Notifier(Notifier const& aOther)
-: m_aImpl(aOther.m_aImpl)
-, m_pTree(aOther.m_pTree)
-{
-}
-// ---------------------------------------------------------------------------------------------------
-
-Notifier::~Notifier()
-{
-}
-// ---------------------------------------------------------------------------------------------------
-
-Broadcaster Notifier::makeBroadcaster(configuration::NodeChange const& aChange, bool bLocal) const
-{
-    return Broadcaster(*this,aChange,bLocal);
-}
-// ---------------------------------------------------------------------------------------------------
-
-Broadcaster Notifier::makeBroadcaster(configuration::NodeChanges const& aChanges, bool bLocal) const	
-{
-    OSL_ENSURE(!aChanges.isEmpty(),"Creating broadcaster for no changes");
-    return Broadcaster(*this,aChanges,bLocal);
-}
-// ---------------------------------------------------------------------------------------------------
-
-NotifierImpl::NotifierImpl(rtl::Reference< configuration::Tree > const& aTree)
-: m_aListeners(aTree->nodeCount(), SubNodeToIndex(aTree))
-{
-}
-// ---------------------------------------------------------------------------------------------------
-
-NotifierImpl::~NotifierImpl()
-{
-}
-
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::add(configuration::NodeRef const& aNode, uno::Reference< css::lang::XEventListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->add( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::add(configuration::NodeRef const& aNode, uno::Reference< css::container::XContainerListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->add( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::add(configuration::NodeRef const& aNode, uno::Reference< css::util::XChangesListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->add( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::addForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->addForAll( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::addForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener, rtl::OUString const& aName) const
-{
-    if (xListener.is())
-        m_aImpl->addNamed( configuration::SubNodeID(m_pTree->getTree(),aNode, aName), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::addForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->addForAll( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::addForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener, rtl::OUString const& aName) const
-{
-    if (xListener.is())
-        m_aImpl->addNamed( configuration::SubNodeID(m_pTree->getTree(),aNode, aName), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::add(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener, uno::Sequence<rtl::OUString> const& aNames) const
-{
-    if (xListener.is())
-    {
-        if (aNames.getLength() > 0)
-            m_aImpl->add( configuration::NodeID(m_pTree->getTree(),aNode), xListener, aNames);
-        else
-            m_aImpl->add( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::remove(configuration::NodeRef const& aNode, uno::Reference< css::lang::XEventListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->remove( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::remove(configuration::NodeRef const& aNode, uno::Reference< css::container::XContainerListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->remove( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::remove(configuration::NodeRef const& aNode, uno::Reference< css::util::XChangesListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->remove( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::removeForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->removeForAll( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::removeForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener, rtl::OUString const& aName) const
-{
-    if (xListener.is())
-        m_aImpl->removeNamed( configuration::SubNodeID(m_pTree->getTree(),aNode, aName), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::removeForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->removeForAll( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::removeForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener, rtl::OUString const& aName) const
-{
-    if (xListener.is())
-        m_aImpl->removeNamed( configuration::SubNodeID(m_pTree->getTree(),aNode, aName), xListener );
-}
-// ---------------------------------------------------------------------------------------------------
-
-void Notifier::remove(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener) const
-{
-    if (xListener.is())
-        m_aImpl->remove( configuration::NodeID(m_pTree->getTree(),aNode), xListener );
-}
-
-// ---------------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------------
-
-DisposeGuardImpl::DisposeGuardImpl(Notifier const&) throw()
-{
-}
-// ---------------------------------------------------------------------------------------------------
-DisposeGuardImpl::~DisposeGuardImpl() throw ()
-{
-}
-// ---------------------------------------------------------------------------------------------------
-GuardedNotifier::GuardedNotifier(NodeAccess& rNode) throw()
-: m_aNotifier(rNode.getNotifier())
-, m_aImpl(m_aNotifier)
-{
-}
-// ---------------------------------------------------------------------------------------------------
-
-DisposeGuard::DisposeGuard(NodeAccess& rNode) throw(css::lang::DisposedException)
-: m_aImpl(rNode.getNotifier())
-{
-    rNode.checkAlive();
-}
-// ---------------------------------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/api2/confignotifier.hxx b/configmgr/source/api2/confignotifier.hxx
deleted file mode 100644
index bd1c121db2..0000000000
--- a/configmgr/source/api2/confignotifier.hxx
+++ /dev/null
@@ -1,200 +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: confignotifier.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 CONFIGMGR_CONFIGNOTIFIER_HXX_
-#define CONFIGMGR_CONFIGNOTIFIER_HXX_
-
-#include "configexcept.hxx"
-#include "configpath.hxx"
-#include "datalock.hxx"
-#include "utility.hxx"
-#include <boost/utility.hpp>
-#include <vos/ref.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-namespace com { namespace sun { namespace star {
-    namespace beans 
-    { 
-        class XPropertyChangeListener; 
-        class XVetoableChangeListener; 
-        class XPropertiesChangeListener; 
-        class PropertyVetoException; 
-    }
-    namespace lang		
-    { 
-        class XEventListener; 
-        struct EventObject; 
-    }
-    namespace container { class XContainerListener; }
-    namespace util		{ class XChangesListener; }
-    namespace uno		{ class RuntimeException; }
-} } }
-namespace osl { class Mutex; }
-
-namespace configmgr
-{
-    namespace configuration
-    {
-// ---------------------------------------------------------------------------------------------------
-        class NodeRef;
-        class ValueRef;
-        class NodeChange;
-        class NodeChanges;
-    }
-// ---------------------------------------------------------------------------------------------------
-    namespace configapi
-    {
-// ---------------------------------------------------------------------------------------------------
-        class Broadcaster;
-        class NotifierImpl;
-        class ApiTreeImpl;
-
-        namespace css = ::com::sun::star;
-// ---------------------------------------------------------------------------------------------------
-        /// manages collections of event listeners observing a config tree, thread-safe
-        class Notifier
-        {
-            friend class Broadcaster;
-            friend class BroadcasterHelper;
-            vos::ORef<NotifierImpl> 			m_aImpl;
-            ApiTreeImpl const*const	m_pTree;
-        public:
-            /// construct this around the given Implementation, for the given tree
-            explicit Notifier(vos::ORef<NotifierImpl> const & aImpl, ApiTreeImpl const* pTree);
-            Notifier(Notifier const& aOther);
-            ~Notifier();
-
-        // ---------------------------------------------------------------------------------------------------
-            /// create a broadcaster for a single change (either local or (possibly) nested)
-            Broadcaster makeBroadcaster(configuration::NodeChange const& aChange, bool bLocal) const;		
-            /// create a broadcaster for a collection of changes (either local or (possibly) nested)
-            Broadcaster makeBroadcaster(configuration::NodeChanges const& aChange, bool bLocal) const;		
-
-        // ---------------------------------------------------------------------------------------------------
-            bool checkAlive(uno::XInterface* pObject) const throw(css::lang::DisposedException);
-            
-        // ---------------------------------------------------------------------------------------------------
-            /// Add a <type scope='com::sun::star::lang'>XEventListener</type> observing <var>aNode</var>.
-            void add(configuration::NodeRef const& aNode, uno::Reference< css::lang::XEventListener > const& xListener) const;
-
-            /// Add a <type scope='com::sun::star::container'>XContainerListener</type> observing <var>aNode</var>.
-            void add(configuration::NodeRef const& aNode, uno::Reference< css::container::XContainerListener > const& xListener) const;
-
-            /// Add a <type scope='com::sun::star::util'>XChangesListener</type> observing <var>aNode</var> and its descendants.
-            void add(configuration::NodeRef const& aNode, uno::Reference< css::util::XChangesListener > const& xListener) const;
-
-            /// Add a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing all children of <var>aNode</var>.
-            void addForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener) const;
-            /// Add a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing only the child named <var>aName</var> of <var>aNode</var>.
-            void addForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener, rtl::OUString const& aName) const;
-            /// Add a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining all children of <var>aNode</var>.
-            void addForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener) const;
-            /// Add a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining only the child named <var>aName</var> of <var>aNode</var>.
-            void addForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener, rtl::OUString const& aName) const;
-
-            /** Add a <type scope='com::sun::star::beans'>XPropertiesChangeListener</type> 
-                observing the properties of <var>aNode</var> (optimally only those given by <var>aNames</var>.
-            */
-            void add(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener, uno::Sequence<rtl::OUString> const& aNames) const;
-
-        // ---------------------------------------------------------------------------------------------------
-            /// Remove a <type scope='com::sun::star::lang'>XEventListener</type> observing <var>aNode</var>.
-            void remove(configuration::NodeRef const& aNode, uno::Reference< css::lang::XEventListener > const& xListener) const;
-
-            /// Remove a <type scope='com::sun::star::container'>XContainerListener</type> observing <var>aNode</var>.
-            void remove(configuration::NodeRef const& aNode, uno::Reference< css::container::XContainerListener > const& xListener) const;
-
-            /// Remove a <type scope='com::sun::star::util'>XChangesListener</type> observing <var>aNode</var> and its descendants.
-            void remove(configuration::NodeRef const& aNode, uno::Reference< css::util::XChangesListener > const& xListener) const;
-
-            /// Remove a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing <var>aNode</var>.
-            void removeForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener) const;
-            /// Remove a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing the child named <var>aName</var> of <var>aNode</var>.
-            void removeForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener, rtl::OUString const& aName) const;
-            /// Remove a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining <var>aNode</var>.
-            void removeForAll(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener) const;
-            /// Remove a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining the child named <var>aName</var> of <var>aNode</var>.
-            void removeForOne(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener, rtl::OUString const& aName) const;
-
-            /// Remove a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining <var>aNode</var>.
-            void remove(configuration::NodeRef const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener) const;
-            /** Remove a <type scope='com::sun::star::beans'>XPropertiesChangeListener</type> 
-                observing any properties of <var>aNode</var>.
-            */
-            void remove(configuration::NodeRef const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener) const;
-        // ---------------------------------------------------------------------------------------------------
-        private:
-            void operator=(Notifier const& aOther);
-        };
-// ---------------------------------------------------------------------------------------------------
-
-// Thin Wrappers around Notifiers: Provide guarding and convenient access
-    // Guarding and locking implementations
-        class NodeAccess;
-        class TreeElement;
-
-        ///  guards a NodeAccess; provides a simple lock for non-data access, does not check for disposed state
-        class DisposeGuardImpl: private boost::noncopyable
-        {
-        public:
-            DisposeGuardImpl(Notifier const& rNotifier) throw();
-            ~DisposeGuardImpl() throw ();
-        };
-
-        /// wraps a Notifier (from a node or tree); provides a simple lock for notifier access, does not check for disposed state
-        class GuardedNotifier
-        {	
-            UnoApiLock          m_aLock;
-            Notifier			m_aNotifier;
-            DisposeGuardImpl	m_aImpl;
-        public:
-            GuardedNotifier(NodeAccess& rNode) throw();
-        public:
-            Notifier const&	get()		 const	{ return m_aNotifier; }
-
-            Notifier const&	operator *() const	{ return  get(); }
-            Notifier const*	operator->() const	{ return &get(); }
-        };
-
-        /// guards a Node or Tree provides a simple lock for non-data access, does (!) check for disposed state
-        class DisposeGuard
-        {
-            DisposeGuardImpl	m_aImpl;
-            UnoApiLock          m_aLock;
-        public:
-            DisposeGuard(NodeAccess& rNode) throw(css::lang::DisposedException);
-        };
-
-// ---------------------------------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGNOTIFIER_HXX_
diff --git a/configmgr/source/api2/elementaccess.cxx b/configmgr/source/api2/elementaccess.cxx
deleted file mode 100644
index cb497a7a51..0000000000
--- a/configmgr/source/api2/elementaccess.cxx
+++ /dev/null
@@ -1,489 +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: elementaccess.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_configmgr.hxx"
-
-#include "elementaccess.hxx"
-
-#include "elementimpl.hxx"
-#include "apinotifierimpl.hxx"
-
-#include "apitreeaccess.hxx"
-
-//-----------------------------------------------------------------------------------
-namespace configmgr
-{
-//-----------------------------------------------------------------------------------
-
-    namespace uno = com::sun::star::uno;
-
-//-----------------------------------------------------------------------------------
-// XInterface (but not method queryInterface)
-//-----------------------------------------------------------------------------------
-
-// acuire doesn't really do anything but forward. OTOH it should always be overridden when release() is
-void SAL_CALL BasicInnerElement	::acquire() throw() { cppu::WeakImplHelper3< css::container::XChild, css::container::XNamed, css::lang::XServiceInfo >::acquire(); }
-void SAL_CALL BasicSetElement	::acquire() throw() { cppu::WeakImplHelper6< css::container::XChild, css::container::XNamed, css::lang::XComponent, css::lang::XServiceInfo, css::configuration::XTemplateInstance, css::lang::XUnoTunnel >::acquire(); }
-void SAL_CALL BasicRootElement	::acquire() throw() { cppu::WeakImplHelper5< css::container::XNamed, css::util::XChangesNotifier, css::lang::XComponent, css::lang::XServiceInfo, css::lang::XLocalizable >::acquire(); }
-void SAL_CALL BasicUpdateElement::acquire() throw() { cppu::WeakImplHelper6< css::container::XNamed, css::util::XChangesNotifier, css::lang::XComponent, css::lang::XServiceInfo, css::lang::XLocalizable, css::util::XChangesBatch >::acquire(); }
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicInnerElement::release() throw() 
-{
-    // FIXME: this looks highly flaky wrt. weak-refs etc.
-    bool bLastRef = (1 == m_refCount);
-    if (bLastRef)
-    {
-        UnoApiLock::acquire();
-        configapi::implDisposeObject( getNodeAccess(), getElementClass() );
-    }
-    cppu::WeakImplHelper3< css::container::XChild, css::container::XNamed, css::lang::XServiceInfo >::release();
-    if (bLastRef)
-        UnoApiLock::release();
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicSetElement::release() throw() 
-{
-    // FIXME: this looks highly flaky wrt. weak-refs etc.
-    bool bLastRef = (1 == m_refCount);
-    if (bLastRef)
-    {
-        UnoApiLock::acquire();
-        configapi::implDisposeObject( getNodeAccess(), getElementClass() );
-    }
-    cppu::WeakImplHelper6< css::container::XChild, css::container::XNamed, css::lang::XComponent, css::lang::XServiceInfo, css::configuration::XTemplateInstance, css::lang::XUnoTunnel >::release();
-    if (bLastRef)
-        UnoApiLock::release();
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicRootElement::release() throw() 
-{
-    // FIXME: this looks highly flaky wrt. weak-refs etc.
-    bool bLastRef = (1 == m_refCount);
-    if (bLastRef)
-    {
-        UnoApiLock::acquire();
-        configapi::implDisposeObject( getNodeAccess(), getElementClass() );
-    }
-    cppu::WeakImplHelper5< css::container::XNamed, css::util::XChangesNotifier, css::lang::XComponent, css::lang::XServiceInfo, css::lang::XLocalizable >::release();
-    if (bLastRef)
-        UnoApiLock::release();
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::release() throw() 
-{
-    // FIXME: this looks highly flaky wrt. weak-refs etc.
-    bool bLastRef = (1 == m_refCount);
-    if (bLastRef)
-    {
-        UnoApiLock::acquire();
-        configapi::implDisposeObject( getNodeAccess(), getElementClass() );
-    }
-    cppu::WeakImplHelper6< css::container::XNamed, css::util::XChangesNotifier, css::lang::XComponent, css::lang::XServiceInfo, css::lang::XLocalizable, css::util::XChangesBatch >::release();
-    if (bLastRef)
-        UnoApiLock::release();
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XTypeProvider (but not method getTypes)
-//-----------------------------------------------------------------------------------
-
-uno::Sequence<sal_Int8> SAL_CALL BasicInnerElement::getImplementationId(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationId( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence<sal_Int8> SAL_CALL BasicSetElement::getImplementationId(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationId( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence<sal_Int8> SAL_CALL BasicRootElement::getImplementationId(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationId( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence<sal_Int8> SAL_CALL BasicUpdateElement::getImplementationId(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationId( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XChild (not for root elements)
-//-----------------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL BasicInnerElement::getParent(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetParent( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL BasicSetElement::getParent(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetParent( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicInnerElement::setParent( const uno::Reference< uno::XInterface >& xParent ) 
-    throw(css::lang::NoSupportException, uno::RuntimeException)
-{
-    configapi::implSetParent( getNodeAccess(), getElementClass(), xParent );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicSetElement::setParent( const uno::Reference< uno::XInterface >& xParent ) 
-    throw(css::lang::NoSupportException, uno::RuntimeException)
-{
-    configapi::implSetParent( getNodeAccess(), getElementClass(), xParent );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XNamed
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicInnerElement::getName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicSetElement::getName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicRootElement::getName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicUpdateElement::getName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicInnerElement::setName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-{
-    configapi::implSetName( getNodeAccess(), getElementClass(), aName );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicSetElement::setName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-{
-    configapi::implSetName( getNodeAccess(), getElementClass(), aName );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicRootElement::setName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-{
-    configapi::implSetName( getNodeAccess(), getElementClass(), aName );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::setName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-{
-    configapi::implSetName( getNodeAccess(), getElementClass(), aName );
-}
-//-----------------------------------------------------------------------------------
-    
-//-----------------------------------------------------------------------------------
-// XChangesNotifier
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicRootElement::addChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::addChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicRootElement::removeChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::removeChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XComponent
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicSetElement::dispose(  ) throw(uno::RuntimeException)
-{
-    configapi::implDispose( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicRootElement::dispose(  ) throw(uno::RuntimeException)
-{
-    configapi::implDispose( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::dispose(  ) throw(uno::RuntimeException)
-{
-    configapi::implDispose( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicSetElement::addEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicRootElement::addEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::addEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicSetElement::removeEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicRootElement::removeEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::removeEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNodeAccess(), xListener );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XServiceInfo
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicInnerElement::getImplementationName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicSetElement::getImplementationName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicRootElement::getImplementationName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicUpdateElement::getImplementationName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetImplementationName( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-sal_Bool SAL_CALL BasicInnerElement::supportsService( const rtl::OUString& ServiceName ) throw(uno::RuntimeException)
-{
-    return configapi::implSupportsService( getNodeAccess(), getElementClass(), ServiceName );
-}
-//-----------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BasicSetElement::supportsService( const rtl::OUString& ServiceName ) throw(uno::RuntimeException)
-{
-    return configapi::implSupportsService( getNodeAccess(), getElementClass(), ServiceName );
-}
-//-----------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BasicRootElement::supportsService( const rtl::OUString& ServiceName ) throw(uno::RuntimeException)
-{
-    return configapi::implSupportsService( getNodeAccess(), getElementClass(), ServiceName );
-}
-//-----------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BasicUpdateElement::supportsService( const rtl::OUString& ServiceName ) throw(uno::RuntimeException)
-{
-    return configapi::implSupportsService( getNodeAccess(), getElementClass(), ServiceName );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > SAL_CALL 	BasicInnerElement::getSupportedServiceNames(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetSupportedServiceNames( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence< rtl::OUString > SAL_CALL 	BasicSetElement::getSupportedServiceNames(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetSupportedServiceNames( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence< rtl::OUString > SAL_CALL 	BasicRootElement::getSupportedServiceNames(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetSupportedServiceNames( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence< rtl::OUString > SAL_CALL 	BasicUpdateElement::getSupportedServiceNames(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetSupportedServiceNames( getNodeAccess(), getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-// ONLY set elements
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XTemplateInstance
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicSetElement::getTemplateName( ) throw(uno::RuntimeException)
-{
-    return configapi::implGetTemplateName( getElementClass() );
-}
-
-//-----------------------------------------------------------------------------------
-// XUnoTunnel
-//-----------------------------------------------------------------------------------
-
-sal_Int64 SAL_CALL BasicSetElement::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) 
-    throw(uno::RuntimeException)
-{
-    return configapi::implGetSomething( getElementClass(), aIdentifier);
-}
-
-//-----------------------------------------------------------------------------------
-
-// ONLY root elements
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XLocalizable
-//-----------------------------------------------------------------------------------
-
-css::lang::Locale SAL_CALL 	BasicRootElement::getLocale(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetLocale( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-css::lang::Locale SAL_CALL 	BasicUpdateElement::getLocale(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetLocale( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicRootElement::setLocale( const css::lang::Locale& eLocale ) throw(uno::RuntimeException)
-{
-    configapi::implSetLocale( getElementClass(), eLocale );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::setLocale( const css::lang::Locale& eLocale ) throw(uno::RuntimeException)
-{
-    configapi::implSetLocale( getElementClass(), eLocale );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// XChangesBatch (only on update root)
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateElement::commitChanges(  ) throw(css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implCommitChanges( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BasicUpdateElement::hasPendingChanges(  ) throw(uno::RuntimeException)
-{
-    return configapi::implHasPendingChanges( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Sequence< css::util::ElementChange > SAL_CALL BasicUpdateElement::getPendingChanges(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetPendingChanges( getElementClass() );
-}
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/elementaccess.hxx b/configmgr/source/api2/elementaccess.hxx
deleted file mode 100644
index 8bf73774a2..0000000000
--- a/configmgr/source/api2/elementaccess.hxx
+++ /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: elementaccess.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 CONFIGMGR_API_ELEMENTACCESS_HXX_
-#define CONFIGMGR_API_ELEMENTACCESS_HXX_
-
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/configuration/XTemplateInstance.hpp>
-#include <com/sun/star/lang/XLocalizable.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-//-----------------------------------------------------------------------------
-    namespace configapi 
-    { 
-        class NodeAccess; 
-        class InnerElement;
-        class SetElement;
-        class RootElement;
-        class UpdateRootElement;
-    }
-//-----------------------------------------------------------------------------
-
-    /** implements the interfaces supported by a inner node
-        within the configuration tree that is a plain node (group member).
-        <p> Is an interface adapter around 
-            <type scope='configmgr::configapi'>NodeAccess</type> and
-            <type scope='configmgr::configapi'>InnerElement</type>.</p>
-    */
-    class BasicInnerElement : public cppu::WeakImplHelper3< css::container::XChild, css::container::XNamed, css::lang::XServiceInfo >
-    {
-    protected:
-    // Destructors
-        virtual ~BasicInnerElement() {}
-
-    public:
-    // Interface methods
-        // XInterface ('dispose' management) - partial implementation
-        virtual void SAL_CALL acquire() throw();
-        virtual void SAL_CALL release() throw();
-
-        // XTypeProvider (from implhelper) - partial implementation
-        virtual uno::Sequence<sal_Int8> SAL_CALL 
-            getImplementationId(  ) 
-                throw(uno::RuntimeException);
-
-        // XChild
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            getParent(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL // not supported
-            setParent( const uno::Reference< uno::XInterface >& Parent ) 
-                throw(css::lang::NoSupportException, css::uno::RuntimeException);
-
-        // XNamed
-        virtual rtl::OUString SAL_CALL 
-            getName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL  // not supported (! - missing exception)
-            setName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            supportsService( const rtl::OUString& ServiceName ) 
-                throw(uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw(uno::RuntimeException);
-    
-    protected:
-        virtual configapi::InnerElement& getElementClass() = 0;
-        virtual configapi::NodeAccess& getNodeAccess() = 0;
-    };
-//-----------------------------------------------------------------------------
-
-    /** implements the interfaces supported by a node
-        within the configuration tree that is a set element (or floating free).
-        <p> Is an interface adapter around 
-            <type scope='configmgr::configapi'>NodeAccess</type> and
-            <type scope='configmgr::configapi'>SetElement</type>.</p>
-    */
-    class BasicSetElement : public cppu::WeakImplHelper6< css::container::XChild, css::container::XNamed, css::lang::XComponent, css::lang::XServiceInfo, css::configuration::XTemplateInstance, css::lang::XUnoTunnel >
-    {
-    protected:
-    // Destructors
-        virtual ~BasicSetElement() {}
-
-    public:
-    // Interface methods
-        // XInterface ('dispose' management) - partial implementation
-        virtual void SAL_CALL acquire() throw();
-        virtual void SAL_CALL release() throw();
-
-        // XTypeProvider (from implhelper) - partial implementation
-        virtual uno::Sequence<sal_Int8> SAL_CALL 
-            getImplementationId(  ) 
-                throw(uno::RuntimeException);
-
-        // XChild
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            getParent(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL // currently not supported
-            setParent( const uno::Reference< uno::XInterface >& Parent ) 
-                throw(css::lang::NoSupportException, css::uno::RuntimeException);
-
-        // XNamed
-        virtual rtl::OUString SAL_CALL 
-            getName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL  // generally not supported (! - missing exception)
-            setName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XComponent
-        virtual void SAL_CALL 
-            dispose(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            addEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeEventListener( const uno::Reference< css::lang::XEventListener >& aListener ) 
-                throw(uno::RuntimeException);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            supportsService( const rtl::OUString& ServiceName ) 
-                throw(uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw(uno::RuntimeException);
-    
-        // XTemplateInstance
-        virtual rtl::OUString SAL_CALL 
-            getTemplateName( )
-                throw(uno::RuntimeException);
-
-        // XUnoTunnel
-        virtual sal_Int64 SAL_CALL 
-            getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) 
-                throw(uno::RuntimeException);
-
-    protected:
-        virtual configapi::SetElement& getElementClass() = 0;
-        virtual configapi::NodeAccess& getNodeAccess() = 0;
-    };
-//-----------------------------------------------------------------------------
-
-    /** implements the interfaces supported by a node
-        within the configuration that is the root of a read-only access
-        <p> Is an interface adapter around 
-            <type scope='configmgr::configapi'>NodeAccess</type> and
-            <type scope='configmgr::configapi'>SetElement</type>.</p>
-    */
-    class BasicRootElement : public cppu::WeakImplHelper5< css::container::XNamed, css::util::XChangesNotifier, css::lang::XComponent, css::lang::XServiceInfo, css::lang::XLocalizable >
-    {
-    protected:
-    // Destructors
-        virtual ~BasicRootElement() {}
-
-    public:
-    // Interface methods
-        // XInterface ('dispose' management) - partial implementation
-        virtual void SAL_CALL acquire() throw();
-        virtual void SAL_CALL release() throw();
-
-        // XTypeProvider (from implhelper) - partial implementation
-        virtual uno::Sequence<sal_Int8> SAL_CALL 
-            getImplementationId(  ) 
-                throw(uno::RuntimeException);
-
-        // XNamed
-        virtual rtl::OUString SAL_CALL 
-            getName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL  // generally not supported (! - missing exception)
-            setName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XChangesNotifier
-        virtual void SAL_CALL 
-            addChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        // XComponent
-        virtual void SAL_CALL 
-            dispose(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            addEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeEventListener( const uno::Reference< css::lang::XEventListener >& aListener ) 
-                throw(uno::RuntimeException);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            supportsService( const rtl::OUString& ServiceName ) 
-                throw(uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw(uno::RuntimeException);
-    
-        // XLocalizable
-        virtual css::lang::Locale SAL_CALL 
-            getLocale(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL   // maybe not supported (! - missing exception)
-            setLocale( const css::lang::Locale& eLocale ) 
-                throw(uno::RuntimeException);
-
-    protected:
-        virtual configapi::RootElement& getElementClass() = 0;
-        virtual configapi::NodeAccess& getNodeAccess() = 0;
-    };
-//-----------------------------------------------------------------------------
-
-    /** implements the interfaces supported by a node
-        within the configuration that is the root of an update access
-        <p> Is an interface adapter around 
-            <type scope='configmgr::configapi'>NodeAccess</type> and
-            <type scope='configmgr::configapi'>SetElement</type>.</p>
-    */
-    class BasicUpdateElement : public cppu::WeakImplHelper6< css::container::XNamed, css::util::XChangesNotifier, css::lang::XComponent, css::lang::XServiceInfo, css::lang::XLocalizable, css::util::XChangesBatch >
-    {
-    protected:
-    // Destructors
-        virtual ~BasicUpdateElement() {}
-
-    public:
-    // Interface methods
-        // XInterface ('dispose' management) - partial implementation
-        virtual void SAL_CALL acquire() throw();
-        virtual void SAL_CALL release() throw();
-
-        // XTypeProvider (from implhelper) - partial implementation
-        virtual uno::Sequence<sal_Int8> SAL_CALL 
-            getImplementationId(  ) 
-                throw(uno::RuntimeException);
-
-        // XNamed
-        virtual rtl::OUString SAL_CALL 
-            getName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL  // generally not supported (! - missing exception)
-            setName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XChangesNotifier
-        virtual void SAL_CALL 
-            addChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeChangesListener( const uno::Reference< css::util::XChangesListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        // XComponent
-        virtual void SAL_CALL 
-            dispose(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            addEventListener( const uno::Reference< css::lang::XEventListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeEventListener( const uno::Reference< css::lang::XEventListener >& aListener ) 
-                throw(uno::RuntimeException);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            supportsService( const rtl::OUString& ServiceName ) 
-                throw(uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw(uno::RuntimeException);
-    
-        // XChangesBatch
-        virtual void SAL_CALL 
-            commitChanges(  ) 
-                throw(css::lang::WrappedTargetException, uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasPendingChanges(  ) 
-                throw(uno::RuntimeException);
-
-        virtual uno::Sequence< css::util::ElementChange > SAL_CALL 
-            getPendingChanges(  ) 
-                throw(uno::RuntimeException);
-
-        // XLocalizable
-        virtual css::lang::Locale SAL_CALL 
-            getLocale(  ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL    // maybe not supported (! - missing exception)
-            setLocale( const css::lang::Locale& eLocale ) 
-                throw(uno::RuntimeException);
-
-    protected:
-        virtual configapi::UpdateRootElement& getElementClass() = 0;
-        virtual configapi::NodeAccess& getNodeAccess() = 0;
-    };
-//-----------------------------------------------------------------------------
-}
-#endif // CONFIGMGR_API_ELEMENTACCESS_HXX_
-
-
diff --git a/configmgr/source/api2/elementimpl.cxx b/configmgr/source/api2/elementimpl.cxx
deleted file mode 100644
index 1b6dffcbf2..0000000000
--- a/configmgr/source/api2/elementimpl.cxx
+++ /dev/null
@@ -1,591 +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: elementimpl.cxx,v $
- * $Revision: 1.17.14.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_configmgr.hxx"
-
-#include "elementimpl.hxx"
-#include "apitreeaccess.hxx"
-#include "apinodeaccess.hxx"
-#include "apifactory.hxx"
-#include "noderef.hxx"
-#include "nodechange.hxx"
-#include "nodechangeinfo.hxx"
-#include "translatechanges.hxx"
-#include "apitypes.hxx"
-#include "configset.hxx"
-#include "confignotifier.hxx"
-#include "confsvccomponent.hxx"
-#include "committer.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/configuration/XTemplateContainer.hpp>
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------------
-        namespace lang = css::lang;
-        namespace util = css::util;
-
-//-----------------------------------------------------------------------------------
-
-// Interface methods
-//-----------------------------------------------------------------------------------
-
-// XChild
-//-----------------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > implGetParent(NodeAccess& rNode, InnerElement&) throw(uno::RuntimeException)
-{
-    uno::Reference<uno::XInterface> xRet;
-
-    try
-    {
-        GuardedNodeData<NodeAccess> impl( rNode ); // no provider lock needed - tree must be prebuilt already
-
-        rtl::Reference< configuration::Tree > aTree(impl.getTree());
-        configuration::NodeRef aParentNode = aTree->getParent(impl.getNode());
-
-        uno::Any aAny = configapi::makeInnerElement( rNode.getFactory(), aTree, aParentNode );
-
-        if (!(aAny >>= xRet)) // no parent available
-        {
-            OSL_ASSERT(!xRet.is()); // make sure we return NULL
-            OSL_ENSURE(!aAny.hasValue(), "configmgr: BasicElement::getParent: could not extract parent - node is not an object"); 
-        }
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return xRet;
-}
-
-//-----------------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > implGetParent(NodeAccess& rNode, SetElement& /*rElement*/) throw(uno::RuntimeException)
-{
-    uno::Reference<uno::XInterface> xRet;
-
-    try
-    {
-        // assume shared lock for connected trees
-        GuardedNodeData<NodeAccess> impl( rNode ); // no provider lock needed - tree must be prebuilt already
-    
-        rtl::Reference< configuration::Tree > aTree(impl.getTree());
-
-        rtl::Reference< configuration::Tree > aParentTree( aTree->getContextTree() );
-
-        if (!configuration::isEmpty(aParentTree.get()))
-        {
-            configuration::NodeRef aParentNode( aTree->getContextNodeRef() );
-
-            // assume shared factory for connected trees
-            uno::Any aAny = configapi::makeInnerElement( rNode.getFactory(), aParentTree, aParentNode );
-
-            if (!(aAny >>= xRet)) // no parent available
-            {
-                // should occur only if the any is void
-                OSL_ENSURE(!aAny.hasValue(), "configmgr: BasicSetElement::getParent: could not extract parent - node is not an object"); 
-                OSL_ASSERT(!xRet.is()); // make sure we return NULL
-            }
-        }
-        else
-        {
-            OSL_ASSERT(!xRet.is()); // make sure we return NULL
-        }
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return xRet;
-}
-//-----------------------------------------------------------------------------------
-
-// UNSUPPORTED method
-void implSetParent(NodeAccess& rNode, InnerElement& /*rElement*/, const uno::Reference< uno::XInterface >& /*xParent*/ ) 
-    throw(lang::NoSupportException, uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    rNode.checkAlive(); // Does locking internally, checks for disposed nodes
-
-    // TODO(?): allow for xParent == getParent()
-    throw lang::NoSupportException(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("configmgr: BasicElement::setParent: cannot move Entry")), 
-            rNode.getUnoInstance() );
-}
-//-----------------------------------------------------------------------------------
-
-// preliminary implementation
-void implSetParent(NodeAccess& rNode, SetElement& rElement, const uno::Reference< uno::XInterface >& xParent ) 
-    throw(lang::NoSupportException, uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    //implSetParent(rNode,xParent);
-    // TODO: lock the whole transaction ???? - would need Uno Tunneling ?
-    uno::Reference< uno::XInterface > xGotParent( implGetParent(rNode,rElement) );
-    uno::Reference< css::container::XNameContainer > xOldParent( xGotParent, uno::UNO_QUERY );
-    uno::Reference< css::container::XNameContainer > xNewParent( xParent, uno::UNO_QUERY );
-
-    if (xGotParent.is() && !xOldParent.is()) 
-    {
-        throw lang::NoSupportException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: this is not element of a container")), 
-                rNode.getUnoInstance() );
-    }
-    if (xParent.is() && !xNewParent.is()) 
-    {
-        throw lang::NoSupportException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: new parent is no container")), 
-                rNode.getUnoInstance() );
-    }
-
-    uno::Reference< uno::XInterface > xThis(rNode.getUnoInstance());
-    OSL_ASSERT(xThis.is());
-
-    if (xOldParent != xNewParent)
-    {
-        rtl::OUString const sName( implGetName(rNode,rElement) );
-
-        if (xParent.is())
-        {
-            rtl::OUString const sTemplate( implGetTemplateName(rElement) );
-
-            if (sTemplate.getLength() == 0) 
-            {
-                throw lang::NoSupportException(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: object has no recognizable type")), 
-                        xThis );
-            }
-
-            uno::Reference< css::configuration::XTemplateContainer > xNewTemplate( xParent, uno::UNO_QUERY );
-            if (!xNewTemplate.is()) 
-            {
-                throw lang::NoSupportException(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: new parent has no element template")), 
-                        xThis );
-            }
-
-            if ( sTemplate != xNewTemplate->getElementTemplateName())
-            {
-                throw lang::NoSupportException(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: object has wrong type")), 
-                        xThis );
-            }
-
-            if ( xNewParent->hasByName( sName ) )
-            {
-                throw lang::NoSupportException(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: an object of this name already exists in new parent")), 
-                        xThis );
-            }
-
-            // TODO: check for circularity (i.e. that This is not one of new parent's ancestors) !!
-        }
-                
-        // now do it
-
-        try 
-        { 
-            if ( xOldParent.is()) xOldParent->removeByName(sName);
-            if ( xNewParent.is()) xNewParent->insertByName(sName, uno::makeAny(xThis)); 
-        }
-        catch (uno::Exception& e)
-        {
-            e.Message = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Config API: implSetParent: changing parent failed: "))
-                += e.Message;
-
-            if (xOldParent.is()) 
-            try 
-            { 
-                xOldParent->insertByName(sName, uno::makeAny(xThis)); 
-            }
-            catch(uno::Exception& bad) 
-            { 
-                e.Message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\t ! Could not restore old parent: ")) += bad.Message;
-            }
-
-            throw uno::RuntimeException(e.Message,xThis);
-        }
-
-    }
-}
-//-----------------------------------------------------------------------------
-
-
-// XNamed
-//-----------------------------------------------------------------------------
-rtl::OUString implGetName(NodeAccess& rNode, NodeElement& ) throw(uno::RuntimeException)
-{
-    rtl::OUString sRet;
-    try
-    {
-        GuardedNodeData<NodeAccess> impl( rNode ); // maybe passive only ?
-    
-        rtl::Reference< configuration::Tree > aTree(impl.getTree());
-        configuration::NodeRef aNode(impl.getNode());
-
-        sRet = aTree->getSimpleNodeName(aNode.getOffset());
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return sRet;
-}
-//-----------------------------------------------------------------------------
-
-// UNSUPPORTED method
-void implSetName(NodeAccess & rNode, NodeElement& /*rElement*/, const rtl::OUString& /*aName*/ ) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    rNode.checkAlive(); // Does locking internally, checks for disposed nodes
-
-    // TODO(?): allow for aName == getName()
-    throw uno::RuntimeException( 
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("configmgr: BasicElement::setName: cannot rename Entry")), 
-        rNode.getUnoInstance() );
-}
-//-----------------------------------------------------------------------------
-
-// TODO: Implementations for elements to be added to a container node
-void implSetName(NodeAccess& rNode, SetElement& rElement, const rtl::OUString& aName ) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    // TODO: Implement
-    NodeElement& rDelegate = rElement;
-    implSetName(rNode,rDelegate,aName); // delegate to unsupported version
-}
-//-----------------------------------------------------------------------------
-
-// XComponent & XInterface 
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-
-void implDispose( SetElement& rElement) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    if (!rElement.disposeTree(false))
-    {
-        throw uno::RuntimeException( 
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGURATION: Can't dispose an object that has an owner")),
-                rElement.getUnoInstance() );
-    }
-}
-//-----------------------------------------------------------------------------
-
-void implDispose( RootElement& rElement) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    if (!rElement.disposeTree())
-    {
-        throw lang::DisposedException( 
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGURATION: Can't dispose an object that already was disposed")),
-                rElement.getUnoInstance() );
-    }
-}
-//-----------------------------------------------------------------------------
-
-void implDisposeObject( NodeAccess& ,SetElement& rElement) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-// FIXME: should we hold a ref on the element over this ?
-// call apitreeaccess.hxx (doGetUnoInterface) & hold a ref / unref ?
-// [or!] - call getApiTree & ref/unref on that ?
-// [or!] - hold the ref inside the dispose method itself ...
-    rElement.disposeTree(true);
-}
-//-----------------------------------------------------------------------------
-
-void implDisposeObject( NodeAccess& , RootElement& rElement) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    rElement.disposeTree();
-}
-//-----------------------------------------------------------------------------
-
-void implDisposeObject( NodeAccess& rNode, InnerElement& ) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    rNode.disposeNode();
-}
-//-----------------------------------------------------------------------------
-
-
-// XTypeProvider
-//-----------------------------------------------------------------------------
-
-uno::Sequence<sal_Int8> implGetImplementationId(NodeAccess& rNode, NodeElement& rElement) 
-    throw(uno::RuntimeException)
-{
-    DisposeGuard aLock(rNode);
-    ServiceImplementationInfo const* pInfo = rElement.getServiceInfo();
-
-    OSL_ENSURE(pInfo, "Configuration: Object has no implementation (service) info - cannot get implementation id");
-    if (!pInfo)
-        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGURATION: Object has no implementation information - cannot get implementation id")),rElement.getUnoInstance() );
-
-    return ServiceComponentImpl::getStaticImplementationId(pInfo);
-}
-//-----------------------------------------------------------------------------
-
-// XServiceInfo
-//-----------------------------------------------------------------------------
-
-rtl::OUString implGetImplementationName( NodeAccess& rNode, NodeElement& rElement ) throw(uno::RuntimeException)
-{
-    DisposeGuard aLock(rNode);
-    ServiceImplementationInfo const* pInfo = rElement.getServiceInfo();
-    OSL_ENSURE(pInfo, "Configuration: Object has no service info");
-
-    return ServiceInfoHelper(pInfo).getImplementationName();
-}
-//-----------------------------------------------------------------------------
-
-sal_Bool implSupportsService( NodeAccess& rNode, NodeElement& rElement, const rtl::OUString& ServiceName ) throw(uno::RuntimeException)
-{
-    DisposeGuard aLock(rNode);
-    ServiceImplementationInfo const* pInfo = rElement.getServiceInfo();
-    OSL_ENSURE(pInfo, "Configuration: Object has no service info");
-
-    return ServiceInfoHelper(pInfo).supportsService(ServiceName);
-}
-//-----------------------------------------------------------------------------
-
-uno::Sequence< rtl::OUString > implGetSupportedServiceNames( NodeAccess& rNode, NodeElement& rElement ) throw(uno::RuntimeException)
-{
-    DisposeGuard aLock(rNode);
-    ServiceImplementationInfo const* pInfo = rElement.getServiceInfo();
-    OSL_ENSURE(pInfo, "Configuration: Object has no service info");
-
-    return ServiceInfoHelper(pInfo).getSupportedServiceNames();
-}
-//-----------------------------------------------------------------------------
-    
-// Root only ------------------------------------------------------------------
-
-// XLocalizable 
-// TODO: Implement locale support
-//-----------------------------------------------------------------------------
-
-lang::Locale implGetLocale( RootElement& rElement ) throw(uno::RuntimeException)
-{
-    GuardedRootElement aLocked(rElement);
-    
-    OSL_ENSURE(false,"CONFIGURATION: Locale information is not yetsupported.");
-    return lang::Locale();
-}
-//-----------------------------------------------------------------------------
-
-void implSetLocale( RootElement& rElement, const css::lang::Locale& /*eLocale*/ ) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    // TODO: Implement if possible
-    rElement.checkAlive();
-
-    OSL_ENSURE(false,"CONFIGURATION: Changing the set Locale is not supported.");
-    throw uno::RuntimeException( 
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGURATION: Changing the locale is currently not supported")), 
-        rElement.getUnoInstance()
-    );
-}
-//-----------------------------------------------------------------------------
-
-// XChangesBatch
-//-----------------------------------------------------------------------------
-
-void implCommitChanges( UpdateRootElement& rElement ) throw(css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    // quick check to avoid big locks for nothing (has its own locking)
-    if (!implHasPendingChanges(rElement)) return;
-
-    try
-    {
-        rElement.getCommitter().commit();
-    }
-
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rElement.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    // filter/wrap uno::Exceptions
-    catch (lang::WrappedTargetException& )	{ throw; }
-    catch (uno::RuntimeException& )			{ throw; }
-    catch (uno::Exception& ex)
-    {
-        uno::Reference<uno::XInterface> xContext( rElement.getUnoInstance() );
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration: can't commit Changes: ") );
-        throw lang::WrappedTargetException( sMessage += ex.Message, xContext, uno::makeAny(ex));
-    }
-}
-//-----------------------------------------------------------------------------
-
-sal_Bool implHasPendingChanges( RootElement& rElement ) throw(uno::RuntimeException)
-{
-    try
-    {
-        GuardedRootElement aLocked(rElement);
-        return aLocked.get().getTree()->hasChanges();
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rElement.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    OSL_ENSURE(false,"Unreachable Code");
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-uno::Sequence< css::util::ElementChange > implGetPendingChanges( RootElement& rElement ) 
-        throw(uno::RuntimeException)
-{
-    std::vector<css::util::ElementChange> aResult;
-    try
-    {
-        GuardedRootElement aLocked(rElement);
-
-        rtl::Reference< configuration::Tree > aTree( aLocked.get().getTree() );
-            
-        configuration::NodeChangesInformation aInfos;
-
-        {
-            configuration::NodeChanges aChanges;
-            if (aTree->collectChanges(aChanges))
-            {
-                aChanges.getChangesInfos(aInfos);
-            } 
-        }
-            
-        Factory& rFactory = rElement.getFactory();
-
-        for(std::vector< configuration::NodeChangeInformation >::const_iterator it = aInfos.begin(), stop = aInfos.end();
-            it != stop;
-            ++it)
-        {
-            css::util::ElementChange aChange;
-            fillChange(aChange,*it,aTree,rFactory);
-            aResult.push_back(aChange);
-        }
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rElement.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return makeSequence(aResult);
-}
-//-----------------------------------------------------------------------------
-
-// Set only -------------------------------------------------------------------------
-
-// XTemplateInstance
-//-----------------------------------------------------------------------------------
-
-rtl::OUString implGetTemplateName(SetElement& rElement) 
-    throw(uno::RuntimeException)
-{
-    try
-    {
-        GuardedTreeElement aLocked(rElement);
-        return rElement.getTemplateInfo()->getPathString();
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rElement.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    OSL_ENSURE(false,"Unreachable Code");
-    return rtl::OUString();
-}
-//-----------------------------------------------------------------------------------
-
-// XUnoTunnel
-//-----------------------------------------------------------------------------------
-sal_Int64 implGetSomething(SetElement& rElement, const uno::Sequence< sal_Int8 >& aIdentifier ) 
-    throw(uno::RuntimeException)
-{
-    sal_Int64 nSomething = 0;
-    try
-    {
-        GuardedTreeElement aLocked(rElement);
-
-        if (!rElement.getFactory().tunnelSetElement(nSomething, rElement, aIdentifier))
-            OSL_ASSERT(nSomething == 0);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rElement.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return nSomething;
-}
-//-----------------------------------------------------------------------------------
-
-    } // namespace configapi
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/elementimpl.hxx b/configmgr/source/api2/elementimpl.hxx
deleted file mode 100644
index 1fe4e99cfc..0000000000
--- a/configmgr/source/api2/elementimpl.hxx
+++ /dev/null
@@ -1,160 +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: elementimpl.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 CONFIGMGR_API_ELEMENTIMPL_HXX_
-#define CONFIGMGR_API_ELEMENTIMPL_HXX_
-
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/configuration/XTemplateInstance.hpp>
-#include <com/sun/star/lang/XLocalizable.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-    /* implementations of the interfaces supported by a (parent) node
-        within the configuration tree.
-        (read-only operation)
-    */
-    namespace configapi
-    {
-    //-------------------------------------------------------------------------
-        class NodeAccess; 
-        class NodeElement; 
-        class InnerElement; 
-        class TreeElement; 
-        class SetElement; 
-        class RootElement; 
-        class UpdateRootElement; 
-    //-------------------------------------------------------------------------
-
-        // XComponent and XInterface (EOL handling)
-        //---------------------------------------------------------------------
-        void implDispose( SetElement& rElement) 
-            throw(uno::RuntimeException);
-
-        void implDispose( RootElement& rElement) 
-            throw(uno::RuntimeException);
-
-        void implDisposeObject( NodeAccess& aNode, SetElement& rElement) 
-            throw(uno::RuntimeException);
-
-        void implDisposeObject( NodeAccess& aNode, RootElement& rElement) 
-            throw(uno::RuntimeException);
-
-        void implDisposeObject( NodeAccess& aNode, InnerElement& rElement) 
-            throw(uno::RuntimeException);
-
-        // XTypeProvider
-        //---------------------------------------------------------------------
-        uno::Sequence<sal_Int8> implGetImplementationId(NodeAccess& rNode,  NodeElement& rElement ) throw(uno::RuntimeException);
-
-        // XChild
-        //---------------------------------------------------------------------
-        uno::Reference< uno::XInterface > implGetParent(NodeAccess& rNode, InnerElement& rElement) 
-            throw(uno::RuntimeException);
-
-        uno::Reference< uno::XInterface > implGetParent(NodeAccess& rNode, SetElement& rElement) 
-            throw(uno::RuntimeException);
-
-        void implSetParent(NodeAccess& rNode, InnerElement& rElement, const uno::Reference< uno::XInterface >& Parent ) // generally not supported 
-            throw(css::lang::NoSupportException, css::uno::RuntimeException);
-
-        void implSetParent(NodeAccess& rNode, SetElement& rElement, const uno::Reference< uno::XInterface >& Parent ) // maybe supported 
-            throw(css::lang::NoSupportException, css::uno::RuntimeException);
-
-        // XNamed
-        //---------------------------------------------------------------------
-        rtl::OUString implGetName(NodeAccess& rNode, NodeElement& rElement) 
-            throw(uno::RuntimeException);
-
-        void implSetName(NodeAccess& rNode, NodeElement& rElement, const rtl::OUString& aName ) // generally not supported (! - missing exception)
-            throw(uno::RuntimeException);
-
-        void implSetName(NodeAccess& rNode, SetElement& rElement, const rtl::OUString& aName ) // maybe supported 
-            throw(uno::RuntimeException);
-
-        // XServiceInfo
-        //---------------------------------------------------------------------
-        rtl::OUString implGetImplementationName( NodeAccess& rNode, NodeElement& rElement ) 
-            throw(uno::RuntimeException);
-
-        sal_Bool implSupportsService( NodeAccess& rNode, NodeElement& rElement, const rtl::OUString& ServiceName ) 
-            throw(uno::RuntimeException);
-
-        uno::Sequence< rtl::OUString > implGetSupportedServiceNames( NodeAccess& rNode, NodeElement& rElement ) 
-            throw(uno::RuntimeException);
-    
-    // Root only only
-    //-------------------------------------------------------------------------
-
-        // XLocalizable
-        //---------------------------------------------------------------------
-
-        css::lang::Locale implGetLocale( RootElement& rElement ) 
-                throw(uno::RuntimeException);
-
-        void implSetLocale( RootElement& rElement, const css::lang::Locale& eLocale ) 
-                throw(uno::RuntimeException);
-
-        // XChangesBatch
-        //---------------------------------------------------------------------
-
-        void implCommitChanges( UpdateRootElement& rElement ) 
-                throw(css::lang::WrappedTargetException, uno::RuntimeException);
-
-        sal_Bool implHasPendingChanges( RootElement& rElement ) 
-                throw(uno::RuntimeException);
-
-        uno::Sequence< css::util::ElementChange > implGetPendingChanges( RootElement& rElement ) 
-                throw(uno::RuntimeException);
-
-    // Set only
-    //-------------------------------------------------------------------------
-        // XTemplateInstance
-        //---------------------------------------------------------------------
-        rtl::OUString implGetTemplateName(SetElement& rElement) 
-            throw(uno::RuntimeException);
-
-        // XUnoTunnel
-        //---------------------------------------------------------------------
-        sal_Int64 implGetSomething(SetElement& rElement, const uno::Sequence< sal_Int8 >& aIdentifier ) 
-            throw(uno::RuntimeException);
-
-    //-------------------------------------------------------------------------
-    }
-
-}
-#endif // CONFIGMGR_API_BASEACCESSIMPL_HXX_
-
-
diff --git a/configmgr/source/api2/groupaccess.cxx b/configmgr/source/api2/groupaccess.cxx
deleted file mode 100644
index b5e32cca3a..0000000000
--- a/configmgr/source/api2/groupaccess.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: groupaccess.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_configmgr.hxx"
-
-#include "groupaccess.hxx"
-#include "accessimpl.hxx"
-#include "apinotifierimpl.hxx"
-#include "apinodeaccess.hxx"
-
-namespace configmgr
-{
-
-// XHierarchicalName
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL BasicGroupAccess::getHierarchicalName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetHierarchicalName( getNode() );
-}
-
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL BasicGroupAccess::composeHierarchicalName( const rtl::OUString& sRelativeName ) 
-    throw(css::lang::IllegalArgumentException, css::lang::NoSupportException, uno::RuntimeException)
-{
-    return configapi::implComposeHierarchicalName( getNode(), sRelativeName );
-}
-
-//------------------------------------------------------------------------------------------------------------------
-
-// XElementAccess, base class of XNameAccess (and XHierarchicalNameAccess ? )
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-uno::Type SAL_CALL BasicGroupAccess::getElementType(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetElementType( getNode() );
-}
-
-//-----------------------------------------------------------------------------------
-sal_Bool SAL_CALL BasicGroupAccess::hasElements(  ) throw(uno::RuntimeException)
-{
-    return configapi::implHasElements( getNode() );
-}
-
-// XExactName
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicGroupAccess::getExactName( const rtl::OUString& rApproximateName ) throw(uno::RuntimeException)
-{
-    return configapi::implGetExactName( getNode(), rApproximateName);
-}
-
-// XProperty
-//-----------------------------------------------------------------------------------
-
-css::beans::Property SAL_CALL BasicGroupAccess::getAsProperty(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetAsProperty( getNode() );
-}
-
-// XNameAccess
-//-----------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BasicGroupAccess::hasByName( const rtl::OUString& sName ) throw(uno::RuntimeException)
-{
-    return configapi::implHasByName( getNode(), sName);
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any SAL_CALL BasicGroupAccess::getByName( const rtl::OUString& sName ) 
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    return configapi::implGetByName( getNode(), sName );
-} 
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > SAL_CALL BasicGroupAccess::getElementNames(  ) throw( uno::RuntimeException)
-{
-    return configapi::implGetElementNames( getNode() );
-}
-
-// XHierarchicalNameAccess
-//-----------------------------------------------------------------------------------
-sal_Bool SAL_CALL BasicGroupAccess::hasByHierarchicalName( const rtl::OUString& sName ) throw(uno::RuntimeException)
-{
-    return configapi::implHasByHierarchicalName( getNode(), sName);
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any SAL_CALL BasicGroupAccess::getByHierarchicalName( const rtl::OUString& sName ) 
-    throw(css::container::NoSuchElementException, uno::RuntimeException)
-{
-    return configapi::implGetByHierarchicalName( getNode(), sName );
-} 
-
-        
-// XContainer
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicGroupAccess::addContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNode(), xListener );
-}
-
-//-----------------------------------------------------------------------------------
-void SAL_CALL BasicGroupAccess::removeContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNode(), xListener );
-}
-    
-
- 
-//-----------------------------------------------------------------------------------
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/groupaccess.hxx b/configmgr/source/api2/groupaccess.hxx
deleted file mode 100644
index 7a6903c0c7..0000000000
--- a/configmgr/source/api2/groupaccess.hxx
+++ /dev/null
@@ -1,138 +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: groupaccess.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 CONFIGMGR_API_GROUPACCESS_HXX_
-#define CONFIGMGR_API_GROUPACCESS_HXX_
-
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XProperty.hpp>
-#include <cppuhelper/implbase6.hxx>
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-    namespace configapi { class NodeGroupInfoAccess; }
-
-    /** implements the (read-only) interfaces supported by a group node
-        within the configuration tree.
-        <p> Is an interface adapter around <type scope='configmgr::configapi'>NodeAccess</type>.</p>
-    */
-    class BasicGroupAccess
-    : public ::cppu::ImplHelper6
-                < css::container::XNameAccess
-                , css::container::XHierarchicalName
-                , css::container::XHierarchicalNameAccess
-                , css::container::XContainer
-                , css::beans::XExactName
-                , css::beans::XProperty
-                >
-    {
-    protected:
-    // Destructors
-        virtual ~BasicGroupAccess() {}
-
-    public:
-    // Interface methods
-
-        // XHierarchicalName
-        virtual rtl::OUString SAL_CALL 
-            getHierarchicalName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual rtl::OUString SAL_CALL 
-            composeHierarchicalName( const rtl::OUString& aRelativeName ) 
-                throw(css::lang::IllegalArgumentException, css::lang::NoSupportException, 
-                        uno::RuntimeException);
-
-        // XElementAccess, base class of XNameAccess 
-        virtual uno::Type SAL_CALL 
-            getElementType(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasElements(  ) 
-                throw(uno::RuntimeException);
-
-        // XNameAccess
-        virtual uno::Any SAL_CALL 
-            getByName( const rtl::OUString& aName ) 
-                throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, 
-                         uno::RuntimeException);
- 
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getElementNames(  ) 
-                throw( uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasByName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XHierarchicalNameAccess
-        virtual uno::Any SAL_CALL 
-            getByHierarchicalName( const rtl::OUString& aName ) 
-                throw(css::container::NoSuchElementException, uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasByHierarchicalName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XContainer
-        virtual void SAL_CALL 
-            addContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-                throw(uno::RuntimeException);
-    
-        // XExactName
-        virtual ::rtl::OUString SAL_CALL 
-            getExactName( const rtl::OUString& aApproximateName ) 
-                throw(uno::RuntimeException);
-
-        // XProperty
-        virtual css::beans::Property SAL_CALL 
-            getAsProperty(  ) 
-                throw(uno::RuntimeException);
-
-    protected:
-        virtual configapi::NodeGroupInfoAccess& getNode() = 0;
-    };
-
-}
-#endif // CONFIGMGR_API_GROUPACCESS_HXX_
-
-
diff --git a/configmgr/source/api2/groupobjects.cxx b/configmgr/source/api2/groupobjects.cxx
deleted file mode 100644
index be1b7bd380..0000000000
--- a/configmgr/source/api2/groupobjects.cxx
+++ /dev/null
@@ -1,410 +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: groupobjects.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_configmgr.hxx"
-#include <stdio.h>
-#include "groupobjects.hxx"
-#include "comphelper/sequence.hxx"
-
-//........................................................................
-namespace configmgr
-{
-
-//==========================================================================
-//= OInnerGroupInfo
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OInnerGroupInfo::acquire( ) throw ()
-{
-    BasicInnerElement::acquire();
-}
-
-void SAL_CALL OInnerGroupInfo::release( ) throw ()
-{
-    BasicInnerElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OInnerGroupInfo::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicInnerElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicGroupAccess::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicPropertySet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OInnerGroupInfo::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicInnerElement::getTypes(), BasicGroupAccess::getTypes(), BasicPropertySet::getTypes());
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OInnerGroupInfo::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicInnerElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OInnerGroupInfo::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupInfoAccess& OInnerGroupInfo::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupAccess* OInnerGroupInfo::maybeGetUpdateAccess()
-{
-    return 0;
-}
-
-configapi::InnerElement& OInnerGroupInfo::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OInnerGroupUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OInnerGroupUpdate::acquire( ) throw ()
-{
-    BasicInnerElement::acquire();
-}
-
-void SAL_CALL OInnerGroupUpdate::release( ) throw ()
-{
-    BasicInnerElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OInnerGroupUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicInnerElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicGroup::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicPropertySet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OInnerGroupUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicInnerElement::getTypes(), BasicGroup::getTypes(), BasicPropertySet::getTypes());
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OInnerGroupUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicInnerElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OInnerGroupUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupInfoAccess& OInnerGroupUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupAccess*	OInnerGroupUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::InnerElement& OInnerGroupUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OSetElementGroupInfo
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OSetElementGroupInfo::acquire( ) throw ()
-{
-    BasicSetElement::acquire();
-}
-
-void SAL_CALL OSetElementGroupInfo::release( ) throw ()
-{
-    BasicSetElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OSetElementGroupInfo::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicGroupAccess::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicPropertySet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OSetElementGroupInfo::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicSetElement::getTypes(), BasicGroupAccess::getTypes(), BasicPropertySet::getTypes() );
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OSetElementGroupInfo::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicSetElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OSetElementGroupInfo::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupInfoAccess& OSetElementGroupInfo::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupAccess* OSetElementGroupInfo::maybeGetUpdateAccess()
-{
-    return 0;
-}
-
-configapi::SetElement& OSetElementGroupInfo::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OSetElementGroupUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OSetElementGroupUpdate::acquire( ) throw ()
-{
-    BasicSetElement::acquire();
-}
-
-void SAL_CALL OSetElementGroupUpdate::release( ) throw ()
-{
-    BasicSetElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OSetElementGroupUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicGroup::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicPropertySet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OSetElementGroupUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicSetElement::getTypes(), BasicGroup::getTypes(), BasicPropertySet::getTypes());
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OSetElementGroupUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicSetElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OSetElementGroupUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupInfoAccess& OSetElementGroupUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupAccess* OSetElementGroupUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::SetElement& OSetElementGroupUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= ORootElementGroupInfo
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL ORootElementGroupInfo::acquire( ) throw ()
-{
-    BasicRootElement::acquire();
-}
-
-void SAL_CALL ORootElementGroupInfo::release( ) throw ()
-{
-    BasicRootElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL ORootElementGroupInfo::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicRootElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicGroupAccess::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicPropertySet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL ORootElementGroupInfo::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicRootElement::getTypes(), BasicGroupAccess::getTypes(), BasicPropertySet::getTypes());
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL ORootElementGroupInfo::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicRootElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	ORootElementGroupInfo::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupInfoAccess& ORootElementGroupInfo::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupAccess* ORootElementGroupInfo::maybeGetUpdateAccess()
-{
-    return 0;
-}
-
-configapi::RootElement& ORootElementGroupInfo::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= ORootElementGroupUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL ORootElementGroupUpdate::acquire( ) throw ()
-{
-    BasicUpdateElement::acquire();
-}
-
-void SAL_CALL ORootElementGroupUpdate::release( ) throw ()
-{
-    BasicUpdateElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL ORootElementGroupUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicUpdateElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicGroup::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicPropertySet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL ORootElementGroupUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicUpdateElement::getTypes(),BasicGroup::getTypes(), BasicPropertySet::getTypes());
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL ORootElementGroupUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicUpdateElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	ORootElementGroupUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupInfoAccess& ORootElementGroupUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeGroupAccess*	ORootElementGroupUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::UpdateRootElement& ORootElementGroupUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//........................................................................
-} // namespace configmgr
-//........................................................................
-
diff --git a/configmgr/source/api2/groupobjects.hxx b/configmgr/source/api2/groupobjects.hxx
deleted file mode 100644
index 321b0a2cff..0000000000
--- a/configmgr/source/api2/groupobjects.hxx
+++ /dev/null
@@ -1,271 +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: groupobjects.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 CONFIGMGR_API_GROUPOBJECTS_HXX_
-#define CONFIGMGR_API_GROUPOBJECTS_HXX_
-
-#include "groupaccess.hxx"
-#include "groupupdate.hxx"
-#include "propertysetaccess.hxx"
-#include "elementaccess.hxx"
-
-#include "apiaccessobj.hxx"
-
-//........................................................................
-namespace configmgr
-{
-//........................................................................
-
-//==========================================================================
-//= Inner Group Instances
-//==========================================================================
-
-/** read-only access class for configuration nodes which are inner nodes and groups of other nodes
-*/
-    class OInnerGroupInfo 
-    : public BasicInnerElement
-    , public BasicGroupAccess
-    , public BasicPropertySet
-    {
-    public:
-        // Construction/Destruction 
-        OInnerGroupInfo(configapi::ApiTreeImpl& rTree, configuration::NodeRef const& aNode)
-            : m_aAccessElement(static_cast<css::container::XChild*>(this),rTree,aNode)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&				getNodeAccess();
-        virtual configapi::NodeGroupInfoAccess&	getNode();
-        virtual configapi::NodeGroupAccess*		maybeGetUpdateAccess();
-        virtual configapi::InnerElement&			getElementClass();
-    private:
-        configapi::OInnerElement<configapi::NodeGroupInfoAccess> m_aAccessElement;
-    };
-
-/** updating access class for configuration nodes which are inner nodes and groups of other nodes
-*/
-    class OInnerGroupUpdate
-    : public BasicInnerElement
-    , public BasicGroup
-    , public BasicPropertySet
-    {
-    public:
-        // Construction/Destruction 
-        OInnerGroupUpdate(configapi::ApiTreeImpl& rTree, configuration::NodeRef const& aNode)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),rTree,aNode)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&				getNodeAccess();
-        virtual configapi::NodeGroupInfoAccess&	getNode();
-        virtual configapi::NodeGroupAccess*		maybeGetUpdateAccess();
-        virtual configapi::InnerElement&			getElementClass();
-    private:
-        configapi::OInnerElement<configapi::NodeGroupAccess> m_aAccessElement;
-    };
-
-
-//==========================================================================
-//= Set Element Group Instances
-//==========================================================================
-
-/** read-only access class for configuration nodes which are set elements and groups of other nodes
-*/
-    class OSetElementGroupInfo 
-    : public BasicSetElement
-    , public BasicGroupAccess
-    , public BasicPropertySet
-    {
-    public:
-        // Construction/Destruction 
-        OSetElementGroupInfo(rtl::Reference< configuration::Tree > const& aTree, configapi::ApiProvider& rProvider, configapi::ApiTreeImpl* pParentTree = 0)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),aTree,rProvider,pParentTree)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&				getNodeAccess();
-        virtual configapi::NodeGroupInfoAccess&	getNode();
-        virtual configapi::NodeGroupAccess*		maybeGetUpdateAccess();
-        virtual configapi::SetElement&				getElementClass();
-    private:
-        configapi::OSetElement<configapi::NodeGroupInfoAccess> m_aAccessElement;
-    };
-
-/** updating access class for configuration nodes which are set elements and groups of other nodes
-*/
-    class OSetElementGroupUpdate
-    : public BasicSetElement
-    , public BasicGroup
-    , public BasicPropertySet
-    {
-    public:
-        // Construction/Destruction 
-        OSetElementGroupUpdate(rtl::Reference< configuration::Tree > const& aTree, configapi::ApiProvider& rProvider, configapi::ApiTreeImpl* pParentTree = 0)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),aTree,rProvider,pParentTree)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&				getNodeAccess();
-        virtual configapi::NodeGroupInfoAccess&	getNode();
-        virtual configapi::NodeGroupAccess*		maybeGetUpdateAccess();
-        virtual configapi::SetElement&				getElementClass();
-    private:
-        configapi::OSetElement<configapi::NodeGroupAccess> m_aAccessElement;
-    };
-
-
-//==========================================================================
-//= Root Element Set Instances
-//==========================================================================
-
-/** read-only access class for configuration nodes which are root nodes and groups of other nodes
-*/
-    class ORootElementGroupInfo 
-    : public BasicRootElement
-    , public BasicGroupAccess
-    , public BasicPropertySet
-    {
-    public:
-        // Construction/Destruction 
-        ORootElementGroupInfo(configapi::ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-        : m_aAccessElement(static_cast<css::lang::XComponent*>(this),rProvider,aTree, _xOptions)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&				getNodeAccess();
-        virtual configapi::NodeGroupInfoAccess&	getNode();
-        virtual configapi::NodeGroupAccess*		maybeGetUpdateAccess();
-        virtual configapi::RootElement&			getElementClass();
-    private:
-        configapi::OReadRootElement<configapi::NodeGroupInfoAccess> m_aAccessElement;
-    };
-
-/** updating access class for configuration nodes which are root nodes and groups of other nodes
-*/
-    class ORootElementGroupUpdate
-    : public BasicUpdateElement
-    , public BasicGroup
-    , public BasicPropertySet
-    {
-    public:
-        // Construction/Destruction 
-        ORootElementGroupUpdate(configapi::ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-        : m_aAccessElement(static_cast<css::lang::XComponent*>(this),rProvider,aTree, _xOptions)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&				getNodeAccess();
-        virtual configapi::NodeGroupInfoAccess&	getNode();
-        virtual configapi::NodeGroupAccess*		maybeGetUpdateAccess();
-        virtual configapi::UpdateRootElement&		getElementClass();
-    private:
-        configapi::OUpdateRootElement<configapi::NodeGroupAccess> m_aAccessElement;
-    };
-
-
-//........................................................................
-} // namespace configmgr
-//........................................................................
-
-#endif // CONFIGMGR_API_GROUPOBJECTS_HXX_
-
-
diff --git a/configmgr/source/api2/groupupdate.cxx b/configmgr/source/api2/groupupdate.cxx
deleted file mode 100644
index 15ce940d4d..0000000000
--- a/configmgr/source/api2/groupupdate.cxx
+++ /dev/null
@@ -1,107 +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: groupupdate.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_configmgr.hxx"
-
-#include "groupupdate.hxx"
-#include "updateimpl.hxx"
-#include "apinodeaccess.hxx"
-#include "apitypes.hxx"
-
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
-
-namespace configmgr
-{
-//////////////////////////////////////////////////////////////////////////////////
-// class BasicGroup
-//////////////////////////////////////////////////////////////////////////////////
-
-// XInterface joining
-//////////////////////////////////////////////////////////////////////////////////
-uno::Any SAL_CALL BasicGroup::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicGroupAccess::queryInterface( rType );
-    if (!aRet.hasValue())
-    {
-        aRet = cppu::queryInterface(rType
-                    , static_cast< css::container::XNameReplace *>(this)
-                    );
-    }
-    return aRet;
-}
-
-// XTypeProvider joining
-//////////////////////////////////////////////////////////////////////////////////
-uno::Sequence< uno::Type > SAL_CALL BasicGroup::getTypes( ) throw (uno::RuntimeException )
-{
-    /*static ?*/ 
-    cppu::OTypeCollection aTypes(
-        configapi::getReferenceType(static_cast< css::container::XNameReplace *>(this)),
-        BasicGroupAccess::getTypes());
-
-    return aTypes.getTypes();
-}
-
-//uno::Sequence< sal_Int8 > SAL_CALL BasicGroup::getImplementationId( ) throw (uno::RuntimeException ) = 0;
-
-//////////////////////////////////////////////////////////////////////////////////
-
-// safe write access
-/////////////////////////////////////////////////////////////
-configapi::NodeGroupAccess& BasicGroup::getGroupNode()
-{
-    configapi::NodeGroupAccess* pAccess = maybeGetUpdateAccess();
-    OSL_ENSURE(pAccess, "Write operation invoked on a read-only node access - failing with RuntimeException");
-
-    if (!pAccess)
-    {
-        throw uno::RuntimeException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: Invalid Object - internal update interface missing.")),
-                static_cast< css::container::XNameReplace * >(this)
-            );
-    }
-    return *pAccess;			
-}
-
-// New Interface methods
-// XNameReplace
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicGroup::replaceByName( const rtl::OUString& rName, const uno::Any& rElement ) 
-        throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implReplaceByName( getGroupNode(), rName, rElement );
-}
-
-//-----------------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/groupupdate.hxx b/configmgr/source/api2/groupupdate.hxx
deleted file mode 100644
index ad85036b7c..0000000000
--- a/configmgr/source/api2/groupupdate.hxx
+++ /dev/null
@@ -1,101 +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: groupupdate.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 CONFIGMGR_API_GROUPUPDATE_HXX_
-#define CONFIGMGR_API_GROUPUPDATE_HXX_
-
-#include "groupaccess.hxx"
-#include <com/sun/star/container/XNameReplace.hpp>
-
-//........................................................................
-namespace configmgr
-{
-//........................................................................
-    namespace configapi { class NodeGroupAccess; }
-
-//==========================================================================
-//= BasicGroup
-//==========================================================================
-
-/** base class for configuration nodes which are dynamic sets of complex types (trees)
-*/
-    class BasicGroup
-    : public BasicGroupAccess
-    , public css::container::XNameReplace
-    {
-    protected:
-    // Destructors
-        virtual ~BasicGroup() {}
-
-    public:
-    // Base class Interface methods
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException ) = 0;
-
-        // XElementAccess forwarding
-        virtual uno::Type SAL_CALL getElementType(  ) throw(uno::RuntimeException)
-        { return BasicGroupAccess::getElementType(); }
-
-        virtual sal_Bool SAL_CALL hasElements(  )  throw(uno::RuntimeException)
-        { return BasicGroupAccess::hasElements(); }
-
-        // XNameAccess forwarding
-        virtual uno::Any SAL_CALL getByName( const rtl::OUString& aName ) 
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-         { return BasicGroupAccess::getByName(aName); }
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames(  ) throw( uno::RuntimeException)
-         { return BasicGroupAccess::getElementNames(); }
-
-        virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-         { return BasicGroupAccess::hasByName(aName); }
-
-    // New Interface methods
-        // XNameReplace
-        virtual void SAL_CALL 
-            replaceByName( const rtl::OUString& rName, const uno::Any& rElement ) 
-                throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-    protected:
-                configapi::NodeGroupAccess&	getGroupNode();
-        virtual configapi::NodeGroupAccess*	maybeGetUpdateAccess() = 0;
-    };
-
-//........................................................................
-} // namespace configmgr
-//........................................................................
-
-#endif // CONFIGMGR_API_GROUPUPDATE_HXX_
-
-
diff --git a/configmgr/source/api2/listenercontainer.cxx b/configmgr/source/api2/listenercontainer.cxx
deleted file mode 100644
index 5f54d6f77f..0000000000
--- a/configmgr/source/api2/listenercontainer.cxx
+++ /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: listenercontainer.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_configmgr.hxx"
-
-#include "listenercontainer.hxx"
-#include <com/sun/star/lang/XEventListener.hpp>
-
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-//		class DisposeNotifier
-//-----------------------------------------------------------------------------
-
-void DisposeNotifier::appendAndClearContainer(cppu::OInterfaceContainerHelper* pContainer)
-{
-    if (pContainer)
-    {
-        {
-            cppu::OInterfaceIteratorHelper aIterator(*pContainer);
-            while (aIterator.hasMoreElements())
-            {
-                aListeners.push_back(uno::Reference< lang::XEventListener >::query(aIterator.next()));
-            }
-        }
-        pContainer->clear();
-    }
-}
-//-----------------------------------------------------------------------------
-void DisposeNotifier::notify()
-{
-    for(std::vector< uno::Reference< lang::XEventListener > >::iterator it = aListeners.begin(); it != aListeners.end(); ++it)
-    {
-        if (it->is())
-        {
-            try { (*it)->disposing(aEvent); } catch (uno::Exception & ) {}
-            it->clear();
-        }
-    }
-    aListeners.clear();
-}
-
-//-----------------------------------------------------------------------------
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-    }
-}
-
-
diff --git a/configmgr/source/api2/listenercontainer.hxx b/configmgr/source/api2/listenercontainer.hxx
deleted file mode 100644
index cff7a1ff92..0000000000
--- a/configmgr/source/api2/listenercontainer.hxx
+++ /dev/null
@@ -1,584 +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: listenercontainer.hxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 CONFIGMGR_API_LISTENERCONTAINER_HXX_
-#define CONFIGMGR_API_LISTENERCONTAINER_HXX_
-
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <cppuhelper/interfacecontainer.hxx>
-#include "datalock.hxx"
-#include "utility.hxx"
-
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-        namespace css	= ::com::sun::star;
-        namespace uno		= css::uno;
-        namespace lang		= css::lang;
-//-----------------------------------------------------------------------------
-        template <class Listener>
-        class ListenerContainerIterator
-        {
-        public:
-            /**
-             * Create an iterator over the elements of the container. The iterator
-             * copies the elements of the conatainer. A change to the container does not
-             * affect the iterator.<BR>
-             * Remark: The copy is on demand. The iterator copy the elements only if the container
-             * change the contens. It is not allowed to destroy the container if a iterator exist.
-             *
-             * @param rCont	the container of the elements.
-             */
-            ListenerContainerIterator(  cppu::OInterfaceContainerHelper& rCont )
-            : m_aIter(rCont)
-            , m_xNext()
-            { advance(); }
-
-            /**
-             * Release the connection to the container.
-             */
-             ~ListenerContainerIterator() {}
-
-            /** Return true, if there are more elements in the iterator. */
-            sal_Bool hasMoreElements() const { return m_xNext.is() != 0; }
-
-            /** Return the next element of the iterator. Call this method if
-             *  hasMoreElements return false, is an error.
-             */
-            uno::Reference<Listener> next();
-
-        private:
-            void advance();
-
-            cppu::OInterfaceIteratorHelper m_aIter;
-            uno::Reference<Listener> m_xNext;
-        };
-//-----------------------------------------------------------------------------
-        class DisposeNotifier
-        {
-            lang::EventObject aEvent;
-            std::vector< uno::Reference< lang::XEventListener > > aListeners;
-        public:
-            explicit
-            DisposeNotifier(uno::Reference<uno::XInterface> const& aInterface) : aEvent(aInterface) {}
-
-            void appendAndClearContainer(cppu::OInterfaceContainerHelper* pContainer);
-            void notify();
-        };
-//-----------------------------------------------------------------------------
-        struct BasicContainerInfo
-        {
-            uno::XInterface*			pInterface;
-            cppu::OMultiTypeInterfaceContainerHelper*	pContainer;
-            BasicContainerInfo() : pInterface(0), pContainer(0) {}
-        };
-
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        class SpecialListenerContainer
-        {
-        public:
-            /**
-             * Create a container of interface containers.
-             */
-            SpecialListenerContainer(std::vector<BasicContainerInfo>::size_type nCount, KeyToIndex_ aMapper)
-            : m_aSpecialHelper(UnoApiLock::getLock())
-            , m_aContainers(nCount)
-            , m_aMapper(aMapper)
-            , m_bDisposeLock(false)
-            {}
-
-            ~SpecialListenerContainer()
-            {
-                OSL_ENSURE(isDisposed(), "ERROR: Object was not disposed properly");
-            }
-        public:
-            /**
-             * check whether this is disposed or still alive
-             * @param pObject
-             *		an interface on the object on which's behalf the operation was started
-             * @return <FALSE/>
-             *		if the object is being disposed
-             * @throw com::sun::star::lang::DisposedException
-             *		if the object was disposed completely
-             */
-            bool checkAlive(uno::XInterface* pObject = 0) volatile const throw(lang::DisposedException);
-
-            /// return whether the object is completely alive
-            bool isAlive() volatile const throw();
-            /// return whether the object is currently being disposed
-            bool isDisposing()volatile  const throw();
-            /// return whether the object is completely disposed
-            bool isDisposed()volatile  const throw();
-
-            /// return whether the object is present in this container
-            bool isAvailable(std::vector<BasicContainerInfo>::size_type nIndex)  const throw()
-            {
-                return nIndex < m_aContainers.size() && m_aContainers[nIndex].pInterface;
-            }
-
-            std::vector<BasicContainerInfo>::size_type getSize() const
-            {
-                return m_aContainers.size();
-            }
-
-            /// return the interface associated with an index
-            void setObjectAt(std::vector<BasicContainerInfo>::size_type nIndex, uno::XInterface* pInterface)
-            {
-                OSL_ENSURE( !isDisposed(), "object is disposed" );
-
-                if (isAlive())
-                {
-                    OSL_ENSURE( nIndex < m_aContainers.size(), " Invalid Index into Notifier");
-                    OSL_ENSURE( pInterface, "Invalid NULL Interface passed into Notifier");
-
-                    if ( nIndex < m_aContainers.size() && pInterface != NULL)
-                    {
-                        OSL_ENSURE( m_aContainers[nIndex].pInterface == NULL, "Interface already set");
-                        if (m_aContainers[nIndex].pInterface == NULL)
-                            m_aContainers[nIndex].pInterface = pInterface;
-                    }
-                }
-            }
-
-
-            /// return the interface associated with an index
-            uno::Reference<uno::XInterface> getObjectAt(std::vector<BasicContainerInfo>::size_type nIndex) const
-            {
-                uno::Reference<uno::XInterface> xRet( nIndex < m_aContainers.size() ? m_aContainers[nIndex].pInterface : 0 );
-                return xRet;
-            }
-
-            /// return the interface associated with an index
-            uno::Reference<uno::XInterface> getObjectForKey(Key_ const& aKey ) const
-            {
-                std::vector<BasicContainerInfo>::size_type nIndex = m_aMapper.findIndexForKey(aKey);
-                uno::Reference<uno::XInterface> xRet( nIndex < m_aContainers.size() ? m_aContainers[nIndex].pInterface : 0 );
-                return xRet;
-            }
-
-            /**
-             * Call disposing on all object in all the container for anIndex
-             * and in the containers for the associated indices
-             * support XEventListener. Then clear the container.
-             */
-            bool disposeOne( std::vector<BasicContainerInfo>::size_type anIndex ) throw();
-
-            /**
-             * Start disposing this object
-             * @return <TRUE/>
-             *		if disposing has been started
-             * @return <FALSE/>
-             *		if disposing had already been started before
-             */
-            bool beginDisposing() throw();
-            /**
-             * Continue disposing this object
-             * <p>	Call disposing on all object in all the containers that
-             *		support XEventListener. Then clear the container.
-             * </p>
-             * @return <TRUE/>
-             *		if disposing has been started
-             * @return <FALSE/>
-             *		if disposing had already been started before
-             */
-            void notifyDisposing() throw();
-
-            /// mark the end of the dispose processing
-            void endDisposing() throw();
-
-        public:
-            /**
-             * Return the specuial container created under this key.
-             * @return the container created under this key. If the container
-             *			was not created, null was returned.
-             */
-            cppu::OInterfaceContainerHelper *  getSpecialContainer( const Key_ & aKey) const
-            { return m_aSpecialHelper.aLC.getContainer(aKey); }
-
-            /**
-             * Return the containerhelper created under this index.
-             * @return the container helper created under this key. If the container helper
-             *	was not created, null was returned.
-             */
-            cppu::OMultiTypeInterfaceContainerHelper *  getContainerHelper( std::vector<BasicContainerInfo>::size_type nIndex) const
-            {
-                return ((nIndex < m_aContainers.size()) ? m_aContainers[nIndex].pContainer : 0 );
-            }
-            /**
-             * Return the container for the given type created under this index.
-             * @return the container created under this key. If the container
-             *			was not created, null was returned.
-             */
-            cppu::OInterfaceContainerHelper *  getContainer( std::vector<BasicContainerInfo>::size_type nIndex, const uno::Type & aType) const
-            {
-                cppu::OMultiTypeInterfaceContainerHelper* pContainer = (nIndex < m_aContainers.size()) ? m_aContainers[nIndex].pContainer : 0 ;
-
-                return pContainer ? pContainer->getContainer(aType) : 0;
-            }
-
-            /**
-             * Insert an element in the container specified with the index and type. The position is not specified.
-             * The interface at the given index must be set already.
-             * @param aKey		the id of the container.
-             * @param xListener	the added interface. It is allowed to insert null or
-             *					the same pointer more than once.
-             * @return the new count of elements in the container (or 0 if the object is ready being disposed).
-             */
-            sal_Int32 addListener( std::vector<BasicContainerInfo>::size_type nIndex, const uno::Type& aType, uno::Reference< lang::XEventListener > const& xListener) throw();
-
-            /**
-             * Remove an element from the container specified with the index and type.
-             * It uses the equal definition of uno objects to remove the interfaces.
-             * @param aKey		the id of the container.
-             * @param xListener	the removed interface.
-             * @return the new count of elements in the container (or 0 if the object is ready being disposed).
-             */
-            sal_Int32 removeListener( std::vector<BasicContainerInfo>::size_type nIndex, const uno::Type& aType, uno::Reference< lang::XEventListener > const& xListener) throw();
-
-
-            /**
-             * Insert an element in the special container specified with the key. The position is not specified.
-             * The interface at the given index must be set already.
-             * @param aKey		the id of the container.
-             * @param xListener	the added interface. It is allowed to insert null or
-             *					the same pointer more than once.
-             * @return the new count of elements in the container (or 0 if the object is ready being disposed).
-             */
-            sal_Int32 addSpecialListener( const Key_& aKey, uno::Reference< lang::XEventListener > const& xListener) throw();
-
-            /**
-             * Remove an element from the container specified with the key.
-             * It uses the equal definition of uno objects to remove the interfaces.
-             * @param aKey		the id of the container.
-             * @param xListener	the removed interface.
-             * @return the new count of elements in the container (or 0 if the object is ready being disposed).
-             */
-            sal_Int32 removeSpecialListener( const Key_& aKey, uno::Reference< lang::XEventListener > const& xListener) throw();
-
-        private:
-            void implFillDisposer(DisposeNotifier& aNotifier, std::vector<BasicContainerInfo>::size_type nIndex);
-
-            cppu::OBroadcastHelperVar< cppu::OMultiTypeInterfaceContainerHelperVar< Key_,KeyHash_,KeyEq_ >, Key_ >		m_aSpecialHelper;
-            std::vector<BasicContainerInfo>	m_aContainers;
-            KeyToIndex_					m_aMapper;
-            bool m_bDisposeLock;
-        };
-//-----------------------------------------------------------------------------
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::checkAlive(uno::XInterface* pObject) volatile const throw(lang::DisposedException)
-        {
-            bool bAlive = !m_aSpecialHelper.bInDispose;
-            if (m_aSpecialHelper.bDisposed)
-            {
-                throw lang::DisposedException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The object has already been disposed")),pObject);
-            }
-            return bAlive;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        inline
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::isAlive() volatile const throw()
-        {
-            return !m_aSpecialHelper.bInDispose && !m_aSpecialHelper.bDisposed;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        inline
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::isDisposing() volatile const throw()
-        {
-            return !!m_aSpecialHelper.bInDispose;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        inline
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::isDisposed() volatile const throw()
-        {
-            return !!m_aSpecialHelper.bDisposed;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::disposeOne(std::vector<BasicContainerInfo>::size_type nIndex) throw()
-        {
-    //		OSL_ENSURE(!isDisposed(),"Object is already disposed in toto");
-            if (isAlive())
-            {
-                if (nIndex < m_aContainers.size())
-                {
-                    if (uno::XInterface* pObject = m_aContainers[nIndex].pInterface)
-                    {
-                        DisposeNotifier aNotifier(pObject);
-
-                        implFillDisposer(aNotifier, nIndex);
-                        m_aContainers[nIndex].pInterface = 0;
-                        delete m_aContainers[nIndex].pContainer;
-
-                        aNotifier.notify();
-                    }
-                }
-                return true;
-            }
-            else
-                return false;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::beginDisposing() throw()
-        {
-            if (isAlive())
-            {
-                m_aSpecialHelper.bInDispose = sal_True;
-                m_bDisposeLock = true;
-
-                return true;
-            }
-            return false;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        void SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::notifyDisposing() throw()
-        {
-            OSL_ENSURE(isDisposing(),"Disposing isn't in progress on this object");
-            OSL_ENSURE(m_bDisposeLock,"Duplicate call for dispose notification or disposing is not taking place");
-
-            if (m_bDisposeLock)
-            {
-                OSL_ASSERT(m_aSpecialHelper.bInDispose);
-
-                lang::EventObject aBaseEvt;
-                std::vector<DisposeNotifier> aNotifiers;
-
-                if (std::vector<BasicContainerInfo>::size_type size = m_aContainers.size())
-                {
-                    aNotifiers.reserve(m_aContainers.size());
-
-                    aBaseEvt.Source = m_aContainers[0].pInterface;
-                    for(std::vector<BasicContainerInfo>::size_type ix = 0; ix < size; ++ix)
-                    {
-                        if (m_aContainers[ix].pInterface)
-                        {
-                            aNotifiers.push_back(DisposeNotifier(m_aContainers[ix].pInterface));
-                            implFillDisposer(aNotifiers.back(), ix);
-                            m_aContainers[ix].pInterface = 0;
-                            delete m_aContainers[ix].pContainer;
-                        }
-                    }
-                }
-
-                m_bDisposeLock = false;
-
-                for(std::vector<BasicContainerInfo>::size_type jx = 0, count = aNotifiers.size(); jx < count; ++jx)
-                {
-                    aNotifiers[jx].notify();
-                }
-                // in case we missed something
-                m_aSpecialHelper.aLC.disposeAndClear( aBaseEvt );
-            }
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        void SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::endDisposing() throw()
-        {
-            OSL_ENSURE(isDisposing(),"Disposing isn't in progress on this object");
-
-            if (!isAlive())
-            {
-                OSL_ENSURE(!m_bDisposeLock,"Did you forget to notify ?");
-
-                m_aSpecialHelper.bDisposed = sal_True;
-                m_aSpecialHelper.bInDispose = sal_False;
-
-                if (m_bDisposeLock)
-                {
-                    m_bDisposeLock = false;
-                }
-            }
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::addListener( std::vector<BasicContainerInfo>::size_type nIndex, const uno::Type& aType, const uno::Reference< lang::XEventListener > & xListener ) throw()
-        {
-            if ( nIndex < m_aContainers.size() && m_aContainers[nIndex].pInterface  )
-            {
-                if ( isAlive() )
-                {
-                    if (m_aContainers[nIndex].pContainer == 0)
-                        m_aContainers[nIndex].pContainer = new cppu::OMultiTypeInterfaceContainerHelper(UnoApiLock::getLock());
-
-                    return m_aContainers[nIndex].pContainer->addInterface(aType,xListener);
-                }
-
-                else if (xListener.is())
-                {
-                    lang::EventObject aEvent(m_aContainers[nIndex].pInterface);
-                    try { xListener->disposing(aEvent); } catch (uno::Exception & ) {}
-                }
-
-            }
-            else
-                OSL_ENSURE(false, "Invalid index or interface not set");
-
-            return 0;
-        }
-//-----------------------------------------------------------------------------
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::addSpecialListener( const Key_& aKey, const uno::Reference< lang::XEventListener > & xListener ) throw()
-        {
-            std::vector<BasicContainerInfo>::size_type nIndex = m_aMapper.findIndexForKey(aKey);
-            if ( nIndex < m_aContainers.size() && m_aContainers[nIndex].pInterface  )
-            {
-                if ( isAlive() )
-                {
-                    return m_aSpecialHelper.aLC.addInterface(aKey,xListener);
-                }
-
-                else if (xListener.is())
-                {
-                    lang::EventObject aEvent(m_aContainers[nIndex].pInterface);
-                    try { xListener->disposing(aEvent); } catch (uno::Exception & ) {}
-                }
-            }
-            else
-                OSL_ENSURE(false, "Invalid index or interface not set");
-
-            return 0;
-        }
-//-----------------------------------------------------------------------------
-
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::removeListener( std::vector<BasicContainerInfo>::size_type nIndex, const uno::Type& aType, const uno::Reference< lang::XEventListener > & xListener ) throw()
-        {
-            OSL_ENSURE( !isDisposed(), "object is disposed" );
-
-            if ( isAlive() )
-            {
-                if ( nIndex < m_aContainers.size() && m_aContainers[nIndex].pContainer  )
-                {
-                    return m_aContainers[nIndex].pContainer->removeInterface(aType,xListener);
-                }
-            }
-            return 0;
-        }
-//-----------------------------------------------------------------------------
-
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        sal_Int32 SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::removeSpecialListener( const Key_& aKey, const uno::Reference< lang::XEventListener > & xListener ) throw()
-        {
-            OSL_ENSURE( !isDisposed(), "object is disposed" );
-
-            if ( isAlive() )
-                return m_aSpecialHelper.aLC.removeInterface(aKey, xListener );
-
-            else
-                return 0;
-        }
-//-----------------------------------------------------------------------------
-    // relation function. Uses KeyToIndex
-/*		template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::Index
-            SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::findIndexForKey(Key const& aKey)
-        {
-            m_aMapper.findIndexForKey(aKey);
-        }
-//-----------------------------------------------------------------------------
-    // relation function. Uses KeyToIndex
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        bool SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::findKeysForIndex(std::vector<BasicContainerInfo>::size_type nIndex, std::vector<Key_> & aKeys)
-        {
-            aKeys.clear();
-            m_aMapper.findKeysForIndex(nIndex,aKeys);
-            return !aKeys.empty();
-        }
-*///-----------------------------------------------------------------------------
-    // relation function. Uses KeyToIndex
-        template <class Key_, class KeyHash_, class KeyEq_, class KeyToIndex_>
-        void SpecialListenerContainer<Key_,KeyHash_,KeyEq_, KeyToIndex_>::implFillDisposer(DisposeNotifier& aNotifier, std::vector<BasicContainerInfo>::size_type nIndex)
-        {
-            if (cppu::OMultiTypeInterfaceContainerHelper* pMultiContainer = m_aContainers[nIndex].pContainer)
-            {
-                uno::Sequence< uno::Type > aTypes(pMultiContainer->getContainedTypes());
-                for (sal_Int32 ix = 0; ix < aTypes.getLength(); ++ix)
-                {
-                    cppu::OInterfaceContainerHelper* pContainer = pMultiContainer->getContainer(aTypes[ix]);
-                    OSL_ENSURE(pContainer,"No container, but the type ?");
-                    if (pContainer)
-                        aNotifier.appendAndClearContainer(pContainer);
-                }
-            }
-            std::vector<Key_> aKeys;
-            if (m_aMapper.findKeysForIndex(nIndex,aKeys))
-            {
-                for(typename std::vector<Key_>::iterator it = aKeys.begin(); it != aKeys.end(); ++it)
-                {
-                    if (cppu::OInterfaceContainerHelper* pContainer = m_aSpecialHelper.aLC.getContainer(*it))
-                    {
-                        aNotifier.appendAndClearContainer(pContainer);
-                    }
-                }
-            }
-        }
-//-----------------------------------------------------------------------------
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-        template <class Listener>
-        inline
-        void ListenerContainerIterator<Listener>::advance()
-        {
-            while (!m_xNext.is() && m_aIter.hasMoreElements())
-            {
-                m_xNext = m_xNext.query( m_aIter.next() );
-            }
-        }
-//-----------------------------------------------------------------------------
-
-        template <class Listener>
-        uno::Reference<Listener> ListenerContainerIterator<Listener>::next()
-        {
-            uno::Reference<Listener> xRet(m_xNext);
-            m_xNext.clear();
-            advance();
-            return xRet;
-        }
-//-----------------------------------------------------------------------------
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-    }
-}
-#endif // CONFIGMGR_API_LISTENERCONTAINER_HXX_
-
-
diff --git a/configmgr/source/api2/makefile.mk b/configmgr/source/api2/makefile.mk
deleted file mode 100644
index cb79cf0f3e..0000000000
--- a/configmgr/source/api2/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.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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source$/inc
-PRJNAME=configmgr
-TARGET=api2
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-        $(SLO)$/broadcaster.obj		\
-        $(SLO)$/listenercontainer.obj		\
-        $(SLO)$/provider.obj		\
-        $(SLO)$/providerimpl.obj	\
-        $(SLO)$/accessimpl.obj		\
-        $(SLO)$/apiaccessobj.obj	\
-        $(SLO)$/apiserviceinfo.obj	\
-        $(SLO)$/apifactory.obj	\
-        $(SLO)$/apifactoryimpl.obj	\
-        $(SLO)$/apinodeaccess.obj	\
-        $(SLO)$/apinodeupdate.obj	\
-        $(SLO)$/apinotifierimpl.obj	\
-        $(SLO)$/apitreeaccess.obj	\
-        $(SLO)$/apitreeimplobj.obj	\
-        $(SLO)$/confignotifier.obj	\
-        $(SLO)$/committer.obj	\
-        $(SLO)$/elementaccess.obj	\
-        $(SLO)$/elementimpl.obj	\
-        $(SLO)$/groupaccess.obj	\
-        $(SLO)$/groupobjects.obj	\
-        $(SLO)$/groupupdate.obj	\
-        $(SLO)$/propertiesfilterednotifier.obj	\
-        $(SLO)$/propertyinfohelper.obj	\
-        $(SLO)$/propertysetaccess.obj	\
-        $(SLO)$/propsetaccessimpl.obj	\
-        $(SLO)$/setaccess.obj		\
-        $(SLO)$/setobjects.obj		\
-        $(SLO)$/setupdate.obj		\
-        $(SLO)$/translatechanges.obj	\
-        $(SLO)$/treeiterators.obj \
-        $(SLO)$/updateimpl.obj		\
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/api2/notifierimpl.hxx b/configmgr/source/api2/notifierimpl.hxx
deleted file mode 100644
index 445ef00d31..0000000000
--- a/configmgr/source/api2/notifierimpl.hxx
+++ /dev/null
@@ -1,241 +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: notifierimpl.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_NOTIFIERIMPL_HXX_
-#define CONFIGMGR_API_NOTIFIERIMPL_HXX_
-
-#include "listenercontainer.hxx"
-
-#include "noderef.hxx"
-#include "valueref.hxx"
-
-#include <com/sun/star/beans/XPropertyChangeListener.hpp> 
-#include <com/sun/star/beans/XVetoableChangeListener.hpp> 
-#include <com/sun/star/beans/XPropertiesChangeListener.hpp> 
-#include <com/sun/star/beans/PropertyVetoException.hpp> 
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/util/XChangesListener.hpp>
-
-#include "propertiesfilterednotifier.hxx"
-
-#include <vos/refernce.hxx>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-// ---------------------------------------------------------------------------------------------------
-
-        struct SubNodeHash
-        { 
-            size_t operator() (const configuration::SubNodeID& rKey) const {return rKey.hashCode();}
-        };
-        struct SubNodeEq 
-        {  
-            bool operator() (const configuration::SubNodeID& lhs,const configuration::SubNodeID& rhs) const {return lhs == rhs;}
-        };
-        struct SubNodeToIndex 
-        {  
-            rtl::Reference< configuration::Tree > aTree;
-
-            SubNodeToIndex( rtl::Reference< configuration::Tree > const& rTree ) : aTree(rTree) {}
-
-            bool findKeysForIndex(unsigned int nNode, std::vector<configuration::SubNodeID>& aList)
-            {
-                aList.clear();
-                configuration::getAllChildrenHelper(configuration::findNodeFromIndex(aTree,nNode), aList);
-                return !aList.empty();
-            }
-            unsigned int findIndexForKey(configuration::SubNodeID const& aNode)
-            {
-                return aNode.getParentID().toIndex();
-            }
-        };
-
-        /// manages collections of event listeners observing a whole config tree, thread-safe
-        class NotifierImpl : public vos::OReference
-        {
-        public:
-            SpecialListenerContainer <configuration::SubNodeID,SubNodeHash,SubNodeEq,SubNodeToIndex> m_aListeners;
-
-        public:
-            /// construct this around the given Implementation, for the given tree
-            explicit
-            NotifierImpl(rtl::Reference< configuration::Tree > const& aTree);
-            ~NotifierImpl();
-            
-            /// Add a <type scope='com::sun::star::lang'>XEventListener</type> observing <var>aNode</var>.
-            void add(configuration::NodeID const& aNode, uno::Reference< css::lang::XEventListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /// Add a <type scope='com::sun::star::container'>XContainerListener</type> observing <var>aNode</var>.
-            void add(configuration::NodeID const& aNode, uno::Reference< css::container::XContainerListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /// Add a <type scope='com::sun::star::util'>XChangesListener</type> observing <var>aNode</var> and its descendants.
-            void add(configuration::NodeID const& aNode, uno::Reference< css::util::XChangesListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /// Add a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing <var>aNode</var>.
-            void addNamed(configuration::SubNodeID const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addSpecialListener(aNode,xListener.get());
-            }
-            /// Add a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing <var>aNode</var>.
-            void addForAll(configuration::NodeID const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-            /// Add a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining <var>aNode</var>.
-            void addNamed(configuration::SubNodeID const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addSpecialListener(aNode,xListener.get());
-            }
-            /// Add a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining <var>aNode</var>.
-            void addForAll(configuration::NodeID const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /** Add a <type scope='com::sun::star::beans'>XPropertiesChangeListener</type> 
-                observing all properties of <var>aNode</var>.
-            */
-            void add(configuration::NodeID const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-
-                // ignore the names for now
-                m_aListeners.addListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /** Add a <type scope='com::sun::star::beans'>XPropertiesChangeListener</type> 
-                observing the properties of <var>aNode</var> (optimally only those given by <var>aNames</var>.
-            */
-            void add(configuration::NodeID const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener, uno::Sequence< rtl::OUString> const& aNames)
-            {
-                OSL_PRECOND(xListener.is(), "ERROR: Unexpected NULL listener");
-                OSL_PRECOND(aNames.getLength() > 0, "ERROR: Unexpected empty sequence");
-
-                uno::Reference< css::beans::XPropertiesChangeListener > xForwarder( new PropertiesFilteredNotifier(xListener,aNames) );
-                // ignore the names for now
-                add(aNode,xForwarder);
-            }
-
-        // ---------------------------------------------------------------------------------------------------
-            /// Remove a <type scope='com::sun::star::lang'>XEventListener</type> observing <var>aNode</var>.
-            void remove(configuration::NodeID const& aNode, uno::Reference< css::lang::XEventListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /// Remove a <type scope='com::sun::star::container'>XContainerListener</type> observing <var>aNode</var>.
-            void remove(configuration::NodeID const& aNode, uno::Reference< css::container::XContainerListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /// Remove a <type scope='com::sun::star::util'>XChangesListener</type> observing <var>aNode</var> and its descendants.
-            void remove(configuration::NodeID const& aNode, uno::Reference< css::util::XChangesListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-            /// Remove a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing <var>aNode</var>.
-            void removeNamed(configuration::SubNodeID const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeSpecialListener(aNode,xListener.get());
-            }
-            /// Remove a <type scope='com::sun::star::beans'>XPropertyChangeListener</type> observing <var>aNode</var>.
-            void removeForAll(configuration::NodeID const& aNode, uno::Reference< css::beans::XPropertyChangeListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-            /// Remove a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining <var>aNode</var>.
-            void removeNamed(configuration::SubNodeID const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeSpecialListener(aNode,xListener.get());
-            }
-            /// Remove a <type scope='com::sun::star::beans'>XVetoableChangeListener</type> constraining <var>aNode</var>.
-            void removeForAll(configuration::NodeID const& aNode, uno::Reference< css::beans::XVetoableChangeListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-
-
-            /** Remove a <type scope='com::sun::star::beans'>XPropertiesChangeListener</type> 
-                observing any properties of <var>aNode</var>.
-            */
-            void remove(configuration::NodeID const& aNode, uno::Reference< css::beans::XPropertiesChangeListener > const& xListener)
-            {
-                // ignore the names for now
-                m_aListeners.removeListener(aNode.toIndex(),getCppuType(&xListener),xListener.get());
-            }
-        // ---------------------------------------------------------------------------------------------------
-        };
-
-// ---------------------------------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_API_NOTIFIERIMPL_HXX_
diff --git a/configmgr/source/api2/objectregistry.hxx b/configmgr/source/api2/objectregistry.hxx
deleted file mode 100644
index 5e28fdad5a..0000000000
--- a/configmgr/source/api2/objectregistry.hxx
+++ /dev/null
@@ -1,98 +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: objectregistry.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_OBJECTREGISTRY_HXX_
-#define CONFIGMGR_API_OBJECTREGISTRY_HXX_
-
-#include "noderef.hxx"
-
-#include <osl/mutex.hxx>
-#include <vos/refernce.hxx>
-
-#include <hash_map>
-#include "tracer.hxx"
-
-namespace configmgr
-{
-    namespace configapi
-    {
-
-        class NodeElement;
-
-        class ObjectRegistry : public vos::OReference
-        {
-        public:
-            static NodeElement* notFound() { return 0; }
-
-            struct KeyHash
-            {
-                size_t operator() (const configuration::NodeID& rKey) const {return rKey.hashCode();}
-            };
-            struct KeyEq
-            {
-                bool operator() (const configuration::NodeID& lhs,const configuration::NodeID& rhs) const {return lhs == rhs;}
-            };
-            typedef std::hash_map<configuration::NodeID,NodeElement*,KeyHash, KeyEq> ObjectMap;
-        public:
-            ObjectRegistry() {}
-            ~ObjectRegistry();
-
-            NodeElement*	findElement(configuration::NodeID const& aNode) const
-            {
-                ObjectMap::const_iterator aFound = m_aMap.find(aNode);
-
-                return (aFound != m_aMap.end()) ? aFound->second : notFound();
-            }
-            void registerElement(configuration::NodeID const& aNode, NodeElement* aElement)
-            {
-                OSL_ENSURE(m_aMap.find(aNode) == m_aMap.end(), "ERROR: Node is already registered");
-
-                m_aMap[aNode] = aElement;
-            }
-            void revokeElement(configuration::NodeID const& aNode, NodeElement* aElement)
-            {
-                ObjectMap::iterator aFound = m_aMap.find(aNode);
-
-                if (aFound != m_aMap.end())
-                {
-                    OSL_ENSURE(aFound->second == aElement,"Found unexpected element in map");
-
-                    if (aFound->second == aElement)
-                        m_aMap.erase(aFound);
-                }
-            }
-        private:
-            ObjectMap m_aMap;
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_API_FACTORY_HXX_
diff --git a/configmgr/source/api2/propertiesfilterednotifier.cxx b/configmgr/source/api2/propertiesfilterednotifier.cxx
deleted file mode 100644
index 7e4a13f9b9..0000000000
--- a/configmgr/source/api2/propertiesfilterednotifier.cxx
+++ /dev/null
@@ -1,154 +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: propertiesfilterednotifier.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_configmgr.hxx"
-
-#include "propertiesfilterednotifier.hxx"
-
-#include <cppuhelper/queryinterface.hxx>
-
-namespace configmgr
-{
-    namespace uno	= ::com::sun::star::uno;
-    namespace lang	= ::com::sun::star::lang;
-    namespace beans	= ::com::sun::star::beans;
-
-//-----------------------------------------------------------------------------
-//	class PropertiesFilteredNotifier 
-//-----------------------------------------------------------------------------
-
-PropertiesFilteredNotifier::PropertiesFilteredNotifier(
-    uno::Reference< beans::XPropertiesChangeListener >const& xTarget,
-    uno::Sequence< rtl::OUString > const& aFilterNames
-)
-: m_aRefCount()
-, m_xTarget(xTarget)
-, m_aFilterNames(aFilterNames)
-{
-    OSL_ENSURE(xTarget.is(),"PropertiesFilteredNotifier: FORWARDING TO NULL LISTENER");
-    OSL_ENSURE(aFilterNames.getLength() > 0,"PropertiesFilteredNotifier: FILTER IS EMPTY (no target)");
-}
-//-----------------------------------------------------------------------------
-
-PropertiesFilteredNotifier::~PropertiesFilteredNotifier()
-{
-}
-//-----------------------------------------------------------------------------
-
-void SAL_CALL PropertiesFilteredNotifier::acquire() throw()
-{
-    m_aRefCount.acquire();
-}
-//-----------------------------------------------------------------------------
-
-void SAL_CALL PropertiesFilteredNotifier::release(  ) throw()
-{
-    if (m_aRefCount.release() == 0)
-        delete this;
-}
-//-----------------------------------------------------------------------------
-
-uno::Any SAL_CALL PropertiesFilteredNotifier::queryInterface( const uno::Type& aType ) 
-    throw(uno::RuntimeException)
-{
-    return cppu::queryInterface(aType
-                , static_cast< beans::XPropertiesChangeListener *>(this)
-                , static_cast< lang::XEventListener *>(this)
-                , static_cast< uno::XInterface *>(this)
-            );				
-}
-//-----------------------------------------------------------------------------
-
-void SAL_CALL PropertiesFilteredNotifier::disposing( const lang::EventObject& Source ) 
-    throw(uno::RuntimeException)
-{
-    if (m_xTarget.is()) 
-        m_xTarget->disposing(Source);
-}
-//-----------------------------------------------------------------------------
-        
-inline // private and only used twice
-bool PropertiesFilteredNotifier::implAccept(const ::com::sun::star::beans::PropertyChangeEvent& evt) const
-{
-    // todo: optimize by presorting and binary searching
-    sal_Int32 const nCount = m_aFilterNames.getLength();
-
-    for (sal_Int32 i = 0; i<nCount; ++i)
-        if (evt.PropertyName == m_aFilterNames[i])
-            return true;
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-// private and only used once
-uno::Sequence< beans::PropertyChangeEvent > PropertiesFilteredNotifier::implFilter(const uno::Sequence< beans::PropertyChangeEvent >& evt) 	const
-{
-    sal_Int32 const nSize = evt.getLength();
-    sal_Int32 nAccepted = 0;
-    
-    while ( nAccepted < nSize && implAccept(evt[nAccepted]) )
-        ++nAccepted;
-
-    if (nAccepted == nSize) // all accepted
-        return evt;
-
-    // create a modified copy
-    uno::Sequence< beans::PropertyChangeEvent > aResult(evt);
-    for (sal_Int32 nCur = nAccepted+1; nCur<nSize; ++nCur)
-    {
-        if (implAccept(evt[nCur]))
-        {
-            aResult[nAccepted++] = evt[nCur];
-        }
-    }
-    aResult.realloc(nAccepted);
-    OSL_ASSERT(aResult.getLength() == nAccepted);
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-void SAL_CALL PropertiesFilteredNotifier::propertiesChange( const uno::Sequence< beans::PropertyChangeEvent >& evt ) 
-    throw(uno::RuntimeException)
-{
-    uno::Sequence< beans::PropertyChangeEvent > aFilteredEvt( implFilter(evt) );
-
-    if (aFilteredEvt.getLength() > 0)
-    {
-        if (m_xTarget.is())
-            m_xTarget->propertiesChange(aFilteredEvt);
-    }
-}
-//-----------------------------------------------------------------------------
-
-}
-
-
diff --git a/configmgr/source/api2/propertiesfilterednotifier.hxx b/configmgr/source/api2/propertiesfilterednotifier.hxx
deleted file mode 100644
index 235a68e54e..0000000000
--- a/configmgr/source/api2/propertiesfilterednotifier.hxx
+++ /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: propertiesfilterednotifier.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 CONFIGMGR_PROPERTIESFILTEREDNOTIFIER_HXX_
-#define CONFIGMGR_PROPERTIESFILTEREDNOTIFIER_HXX_
-
-#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
-
-#include <vos/refernce.hxx>
-
-namespace configmgr
-{
-    class PropertiesFilteredNotifier 
-    : public ::com::sun::star::beans::XPropertiesChangeListener
-    {
-    public:
-        PropertiesFilteredNotifier(
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > const& xTarget,
-            ::com::sun::star::uno::Sequence< ::rtl::OUString > const& aFilterNames
-        );
-        virtual ~PropertiesFilteredNotifier();
-
-    public:
-        virtual void SAL_CALL acquire(  ) throw();
-        virtual void SAL_CALL release(  ) throw();
-
-        virtual ::com::sun::star::uno::Any SAL_CALL
-            queryInterface( const ::com::sun::star::uno::Type& aType ) 
-                throw(::com::sun::star::uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            disposing( const ::com::sun::star::lang::EventObject& Source ) 
-                throw(::com::sun::star::uno::RuntimeException) ;
-
-        virtual void SAL_CALL 
-            propertiesChange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt ) 
-                throw(::com::sun::star::uno::RuntimeException);
-    private:
-        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent > 
-            implFilter(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) 
-                const;
-
-        bool implAccept(const ::com::sun::star::beans::PropertyChangeEvent& evt) const;
-
-        ::vos::ORefCount m_aRefCount;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener > m_xTarget;
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aFilterNames;
-    };
-}
-
-#endif // CONFIGMGR_PROPERTIESFILTEREDNOTIFIER_HXX_
-
diff --git a/configmgr/source/api2/propertyinfohelper.cxx b/configmgr/source/api2/propertyinfohelper.cxx
deleted file mode 100644
index 2b9acdfd94..0000000000
--- a/configmgr/source/api2/propertyinfohelper.cxx
+++ /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: propertyinfohelper.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_configmgr.hxx"
-
-#include "propertyinfohelper.hxx"
-#include "configpath.hxx"
-#include "attributes.hxx"
-
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HDL_
-#include <com/sun/star/beans/PropertyAttribute.hdl>
-#endif
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-    namespace beans = ::com::sun::star::beans;
-
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-beans::Property helperMakeProperty(rtl::OUString const& aName, 
-                                   node::Attributes const aAttributes, 
-                                   uno::Type const& aType,
-                                   bool bDefaultable ) 
-    throw(uno::RuntimeException)
-{
-    namespace PropertyAttribute = com::sun::star::beans::PropertyAttribute;
-
-    sal_Int16 nPropAttributes = 0;
-    if (aAttributes.isReadonly())		nPropAttributes |= PropertyAttribute::READONLY;
-    if (aAttributes.isNullable())		nPropAttributes |= PropertyAttribute::MAYBEVOID;
-    /*if ( aAttributes.bNotified)*/	nPropAttributes |= PropertyAttribute::BOUND;
-    /*if ( aAttributes.bConstrained)nPropAttributes |= PropertyAttribute::CONSTRAINED;*/
-
-    if ( aAttributes.isRemovable())		nPropAttributes |= PropertyAttribute::REMOVABLE;
-    if ( bDefaultable)	nPropAttributes |= PropertyAttribute::MAYBEDEFAULT;
-
-    return beans::Property(aName, -1, aType, nPropAttributes);
-}
-//-----------------------------------------------------------------------------
-    }
-
-}
-
-
diff --git a/configmgr/source/api2/propertyinfohelper.hxx b/configmgr/source/api2/propertyinfohelper.hxx
deleted file mode 100644
index 657ee983cc..0000000000
--- a/configmgr/source/api2/propertyinfohelper.hxx
+++ /dev/null
@@ -1,59 +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: propertyinfohelper.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 CONFIGMGR_API_PROPERTYINFOIMPL_HXX_
-#define CONFIGMGR_API_PROPERTYINFOIMPL_HXX_
-
-#include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-
-namespace configmgr
-{
-    namespace uno = ::com::sun::star::uno;
-    namespace beans = ::com::sun::star::beans;
-
-    /* implementations of the interfaces supported by a (parent) node
-        within the configuration tree.
-        (read-only operation)
-    */
-    namespace node  { struct Attributes; }
-
-    namespace configapi
-    {
-        // translation helper
-        beans::Property helperMakeProperty( rtl::OUString const& aName, node::Attributes const aAttributes, uno::Type const& aType, bool bDefaultable ) 
-            throw(uno::RuntimeException);
-
-    }
-
-}
-#endif // CONFIGMGR_API_PROPERTYINFOIMPL_HXX_
-
-
diff --git a/configmgr/source/api2/propertysetaccess.cxx b/configmgr/source/api2/propertysetaccess.cxx
deleted file mode 100644
index 7a9be49a33..0000000000
--- a/configmgr/source/api2/propertysetaccess.cxx
+++ /dev/null
@@ -1,278 +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: propertysetaccess.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_configmgr.hxx"
-
-#include "propertysetaccess.hxx"
-#include "propsetaccessimpl.hxx"
-#include "apinotifierimpl.hxx"
-#include "apinodeaccess.hxx"
-#include "apinodeupdate.hxx"
-
-namespace configmgr
-{
-//////////////////////////////////////////////////////////////////////////////////
-// class BasicPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////////////
-// getting Property Metadata
-//////////////////////////////////////////////////////////////////////////////////
-
-// XPropertySet & XMultiPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-uno::Reference< beans::XPropertySetInfo > SAL_CALL BasicPropertySet::getPropertySetInfo(  ) 
-    throw(uno::RuntimeException) 
-{ 
-    return configapi::implGetPropertySetInfo( getNode(), NULL != maybeGetUpdateAccess() ); 
-}
-
-// XHierarchicalPropertySet & XHierarchicalMultiPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-uno::Reference< beans::XHierarchicalPropertySetInfo > SAL_CALL BasicPropertySet::getHierarchicalPropertySetInfo(  ) 
-    throw(uno::RuntimeException) 
-{ 
-    return configapi::implGetHierarchicalPropertySetInfo( getNode() ); 
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-// setting values - may all throw (PropertyVeto)Exceptions on read-only property sets
-//////////////////////////////////////////////////////////////////////////////////
-
-/// get the access for updating, check that it is present
-configapi::NodeGroupAccess& BasicPropertySet::getGroupNode()
-{
-    configapi::NodeGroupAccess* pAccess = maybeGetUpdateAccess();
-    OSL_ENSURE(pAccess, "Write operation invoked on a read-only node access - failing with PropertyVetoException");
-
-    if (!pAccess)
-    {
-        throw beans::PropertyVetoException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: INTERNAL VETO - Write operation invoked on a read-only node access")),
-                static_cast< beans::XPropertySet * >(this)
-            );
-    }
-    return *pAccess;			
-}
-
-// XPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicPropertySet::setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-          lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implSetPropertyValue( getGroupNode(), aPropertyName, aValue ); 
-}
-
-// XMultiPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicPropertySet::setPropertyValues( const uno::Sequence< rtl::OUString >& PropertyNames, const uno::Sequence< uno::Any >& Values ) 
-    throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-          lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implSetPropertyValues( getGroupNode(), PropertyNames, Values ); 
-}
-
-// XHierarchicalPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicPropertySet::setHierarchicalPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-          lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implSetHierarchicalPropertyValue( getGroupNode(), aPropertyName, aValue ); 
-}
-
-// XMultiHierarchicalPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicPropertySet::setHierarchicalPropertyValues( const uno::Sequence< rtl::OUString >& PropertyNames, const uno::Sequence< uno::Any >& Values ) 
-    throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-          lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implSetHierarchicalPropertyValues( getGroupNode(), PropertyNames, Values ); 
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////
-// getting values
-//////////////////////////////////////////////////////////////////////////////////
-// XPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-uno::Any SAL_CALL BasicPropertySet::getPropertyValue( const rtl::OUString& aPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    return configapi::implGetPropertyValue( getNode(), aPropertyName ); 
-}
-
-// XMultiPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-uno::Sequence< uno::Any > SAL_CALL BasicPropertySet::getPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(uno::RuntimeException) 
-{ 
-    return configapi::implGetPropertyValues( getNode(), aPropertyNames ); 
-}
-
-// XHierarchicalPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-uno::Any SAL_CALL BasicPropertySet::getHierarchicalPropertyValue( const rtl::OUString& aPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    return configapi::implGetHierarchicalPropertyValue( getNode(), aPropertyName ); 
-}
-
-// XMultiHierarchicalPropertySet
-//////////////////////////////////////////////////////////////////////////////////
-uno::Sequence< uno::Any > SAL_CALL BasicPropertySet::getHierarchicalPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(uno::RuntimeException) 
-{ 
-    return configapi::implGetHierarchicalPropertyValues( getNode(), aPropertyNames ); 
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-// adding/removing listeners
-//////////////////////////////////////////////////////////////////////////////////
-
-void SAL_CALL BasicPropertySet::addVetoableChangeListener( const rtl::OUString& aPropertyName, const uno::Reference< beans::XVetoableChangeListener >& xListener ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implAddListener( getNode(), xListener, aPropertyName ); 
-}
-
-void SAL_CALL BasicPropertySet::addPropertyChangeListener( const rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implAddListener( getNode(), xListener, aPropertyName ); 
-}
-
-void SAL_CALL BasicPropertySet::addPropertiesChangeListener( const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-    throw(uno::RuntimeException) 
-{ 
-    configapi::implAddListener( getNode(), xListener, aPropertyNames ); 
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicPropertySet::removeVetoableChangeListener( const rtl::OUString& aPropertyName, const uno::Reference< beans::XVetoableChangeListener >& xListener ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implRemoveListener( getNode(), xListener, aPropertyName ); 
-}
-//---------------------------------------------------------------------------------
-
-void SAL_CALL BasicPropertySet::removePropertyChangeListener( const rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-{ 
-    configapi::implRemoveListener( getNode(), xListener, aPropertyName ); 
-}
-//---------------------------------------------------------------------------------
-
-void SAL_CALL BasicPropertySet::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-    throw(uno::RuntimeException) 
-{ 
-    configapi::implRemoveListener( getNode(), xListener ); 
-}
-//---------------------------------------------------------------------------------
-
-
-//////////////////////////////////////////////////////////////////////////////////
-// SPECIAL: XMultiPropertySet::firePropertiesChangeEvent
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicPropertySet::firePropertiesChangeEvent( const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-    throw(uno::RuntimeException) 
-{ 
-    configapi::implFirePropertiesChangeEvent( getNode(),aPropertyNames , xListener ); 
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-// XPropertyState / XMultiPropertyStates
-//////////////////////////////////////////////////////////////////////////////////
-
-// getting property states
-//////////////////////////////////////////////////////////////////////////////////
-
-beans::PropertyState SAL_CALL BasicPropertySet::getPropertyState( const rtl::OUString& sPropertyName ) 
-        throw(beans::UnknownPropertyException, uno::RuntimeException) 
-{ 
-    return configapi::implGetPropertyState( getNode(), sPropertyName); 
-}
-//---------------------------------------------------------------------------------
-
-uno::Sequence< beans::PropertyState > SAL_CALL BasicPropertySet::getPropertyStates( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException) 
-{ 
-    return configapi::implGetPropertyStates( getNode(), aPropertyNames ); 
-}
-//---------------------------------------------------------------------------------
-
-// setting to default state
-//////////////////////////////////////////////////////////////////////////////////
-
-void SAL_CALL BasicPropertySet::setPropertyToDefault( const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException) 
-{ 
-    configapi::implSetPropertyToDefault( getGroupNode(), sPropertyName); 
-}
-//---------------------------------------------------------------------------------
-
-void SAL_CALL BasicPropertySet::setPropertiesToDefault( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw (beans::UnknownPropertyException, uno::RuntimeException)
-{ 
-    configapi::implSetPropertiesToDefault( getGroupNode(), aPropertyNames); 
-}
-//---------------------------------------------------------------------------------
-
-void SAL_CALL BasicPropertySet::setAllPropertiesToDefault(  ) 
-    throw (uno::RuntimeException)
-{ 
-    configapi::implSetAllPropertiesToDefault( getGroupNode() ); 
-}
-//---------------------------------------------------------------------------------
-
-// getting defaults
-//////////////////////////////////////////////////////////////////////////////////
-
-uno::Any SAL_CALL BasicPropertySet::getPropertyDefault( const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) 
-
-{ 
-    return configapi::implGetPropertyDefault( getNode(), sPropertyName); 
-}
-//---------------------------------------------------------------------------------
-
-uno::Sequence< uno::Any > SAL_CALL BasicPropertySet::getPropertyDefaults( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{ 
-    return configapi::implGetPropertyDefaults( getNode(), aPropertyNames); 
-}
-//---------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/propertysetaccess.hxx b/configmgr/source/api2/propertysetaccess.hxx
deleted file mode 100644
index 0cf8d0580f..0000000000
--- a/configmgr/source/api2/propertysetaccess.hxx
+++ /dev/null
@@ -1,218 +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: propertysetaccess.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 CONFIGMGR_API_PROPERTYSET_HXX_
-#define CONFIGMGR_API_PROPERTYSET_HXX_
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XHierarchicalPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <cppuhelper/implbase6.hxx>
-
-namespace configmgr
-{
-/////////////////////////////////////////////////////////////////////////////////////////////
-    namespace css	= ::com::sun::star;
-    namespace uno		= css::uno;
-    namespace lang		= css::lang;
-    namespace beans		= css::beans;
-
-    namespace configapi 
-    { 
-        class NodeGroupAccess; 
-        class NodeGroupInfoAccess; 
-    }
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-/** implements the interfaces supported by a group node, viewed as a property set
-    within the configuration tree.
-    <p> Is an interface adapter around <type scope='configmgr::configapi'>NodeGroup(Info)Access</type>.</p>
-*/
-class BasicPropertySet
-: public ::cppu::ImplHelper6
-            <	beans::XPropertySet
-            ,	beans::XMultiPropertySet
-            ,	beans::XHierarchicalPropertySet
-            ,	beans::XMultiHierarchicalPropertySet
-            ,	beans::XPropertyState
-            ,	beans::XMultiPropertyStates
-            >
-{
-protected:
-// Constructors & Destructors
-    virtual ~BasicPropertySet() {}
-
-public:
-// getting Property Metadata
-    // XPropertySet & XMultiPropertySet
-    virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL 
-        getPropertySetInfo(  ) 
-            throw(uno::RuntimeException);
-
-    // XHierarchicalPropertySet & XHierarchicalMultiPropertySet
-    virtual uno::Reference< beans::XHierarchicalPropertySetInfo > SAL_CALL 
-        getHierarchicalPropertySetInfo(  ) 
-            throw(uno::RuntimeException);
-
-// setting values - may all throw (PropertyVeto)Exceptions on read-only property sets
-    // XPropertySet
-    virtual void SAL_CALL
-        setPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-            throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-                  lang::WrappedTargetException, uno::RuntimeException);
-
-     // XMultiPropertySet
-   virtual void SAL_CALL 
-        setPropertyValues( const uno::Sequence< rtl::OUString >& PropertyNames, const uno::Sequence< uno::Any >& Values ) 
-            throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-                  lang::WrappedTargetException, uno::RuntimeException);
-
-    // XHierarchicalPropertySet
-    virtual void SAL_CALL
-        setHierarchicalPropertyValue( const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-            throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-                  lang::WrappedTargetException, uno::RuntimeException);
-
-     // XMultiHierarchicalPropertySet
-   virtual void SAL_CALL 
-        setHierarchicalPropertyValues( const uno::Sequence< rtl::OUString >& PropertyNames, const uno::Sequence< uno::Any >& Values ) 
-            throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-                  lang::WrappedTargetException, uno::RuntimeException);
-
-// getting values
-    // XPropertySet
-    virtual uno::Any SAL_CALL 
-        getPropertyValue( const rtl::OUString& PropertyName ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-     // XMultiPropertySet
-    virtual uno::Sequence< uno::Any > SAL_CALL 
-        getPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw(uno::RuntimeException);
-
-    // XHierarchicalPropertySet
-    virtual uno::Any SAL_CALL 
-        getHierarchicalPropertyValue( const rtl::OUString& PropertyName ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-     // XMultiHierarchicalPropertySet
-    virtual uno::Sequence< uno::Any > SAL_CALL 
-        getHierarchicalPropertyValues( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw(uno::RuntimeException);
-
-// adding listeners
-    // XPropertySet
-    virtual void SAL_CALL 
-        addPropertyChangeListener( const rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-     // XMultiPropertySet
-    virtual void SAL_CALL 
-        addPropertiesChangeListener( const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-// removing listeners
-    // XPropertySet
-    virtual void SAL_CALL 
-        removePropertyChangeListener( const rtl::OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-     // XMultiPropertySet
-    virtual void SAL_CALL 
-        removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& Listener ) 
-            throw(uno::RuntimeException);
-
-// SPECIAL: support for VetoableChangeListeners
-    // XPropertySet
-    virtual void SAL_CALL 
-        addVetoableChangeListener( const rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-  
-    virtual void SAL_CALL 
-        removeVetoableChangeListener( const rtl::OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-// SPECIAL: firePropertiesChangeEvent
-     // XMultiPropertySet
-    virtual void SAL_CALL 
-        firePropertiesChangeEvent( const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-// XPropertyState
-    virtual beans::PropertyState SAL_CALL 
-        getPropertyState( const rtl::OUString& PropertyName ) 
-            throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-    // see below: 
-    // virtual uno::Sequence< beans::PropertyState > SAL_CALL 
-    //	  getPropertyStates( const uno::Sequence< rtl::OUString >& aPropertyName ) 
-    //		throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-    virtual void SAL_CALL 
-        setPropertyToDefault( const rtl::OUString& PropertyName ) 
-            throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-    virtual uno::Any SAL_CALL 
-        getPropertyDefault( const rtl::OUString& aPropertyName ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-// XMultiPropertyStates
-    virtual uno::Sequence< beans::PropertyState > SAL_CALL 
-        getPropertyStates( const uno::Sequence< rtl::OUString >& aPropertyName ) 
-            throw (beans::UnknownPropertyException, uno::RuntimeException);
-
-    virtual void SAL_CALL 
-        setAllPropertiesToDefault(  ) 
-            throw (uno::RuntimeException);
-
-    virtual void SAL_CALL 
-        setPropertiesToDefault( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw (beans::UnknownPropertyException, uno::RuntimeException);
-
-    virtual uno::Sequence< uno::Any > SAL_CALL 
-        getPropertyDefaults( const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-protected:
-    virtual configapi::NodeGroupInfoAccess&			getNode() = 0;
-            configapi::NodeGroupAccess&				getGroupNode();
-    virtual configapi::NodeGroupAccess*				maybeGetUpdateAccess() = 0;
-};
-
-//--------------------------------------------------------------------------
-
-}
-#endif // CONFIGMGR_API_PROPERTYSET_HXX_
-
-
diff --git a/configmgr/source/api2/propsetaccessimpl.cxx b/configmgr/source/api2/propsetaccessimpl.cxx
deleted file mode 100644
index be1f571076..0000000000
--- a/configmgr/source/api2/propsetaccessimpl.cxx
+++ /dev/null
@@ -1,1287 +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: propsetaccessimpl.cxx,v $
- * $Revision: 1.24.10.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_configmgr.hxx"
-
-#include "propsetaccessimpl.hxx"
-#include "propertyinfohelper.hxx"
-#include "apinodeaccess.hxx"
-#include "apinodeupdate.hxx"
-#include "noderef.hxx"
-#include "valueref.hxx"
-#include "anynoderef.hxx"
-#include "nodechange.hxx"
-#include "configgroup.hxx"
-#include "confignotifier.hxx"
-#include "broadcaster.hxx"
-#include "apitypes.hxx"
-#include "attributes.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <osl/diagnose.h>
-#include <cppuhelper/implbase1.hxx>
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-
-namespace configmgr
-{
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------------
-        namespace lang = css::lang;
-        namespace beans = css::beans;
-
-//-----------------------------------------------------------------------------------
-// a helper class
-//-----------------------------------------------------------------------------------
-
-class CollectProperties : configuration::NodeVisitor
-{
-    std::vector< beans::Property >		m_aProperties;
-    sal_Bool					m_bReadonly;
-public:
-    CollectProperties(sal_Bool _bReadonly) 
-    : m_bReadonly(_bReadonly)
-    { }
-    CollectProperties(sal_Bool _bReadonly, sal_Int32 _nCount) 
-    : m_bReadonly(_bReadonly) 
-    { m_aProperties.reserve(_nCount); }
-
-    uno::Sequence<beans::Property> forChildren(rtl::Reference< configuration::Tree > const& _aPropertyTree, configuration::NodeRef const& _rNode)
-    {
-        OSL_ENSURE( _rNode.isValid() && _aPropertyTree->isValidNode(_rNode.getOffset()), "Node to retrieve properties from does not match tree");
-        reset();
-        _aPropertyTree->dispatchToChildren(_rNode, *this);
-        return makeSequence(m_aProperties);
-    }
-
-private:
-    void	reset() { m_aProperties.clear(); }
-
-    node::Attributes	adjustAttributes(node::Attributes nNodeAttr);
-
-    Result	handle(rtl::Reference< configuration::Tree > const& _aTree, configuration::NodeRef const& _rValue);
-    Result	handle(rtl::Reference< configuration::Tree > const& _aTree, configuration::ValueRef const& _rValue);
-};
-
-//-----------------------------------------------------------------------------------
-node::Attributes CollectProperties::adjustAttributes(node::Attributes nNodeAttr)
-{
-    if (m_bReadonly) nNodeAttr.markReadonly();
-
-    return nNodeAttr;
-}
-
-//-----------------------------------------------------------------------------------
-CollectProperties::Result CollectProperties::handle(rtl::Reference< configuration::Tree > const& _aTree, configuration::ValueRef const& _rValue)
-{
-    // can be default ?
-    m_aProperties.push_back(
-                helperMakeProperty(	_rValue.m_sNodeName,
-                                    adjustAttributes(_aTree->getAttributes(_rValue)),
-                                    _aTree->getUnoType(_rValue),
-                                    _aTree->hasNodeDefault(_rValue)
-                                )
-            );
-
-    return CONTINUE;
-}
-
-//-----------------------------------------------------------------------------------
-CollectProperties::Result CollectProperties::handle(rtl::Reference< configuration::Tree > const& _aTree, configuration::NodeRef const& _rNode)
-{
-    // can be default ?
-    OSL_ENSURE(	configuration::isStructuralNode(_aTree,_rNode), 
-                "Unexpected value element node. Cannot get proper type for this node as property" );
-
-    m_aProperties.push_back(
-        helperMakeProperty(	_aTree->getSimpleNodeName(_rNode.getOffset()),
-                                    adjustAttributes(_aTree->getAttributes(_rNode)),
-                                    getUnoInterfaceType(),
-                                    _aTree->hasNodeDefault(_rNode)
-                                )
-            );
-
-    return CONTINUE;
-}
-
-//-----------------------------------------------------------------------------------
-// yet another helper class (more robust, but can't well be extended to be a HierarchicalPropertySetInfo though)
-//-----------------------------------------------------------------------------------
-
-class NodePropertySetInfo 
-    :public ::cppu::WeakImplHelper1< beans::XPropertySetInfo >
-{
-    uno::Sequence< beans::Property > const m_aProperties;
-
-public:
-    NodePropertySetInfo(uno::Sequence< beans::Property > const& _aProperties) throw(uno::RuntimeException)
-    : m_aProperties(_aProperties)
-    {
-    }
-
-    static NodePropertySetInfo* create(NodeGroupInfoAccess& _rNode, sal_Bool _bReadonly ) throw(uno::RuntimeException);
-    beans::Property const* begin() const throw() { return m_aProperties.getConstArray(); }
-    beans::Property const* end()   const throw() { return m_aProperties.getConstArray() + m_aProperties.getLength(); }
-
-    beans::Property const* find(const rtl::OUString& _rPropertyName) const throw(uno::RuntimeException);
-
-    // XPropertySetInfo
-    virtual uno::Sequence< beans::Property > SAL_CALL getProperties() throw(uno::RuntimeException);
-    virtual beans::Property SAL_CALL	getPropertyByName(const rtl::OUString& _rPropertyName) throw(beans::UnknownPropertyException, uno::RuntimeException);
-    virtual sal_Bool SAL_CALL	hasPropertyByName(const rtl::OUString& _rPropertyName) throw(uno::RuntimeException);
-};
-
-//-----------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------
-NodePropertySetInfo* NodePropertySetInfo::create(NodeGroupInfoAccess& _rNode, sal_Bool _bReadonly ) throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    rtl::Reference< configuration::Tree > aTree( _rNode.getTree() );
-    OSL_ENSURE( !configuration::isEmpty(aTree.get()), "WARNING: Getting Tree information requires a valid tree");
-    if (configuration::isEmpty(aTree.get())) return NULL;
-
-    configuration::NodeRef aNode( _rNode.getNodeRef() );
-    OSL_ENSURE( aNode.isValid() && aTree->isValidNode(aNode.getOffset()), "ERROR: Tree does not match node");
-
-    uno::Sequence< beans::Property > aProperties = CollectProperties(_bReadonly).forChildren(aTree,aNode);
-    OSL_ENSURE( aProperties.getLength() > 0, "ERROR: PropertySet (Configuration group) has no Properties");
-
-    return new NodePropertySetInfo( aProperties );
-}
-
-//-----------------------------------------------------------------------------------
-struct MatchName // : std::unary_function< beans::Property, bool >
-{
-    rtl::OUString sName;
-    MatchName(rtl::OUString const& _sName)  throw(uno::RuntimeException)
-    : sName(_sName)
-    {
-    }
-
-    bool operator()(beans::Property const& _aProperty) const
-    {
-        return !!(_aProperty.Name == this->sName);
-    }
-};
-
-beans::Property const* NodePropertySetInfo::find(const rtl::OUString& _rPropertyName)  const throw(uno::RuntimeException)
-{
-    beans::Property const* const first = this->begin();
-    beans::Property const* const last  = this->end();
-
-    return std::find_if(first,last,MatchName(_rPropertyName));
-}
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< beans::Property > SAL_CALL NodePropertySetInfo::getProperties() throw(uno::RuntimeException)
-{
-    return m_aProperties;
-}
-//-----------------------------------------------------------------------------------
-beans::Property SAL_CALL NodePropertySetInfo::getPropertyByName(const rtl::OUString& _rPropertyName) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    beans::Property const* pFound = find(_rPropertyName);
-
-    if (pFound == this->end())
-    {
-        rtl::OUString sMessage = rtl::OUString::createFromAscii("Configuration - ");
-        sMessage += rtl::OUString::createFromAscii("No Property named '");
-        sMessage += _rPropertyName;
-        sMessage += rtl::OUString::createFromAscii("' in this PropertySetInfo");
-        throw beans::UnknownPropertyException(sMessage, static_cast<XPropertySetInfo*>(this));
-    }
-
-    return *pFound;
-}
-
-//-----------------------------------------------------------------------------------
-sal_Bool SAL_CALL NodePropertySetInfo::hasPropertyByName(const rtl::OUString& _rPropertyName)
-    throw(uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    beans::Property const* pFound = find(_rPropertyName);
-
-    return (pFound != this->end());
-}
-
-// Interface methods
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// getting Property Metadata
-//-----------------------------------------------------------------------------------
-
-// XPropertySet & XMultiPropertySet
-//-----------------------------------------------------------------------------------
-uno::Reference< beans::XPropertySetInfo > implGetPropertySetInfo( NodeGroupInfoAccess& rNode, sal_Bool _bWriteable ) 
-    throw(uno::RuntimeException)
-{
-    GuardedNodeData<NodeAccess> lock( rNode );
-    return NodePropertySetInfo::create(rNode, !_bWriteable);
-}
-
-// XHierarchicalPropertySet & XHierarchicalMultiPropertySet
-//-----------------------------------------------------------------------------------
-uno::Reference< beans::XHierarchicalPropertySetInfo > implGetHierarchicalPropertySetInfo( NodeGroupInfoAccess& /*rNode*/ ) 
-    throw(uno::RuntimeException)
-{
-    // TODO: Implement
-    return 0;
-}
-
-//-----------------------------------------------------------------------------------
-// setting values - may all throw (PropertyVeto)Exceptions on read-only property sets
-//-----------------------------------------------------------------------------------
-
-// XPropertySet
-//-----------------------------------------------------------------------------------
-void implSetPropertyValue( NodeGroupAccess& rNode, const rtl::OUString& sPropertyName, const uno::Any& aValue ) 
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-              lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeGroupAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildName(sPropertyName,aTree,aNode);
-
-        configuration::ValueRef aChild( aTree->getChildValue(aNode, aChildName) );
-
-        if (!aChild.isValid())
-        {
-            if ( configuration::hasChildOrElement(aTree, aNode, aChildName) )
-            {
-                OSL_ENSURE(aTree->hasChildNode(aNode, aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value.") );
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" Property '") );
-                sMessage += sPropertyName;
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is not a simple value.") );
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::PropertyVetoException( sMessage, xContext );
-            }
-            else
-            {
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value.") );
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" Property '") );
-                sMessage += sPropertyName;
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ") );
-                sMessage += aTree->getAbsolutePath(aNode).toString();
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::UnknownPropertyException( sMessage, xContext );
-            }
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateSetValue( aChild, aValue );
-        if (aChange.test().isChange())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-            aSender.queryConstraints(aChange);
-
-            aTree->integrate(aChange, aNode, true);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::PropertyVetoException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-// XMultiPropertySet
-//-----------------------------------------------------------------------------------
-void implSetPropertyValues( NodeGroupAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) 
-    throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-              lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeGroupAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::NodeChanges aChanges;
-        for(sal_Int32 i = 0, count= aValues.getLength(); i < count; ++i)
-        {
-            rtl::OUString aChildName( aPropertyNames[i] ); // not validated
-
-            configuration::ValueRef aChild( aTree->getChildValue(aNode, aChildName) );
-
-            if (!aChild.isValid())
-            {
-                if ( configuration::hasChildOrElement(aTree, aNode, aChildName) )
-                {
-                    OSL_ENSURE(aTree->hasChildNode(aNode, aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-
-                    rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Values.") );
-                    sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" Property '") );
-                    sMessage += aChildName;
-                    sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is not a simple value.") );
-
-                    uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                    throw beans::PropertyVetoException( sMessage, xContext );
-                }
-
-                OSL_TRACE("Configuration: MultiPropertySet: trying to set unknown property - ignored");
-                continue;
-            }
-
-            configuration::NodeChange aChange = lock.getNodeUpdater().validateSetValue( aChild, aValues[i] );
-            if (aChange.maybeChange())
-            {
-                aChanges.add(aChange);
-            }
-        }
-
-        if (!aChanges.test().compact().isEmpty())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,true));
-
-            aSender.queryConstraints(aChanges);
-
-            aTree->integrate(aChanges, aNode, true);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChanges, true);
-        }
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::PropertyVetoException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-// XHierarchicalPropertySet
-//-----------------------------------------------------------------------------------
-void implSetHierarchicalPropertyValue( NodeGroupAccess& rNode, const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-          lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeGroupAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::RelativePath const aRelPath = configuration::validateRelativePath( aPropertyName, aTree, aNode );
-
-        configuration::AnyNodeRef aNestedValue = configuration::getLocalDescendant( aTree, aNode, aRelPath );
-
-        if (!aNestedValue.isValid())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value. Property '") );
-            sMessage += aRelPath.toString();
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' was not found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw beans::UnknownPropertyException( sMessage, xContext );
-        }
-        if (aNestedValue.isNode())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value. Property '") );
-            sMessage += aRelPath.toString();
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is not a simple value property.")  );
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw beans::PropertyVetoException( sMessage, xContext );
-        }
-        OSL_ASSERT(aNode.isValid());
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateSetValue( aNestedValue.toValue(), aValue );
-        if (aChange.test().isChange())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,false));
-
-            aSender.queryConstraints(aChange);
-
-            aTree->integrate(aChange, aNode, false);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::PropertyVetoException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-// XMultiHierarchicalPropertySet
-//-----------------------------------------------------------------------------------
-void implSetHierarchicalPropertyValues( NodeGroupAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) 
-    throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-          lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeGroupAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::NodeChanges aChanges;
-        for(sal_Int32 i = 0, count= aValues.getLength(); i < count; ++i)
-        try
-        {
-            configuration::RelativePath aRelPath = configuration::validateRelativePath( aPropertyNames[i], aTree, aNode );
-
-            configuration::AnyNodeRef aNestedValue = configuration::getLocalDescendant( aTree, aNode, aRelPath );
-
-            if (!aNestedValue.isValid())
-            {
-                OSL_TRACE("Configuration: MultiPropertySet: trying to set unknown property - ignored");
-                continue;
-            }
-            if ( aNestedValue.isNode() )
-            {
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Values.") );
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" Property '") );
-                sMessage += aRelPath.toString();
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is not a simple value property.") );
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::PropertyVetoException( sMessage, xContext );
-            }
-            OSL_ASSERT(aNode.isValid());
-
-            configuration::NodeChange aChange = lock.getNodeUpdater().validateSetValue( aNestedValue.toValue(), aValues[i] );
-            if (aChange.maybeChange())
-            {
-                aChanges.add(aChange);
-            }
-        }
-        catch (configuration::InvalidName& )
-        {
-            OSL_TRACE("Configuration: MultiHierarchicalPropertySet: trying to set property <invalid path> - ignored");
-            continue;
-        }
-
-        if (!aChanges.test().compact().isEmpty())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,false));
-
-            aSender.queryConstraints(aChanges);
-
-            aTree->integrate(aChanges, aNode, false);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChanges, true); // if we use 'false' we don't need 'Deep' change objects
-        }
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Property Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::PropertyVetoException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-//-----------------------------------------------------------------------------------
-// getting values
-//-----------------------------------------------------------------------------------
-
-// XPropertySet
-//-----------------------------------------------------------------------------------
-uno::Any implGetPropertyValue( NodeGroupInfoAccess& rNode,const rtl::OUString& aPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildName(aPropertyName,aTree,aNode);
-
-        configuration::AnyNodeRef aChild( aTree->getAnyChild(aNode, aChildName) );
-
-        if (!aChild.isValid())
-        {
-            OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Property Value. Property '") );
-            sMessage += aPropertyName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' could not be found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw beans::UnknownPropertyException( sMessage, xContext );
-        }
-
-        return configapi::makeElement( rNode.getFactory(), aTree, aChild );
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return uno::Any();
-}
-
-// XMultiPropertySet
-//-----------------------------------------------------------------------------------
-uno::Sequence< uno::Any > implGetPropertyValues( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(uno::RuntimeException)
-{
-    sal_Int32 const count = aPropertyNames.getLength();
-    uno::Sequence<uno::Any> aRet(count);
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        for(sal_Int32 i = 0; i < count; ++i)
-        {
-            rtl::OUString aChildName( aPropertyNames[i] ); // not validated
-
-            configuration::AnyNodeRef aChild( aTree->getAnyChild(aNode, aChildName) );
-
-            if (aChild.isValid())
-            {
-                aRet[i] = configapi::makeElement( rNode.getFactory(), aTree, aChild );
-            }
-            else
-            {
-                OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-                OSL_TRACE("Configuration: MultiPropertySet: trying to get unknown property - returning void");
-            }
-        }
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return aRet;
-}
-
-// XHierarchicalPropertySet
-//-----------------------------------------------------------------------------------
-uno::Any implGetHierarchicalPropertyValue( NodeGroupInfoAccess& rNode, const rtl::OUString& aPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::RelativePath aRelPath = configuration::validateRelativePath( aPropertyName, aTree, aNode );
-
-        configuration::AnyNodeRef aNestedNode = configuration::getLocalDescendant( aTree, aNode, aRelPath );
-        
-        if (!aNestedNode.isValid())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Property Value. Property '") );
-            sMessage += aRelPath.toString();
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' could not be found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw beans::UnknownPropertyException( sMessage, xContext );
-        }
-        OSL_ASSERT(aNode.isValid());
-
-        return configapi::makeElement( rNode.getFactory(), aTree, aNestedNode );
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return uno::Any();
-}
-
-// XMultiHierarchicalPropertySet
-//-----------------------------------------------------------------------------------
-uno::Sequence< uno::Any > implGetHierarchicalPropertyValues( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(uno::RuntimeException)
-{
-    sal_Int32 const count = aPropertyNames.getLength();
-    uno::Sequence<uno::Any> aRet(count);
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        for(sal_Int32 i = 0; i < count; ++i)
-        try
-        {
-            configuration::RelativePath aRelPath = configuration::validateRelativePath( aPropertyNames[i], aTree, aNode );
-
-            configuration::AnyNodeRef aNestedValue = configuration::getLocalDescendant( aTree, aNode, aRelPath );
-
-            if (aNestedValue.isValid())
-            {
-                aRet[i] = configapi::makeElement( rNode.getFactory(), aTree, aNestedValue );
-            }
-            else
-            {
-                OSL_TRACE("Configuration: MultiPropertySet: trying to get unknown property - returning void");
-            }
-        }
-        catch (configuration::InvalidName& )
-        {
-            OSL_TRACE("Configuration: MultiPropertySet: trying to get property from unknown path - returning void");
-            OSL_ASSERT(!aRet[i].hasValue());
-        }
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return aRet;
-}
-
-//------------------------------------------------------------------------------------------------------------------
-// SPECIAL: XMultiPropertySet::firePropertiesChangeEvent
-//------------------------------------------------------------------------------------------------------------------
-
-void implFirePropertiesChangeEvent( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    OSL_ENSURE(xListener.is(), "ERROR: requesting to fire Events to a NULL listener.");
-    if (!xListener.is())
-    {
-        return; // should this be an exception ??
-    }
-
-    sal_Int32 const count = aPropertyNames.getLength();
-    uno::Sequence<beans::PropertyChangeEvent> aEvents(count);
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-        configapi::Factory& rFactory = rNode.getFactory(); 
-
-        sal_Int32 nFire = 0;
-
-        for(sal_Int32 i = 0; i < count; ++i)
-        {
-            rtl::OUString aChildName( aPropertyNames[i] ); // not validated
-
-            configuration::AnyNodeRef aChild( aTree->getAnyChild(aNode, aChildName) );
-
-            if (aChild.isValid())
-            {
-                aEvents[nFire].Source = rNode.getUnoInstance();
-                aEvents[nFire].PropertyName = aChildName;
-                aEvents[nFire].PropertyHandle = -1;
-
-                aEvents[nFire].NewValue = aEvents[nFire].OldValue = configapi::makeElement( rFactory, aTree, aChild );
-                nFire++;
-            }
-            else
-            {
-                OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-                OSL_TRACE("Configuration: MultiPropertySet: request to fire unknown property - skipping");
-            }
-        }
-
-        if (nFire < count) aEvents.realloc(nFire);;
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    xListener->propertiesChange(aEvents);
-}
-
-//------------------------------------------------------------------------------------------------------------------
-// XPropertyState
-//------------------------------------------------------------------------------------------------------------------
-
-beans::PropertyState implGetPropertyState( NodeAccess& rNode, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildOrElementName(sPropertyName,aTree,aNode);
-
-        configuration::AnyNodeRef aChild = configuration::getChildOrElement(aTree,aNode,aChildName);
-        if (!aChild.isValid())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get PropertyState. Property '") );
-            sMessage += sPropertyName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw beans::UnknownPropertyException( sMessage, xContext );
-        }
-        OSL_ASSERT(aNode.isValid());
-
-        return aTree->isNodeDefault(aChild)  ? beans::PropertyState_DEFAULT_VALUE : 
-               aChild.isNode()              ? beans::PropertyState_AMBIGUOUS_VALUE :
-                                              beans::PropertyState_DIRECT_VALUE;
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    // unreachable, but still there to make some compilers happy
-    OSL_ASSERT(!"Unreachable code");
-    return beans::PropertyState_AMBIGUOUS_VALUE;
-}
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< beans::PropertyState > implGetPropertyStates( NodeAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
-{
-    sal_Int32 const count = aPropertyNames.getLength();
-    uno::Sequence<beans::PropertyState> aRet(count);
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        for(sal_Int32 i = 0; i < count; ++i)
-        {
-            rtl::OUString aChildName = configuration::validateChildOrElementName(aPropertyNames[i],aTree,aNode);
-
-            rtl::Reference< configuration::Tree > aChildTree( aTree);
-
-            configuration::AnyNodeRef aChildNode = configuration::getChildOrElement(aChildTree,aNode,aChildName);
-            if (!aChildNode.isValid())
-            {
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get PropertyStates. Property '") );
-                sMessage += aPropertyNames[i];
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' could not be found in ")  );
-                sMessage += aTree->getAbsolutePath(aNode).toString();
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::UnknownPropertyException( sMessage, xContext );
-            }
-            OSL_ASSERT(aChildNode.isValid());
-
-            aRet[i] = aChildTree->isNodeDefault(aChildNode)  ? beans::PropertyState_DEFAULT_VALUE : 
-                      aChildNode.isNode()                   ? beans::PropertyState_AMBIGUOUS_VALUE :
-                                                              beans::PropertyState_DIRECT_VALUE;		
-        }
-
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return aRet;
-}
-
-//-----------------------------------------------------------------------------------
-static inline configuration::NodeChange validateSetToDefaultHelper(configuration::GroupDefaulter& _rDefaulter, configuration::AnyNodeRef _aNode)
-{
-    if (!_aNode.isNode())
-        return _rDefaulter.validateSetToDefaultValue( _aNode.toValue() );
-
-    else
-        return _rDefaulter.validateSetToDefaultState( _aNode.toNode() );
-}
-//-----------------------------------------------------------------------------------
-void implSetPropertyToDefault( NodeGroupAccess& rNode, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
-{
-    try
-    {
-        UnoApiLock aWithDefaultLock;
-        GuardedNodeUpdate<NodeGroupAccess> lock( withDefaultData( rNode ) );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::GroupDefaulter aDefaulter = lock.getNodeDefaulter();
-
-        rtl::OUString aChildName = configuration::validateChildName(sPropertyName,aTree,aNode);
-
-        configuration::AnyNodeRef aChild( aTree->getAnyChild(aNode, aChildName) );
-
-        configuration::NodeChange aChange = validateSetToDefaultHelper( aDefaulter, aChild );
-
-        const bool bLocal = !aDefaulter.hasDoneSet();
-
-        if (aChange.test().isChange() )
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,bLocal));
-
-            aSender.queryConstraints(aChange);
-
-            aTree->integrate(aChange, aNode, bLocal);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Default: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::ConstraintViolation & ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Default: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-//-----------------------------------------------------------------------------------
-void implSetPropertiesToDefault( NodeGroupAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
-{
-    try
-    {
-        UnoApiLock aWithDefaultLock;
-        GuardedNodeUpdate<NodeGroupAccess> lock( withDefaultData( rNode ) );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::GroupDefaulter aDefaulter = lock.getNodeDefaulter();
-
-        configuration::NodeChanges aChanges;
-        for(sal_Int32 i = 0, count= aPropertyNames.getLength(); i < count; ++i)
-        {
-            rtl::OUString aChildName = configuration::validateChildName( aPropertyNames[i], aTree, aNode ); // validated
-
-            configuration::AnyNodeRef aChild( aTree->getAnyChild(aNode, aChildName) );
-
-            if (!aChild.isValid())
-            {
-                OSL_ENSURE(!configuration::hasChildOrElement(aTree, aNode, aChildName),"ERROR: Configuration: Existing Property not found by implementation");
-
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Default.") );
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" Property '") );
-                sMessage += aChildName;
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ") );
-                sMessage += aTree->getAbsolutePath(aNode).toString();
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::UnknownPropertyException( sMessage, xContext );
-            }
-            OSL_ASSERT(aNode.isValid());
-
-            if (!aTree->hasNodeDefault(aChild))
-            {
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Default.") );
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" Property '") );
-                sMessage += aChildName;
-
-                if (aChild.isNode())
-                    sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is not a simple value.") );
-
-                else
-                    sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' does not have a default value.") );
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::UnknownPropertyException( sMessage, xContext );
-            }
-
-            configuration::NodeChange aChildChange = validateSetToDefaultHelper(aDefaulter, aChild );
-            if (aChildChange.maybeChange())
-                aChanges.add(aChildChange);
-        }
-
-        const bool bLocal = !aDefaulter.hasDoneSet();
-
-        if (!aChanges.test().compact().isEmpty())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,bLocal));
-
-            aSender.queryConstraints(aChanges);
-
-            aTree->integrate(aChanges, aNode, bLocal);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChanges, bLocal);
-        }
-
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Defaults: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::ConstraintViolation & ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Defaults: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-//-----------------------------------------------------------------------------------
-void implSetAllPropertiesToDefault( NodeGroupAccess& rNode ) 
-    throw(uno::RuntimeException)
-{
-    try
-    {
-        UnoApiLock aWithDefaultLock;
-        GuardedNodeUpdate<NodeGroupAccess> lock( withDefaultData( rNode ) );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::GroupDefaulter aDefaulter = lock.getNodeDefaulter();
-        
-        configuration::NodeChanges aChanges = aDefaulter.validateSetAllToDefault( );
-        
-        const bool bLocal = !aDefaulter.hasDoneSet();
-
-        if (!aChanges.test().compact().isEmpty())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChanges,bLocal));
-
-            aSender.queryConstraints(aChanges);
-
-            aTree->integrate(aChanges, aNode, bLocal);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChanges, bLocal);
-        }
-
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Defaults: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::ConstraintViolation & ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Defaults: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any implGetPropertyDefault( NodeGroupInfoAccess& rNode, const rtl::OUString& sPropertyName ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    uno::Any aDefault;
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildName(sPropertyName,aTree,aNode);
-
-        configuration::AnyNodeRef aChildNode = aTree->getAnyChild(aNode, aChildName);
-        if (!aChildNode.isValid())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Default. Property '") );
-            sMessage += sPropertyName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw beans::UnknownPropertyException( sMessage, xContext );
-        }
-        OSL_ASSERT(aNode.isValid());
-
-        if (!aChildNode.isNode())
-        {
-            aDefault = aTree->getNodeDefaultValue(aChildNode.toValue());
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::ConstraintViolation & ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Default: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return aDefault;
-}
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< uno::Any > implGetPropertyDefaults( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    sal_Int32 const count = aPropertyNames.getLength();
-    uno::Sequence<uno::Any> aDefaults(count);
-
-    try
-    {
-        GuardedNodeData<NodeAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        for(sal_Int32 i = 0; i < count; ++i)
-        {
-            rtl::OUString aChildName = configuration::validateChildName(aPropertyNames[i],aTree,aNode);
-
-            configuration::AnyNodeRef aChildNode = aTree->getAnyChild(aNode, aChildName);
-            if (!aChildNode.isValid())
-            {
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Default. Property '") );
-                sMessage += aPropertyNames[i];
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ")  );
-                sMessage += aTree->getAbsolutePath(aNode).toString();
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw beans::UnknownPropertyException( sMessage, xContext );
-            }
-            OSL_ASSERT(aNode.isValid());
-
-            if (!aChildNode.isNode())
-            {
-                aDefaults[i] = aTree->getNodeDefaultValue(aChildNode.toValue());
-            }
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( e.message(), xContext );
-    }
-    catch (configuration::ConstraintViolation & ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot get Default: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw beans::UnknownPropertyException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return aDefaults;
-}
-
-//-----------------------------------------------------------------------------------
-    } // namespace configapi
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/propsetaccessimpl.hxx b/configmgr/source/api2/propsetaccessimpl.hxx
deleted file mode 100644
index 223205c2ec..0000000000
--- a/configmgr/source/api2/propsetaccessimpl.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: propsetaccessimpl.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 CONFIGMGR_API_PROPERTYSETIMPL_HXX_
-#define CONFIGMGR_API_PROPERTYSETIMPL_HXX_
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XHierarchicalPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp>
-
-#ifndef CONFIGMGR_NO_PROPERTYSTATE
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_
-#include <com/sun/star/beans/XPropertyState.hpp>
-#endif
-#endif
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-    namespace lang = ::com::sun::star::lang;
-    namespace beans = ::com::sun::star::beans;
-
-    /* implementations of the interfaces supported by a (parent) node
-        within the configuration tree.
-        (read-only operation)
-    */
-    namespace configapi
-    {
-        class NodeAccess; 
-        class NodeGroupInfoAccess; 
-        class NodeGroupAccess; 
-
-    // getting Property Metadata
-        // XPropertySet & XMultiPropertySet
-        uno::Reference< beans::XPropertySetInfo > implGetPropertySetInfo( NodeGroupInfoAccess& rNode, sal_Bool _bWriteable ) 
-            throw(uno::RuntimeException);
-
-        // XHierarchicalPropertySet & XHierarchicalMultiPropertySet
-        uno::Reference< beans::XHierarchicalPropertySetInfo > implGetHierarchicalPropertySetInfo( NodeGroupInfoAccess& rNode ) 
-            throw(uno::RuntimeException);
-
-    // setting values - may all throw (PropertyVeto)Exceptions on read-only property sets
-        // XPropertySet
-        void implSetPropertyValue( NodeGroupAccess& rNode, const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-            throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-                      lang::WrappedTargetException, uno::RuntimeException);
-
-         // XMultiPropertySet
-       void implSetPropertyValues( NodeGroupAccess& rNode, const uno::Sequence< rtl::OUString >& PropertyNames, const uno::Sequence< uno::Any >& Values ) 
-            throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-                      lang::WrappedTargetException, uno::RuntimeException);
-
-        // XHierarchicalPropertySet
-        void implSetHierarchicalPropertyValue( NodeGroupAccess& rNode, const rtl::OUString& aPropertyName, const uno::Any& aValue ) 
-            throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, 
-                  lang::WrappedTargetException, uno::RuntimeException);
-
-         // XMultiHierarchicalPropertySet
-       void implSetHierarchicalPropertyValues( NodeGroupAccess& rNode, const uno::Sequence< rtl::OUString >& PropertyNames, const uno::Sequence< uno::Any >& Values ) 
-            throw(beans::PropertyVetoException, lang::IllegalArgumentException, 
-                  lang::WrappedTargetException, uno::RuntimeException);
-
-    // getting values
-        // XPropertySet
-        uno::Any implGetPropertyValue( NodeGroupInfoAccess& rNode,const rtl::OUString& PropertyName ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-         // XMultiPropertySet
-        uno::Sequence< uno::Any > implGetPropertyValues( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw(uno::RuntimeException);
-
-        // XHierarchicalPropertySet
-        uno::Any implGetHierarchicalPropertyValue( NodeGroupInfoAccess& rNode, const rtl::OUString& PropertyName ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-         // XMultiHierarchicalPropertySet
-        uno::Sequence< uno::Any > implGetHierarchicalPropertyValues( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw(uno::RuntimeException);
-
-    // SPECIAL: firePropertiesChangeEvent
-         // XMultiPropertySet
-        void implFirePropertiesChangeEvent( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames, const uno::Reference< beans::XPropertiesChangeListener >& xListener ) 
-            throw(uno::RuntimeException);
-
-    // XPropertyState
-        beans::PropertyState implGetPropertyState( NodeAccess& rNode, const rtl::OUString& sPropertyName ) 
-            throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-        void implSetPropertyToDefault( NodeGroupAccess& rNode, const rtl::OUString& sPropertyName ) 
-            throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-        uno::Any implGetPropertyDefault( NodeGroupInfoAccess& rNode, const rtl::OUString& sPropertyName ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-
-    // XMultiPropertyState
-        uno::Sequence< beans::PropertyState > implGetPropertyStates( NodeAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyName ) 
-            throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-        void implSetPropertiesToDefault( NodeGroupAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw(beans::UnknownPropertyException, uno::RuntimeException);
-
-        void implSetAllPropertiesToDefault( NodeGroupAccess& rNode ) 
-            throw(uno::RuntimeException);
-
-        uno::Sequence< uno::Any > implGetPropertyDefaults( NodeGroupInfoAccess& rNode, const uno::Sequence< rtl::OUString >& aPropertyNames ) 
-            throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
-    }
-
-}
-#endif // CONFIGMGR_API_PROPERTYSETIMPL_HXX_
-
-
diff --git a/configmgr/source/api2/provider.cxx b/configmgr/source/api2/provider.cxx
deleted file mode 100644
index 37043d5705..0000000000
--- a/configmgr/source/api2/provider.cxx
+++ /dev/null
@@ -1,714 +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: provider.cxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include "apiserviceinfo.hxx"
-#include "confapifactory.hxx"
-#include "configpath.hxx"
-#include "datalock.hxx"
-#include "provider.hxx"
-#include "providerimpl.hxx"
-#include "tracer.hxx"
-#include "bootstrap.hxx"
-#include "wrapexception.hxx"
-#include <osl/mutex.hxx>
-#include <rtl/ustrbuf.hxx>
-#ifndef __SGI_STL_ALGORITHM
-#include <algorithm>
-#endif
-#include <comphelper/sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/typeprovider.hxx>
-#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-
-namespace configmgr
-{
-    namespace css  = ::com::sun::star;
-    namespace uno  = css::uno;
-    namespace lang = css::lang;
-    namespace beans = css::beans;
-
-    namespace 
-    {
-    //------------------------------------------------------------------------
-        sal_Char const * const aConfigProviderServices[] = 
-        {
-            "com.sun.star.configuration.ConfigurationProvider",
-            0
-        };
-        sal_Char const * const aAdminProviderServices[] = 
-        {
-            "com.sun.star.configuration.AdministrationProvider",
-            0
-        };
-    //------------------------------------------------------------------------
-
-        ServiceImplementationInfo const aConfigProviderInfo = 
-        {			
-            "com.sun.star.comp.configuration.ConfigurationProvider",
-            aConfigProviderServices,
-            0
-        };
-        ServiceImplementationInfo const aAdminProviderInfo = 
-        {			
-            "com.sun.star.comp.configuration.AdministrationProvider",
-            aAdminProviderServices,
-            aConfigProviderServices			
-        };
-    //------------------------------------------------------------------------
-
-        sal_Char const * const 
-            aDefaultProviderServiceAndImplName  = A_DefaultProviderServiceAndImplName;
-
-    //------------------------------------------------------------------------
-
-        sal_Char const * const aDefaultProviderServices[] = 
-        {
-            aDefaultProviderServiceAndImplName,
-            0
-        };
-    //------------------------------------------------------------------------
-
-        ServiceRegistrationInfo const aDefaultProviderInfo = 
-        {			
-            aDefaultProviderServiceAndImplName,
-            aDefaultProviderServices
-        };
-        SingletonRegistrationInfo const aDefaultProviderSingletonInfo = 
-        { 
-            A_DefaultProviderSingletonName,
-            aDefaultProviderServiceAndImplName, 
-            aDefaultProviderServiceAndImplName, 
-            0
-        };
-    //------------------------------------------------------------------------
-        typedef uno::Reference< uno::XInterface > (OProviderImpl::*CreatorFunc)(const uno::Sequence< uno::Any >& aArguments);
-        struct ServiceCreationInfo
-        {
-            ServiceRegistrationInfo const* info;
-            CreatorFunc create;
-        };
-
-        static sal_Int32 getCreateServiceDataCount()
-        {
-            return 2;
-        }
-
-        static const ServiceCreationInfo* getCreateServiceData()
-        {
-            static ServiceCreationInfo const createServiceData[] = 
-            {
-                { &configapi::aCreateReadAccessSI, &OProviderImpl::createReadAccess },
-                { &configapi::aCreateUpdateAccessSI, &OProviderImpl::createUpdateAccess },
-            };
-            OSL_ENSURE(sizeof(createServiceData)/sizeof(createServiceData[0]) == getCreateServiceDataCount(),
-                "getCreateServiceData : inconsistent data !");
-            return createServiceData;
-        }
-    //------------------------------------------------------------------------
-    }
-
-    static ServiceCreationInfo const* findCreationInfo( const rtl::OUString& aServiceSpecifier )
-    {
-        for (int i= 0; i<getCreateServiceDataCount(); ++i)
-        {
-            ServiceCreationInfo const& rCreationInfo = getCreateServiceData()[i];
-
-            ServiceRegistrationInfo const* pInfo = rCreationInfo.info;
-            if (!pInfo)
-                continue;
-
-            if (sal_Char const * pImplName = pInfo->implementationName)
-            {
-                if (0 == aServiceSpecifier.compareToAscii(pImplName))
-                    return &rCreationInfo;
-            }
-                
-            if (sal_Char const * const* pNames = pInfo->registeredServiceNames)
-            {
-                while(*pNames)
-                {
-                    if (0 == aServiceSpecifier.compareToAscii(*pNames))
-                        return &rCreationInfo;
-
-                    ++pNames;
-                }
-            }
-        }
-        // not found
-        return 0;
-    }
-
-    //#define ID_PREFETCH		1
-    static const int ID_PREFETCH=1;
-    static const int ID_ENABLEASYNC=2;
-    
-    static inline
-    rtl::OUString getPrefetchPropName() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PrefetchNodes") ); }
-    static inline
-    rtl::OUString getEnableAsyncPropName() { return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("EnableAsync") ); }
-    //=============================================================================
-    //= OProvider
-    //=============================================================================
-    // service info export
-    const ServiceRegistrationInfo* getConfigurationProviderServiceInfo()
-    {
-        return getRegistrationInfo(&aConfigProviderInfo);
-    }
-
-    const ServiceRegistrationInfo* getAdminProviderServiceInfo()
-    {
-        return getRegistrationInfo(&aAdminProviderInfo);
-    }
-
-    const ServiceRegistrationInfo* getDefaultProviderServiceInfo()
-    {
-        return &aDefaultProviderInfo;
-    }
-
-    const SingletonRegistrationInfo* getDefaultProviderSingletonInfo()
-    {
-        return &aDefaultProviderSingletonInfo;
-    }
-
-    //-----------------------------------------------------------------------------
-    uno::Reference<uno::XInterface> SAL_CALL 
-        getDefaultConfigProviderSingleton( uno::Reference< uno::XComponentContext > const& xContext )
-    { 
-        OSL_ENSURE( xContext.is(), "ERROR: NULL context has no singletons" );
-
-        UnoContextTunnel aTunnel;
-        aTunnel.passthru( xContext );
-    
-        uno::Reference<uno::XInterface> xResult;
-
-        if (xContext.is())
-        try
-        {
-            rtl::OUString aSingletonName = SINGLETON(A_DefaultProviderSingletonName);
-            uno::Any aResult = xContext->getValueByName(aSingletonName);
-            aResult >>= xResult;
-        }
-        catch (uno::Exception & )
-        {
-            // to do: really use the tunneled failure when that is set properly
-            if ( aTunnel.recoverFailure(true).hasValue() )
-            {
-                // have a failure, but can't recover it
-                // -> try to regenerate
-                instantiateDefaultProvider(xContext);
-
-                OSL_ENSURE(false, "Cannot recreate configuration backend instantiation failure - using generic error");
-            }
-            // cannot recover any failure
-            throw;
-        }
-
-        return xResult;
-    }
-    // ------------------------------------------------------------------------
-    // ----------------------------------------------------------------------------
-    #define TUNNEL_ALL_EXCEPTIONS()     \
-        WRAP_CONFIGBACKEND_CREATION_EXCEPTIONS1( UnoContextTunnel::tunnelFailure, true)
-
-    // ----------------------------------------------------------------------------
-    // ------------------------------------------------------------------------
-    
-    uno::Reference< uno::XInterface > SAL_CALL instantiateDefaultProvider( uno::Reference< uno::XComponentContext > const & xTargetContext )
-    {
-        uno::Reference< uno::XComponentContext > xContext = UnoContextTunnel::recoverContext(xTargetContext);
-
-        ServiceImplementationInfo const * pProviderInfo =
-            ContextReader::testAdminService(xContext,true) ? &aAdminProviderInfo : &aConfigProviderInfo;
-
-        OProvider* pNewProvider = new OProvider(xContext,pProviderInfo);
-        uno::Reference< lang::XMultiServiceFactory > aRet( pNewProvider );
-        
-        try
-        {
-            pNewProvider->connect();
-        }
-        TUNNEL_ALL_EXCEPTIONS()
-        
-            return  uno::Reference< uno::XInterface >( aRet, uno::UNO_QUERY );
-    }
-
-    // -----------------------------------------------------------------------------
-    class OProviderDisposingListener : public cppu::WeakImplHelper1<lang::XEventListener>
-    {
-        OProvider* m_pProvider;	
-
-    public:
-        OProviderDisposingListener(OProvider* pProvider)
-            :m_pProvider(pProvider){}			
-        
-        virtual void SAL_CALL disposing(com::sun::star::lang::EventObject const& rEvt) throw()
-            {			
-                CFG_TRACE_INFO("Service Manager or context disposed, disposing the provider");
-                if (OProvider* pProvider = m_pProvider) 
-                {   
-                    m_pProvider = NULL;	
-                    pProvider->disposing(rEvt);
-                }
-            }		
-    };
-
-    //=============================================================================
-    //= OProvider
-    //=============================================================================
-    //-----------------------------------------------------------------------------
-    OProvider::OProvider(uno::Reference< uno::XComponentContext > const & xContext, ServiceImplementationInfo const* pInfo)
-              :ServiceComponentImpl(pInfo)
-              ,OPropertyContainer(ServiceComponentImpl::rBHelper)
-              ,m_xContext(xContext)
-              ,m_pImpl(NULL)
-              ,m_bEnableAsync(false)
-    {
-        OSL_ENSURE(m_xContext.is(), "Creating a provider without a context");
-        attachToContext();
-        registerProperty(getPrefetchPropName(),	ID_PREFETCH, 0,&m_aPrefetchNodes, ::getCppuType(&m_aPrefetchNodes));
-        registerProperty(getEnableAsyncPropName(),	ID_ENABLEASYNC, 0, &m_bEnableAsync, ::getBooleanCppuType());
-    }
-
-    //-----------------------------------------------------------------------------
-    OProvider::~OProvider()
-    {	
-        delete m_pImpl;
-        discardContext(releaseContext());
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProvider::connect() throw (uno::Exception)
-    {
-        OSL_ENSURE( m_pImpl == NULL, "Error: Configuration Provider already is connected");
-
-        std::auto_ptr<OProviderImpl> pNewImpl( new OProviderImpl(this, m_xContext) );
-
-        implConnect(*pNewImpl,ContextReader(m_xContext));
-
-        m_pImpl = pNewImpl.release();
-        if (m_pImpl)
-        {
-            sal_Bool isEnabled = m_pImpl->getDefaultOptions().isAsyncEnabled();
-            this->setPropertyValue( getEnableAsyncPropName(), uno::makeAny(isEnabled) );
-        }
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProvider::attachToContext()
-    {
-        UnoApiLock aLock;
-        ::osl::MutexGuard aGuard(ServiceComponentImpl::rBHelper.rMutex);
-        OSL_ASSERT(!m_xDisposeListener.is());
-        if (m_xContext.is())
-        {
-            uno::Reference< lang::XComponent > xContextComp(m_xContext, uno::UNO_QUERY);		
-            uno::Reference< lang::XComponent > xServiceMgrComp(m_xContext->getServiceManager(), uno::UNO_QUERY);
-            
-            m_xDisposeListener = new OProviderDisposingListener(this);	
-            
-            if (xContextComp.is())    xContextComp   ->addEventListener(m_xDisposeListener);	
-            if (xServiceMgrComp.is()) xServiceMgrComp->addEventListener(m_xDisposeListener);	
-            
-            OSL_ENSURE(xServiceMgrComp.is() || xContextComp.is(), 
-                        "Provider cannot detect shutdown -> no XComponent found");
-        }
-    }
-
-    //-----------------------------------------------------------------------------
-    uno::Reference< lang::XComponent > OProvider::releaseContext()
-    {		
-        UnoApiLock aLock;
-        ::osl::MutexGuard aGuard(ServiceComponentImpl::rBHelper.rMutex);
-        
-        uno::Reference< lang::XComponent > xContextComp(m_xContext, uno::UNO_QUERY);	
-        if (m_xDisposeListener.is() && m_xContext.is())
-        {
-            uno::Reference< lang::XComponent > xServiceMgrComp(m_xContext->getServiceManager(), uno::UNO_QUERY);		
-
-            if (xContextComp.is()) 
-            {
-                try { xContextComp   ->removeEventListener(m_xDisposeListener); } 
-                catch (uno::Exception & ) {} 
-            }
-
-            if (xServiceMgrComp.is()) 
-            {
-                try { xServiceMgrComp->removeEventListener(m_xDisposeListener); }
-                catch (uno::Exception & ) {} 
-            }
-        }
-        m_xDisposeListener = NULL;
-        m_xContext = NULL;
-
-        return xContextComp;
-    }
-    //-----------------------------------------------------------------------------
-
-    void OProvider::discardContext(uno::Reference< lang::XComponent > const & xContext)
-    {
-        UnoApiLock aLock;
-        if (xContext.is())
-        {
-            uno::Reference< uno::XComponentContext > xCC(xContext,uno::UNO_QUERY);
-            OSL_ASSERT(xCC.is());
-
-            if (BootstrapContext::isWrapper(xCC)) 
-            {
-                try { xContext->dispose(); }
-                catch (uno::Exception & ) {} 
-            }
-        }
-    }
-    //-----------------------------------------------------------------------------
-    // XTypeProvider
-    //-----------------------------------------------------------------------------
-    uno::Sequence< uno::Type > SAL_CALL OProvider::getTypes(  ) throw(uno::RuntimeException)
-    {
-        cppu::OTypeCollection aCollection(::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ),
-                                          ::getCppuType( (const uno::Reference< beans::XFastPropertySet > *)0 ),
-                                          ::getCppuType( (const uno::Reference< beans::XMultiPropertySet > *)0 ),
-                                          ::comphelper::concatSequences(ServiceComponentImpl::getTypes(), cppu::ImplHelper4< lang::XMultiServiceFactory, lang::XLocalizable, util::XRefreshable, util::XFlushable >::getTypes()));
-        return aCollection.getTypes();
-    }
-
-    // XPropertySet
-    //-----------------------------------------------------------------------------
-    uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OProvider::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
-    {
-        return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
-    }
-
-    //-----------------------------------------------------------------------------
-    uno::Reference< uno::XInterface > SAL_CALL OProvider::createInstance( const rtl::OUString& aServiceSpecifier ) 
-        throw(uno::Exception, uno::RuntimeException)
-    {		
-        UnoApiLock aLock;
-        // same as creating with empty sequence of arguments
-        return this->createInstanceWithArguments( aServiceSpecifier, uno::Sequence< uno::Any >() );
-    }
-
-    //-----------------------------------------------------------------------------
-    uno::Reference< uno::XInterface > SAL_CALL 
-        OProvider::createInstanceWithArguments( const rtl::OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& aArguments ) 
-            throw(uno::Exception, uno::RuntimeException)
-    {
-        UnoApiLock aLock;
-
-        OSL_ENSURE(m_pImpl, "OProvider: no implementation available");
-        
-        if (ServiceCreationInfo const* pInfo = findCreationInfo(aServiceSpecifier))
-        {
-            // it's a known service name - try to create without args
-            if (CreatorFunc create = pInfo->create)
-            {
-                return (m_pImpl->*create)(aArguments);
-            }
-        }
-
-        rtl::OUStringBuffer sMsg;
-        sMsg.appendAscii("ConfigurationProvider: Cannot create view - ");
-        sMsg.append( aServiceSpecifier ) .appendAscii(" is not a valid configuration access service. ");
-
-        throw lang::ServiceNotRegisteredException(sMsg.makeStringAndClear(),*this);
-    }
-
-    //-----------------------------------------------------------------------------
-    uno::Sequence< rtl::OUString > SAL_CALL OProvider::getAvailableServiceNames(  ) 
-        throw(uno::RuntimeException)
-    {
-        UnoApiLock aLock;
-
-        sal_Int32 nCount = 0;
-        {
-            for (int i= 0; i< getCreateServiceDataCount(); ++i)
-                nCount += countServices(getCreateServiceData()[i].info);
-        }
-
-        uno::Sequence< rtl::OUString > aNames(nCount);
-        if (nCount > 0)
-        {
-            sal_Int32 n = 0;
-            for (int i= 0; i<getCreateServiceDataCount(); ++i)
-            {
-                ServiceRegistrationInfo const* pInfo = getCreateServiceData()[i].info;
-                sal_Char const * const* pNames = pInfo ? pInfo->registeredServiceNames : 0;
-
-                if (pNames)
-                {
-                    while(*pNames)
-                    {
-                        aNames[n] = rtl::OUString::createFromAscii(*pNames);
-                        ++n;
-                        ++pNames;
-                    }
-                }
-            }
-        }
-
-        return aNames;
-    }
-
-    // XLocalizable
-    //-----------------------------------------------------------------------------
-    void SAL_CALL OProvider::setLocale( const lang::Locale& eLocale ) 
-        throw (uno::RuntimeException)
-    {
-        UnoApiLock aLock;
-
-        OSL_ENSURE(m_pImpl, "OProvider: no implementation available");
-
-        m_pImpl->setDefaultLocale( eLocale );
-    }
-
-    //-----------------------------------------------------------------------------
-    lang::Locale SAL_CALL OProvider::getLocale()
-        throw (uno::RuntimeException)
-    {
-        UnoApiLock aLock;
-
-        OSL_ENSURE(m_pImpl, "OProvider: no implementation available");
-        
-        return m_pImpl->getDefaultOptions().getUnoLocale();
-    }
-    
-    //XRefreshable
-    //-----------------------------------------------------------------------------
-    void SAL_CALL OProvider::refresh()
-        throw (uno::RuntimeException)
-     {
-        UnoApiLock aLock;
-
-        OSL_ENSURE(m_pImpl, "OProvider: no implementation available");
-        
-        try
-        {
-            m_pImpl->refreshAll();
-        }
-        catch (uno::RuntimeException& ) { throw; }
-        catch (uno::Exception& e) 
-        { 
-            // FIXME: use getCaughtException()
-            throw lang::WrappedTargetRuntimeException(e.Message, *this, uno::makeAny(e));
-        }
-        //Broadcast the changes
-        uno::Reference< css::util::XRefreshListener > const * const pRefresh = 0;
-        cppu::OInterfaceContainerHelper * aInterfaceContainer=
-            getBroadcastHelper().getContainer (::getCppuType(pRefresh));
-
-        if(aInterfaceContainer)
-        {
-            lang::EventObject aEventObject(*this);
-
-            cppu::OInterfaceIteratorHelper aIterator(*aInterfaceContainer);
-            while(aIterator.hasMoreElements())
-            {
-                uno::Reference< uno::XInterface > xIface = aIterator.next();
-                uno::Reference< util::XRefreshListener > xRefresh (xIface, uno::UNO_QUERY);
-                if (xRefresh.is())
-                {
-                    xRefresh->refreshed(aEventObject);
-                }
-            }
-        }
-     }
-     //-----------------------------------------------------------------------------
-     void SAL_CALL OProvider::addRefreshListener( 
-         const uno::Reference< util::XRefreshListener >& aListener ) 
-            throw (uno::RuntimeException)
-     {
-        UnoApiLock aLock;
-        getBroadcastHelper().addListener(::getCppuType(&aListener), aListener);
-     }
-     //-----------------------------------------------------------------------------
-     void SAL_CALL OProvider::removeRefreshListener( 
-         const uno::Reference< util::XRefreshListener >& aListener ) 
-            throw (uno::RuntimeException)
-     {
-        UnoApiLock aLock;
-        getBroadcastHelper().removeListener(::getCppuType(&aListener), aListener);
-     }
-     //XFlushable
-     //-----------------------------------------------------------------------------
-     void SAL_CALL OProvider::flush(  ) 
-                throw (uno::RuntimeException)
-     {
-         UnoApiLock aLock;
-         OSL_ENSURE(m_pImpl, "OProvider: no implementation available");
-         m_pImpl->flushAll();
-
-         //Broadcast the changes
-         uno::Reference< css::util::XFlushListener > const * const pFlush = 0;
-         cppu::OInterfaceContainerHelper * aInterfaceContainer=
-            getBroadcastHelper().getContainer(::getCppuType(pFlush));
-
-         if(aInterfaceContainer)
-         {
-             lang::EventObject aEventObject(*this);
-
-             cppu::OInterfaceIteratorHelper aIterator(*aInterfaceContainer);
-             while(aIterator.hasMoreElements())
-             {
-                 uno::Reference< uno::XInterface > xIface = aIterator.next();
-                 uno::Reference< util::XFlushListener > xFlush (xIface, uno::UNO_QUERY);
-                 if (xFlush.is())
-                 {
-                     xFlush->flushed(aEventObject);
-                 }
-             }
-         }
-     }
-     //-----------------------------------------------------------------------------
-     void SAL_CALL OProvider::addFlushListener( 
-         const uno::Reference< util::XFlushListener >& aListener ) 
-            throw (uno::RuntimeException)
-     {
-          UnoApiLock aLock;
-          getBroadcastHelper().addListener(::getCppuType(&aListener), aListener);
-     }
-     //-----------------------------------------------------------------------------
-     void SAL_CALL OProvider::removeFlushListener( 
-         const uno::Reference< util::XFlushListener >& aListener ) 
-            throw (uno::RuntimeException)
-     {
-         UnoApiLock aLock;
-         getBroadcastHelper().removeListener(::getCppuType(&aListener), aListener);
-     }
-
-    // XInterface 
-    //-----------------------------------------------------------------------------
-    uno::Any SAL_CALL OProvider::queryInterface(uno::Type const& rType) throw(uno::RuntimeException) 
-    {
-        UnoApiLock aLock;
-        uno::Any aRet( ServiceComponentImpl::queryInterface(rType) );
-        if ( !aRet.hasValue() )
-            aRet = cppu::ImplHelper4< lang::XMultiServiceFactory, lang::XLocalizable, util::XRefreshable, util::XFlushable >::queryInterface(rType);
-        if ( !aRet.hasValue() )
-            aRet = queryPropertyInterface(rType);
-        return aRet;
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProvider::implConnect(OProviderImpl& _rFreshProviderImpl, const ContextReader& _rSettings) throw(uno::Exception)
-    {
-        UnoApiLock aLock;
-        if (!_rFreshProviderImpl.initSession(_rSettings))
-            throw uno::Exception(::rtl::OUString::createFromAscii("Could not connect to the configuration. Please check your settings."), static_cast< ::cppu::OWeakObject* >(this) );
-    }
-
-    //-----------------------------------------------------------------------------
-       void SAL_CALL OProvider::disposing(com::sun::star::lang::EventObject const& /*rEvt*/) throw()
-    {	
-        UnoApiLock aLock;
-        releaseContext();
-        this->dispose();		
-    }
-
-    //-----------------------------------------------------------------------------
-    void SAL_CALL OProvider::disposing()
-    {		
-        UnoApiLock aLock;
-
-        if (m_pImpl)
-            m_pImpl->dispose();				
-
-        uno::Reference< lang::XComponent > xComp = releaseContext();
-        
-        ServiceComponentImpl::disposing();	
-        OPropertyContainer::disposing();
-
-        discardContext( xComp );
-    }		
-
-    // OPropertyArrayUsageHelper
-    // -------------------------------------------------------------------------
-    ::cppu::IPropertyArrayHelper* OProvider::createArrayHelper( ) const
-    {
-        UnoApiLock aLock;
-        uno::Sequence< beans::Property > aProps;
-        describeProperties(aProps);
-        return new ::cppu::OPropertyArrayHelper(aProps);
-    }
-    // -------------------------------------------------------------------------
-    ::cppu::IPropertyArrayHelper & OProvider::getInfoHelper()
-    {
-        UnoApiLock aLock;
-        return *getArrayHelper();
-    }
-
-    void SAL_CALL OProvider::setFastPropertyValue_NoBroadcast(	sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue)
-                                                 throw (::com::sun::star::uno::Exception)
-    {
-        UnoApiLock aLock;
-
-        OPropertyContainer::setFastPropertyValue_NoBroadcast( nHandle, rValue );
-
-        switch(nHandle)
-        {
-            case ID_PREFETCH:
-            {
-                uno::Sequence< rtl::OUString > aNodeList;
-                rValue >>= aNodeList;
-
-                RequestOptions const aOptions = m_pImpl->getDefaultOptions();
-
-                for (sal_Int32 i = 0; i < aNodeList.getLength(); i++)
-                {
-                    configuration::AbsolutePath aModulePath = configuration::AbsolutePath::makeModulePath(aNodeList[i]);
-                    m_pImpl->fetchSubtree(aModulePath , aOptions);
-                }
-            }break;
-
-            case ID_ENABLEASYNC:
-            {
-                //Forward to TreeManager
-                sal_Bool bAsync;
-                if (rValue >>= bAsync)
-                {
-                    m_pImpl->enableAsync(bAsync);
-                    if (!bAsync)
-                        this->flush();
-                }
-                else
-                    OSL_ENSURE(false, "Unexpected type of new property value");
-            }
-            break;
-            default:
-            {
-                OSL_ENSURE(false, "OProvider::setFastPropertyValue_NoBroadcast -unknown property");   
-            }
-               
-        }
-    }
-} // namespace configmgr
diff --git a/configmgr/source/api2/provider.hxx b/configmgr/source/api2/provider.hxx
deleted file mode 100644
index 916cb0aef8..0000000000
--- a/configmgr/source/api2/provider.hxx
+++ /dev/null
@@ -1,201 +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: provider.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_PROVIDER_HXX_
-#define CONFIGMGR_API_PROVIDER_HXX_
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XLocalizable.hpp>
-#include <com/sun/star/util/XRefreshable.hpp>
-#include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HDL_ 
-#include <com/sun/star/lang/IllegalArgumentException.hdl>
-#endif
-#include "confsvccomponent.hxx"
-#include <rtl/ustring.hxx>
-#include <vos/ref.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/propertycontainer.hxx>
-
-namespace configmgr
-{
-    namespace css  = ::com::sun::star;
-    namespace uno  = css::uno;
-    namespace lang = css::lang;
-    namespace beans = css::beans;
-    namespace util = css::util;
-
-    class Module;	
-    class ContextReader;
-    class OProviderImpl;
-
-    //==========================================================================
-    //= OProvider
-    //==========================================================================
-    /** Base class to receive access to the configuration data. A provider for configuration is 
-        a factory for service which allow a readonly or update access to the configuration trees.
-    */
-    class OProvider:
-        private ServiceComponentImpl, private comphelper::OPropertyContainer,
-        public comphelper::OPropertyArrayUsageHelper< OProvider >
-            // don't want to allow our derivees to access the mutex of ServiceComponentImpl
-            // (this helps to prevent deadlocks: The mutex of the base class is used by the OComponentHelper to
-            // protect addEvenetListener calls. Unfortunately these calls are made from within API object we create,
-            // too, which can lead do deadlocks ....)
-                    , public cppu::ImplHelper4< lang::XMultiServiceFactory, lang::XLocalizable, util::XRefreshable, util::XFlushable >
-    {
-    private:
-        friend class OProviderDisposingListener;
-
-        uno::Reference< uno::XComponentContext >		    m_xContext;
-        uno::Reference< lang::XEventListener >				m_xDisposeListener; 
-        OProviderImpl * m_pImpl;		
-        uno::Sequence< ::rtl::OUString >	m_aPrefetchNodes;
-        sal_Bool                            m_bEnableAsync;
-
-    public:
-        // make ServiceComponentImpl allocation functions public
-        static void * SAL_CALL operator new( size_t nSize ) throw()
-        { return ServiceComponentImpl::operator new( nSize ); }
-        static void SAL_CALL operator delete( void * pMem ) throw()
-            { ServiceComponentImpl::operator delete( pMem ); }
-
-        OProvider(uno::Reference< uno::XComponentContext > const & xContext, ServiceImplementationInfo const* pInfo);		
-        virtual ~OProvider();
-
-        void connect() throw (uno::Exception);		
-
-        /// XTypeOProvider
-        virtual uno::Sequence< uno::Type > SAL_CALL getTypes(  ) throw(uno::RuntimeException);
-
-        /// XInterface
-        virtual void SAL_CALL acquire() throw() { ServiceComponentImpl::acquire(); }
-        virtual void SAL_CALL release() throw() { ServiceComponentImpl::release(); }
-        virtual uno::Any SAL_CALL queryInterface(uno::Type const& rType) throw (uno::RuntimeException);		
-
-        // XPropertySet
-        virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(uno::RuntimeException);		
-
-        /// XMultiServiceFactory
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstance( const rtl::OUString& aServiceSpecifier ) 
-                throw(uno::Exception, uno::RuntimeException);
-
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) 
-                throw(uno::Exception, uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getAvailableServiceNames(  ) 
-                throw(uno::RuntimeException);
-
-        /// XLocalizable
-        virtual void SAL_CALL 
-            setLocale( const lang::Locale& eLocale ) 
-                throw (uno::RuntimeException);
-        
-        virtual lang::Locale SAL_CALL 
-            getLocale(  ) 
-                throw (uno::RuntimeException);
-
-        
-        //XRefreshable
-         virtual void SAL_CALL 
-            refresh(  ) 
-                throw (uno::RuntimeException);
-        virtual void SAL_CALL 
-            addRefreshListener( 
-                const uno::Reference< util::XRefreshListener >& aListener ) 
-                    throw (uno::RuntimeException);
-        virtual void SAL_CALL 
-            removeRefreshListener( 
-                const uno::Reference< util::XRefreshListener >& aListener ) 
-                    throw (uno::RuntimeException);
-        //XFlushable
-         virtual void SAL_CALL 
-            flush(  ) 
-                throw (uno::RuntimeException);
-        virtual void SAL_CALL 
-            addFlushListener( 
-                const uno::Reference< util::XFlushListener >& aListener ) 
-                    throw (uno::RuntimeException);
-        virtual void SAL_CALL 
-            removeFlushListener( 
-                const uno::Reference< util::XFlushListener >& aListener ) 
-                    throw (uno::RuntimeException);
-
-        // OPropertSetHelper
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-            sal_Int32 nHandle, const uno::Any& rValue) throw (uno::Exception);
-
-        static sal_Int32 countServices(ServiceRegistrationInfo const* aInfo) { return ServiceRegistrationHelper(aInfo).countServices(); }
-
-    private:
-        // creates a new session
-        void implConnect(OProviderImpl& rFreshProviderImpl, const ContextReader& _rSettings) throw (uno::Exception);		
-
-        // disambuiguated access
-        cppu::OBroadcastHelper & getBroadcastHelper() 
-        { return ServiceComponentImpl::rBHelper; }
-
-        /// Component Helper override
-        virtual void SAL_CALL disposing();
-        virtual void SAL_CALL disposing(lang::EventObject const& rEvt) throw();
-
-        // OPropertyArrayUsageHelper
-        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
-        // OPropertySetHelper
-        virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();		
-
-        // OPropertyContainer		
-        void	registerProperty(const rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
-                                 void* _pPointerToMember, const uno::Type& _rMemberType) 
-            { OPropertyContainer::registerProperty(_rName, _nHandle, _nAttributes, _pPointerToMember, _rMemberType);}		
-
-        void	describeProperties(uno::Sequence< beans::Property >& /* [out] */ _rProps) const
-            { OPropertyContainer::describeProperties(_rProps);}		
-        
-
-        uno::Any SAL_CALL queryPropertyInterface(uno::Type const& rType) throw (uno::RuntimeException)
-        { return OPropertyContainer::queryInterface(rType);}
-
-        void attachToContext();
-        uno::Reference< lang::XComponent > releaseContext();
-        void discardContext(uno::Reference< lang::XComponent > const & xContext);
-    };
-
-} // namespace configmgr
-
-#endif // CONFIGMGR_API_PROVIDER_HXX_
-
-
diff --git a/configmgr/source/api2/providerimpl.cxx b/configmgr/source/api2/providerimpl.cxx
deleted file mode 100644
index 03ce8a9278..0000000000
--- a/configmgr/source/api2/providerimpl.cxx
+++ /dev/null
@@ -1,896 +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: providerimpl.cxx,v $
- * $Revision: 1.69 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include <stdio.h>
-#include "providerimpl.hxx"
-#include "options.hxx"
-#include "apifactoryimpl.hxx"
-#include "apitreeimplobj.hxx"
-#include "apitreeaccess.hxx"
-#include "roottree.hxx"
-#include "node.hxx"
-#include "noderef.hxx"
-#include "objectregistry.hxx"
-#include "bootstrap.hxx"
-#include "cachefactory.hxx"
-#include "provider.hxx"
-#include "treemanager.hxx"
-#include "tracer.hxx"
-#include <osl/interlck.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
-
-#define RTL_LOGFILE_OU2A(rtlOUString)	(::rtl::OUStringToOString((rtlOUString), RTL_TEXTENCODING_ASCII_US).getStr())
-
-namespace configmgr
-{
-    namespace css	= ::com::sun::star;
-    namespace uno	= css::uno;
-    namespace beans	= css::beans;
-
-    namespace configapi 
-    {
-
-        class ApiProviderInstances
-        {
-            rtl::Reference<ObjectRegistry>	m_aObjectRegistry;
-            ReadOnlyObjectFactory	m_aReaderFactory;
-            UpdateObjectFactory		m_aWriterFactory;
-            ApiProvider				m_aReaderProvider;
-            ApiProvider				m_aWriterProvider;
-        public:
-            ApiProviderInstances(OProviderImpl& rProviderImpl)
-            : m_aObjectRegistry(new ObjectRegistry())
-            , m_aReaderFactory(m_aReaderProvider,m_aObjectRegistry)
-            , m_aWriterFactory(m_aWriterProvider,m_aObjectRegistry)
-            , m_aReaderProvider(m_aReaderFactory,rProviderImpl)
-            , m_aWriterProvider(m_aWriterFactory,rProviderImpl)
-            {
-            }
-
-            ~ApiProviderInstances()
-            {}
-
-            ApiProvider&		getReaderProvider()		{ return m_aReaderProvider; }
-            ApiProvider&		getWriterProvider()		{ return m_aWriterProvider; }
-            Factory&			getReaderFactory()		{ return m_aReaderFactory; }
-            Factory&			getWriterFactory()		{ return m_aWriterFactory; }			
-        };
-    }
-        
-    //=============================================================================
-
-    //=============================================================================
-    //= OProviderImpl
-    //=============================================================================
-    //-----------------------------------------------------------------------------
-    OProviderImpl::OProviderImpl(OProvider* _pProvider, uno::Reference< uno::XComponentContext > const & _xContext)				  
-                  :m_pProvider(_pProvider)		          
-                  ,m_xTypeConverter()		
-                  ,m_aDefaultOptions()		
-                  ,m_pNewProviders(NULL)
-                  ,m_aTreeManagerMutex()
-                  ,m_pTreeManager(NULL)
-    {
-        OSL_ENSURE(_xContext.is(), "OProviderImpl : NULL context !");	
-        
-        uno::Reference< lang::XMultiComponentFactory > xFactory = _xContext->getServiceManager();
-        OSL_ENSURE(xFactory.is(), "OProviderImpl : missing service factory !");	
-        
-        m_xTypeConverter = m_xTypeConverter.query(
-            xFactory->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.Converter" )),
-                                                 _xContext));
-
-        OSL_ENSURE(m_xTypeConverter.is(), "Module::Module : could not create an instance of the type converter !");		
-    }
-    //-----------------------------------------------------------------------------
-    rtl::Reference< TreeManager > OProviderImpl::maybeGetTreeManager() const SAL_THROW(())
-    {
-        osl::MutexGuard aGuard(m_aTreeManagerMutex);
-        rtl::Reference< TreeManager > xResult(m_pTreeManager);
-        return xResult;
-    }
-    //-----------------------------------------------------------------------------
-    rtl::Reference< TreeManager > OProviderImpl::getTreeManager() const SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        osl::MutexGuard aGuard(m_aTreeManagerMutex);
-        if (m_pTreeManager == NULL)
-        {
-            rtl::OUString sMsg = rtl::OUString::createFromAscii("OProviderImpl: No cache available - provider was already disposed.");
-            throw com::sun::star::lang::DisposedException(sMsg,static_cast<lang::XMultiServiceFactory*>(m_pProvider));
-        }
-        rtl::Reference< TreeManager > xResult(m_pTreeManager);
-        return xResult;
-    }
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::setTreeManager(TreeManager * pTreeManager) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        osl::MutexGuard aGuard(m_aTreeManagerMutex);
-
-        OSL_PRECOND(m_pTreeManager == NULL, "OProviderImpl: TreeManager is already set");
-        OSL_PRECOND(pTreeManager != NULL, "OProviderImpl: Trying to set a NULL TreeManager");
-       
-        if (pTreeManager == NULL)
-        {
-            rtl::OUString sMsg = rtl::OUString::createFromAscii("OProviderImpl: No cache available - cache creation failed.");
-            throw com::sun::star::uno::RuntimeException(sMsg,NULL);
-        }
-
-        (m_pTreeManager = pTreeManager) -> acquire();
-    }
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::clearTreeManager() SAL_THROW(())
-    {
-        osl::ClearableMutexGuard aGuard(m_aTreeManagerMutex);
-        if (TreeManager * pTM = m_pTreeManager)
-        {
-            m_pTreeManager = NULL;
-            pTM->release();
-        }
-    }
-    //-----------------------------------------------------------------------------
-    bool OProviderImpl::initSession(const ContextReader& _rSettings)				  
-    {
-        bool bNeedProfile = false;
-        rtl::Reference< TreeManager > xNewTreeManager; 
-        if (_rSettings.isUnoBackend())
-        {
-            this->implInitFromSettings(_rSettings,bNeedProfile);
-
-            xNewTreeManager = CacheFactory::instance().createCacheManager(_rSettings.getBaseContext()); 
-        }
-        else
-        {
-            throw com::sun::star::uno::RuntimeException(rtl::OUString::createFromAscii("OProviderImpl: Only UNO Backends Supported"),NULL);
-        }
-        
-        setTreeManager( xNewTreeManager.get() );
-        OSL_ASSERT( xNewTreeManager.get() );
-        
-        // put out of line to get rid of the order dependency (and to have a acquired configuration)
-        m_pNewProviders   = new configapi::ApiProviderInstances(*this);
-
-    // now complete our state from the user's profile, if necessary
-        if (bNeedProfile)
-        try
-        {
-            static ::rtl::OUString ssUserProfile(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup"));	
-            configuration::AbsolutePath aProfileModule = configuration::AbsolutePath::makeModulePath(ssUserProfile);
-
-            sharable::Node * profileTree = xNewTreeManager->requestSubtree(aProfileModule, m_aDefaultOptions);
-            if (profileTree != 0)
-            {
-                implInitFromProfile(profileTree);
-
-                // should we clean this up ?
-                // xNewTreeManager->releaseSubtree(aProfileModule, xTempOptions);
-            }
-        }
-        catch (uno::Exception& e)
-        {
-            // could not read profile
-                   (void)e;
-            CFG_TRACE_ERROR_NI("Provider bootstrapping: Caught an exception trying to get 'Setup' data: %s", OUSTRING2ASCII(e.Message));
-        }
-
-        return true;
-    }
-    //-----------------------------------------------------------------------------
-
-    // these can be overridden. default does nothing
-    void OProviderImpl::initFromSettings(const ContextReader& , bool& )
-    {
-    }
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::initFromProfile(sharable::Node *)
-    {
-    }
-    //-----------------------------------------------------------------------------
-    // these implement the base class behavior
-    void OProviderImpl::implInitFromSettings(const ContextReader& _rSettings, bool& rNeedProfile)
-    {
-        bool bIntrinsicNeedProfile = true;
-
-        if  (_rSettings.hasLocale())
-        {
-            bIntrinsicNeedProfile = false;
-            rtl::OUString sDefaultLocale = _rSettings.getLocale();
-            m_aDefaultOptions.setIsoLocale(sDefaultLocale);			
-        }
-        else if (_rSettings.isAdminService())
-        {
-            bIntrinsicNeedProfile = false;
-            m_aDefaultOptions.setAllLocales();			
-        }
-        else
-            OSL_ASSERT(!m_aDefaultOptions.hasLocale());
-
-        if  (_rSettings.hasAsyncSetting())
-        {
-            m_aDefaultOptions.enableAsync( !!_rSettings.getAsyncSetting() );
-        }
-        
-
-    // call the template method
-        this->initFromSettings(_rSettings, rNeedProfile);
-
-        if (bIntrinsicNeedProfile)
-            rNeedProfile = true; // to get locale
-    }
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::implInitFromProfile(sharable::Node * profile)
-    {
-        OSL_ASSERT(profile != 0);
-
-        sharable::GroupNode * profileNode = sharable::GroupNode::from(profile);
-
-        OSL_ASSERT(profileNode != 0);
-
-        // read the default locale for the user		
-        if (!m_aDefaultOptions.hasLocale())
-        {
-            static rtl::OUString ssSubGroup(RTL_CONSTASCII_USTRINGPARAM("L10N"));
-            static rtl::OUString ssLocale(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
-
-            sharable::GroupNode * l10nNode = sharable::GroupNode::from(profileNode->getChild(ssSubGroup));
-            if (l10nNode != 0)
-            {
-                sharable::ValueNode * value = sharable::ValueNode::from(l10nNode->getChild(ssLocale));
-
-                if (value != 0)
-                {
-                    rtl::OUString sDefaultLocale;		
-                    if (value->getValue() >>= sDefaultLocale)
-                    {
-                        m_aDefaultOptions.setIsoLocale(sDefaultLocale);			
-                    }
-                    else
-                        OSL_ENSURE(false, "Could not extract locale parameter into string");
-                }
-            }			
-        }
-
-    // call the template method
-        this->initFromProfile(profile);
-
-        // last fallback, if there is no locale - even in ooLocale
-        m_aDefaultOptions.ensureLocaleSet();
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::setDefaultLocale( com::sun::star::lang::Locale const & aLocale )
-    {
-        m_aDefaultOptions.setLocale( aLocale );
-        // ensure that the locale is never cleared to 'empty'
-        m_aDefaultOptions.ensureLocaleSet();
-    }
-
-    //-----------------------------------------------------------------------------
-    OProviderImpl::~OProviderImpl()
-    {	
-        UnoApiLock aLock; // hmm...
-        clearTreeManager();
-
-        delete m_pNewProviders;		
-    }
-
-    // --------------------------------- disposing ---------------------------------
-    void SAL_CALL OProviderImpl::dispose() throw()
-    {
-        try 
-        { 
-            rtl::Reference< TreeManager > xTM = maybeGetTreeManager();
-
-            if (xTM.is())
-                xTM->dispose();	
-
-            clearTreeManager();
-        } 
-        catch (uno::Exception& e) 
-        { 
-            (void)e;
-            CFG_TRACE_ERROR("Disposing the TreeManager or closing the session caused an exception: %s", OUSTRING2ASCII(e.Message)); 
-            clearTreeManager();
-        }	
-    }
-
-    //-----------------------------------------------------------------------------	
-    // access to the raw notifications
-    TreeManager * OProviderImpl::getNotifier() SAL_THROW(())
-    { 
-        rtl::Reference< TreeManager > xTM = maybeGetTreeManager();
-        return xTM.get(); 
-    }
-
-    // DefaultProvider access
-    //-----------------------------------------------------------------------------			
-    rtl::Reference< TreeManager > OProviderImpl::getDefaultProvider() const SAL_THROW((com::sun::star::uno::RuntimeException))
-    { 
-        return getTreeManager().get(); 
-    }
-
-    //-----------------------------------------------------------------------------
-    sharable::Node * OProviderImpl::requestSubtree( configuration::AbsolutePath const& aSubtreePath, 
-                                                    RequestOptions const & _aOptions
-                                                  ) SAL_THROW((com::sun::star::uno::Exception))
-    {
-        rtl::Reference< TreeManager > xTreeManager = getTreeManager();
-
-        sharable::Node * tree = 0;
-        try
-        {
-            tree = xTreeManager->requestSubtree(aSubtreePath, _aOptions);
-        }
-        catch(uno::Exception&e)
-        {
-            ::rtl::OUString sMessage = getErrorMessage(aSubtreePath, _aOptions);
-            // append the error message given by the tree provider
-            sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\nThe backend returned the following error:\n"));
-            sMessage += e.Message;
-        
-            throw lang::WrappedTargetException(sMessage, getProviderInstance(), uno::makeAny(e));
-        }
-
-        if (tree == 0)
-        {
-            ::rtl::OUString sMessage = getErrorMessage(aSubtreePath, _aOptions);
-                
-            sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\nNo backend error message available\n"));
-
-            throw uno::Exception(sMessage, getProviderInstance());
-        }
-
-        return tree;
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::updateTree(TreeChangeList& aChanges) SAL_THROW((com::sun::star::uno::Exception))
-    {
-        getTreeManager()->updateTree(aChanges);
-    }	
-    
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::releaseSubtree( configuration::AbsolutePath const& aSubtreePath, RequestOptions const& _aOptions ) SAL_THROW(())
-    {
-        rtl::Reference< TreeManager > xTM = maybeGetTreeManager();
-        if (xTM.is())
-            xTM->releaseSubtree(aSubtreePath, _aOptions);
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::saveAndNotifyUpdate(TreeChangeList const& aChanges) SAL_THROW((com::sun::star::uno::Exception))
-    {
-        getTreeManager()->saveAndNotifyUpdate(aChanges);
-    }
-
-    //-----------------------------------------------------------------------------
-    void OProviderImpl::fetchSubtree(configuration::AbsolutePath const& aSubtreePath, RequestOptions const& _aOptions) SAL_THROW(())
-    {
-        rtl::Reference< TreeManager > xTM = maybeGetTreeManager();
-        if (xTM.is()) 
-            xTM->fetchSubtree(aSubtreePath, _aOptions);
-    }
-
-    //-----------------------------------------------------------------------------
-    sal_Bool OProviderImpl::fetchDefaultData(configuration::AbsolutePath const& aSubtreePath, RequestOptions const& _aOptions) SAL_THROW((com::sun::star::uno::Exception))
-    {
-        return getTreeManager()->fetchDefaultData(aSubtreePath, _aOptions);
-    }
-    //-----------------------------------------------------------------------------------
-    void OProviderImpl::refreshAll()SAL_THROW((com::sun::star::uno::Exception))
-    {
-        m_pTreeManager->refreshAll();
-    }
-    //-----------------------------------------------------------------------------------
-    void OProviderImpl::flushAll()SAL_THROW(())
-    {
-        m_pTreeManager->flushAll();
-    }
-    //-----------------------------------------------------------------------------------
-    void OProviderImpl::enableAsync(const sal_Bool& bEnableAsync) SAL_THROW(())
-    {
-         m_pTreeManager->enableAsync(bEnableAsync);
-    }
-    //-----------------------------------------------------------------------------
-    uno::XInterface* OProviderImpl::getProviderInstance()
-    {
-        return static_cast<com::sun::star::lang::XMultiServiceFactory*>(m_pProvider);
-    }
-
-    //-----------------------------------------------------------------------------------
-    rtl::OUString OProviderImpl::getErrorMessage(configuration::AbsolutePath const& _rAccessor, RequestOptions const& _aOptions)
-    {
-        rtl::OUString const sAccessor = _rAccessor.toString();
-
-        CFG_TRACE_ERROR("config provider: the cache manager could not provide the tree (neither from the cache nor from the session)");		
-        ::rtl::OUString sMessage;
-        ::rtl::OUString sEntity(_aOptions.getEntity());
-        ::rtl::OUString sLocale(_aOptions.getLocale());
-        CFG_TRACE_INFO_NI("config provider: the entity we tried this for is \"%s\", the locale \"%s\", the path \"%s\"", OUSTRING2ASCII(sEntity), OUSTRING2ASCII(sLocale), OUSTRING2ASCII(sAccessor));
-        sMessage += sAccessor;
-        
-        if (sEntity.getLength())
-        {
-            sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (and for entity "));
-            sMessage += sEntity;
-            sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
-        }
-
-        if (sLocale.getLength())
-        {
-            sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (and for locale "));
-            sMessage += sLocale;
-            sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
-        }
-        
-        sMessage += ::rtl::OUString::createFromAscii(" could not be created. Unable to retrieve the node from the configuration server.");		
-        return sMessage;
-    }
-
-    // actual factory methods
-    //-----------------------------------------------------------------------------------
-    configapi::NodeElement* OProviderImpl::buildReadAccess(rtl::OUString const& _rAccessor, RequestOptions const& _aOptions, sal_Int32 nMinLevels)  SAL_THROW((com::sun::star::uno::Exception))
-    {
-        CFG_TRACE_INFO("config provider: requesting the tree from the cache manager");
-
-        OSL_ASSERT(sal_Int16(nMinLevels) == nMinLevels);
-
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::OProviderImpl", "jb99855", "configmgr::OProviderImpl::buildReadAccess()");
-        RTL_LOGFILE_CONTEXT_TRACE1(aLog, "request path: %s", RTL_LOGFILE_OU2A(_rAccessor) );
-
-        try
-        {
-            configuration::AbsolutePath aAccessorPath = configuration::AbsolutePath::parse(_rAccessor);
-
-            sharable::Node * tree = requestSubtree(aAccessorPath,_aOptions);
-
-            RTL_LOGFILE_CONTEXT_TRACE(aLog, "data loaded" );
-
-            unsigned int nDepth = (nMinLevels == treeop::ALL_LEVELS) ? configuration::C_TreeDepthAll : (unsigned int)(nMinLevels);
-
-            RTL_LOGFILE_CONTEXT_AUTHOR(aLog2, "configmgr::OProviderImpl", "jb99855", "configmgr: createReadOnlyTree()");
-
-            rtl::Reference< configuration::Tree > aRootTree( configuration::createReadOnlyTree(
-                    aAccessorPath, tree, nDepth, 
-                    configuration::TemplateProvider( getTreeManager(), _aOptions )
-                ));
-
-            return m_pNewProviders->getReaderFactory().makeAccessRoot(aRootTree, _aOptions);
-        }
-        catch (configuration::Exception& e)
-        {
-            configapi::ExceptionMapper ec(e);
-            ec.setContext(this->getProviderInstance());
-            //ec.unhandled();
-            throw lang::WrappedTargetException(ec.message(), ec.context(), uno::Any());
-        }
-    }
-
-
-    //-----------------------------------------------------------------------------------
-    configapi::NodeElement* OProviderImpl::buildUpdateAccess(rtl::OUString const& _rAccessor, RequestOptions const& _aOptions,
-                                                  sal_Int32 nMinLevels) SAL_THROW((com::sun::star::uno::Exception))
-    {		
-        CFG_TRACE_INFO("config provider: requesting the tree from the cache manager");
-        OSL_ASSERT(sal_Int16(nMinLevels) == nMinLevels);
-
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::OProviderImpl", "jb99855", "configmgr: buildUpdateAccess()");
-        RTL_LOGFILE_CONTEXT_TRACE1(aLog, "request path: %s", RTL_LOGFILE_OU2A(_rAccessor) );
-
-        try
-        {
-            configuration::AbsolutePath aAccessorPath = configuration::AbsolutePath::parse(_rAccessor);
-
-            sharable::Node * tree = requestSubtree(aAccessorPath, _aOptions);
-
-            RTL_LOGFILE_CONTEXT_TRACE(aLog, "data loaded" );
-
-            unsigned int nDepth = (nMinLevels == treeop::ALL_LEVELS) ? configuration::C_TreeDepthAll : (unsigned int)(nMinLevels);
-
-            RTL_LOGFILE_CONTEXT_AUTHOR(aLog2, "configmgr::OProviderImpl", "jb99855", "createUpdatableTree()");
-
-            rtl::Reference< configuration::Tree > aRootTree( configuration::createUpdatableTree(
-                                    aAccessorPath, tree, nDepth, 
-                                    configuration::TemplateProvider( getTreeManager(), _aOptions )
-                                ));
-            
-
-            return m_pNewProviders->getWriterFactory().makeAccessRoot(aRootTree, _aOptions);		
-        }
-        catch (configuration::Exception& e)
-        {
-            configapi::ExceptionMapper ec(e);
-            ec.setContext(this->getProviderInstance());
-            //ec.unhandled();
-            throw lang::WrappedTargetException(ec.message(), ec.context(), uno::Any());
-        }
-    }	
-    
-    //=============================================================================
-    //= OProvider::FactoryArguments
-    //=============================================================================
-
-    sal_Char const * const  OProviderImpl::FactoryArguments::asciiArgumentNames[] =
-    {
-       "nodepath",  // ARG_NODEPATH,            // requested node path
-       "depth",     // ARG_DEPTH,               // depth of the tree
-       "user",      // ARG_USER_DEPRECATED,     // name of the user - only for admin
-       "locale",    // ARG_LOCALE,              // desired locale
-       "nocache",   // ARG_NOCACHE_OBSOLETE,    // cache disabling
-       "lazywrite", // ARG_ASYNC_DEPRECATED,    // lasy write data
-       "enableasync",   // ARG_ASYNC,           // lasy write data
-       "entity",    // ARG_ENTITY,              // name of the entity to be manipulated - only for admin
-       "reload",    //ARG_REFRESH            // refresh component 
-
-    }; 
-            
-    OProviderImpl::FactoryArguments::Argument 
-        OProviderImpl::FactoryArguments::lookupArgument(const rtl::OUString& rName) 
-            SAL_THROW(())
-    {
-        rtl::OUString sCheck( rName.toAsciiLowerCase() );
-        
-        sal_Char const * const * const pFirst = asciiArgumentNames;
-        sal_Char const * const * const pLast  = pFirst + _arg_count;
-
-        sal_Char const * const * it = pFirst;
-            
-        for(; it != pLast; ++it)
-        {
-            if (0 == sCheck.compareToAscii(*it))
-            {
-                break;
-            }
-        }
-
-        OSL_ASSERT( Argument(pLast-pFirst) ==  ARG_NOT_FOUND );
-        return static_cast<Argument>(it - pFirst);
-    }
-
-    //-----------------------------------------------------------------------------------
-    bool OProviderImpl::FactoryArguments::extractOneArgument(
-                            rtl::OUString const& aName, uno::Any const& aValue,
-                            rtl::OUString&	/* [out] */ _rNodeAccessor, 
-                            sal_Int32&	/* [out] */ _nLevels,
-                            RequestOptions& /* [in/out] */ _rOptions ) 
-        SAL_THROW(())
-    {
-        switch ( lookupArgument(aName) )
-        {
-        case ARG_NODEPATH: 
-            {
-                rtl::OUString sStringVal;
-                if (aValue >>= sStringVal)
-                    _rNodeAccessor = sStringVal;
-                else
-                    return false; 
-            }
-            break;
-
-        case ARG_DEPTH:     
-            {
-                sal_Int32 nIntVal = 0;
-                if (aValue >>= nIntVal)
-                    _nLevels = nIntVal;
-                else
-                    return false; 
-            }
-            break;
-        
-        case ARG_ENTITY: 
-        case ARG_USER_DEPRECATED: 
-            {
-                rtl::OUString sStringVal;
-                if (aValue >>= sStringVal)
-                    _rOptions.setEntity(sStringVal);
-                else
-                    return false; 
-            }
-            break;
-     
-        case ARG_LOCALE:
-            {
-                rtl::OUString    sStringVal;
-                if (aValue >>= sStringVal)
-                {
-                    _rOptions.setIsoLocale(sStringVal);
-                    break;
-                }
-
-                lang::Locale aLocale;
-                if (aValue >>= aLocale)
-                {
-                    _rOptions.setLocale(aLocale);
-                    break;
-                }
-            
-                return false; 
-            }
-
-        case ARG_NOCACHE_OBSOLETE: 
-            {
-                sal_Bool bBoolVal;
-                if (aValue >>= bBoolVal)
-                    OSL_ENSURE(false,"ConfigurationProvider: Parameter \"nocache\" is obsolete and has no effect");
-                else
-                    return false; 
-            }
-            break;
-
-        case ARG_ASYNC:
-        case ARG_ASYNC_DEPRECATED:
-            {
-                sal_Bool bBoolVal = sal_False;
-                if (aValue >>= bBoolVal)
-                    _rOptions.enableAsync(!!bBoolVal);
-                else
-                    return false; 
-            }
-            break;
-         case ARG_REFRESH:
-            {
-                sal_Bool bBoolVal = sal_False;
-                if (aValue >>= bBoolVal)
-                    _rOptions.forceRefresh(!!bBoolVal);
-                else
-                    return false; 
-            }
-            break;
-
-        case ARG_NOT_FOUND:
-                {
-                    rtl::OString sMessage(RTL_CONSTASCII_STRINGPARAM("Unknown argument \""));
-                    sMessage += rtl::OUStringToOString(aName, RTL_TEXTENCODING_ASCII_US);
-                    sMessage += rtl::OString(RTL_CONSTASCII_STRINGPARAM("\" !\n- Parameter will be ignored -\n"));
-                    CFG_TRACE_WARNING( "provider: %s", sMessage.getStr() );
-            #ifdef DBG_UTIL
-                    OSL_ENSURE(false, sMessage.getStr());
-            #endif
-                }
-            break;
-
-        default: 
-            CFG_TRACE_ERROR( "Known argument is not handled" );
-            OSL_ENSURE(false, "Known argument is not handled"); 
-            break;
-        }
-        return true;
-    }
-
-     //-----------------------------------------------------------------------------------
-    static 
-    void failInvalidArg(uno::Any const & aArg, sal_Int32 _nArg = -1)
-        SAL_THROW((lang::IllegalArgumentException))
-    {
-        OSL_ENSURE( sal_Int16(_nArg) == _nArg, "Argument number out of range. Raising imprecise exception.");
-
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("Configuration Provider: An argument");
-        sMessage.appendAscii(" has the wrong type.");
-        sMessage.appendAscii("\n- Expected a NamedValue or PropertyValue");
-        sMessage.appendAscii("\n- Found type ").append( aArg.getValueType().getTypeName() );
-        
-        throw lang::IllegalArgumentException(   sMessage.makeStringAndClear(),
-                                                uno::Reference<uno::XInterface>(),
-                                                sal_Int16(_nArg+1));
-   }
-
-     //-----------------------------------------------------------------------------------
-    static 
-    void failInvalidArgValue(rtl::OUString const & aName, uno::Any const & aValue, sal_Int32 _nArg = -1)
-        SAL_THROW((lang::IllegalArgumentException))
-    {
-        OSL_ENSURE( sal_Int16(_nArg) == _nArg, "Argument number out of range. Raising imprecise exception.");
-
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("Configuration Provider: The argument ").append(aName);
-        sMessage.appendAscii(" has the wrong type.");
-        sMessage.appendAscii("\n- Found type ").append( aValue.getValueType().getTypeName() );
-        
-        throw lang::IllegalArgumentException(   sMessage.makeStringAndClear(),
-                                                uno::Reference<uno::XInterface>(),
-                                                sal_Int16(_nArg+1));
-   }
-
-     //-----------------------------------------------------------------------------------
-    static 
-    bool extractLegacyArguments(    const uno::Sequence<uno::Any>& _rArgs,
-                                    rtl::OUString&	/* [out] */ _rNodeAccessor, 
-                                    sal_Int32&	/* [out] */ _nLevels )
-        SAL_THROW((lang::IllegalArgumentException))
-    {
-        OSL_ASSERT( _rArgs.getLength() != 0 );
-
-        // compatibility : formerly, you could specify the node path as first arg and the (optional) depth
-        // as second arg
-        if (! (_rArgs[0] >>= _rNodeAccessor) )
-            return false;
-
-        switch (_rArgs.getLength() ) 
-        {
-        case 1:
-            // valid single argument
-            return true;
-
-        case 2:
-            // valid second argument
-            if (_rArgs[1] >>= _nLevels)
-                return true;
-
-            break;
-
-        default:
-            if (_rArgs[1] >>= _nLevels)
-            {
-                // valid second argument, but too many arguments altogether
-                 throw lang::IllegalArgumentException(
-                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                "Configuration Provider: Too many arguments. "
-                                "Additional arguments are not supported when passing the node path as string (deprecated convention).")),
-                            uno::Reference<uno::XInterface>(),
-                            sal_Int16(3)
-                );
-            }
-
-            break;
-
-        }
-        // here we have an invalid second argument
-
-        if (_rArgs[1].getValueTypeClass() != uno::TypeClass_STRUCT)
-        {
-            // completely invalid second argument
-            failInvalidArgValue(rtl::OUString::createFromAscii("<depth>"),_rArgs[1],1);
-        }
-
-        // Assume PropertyValue or NamedValue,
-        // which should be handled consistently by caller
-        return false;
-    }
-    
-    //-----------------------------------------------------------------------------------
-    void OProviderImpl::FactoryArguments::extractArgs(	const uno::Sequence<uno::Any>& _rArgs,
-                                                        rtl::OUString&	/* [out] */ _rNodeAccessor, 
-                                                        sal_Int32&	/* [out] */ _nLevels,
-                                                        RequestOptions & /* [in/out] */ _aOptions ) 
-        SAL_THROW((lang::IllegalArgumentException))
-    {
-        UnoApiLock aLock;
-
-        _nLevels = treeop::ALL_LEVELS; // setting a fallback
-
-        // the args have to be a sequence of property or named values
-        beans::NamedValue    aNV;
-        beans::PropertyValue aPV;
-        for (sal_Int32 i=0; i<_rArgs.getLength(); ++i)
-        {
-            if (_rArgs[i] >>= aPV)
-            {
-                if ( !extractOneArgument(aPV.Name,aPV.Value,_rNodeAccessor,_nLevels,_aOptions) )
-                    failInvalidArgValue(aPV.Name,aPV.Value,i);
-            }
-            else if (_rArgs[i] >>= aNV)
-            {
-                if ( !extractOneArgument(aNV.Name,aNV.Value,_rNodeAccessor,_nLevels,_aOptions) )
-                    failInvalidArgValue(aNV.Name,aNV.Value,i);
-            }
-            else 
-            {
-                if (i == 0)// try compatibility format
-                    if ( extractLegacyArguments(_rArgs,_rNodeAccessor,_nLevels))
-                        break;
-
-                failInvalidArg(_rArgs[i],i);
-                OSL_ASSERT(false);
-            }
-        }
-
-        if (_rNodeAccessor.getLength() == 0)
-        {
-            rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Configuration Provider: Missing argument: no nodepath was provided"));
-            throw	lang::IllegalArgumentException(sMessage,uno::Reference<uno::XInterface>(),0);
-        }
-    }
-
-    //--------------------------------------------------------------------------
-    uno::Reference<uno::XInterface>  OProviderImpl::createReadAccess( uno::Sequence<uno::Any> const& aArgs)
-        SAL_THROW((com::sun::star::uno::Exception))
-    {
-        CFG_TRACE_INFO("config provider: going to create a read access instance");
-
-        // extract the args
-        rtl::OUString sPath;
-        sal_Int32 nLevels;
-        
-        RequestOptions aOptions = getDefaultOptions();
-
-        OProviderImpl::FactoryArguments::extractArgs(aArgs, sPath, nLevels, aOptions);
-
-        CFG_TRACE_INFO_NI("config provider: node accessor extracted from the args is %s", OUSTRING2ASCII(sPath));
-        CFG_TRACE_INFO_NI("config provider: level depth extracted from the args is %i", nLevels);
-
-        // create the access object
-        uno::Reference< uno::XInterface > xReturn;
-
-        configapi::NodeElement* pElement = buildReadAccess(sPath, aOptions, nLevels);
-        if (pElement != 0)
-        {
-            xReturn = pElement->getUnoInstance();
-            if (xReturn.is())
-                // acquired once by buildReadAccess
-                xReturn->release();
-        }
-
-        return xReturn;
-    }
-
-    //-----------------------------------------------------------------------------------
-    uno::Reference<uno::XInterface> OProviderImpl::createUpdateAccess( uno::Sequence<uno::Any> const& aArgs)
-        SAL_THROW((com::sun::star::uno::Exception))
-    {
-        CFG_TRACE_INFO("config provider: going to create an update access instance");
-
-        // extract the args
-        rtl::OUString sPath;
-        sal_Int32 nLevels;
-
-        RequestOptions aOptions = getDefaultOptions();
-
-        OProviderImpl::FactoryArguments::extractArgs(aArgs, sPath, nLevels, aOptions);
-
-        CFG_TRACE_INFO_NI("config provider: node accessor extracted from the args is %s", OUSTRING2ASCII(sPath));
-        CFG_TRACE_INFO_NI("config provider: level depth extracted from the args is %i", nLevels);
-
-        // create the access object
-        uno::Reference< uno::XInterface > xReturn;
-
-        configapi::NodeElement* pElement = buildUpdateAccess(sPath, aOptions, nLevels);
-        if (pElement != 0)
-        {
-            xReturn = pElement->getUnoInstance();
-            if (xReturn.is())
-                // acquired once by buildReadAccess
-                xReturn->release();
-        }
-
-        return xReturn;
-    }
-//-----------------------------------------------------------------------------------
-    
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/providerimpl.hxx b/configmgr/source/api2/providerimpl.hxx
deleted file mode 100644
index 9e8e9e252d..0000000000
--- a/configmgr/source/api2/providerimpl.hxx
+++ /dev/null
@@ -1,231 +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: providerimpl.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_PROVIDERIMPL_HXX_
-#define CONFIGMGR_API_PROVIDERIMPL_HXX_
-
-#include "defaultprovider.hxx"
-#include "requestoptions.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <osl/mutex.hxx>
-
-namespace com { namespace sun { namespace star { 
-    namespace uno 
-    {
-        class Any;
-        class XInterface;
-        template <class> class Sequence;
-        template <class> class Reference;
-    }
-    namespace beans 
-    {
-        struct PropertyValue;
-    }
-}   }   }
-
-namespace rtl 
-{ 
-    class OUString; 
-    template <class RCType> class Reference; 
-}
-
-namespace configmgr
-{
-    namespace css       = ::com::sun::star;
-    namespace uno       = css::uno;
-    namespace script    = css::script;
-    namespace lang      = css::lang;
-    namespace beans     = css::beans;
-    
-    class ISubtree;
-    struct TreeChangeList;
-    class TreeManager;
-    class ContextReader;
-    class OProvider;
-    
-    namespace configapi
-    {
-        class NodeElement;
-        class ApiProviderInstances;
-        class Factory;
-    }
-    namespace sharable { union Node; }
-
-    // -----------------------------------------------------------------------------
-    class OProviderImpl : public IDefaultableTreeManager
-    {
-        friend class OProvider; 
-    public:
-        //==========================================================================
-        //= FactoryArguments
-        //==========================================================================
-        /** Helper class for evaluation of the arguments for creating a service instance.*/
-        struct FactoryArguments
-        {
-            /// possible arguments, given only in small letters.
-            enum Argument
-            {
-                ARG_NODEPATH,           // requested node path
-                ARG_DEPTH,              // depth of the tree
-                ARG_USER_DEPRECATED,    // name of the entity to be manipulated - deprecated version
-                ARG_LOCALE,             // desired locale
-                ARG_NOCACHE_OBSOLETE,   // cache disabling - obsolete and nonfunctional
-                ARG_ASYNC_DEPRECATED,   // lasy write data - deprecated version
-                ARG_ASYNC,              // lazy write data
-                ARG_ENTITY,             // name of the entity to be manipulated - only for admin
-                ARG_REFRESH,            // force refresh of data into cache
-
-                _arg_count,
-                ARG_NOT_FOUND = _arg_count
-            };
-            static sal_Char const * const asciiArgumentNames[]; 
-            
-            static Argument lookupArgument(rtl::OUString const& sArgumentName)   SAL_THROW(());
-        public:        
-            /** extracts arguments from the argument sequence into to the parameter variables
-
-                <p>unknown arguments are ignored</p>
-
-                @throws com::sun::star::lang::IllegalArgumentException
-                    if an element of _rArgs had the wrong type or
-                    if the value of a known argument has the wrong type or
-                    if the value of a known argument is out of range (sometimes)
-                    or if no non-empty node path argument could be extracted,
-            */
-            static void extractArgs(    const uno::Sequence<uno::Any>& _rArgs, 
-                                        rtl::OUString&   /* [out] */ _rNodeAccessor, 
-                                        sal_Int32&  /* [out] */ _nLevels,
-                                        RequestOptions& /* [in/out] */ xOptions)
-                SAL_THROW((lang::IllegalArgumentException));
-
-            static bool extractOneArgument( rtl::OUString const& aName, uno::Any const& aValue,
-                                            rtl::OUString&	/* [out] */ _rNodeAccessor, 
-                                            sal_Int32&	/* [out] */ _nLevels,
-                                            RequestOptions& /* [in/out] */ xOptions 
-                                          ) SAL_THROW(());
-
-        };
-        
-    private:  
-        OProvider*                          m_pProvider;        /// used for ref counting, uno representation
-
-        uno::Reference< script::XTypeConverter >                    m_xTypeConverter;
-        RequestOptions                      m_aDefaultOptions;      
-        configapi::ApiProviderInstances*    m_pNewProviders;    
-        mutable osl::Mutex                  m_aTreeManagerMutex;
-        TreeManager*                        m_pTreeManager;     /// the tree cache. Will hold a reference to us as long as it life              
-        
-        rtl::Reference< TreeManager > maybeGetTreeManager() const SAL_THROW(());
-        rtl::Reference< TreeManager > getTreeManager() const SAL_THROW((com::sun::star::uno::RuntimeException));
-        void setTreeManager(TreeManager * pTreeManager) SAL_THROW((com::sun::star::uno::RuntimeException));
-        void clearTreeManager() SAL_THROW(());
-
-        OProviderImpl(OProvider* _pProvider, 
-                                   uno::Reference< uno::XComponentContext > const & xContext);
-
-    public:
-        virtual ~OProviderImpl();
-
-       /** request that the tree named by a path is added to the collection of managed trees
-            respecting certain options and requiring a specific loading depth.
-            Return a reference to that managed tree.
-            The reference must later be released by calling releaseSubtree with the same path and options.
-        */
-        sharable::Node * requestSubtree(configuration::AbsolutePath const& aSubtreePath, const RequestOptions& _aOptions) SAL_THROW((com::sun::star::uno::Exception));
-
-        /// update the managed data according to a changes list - update the changes list accordingly with old values
-        void updateTree(TreeChangeList& aChanges) SAL_THROW((com::sun::star::uno::Exception));
-
-        // bookkeeping support
-        void releaseSubtree( configuration::AbsolutePath const& aSubtreePath, const RequestOptions& _aOptions ) SAL_THROW(());
-
-        // notification
-        void saveAndNotifyUpdate(TreeChangeList const& aChanges) SAL_THROW((com::sun::star::uno::Exception));
-
-        /** request that the tree named by a path is added to the collection of managed trees
-            respecting certain options and requiring a specific loading depth.
-        */
-        void fetchSubtree(configuration::AbsolutePath const& aSubtreePath, const RequestOptions& _aOptions) SAL_THROW(());
-
-        //Refresh all components in the cache
-        void refreshAll() SAL_THROW((com::sun::star::uno::Exception));
-
-        //Flush all components in the cache
-        void flushAll() SAL_THROW(());
-
-        //Enable/Disable Asynchronous write-back to cache
-        void enableAsync(const sal_Bool& bEnableAsync) SAL_THROW(());
-
-        /// IDefaultableTreeManager
-        virtual sal_Bool fetchDefaultData(configuration::AbsolutePath const& aSubtreePath, const RequestOptions& _aOptions
-                                          ) SAL_THROW((com::sun::star::uno::Exception));
-
-        // DefaultProvider access
-        rtl::Reference< TreeManager >  getDefaultProvider() const SAL_THROW((com::sun::star::uno::RuntimeException));
-
-    protected:
-        static rtl::OUString getErrorMessage(configuration::AbsolutePath const& _rAccessor, const RequestOptions& _aOptions);
-        
-        void SAL_CALL dispose() throw();
-    public:             
-        void setDefaultLocale( com::sun::star::lang::Locale const & aLocale );
-
-        RequestOptions const& getDefaultOptions() const {return m_aDefaultOptions;}
-        uno::Reference< script::XTypeConverter > getTypeConverter() const {return m_xTypeConverter;}
-        TreeManager * getNotifier() SAL_THROW(());
-        uno::XInterface*    getProviderInstance();      
-
-        // actual factory methods
-        // the returned object (if any) has to be acquired once)
-        configapi::NodeElement* buildReadAccess( rtl::OUString const& _rAccessor, const RequestOptions& _aOptions, sal_Int32 nMinLevels) SAL_THROW((com::sun::star::uno::Exception));
-        // the returned object (if any) has to be acquired once)
-        configapi::NodeElement* buildUpdateAccess(rtl::OUString const& _rAccessor, const RequestOptions& _aOptions, sal_Int32 nMinLevels) SAL_THROW((com::sun::star::uno::Exception));     
-        // factory methods
-        uno::Reference<uno::XInterface>  createReadAccess( uno::Sequence<uno::Any> const& aArgs) SAL_THROW((com::sun::star::uno::Exception));
-        uno::Reference<uno::XInterface>  createUpdateAccess( uno::Sequence<uno::Any> const& aArgs) SAL_THROW((com::sun::star::uno::Exception));
-
-    private:
-        bool initSession(const ContextReader& _rSettings);
-    private:
-        void implInitFromSettings(const ContextReader& _rSettings, bool& rNeedProfile);        
-        void implInitFromProfile(sharable::Node * aProfile); 
-        
-        void initFromSettings(const ContextReader& _rSettings, bool& rNeedProfile);        
-        void initFromProfile(sharable::Node * aProfile);     
-    };
-} // namespace configmgr
-
-#endif // CONFIGMGR_API_PROVIDERIMPL_HXX_
-
-
diff --git a/configmgr/source/api2/setaccess.cxx b/configmgr/source/api2/setaccess.cxx
deleted file mode 100644
index c421e6430b..0000000000
--- a/configmgr/source/api2/setaccess.cxx
+++ /dev/null
@@ -1,188 +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: setaccess.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_configmgr.hxx"
-
-#include "setaccess.hxx"
-#include "accessimpl.hxx"
-#include "apinotifierimpl.hxx"
-#include "apinodeaccess.hxx"
-
-namespace configmgr
-{
-
-// XHierarchicalName
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL BasicSetAccess::getHierarchicalName(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetHierarchicalName( getNode() );
-}
-
-//------------------------------------------------------------------------------------------------------------------
-rtl::OUString SAL_CALL BasicSetAccess::composeHierarchicalName( const rtl::OUString& sRelativeName ) 
-    throw(css::lang::IllegalArgumentException, css::lang::NoSupportException, uno::RuntimeException)
-{
-    return configapi::implComposeHierarchicalName( getNode(), sRelativeName );
-}
-
-//------------------------------------------------------------------------------------------------------------------
-
-// XElementAccess, base class of XNameAccess (and XHierarchicalNameAccess ? )
-//-----------------------------------------------------------------------------------
-
-uno::Type SAL_CALL BasicSetAccess::getElementType(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetElementType( getNode() );
-}
-
-//-----------------------------------------------------------------------------------
-sal_Bool SAL_CALL BasicSetAccess::hasElements(  ) throw(uno::RuntimeException)
-{
-    return configapi::implHasElements( getNode() );
-}
-
-// XExactName
-//-----------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BasicSetAccess::getExactName( const rtl::OUString& rApproximateName ) throw(uno::RuntimeException)
-{
-    return configapi::implGetExactName( getNode(), rApproximateName);
-}
-
-// XProperty
-//-----------------------------------------------------------------------------------
-
-css::beans::Property SAL_CALL BasicSetAccess::getAsProperty(  ) throw(uno::RuntimeException)
-{
-    return configapi::implGetAsProperty( getNode() );
-}
-
-// XPropertySetInfo
-//-----------------------------------------------------------------------------------
-
-uno::Sequence< css::beans::Property > SAL_CALL BasicSetAccess::getProperties(  ) throw (uno::RuntimeException)
-{
-    return configapi::implGetProperties( getNode() );
-}
-
-css::beans::Property SAL_CALL BasicSetAccess::getPropertyByName( const rtl::OUString& aName ) 
-    throw (css::beans::UnknownPropertyException, uno::RuntimeException)
-{
-    return configapi::implGetPropertyByName( getNode(), aName );
-}
-
-sal_Bool SAL_CALL BasicSetAccess::hasPropertyByName( const rtl::OUString& name ) throw (uno::RuntimeException)
-{
-    return configapi::implHasPropertyByName( getNode(), name );
-}
-
-
-// XNameAccess
-//-----------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BasicSetAccess::hasByName( const rtl::OUString& sName ) throw(uno::RuntimeException)
-{
-    return configapi::implHasByName( getNode(), sName);
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any SAL_CALL BasicSetAccess::getByName( const rtl::OUString& sName ) 
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    return configapi::implGetByName( getNode(), sName );
-} 
-
-//-----------------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > SAL_CALL BasicSetAccess::getElementNames(  ) throw( uno::RuntimeException)
-{
-    return configapi::implGetElementNames( getNode() );
-}
-
-// XHierarchicalNameAccess
-//-----------------------------------------------------------------------------------
-sal_Bool SAL_CALL BasicSetAccess::hasByHierarchicalName( const rtl::OUString& sName ) throw(uno::RuntimeException)
-{
-    return configapi::implHasByHierarchicalName( getNode(), sName);
-}
-
-//-----------------------------------------------------------------------------------
-uno::Any SAL_CALL BasicSetAccess::getByHierarchicalName( const rtl::OUString& sName ) 
-    throw(css::container::NoSuchElementException, uno::RuntimeException)
-{
-    return configapi::implGetByHierarchicalName( getNode(), sName );
-} 
-
-        
-// XContainer
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicSetAccess::addContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implAddListener( getNode(), xListener );
-}
-
-void SAL_CALL BasicSetAccess::removeContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-    throw(uno::RuntimeException)
-{
-    configapi::implRemoveListener( getNode(), xListener );
-}
-    
-//-----------------------------------------------------------------------------------
-// Set-specific interfaces
-//-----------------------------------------------------------------------------------
-
-// XTemplateContainer
-//-----------------------------------------------------------------------------------
-rtl::OUString SAL_CALL BasicSetAccess::getElementTemplateName(  ) 
-    throw(uno::RuntimeException)
-{
-    return configapi::implGetElementTemplateName( getNode() );
-}
-
-// XStringEscape
-//-----------------------------------------------------------------------------------
-rtl::OUString SAL_CALL BasicSetAccess::escapeString( const rtl::OUString& aString ) 
-    throw(css::lang::IllegalArgumentException, uno::RuntimeException)
-{
-    return aString;
-}
-
-rtl::OUString SAL_CALL BasicSetAccess::unescapeString( const rtl::OUString& aEscapedString ) 
-    throw(css::lang::IllegalArgumentException, uno::RuntimeException)
-{
-    return aEscapedString;
-}
-
-//-----------------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/setaccess.hxx b/configmgr/source/api2/setaccess.hxx
deleted file mode 100644
index a8975ff90d..0000000000
--- a/configmgr/source/api2/setaccess.hxx
+++ /dev/null
@@ -1,170 +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: setaccess.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 CONFIGMGR_API_SETACCESS_HXX_
-#define CONFIGMGR_API_SETACCESS_HXX_
-
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/configuration/XTemplateContainer.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/beans/XProperty.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/util/XStringEscape.hpp>
-#include <cppuhelper/implbase9.hxx>
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-    namespace configapi { class NodeSetInfoAccess; }
-
-    /** implements the (read-only) interfaces supported by a set node
-        within the configuration tree.
-        <p> Is an interface adapter around <type scope='configmgr::configapi'>NodeAccess</type>.</p>
-    */
-    class BasicSetAccess
-    : public ::cppu::ImplHelper9
-                < css::container::XNameAccess
-                , css::container::XHierarchicalName
-                , css::container::XHierarchicalNameAccess
-                , css::container::XContainer
-                , css::beans::XExactName
-                , css::beans::XProperty
-                , css::beans::XPropertySetInfo
-                , css::configuration::XTemplateContainer
-                , css::util::XStringEscape
-                >
-    {
-    protected:
-    // Destructors
-        virtual ~BasicSetAccess() {}
-
-    public:
-    // Interface methods
-        // XHierarchicalName
-        virtual rtl::OUString SAL_CALL 
-            getHierarchicalName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual rtl::OUString SAL_CALL 
-            composeHierarchicalName( const rtl::OUString& aRelativeName ) 
-                throw(css::lang::IllegalArgumentException, css::lang::NoSupportException, 
-                        uno::RuntimeException);
-
-        // XElementAccess, base class of XNameAccess 
-        virtual uno::Type SAL_CALL 
-            getElementType(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasElements(  ) 
-                throw(uno::RuntimeException);
-
-        // XNameAccess
-        virtual uno::Any SAL_CALL 
-            getByName( const rtl::OUString& aName ) 
-                throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, 
-                         uno::RuntimeException);
- 
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getElementNames(  ) 
-                throw( uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasByName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XHierarchicalNameAccess
-        virtual uno::Any SAL_CALL 
-            getByHierarchicalName( const rtl::OUString& aName ) 
-                throw(css::container::NoSuchElementException, uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            hasByHierarchicalName( const rtl::OUString& aName ) 
-                throw(uno::RuntimeException);
-
-        // XContainer
-        virtual void SAL_CALL 
-            addContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-                throw(uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeContainerListener( const uno::Reference< css::container::XContainerListener >& xListener ) 
-                throw(uno::RuntimeException);
-     
-        // XExactName
-        virtual rtl::OUString SAL_CALL 
-            getExactName( const rtl::OUString& aApproximateName ) 
-                throw(uno::RuntimeException);
-
-        // XProperty
-        virtual css::beans::Property SAL_CALL 
-            getAsProperty(  ) 
-                throw(uno::RuntimeException);
-
-        // XPropertySetInfo
-        virtual uno::Sequence< css::beans::Property > SAL_CALL 
-            getProperties(  ) 
-                throw (uno::RuntimeException);
-
-        virtual css::beans::Property SAL_CALL 
-            getPropertyByName( const rtl::OUString& aName ) 
-                throw (css::beans::UnknownPropertyException, uno::RuntimeException);
-        
-        virtual sal_Bool SAL_CALL 
-            hasPropertyByName( const rtl::OUString& name ) 
-                throw (uno::RuntimeException);
-
-        // XTemplateContainer
-        rtl::OUString SAL_CALL 
-            getElementTemplateName(  ) 
-                throw(uno::RuntimeException);
-
-        // XStringEscape
-        rtl::OUString SAL_CALL 
-            escapeString( const rtl::OUString& aString ) 
-                throw(css::lang::IllegalArgumentException, uno::RuntimeException);
-
-        rtl::OUString SAL_CALL 
-            unescapeString( const rtl::OUString& aEscapedString ) 
-                throw(css::lang::IllegalArgumentException, uno::RuntimeException);
-
-    protected:
-        virtual configapi::NodeSetInfoAccess& getNode() = 0;
-    };
-
-}
-#endif // CONFIGMGR_API_SETACCESS_HXX_
-
-
diff --git a/configmgr/source/api2/setobjects.cxx b/configmgr/source/api2/setobjects.cxx
deleted file mode 100644
index 54d1e514c6..0000000000
--- a/configmgr/source/api2/setobjects.cxx
+++ /dev/null
@@ -1,550 +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: setobjects.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_configmgr.hxx"
-#include <stdio.h>
-#include "setobjects.hxx"
-#include "comphelper/sequence.hxx"
-
-//........................................................................
-namespace configmgr
-{
-
-//==========================================================================
-//= OInnerSetInfo
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OInnerSetInfo::acquire( ) throw ()
-{
-    BasicInnerElement::acquire();
-}
-
-void SAL_CALL OInnerSetInfo::release( ) throw ()
-{
-    BasicInnerElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OInnerSetInfo::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicInnerElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicSetAccess::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OInnerSetInfo::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicInnerElement::getTypes(),BasicSetAccess::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OInnerSetInfo::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicInnerElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OInnerSetInfo::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& OInnerSetInfo::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::InnerElement& OInnerSetInfo::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OInnerTreeSetUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OInnerTreeSetUpdate::acquire( ) throw ()
-{
-    BasicInnerElement::acquire();
-}
-
-void SAL_CALL OInnerTreeSetUpdate::release( ) throw ()
-{
-    BasicInnerElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OInnerTreeSetUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicInnerElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicSet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OInnerTreeSetUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicInnerElement::getTypes(),BasicSet::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OInnerTreeSetUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicInnerElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OInnerTreeSetUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& OInnerTreeSetUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeTreeSetAccess*	OInnerTreeSetUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::InnerElement& OInnerTreeSetUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OInnerValueSetUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OInnerValueSetUpdate::acquire( ) throw ()
-{
-    BasicInnerElement::acquire();
-}
-
-void SAL_CALL OInnerValueSetUpdate::release( ) throw ()
-{
-    BasicInnerElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OInnerValueSetUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicInnerElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicValueSet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OInnerValueSetUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicInnerElement::getTypes(),BasicValueSet::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OInnerValueSetUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicInnerElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OInnerValueSetUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& OInnerValueSetUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeValueSetAccess*	OInnerValueSetUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::InnerElement& OInnerValueSetUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OSetElementSetInfo
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OSetElementSetInfo::acquire( ) throw ()
-{
-    BasicSetElement::acquire();
-}
-
-void SAL_CALL OSetElementSetInfo::release( ) throw ()
-{
-    BasicSetElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OSetElementSetInfo::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicSetAccess::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OSetElementSetInfo::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicSetElement::getTypes(),BasicSetAccess::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OSetElementSetInfo::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicSetElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OSetElementSetInfo::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& OSetElementSetInfo::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::SetElement& OSetElementSetInfo::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OSetElementTreeSetUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OSetElementTreeSetUpdate::acquire( ) throw ()
-{
-    BasicSetElement::acquire();
-}
-
-void SAL_CALL OSetElementTreeSetUpdate::release( ) throw ()
-{
-    BasicSetElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OSetElementTreeSetUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicSet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OSetElementTreeSetUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicSetElement::getTypes(),BasicSet::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OSetElementTreeSetUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicSetElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OSetElementTreeSetUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& OSetElementTreeSetUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeTreeSetAccess*	OSetElementTreeSetUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::SetElement& OSetElementTreeSetUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= OSetElementValueSetUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL OSetElementValueSetUpdate::acquire( ) throw ()
-{
-    BasicSetElement::acquire();
-}
-
-void SAL_CALL OSetElementValueSetUpdate::release( ) throw ()
-{
-    BasicSetElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL OSetElementValueSetUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicValueSet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL OSetElementValueSetUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicSetElement::getTypes(),BasicValueSet::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL OSetElementValueSetUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicSetElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	OSetElementValueSetUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& OSetElementValueSetUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeValueSetAccess*	OSetElementValueSetUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::SetElement& OSetElementValueSetUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= ORootElementSetInfo
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL ORootElementSetInfo::acquire( ) throw ()
-{
-    BasicRootElement::acquire();
-}
-
-void SAL_CALL ORootElementSetInfo::release( ) throw ()
-{
-    BasicRootElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL ORootElementSetInfo::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicRootElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicSetAccess::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL ORootElementSetInfo::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicRootElement::getTypes(),BasicSetAccess::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL ORootElementSetInfo::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicRootElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	ORootElementSetInfo::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& ORootElementSetInfo::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::RootElement& ORootElementSetInfo::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= ORootElementTreeSetUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL ORootElementTreeSetUpdate::acquire( ) throw ()
-{
-    BasicUpdateElement::acquire();
-}
-
-void SAL_CALL ORootElementTreeSetUpdate::release( ) throw ()
-{
-    BasicUpdateElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL ORootElementTreeSetUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicUpdateElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicSet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL ORootElementTreeSetUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicUpdateElement::getTypes(),BasicSet::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL ORootElementTreeSetUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicUpdateElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	ORootElementTreeSetUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& ORootElementTreeSetUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeTreeSetAccess*	ORootElementTreeSetUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::UpdateRootElement& ORootElementTreeSetUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-
-//==========================================================================
-//= ORootElementValueSetUpdate
-//==========================================================================
-
-// XInterface refcounting
-void SAL_CALL ORootElementValueSetUpdate::acquire( ) throw ()
-{
-    BasicUpdateElement::acquire();
-}
-
-void SAL_CALL ORootElementValueSetUpdate::release( ) throw ()
-{
-    BasicUpdateElement::release();
-}
-
-// XInterface joining
-uno::Any SAL_CALL ORootElementValueSetUpdate::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicUpdateElement::queryInterface(rType);
-
-    if (!aRet.hasValue())
-        aRet = BasicValueSet::queryInterface(rType);
-
-    return aRet;
-}
-
-// XTypeProvider joining
-uno::Sequence< uno::Type > SAL_CALL ORootElementValueSetUpdate::getTypes( ) throw (uno::RuntimeException )
-{
-    return comphelper::concatSequences(BasicUpdateElement::getTypes(),BasicValueSet::getTypes()	);
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL ORootElementValueSetUpdate::getImplementationId( ) throw (uno::RuntimeException )
-{
-    return BasicUpdateElement::getImplementationId();
-}
-
-
-configapi::NodeAccess&	ORootElementValueSetUpdate::getNodeAccess()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeSetInfoAccess& ORootElementValueSetUpdate::getNode()
-{
-    return m_aAccessElement;
-}
-
-configapi::NodeValueSetAccess*	ORootElementValueSetUpdate::maybeGetUpdateAccess()
-{
-    return &m_aAccessElement;
-}
-
-configapi::UpdateRootElement& ORootElementValueSetUpdate::getElementClass()
-{
-    return m_aAccessElement;
-}
-//........................................................................
-} // namespace configmgr
-//........................................................................
-
diff --git a/configmgr/source/api2/setobjects.hxx b/configmgr/source/api2/setobjects.hxx
deleted file mode 100644
index b1272b4e6b..0000000000
--- a/configmgr/source/api2/setobjects.hxx
+++ /dev/null
@@ -1,361 +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: setobjects.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 CONFIGMGR_API_SETOBJECTS_HXX_
-#define CONFIGMGR_API_SETOBJECTS_HXX_
-
-#include "setaccess.hxx"
-#include "setupdate.hxx"
-#include "elementaccess.hxx"
-
-#include "apiaccessobj.hxx"
-
-//........................................................................
-namespace configmgr
-{
-//........................................................................
-
-//==========================================================================
-//= Inner Set Instances
-//==========================================================================
-
-/** read-only access class for configuration nodes which are inner nodes and dynamic sets
-*/
-    class OInnerSetInfo 
-    : public BasicInnerElement
-    , public BasicSetAccess
-    {
-    public:
-        // Construction/Destruction 
-        OInnerSetInfo(configapi::ApiTreeImpl& rTree, configuration::NodeRef const& aNode)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),rTree,aNode)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::InnerElement&		getElementClass();
-    private:
-        configapi::OInnerElement<configapi::NodeSetInfoAccess> m_aAccessElement;
-    };
-
-/** updating access class for configuration nodes which are inner nodes and dynamic sets of complex types (trees)
-*/
-    class OInnerTreeSetUpdate
-    : public BasicInnerElement
-    , public BasicSet
-    {
-    public:
-        // Construction/Destruction 
-        OInnerTreeSetUpdate(configapi::ApiTreeImpl& rTree, configuration::NodeRef const& aNode)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),rTree,aNode)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::NodeTreeSetAccess*	maybeGetUpdateAccess();
-        virtual configapi::InnerElement&		getElementClass();
-    private:
-        configapi::OInnerElement<configapi::NodeTreeSetAccess> m_aAccessElement;
-    };
-
-
-/** update access class for configuration nodes which are inner nodes and dynamic sets of  simple types (values)
-*/
-    class OInnerValueSetUpdate
-    : public BasicInnerElement
-    , public BasicValueSet
-    {
-    public:
-        // Construction/Destruction 
-        OInnerValueSetUpdate(configapi::ApiTreeImpl& rTree, configuration::NodeRef const& aNode)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),rTree,aNode)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::NodeValueSetAccess*	maybeGetUpdateAccess();
-        virtual configapi::InnerElement&		getElementClass();
-    private:
-        configapi::OInnerElement<configapi::NodeValueSetAccess> m_aAccessElement;
-    };
-
-//==========================================================================
-//= Set Element Set Instances
-//==========================================================================
-
-/** read-only access class for configuration nodes which are set elements and dynamic sets
-*/
-    class OSetElementSetInfo 
-    : public BasicSetElement
-    , public BasicSetAccess
-    {
-    public:
-        // Construction/Destruction 
-        OSetElementSetInfo(rtl::Reference< configuration::Tree > const& aTree, configapi::ApiProvider& rProvider, configapi::ApiTreeImpl* pParentTree = 0)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),aTree,rProvider,pParentTree)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::SetElement&			getElementClass();
-    private:
-        configapi::OSetElement<configapi::NodeSetInfoAccess> m_aAccessElement;
-    };
-
-/** updating access class for configuration nodes which are set elements and dynamic sets of complex types (trees)
-*/
-    class OSetElementTreeSetUpdate
-    : public BasicSetElement
-    , public BasicSet
-    {
-    public:
-        // Construction/Destruction 
-        OSetElementTreeSetUpdate(rtl::Reference< configuration::Tree > const& aTree, configapi::ApiProvider& rProvider, configapi::ApiTreeImpl* pParentTree = 0)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),aTree,rProvider,pParentTree)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::NodeTreeSetAccess*	maybeGetUpdateAccess();
-        virtual configapi::SetElement&		getElementClass();
-    private:
-        configapi::OSetElement<configapi::NodeTreeSetAccess> m_aAccessElement;
-    };
-
-
-/** update access class for configuration nodes which are set elements and dynamic sets of  simple types (values)
-*/
-    class OSetElementValueSetUpdate
-    : public BasicSetElement
-    , public BasicValueSet
-    {
-    public:
-        // Construction/Destruction 
-        OSetElementValueSetUpdate(rtl::Reference< configuration::Tree > const& aTree, configapi::ApiProvider& rProvider, configapi::ApiTreeImpl* pParentTree = 0)
-        : m_aAccessElement(static_cast<css::container::XChild*>(this),aTree,rProvider,pParentTree)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::NodeValueSetAccess*	maybeGetUpdateAccess();
-        virtual configapi::SetElement&		getElementClass();
-    private:
-        configapi::OSetElement<configapi::NodeValueSetAccess> m_aAccessElement;
-    };
-
-//==========================================================================
-//= Root Element Set Instances
-//==========================================================================
-
-/** read-only access class for configuration nodes which are root nodes and dynamic sets
-*/
-    class ORootElementSetInfo 
-    : public BasicRootElement
-    , public BasicSetAccess
-    {
-    public:
-        // Construction/Destruction 
-        ORootElementSetInfo(configapi::ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-            : m_aAccessElement(static_cast<css::lang::XComponent*>(this),rProvider,aTree,_xOptions)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::RootElement&		getElementClass();
-    private:
-        configapi::OReadRootElement<configapi::NodeSetInfoAccess> m_aAccessElement;
-    };
-
-/** updating access class for configuration nodes which are root nodes and dynamic sets of complex types (trees)
-*/
-    class ORootElementTreeSetUpdate
-    : public BasicUpdateElement
-    , public BasicSet
-    {
-    public:
-        // Construction/Destruction 
-        ORootElementTreeSetUpdate(configapi::ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-        : m_aAccessElement(static_cast<css::lang::XComponent*>(this),rProvider,aTree, _xOptions)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::NodeTreeSetAccess*	maybeGetUpdateAccess();
-        virtual configapi::UpdateRootElement&	getElementClass();
-    private:
-        configapi::OUpdateRootElement<configapi::NodeTreeSetAccess> m_aAccessElement;
-    };
-
-
-/** update access class for configuration nodes which are root nodes and dynamic sets of  simple types (values)
-*/
-    class ORootElementValueSetUpdate
-    : public BasicUpdateElement
-    , public BasicValueSet
-    {
-    public:
-        // Construction/Destruction 
-        ORootElementValueSetUpdate(configapi::ApiProvider& rProvider, rtl::Reference< configuration::Tree > const& aTree, vos::ORef< OOptions >const& _xOptions)
-        : m_aAccessElement(static_cast<css::lang::XComponent*>(this),rProvider,aTree,_xOptions)
-        {
-        }
-
-        // XInterface refcounting
-        void SAL_CALL acquire( ) throw ();
-        void SAL_CALL release( ) throw ();
-
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException );
-
-    // Base class implementation
-        virtual configapi::NodeAccess&			getNodeAccess();
-        virtual configapi::NodeSetInfoAccess&	getNode();
-        virtual configapi::NodeValueSetAccess*	maybeGetUpdateAccess();
-        virtual configapi::UpdateRootElement&	getElementClass();
-    private:
-        configapi::OUpdateRootElement<configapi::NodeValueSetAccess> m_aAccessElement;
-    };
-
-
-//........................................................................
-} // namespace configmgr
-//........................................................................
-
-#endif // CONFIGMGR_API_SETOBJECTS_HXX_
-
-
diff --git a/configmgr/source/api2/setupdate.cxx b/configmgr/source/api2/setupdate.cxx
deleted file mode 100644
index 2dff6a99f4..0000000000
--- a/configmgr/source/api2/setupdate.cxx
+++ /dev/null
@@ -1,244 +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: setupdate.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_configmgr.hxx"
-
-#include "setupdate.hxx"
-#include "accessimpl.hxx"
-#include "updateimpl.hxx"
-#include "apinodeupdate.hxx"
-#include "apitypes.hxx"
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/typeprovider.hxx>
-
-namespace configmgr
-{
-//////////////////////////////////////////////////////////////////////////////////
-// classes BasicSet / BasicValueSet
-//////////////////////////////////////////////////////////////////////////////////
-
-// XInterface joining
-//////////////////////////////////////////////////////////////////////////////////
-uno::Any SAL_CALL BasicSet::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetAccess::queryInterface( rType );
-    if (!aRet.hasValue())
-    {
-        aRet = cppu::queryInterface(rType
-                    , static_cast< css::container::XNameContainer *>(this)
-                    , static_cast< css::container::XNameReplace *>(this)
-                    , static_cast< css::beans::XPropertyWithState *>(this)
-                    , static_cast< css::lang::XSingleServiceFactory *>(this)
-                    );
-    }
-    return aRet;
-}
-//..............................................................................
-
-uno::Any SAL_CALL BasicValueSet::queryInterface( uno::Type const& rType ) throw (uno::RuntimeException )
-{
-    uno::Any aRet = BasicSetAccess::queryInterface( rType );
-    if (!aRet.hasValue())
-    {
-        aRet = cppu::queryInterface(rType
-                    , static_cast< css::container::XNameContainer *>(this)
-                    , static_cast< css::container::XNameReplace *>(this)
-                    , static_cast< css::beans::XPropertyWithState *>(this)
-                    );
-    }
-    return aRet;
-}
-
-// XTypeProvider joining
-//////////////////////////////////////////////////////////////////////////////////
-uno::Sequence< uno::Type > SAL_CALL BasicSet::getTypes( ) throw (uno::RuntimeException )
-{
-    /*static ?*/ 
-    cppu::OTypeCollection aTypes(
-        configapi::getReferenceType(static_cast< css::container::XNameContainer *>(this)),
-        configapi::getReferenceType(static_cast< css::container::XNameReplace *>(this)),
-        configapi::getReferenceType(static_cast< css::beans::XPropertyWithState *>(this)),
-        configapi::getReferenceType(static_cast< css::lang::XSingleServiceFactory *>(this)),
-        BasicSetAccess::getTypes());
-
-    return aTypes.getTypes();
-}
-//..............................................................................
-
-uno::Sequence< uno::Type > SAL_CALL BasicValueSet::getTypes( ) throw (uno::RuntimeException )
-{
-    /*static ?*/ 
-    cppu::OTypeCollection aTypes(
-        configapi::getReferenceType(static_cast< css::container::XNameContainer *>(this)),
-        configapi::getReferenceType(static_cast< css::container::XNameReplace *>(this)),
-        configapi::getReferenceType(static_cast< css::beans::XPropertyWithState *>(this)),
-        BasicSetAccess::getTypes());
-
-    return aTypes.getTypes();
-}
-
-//uno::Sequence< sal_Int8 > SAL_CALL BasicSet::getImplementationId( ) throw (uno::RuntimeException ) = 0;
-//uno::Sequence< sal_Int8 > SAL_CALL BasicValueSet::getImplementationId( ) throw (uno::RuntimeException ) = 0;
-
-// safe write access
-//////////////////////////////////////////////////////////////////////////////////
-configapi::NodeTreeSetAccess& BasicSet::getSetNode()
-{
-    configapi::NodeTreeSetAccess* pAccess = maybeGetUpdateAccess();
-    OSL_ENSURE(pAccess, "Write operation invoked on a read-only node access - failing with RuntimeException");
-
-    if (!pAccess)
-    {
-        throw uno::RuntimeException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: Invalid Object - internal update-interface missing.")),
-                static_cast< css::container::XNameReplace * >(this)
-            );
-    }
-    return *pAccess;			
-}
-
-configapi::NodeValueSetAccess& BasicValueSet::getSetNode()
-{
-    configapi::NodeValueSetAccess* pAccess = maybeGetUpdateAccess();
-    OSL_ENSURE(pAccess, "Write operation invoked on a read-only node access - failing with RuntimeException");
-
-    if (!pAccess)
-    {
-        throw uno::RuntimeException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration: Invalid Object - internal update-interface missing.")),
-                static_cast< css::container::XNameReplace* >(this)
-            );
-    }
-    return *pAccess;			
-}
-
-// New Interface methods
-// XNameReplace
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicSet::replaceByName( const rtl::OUString& rName, const uno::Any& rElement ) 
-        throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implReplaceByName( getSetNode(), rName, rElement );
-}
-//..............................................................................
-
-void SAL_CALL BasicValueSet::replaceByName( const rtl::OUString& rName, const uno::Any& rElement ) 
-        throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implReplaceByName( getSetNode(), rName, rElement );
-}
-
-// XNameContainer
-//////////////////////////////////////////////////////////////////////////////////
-void SAL_CALL BasicSet::insertByName( const rtl::OUString& rName, const uno::Any& rElement) 
-        throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implInsertByName( getSetNode(), rName, rElement );
-}
-//..............................................................................
-
-void SAL_CALL BasicValueSet::insertByName( const rtl::OUString& rName, const uno::Any& rElement) 
-        throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implInsertByName( getSetNode(), rName, rElement );
-}
-
-//----------------------------------------------------------------------------------
-void SAL_CALL BasicSet::removeByName( const rtl::OUString& rName ) 
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implRemoveByName( getSetNode(), rName );
-}
-//..............................................................................
-
-void SAL_CALL BasicValueSet::removeByName( const rtl::OUString& rName ) 
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implRemoveByName( getSetNode(), rName );
-}
-
-// XPropertyWithState
-//////////////////////////////////////////////////////////////////////////////////
-
-css::beans::PropertyState SAL_CALL BasicSet::getStateAsProperty() throw (uno::RuntimeException)
-{
-    return configapi::implGetStateAsProperty( getSetNode() );
-}
-//..............................................................................
-
-css::beans::PropertyState SAL_CALL BasicValueSet::getStateAsProperty() throw (uno::RuntimeException)
-{
-    return configapi::implGetStateAsProperty( getSetNode() );
-}
-//-----------------------------------------------------------------------------------
-
-void SAL_CALL BasicSet::setToDefaultAsProperty() throw (css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implSetToDefaultAsProperty( getSetNode() );
-}
-//..............................................................................
-
-void SAL_CALL BasicValueSet::setToDefaultAsProperty() throw (css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    configapi::implSetToDefaultAsProperty( getSetNode() );
-}
-//-----------------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL BasicSet::getDefaultAsProperty() throw (css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    return configapi::implGetDefaultAsProperty( getSetNode() );
-}
-//..............................................................................
-
-uno::Reference< uno::XInterface > SAL_CALL BasicValueSet::getDefaultAsProperty() throw (css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    return configapi::implGetDefaultAsProperty( getSetNode() );
-}
-
-// XSingleServiceFactory (not for ValueSet)
-//////////////////////////////////////////////////////////////////////////////////
-uno::Reference< uno::XInterface > SAL_CALL BasicSet::createInstance(  ) 
-        throw(uno::Exception, uno::RuntimeException)
-{
-    return configapi::implCreateElement( getSetNode() );
-}
-
-//----------------------------------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL BasicSet::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments ) 
-        throw(uno::Exception, uno::RuntimeException)
-{
-    return configapi::implCreateElement( getSetNode(), aArguments );
-}
-
-//-----------------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/setupdate.hxx b/configmgr/source/api2/setupdate.hxx
deleted file mode 100644
index dd67364eaf..0000000000
--- a/configmgr/source/api2/setupdate.hxx
+++ /dev/null
@@ -1,211 +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: setupdate.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 CONFIGMGR_API_SETUPDATE_HXX_
-#define CONFIGMGR_API_SETUPDATE_HXX_
-
-#include "setaccess.hxx"
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XPropertyWithState.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-//........................................................................
-namespace configmgr
-{
-//........................................................................
-    namespace configapi { class NodeTreeSetAccess; class NodeValueSetAccess; }
-
-//==========================================================================
-//= BasicSet
-//==========================================================================
-
-/** base class for configuration nodes which are dynamic sets of complex types (trees)
-*/
-    class BasicSet 
-    : public BasicSetAccess
-    , public css::container::XNameContainer 
-    , public css::beans::XPropertyWithState 
-    , public css::lang::XSingleServiceFactory
-    {
-    protected:
-    // Destructors
-        virtual ~BasicSet() {}
-
-    public:
-    // Base class Interface methods
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException ) = 0;
-
-        // XElementAccess forwarding
-        virtual uno::Type SAL_CALL getElementType(  ) throw(uno::RuntimeException)
-        { return BasicSetAccess::getElementType(); }
-
-        virtual sal_Bool SAL_CALL hasElements(  )  throw(uno::RuntimeException)
-        { return BasicSetAccess::hasElements(); }
-
-        // XNameAccess forwarding
-        virtual uno::Any SAL_CALL getByName( const rtl::OUString& aName ) 
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-         { return BasicSetAccess::getByName(aName); }
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames(  ) throw( uno::RuntimeException)
-         { return BasicSetAccess::getElementNames(); }
-
-        virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-         { return BasicSetAccess::hasByName(aName); }
-
-    // New Interface methods
-        // XNameReplace
-        virtual void SAL_CALL 
-            replaceByName( const rtl::OUString& rName, const uno::Any& rElement ) 
-                throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XNameContainer
-        virtual void SAL_CALL 
-            insertByName( const rtl::OUString& rName, const uno::Any& rElement) 
-                throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeByName( const rtl::OUString& rName ) 
-                throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XPropertyWithState
-        virtual css::beans::PropertyState SAL_CALL 
-            getStateAsProperty(  ) 
-                throw (uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            setToDefaultAsProperty(  ) 
-                throw (css::lang::WrappedTargetException, uno::RuntimeException);
-
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            getDefaultAsProperty(  ) 
-                throw (css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XSingleServiceFactory
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstance(  ) 
-                throw(uno::Exception, uno::RuntimeException);
-
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments ) 
-                throw(uno::Exception, uno::RuntimeException);
-
-    protected:
-                configapi::NodeTreeSetAccess&	getSetNode();
-        virtual configapi::NodeTreeSetAccess*	maybeGetUpdateAccess() = 0;
-    };
-
-//==========================================================================
-//= BasicValueSet
-//==========================================================================
-
-/** class for configuration nodes which are dynamic sets of simple types (values)
-*/
-    class BasicValueSet 
-    : public BasicSetAccess
-    , public css::beans::XPropertyWithState 
-    , public css::container::XNameContainer 
-    {
-    protected:
-    // Destructors
-        virtual ~BasicValueSet() {}
-
-    public:
-    // Base class Interface methods
-        // XInterface joining
-        uno::Any SAL_CALL queryInterface( uno::Type const& rType ) throw (uno::RuntimeException );
-
-        // XTypeProvider joining
-        uno::Sequence< uno::Type > SAL_CALL getTypes( ) throw (uno::RuntimeException );
-        uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (uno::RuntimeException ) = 0;
-
-        // XElementAccess forwarding
-        virtual uno::Type SAL_CALL getElementType(  ) throw(uno::RuntimeException)
-        { return BasicSetAccess::getElementType(); }
-
-        virtual sal_Bool SAL_CALL hasElements(  )  throw(uno::RuntimeException)
-        { return BasicSetAccess::hasElements(); }
-
-        // XNameAccess forwarding
-        virtual uno::Any SAL_CALL getByName( const rtl::OUString& aName ) 
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException)
-         { return BasicSetAccess::getByName(aName); }
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL getElementNames(  ) throw( uno::RuntimeException)
-         { return BasicSetAccess::getElementNames(); }
-
-        virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException)
-         { return BasicSetAccess::hasByName(aName); }
-
-    // New Interface methods
-        // XNameReplace
-        virtual void SAL_CALL 
-            replaceByName( const rtl::OUString& rName, const uno::Any& rElement ) 
-                throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XNameContainer
-        virtual void SAL_CALL 
-            insertByName( const rtl::OUString& rName, const uno::Any& rElement) 
-                throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            removeByName( const rtl::OUString& rName ) 
-                throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XPropertyWithState
-        virtual css::beans::PropertyState SAL_CALL 
-            getStateAsProperty(  ) 
-                throw (uno::RuntimeException);
-
-        virtual void SAL_CALL 
-            setToDefaultAsProperty(  ) 
-                throw (css::lang::WrappedTargetException, uno::RuntimeException);
-
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            getDefaultAsProperty(  ) 
-                throw (css::lang::WrappedTargetException, uno::RuntimeException);
-
-    protected:
-                configapi::NodeValueSetAccess&	getSetNode();
-        virtual configapi::NodeValueSetAccess*	maybeGetUpdateAccess() = 0;
-    };
-
-//........................................................................
-} // namespace configmgr
-//........................................................................
-
-#endif // CONFIGMGR_API_VALUESETACCESS_HXX_
-
-
diff --git a/configmgr/source/api2/translatechanges.cxx b/configmgr/source/api2/translatechanges.cxx
deleted file mode 100644
index d78c89212b..0000000000
--- a/configmgr/source/api2/translatechanges.cxx
+++ /dev/null
@@ -1,286 +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: translatechanges.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "translatechanges.hxx"
-#include "noderef.hxx"
-#include "nodechange.hxx"
-#include "nodechangeinfo.hxx"
-#include "apifactory.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------------------------------
-    namespace css = ::com::sun::star;
-    namespace uno		= css::uno;
-    namespace lang		= css::lang;
-    namespace util		= css::util;
-    namespace beans		= css::beans;
-    namespace container	= css::container;
-// ---------------------------------------------------------------------------------------------------
-
-    namespace configuration 
-    { 
-        class NodeChange; 
-        class NodeChanges; 
-        class NodeRef; 
-        class NodeID; 
-    }
-// ---------------------------------------------------------------------------------------------------
-
-    namespace configapi
-    {
-// ---------------------------------------------------------------------------------------------------
-    //interpreting NodeChanges
-// resolve the relative path from a given base to the changed node
-bool resolveChangeLocation(configuration::RelativePath& aPath, configuration::NodeChangeLocation const& aChange, rtl::Reference< configuration::Tree > const& aBaseTree, configuration::NodeRef const& aBaseNode)
-{
-    OSL_ENSURE(aChange.isValidLocation(), "Trying to resolve against change location that wasn't set up properly");
-
-    namespace Path = configuration::Path;
-
-    rtl::Reference< configuration::Tree > aChangeBaseTree = aChange.getBaseTree();
-
-    configuration::AbsolutePath aOuterBasePath		= aBaseTree->getAbsolutePath(aBaseNode);
-    configuration::AbsolutePath aChangeBasePath	= aChangeBaseTree->getAbsolutePath(aChange.getBaseNode());
-
-    std::vector<configuration::Path::Component>::const_reverse_iterator aChangeIt = aChangeBasePath.begin(),	aChangeEnd = aChangeBasePath.end();
-    std::vector<configuration::Path::Component>::const_reverse_iterator aOuterIt  = aOuterBasePath.begin(),	aOuterEnd  = aOuterBasePath.end();
-
-    // First by resolve the base node pathes
-    while (aOuterIt != aOuterEnd && aChangeIt != aChangeEnd)
-    {
-        if ( ! Path::matches(*aOuterIt,*aChangeIt) ) return false; // mismatch
-        ++aOuterIt;
-        ++aChangeIt;
-    }
-
-    // Next consider the stored accessor
-    if (aChangeIt != aChangeEnd) // stepping outward - prepend
-    {
-        Path::Rep aRemaining(aChangeIt, aChangeEnd);
-
-        aPath = configuration::RelativePath(aRemaining).compose(aChange.getAccessor());
-    }
-    else if (aOuterIt == aOuterEnd) // exact match outside
-    {
-        aPath = aChange.getAccessor();
-    }
-    else //(aChangeIt == aChangeEnd) but outer left 
-    {
-        configuration::RelativePath aAccessor = aChange.getAccessor();
-        aChangeIt	= aAccessor.begin();
-        aChangeEnd	= aAccessor.end();
-
-        // resolve the outer path against the change accessor
-        while (aOuterIt != aOuterEnd && aChangeIt != aChangeEnd)
-        {
-            if ( ! Path::matches(*aOuterIt,*aChangeIt) ) return false; // mismatch
-            ++aOuterIt;
-            ++aChangeIt;
-        }
-
-        if (aOuterIt == aOuterEnd)
-        {
-            Path::Rep aRemaining(aChangeIt, aChangeEnd);
-
-            aPath = configuration::RelativePath( aRemaining );
-        }
-    }
-
-    return (aOuterIt == aOuterEnd); // resolved completely and assigned ??
-
-}
-
-// ---------------------------------------------------------------------------------------------------
-// change path and base settings to start from the given base
-bool rebaseChange(configuration::NodeChangeLocation& aChange, rtl::Reference< configuration::Tree > const& _aBaseTreeRef)
-{
-    return rebaseChange(aChange,_aBaseTreeRef,_aBaseTreeRef->getRootNode());
-}
-bool rebaseChange(configuration::NodeChangeLocation& aChange, rtl::Reference< configuration::Tree > const& _aBaseTreeRef, configuration::NodeRef const& aBaseNode)
-{
-    OSL_ENSURE(aChange.isValidLocation(), "Trying to rebase change location that wasn't set up properly");
-
-    rtl::Reference< configuration::Tree > aBaseTree(_aBaseTreeRef);
-
-    configuration::RelativePath aNewPath;
-    if (resolveChangeLocation(aNewPath,aChange,aBaseTree,aBaseNode))
-    {
-        aChange.setBase( aBaseTree, aBaseNode);
-        aChange.setAccessor( aNewPath );
-        return true;
-    }
-    else
-        return false;
-}
-// ---------------------------------------------------------------------------------------------------
-// resolve non-uno elements to Uno Objects
-bool resolveUnoObjects(UnoChange& aUnoChange, configuration::NodeChangeData const& aChange, 
-                       Factory& rFactory)
-{
-    if (aChange.isSetChange())
-    {
-        //Check we have ElementTree
-        if ((aChange.element.newValue == NULL) &&
-            (aChange.element.oldValue == NULL))
-        {
-            if( ( aChange.unoData.newValue.getValue()!=NULL) ||
-               ( aChange.unoData.newValue.getValue()!=NULL))
-            {
-                return true;  
-            }
-            else return false;
-        }
-
-        //Check if complex or simple type
-        rtl::Reference< configuration::Tree > aTree = aChange.isRemoveSetChange()?
-            aChange.getOldElementTree():
-            aChange.getNewElementTree();
-        
-        configuration::NodeRef aNodeRef = aTree->getRootNode();
-        
-        if (configuration::isStructuralNode(aTree, aNodeRef))
-        {
-            uno::Reference<uno::XInterface> aNewUnoObject = rFactory.findUnoElement(aChange.getNewElementNodeID());
-            uno::Reference<uno::XInterface> aOldUnoObject = rFactory.findUnoElement(aChange.getOldElementNodeID());
-
-            bool bFound = aNewUnoObject.is() || aOldUnoObject.is();
-            aUnoChange.newValue <<= aNewUnoObject;
-            aUnoChange.oldValue <<= aOldUnoObject;
-            return bFound;
-        }
-        else
-        {
-            aUnoChange.newValue = configuration::getSimpleElementValue(aTree, aNodeRef);
-            
-            if (aChange.isReplaceSetChange() )
-            {
-                rtl::Reference< configuration::Tree > aOldTree = aChange.getOldElementTree();
-            
-                aNodeRef = aOldTree->getRootNode();
-                OSL_ENSURE(!configuration::isStructuralNode(aOldTree, aNodeRef), "resolveUnoObject types mismatch"); 
-                aUnoChange.oldValue =  configuration::getSimpleElementValue(aOldTree, aNodeRef);
-            }
-            bool bFound = aUnoChange.newValue.hasValue() || aUnoChange.oldValue.hasValue();
-            return bFound;
-        }
-    }
-    else if (aChange.isValueChange())
-    {
-        aUnoChange.newValue = aChange.unoData.newValue;
-        aUnoChange.oldValue = aChange.unoData.oldValue;
-        return true;	
-    }
-    else
-    {
-        return false;
-    }
-}
-// ---------------------------------------------------------------------------------------------------
-// resolve non-uno elements to Uno Objects inplace
-bool resolveToUno(configuration::NodeChangeData& aChange, Factory& rFactory)
-{
-    struct UnoChange aUnoChange;
-    if (resolveUnoObjects(aUnoChange,aChange, rFactory))
-    {
-        aChange.unoData.newValue = aUnoChange.newValue;
-        aChange.unoData.oldValue = aUnoChange.oldValue;
-        return true;
-    }
-    else
-        return false;
-}
-// ---------------------------------------------------------------------------------------------------
-
-/// fill a change info from a NodeChangeInfo
-void fillChange(util::ElementChange& rChange, configuration::NodeChangeInformation const& aInfo, rtl::Reference< configuration::Tree > const& aBaseTree, Factory& rFactory)
-{
-    fillChange(rChange,aInfo,aBaseTree,aBaseTree->getRootNode(),rFactory);
-}
-/// fill a change info from a NodeChangeInfo
-void fillChange(util::ElementChange& rChange, configuration::NodeChangeInformation const& aInfo, rtl::Reference< configuration::Tree > const& aBaseTree, configuration::NodeRef const& aBaseNode, Factory& rFactory)
-{
-    configuration::RelativePath aRelativePath;
-    if (!resolveChangeLocation(aRelativePath, aInfo.location, aBaseTree, aBaseNode))
-        OSL_ENSURE(false, "WARNING: Change is not part of the given Tree");
-
-    UnoChange aUnoChange;
-
-    if (!resolveUnoObjects(aUnoChange, aInfo.change, rFactory))
-        OSL_ENSURE(false, "WARNING: Cannot find out old/new UNO objects involved in change");
-
-    rChange.Accessor		<<= aRelativePath.toString();
-    rChange.Element			= aUnoChange.newValue;
-    rChange.ReplacedElement = aUnoChange.oldValue;
-}
-// ---------------------------------------------------------------------------------------------------
-/// fill a change info from a NodeChangeInfo (base,path and uno objects are assumed to be resolved already)
-void fillChangeFromResolved(util::ElementChange& rChange, configuration::NodeChangeInformation const& aInfo)
-{
-    rChange.Accessor		<<= aInfo.location.getAccessor().toString();
-    rChange.Element			= aInfo.change.unoData.newValue;
-    rChange.ReplacedElement = aInfo.change.unoData.oldValue;
-}
-// ---------------------------------------------------------------------------------------------------
-/// fill a event from a NodeChangeInfo (uno objects are assumed to be resolved already)
-bool fillEventDataFromResolved(container::ContainerEvent& rEvent, configuration::NodeChangeInformation const& aInfo)
-{
-    rEvent.Accessor			<<= aInfo.location.getAccessor().getLocalName().getName();
-    rEvent.Element			= aInfo.change.unoData.newValue;
-    rEvent.ReplacedElement	= aInfo.change.unoData.oldValue;
-
-    return !aInfo.isEmptyChange();
-}
-// ---------------------------------------------------------------------------------------------------
-/// fill a event from a NodeChangeInfo(uno objects are assumed to be resolved already)
-bool fillEventDataFromResolved(beans::PropertyChangeEvent& rEvent, configuration::NodeChangeInformation const& aInfo, bool bMore)
-{
-    if (!aInfo.isValueChange()) 
-        return false;
-
-    rEvent.PropertyName		= aInfo.location.getAccessor().getLocalName().getName();
-
-    rEvent.NewValue			= aInfo.change.unoData.newValue;
-    rEvent.OldValue			= aInfo.change.unoData.oldValue;
-
-    rEvent.PropertyHandle	= -1;
-     rEvent.Further			= bMore;
-
-    return !aInfo.isEmptyChange();
-}
-// ---------------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------------
-    }
-// ---------------------------------------------------------------------------------------------------
-}
-
diff --git a/configmgr/source/api2/translatechanges.hxx b/configmgr/source/api2/translatechanges.hxx
deleted file mode 100644
index 0ebb22aa50..0000000000
--- a/configmgr/source/api2/translatechanges.hxx
+++ /dev/null
@@ -1,120 +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: translatechanges.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 CONFIGMGR_API_TRANSLATECHANGES_HXX_
-#define CONFIGMGR_API_TRANSLATECHANGES_HXX_
-
-#include <com/sun/star/beans/XPropertyChangeListener.hpp> 
-#include <com/sun/star/beans/XVetoableChangeListener.hpp> 
-#include <com/sun/star/beans/XPropertiesChangeListener.hpp> 
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/util/XChangesListener.hpp>
-#include "rtl/ref.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------------------------------
-    namespace css = ::com::sun::star;
-    namespace uno		= css::uno;
-    namespace lang		= css::lang;
-    namespace util		= css::util;
-    namespace beans		= css::beans;
-    namespace container	= css::container;
-// ---------------------------------------------------------------------------------------------------
-
-    namespace configuration 
-    { 
-        class NodeChangeInformation; 
-        class NodeChangeData; 
-        class NodeChangeLocation; 
-
-        //class NodeChange; 
-        //class NodeChanges; 
-        class Tree; 
-        class NodeRef; 
-        class NodeID; 
-        class RelativePath; 
-    }
-// ---------------------------------------------------------------------------------------------------
-
-    namespace configapi
-    {
-        class NotifierImpl;
-        class Factory;
-
-        struct UnoChange { uno::Any newValue, oldValue; };
-
-    //interpreting NodeChanges
-        // resolve the relative path from a given base node to the changed node
-        bool resolveChangeLocation(	configuration::RelativePath& aPath, 
-                                    configuration::NodeChangeLocation const& aChange, 
-                                    rtl::Reference< configuration::Tree > const& aBaseTree,
-                                    configuration::NodeRef const& aBaseNode);
-
-        // change path and base settings to start from the given base tree (root)
-        bool rebaseChange(	configuration::NodeChangeLocation& aChange, 
-                            rtl::Reference< configuration::Tree > const& _aBaseTreeRef);
-        // change path and base settings to start from the given base node
-        bool rebaseChange(	configuration::NodeChangeLocation& aChange, 
-                            rtl::Reference< configuration::Tree > const& _aBaseTreeRef, 
-                            configuration::NodeRef const& aBaseNode);
-        // resolve non-uno elements to Uno Objects
-        bool resolveUnoObjects(UnoChange& aUnoChange, 
-                               configuration::NodeChangeData const& aChange,
-                               Factory& rFactory);
-        // resolve non-uno elements to Uno Objects inplace
-        bool resolveToUno(configuration::NodeChangeData& aChange,
-                          Factory& rFactory);
-
-    // building events
-
-        /// fill a change info from a NodeChangeInfo
-        void fillChange(util::ElementChange& rChange, 
-                        configuration::NodeChangeInformation const& aInfo, 
-                        rtl::Reference< configuration::Tree > const& aBaseTree, 
-                        Factory& rFactory);
-        /// fill a change info from a NodeChangeInfo
-        void fillChange(util::ElementChange& rChange, 
-                        configuration::NodeChangeInformation const& aInfo, 
-                        rtl::Reference< configuration::Tree > const& aBaseTree, 
-                        configuration::NodeRef const& aBaseNode,
-                        Factory& rFactory);
-        /// fill a change info from a NodeChangeInfo (base,path and uno objects are assumed to be resolved already)
-        void fillChangeFromResolved(util::ElementChange& rChange, configuration::NodeChangeInformation const& aInfo);
-
-        /// fill a event from a NodeChangeInfo (uno objects are assumed to be resolved already)
-        bool fillEventDataFromResolved(container::ContainerEvent& rEvent, configuration::NodeChangeInformation const& aInfo);
-        /// fill a event from a NodeChangeInfo(uno objects are assumed to be resolved already) - returns false if this isn't a property change
-        bool fillEventDataFromResolved(beans::PropertyChangeEvent& rEvent, configuration::NodeChangeInformation const& aInfo, bool bMore);
-    }
-// ---------------------------------------------------------------------------------------------------
-}
-
-#endif // CONFIGMGR_API_TRANSLATECHANGES_HXX_
diff --git a/configmgr/source/api2/treeiterators.cxx b/configmgr/source/api2/treeiterators.cxx
deleted file mode 100644
index bb26557b41..0000000000
--- a/configmgr/source/api2/treeiterators.cxx
+++ /dev/null
@@ -1,96 +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: treeiterators.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_configmgr.hxx"
-#include <stdio.h>
-
-#include "treeiterators.hxx"
-
-#include "apitypes.hxx"
-#include "configpath.hxx"
-#include "attributes.hxx"
-#include "valueref.hxx"
-#include "propertyinfohelper.hxx"
-
-// .......................................................................
-namespace configmgr
-{
-// .......................................................................
-    namespace configapi
-    {
-        // ===================================================================
-        // = CollectNodeNames
-        // ===================================================================
-        // -------------------------------------------------------------------
-        CollectPropertyInfo::Result CollectNodeNames::handle(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-        {
-            m_aList.push_back(aTree->getSimpleNodeName(aNode.getOffset()));
-            return CONTINUE;
-        }
-
-        // -------------------------------------------------------------------
-        CollectPropertyInfo::Result CollectNodeNames::handle(rtl::Reference< configuration::Tree > const&, configuration::ValueRef const& aNode)
-        {
-            m_aList.push_back(aNode.m_sNodeName);
-            return CONTINUE;
-        }
-
-        // ===================================================================
-        // = CollectPropertyInfo
-        // ===================================================================
-        // -------------------------------------------------------------------
-        CollectNodeNames::Result CollectPropertyInfo::handle(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode)
-        {
-            rtl::OUString aName       = aTree->getSimpleNodeName(aNode.getOffset());
-            node::Attributes	aAttributes = aTree->getAttributes(aNode);
-            uno::Type	aApiType    = getUnoInterfaceType();
-
-            m_aList.push_back( helperMakeProperty(aName,aAttributes,aApiType,aTree->hasNodeDefault(aNode)) );
-            return CONTINUE;
-        }
-
-        // -------------------------------------------------------------------
-        CollectNodeNames::Result CollectPropertyInfo::handle(rtl::Reference< configuration::Tree > const& aTree, configuration::ValueRef const& aNode)
-        {
-            rtl::OUString aName       = aNode.m_sNodeName;
-            node::Attributes	aAttributes = aTree->getAttributes(aNode);
-            uno::Type	aApiType    = aTree->getUnoType(aNode);
-
-            m_aList.push_back( helperMakeProperty(aName,aAttributes,aApiType,aTree->hasNodeDefault(aNode)) );
-            return CONTINUE;
-        }
-// .......................................................................
-    }	// namespace configapi
-
-// .......................................................................
-}	// namespace configmgr
-// .......................................................................
-
diff --git a/configmgr/source/api2/treeiterators.hxx b/configmgr/source/api2/treeiterators.hxx
deleted file mode 100644
index 2656882ae9..0000000000
--- a/configmgr/source/api2/treeiterators.hxx
+++ /dev/null
@@ -1,88 +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: treeiterators.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 CONFIGMGR_TREEITERATORS_HXX_
-#define CONFIGMGR_TREEITERATORS_HXX_
-
-#include "tree.hxx"
-#include <com/sun/star/beans/Property.hpp>
-#include <rtl/ustring.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-// .......................................................................
-namespace configmgr
-{
-// .......................................................................
-    namespace configapi
-    {
-        // ===================================================================
-        // = CollectNodeNames
-        // ===================================================================
-        class CollectNodeNames :  public configuration::NodeVisitor
-        {
-        protected:
-            std::vector<rtl::OUString>	m_aList;
-
-        public:
-            CollectNodeNames() { }
-
-            virtual Result handle(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode); // NodeVisitor
-            virtual Result handle(rtl::Reference< configuration::Tree > const& aTree, configuration::ValueRef const& aNode); // NodeVisitor
-
-            std::vector<rtl::OUString> const& list() const { return m_aList; }
-        };
-
-        // ===================================================================
-        // = CollectPropertyInfo
-        // ===================================================================
-        class CollectPropertyInfo :  public configuration::NodeVisitor
-        {
-        protected:
-            std::vector<com::sun::star::beans::Property>	m_aList;
-
-        public:
-            CollectPropertyInfo() { }
-
-            virtual Result handle(rtl::Reference< configuration::Tree > const& aTree, configuration::NodeRef const& aNode); // NodeVisitor
-            virtual Result handle(rtl::Reference< configuration::Tree > const& aTree, configuration::ValueRef const& aNode); // NodeVisitor
-
-            std::vector<com::sun::star::beans::Property> const& list() const { return m_aList; }
-        };
-    }
-// .......................................................................
-}	// namespace configmgr
-// .......................................................................
-
-#endif // _CONFIGMGR_TREEITERATORS_HXX_
-
diff --git a/configmgr/source/api2/updateimpl.cxx b/configmgr/source/api2/updateimpl.cxx
deleted file mode 100644
index 301a9f77c1..0000000000
--- a/configmgr/source/api2/updateimpl.cxx
+++ /dev/null
@@ -1,650 +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: updateimpl.cxx,v $
- * $Revision: 1.15.20.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_configmgr.hxx"
-
-#include "updateimpl.hxx"
-#include "accessimpl.hxx"
-#include "apinodeaccess.hxx"
-#include "apinodeupdate.hxx"
-#include "noderef.hxx"
-#include "valueref.hxx"
-#include "nodechange.hxx"
-#include "configset.hxx"
-#include "configgroup.hxx"
-#include "confignotifier.hxx"
-#include "broadcaster.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/beans/PropertyVetoException.hpp>
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------------
-        namespace lang = css::lang;
-        namespace util = css::util;
-        namespace container = css::container;
-
-// Interface methods
-//-----------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------
-// Update methods
-//-----------------------------------------------------------------------------------
-
-// XNameReplace
-//-----------------------------------------------------------------------------------
-void implReplaceByName(NodeGroupAccess& rNode, const rtl::OUString& sName, const uno::Any& rElement ) 
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeGroupAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateChildName(sName,aTree,aNode);
-
-        configuration::ValueRef aChildValue( aTree->getChildValue(aNode, aChildName) );
-
-        if (!aChildValue.isValid())
-        {
-            if (aTree->hasChildNode(aNode, aChildName))
-            {
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Value. Node '") );
-                sMessage += sName;
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is not a simple value.")  );
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw lang::IllegalArgumentException( sMessage, xContext, 2 );
-            }
-            else
-            {
-                OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing child node not found by implementation");
-                rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Value. Value '") );
-                sMessage += sName;
-                sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in ")  );
-                sMessage += aTree->getAbsolutePath(aNode).toString();
-
-                uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-                throw container::NoSuchElementException( sMessage, xContext );
-            }
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateSetValue(aChildValue, rElement);
-
-        if (aChange.test().isChange())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-//			lock.clearForBroadcast();
-
-            aSender.queryConstraints(aChange);
-
-            aTree->integrate(aChange, aNode, true);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Value: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw container::NoSuchElementException( e.message(), xContext );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-    catch (css::beans::PropertyVetoException& ex)
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot set Value. Change was Vetoed: ") );
-        throw lang::WrappedTargetException( sMessage += ex.Message, rNode.getUnoInstance(), uno::makeAny(ex) );
-    }
-} 
-//-----------------------------------------------------------------------------------
-
-void implReplaceByName(NodeTreeSetAccess& rNode, const rtl::OUString& sName, const uno::Any& rElement ) 
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeTreeSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateElementName(sName,aTree,aNode);
-
-        rtl::Reference< configuration::ElementTree > aElement( aTree->getElement(aNode,aChildName) );
-
-        if (!aElement.is())
-        {
-            OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Set element not found by implementation");
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element. Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in Set ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw container::NoSuchElementException( sMessage, xContext );
-        }
-
-        rtl::Reference< configuration::ElementTree > aElementTree = configapi::extractElementTree(rNode.getFactory(), rElement, rNode.getElementInfo());
-        if (!aElementTree.is())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element: ") );
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Replacing object was not created from this set's template") );
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw lang::IllegalArgumentException( sMessage, xContext, 2 );
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateReplaceElement( aElement, aElementTree );
-        
-        if (aChange.test().isChange())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-            //aSender.queryConstraints(aChange); - N/A: no external constraints on set children possible
-
-            aTree->integrate(aChange, aNode, true);
-            attachSetElement(rNode, aElementTree);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw container::NoSuchElementException( e.message(), xContext );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-//-----------------------------------------------------------------------------------
-
-void implReplaceByName(NodeValueSetAccess& rNode, const rtl::OUString& sName, const uno::Any& rElement ) 
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeValueSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateElementName(sName,aTree,aNode);
-
-        rtl::Reference< configuration::ElementTree > aElement( aTree->getElement(aNode,aChildName) );
-
-        if (!aElement.is())
-        {
-            OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Set element not found by implementation");
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element. Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in Set ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw container::NoSuchElementException( sMessage, xContext );
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateReplaceElement( aElement, rElement );
-        
-        if (aChange.test().isChange())
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-            //aSender.queryConstraints(aChange); - N/A: no external constraints on set children possible
-
-            aTree->integrate(aChange, aNode, true);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot replace Set Element: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw container::NoSuchElementException( e.message(), xContext );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-}
-
-// XNameContainer
-//-----------------------------------------------------------------------------------
-void implInsertByName(NodeTreeSetAccess& rNode, const rtl::OUString& sName, const uno::Any& rElement) 
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeTreeSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateElementName(sName,aTree,aNode);
-
-        if( aTree->hasElement(aNode,aChildName) )
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot insert into Set. Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is already present in Set ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw container::ElementExistException( sMessage, xContext );
-        }
-        OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Set element not found by implementation");
-
-        rtl::Reference< configuration::ElementTree > aElementTree = configapi::extractElementTree(rNode.getFactory(), rElement, rNode.getElementInfo());
-        if (!aElementTree.is())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot insert into Set: ") );
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Inserted object was not created from this set's template") );
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw lang::IllegalArgumentException( sMessage, xContext, 2 );
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateInsertElement(aChildName, aElementTree);
-
-        aChange.test(); // make sure old values are set up correctly
-        OSL_ENSURE(aChange.isChange(), "ERROR: Adding a node validated as empty change");
-
-        Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-        //aSender.queryConstraints(); - N/A: no external constraints on set children possible
-
-        aTree->integrate(aChange, aNode, true);
-        attachSetElement(rNode, aElementTree);
-
-        lock.clearForBroadcast();
-        aSender.notifyListeners(aChange);
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.illegalArgument( 1 );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-}
-
-//-----------------------------------------------------------------------------------
-
-void implInsertByName(NodeValueSetAccess& rNode, const rtl::OUString& sName, const uno::Any& rElement) 
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeValueSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateElementName(sName,aTree,aNode);
-
-        if( aTree->hasElement(aNode,aChildName) )
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot insert into Set. Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' is already present in Set ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw container::ElementExistException( sMessage, xContext );
-        }
-        OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Set element not found by implementation");
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateInsertElement(aChildName, rElement);
-
-        aChange.test(); // make sure old values are set up correctly
-        OSL_ENSURE(aChange.isChange(), "ERROR: Adding a node validated as empty change");
-
-        Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-        //aSender.queryConstraints(); - N/A: no external constraints on set children possible
-
-        aTree->integrate(aChange, aNode, true);
-
-        lock.clearForBroadcast();
-        aSender.notifyListeners(aChange);
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );
-        e.illegalArgument( 1 );
-    }
-    catch (configuration::TypeMismatch& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::ConstraintViolation& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.illegalArgument(2);
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-}
-
-//-----------------------------------------------------------------------------------
-void implRemoveByName(NodeTreeSetAccess& rNode, const rtl::OUString& sName ) 
-    throw(css::container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeTreeSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateElementName(sName,aTree,aNode);
-
-        rtl::Reference< configuration::ElementTree > aElement( aTree->getElement(aNode,aChildName) );
-
-        if (!aElement.is())
-        {
-            OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Set element not found by implementation");
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot remove Set Element. Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in Set ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw container::NoSuchElementException( sMessage, xContext );
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateRemoveElement(aElement);
-
-        aChange.test(); // make sure old values are set up correctly
-        OSL_ENSURE(aChange.isChange(), "ERROR: Removing a node validated as empty change");
-
-        Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-        //aSender.queryConstraints(); - N/A: no external constraints on set children possible
-
-        aTree->integrate(aChange, aNode, true);
-        detachSetElement(rNode.getFactory(), aElement);
-
-        lock.clearForBroadcast();
-        aSender.notifyListeners(aChange);
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot remove Set Element: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw container::NoSuchElementException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-}
-//-----------------------------------------------------------------------------------
-void implRemoveByName(NodeValueSetAccess& rNode, const rtl::OUString& sName ) 
-    throw(css::container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeValueSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        rtl::OUString aChildName = configuration::validateElementName(sName,aTree,aNode);
-
-        rtl::Reference< configuration::ElementTree > aElement = aTree->getElement(aNode,aChildName);
-        if (!aElement.is())
-        {
-            OSL_ENSURE(!configuration::hasChildOrElement(aTree,aNode,aChildName),"ERROR: Configuration: Existing Set element not found by implementation");
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot remove Set Element. Element '") );
-            sMessage += sName;
-            sMessage += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("' not found in Set ")  );
-            sMessage += aTree->getAbsolutePath(aNode).toString();
-
-            uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-            throw container::NoSuchElementException( sMessage, xContext );
-        }
-
-        configuration::NodeChange aChange = lock.getNodeUpdater().validateRemoveElement(aElement);
-
-        aChange.test(); // make sure old values are set up correctly
-        OSL_ENSURE(aChange.isChange(), "ERROR: Removing a node validated as empty change");
-
-        Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,true));
-
-        //aSender.queryConstraints(); - N/A: no external constraints on set children possible
-
-        aTree->integrate(aChange, aNode, true);
-
-        lock.clearForBroadcast();
-        aSender.notifyListeners(aChange);
-    }
-    catch (configuration::InvalidName& ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot remove Set Element: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-        throw container::NoSuchElementException( sMessage += e.message(), xContext );
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-}
-//-----------------------------------------------------------------------------------
-
-// XPropertyWithState
-//-----------------------------------------------------------------------------------
-
-void implSetToDefaultAsProperty(NodeSetAccess& rNode) 
-    throw (css::lang::WrappedTargetException, uno::RuntimeException)
-{
-    try
-    {
-        GuardedNodeUpdate<NodeSetAccess> lock( rNode );
-
-        rtl::Reference< configuration::Tree > const aTree( lock.getTree() );
-        configuration::NodeRef const aNode( lock.getNode() );
-
-        configuration::SetDefaulter aDefaulter = lock.getNodeDefaulter();
-
-        configuration::NodeChange aChange = aDefaulter.validateSetToDefaultState();
-
-        const bool bLocal = true;
-
-        if (aChange.test().isChange() )
-        {
-            Broadcaster aSender(rNode.getNotifier().makeBroadcaster(aChange,bLocal));
-
-            aSender.queryConstraints(aChange);
-
-            aTree->integrate(aChange, aNode, bLocal);
-
-            lock.clearForBroadcast();
-            aSender.notifyListeners(aChange);
-        }
-    }
-    catch (configuration::ConstraintViolation & ex)
-    {
-        ExceptionMapper e(ex);
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Default: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-
-        throw lang::WrappedTargetException( sMessage += e.message(), xContext, uno::Any());
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-    catch (lang::WrappedTargetException& )  { throw;}
-    catch (uno::RuntimeException& )         { throw;}
-    catch (uno::Exception& e)         
-    { 		
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration - Cannot restore Default: ") );
-        uno::Reference<uno::XInterface> xContext( rNode.getUnoInstance() );
-
-        throw lang::WrappedTargetException( sMessage += e.Message, xContext, uno::makeAny(e));
-    }
-}
-//-----------------------------------------------------------------------------------
-
-// XSingleServiceFactory
-//-----------------------------------------------------------------------------------
-uno::Reference< uno::XInterface > implCreateElement(NodeTreeSetAccess& rNode ) 
-    throw(uno::Exception, uno::RuntimeException)
-{
-    uno::Reference< uno::XInterface > xRet;
-    try
-    {
-        GuardedNodeData<NodeSetAccess> lock( rNode ); // no provider lock needed ? => if template lock is separate - OK
-
-        rtl::Reference< configuration::ElementTree > aNewElement( rNode.getElementFactory().instantiateTemplate(rNode.getElementInfo()) );
-    
-        uno::Any aAny = configapi::makeElement( rNode.getFactory(), aNewElement );
-        if (!(aAny >>= xRet)) // no parent available
-        {
-            OSL_ASSERT(!xRet.is()); // make sure we return NULL
-            OSL_ENSURE(!aAny.hasValue(), "configmgr: BasicSetElement::getParent: could not extract parent - node is not an object"); 
-        }
-    }
-    catch (configuration::Exception& ex)
-    {
-        ExceptionMapper e(ex);
-        e.setContext( rNode.getUnoInstance() );	
-        e.unhandled();
-    }
-
-    return xRet; 
-}
-//-----------------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > implCreateElement(NodeTreeSetAccess& rNode, const uno::Sequence< uno::Any >& aArguments ) 
-    throw(uno::Exception, uno::RuntimeException)
-{
-    { (void)aArguments; }
-    OSL_ENSURE(aArguments.getLength() == 0, "ConfigurationContainer: createInstance: Arguments not supported - ignoring ...");
-    return implCreateElement(rNode);
-}
-        
-//-----------------------------------------------------------------------------------
-    } // namespace configapi
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/api2/updateimpl.hxx b/configmgr/source/api2/updateimpl.hxx
deleted file mode 100644
index 77b510f424..0000000000
--- a/configmgr/source/api2/updateimpl.hxx
+++ /dev/null
@@ -1,98 +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: updateimpl.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 CONFIGMGR_API_BASEUPDATEIMPL_HXX_
-#define CONFIGMGR_API_BASEUPDATEIMPL_HXX_
-
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XPropertyWithState.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-namespace configmgr
-{
-    namespace css = ::com::sun::star;
-    namespace uno = ::com::sun::star::uno;
-
-    /* implementations of the interfaces supported by a (parent) node
-        within the configuration tree.
-        (updating operation)
-    */
-    namespace configapi
-    {
-        class NodeSetAccess; 
-        class NodeTreeSetAccess; 
-        class NodeValueSetAccess; 
-        class NodeGroupAccess; 
-
-        // XNameReplace
-        //---------------------------------------------------------------------
-        void implReplaceByName(NodeGroupAccess& rNode, const rtl::OUString& rName, const uno::Any& rElement ) 
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        void implReplaceByName(NodeTreeSetAccess& rNode, const rtl::OUString& rName, const uno::Any& rElement ) 
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        void implReplaceByName(NodeValueSetAccess& rNode, const rtl::OUString& rName, const uno::Any& rElement ) 
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XNameContainer
-        //---------------------------------------------------------------------
-        void implInsertByName(NodeTreeSetAccess& rNode, const rtl::OUString& rName, const uno::Any& rElement) 
-            throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        void implInsertByName(NodeValueSetAccess& rNode, const rtl::OUString& rName, const uno::Any& rElement) 
-            throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, uno::RuntimeException);
-
-        void implRemoveByName(NodeTreeSetAccess& rNode, const rtl::OUString& rName ) 
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
- 
-        void implRemoveByName(NodeValueSetAccess& rNode, const rtl::OUString& rName ) 
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, uno::RuntimeException);
- 
-        // XPropertyWithState - updating operation only
-        //---------------------------------------------------------------------
-        void implSetToDefaultAsProperty(NodeSetAccess& rNode) 
-            throw (css::lang::WrappedTargetException, uno::RuntimeException);
-
-        // XSingleServiceFactory
-        //---------------------------------------------------------------------
-        uno::Reference< uno::XInterface > implCreateElement(NodeTreeSetAccess& rNode ) 
-            throw(uno::Exception, uno::RuntimeException);
-
-        uno::Reference< uno::XInterface > implCreateElement(NodeTreeSetAccess& rNode, const uno::Sequence< uno::Any >& aArguments ) 
-            throw(uno::Exception, uno::RuntimeException);
-
-        //---------------------------------------------------------------------
-    }
-
-}
-#endif // CONFIGMGR_API_BASEUPDATEIMPL_HXX_
-
-
diff --git a/configmgr/source/backend/backendaccess.cxx b/configmgr/source/backend/backendaccess.cxx
deleted file mode 100644
index c84a4d7e5e..0000000000
--- a/configmgr/source/backend/backendaccess.cxx
+++ /dev/null
@@ -1,830 +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: backendaccess.cxx,v $
- * $Revision: 1.27 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include "backendaccess.hxx"
-#include "logger.hxx"
-#include "matchlocale.hxx"
-#include "layermerge.hxx"
-#include "schemabuilder.hxx"
-
-#ifndef CONFIGMGR_BACKEND_UPDATEDISPATCHER_HXX
-#include "updatedispatch.hxx"
-#endif // CONFIGMGR_BACKEND_UPDATEDISPATCHER_HXX
-#include "backendnotifier.hxx"
-#include "emptylayer.hxx"
-#include "filehelper.hxx"
-#include "simpleinteractionrequest.hxx"
-#include "configinteractionhandler.hxx"
-#include <com/sun/star/configuration/backend/XVersionedSchemaSupplier.hpp>
-#include <com/sun/star/configuration/backend/XCompositeLayer.hpp>
-#include <com/sun/star/configuration/backend/XUpdatableLayer.hpp>
-#include <com/sun/star/configuration/backend/XBackendEntities.hpp>
-#include <com/sun/star/configuration/backend/MergeRecoveryRequest.hpp>
-#include <com/sun/star/configuration/backend/MalformedDataException.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/lang/NullPointerException.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/logfile.hxx>
-
-#include <cppuhelper/exc_hlp.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif //INCLUDED_VECTOR
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif //INCLUDED_ALGORITHM
-
-#define OU2A(rtlOUString)	(::rtl::OUStringToOString((rtlOUString), RTL_TEXTENCODING_ASCII_US).getStr())
-#define RTL_LOGFILE_OU2A(rtlOUString)	OU2A(rtlOUString)
-
-#define OUSTR(txt)	rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(txt) )
-
-namespace configmgr { namespace backend {
-//------------------------------------------------------------------------------
-    namespace task = com::sun::star::task;
-
-inline
-uno::Reference<lang::XMultiServiceFactory> BackendAccess::getServiceFactory() const
-{
-    return uno::Reference<lang::XMultiServiceFactory>(mContext->getServiceManager(),uno::UNO_QUERY_THROW);
-}
-//------------------------------------------------------------------------------
-
-BackendAccess::BackendAccess(
-        const uno::Reference<backenduno::XBackend>& xBackend,
-        const uno::Reference<uno::XComponentContext>& xContext) 
-    : mContext(xContext)
-    , mBackend(xBackend)
-    , mBinaryCache(xContext)
- {
-    OSL_ENSURE(mContext.is(), "BackendAccess: Context is missing");
-    if (!mContext.is())
-        throw lang::NullPointerException(rtl::OUString::createFromAscii("BackendAccess: NULL Context passed"), NULL);
-    if (!xBackend.is())
-        throw lang::NullPointerException(OUSTR("Configuration: Trying to create backend access without backend"),NULL);
-    if (!uno::Reference<backenduno::XSchemaSupplier>::query(xBackend).is())
-        throw lang::NullPointerException(OUSTR("Configuration: No backend for schemas available"),NULL);
-    
-
-     mNotifier = new BackendChangeNotifier(xBackend);
-     //Stored as uno::reference to facilitate sharing with MultiStratumBackend
-     mXNotifier = mNotifier;
-     
-     //Create Binary Cache
-    uno::Reference<backenduno::XBackendEntities> xBackendEntities = uno::Reference<backenduno::XBackendEntities>( mBackend, uno::UNO_QUERY) ;
-    OSL_ENSURE(xBackendEntities.is(),"Backend does not provide entity information");
-    
-    if ( xBackendEntities.is() ) mBinaryCache.setOwnerEntity(xBackendEntities->getOwnerEntity());
-}
-//------------------------------------------------------------------------------
-
-BackendAccess::~BackendAccess() {}
-//------------------------------------------------------------------------------
-namespace
-{
-//------------------------------------------------------------------------------
-        
-    static inline
-    bool findLocale(std::vector< com::sun::star::lang::Locale > const & seq, com::sun::star::lang::Locale const & loc)
-    {
-        std::vector< com::sun::star::lang::Locale >::const_iterator first = seq.begin();
-        std::vector< com::sun::star::lang::Locale >::const_iterator last  = seq.end();
-        for ( ; first != last; ++first)
-            if (localehelper::equalLocale(*first, loc))
-                return true;
-        return false;
-    }
-//------------------------------------------------------------------------------
-
-    static inline
-    void addLocale( com::sun::star::lang::Locale const & aLocale, std::vector< com::sun::star::lang::Locale > & inoutLocales)
-    {
-        if (!findLocale(inoutLocales,aLocale))
-            inoutLocales.push_back(aLocale);
-    }
-//------------------------------------------------------------------------------
-
-    static rtl::OUString toString(uno::Sequence< rtl::OUString > const & seq, sal_Unicode separator = ',')
-    {
-        rtl::OUStringBuffer buf;
-
-        if (sal_Int32 const nCount = seq.getLength())
-        {
-            buf.append(seq[0]);
-            for (sal_Int32 ix=1; ix < nCount; ++ix)
-                buf.append(separator).append(seq[ix]);
-        }
-        else
-            buf.appendAscii("<none>");
-
-        return buf.makeStringAndClear();
-    }
-//------------------------------------------------------------------------------
-
-    static 
-    uno::Sequence< rtl::OUString > intersect(uno::Sequence< rtl::OUString > const & seq1, uno::Sequence< rtl::OUString > const & seq2)
-    {
-        sal_Int32 const len1 = seq1.getLength();
-        uno::Sequence< rtl::OUString > aResult(len1);
-
-        rtl::OUString const * const beg2 = seq2.getConstArray();
-        rtl::OUString const * const end2 = beg2 + seq2.getLength();
-
-        sal_Int32 ix = 0;
-        for (sal_Int32 i1 = 0; i1 < len1; ++i1)
-        {
-            if (std::find(beg2,end2,seq1[i1]) != end2)
-                aResult[ix++] = seq1[i1];
-        }
-        aResult.realloc(ix);
-        return aResult;
-    }
-//------------------------------------------------------------------------------
-} // anonymous namespace
-//------------------------------------------------------------------------------
-
-// helper used by the binary cache
-uno::Sequence< rtl::OUString >
-    getAvailableLocales(const uno::Reference<backenduno::XLayer> * pLayers, sal_Int32 nNumLayers)
-{
-    uno::Sequence< rtl::OUString > aResult;
-
-    for (sal_Int32 i = 0 ; i < nNumLayers ; ++ i) 
-    {
-        uno::Reference<backenduno::XCompositeLayer> compositeLayer(
-             pLayers [i], uno::UNO_QUERY) ;
-
-        if (compositeLayer.is()) 
-        {
-            uno::Sequence<rtl::OUString> aLocales = compositeLayer->listSubLayerIds();
-
-            if (aResult.getLength() == 0)
-            {
-                aResult = aLocales;
-            }
-            else 
-            {
-                OSL_TRACE("Warning: multiple composite layers found. Detection of available locales is inaccurate.");
-                // be defensive: only locales present in all composite layers are 'available'
-                aResult= intersect(aResult,aLocales);
-            }
-        }
-    }
-    return aResult;
-}
-//------------------------------------------------------------------------------
-static rtl::OUString getLayerURL(const uno::Reference<backenduno::XLayer> & aLayer);
-
-void BackendAccess::merge(
-        MergedComponentData& aData,
-        const uno::Reference<backenduno::XLayer> * pLayers,
-        sal_Int32 aNumLayers,
-        com::sun::star::lang::Locale const & aRequestedLocale,
-        std::vector< com::sun::star::lang::Locale > & inoutMergedLocales,
-        ITemplateDataProvider *aTemplateProvider,
-        sal_Int32 * pLayersMerged)
-    SAL_THROW((com::sun::star::uno::Exception)) 
-{
-    LayerMergeHandler * pMerger = new LayerMergeHandler(mContext, aData, aTemplateProvider );
-    uno::Reference<backenduno::XLayerHandler> xLayerMerger(pMerger);
-
-    Logger logger(mContext);
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::merge()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "merging %d layers", int(aNumLayers) );
-
-    rtl::OUString const & aLanguage = aRequestedLocale.Language;
-    bool const needAllLanguages = localehelper::isAnyLanguage(aLanguage);
-
-    if (aLanguage.getLength() && !needAllLanguages)
-    { 
-        if (!localehelper::isDefaultLanguage(aLanguage))
-            addLocale(aRequestedLocale,inoutMergedLocales);
-    }
-    bool const needLocalizedData = needAllLanguages || !inoutMergedLocales.empty();
-    
-    if (logger.isLogging(LogLevel::FINEST))
-    {
-        if (!needLocalizedData)
-            logger.finest("Starting merge with NO locales", "merge()","configmgr::Backend");
-
-        else if (needAllLanguages)
-            logger.finest("Starting merge for ALL locales", "merge()","configmgr::Backend");
-
-        else
-            logger.finest(OUSTR("Starting merge for locale(s): ") + 
-                                toString(localehelper::makeIsoSequence(inoutMergedLocales)), 
-                                "merge()","configmgr::Backend");
-    }
-
-    if (pLayersMerged) *pLayersMerged = 0;
-
-    for (sal_Int32 i = 0 ; i < aNumLayers ; ++ i) 
-    {
-        if (logger.isLogging(LogLevel::FINEST))
-            logger.finest(OUSTR("+ Merging layer: ") + getLayerURL(pLayers[i]), 
-                                "merge()","configmgr::Backend");
-
-        pMerger->prepareLayer() ;
-        pLayers [i]->readData(xLayerMerger) ;
-
-        if (needLocalizedData)
-        {
-            uno::Reference<backenduno::XCompositeLayer> compositeLayer(
-                 pLayers [i], uno::UNO_QUERY) ;
-
-            if (compositeLayer.is()) 
-            {
-                uno::Sequence<rtl::OUString> aSubLayerIds = compositeLayer->listSubLayerIds();
-                logger.finest(OUSTR("++ Found locales: ") + toString(aSubLayerIds), 
-                                    "merge()","configmgr::Backend");
-
-                for (sal_Int32 j = 0; j < aSubLayerIds.getLength(); ++j)
-                {
-                    rtl::OUString const & aLocaleIso = aSubLayerIds[j];
-                    com::sun::star::lang::Locale aLocale = localehelper::makeLocale(aLocaleIso);
-
-                    // requesting de-CH, we accept de-CH and de, but not de-DE
-                    const localehelper::MatchQuality kMatchAccept = localehelper::MATCH_LANGUAGE_PLAIN;
-
-                    if (needAllLanguages || localehelper::isMatch(aLocale,inoutMergedLocales,kMatchAccept))
-                    {
-                        if(pMerger->prepareSublayer(aLocaleIso))
-                        {
-                            logger.finest(OUSTR("++ Merging sublayer for locale: ") + aLocaleIso, 
-                                                "merge()","configmgr::Backend");
-                            compositeLayer->readSubLayerData(xLayerMerger,aLocaleIso) ;
-                            addLocale(aLocale,inoutMergedLocales); 
-                        }
-                        // else dropLocale(aLocale,inoutMergedLocales); ?
-                    }
-                }
-            }
-        }
-        if (pLayersMerged) ++*pLayersMerged;
-    }
-}
-//------------------------------------------------------------------------------
-
-bool BackendAccess::readDefaultData( MergedComponentData & aComponentData, 
-                                        rtl::OUString const & aComponent, 
-                                        RequestOptions const & aOptions,
-                                        bool bIncludeTemplates,
-                                        const uno::Reference<backenduno::XLayer> * pLayers,
-                                        sal_Int32 nNumLayers,                                   
-                                        ITemplateDataProvider *aTemplateProvider,
-                                        sal_Int32 * pLayersMerged)
-    SAL_THROW((com::sun::star::uno::Exception)) 
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog1, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::readDefaultData()");
-
-    Logger logger(mContext);
-    const sal_Int32 detail = LogLevel::FINER;
-    bool const bLogDetail = logger.isLogging(detail);
-    
-    rtl::OUString const aSchemaVersion = this->getSchemaVersion(aComponent);
-
-    if (logger.isLogging(LogLevel::FINE))
-    {
-        rtl::OUStringBuffer aMsg;
-        aMsg.appendAscii("Reading data for component \"").append(aComponent).appendAscii("\"");
-        aMsg.appendAscii(" [version=").append(aSchemaVersion).appendAscii("]");
-
-        logger.fine( aMsg.makeStringAndClear(), "readDefaultData()","configmgr::Backend");
-    }
-    
-    com::sun::star::lang::Locale const aRequestedLocale = localehelper::makeLocale(aOptions.getLocale());
-    std::vector< com::sun::star::lang::Locale > aKnownLocales;
-
-    if (bLogDetail) logger.log(detail, "... attempt to read from binary cache", "readDefaultData()","configmgr::Backend");
-    bool bCacheHit = mBinaryCache.readComponentData(aComponentData, getServiceFactory(), 
-                                                    aComponent, aSchemaVersion, 
-                                                    aOptions.getEntity(), 
-                                                    aRequestedLocale, aKnownLocales, 
-                                                    pLayers, nNumLayers, bIncludeTemplates);
-
-    if (!bCacheHit)
-    {
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog2, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::readDefaultData() - not in cache");
-        
-        if (bLogDetail) logger.log(detail, "... cache miss - need full merge", "readDefaultData()","configmgr::Backend");
-        if (bLogDetail) logger.log(detail, "... reading schema", "readDefaultData()","configmgr::Backend");
-        {
-            SchemaBuilder *schemaBuilder = new SchemaBuilder( mContext, aComponent, aComponentData, aTemplateProvider ); 
-            uno::Reference<backenduno::XSchemaHandler> schemaHandler = schemaBuilder ;
-
-            uno::Reference<backenduno::XSchema> schema = this->getSchema(aComponent);
-            schema->readSchema(schemaHandler) ;
-        }
-
-        if (bLogDetail) logger.log(detail, "... merging layers", "readDefaultData()","configmgr::Backend");
-        this->merge(aComponentData, pLayers, nNumLayers, aRequestedLocale, aKnownLocales, aTemplateProvider, pLayersMerged );
-        promoteToDefault(aComponentData);
-
-        if (mBinaryCache.isCacheEnabled(aOptions.getEntity()))
-        {
-            if (bLogDetail) logger.log(detail, "... creating binary cache", "readDefaultData()","configmgr::Backend");
-            bool bWriteSuccess = mBinaryCache.writeComponentData( aComponentData, getServiceFactory(), 
-                                                                  aComponent, aSchemaVersion,
-                                                                  aOptions.getEntity(), aKnownLocales, 
-                                                                  pLayers, nNumLayers );
-
-            if (!bWriteSuccess)
-            {
-                logger.info("Binary cache write failed - disabling binary cache","readDefaultData()","configmgr::Backend");
-                mBinaryCache.disableCache();
-            }
-        }
-        else if (bLogDetail)
-            logger.log(detail, "... cache hit", "readDefaultData()","configmgr::Backend");
-    }
-    else if (pLayersMerged)
-        *pLayersMerged = nNumLayers;
-
-    return aComponentData.hasSchema();
-}
-//------------------------------------------------------------------------------
-
-static rtl::OUString getLayerURL(const uno::Reference<backenduno::XLayer> & aLayer)
-{
-    try
-    {
-        namespace beans = com::sun::star::beans;
-        uno::Reference< beans::XPropertySet > xLayerProps( aLayer, uno::UNO_QUERY );
-        if (xLayerProps.is())
-        {
-            uno::Any aPropVal = xLayerProps->getPropertyValue( OUSTR("URL") );
-            rtl::OUString aResult;
-            if (aPropVal >>= aResult)
-                return aResult;
-        }
-        OSL_TRACE("Warning - Cannot get location of layer data\n");
-    }
-    catch (uno::Exception & e)
-    {
-        OSL_TRACE("Warning - Configuration: Retrieving layer URL failed: [%s]\n", OU2A(e.Message));
-    }
-    // TODO: use better fallback, e.g. ServiceName
-    const char * const aFallback = aLayer.is() ? "<Unknown Layer Type>" : "<NULL Layer>";
-    return rtl::OUString::createFromAscii(aFallback);
-}
-//------------------------------------------------------------------------------
-static inline
-rtl::OUString getLayerIdentifier(const uno::Reference<backenduno::XLayer> & aLayer)
-{
-    return getLayerURL(aLayer);
-}
-
-//------------------------------------------------------------------------------
-static void removeLayerData(uno::Reference< backenduno::XLayer > const & xLayer)
-{
-    OSL_ASSERT(xLayer.is());
-    
-    uno::Reference< backenduno::XUpdatableLayer > xLayerRemover(xLayer,uno::UNO_QUERY);
-    if (xLayerRemover.is())
-    try
-    {
-        xLayerRemover->replaceWith(createEmptyLayer());
-    }
-    catch (uno::Exception & e)
-    {
-        OSL_TRACE("Warning - Configuration: Could not clear Layer data. Error: [%s]\n", OU2A(e.Message));
-    }
-    else
-    {
-        if (! FileHelper::tryToRemoveFile(getLayerURL(xLayer),true))
-            OSL_TRACE("Warning - Configuration: Could not remove broken user Layer data: [-Not Updatable-]\n");
-    }
-}
-//------------------------------------------------------------------------------
-
-static void discardLayer(uno::Sequence<uno::Reference<backenduno::XLayer> >& layers, sal_Int32 nLayer)
-{
-    OSL_ASSERT(0 <= nLayer && nLayer < layers.getLength());
-    sal_Int32 nNewSize = layers.getLength() - 1;
-
-    for (sal_Int32 i = nLayer; i<nNewSize; ++i)
-        layers[i] = layers[i+1];
-
-    layers.realloc(nNewSize);
-}
-//------------------------------------------------------------------------------
-
-namespace {
-
-class RecursiveHandler:
-    public cppu::WeakImplHelper1< task::XInteractionHandler >
-{
-public:
-    explicit RecursiveHandler(
-        uno::Reference< task::XInteractionHandler > const & outer):
-        m_outer(outer) {}
-
-    virtual void SAL_CALL handle(
-        uno::Reference< task::XInteractionRequest > const & request)
-        throw (uno::RuntimeException)
-    {
-        backenduno::MergeRecoveryRequest req;
-        if (request->getRequest() >>= req) {
-            uno::Sequence< uno::Reference< task::XInteractionContinuation > >
-                cs(request->getContinuations());
-            for (sal_Int32 i = 0; i < cs.getLength(); ++i) {
-                uno::Reference< task::XInteractionDisapprove > dis(
-                    cs[i], uno::UNO_QUERY);
-                if (dis.is()) {
-                    dis->select();
-                    break;
-                }
-            }
-        } else if (m_outer.is()) {
-            m_outer->handle(request);
-        }
-    }
-
-private:
-    RecursiveHandler(RecursiveHandler &); // not defined
-    void operator =(RecursiveHandler &); // not defined
-
-    virtual ~RecursiveHandler() {}
-
-    uno::Reference< task::XInteractionHandler > m_outer;
-};
-
-}
-
-bool BackendAccess::approveRecovery(const uno::Any & aMergeException,
-                                    const uno::Reference<backenduno::XLayer> & aBrokenLayer, 
-                                    bool bUserLayerData)
-    SAL_THROW((com::sun::star::uno::Exception))
-{
-    sal_uInt32 const k_supported_choices = apihelper::CONTINUATION_APPROVE | apihelper::CONTINUATION_DISAPPROVE;
-
-    sal_uInt32 chosen = apihelper::CONTINUATION_UNKNOWN;
-
-    apihelper::ConfigurationInteractionHandler handler;
-    try {
-        uno::Reference< task::XInteractionHandler > h(handler.get());
-        if (h.is()) {
-            handler.setRecursive(new RecursiveHandler(h));
-            rtl::Reference< apihelper::SimpleInteractionRequest > req(
-                new apihelper::SimpleInteractionRequest(
-                    uno::makeAny(
-                        backenduno::MergeRecoveryRequest(
-                            rtl::OUString(
-                                RTL_CONSTASCII_USTRINGPARAM(
-                                    "Recover from configuration merge"
-                                    " failure")),
-                            aBrokenLayer, aMergeException,
-                            getLayerIdentifier(aBrokenLayer),
-                            (bUserLayerData
-                             && (uno::Reference< backenduno::XUpdatableLayer >::query(aBrokenLayer).is()
-                                 || FileHelper::fileExists(
-                                     getLayerURL(aBrokenLayer)))))),
-                    k_supported_choices));
-            h->handle(req.get());
-            chosen = req->getResponse();
-        }
-    } catch (uno::Exception & e) {
-        OSL_TRACE("Warning - Configuration: Interaction handler failed: [%s]\n", OU2A(e.Message));
-    }
-
-    switch (chosen)
-    {
-    case apihelper::CONTINUATION_APPROVE:      return true;
-    case apihelper::CONTINUATION_DISAPPROVE:   return false;
-    case apihelper::CONTINUATION_UNKNOWN:      break;
-
-    default: OSL_ENSURE(false,"Unsolicited continuation chosen"); break;
-    }
-    // no choice available - default: approve, if user data 
-    return bUserLayerData;
-}
-//------------------------------------------------------------------------------
-
-ResultHolder< ComponentInstance > BackendAccess::getNodeData(const ComponentRequest& aRequest,
-                                           ITemplateDataProvider *_aTemplateProvider,
-                                           INodeDataListener *aListener)
-    SAL_THROW((com::sun::star::uno::Exception)) 
-{
-    rtl::OUString const component = aRequest.getComponentName();
-    ITemplateDataProvider * const aTemplateProvider = _aTemplateProvider ? _aTemplateProvider : this;
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::getNodeData()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "request path: %s", RTL_LOGFILE_OU2A(component) );
-
-    uno::Sequence<uno::Reference<backenduno::XLayer> > layers =
-        this->getLayers(component, aRequest.getOptions()) ;
-
-    sal_Int32 const k_NumUserLayers = 1;
-
-    sal_Int32 nNumDefaultLayers = layers.getLength() - k_NumUserLayers;
-    sal_Int32 nCurrentLayer( -1 );
-    bool bDefaultRecoveryApproved = false;
-
-    Logger logger(mContext);
-    do try // loop to allow recovery from merge failures
-    {
-        MergedComponentData aComponentData;
-        nCurrentLayer = -1;
-
-        if (!this->readDefaultData(aComponentData, component, aRequest.getOptions(), true,
-                                    layers.getConstArray(),nNumDefaultLayers, 
-                                    aTemplateProvider, &nCurrentLayer))
-        {
-            rtl::OUStringBuffer sMessage;
-            sMessage.appendAscii("Configuration: No data for request. Component \"");
-            sMessage.append(component);
-            sMessage.appendAscii("\" contains no data. ");
-
-            throw com::sun::star::container::NoSuchElementException(sMessage.makeStringAndClear(),mBackend);
-        }
-        OSL_ASSERT(nCurrentLayer == nNumDefaultLayers);
-
-        sal_Int32 const nNumUserLayers = layers.getLength() - nNumDefaultLayers;
-        if (nNumUserLayers > 0)
-        {
-            //Merge User layer (with all locales)
-            logger.finer("... merging user layer", "getNodeData()","configmgr::Backend");
-
-            std::vector< com::sun::star::lang::Locale > aLocales;
-            merge(aComponentData,  
-                    layers.getConstArray()+nNumDefaultLayers, nNumUserLayers, 
-                    localehelper::getAnyLocale(), aLocales, aTemplateProvider );
-
-            // mark this one as done
-            ++nCurrentLayer;
-        }
-
-        logger.finer("Reading component data finished successfully", "getNodeData()","configmgr::Backend");
-
-        ComponentInstance retCode(aComponentData.extractSchemaTree(),
-                                aComponentData.extractTemplatesTree(), 
-                                aRequest.getComponentName()) ;
-            
-        //Register listener with notifier
-        if(aListener)
-        {
-            mNotifier->addListener(aListener, aRequest);
-        }
-        return ResultHolder< ComponentInstance >(retCode) ;
-    }
-    catch (com::sun::star::container::NoSuchElementException &) { throw; }
-    catch (com::sun::star::uno::RuntimeException &) { throw; }
-    catch (uno::Exception & )
-    {
-        // can only recover if layer merging broke
-        if (nCurrentLayer < 0 || layers.getLength() <= nCurrentLayer)
-            throw;
-
-        uno::Reference< backenduno::XLayer > xBrokenLayer = layers[nCurrentLayer];
-
-        bool bUserLayerBroken = (nCurrentLayer == nNumDefaultLayers);
-
-        if (!bDefaultRecoveryApproved || bUserLayerBroken)
-        {
-            logger.info("Parsing data layer failed. Requesting approval for automated recovery", "getNodeData()","configmgr::Backend");
-            uno::Any theError = cppu::getCaughtException();
-            if (!approveRecovery(theError,xBrokenLayer,bUserLayerBroken))
-                cppu::throwException( theError );
-        }
-
-        // now do the recovery
-        discardLayer(layers,nCurrentLayer);
-        if (bUserLayerBroken) 
-        {
-            logger.info("Recovering from broken user data layer - discarding the data", "getNodeData()","configmgr::Backend");
-            removeLayerData(xBrokenLayer);
-        }
-        else
-        {
-            logger.info("Recovering from broken default layer - skipping", "getNodeData()","configmgr::Backend");
-            bDefaultRecoveryApproved = true;
-            --nNumDefaultLayers;
-        }
-    }
-    while (true);
-}
-//------------------------------------------------------------------------------
-
-void BackendAccess::updateNodeData(const UpdateRequest& aUpdate) 
-    SAL_THROW((com::sun::star::uno::Exception)) 
-{
-    rtl::OUString entity = aUpdate.getOptions().getEntity() ;
-    rtl::OUString component = 
-                    aUpdate.getUpdateRoot().getModuleName();
-    uno::Reference<backenduno::XUpdateHandler> handler ;
-        
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::updateNodeData()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "updating component: %s", RTL_LOGFILE_OU2A(component) );
-
-    if (entity.getLength() == 0) {
-        handler = mBackend->getOwnUpdateHandler(component) ;
-    }
-    else { handler = mBackend->getUpdateHandler(component, entity) ; }
-    UpdateDispatcher dispatcher(handler, aUpdate.getOptions().getLocale()) ;
-
-    dispatcher.dispatchUpdate(aUpdate.getUpdateRoot(), 
-                              *aUpdate.getUpdateData()) ;
-}
-//------------------------------------------------------------------------------
-
-ResultHolder< NodeInstance > BackendAccess::getDefaultData(const NodeRequest& aRequest)
-    SAL_THROW((com::sun::star::uno::Exception))
-{
-    rtl::OUString const component = aRequest.getPath().getModuleName();
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::getDefaultData()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "request path: %s", RTL_LOGFILE_OU2A(aRequest.getPath().toString()) );
-
-    uno::Sequence<uno::Reference<backenduno::XLayer> > const layers =
-        this->getLayers(component, aRequest.getOptions()) ;
-
-    sal_Int32 const nNumUserLayers = 1;
-    sal_Int32 const nNumDefaultLayers = layers.getLength() - nNumUserLayers;
-    
-    MergedComponentData aComponentData;
-
-    if (!this->readDefaultData(aComponentData, component, aRequest.getOptions(), false,
-                                layers.getConstArray(),nNumDefaultLayers, 
-                                this))
-    {
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("Configuration: No data for request. Component \"");
-        sMessage.append(component);
-        sMessage.appendAscii("\" contains no default data. ");
-
-        rtl::OUString const sMsg = sMessage.makeStringAndClear();
-        Logger(mContext).finer(sMsg,"getDefaultData()","configmgr::BackendAccess");
-        throw com::sun::star::container::NoSuchElementException(sMsg,mBackend);
-    }
-
-    std::auto_ptr<ISubtree> aResultTree = aComponentData.extractSchemaTree();
-    
-    configuration::AbsolutePath aPath = aRequest.getPath();
-    if( aPath.begin() != aPath.end())
-    {
-        for(std::vector<configuration::Path::Component>::const_reverse_iterator it=aPath.begin()+1,endIt=aPath.end();it!=endIt; ++it)
-        {
-            std::auto_ptr<INode> aChild=aResultTree->removeChild(it->getName());
-            if(aChild.get()== NULL)
-            {
-                rtl::OUStringBuffer sMessage;
-                sMessage.appendAscii("Configuration: No data for request. Element \"");
-                sMessage.append(aPath.toString());
-                sMessage.appendAscii("\" does not exist in the default data. ");
-
-                rtl::OUString const sMsg = sMessage.makeStringAndClear();
-                Logger(mContext).finest(sMsg,"getDefaultData()","configmgr::BackendAccess");
-                throw com::sun::star::container::NoSuchElementException(sMsg,mBackend);
-            }
-
-            ISubtree *pChildAsSubtree = aChild->asISubtree();
-            if(pChildAsSubtree == NULL)
-            {
-                rtl::OUString sMsg = rtl::OUString::createFromAscii("BackendAccess::getDefaultData - Node Expected, Found Property: ").concat(it->getName());
-                Logger(mContext).finer(sMsg,"getDefaultData()","configmgr::BackendAccess");
-                throw backenduno::MalformedDataException(sMsg, mBackend, uno::Any());
-            }
-            aResultTree.reset(pChildAsSubtree);
-            aChild.release();
-        }
-    }
-    
-    NodeInstance retCode(aResultTree, aRequest.getPath()) ;
-    return ResultHolder< NodeInstance >(retCode) ;
-}
-//------------------------------------------------------------------------------
-
-ResultHolder< TemplateInstance > BackendAccess::getTemplateData(const TemplateRequest& aRequest)
-    SAL_THROW((com::sun::star::uno::Exception))
-{
-    rtl::OUString component = aRequest.getComponentName();
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::BackendAccess", "jb99855", "configmgr: BackendAccess::getTemplateData()");
-    RTL_LOGFILE_CONTEXT_TRACE2(aLog, "requested template: %s/%s", 
-                                    RTL_LOGFILE_OU2A(aRequest.getComponentName().toString()) ,
-                                    aRequest.isComponentRequest() ? "*" : RTL_LOGFILE_OU2A(aRequest.getComponentName().toString()) );
-
-    MergedComponentData aComponentData;
-
-    {
-        SchemaBuilder *schemaBuilder = new SchemaBuilder( mContext, component, aComponentData ) ;
-        uno::Reference<backenduno::XSchemaHandler> handler = schemaBuilder ;
-
-        uno::Reference<backenduno::XSchema> schema = this->getSchema(component);
-
-        schema->readTemplates(handler) ;   
-    }
-
-    TemplateInstance::Data aResultData;
-    if (aRequest.isComponentRequest())
-    {
-        aResultData.reset( aComponentData.extractTemplatesTree().release() );     
-    }
-    else
-    {
-        backenduno::TemplateIdentifier templateId ;
-        templateId.Name = aRequest.getTemplateName();
-        templateId.Component = aRequest.getComponentName();
-
-        aResultData = aComponentData.extractTemplateNode(templateId.Name);   
-    }
-
-    TemplateInstance retCode(aResultData,aRequest.getTemplateName(), aRequest.getComponentName()) ;
-    return ResultHolder< TemplateInstance >(retCode) ;
-}
-//------------------------------------------------------------------------------
-    
-uno::Reference< backenduno::XSchema > BackendAccess::getSchema(const rtl::OUString& aComponent) 
-{
-    uno::Reference< backenduno::XSchemaSupplier > xSchemaBackend(mBackend, uno::UNO_QUERY_THROW);
-    OSL_ASSERT(xSchemaBackend.is());
-
-    uno::Reference< backenduno::XSchema > xSchema = xSchemaBackend->getComponentSchema(aComponent) ;
-    if (!xSchema.is())
-    {
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("Configuration: No data for request. Component \"");
-        sMessage.append(aComponent);
-        sMessage.appendAscii("\" is unknown. [No schema available]");
-
-        rtl::OUString const sMsg = sMessage.makeStringAndClear();
-        Logger(mContext).warning(sMsg,"getSchema()","configmgr::BackendAccess");
-        throw com::sun::star::container::NoSuchElementException(sMsg,xSchemaBackend);
-    }
-
-    return xSchema;
-}
-//------------------------------------------------------------------------------
-    
-rtl::OUString BackendAccess::getSchemaVersion(const rtl::OUString& aComponent) 
-{
-    uno::Reference< backenduno::XVersionedSchemaSupplier > xSchemaBackend(mBackend, uno::UNO_QUERY);
-    if (xSchemaBackend.is())
-        return xSchemaBackend->getSchemaVersion(aComponent);
-    else
-        return rtl::OUString();
-}
-//------------------------------------------------------------------------------
-    
-uno::Sequence< uno::Reference<backenduno::XLayer> > BackendAccess::getLayers(const rtl::OUString& aComponent,const RequestOptions& aOptions) 
-{
-    rtl::OUString aEntity = aOptions.getEntity() ;
-
-    if (aEntity.getLength() == 0) 
-    {
-        // Use own entity instead
-        return mBackend->listOwnLayers(aComponent) ;
-    }
-    else 
-    {
-        return mBackend->listLayers(aComponent, aEntity) ;
-    }
-}
-//------------------------------------------------------------------------------
-void BackendAccess::removeRequestListener(INodeDataListener *aListener,
-                                          const ComponentRequest& aRequest)
-   SAL_THROW(()) 
-{
-    
-    OSL_PRECOND(aListener, "ERROR: trying to remove a NULL listener");
-    mNotifier->removeListener(aListener, aRequest);
-} 
-//------------------------------------------------------------------------------
-} } // configmgr.backend
diff --git a/configmgr/source/backend/backendaccess.hxx b/configmgr/source/backend/backendaccess.hxx
deleted file mode 100644
index 2a53cb7a0f..0000000000
--- a/configmgr/source/backend/backendaccess.hxx
+++ /dev/null
@@ -1,160 +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: backendaccess.hxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_BACKENDACCESS_HXX_
-#define CONFIGMGR_BACKEND_BACKENDACCESS_HXX_
-
-#include "backendnotifier.hxx"
-#include "mergeddataprovider.hxx"
-#include "mergedcomponentdata.hxx"
-#include "matchlocale.hxx"
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/XSchema.hpp>
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include "binarycache.hxx"
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
-
-
-namespace configmgr { namespace backend {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backenduno = css::configuration::backend ;
-
-/**
-  Implementation of IMergedDataProvider handling the access
-  to the configuration data.
-  */
-class BackendAccess : public IMergedDataProvider 
-{
-    public :
-        /**
-          Constructor using an XBackend implementation and a
-          service factory.
-
-          @param xBackend   backend used for access to data
-          @param xContext   uno context for instantiation of services
-          */
-        BackendAccess(  const uno::Reference<backenduno::XBackend>& xBackend,
-                        const uno::Reference<uno::XComponentContext>& xContext) ;
-        /** Destructor */
-        ~BackendAccess(void) ;
-
-        // IMergedDataProvider
-        virtual ResultHolder< ComponentInstance > getNodeData(const ComponentRequest& aRequest,
-                                            ITemplateDataProvider* aTemplateProvider,
-                                            INodeDataListener *aListener = NULL) 
-            SAL_THROW((com::sun::star::uno::Exception)) ;
-        virtual void removeRequestListener(INodeDataListener *aListener,
-                                           const ComponentRequest& aRequest)
-            SAL_THROW(());
-        virtual void updateNodeData(const UpdateRequest& aUpdate)
-            SAL_THROW((com::sun::star::uno::Exception)) ;
-        virtual ResultHolder< NodeInstance > getDefaultData(const NodeRequest& aRequest) 
-            SAL_THROW((com::sun::star::uno::Exception)) ;
-        virtual ResultHolder< TemplateInstance > getTemplateData(const TemplateRequest& aRequest)
-            SAL_THROW((com::sun::star::uno::Exception)) ;
-
-    private :
-        
-        /**
-          Retrieves the schema of a component.
-          */
-        uno::Reference< backenduno::XSchema > getSchema(const rtl::OUString& aComponent) ;
-
-        /**
-          Retrieves the schema version of a component.
-          */
-        rtl::OUString getSchemaVersion(const rtl::OUString& aComponent) ;
-
-        /**
-          Retrieves the layers for a request.
-          */
-        uno::Sequence< uno::Reference<backenduno::XLayer> > getLayers(const rtl::OUString& aComponent,const RequestOptions& aOptions) ;
-        
-        /**
-          Reads merged default data with a given number of layers.
-          */
-        bool readDefaultData( MergedComponentData & aComponentData, 
-                                rtl::OUString const & aComponent, 
-                                RequestOptions const & aOptions,
-                                bool bIncludeTemplates,
-                                const uno::Reference<backenduno::XLayer> * pLayers,
-                                sal_Int32 nNumLayers,                                   
-                                ITemplateDataProvider *aTemplateProvider,
-                                sal_Int32 * pLayersMerged = 0)
-            SAL_THROW((com::sun::star::uno::Exception)); 
-        /**
-          Merges layers onto component data.
-          */
-        void merge(
-                MergedComponentData& aData,
-                const uno::Reference<backenduno::XLayer> * pLayers,
-                sal_Int32 aNumLayers,
-                com::sun::star::lang::Locale const & aRequestedLocale,
-                std::vector< com::sun::star::lang::Locale > & inoutMergedLocales,
-                ITemplateDataProvider *aTemplateProvider,
-                sal_Int32 * pLayersMerged = 0)
-            SAL_THROW((com::sun::star::uno::Exception));
-    private :
-        /**
-          Decides if merging should be retried after an exception.
-
-          @throws com::sun::star::uno::Exception
-            if not approved
-          */
-        bool approveRecovery(
-                const uno::Any & aMergeException,
-                const uno::Reference<backenduno::XLayer>  & aBrokenLayer,
-                bool bUserLayerData)
-            SAL_THROW((com::sun::star::uno::Exception));
-
-    private :
-        /** Get the factory used for service invocation */
-        uno::Reference<lang::XMultiServiceFactory> getServiceFactory() const;
-        /** UNO context to which this backend belongs */
-        uno::Reference<uno::XComponentContext> mContext ;
-        /** Backend being accessed */
-        uno::Reference<backenduno::XBackend> mBackend ;
-        /** Binary cache of default data */
-        BinaryCache mBinaryCache;
-        /** Manages Nofification from the Backends */
-        uno::Reference<backenduno::XBackendChangesListener>  mXNotifier;
-        
-        BackendChangeNotifier * mNotifier;
-        
-} ;
-
-} } // configmgr.backend
-
-#endif // CONFIGMGR_BACKEND_BACKENDACCESS_HXX_
diff --git a/configmgr/source/backend/backendfactory.cxx b/configmgr/source/backend/backendfactory.cxx
deleted file mode 100644
index eda39e38ef..0000000000
--- a/configmgr/source/backend/backendfactory.cxx
+++ /dev/null
@@ -1,332 +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: backendfactory.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_configmgr.hxx"
-
-#include "backendfactory.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include "bootstrapcontext.hxx"
-#include "bootstrap.hxx"
-#include "backendaccess.hxx"
-#include "serviceinfohelper.hxx"
-#include "wrapexception.hxx"
-
-
-#include <com/sun/star/configuration/CannotLoadConfigurationException.hpp>
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include <com/sun/star/configuration/backend/XMultiLayerStratum.hpp>
-
-namespace configmgr
-{
-// -------------------------------------------------------------------------
-    namespace backend
-    {
-// -------------------------------------------------------------------------
-        namespace uno = ::com::sun::star::uno;
-        namespace lang = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -------------------------------------------------------------------------
-const sal_Char k_DefaultBackendWrapper[] = "com.sun.star.comp.configuration.backend.SingleBackendAdapter";
-const sal_Char k_DefaultBackendService[] = "com.sun.star.comp.configuration.backend.LocalSingleBackend";
-
-// -------------------------------------------------------------------------
-const sal_Char k_DefaultBackendServiceAndImplName[]         = K_DefaultBackendServiceAndImplName ;
-
-// -------------------------------------------------------------------------
-const sal_Char k_GenericBackendServiceAndImplName[]         = "com.sun.star.configuration.backend.Backend" ;
-
-// -------------------------------------------------------------------------
-static sal_Char const * const k_BackendServiceNames [] = 
-{
-    k_DefaultBackendServiceAndImplName, 
-    k_GenericBackendServiceAndImplName, 
-    0 
-};
-// -------------------------------------------------------------------------
-static const ServiceRegistrationInfo k_DefaultBackendServiceInfo = 
-{ 
-    k_DefaultBackendServiceAndImplName, 
-    k_BackendServiceNames
-};
-// -------------------------------------------------------------------------
-static const ServiceRegistrationInfo k_GenericBackendServiceInfo = 
-{ 
-    k_GenericBackendServiceAndImplName, 
-    k_BackendServiceNames + 1
-};
-// -------------------------------------------------------------------------
-static const SingletonRegistrationInfo k_DefaultBackendSingletonInfo = 
-{ 
-    K_DefaultBackendSingletonName,
-    k_DefaultBackendServiceAndImplName, 
-    k_DefaultBackendServiceAndImplName, 
-    & k_GenericBackendServiceInfo
-};
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
-const SingletonRegistrationInfo * getDefaultBackendSingletonInfo()       
-{ 
-    return & k_DefaultBackendSingletonInfo; 
-}
-// -------------------------------------------------------------------------
-
-const ServiceRegistrationInfo   * getDefaultBackendServiceInfo() 
-{ 
-    return & k_DefaultBackendServiceInfo; 
-}
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
-
-uno::Reference<uno::XInterface> SAL_CALL 
-    getDefaultBackendSingleton( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const& xContext )
-{ 
-    OSL_ENSURE( xContext.is(), "ERROR: NULL context has no singletons" );
-
-    UnoContextTunnel aTunnel;
-    aTunnel.passthru( xContext );
-    
-    uno::Reference<uno::XInterface> xResult;
-
-    if (xContext.is())
-    try
-    {
-        xContext->getValueByName(SINGLETON(K_DefaultBackendSingletonName))
-            >>= xResult;
-    }
-    catch (uno::Exception & )
-    {
-        // to do: really use the tunneled failure when that is set properly
-        if ( aTunnel.recoverFailure(true).hasValue() )
-        {
-            // have a failure, but can't recover it
-            // -> try to regenerate
-            instantiateDefaultBackend(xContext);
-
-            OSL_ENSURE(false, "Cannot recreate configuration backend instantiation failure - using generic error");
-        }
-        // cannot recover any failure
-        throw;
-    }
-
-    return xResult;
-}
-// -------------------------------------------------------------------------
-
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
-
-static 
-uno::Sequence< uno::Any > createInitArgs(ContextReader const & _aContext) 
-{
-    OSL_ASSERT(_aContext.hasBootstrapContext());
-    uno::Sequence< uno::Any > aResult( 1 );
-    aResult[0] <<= _aContext.getBootstrapContext();
-    return aResult;
-}
-// -------------------------------------------------------------------------
-
-static
-inline
-uno::Reference< uno::XInterface > createService(ContextReader const & _aCtx, uno::Sequence< uno::Any > const & _aInitArgs, rtl::OUString const & _aSvc) 
-{
-    uno::Reference< lang::XMultiComponentFactory > xFactory = _aCtx.getServiceManager();
-    OSL_ENSURE(xFactory.is(),"ERROR: ComponentContext has no service manager\n");
-    if (!xFactory.is()) throw uno::RuntimeException( rtl::OUString::createFromAscii("ERROR: ComponentContext has no service manager\n"), NULL );
-    return xFactory->createInstanceWithArgumentsAndContext( _aSvc, _aInitArgs, _aCtx.getBaseContext());
-}
-// -------------------------------------------------------------------------
-
-static
-uno::Reference< backenduno::XBackend > wrapSingleBackend(ContextReader const & _aSettings, uno::Sequence< uno::Any > const & _aInitArgs, uno::Reference< backenduno::XMultiLayerStratum > const & _xWrappedBackend) 
-{
-    OSL_ASSERT(_aSettings.hasUnoBackendWrapper() || _aSettings.hasBootstrapContext());
-
-    rtl::OUString aWrapperSvc = _aSettings.hasUnoBackendWrapper() ?
-                                _aSettings.getUnoBackendWrapper() :
-                                rtl::OUString::createFromAscii(k_DefaultBackendWrapper);
-
-    OSL_ENSURE (aWrapperSvc.getLength(), "ERROR: No wrapper service for wrapped configuration");
-    OSL_ENSURE (_xWrappedBackend.is(), "ERROR: No backend to wrap for wrapped configuration");
-
-    sal_Int32 const nBaseArgsCount = _aInitArgs.getLength();
-    uno::Sequence< uno::Any > aExtendedArgs( _aInitArgs );
-    aExtendedArgs.realloc( nBaseArgsCount + 1 );
-    aExtendedArgs[nBaseArgsCount] <<= _xWrappedBackend;
-
-    return uno::Reference< backenduno::XBackend >::query( createService(_aSettings,aExtendedArgs,aWrapperSvc) );
-}
-// -------------------------------------------------------------------------
-
-static
-uno::Reference< backenduno::XBackend > createOfflineBackend(ContextReader const & _aSettings, uno::Sequence< uno::Any > const & _aInitArgs) 
-{
-    OSL_ASSERT(_aSettings.hasUnoBackendWrapper() || _aSettings.hasBootstrapContext());
-
-    uno::Reference< backenduno::XBackend > xResult;
-    if ( _aSettings.hasUnoBackendWrapper() )
-    {   
-        rtl::OUString const aWrapperSvc = _aSettings.getUnoBackendWrapper();
-
-        xResult = uno::Reference< backenduno::XBackend >::query( createService(_aSettings,_aInitArgs,aWrapperSvc) );
-    }
-
-    return xResult;
-}
-// -------------------------------------------------------------------------
-
-static
-uno::Reference< uno::XInterface > createRealBackend(ContextReader const & _aSettings, uno::Sequence< uno::Any > const & _aInitArgs) 
-{
-    OSL_ASSERT(_aSettings.hasUnoBackendService() || _aSettings.hasBootstrapContext());
-
-    rtl::OUString const aBackendServiceName = _aSettings.hasUnoBackendService() ?
-                                        _aSettings.getUnoBackendService() :
-                                        rtl::OUString::createFromAscii(k_DefaultBackendService);
-
-    uno::Reference< uno::XInterface > xResult = 
-        createService(_aSettings,_aInitArgs,aBackendServiceName);
-
-    return xResult;
-}
-// -------------------------------------------------------------------------
-
-static
-uno::Reference< backenduno::XBackend > createOnlineBackend(ContextReader const & _aSettings, uno::Sequence< uno::Any > const & _aInitArgs) 
-{
-    OSL_ENSURE( _aSettings.isUnoBackend(), "ERROR - BackendFactory: For legacy backends use createSessionBackend()");
-
-    uno::Reference< backenduno::XBackend > xResult;
-
-    uno::Reference< uno::XInterface > xRealBackend = createRealBackend(_aSettings,_aInitArgs);
-
-    if (_aSettings.hasUnoBackendWrapper())
-    {
-        // try wrapping a single backend
-        uno::Reference< backenduno::XMultiLayerStratum > xSingleRealBackend( xRealBackend, uno::UNO_QUERY);
-        if (xSingleRealBackend.is())
-            xResult = wrapSingleBackend(_aSettings,_aInitArgs,xSingleRealBackend);
-
-        // if we don't have one, try using it as unwrapped backend
-        else
-            xResult.set(xRealBackend, uno::UNO_QUERY);
-    }
-    else
-    {
-         // look for a direct implementation of XBackend
-        xResult.set(xRealBackend, uno::UNO_QUERY);
-        if (!xResult.is())
-        {
-            // try the default wrapper if we only have a single backend
-            uno::Reference< backenduno::XMultiLayerStratum > xSingleRealBackend( xRealBackend, uno::UNO_QUERY);
-            if (xSingleRealBackend.is())
-                xResult = wrapSingleBackend(_aSettings,_aInitArgs,xSingleRealBackend);
-
-            else
-                OSL_ENSURE( !xRealBackend.is(), "Configuration Backend implements no known backend interface" );
-        }
-    }
-
-    return xResult;
-}
-// -------------------------------------------------------------------------
-
-static uno::Reference< backenduno::XBackend > createUnoBackend(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const& _xCtx) 
-{
-    ContextReader aSettings(_xCtx);
-    OSL_ENSURE( aSettings.isUnoBackend(), "ERROR - BackendFactory: Legacy backends are not supported any more");
-
-    uno::Sequence< uno::Any > aArguments = createInitArgs(aSettings);
-
-    sal_Bool bOffline = aSettings.hasOfflineSetting() ? aSettings.getOfflineSetting() : !aSettings.hasUnoBackendService();
-
-    uno::Reference< backenduno::XBackend > xResult;
-    
-    if (!bOffline)
-        xResult = createOnlineBackend (aSettings,aArguments);
-
-    if (!xResult.is())
-        xResult = createOfflineBackend(aSettings,aArguments);
-
-    return xResult;
-}
-// -------------------------------------------------------------------------
-// to do: tunnel and raise fully typed exception information (and use it in the get..Singleton wrappers)
-    #define TUNNEL_ALL_EXCEPTIONS()     \
-        WRAP_CONFIGBACKEND_CREATION_EXCEPTIONS1( UnoContextTunnel::tunnelFailure, true )
-    
-// -------------------------------------------------------------------------
-
-uno::Reference<uno::XInterface> SAL_CALL instantiateDefaultBackend( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const& xTargetContext )
-{
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext = UnoContextTunnel::recoverContext(xTargetContext);
-
-    try
-    {
-        return uno::Reference< uno::XInterface >( createUnoBackend(xContext), uno::UNO_QUERY );
-    }
-    TUNNEL_ALL_EXCEPTIONS()
-
-    OSL_ASSERT(!"unreached");
-    return NULL;
-}
-// -------------------------------------------------------------------------
-
-uno::Reference< backenduno::XBackend > BackendFactory::getUnoBackend()
-{
-    return uno::Reference< backenduno::XBackend >::query( getDefaultBackendSingleton(m_xCtx) );
-}
-// -------------------------------------------------------------------------
-
-rtl::Reference<IMergedDataProvider> BackendFactory::createBackend()
-{
-    rtl::Reference< IMergedDataProvider > xBackend;
-
-    uno::Reference< backenduno::XBackend > xBackendService = this->getUnoBackend();
-
-    if (xBackendService.is())
-        xBackend = new BackendAccess(xBackendService, m_xCtx);
-        
-    return xBackend;
-}
-// -------------------------------------------------------------------------
-
-BackendFactory BackendFactory::instance(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & _xCtx)
-{
-    return BackendFactory(_xCtx);
-}
-
-//-----------------------------------------------------------------------------
-    } // namespace
-//-----------------------------------------------------------------------------
-} // namespace
diff --git a/configmgr/source/backend/backendnotifier.cxx b/configmgr/source/backend/backendnotifier.cxx
deleted file mode 100644
index 2deb007382..0000000000
--- a/configmgr/source/backend/backendnotifier.cxx
+++ /dev/null
@@ -1,198 +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: backendnotifier.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_configmgr.hxx"
-
-#include "backendnotifier.hxx"
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#include "configpath.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-
-
-//----------------------------------------------------------------------------
-BackendChangeNotifier::BackendChangeNotifier(const uno::Reference<backenduno::XBackend>& _xBackend)    
-: m_aMutex()
- ,m_aListeners()
- ,m_aBackend(_xBackend, uno::UNO_QUERY)
-{
-    
-}
-// ---------------------------------------------------------------------------
-
-BackendChangeNotifier::~BackendChangeNotifier()   
-{ 
-    m_aListeners.clear();
-}
-// ---------------------------------------------------------------------------
-void SAL_CALL BackendChangeNotifier::componentDataChanged(const backenduno::ComponentChangeEvent& _aEvent)
-   throw (::com::sun::star::uno::RuntimeException)
-{
-    rtl::OUString aComponentName = _aEvent.Component; 
-    std::map<rtl::OUString, ComponentNotifier>::iterator aIter = 	m_aListeners.find(aComponentName);
-    if(aIter != m_aListeners.end())
-    {
-        aIter->second.notifyListeners(aComponentName);
-    }
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL BackendChangeNotifier::disposing( lang::EventObject const & /*rSource*/ )
-throw (uno::RuntimeException)
-{
-    osl::MutexGuard aListGuard(m_aMutex);
-    if (m_aBackend.is())
-    {
-        m_aBackend.clear();
-    }
-    m_aListeners.clear();
-}
-// -----------------------------------------------------------------------------
-void BackendChangeNotifier::addListener(INodeDataListener * _xListener,  const ComponentRequest& _aRequest) SAL_THROW(())
-{
-    osl::MutexGuard aListGuard(m_aMutex);
-    
-    OSL_PRECOND(_xListener, "ERROR: trying to register a NULL listener");
-    ComponentListener aComponentListener(_xListener, _aRequest.getOptions());
-    
-    const rtl::OUString aComponentName = _aRequest.getComponentName();
-    
-    //Check if we have a Listener registered for that Component
-    std::map<rtl::OUString, ComponentNotifier>::iterator aIter;
-    aIter = m_aListeners.find(aComponentName);
-    if (aIter == m_aListeners.end())
-    {
-        ComponentNotifier aComponentNotifier;
-        aComponentNotifier.addListenerToList(aComponentListener);
-        m_aListeners[aComponentName] = aComponentNotifier;
-        
-        //Now need to register Listener with MultiStratumBackend for that Component
-        if (m_aBackend.is())
-        {
-            m_aBackend->addChangesListener(this, aComponentName);
-        }
-    }
-    else
-    {
-        //Add Listener and Option to ComponentNotifier list
-        aIter->second.addListenerToList(aComponentListener); 
-    
-    }
-    
-}
-// ---------------------------------------------------------------------------
-
-void BackendChangeNotifier::removeListener(INodeDataListener * _xListener, const ComponentRequest& _aRequest) SAL_THROW(())
-{
-    osl::MutexGuard aListGuard(m_aMutex);
-    OSL_PRECOND(!m_aListeners.empty(), 
-        "BackendChangeNotifier:Cannot Remove Listener, no Listeners Registered");
-    OSL_PRECOND(_xListener, "ERROR: trying to remove a NULL listener");
-    
-    std::map<rtl::OUString, ComponentNotifier>::iterator aIter;
-    rtl::OUString aComponentName = _aRequest.getComponentName();
-    
-    aIter = m_aListeners.find(aComponentName);
-    if (aIter == m_aListeners.end())
-    {
-        OSL_TRACE("BackendChangeNotifier: removeListener: no listener registered for component %s",
-                   aComponentName.getStr());
-    }
-    else
-    {
-        ComponentListener aComponentListener(_xListener, _aRequest.getOptions());
-        aIter->second.removeListenerFromList(aComponentListener);
-        if (aIter->second.isListEmpty())
-        {
-            m_aListeners.erase(aIter);
-            //Need all to de-register listeners from the lower layers
-            if (m_aBackend.is())
-            {
-                m_aBackend->removeChangesListener(this, aComponentName);
-            }
-        }
-    }
-    
-}
-// ---------------------------------------------------------------------------
-ComponentNotifier::ComponentNotifier():m_aListenerList()
-{
-}
-// ---------------------------------------------------------------------------
-
-
-void ComponentNotifier::addListenerToList(const ComponentListener& _aListener)
-{
-    m_aListenerList.push_back(_aListener);
-    //REM TO REMOVE
-    ComponentListener aListener = m_aListenerList.front();
-    
-}
-// ---------------------------------------------------------------------------
-void ComponentNotifier::removeListenerFromList(const ComponentListener& _aListener)
-{
-    OSL_PRECOND(!m_aListenerList.empty(), 
-        "ComponentNotifier:Cannot Remove Listener, no Listeners Registered");
-    
-    std::list<ComponentListener>::iterator aIter;
-
-    //Remove first instance that matches in the list
-    aIter = std::find(m_aListenerList.begin(), m_aListenerList.end(),_aListener);
-    if(aIter != m_aListenerList.end())
-    {
-        m_aListenerList.erase(aIter);	
-    }
-}
-// ---------------------------------------------------------------------------
-void ComponentNotifier::notifyListeners(const rtl::OUString& _aComponent)
-{
-    
-    for( std::list<ComponentListener>::iterator aIter = m_aListenerList.begin(); 
-        aIter != m_aListenerList.end(); aIter++)
-    {
-        ComponentRequest aRequest(_aComponent, (*aIter).m_aOptions);
-        
-        (*aIter).m_aListener->dataChanged(aRequest);	
-    }
-
-}
-// ---------------------------------------------------------------------------
-    } // namespace backend
-
-// ---------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/backendnotifier.hxx b/configmgr/source/backend/backendnotifier.hxx
deleted file mode 100644
index 9ab179832c..0000000000
--- a/configmgr/source/backend/backendnotifier.hxx
+++ /dev/null
@@ -1,123 +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: backendnotifier.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 CONFIGMGR_BACKEND_BACKENDNOTIFIER_HXX
-#define CONFIGMGR_BACKEND_BACKENDNOTIFIER_HXX
-
-#include "mergeddataprovider.hxx"
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
-#include <osl/mutex.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-#ifndef INCLUDED_LIST
-#include <list>
-#define INCLUDED_LIST
-#endif
-
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-    namespace uno       = ::com::sun::star::uno;
-    namespace lang      = ::com::sun::star::lang;
-    namespace backenduno = ::com::sun::star::configuration::backend;
-// ---------------------------------------------------------------------------
-    struct ComponentListener
-    {
-        explicit
-        ComponentListener(INodeDataListener * _xListener, RequestOptions _aOptions):
-        m_aListener( _xListener),
-        m_aOptions(_aOptions)
-        {}
-        
-        bool operator==(const ComponentListener& _aListener)const
-        {
-            return ( (&m_aListener == &_aListener.m_aListener)&&
-                     (compareRequestOptions(m_aOptions, _aListener.m_aOptions)== 0) );
-                 
-        }
-        INodeDataListener * m_aListener;
-        RequestOptions m_aOptions;
-    };
-    
-    /** Class used to store ComponentListener(listener and options) 
-    */
-    class ComponentNotifier
-    {
-    public:
-        ComponentNotifier();
-        void addListenerToList(const ComponentListener& _aListener);
-        void removeListenerFromList(const ComponentListener& _aListener);
-        bool isListEmpty(){ return m_aListenerList.empty();}
-        void notifyListeners(const rtl::OUString& _aComponent);
-    private:
-        std::list<ComponentListener> m_aListenerList;
-    };
-    // ---------------------------------------------------------------------------
-    /** Interface providing a multicasting service for changes in the backend 
-     */
-    class BackendChangeNotifier :public cppu::WeakImplHelper1<backenduno::XBackendChangesListener>
-    {
-    public:      
-        BackendChangeNotifier(const uno::Reference<backenduno::XBackend>& _xBackend);
-        ~BackendChangeNotifier();
-        
-        virtual void SAL_CALL componentDataChanged(const backenduno::ComponentChangeEvent& aEvent)
-        throw (::com::sun::star::uno::RuntimeException);
-            
-        virtual void SAL_CALL disposing( lang::EventObject const & rSource )
-            throw (uno::RuntimeException);
-      // notification support. 
-        /// register a listener for observing changes to the cached data
-        void addListener(INodeDataListener * _xListener, const ComponentRequest& _aRequest) SAL_THROW(());
-        /// unregister a listener previously registered
-        void removeListener(INodeDataListener * _xListener, const ComponentRequest& _aRequest) SAL_THROW(());
-    private:
-        osl::Mutex   m_aMutex;
-        std::map<rtl::OUString, ComponentNotifier> m_aListeners;
-        
-        /** Backend being accessed */
-        uno::Reference<backenduno::XBackendChangesNotifier> m_aBackend ;
-    };
-// ---------------------------------------------------------------------------	
- } // namespace backend
-
-// ---------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/backend/backendstratalistener.cxx b/configmgr/source/backend/backendstratalistener.cxx
deleted file mode 100644
index e7de81ca00..0000000000
--- a/configmgr/source/backend/backendstratalistener.cxx
+++ /dev/null
@@ -1,59 +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: backendstratalistener.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_configmgr.hxx"
-#include "backendstratalistener.hxx"
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-    // -----------------------------------------------------------------------------
-        BackendStrataListener::BackendStrataListener(const MultiStratumBackend& aBackend)
-            :mBackend(aBackend)
-        {}
-        BackendStrataListener:: ~BackendStrataListener(){}
-
-        void SAL_CALL BackendStrataListener::componentDataChanged(const backenduno::ComponentChangeEvent& aEvent)
-        throw (::com::sun::star::uno::RuntimeException)
-        {
-            
-            mBackend.notifyListeners(aEvent);
-                
-        }
-        // -----------------------------------------------------------------------------
-        void SAL_CALL BackendStrataListener::disposing( lang::EventObject const & /*rSource*/ )
-        throw (uno::RuntimeException)
-        {
-        
-        }
-    }
-}
diff --git a/configmgr/source/backend/backendstratalistener.hxx b/configmgr/source/backend/backendstratalistener.hxx
deleted file mode 100644
index 72a4b9cc34..0000000000
--- a/configmgr/source/backend/backendstratalistener.hxx
+++ /dev/null
@@ -1,77 +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: backendstratalistener.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 CONFIGMGR_BACKEND_BACKENDSTRATALISTENER_HXX
-#define CONFIGMGR_BACKEND_BACKENDSTRATALISTENER_HXX
-
-#include <com/sun/star/configuration/backend/XBackendChangesListener.hpp>
-#include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-#include "backendnotifier.hxx"
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include "multistratumbackend.hxx"
-
-
-#include <cppuhelper/implbase1.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-
-        namespace backenduno = ::com::sun::star::configuration::backend;
-        // --------------------------------------------------------------------------
-        class BackendStrataListener: public cppu::WeakImplHelper1<backenduno::XBackendChangesListener>
-        {
-        public:
-            BackendStrataListener(const MultiStratumBackend& aBackend);
-            ~BackendStrataListener();
-            virtual void SAL_CALL componentDataChanged(const backenduno::ComponentChangeEvent& aEvent)
-            throw (::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL disposing( lang::EventObject const & rSource )
-            throw (uno::RuntimeException);
-        private:
-             const MultiStratumBackend& mBackend ;
-
-        };
-
-
-
-    }
-    // -----------------------------------------------------------------------------
-}
-// -----------------------------------------------------------------------------
-#endif
diff --git a/configmgr/source/backend/basicimporthandler.cxx b/configmgr/source/backend/basicimporthandler.cxx
deleted file mode 100644
index 2cbf3cc41b..0000000000
--- a/configmgr/source/backend/basicimporthandler.cxx
+++ /dev/null
@@ -1,117 +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: basicimporthandler.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_configmgr.hxx"
-
-#include "basicimporthandler.hxx"
-#include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-BasicImportHandler::BasicImportHandler(
-    uno::Reference< backenduno::XBackend > const & xBackend,rtl::OUString const & aEntity, const sal_Bool&  bNotify)       
-: m_bSendNotification(bNotify)
-, m_xBackend(xBackend)
-, m_aComponentName()
-, m_aEntity(aEntity)
-{
-    OSL_ENSURE( m_xBackend.is(), "Creating an import handler without a target backend" );
-}
-// -----------------------------------------------------------------------------
-
-BasicImportHandler::~BasicImportHandler()
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    BasicImportHandler::startLayer(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    m_aComponentName = rtl::OUString();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    BasicImportHandler::endLayer(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if ( m_bSendNotification)
-    {
-        backenduno::ComponentChangeEvent aEvent;
-        aEvent.Source=*this;
-        aEvent.Component = m_aComponentName;
-        
-        uno::Reference<backenduno::XBackendChangesListener> xListener(m_xBackend, uno::UNO_QUERY);
-        if( xListener.is())
-        {
-            xListener->componentDataChanged(aEvent);
-        }
-        else
-        {
-            OSL_ENSURE(false, "ImportMergeHandler: target backend does not support notifications");
-        }
-    }
-    m_aComponentName = rtl::OUString();
-}
-// -----------------------------------------------------------------------------
-
-bool BasicImportHandler::startComponent( const rtl::OUString& aName ) 
-{
-    if (hasComponent()) return false;
-
-    m_aComponentName = aName;
-    return true;
-}
-// -----------------------------------------------------------------------------
-            
-void BasicImportHandler::raiseMalformedDataException(sal_Char const * pMsg)
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-
-    throw backenduno::MalformedDataException(sMsg, *this, uno::Any());
-}
-// -----------------------------------------------------------------------------
-        
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/basicimporthandler.hxx b/configmgr/source/backend/basicimporthandler.hxx
deleted file mode 100644
index b62eb0bf3f..0000000000
--- a/configmgr/source/backend/basicimporthandler.hxx
+++ /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: basicimporthandler.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 CONFIGMGR_BACKEND_BASICIMPORTHANDLER_HXX
-#define CONFIGMGR_BACKEND_BASICIMPORTHANDLER_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno        = ::com::sun::star::uno;
-        namespace lang       = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class BasicImportHandler : public cppu::WeakImplHelper1< backenduno::XLayerHandler >
-        {
-        public:
-            explicit
-            BasicImportHandler(){}
-            
-            BasicImportHandler(uno::Reference< backenduno::XBackend > const & xBackend,rtl::OUString const & aEntity = rtl::OUString(), const sal_Bool& bNofity= sal_False);       
-            ~BasicImportHandler();
-
-        // XLayerHandler subset - call these implementations from your derived class implementations
-        protected:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-        protected:
-            bool hasComponent() const { return m_aComponentName.getLength() != 0; }
-            bool hasEntity()    const { return m_aEntity.getLength() != 0; }
-
-            rtl::OUString getComponent() const { return m_aComponentName; }
-            rtl::OUString getEntity()    const { return m_aEntity; }
-            uno::Reference< backenduno::XBackend >  getBackend()   const { return m_xBackend; }
-
-            bool startComponent( const rtl::OUString& aName );
-
-            void raiseMalformedDataException(sal_Char const * pMsg);
-            /** If True, notification should be send to backend 
-            */
-            sal_Bool        m_bSendNotification;
-        private:
-            uno::Reference< backenduno::XBackend > const   m_xBackend;
-            rtl::OUString        m_aComponentName;
-            rtl::OUString const  m_aEntity;
-           
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/basicupdatemerger.cxx b/configmgr/source/backend/basicupdatemerger.cxx
deleted file mode 100644
index 205a062651..0000000000
--- a/configmgr/source/backend/basicupdatemerger.cxx
+++ /dev/null
@@ -1,341 +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: basicupdatemerger.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_configmgr.hxx"
-
-#include "basicupdatemerger.hxx"
-#include "layerdefaultremover.hxx"
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#ifndef INCLUDED_ITERATOR
-#include <iterator>
-#define INCLUDED_ITERATOR
-#endif
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-BasicUpdateMerger::BasicUpdateMerger( uno::Reference< backenduno::XLayer > const & _xSourceLayer )
-: m_xSourceLayer(_xSourceLayer)
-, m_xResultHandler()
-, m_nNesting(0)
-, m_bSkipping(false)    
-{
-}
-// -----------------------------------------------------------------------------
-
-BasicUpdateMerger::~BasicUpdateMerger()
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::readData( uno::Reference< backenduno::XLayerHandler > const & _xResultHandler ) 
-    throw ( backenduno::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!_xResultHandler.is())
-    {
-        rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("UpdateMerger: Error - NULL output handler unexpected") );
-        throw lang::NullPointerException(sMsg,*this);
-    }
-    if (!m_xSourceLayer.is())
-    {
-        rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("UpdateMerger: Error - No source layer set") );
-        throw lang::NullPointerException(sMsg,*this);
-    }
-    
-    try
-    {
-        m_xResultHandler = new LayerDefaultRemover(_xResultHandler);
-        m_xSourceLayer->readData( this );
-    }
-    catch (uno::Exception & )
-    {
-        m_xResultHandler.clear();
-        throw;
-    }
-
-    m_xResultHandler.clear();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::startLayer(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (m_nNesting)
-        raiseMalformedDataException("UpdateMerger: Cannot start layer - layer already in progress");
-
-    m_bSkipping = false;
-
-    m_xResultHandler->startLayer();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::endLayer(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (m_nNesting > 0)
-        raiseMalformedDataException("UpdateMerger: Cannot end layer - data handling still in progress");
-
-    this->flushContext();
-
-    m_xResultHandler->endLayer();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->overrideNode(aName, aAttributes, bClear);
-
-    pushLevel(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->addOrReplaceNode(aName, aAttributes);
-
-    pushLevel(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->addOrReplaceNodeFromTemplate(aName, aTemplate, aAttributes);
-
-    pushLevel(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::endNode(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->endNode();
-
-    popLevel();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::dropNode( const rtl::OUString& aName ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->dropNode(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->overrideProperty(aName, aAttributes, aType, bClear);
-
-    pushLevel( rtl::OUString() ); // do not match context path to property names
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::endProperty(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->endProperty();
-
-    popLevel();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::setPropertyValue( const uno::Any& aValue ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->setPropertyValue(aValue);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->setPropertyValueForLocale(aValue,aLocale);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->addProperty(aName, aAttributes, aType);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicUpdateMerger::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isSkipping())
-        m_xResultHandler->addPropertyWithValue(aName, aAttributes, aValue);
-}
-// -----------------------------------------------------------------------------
-            
-void BasicUpdateMerger::raiseMalformedDataException(sal_Char const * pMsg)
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-
-    throw backenduno::MalformedDataException(sMsg, *this, uno::Any());
-}
-// -----------------------------------------------------------------------------
-
-void BasicUpdateMerger::startSkipping()
-{
-    OSL_PRECOND( m_nNesting == 0, "BasicUpdateMerger: starting to skip, while already forwarding data");
-    m_nNesting = 1;
-    m_bSkipping = true;
-    OSL_POSTCOND( isHandling(), "BasicUpdateMerger: isHandling() is broken");
-    OSL_POSTCOND( isSkipping(), "BasicUpdateMerger: isSkipping() is broken");
-}
-// -----------------------------------------------------------------------------
-        
-
-void BasicUpdateMerger::pushLevel(rtl::OUString const & _aContext)
-{
-    if (m_nNesting > 0) 
-    {
-        ++m_nNesting;
-        OSL_POSTCOND( isHandling(), "BasicUpdateMerger: level counting is broken" );
-    }
-    else if (m_nNesting < 0) 
-    {
-        OSL_POSTCOND( isHandling(), "BasicUpdateMerger: level counting is broken" );
-    }
-    else if (m_aSearchPath.empty())
-    {
-        ++m_nNesting;
-        OSL_POSTCOND( isHandling(), "BasicUpdateMerger: level counting is broken" );
-    }
-    else if ( m_aSearchPath.back().equals(_aContext) ) // search path is reverse - see findContext()
-    {
-        OSL_ENSURE( m_nNesting == 0, "BasicUpdateMerger: level count while searching must be zero");
-                
-        m_aSearchPath.pop_back();
-    }
-    else // start forwarding
-    {
-        m_nNesting = 1;
-        OSL_POSTCOND( isHandling(), "BasicUpdateMerger: level counting is broken" );
-        OSL_POSTCOND(!isSkipping(), "BasicUpdateMerger: skip flag set while searching " );
-    }
-}
-// -----------------------------------------------------------------------------
-        
-void BasicUpdateMerger::popLevel()
-{
-    OSL_PRECOND( isHandling(), "BasicUpdateMerger: ending a node that wasn't handled here");
-    if (m_nNesting > 0) 
-    {
-        if (--m_nNesting == 0)
-            m_bSkipping = false;
-    }
-    else if (m_nNesting == 0) // ending a context level, but the context is not yet gone
-    {
-        OSL_ENSURE( !m_aSearchPath.empty(), "BasicUpdateMerger: flushing a context that was already found");
-        flushContext();
-        leaveContext();
-    }
-    else
-    {
-        OSL_ENSURE( m_aSearchPath.empty(), "BasicUpdateMerger: Left an unfinished context" );
-    }
-}
-// -----------------------------------------------------------------------------
-        
-void BasicUpdateMerger::findContext(std::vector<rtl::OUString> const & _aContext)
-{
-    // make the context a *reverse* copy of the context path
-    OSL_PRECOND( ! isHandling(), "BasicUpdateMerger: starting context search while still handling data");
-    m_aSearchPath.clear();
-    m_aSearchPath.reserve(_aContext.size());
-    std::copy( _aContext.rbegin(), _aContext.rend(), std::back_inserter(m_aSearchPath) );
-}
-// -----------------------------------------------------------------------------
-        
-void BasicUpdateMerger::leaveContext()
-{
-    OSL_PRECOND( !isHandling(), "BasicUpdateMerger: ending the context while still handling data or seaching the context");
-
-    // force
-    m_nNesting = -1;
-
-    OSL_POSTCOND( ! isSkipping(), "BasicUpdateMerger: ending the context node while still skipping data");
-    OSL_POSTCOND( isHandling(), "BasicUpdateMerger: cannot mark context as being handled to the end.");
-}
-// -----------------------------------------------------------------------------
-        
-void BasicUpdateMerger::flushContext()
-{
-    std::vector<rtl::OUString>::size_type nNesting = m_aSearchPath.size();
-
-    while (!m_aSearchPath.empty())
-    {
-        m_xResultHandler->overrideNode(m_aSearchPath.back(), 0, false);
-        m_aSearchPath.pop_back();
-    }
-    this->flushUpdate();
-
-    while (nNesting > 0)
-    {
-        m_xResultHandler->endNode();
-        --nNesting;
-    }
-}
-// -----------------------------------------------------------------------------
-        
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/basicupdatemerger.hxx b/configmgr/source/backend/basicupdatemerger.hxx
deleted file mode 100644
index e4c233f6e1..0000000000
--- a/configmgr/source/backend/basicupdatemerger.hxx
+++ /dev/null
@@ -1,160 +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: basicupdatemerger.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 CONFIGMGR_BACKEND_BASICUPDATEMERGER_HXX
-#define CONFIGMGR_BACKEND_BASICUPDATEMERGER_HXX
-
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class BasicUpdateMerger : public cppu::WeakImplHelper2< backenduno::XLayerHandler, backenduno::XLayer >
-        {
-        public:
-            explicit
-            BasicUpdateMerger(uno::Reference< backenduno::XLayer > const & _xSourceLayer);       
-            ~BasicUpdateMerger();
-
-        // XLayerHandler
-        protected:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-        
-        // XLayer
-        protected:
-            virtual void SAL_CALL 
-                readData( const uno::Reference< backenduno::XLayerHandler >& aHandler ) 
-                    throw (backenduno::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException);
-
-        // new overrideable    
-        private:   
-            /// write the whole update to the output 
-            virtual void flushUpdate() = 0;
-
-        protected:
-            bool isHandling() const { return m_nNesting != 0 || !m_aSearchPath.empty(); }
-            bool isSkipping() const { return m_bSkipping; }
-            void startSkipping();
-
-            void findContext(std::vector<rtl::OUString> const & _aContext);
-            void leaveContext();
-            
-            uno::Reference< backenduno::XLayerHandler > getResultWriter() const { return m_xResultHandler; };
-
-            void raiseMalformedDataException(sal_Char const * pMsg);
-        private:
-            void pushLevel(rtl::OUString const & _aLevel);
-            void popLevel();
-
-            void flushContext();
-        private:
-            uno::Reference< backenduno::XLayer >     m_xSourceLayer;
-            uno::Reference< backenduno::XLayerHandler >   m_xResultHandler;
-            std::vector<rtl::OUString>     m_aSearchPath;
-
-            sal_Int16   m_nNesting;
-            bool        m_bSkipping;  
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/binarycache.cxx b/configmgr/source/backend/binarycache.cxx
deleted file mode 100644
index 005e418a0b..0000000000
--- a/configmgr/source/backend/binarycache.cxx
+++ /dev/null
@@ -1,251 +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: binarycache.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_configmgr.hxx"
-
-#include "binarycache.hxx"
-
-#include "binaryreadhandler.hxx"
-#include "binarywritehandler.hxx"
-
-#include "mergedcomponentdata.hxx"
-#include "filehelper.hxx"
-#include "typeconverter.hxx"
-
-#ifndef _CONFIGMGR_BOOTSTRAP_HXX
-#include "bootstrap.hxx"
-#endif
-#include <osl/file.hxx>
-#include "tools/getprocessworkingdir.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
-
-#define RTL_LOGFILE_OU2A(rtlOUString)	(::rtl::OUStringToOString((rtlOUString), RTL_TEXTENCODING_ASCII_US).getStr())
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        const rtl::OUString aSettingName(
-                RTL_CONSTASCII_USTRINGPARAM( CONTEXT_ITEM_PREFIX_ "CacheUrl"));
-        // ---------------------------------------------------------------------------------------
-        static inline bool isValidFileURL (rtl::OUString const& _sFileURL)
-        {
-            rtl::OUString sSystemPath;
-            return _sFileURL.getLength() && (osl::File::E_None == osl::File::getSystemPathFromFileURL(_sFileURL, sSystemPath));
-        }
-        // -----------------------------------------------------------------------------
-        // ---------------------------------------------------------------------------------------
-        static 
-        bool implEnsureAbsoluteURL(rtl::OUString & _rsURL) // also strips embedded dots etc.
-        {
-            if (!_rsURL.getLength())
-                return false;
-
-            if (!isValidFileURL(_rsURL))
-            {
-                OSL_TRACE("Binary cache: File URL %s is invalid.",
-                            rtl::OUStringToOString(_rsURL,RTL_TEXTENCODING_ASCII_US).getStr());
-                return false;
-            }
-        
-            rtl::OUString sBasePath;
-            OSL_VERIFY(tools::getProcessWorkingDir(&sBasePath));
-
-            rtl::OUString sAbsolute;
-            if ( osl::File::E_None == osl::File::getAbsoluteFileURL(sBasePath, _rsURL, sAbsolute))
-            {
-                _rsURL = sAbsolute;
-                return isValidFileURL(_rsURL);
-            }
-            else
-            {
-                OSL_ENSURE(!isValidFileURL(_rsURL), "Could not get absolute file URL for valid URL");
-                return false;
-            }
-        }
-        // ---------------------------------------------------------------------------------------
-        static const sal_Unicode kComponentSeparator = '.' ;
-        static const sal_Unicode kPathSeparator = '/' ;
-        static const char kBinarySuffix[] = ".dat" ;
-
-        rtl::OUString BinaryCache::getCacheFileURL(const rtl::OUString& aComponent) const
-        {
-            rtl::OUStringBuffer retCode (mBaseURL);
-            retCode.append(kPathSeparator) ;
-        //	retCode.append(aComponent.replace(kComponentSeparator, kPathSeparator)) ;
-            retCode.append(aComponent) ;
-            retCode.appendAscii(RTL_CONSTASCII_STRINGPARAM(kBinarySuffix));
-
-            rtl::OUString aResult = retCode.makeStringAndClear() ;	
-
-            if (isValidFileURL(aResult))
-            {
-                return aResult;
-            }
-            else
-            {
-                OSL_ENSURE(false, "Component File URL is invalid");
-                return rtl::OUString();
-            }
-        }
-        // -----------------------------------------------------------------------------
-        BinaryCache::BinaryCache(const uno::Reference<uno::XComponentContext>& xContext ) 
-        : mBaseURL()
-        , mOwnerEntity()
-        , mbCacheEnabled(false)
-        {
-            
-            //initialise the base URL
-            ContextReader aReader(xContext);
-
-            rtl::OUString sCacheUrl;
-            if (!aReader.isAdminService())
-            {
-                        mbCacheEnabled = (aReader.getBestContext()->getValueByName(aSettingName) >>= sCacheUrl) 
-                                        && implEnsureAbsoluteURL(sCacheUrl);
-                    }
-
-                    if (mbCacheEnabled)
-                    {
-                        mBaseURL = sCacheUrl;
-                if (!FileHelper::dirExists(sCacheUrl))
-                {
-                    osl::File::RC errorCode = FileHelper::mkdirs(sCacheUrl);	  
-                    if (errorCode) 
-                                {
-#if (OSL_DEBUG_LEVEL > 0)
-                                    rtl::OString sURL = rtl::OUStringToOString(sCacheUrl,RTL_TEXTENCODING_ASCII_US);
-                        rtl::OString sErr = rtl::OUStringToOString(FileHelper::createOSLErrorString(errorCode),RTL_TEXTENCODING_ASCII_US);
-                                        ::osl_trace("Configuration: Cannot create cache directory \"%s\". "
-                                   "Error is %s [%d]",sURL.getStr(),sErr.getStr(),int(errorCode)) ;
-#endif				
-                                    mbCacheEnabled = false;
-                    }
-                }
-                }
-        }
-        // -----------------------------------------------------------------------------
-        
-        void BinaryCache::setOwnerEntity(const rtl::OUString & aOwnerEntity) 
-        {
-            OSL_PRECOND(mOwnerEntity.getLength() == 0, "Owner entity of cache already set");
-            mOwnerEntity = aOwnerEntity;
-        }
-        // -----------------------------------------------------------------------------
-        
-        void BinaryCache::disableCache() 
-        {
-            mbCacheEnabled = false;
-        }
-        // -----------------------------------------------------------------------------
-
-        bool BinaryCache::isCacheEnabled(rtl::OUString const & aEntity) const
-        { 
-            if (!mbCacheEnabled) return false;
-
-            // default entity is empty
-            if (aEntity.getLength() == 0) return true;
-
-            return aEntity.equals(mOwnerEntity); 
-        }
-        // -----------------------------------------------------------------------------
-        bool BinaryCache::readComponentData(MergedComponentData & aComponentData, 
-                                uno::Reference< lang::XMultiServiceFactory > const & aFactory,
-                                rtl::OUString const & aComponent, 
-                                rtl::OUString const & aSchemaVersion, 
-                                rtl::OUString const & aEntity,
-                                com::sun::star::lang::Locale const & aRequestedLocale,
-                                std::vector< com::sun::star::lang::Locale > & outKnownLocales,
-                                const uno::Reference<backenduno::XLayer> * pLayers,
-                                sal_Int32 nNumLayers,
-                                bool bIncludeTemplates)
-        {
-            if (isCacheEnabled(aEntity))
-            try
-            {
-                RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::BinaryCache", "jb99855", "configmgr: BinaryCache::readComponentData() - enabled");
-                BinaryReadHandler aCacheReader(getCacheFileURL(aComponent),aComponent,aFactory);
-                
-                // #i49148# Invalidate cache when schema version changes - using former 'owner' parameter for version
-                if(aCacheReader.validateHeader(pLayers, nNumLayers, aSchemaVersion, aRequestedLocale, outKnownLocales))
-                {
-                    RTL_LOGFILE_CONTEXT_AUTHOR(aLog1, "configmgr::backend::BinaryCache", "jb99855", "configmgr: BinaryCache::readComponentData() - cache hit");
-                    aComponentData.setSchemaRoot( aCacheReader.readComponentTree() );
-                    if (bIncludeTemplates)
-                        aComponentData.setTemplatesTree( aCacheReader.readTemplatesTree() );
-                    return true;
-                }
-            }
-            catch (uno::Exception & e)
-            {
-                OSL_TRACE("Binary Cache read failed - exception: %s", rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_ASCII_US).getStr());
-            }
-            return false;
-        }
-        // -----------------------------------------------------------------------------
-
-        bool BinaryCache::writeComponentData(MergedComponentData const & aComponentData, 
-                                uno::Reference< lang::XMultiServiceFactory > const & aFactory,
-                                rtl::OUString const & aComponent, 
-                                rtl::OUString const & aSchemaVersion, 
-                                rtl::OUString const & aEntity,
-                                std::vector< com::sun::star::lang::Locale > const & aKnownLocales,
-                                const uno::Reference<backenduno::XLayer> * pLayers,
-                                sal_Int32 nNumLayers)
-        {
-            if (isCacheEnabled(aEntity))
-            try
-            {
-                RTL_LOGFILE_CONTEXT_AUTHOR(aLog3, "configmgr::backend::BinaryCache", "jb99855", "configmgr: BinaryCache::writeComponentData() - enabled");
-                BinaryWriteHandler aCacheWriter(getCacheFileURL(aComponent),aComponent, aFactory);
-                
-                //write data to cache
-                // #i49148# Invalidate cache when schema version changes - using former 'owner' parameter for schema
-                if (aCacheWriter.generateHeader(pLayers, nNumLayers, aSchemaVersion, aKnownLocales))
-                {
-                    aCacheWriter.writeComponentTree(aComponentData.getSchemaTree());
-                    aCacheWriter.writeTemplatesTree(aComponentData.getTemplatesTree());
-                    return true;
-                }
-            }
-            catch (uno::Exception & e)
-            {
-                OSL_TRACE("Configuration: Cache write failed - exception: %s", rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_ASCII_US).getStr());
-            }
-            return false;
-        }
-        // -----------------------------------------------------------------------------
-
-    }
-// -----------------------------------------------------------------------------
-}
diff --git a/configmgr/source/backend/binarycache.hxx b/configmgr/source/backend/binarycache.hxx
deleted file mode 100644
index f4506a12b1..0000000000
--- a/configmgr/source/backend/binarycache.hxx
+++ /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: binarycache.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 CONFIGMGR_BINARYCACHE_HXX
-#define CONFIGMGR_BINARYCACHE_HXX
-
-#include "matchlocale.hxx"
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace css = com::sun::star ;
-        namespace uno  = css::uno ;
-        namespace lang = css::lang ;
-        namespace backenduno = css::configuration::backend  ;
-        
-        // -----------------------------------------------------------------------------
-        class MergedComponentData;
-
-        // -----------------------------------------------------------------------------
-        
-        class BinaryCache
-        {
-        public:
-            explicit
-            BinaryCache(const uno::Reference<uno::XComponentContext>& xContext);
-            
-            void setOwnerEntity(rtl::OUString const & aOwnerEntity);
-            void disableCache();
-
-            bool isCacheEnabled(rtl::OUString const & aEntity) const;
-            
-            rtl::OUString getCacheFileURL(rtl::OUString const & aComponent) const;
-
-            bool readComponentData(MergedComponentData & aComponentData, 
-                                    uno::Reference< lang::XMultiServiceFactory > const & aFactory,
-                                    rtl::OUString const & aComponent, 
-                                    rtl::OUString const & aSchemaVersion, 
-                                    rtl::OUString const & aEntity,
-                                    com::sun::star::lang::Locale const & aRequestedLocale,
-                                    std::vector< com::sun::star::lang::Locale > & outKnownLocales,
-                                    const uno::Reference<backenduno::XLayer> * pLayers,
-                                    sal_Int32 nNumLayers,
-                                    bool bIncludeTemplates = true);
-
-            bool writeComponentData(MergedComponentData const & aComponentData, 
-                                    uno::Reference< lang::XMultiServiceFactory > const & aFactory,
-                                    rtl::OUString const & aComponent, 
-                                    rtl::OUString const & aSchemaVersion, 
-                                    rtl::OUString const & aEntity,
-                                    std::vector< com::sun::star::lang::Locale > const & aKnownLocales,
-                                    const uno::Reference<backenduno::XLayer> * pLayers,
-                                    sal_Int32 nNumLayers);
-        private:
-            rtl::OUString mBaseURL;
-            rtl::OUString mOwnerEntity;
-            bool mbCacheEnabled;
-        };
-
-    // -----------------------------------------------------------------------------------
-    // helper for cache reader implementations - see backendaccess.cxx for implementation
-        uno::Sequence< rtl::OUString >
-            getAvailableLocales(const uno::Reference<backenduno::XLayer> * pLayers, sal_Int32 nNumLayers);
-    // -----------------------------------------------------------------------------------
-    }
-// -----------------------------------------------------------------------------------
-}
-
-#endif // 
-
diff --git a/configmgr/source/backend/binaryreader.cxx b/configmgr/source/backend/binaryreader.cxx
deleted file mode 100644
index fcf971a8ba..0000000000
--- a/configmgr/source/backend/binaryreader.cxx
+++ /dev/null
@@ -1,693 +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: binaryreader.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_configmgr.hxx"
-
-#include "binaryreader.hxx"
-#include "binarytype.hxx"
-#include "valuenode.hxx"
-#include "filehelper.hxx"
-#include "oslstream.hxx"
-
-
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XDataInputStream.hpp>
-#include <com/sun/star/io/XDataOutputStream.hpp>
-#include <com/sun/star/io/BufferSizeExceededException.hpp>
-#include <com/sun/star/io/UnexpectedEOFException.hpp>
-
-#include <cppuhelper/implbase1.hxx>
-#include <osl/file.hxx>
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#include "tracer.hxx"
-
-#define ASCII(x) rtl::OUString::createFromAscii(x)
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace uno = com::sun::star::uno;
-        namespace io = com::sun::star::io;
-
-
-        // --------------------------------------------------------------------------
-
-        inline rtl::OUString ErrorToMessage_Impl (osl::FileBase::RC eError)
-        {
-            return FileHelper::createOSLErrorString (eError);
-        }
-
-        // --------------------------------------------------------------------------
-
-        class BinaryReader_Impl :
-            public cppu::WeakImplHelper1< com::sun::star::io::XDataInputStream > 
-        {
-        public:
-            /** Construction.
-            */
-            explicit BinaryReader_Impl (rtl::OUString const & rFileUrl)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            /** XInputStream.
-            */
-            virtual sal_Int32 SAL_CALL readBytes (
-                uno::Sequence<sal_Int8> & rData, sal_Int32 nBytesToRead)
-                throw (
-                    io::NotConnectedException,
-                    io::BufferSizeExceededException,
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Int32 SAL_CALL readSomeBytes (
-                uno::Sequence<sal_Int8> & rData, sal_Int32 nBytesToRead)
-                throw (
-                    io::NotConnectedException,
-                    io::BufferSizeExceededException,
-                    io::IOException, uno::RuntimeException);
-
-            virtual void SAL_CALL skipBytes (sal_Int32 nBytesToSkip)
-                throw (
-                    io::NotConnectedException,
-                    io::BufferSizeExceededException,
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Int32 SAL_CALL available()
-                throw (
-                    io::NotConnectedException,
-                    io::IOException, uno::RuntimeException);
-
-            virtual void SAL_CALL closeInput()
-                throw (
-                    io::NotConnectedException,
-                    io::IOException, uno::RuntimeException);
-
-
-            /** XDataInputStream.
-            */
-            virtual sal_Int8 SAL_CALL readBoolean()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Int8 SAL_CALL readByte()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Unicode SAL_CALL readChar()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Int16 SAL_CALL readShort()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Int32 SAL_CALL readLong()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual sal_Int64 SAL_CALL readHyper()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual float SAL_CALL readFloat()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual double SAL_CALL readDouble()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-            virtual rtl::OUString SAL_CALL readUTF()
-                throw (
-                    io::IOException, uno::RuntimeException);
-
-        protected:
-            /** Destruction.
-            */
-            virtual ~BinaryReader_Impl();
-
-        private:
-            sal_uInt32 checkAvail(); // may throw NotConnectedException
-            sal_uInt32 getMaxAvail(sal_Int32 nRequest); // may throw NotConnectedException, BufferSizeExceededException
-            sal_uInt8 const * readBuffer(sal_uInt32 nRequired); // may throw NotConnectedException, UnexpectedEOFException
-        private:
-            /** Representation.
-            */
-            sal_uInt8 * m_pBuffer;
-            sal_uInt32  m_nLength;
-            sal_uInt32  m_nOffset;
-
-            /** Not implemented.
-            */
-            BinaryReader_Impl (const BinaryReader_Impl&);
-            BinaryReader_Impl& operator= (const BinaryReader_Impl&);
-    };
-
-    // --------------------------------------------------------------------------
-    static inline void checkIOError(osl::File::RC errcode)
-    {
-        if (errcode != osl::FileBase::E_None)
-        {
-            throw io::IOException (ErrorToMessage_Impl (errcode), NULL);
-        }
-    }
-    static void raiseBufferError()
-    {
-        rtl::OUString sMsg = rtl::OUString::createFromAscii("Cannot allocate Buffer: Too large");
-        throw io:: BufferSizeExceededException(sMsg, NULL);
-    }
-    // -------------------------------------------------------------------------
-        BinaryReader_Impl::BinaryReader_Impl (rtl::OUString const & rFileUrl)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        : m_pBuffer (0)
-        , m_nLength (0)
-        , m_nOffset (0)
-        {
-            osl::File aFile (rFileUrl);
-
-            checkIOError( aFile.open (OpenFlag_Read) );
-            sal_uInt64 nLength = 0;
-            checkIOError( aFile.getSize (nLength) );
-            if (nLength > 0xffffffff)
-                raiseBufferError();
-            m_nLength = sal_uInt32(nLength);
-
-            sal_uInt8 *pBuffer = static_cast<sal_uInt8*>(rtl_allocateMemory (m_nLength));
-            if (!pBuffer)
-                raiseBufferError();
-
-            sal_uInt64 nRead = 0;
-            osl::File::RC result = aFile.read (pBuffer, nLength, nRead);
-            if (result != osl::FileBase::E_None)
-            {
-                rtl_freeMemory (pBuffer);
-                checkIOError( result );
-            }
-            if (nRead != nLength)
-            {
-                rtl_freeMemory (pBuffer);
-                rtl::OUString sMsg = rtl::OUString::createFromAscii("BinaryCache - Could not read entire size of file: ");
-                throw io::UnexpectedEOFException(sMsg.concat(rFileUrl),NULL);
-            }
-            m_pBuffer = pBuffer;
-        }
-
-        // --------------------------------------------------------------------------
-
-        BinaryReader_Impl::~BinaryReader_Impl()
-        {
-            if (m_pBuffer) rtl_freeMemory (m_pBuffer);
-        }
-
-        // --------------------------------------------------------------------------
-        // XInputStream implementation.
-        // --------------------------------------------------------------------------
-        sal_uInt32 BinaryReader_Impl::checkAvail ()
-        {
-            if (!m_pBuffer)
-            {
-                rtl::OUString sMsg = rtl::OUString::createFromAscii("BinaryCache - Stream is not open. No data available for reading.");
-                throw io::NotConnectedException(sMsg,*this);
-            }
-            OSL_ASSERT(m_nLength >= m_nOffset);
-              return m_nLength - m_nOffset;
-        }
-        // --------------------------------------------------------------------------
-
-        sal_uInt32 BinaryReader_Impl::getMaxAvail (sal_Int32 nRequest)
-        {
-            if (nRequest < 0)
-            {
-                rtl::OUString sMsg = rtl::OUString::createFromAscii("BinaryCache - Invalid read request - negative byte count requested.");
-                throw io::BufferSizeExceededException(sMsg,*this);
-            }
-            sal_uInt32 const uRequest = sal_uInt32(nRequest);
-            sal_uInt32 const uAvail = checkAvail ();
-            return std::min(uRequest,uAvail);
-        }
-        // --------------------------------------------------------------------------
-
-        sal_uInt8 const * BinaryReader_Impl::readBuffer (sal_uInt32 nRequest)
-        {
-            sal_uInt32 const nAvail = checkAvail ();
-            if (nRequest > nAvail)
-            {
-                rtl::OUString sMsg = rtl::OUString::createFromAscii("BinaryCache - Invalid file format - read past end-of-file.");
-                throw io::UnexpectedEOFException(sMsg,*this);
-            }
-            sal_uInt8 const * pData = m_pBuffer + m_nOffset;
-            m_nOffset += nRequest;
-            return pData;
-        }
-        // --------------------------------------------------------------------------
-
-        sal_Int32 SAL_CALL BinaryReader_Impl::readBytes (
-            uno::Sequence<sal_Int8> & rData, sal_Int32 nBytesToRead)
-            throw (
-                io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException)
-        {
-            sal_uInt32 nRead = getMaxAvail(nBytesToRead);
-            if (nRead > 0)
-            {
-                rData.realloc (nRead);
-                memcpy (rData.getArray(), readBuffer(nRead), nRead);
-            }
-            return sal_Int32(nRead);
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Int32 SAL_CALL BinaryReader_Impl::readSomeBytes (
-            uno::Sequence<sal_Int8> & rData, sal_Int32 nBytesToRead)
-            throw (
-                io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException)
-        {
-            return readBytes(rData,nBytesToRead);
-        }
-
-        // --------------------------------------------------------------------------
-
-        void SAL_CALL BinaryReader_Impl::skipBytes (sal_Int32 nBytesToSkip)
-            throw (
-                io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException)
-        {
-            (void) readBuffer(sal_uInt32(nBytesToSkip));
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Int32 SAL_CALL BinaryReader_Impl::available()
-            throw (
-                io::NotConnectedException,
-                io::IOException, uno::RuntimeException)
-        {
-            const sal_uInt32 nMaxAvail = 0x7FFFFFFF;
-            const sal_uInt32 nAvail = checkAvail();
-            return sal_Int32(std::min(nAvail,nMaxAvail));
-        }
-
-        // --------------------------------------------------------------------------
-
-        void SAL_CALL BinaryReader_Impl::closeInput()
-            throw (
-                io::NotConnectedException,
-                io::IOException, uno::RuntimeException)
-        {
-            OSL_ENSURE(m_pBuffer,"BinaryCache - Closing stream that is already closed");
-            if (m_pBuffer)		
-            {
-                rtl_freeMemory (m_pBuffer); 
-                m_pBuffer = 0;
-            }
-        }
-
-        // --------------------------------------------------------------------------
-        // XDataInputStream implementation.
-        // --------------------------------------------------------------------------
-
-        sal_Int8 SAL_CALL BinaryReader_Impl::readBoolean()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            return this->readByte();
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Int8 SAL_CALL BinaryReader_Impl::readByte()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            sal_Int8 result = sal_Int8(*readBuffer(1));
-
-            return result;
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Unicode SAL_CALL BinaryReader_Impl::readChar()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            sal_Unicode result;
-
-            sal_uInt8 const * pData = readBuffer(sizeof result);
-
-            result = sal_Unicode(
-                (sal_uInt16(pData[0]) << 8) |
-                (sal_uInt16(pData[1]) << 0)   );
-
-            return result;
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Int16 SAL_CALL BinaryReader_Impl::readShort()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            sal_Int16 result;
-
-            sal_uInt8 const * pData = readBuffer(sizeof result);
-
-            result = sal_Int16(
-                (sal_uInt16(pData[0]) << 8) |
-                (sal_uInt16(pData[1]) << 0)   );
-
-            return result;
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Int32 SAL_CALL BinaryReader_Impl::readLong()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            sal_Int32 result;
-
-            sal_uInt8 const * pData = readBuffer(sizeof result);
-
-            result = sal_Int32(
-                (sal_uInt32(pData[0]) << 24) |
-                (sal_uInt32(pData[1]) << 16) |
-                (sal_uInt32(pData[2]) <<  8) |
-                (sal_uInt32(pData[3]) <<  0)   );
-
-            return result;
-        }
-
-        // --------------------------------------------------------------------------
-
-        sal_Int64 SAL_CALL BinaryReader_Impl::readHyper()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            sal_Int64 result;
-
-            sal_uInt8 const * pData = readBuffer(sizeof result);
-
-            result = sal_Int64(
-                (sal_uInt64(pData[0]) << 56) |
-                (sal_uInt64(pData[1]) << 48) |
-                (sal_uInt64(pData[2]) << 40) |
-                (sal_uInt64(pData[3]) << 32) |
-                (sal_uInt64(pData[4]) << 24) |
-                (sal_uInt64(pData[5]) << 16) |
-                (sal_uInt64(pData[6]) <<  8) |
-                (sal_uInt64(pData[7]) <<  0)   );
-
-            return result;
-        }
-
-        // --------------------------------------------------------------------------
-
-        float SAL_CALL BinaryReader_Impl::readFloat()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            union { float f; sal_uInt32 n; } result;
-
-            sal_uInt8 const * pData = readBuffer(sizeof result.n);
-
-            result.n = sal_uInt32(
-                (sal_uInt32(pData[0]) << 24) |
-                (sal_uInt32(pData[1]) << 16) |
-                (sal_uInt32(pData[2]) <<  8) |
-                (sal_uInt32(pData[3]) <<  0)   );
-
-            return result.f;
-        }
-
-        // --------------------------------------------------------------------------
-
-        double SAL_CALL BinaryReader_Impl::readDouble()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            union { double d; sal_uInt64 n; } result;
-
-            sal_uInt8 const * pData = readBuffer(sizeof result.n);
-
-            result.n = sal_uInt64(
-                (sal_uInt64(pData[0]) << 56) |
-                (sal_uInt64(pData[1]) << 48) |
-                (sal_uInt64(pData[2]) << 40) |
-                (sal_uInt64(pData[3]) << 32) |
-                (sal_uInt64(pData[4]) << 24) |
-                (sal_uInt64(pData[5]) << 16) |
-                (sal_uInt64(pData[6]) <<  8) |
-                (sal_uInt64(pData[7]) <<  0)   );
-
-            return result.d;
-        }
-
-        // --------------------------------------------------------------------------
-
-        rtl::OUString SAL_CALL BinaryReader_Impl::readUTF()
-            throw (io::IOException, uno::RuntimeException)
-        {
-            sal_uInt32    nLength;
-
-            sal_uInt8 const * const pData = readBuffer(sizeof nLength);
-
-            nLength = sal_uInt32(
-                (sal_uInt32(pData[0]) << 24) |
-                (sal_uInt32(pData[1]) << 16) |
-                (sal_uInt32(pData[2]) <<  8) |
-                (sal_uInt32(pData[3]) <<  0)   );
-
-            bool bIsAscii = (nLength & binary::STR_ASCII_MASK) == binary::STR_ASCII_MASK;
-            nLength &=~binary::STR_ASCII_MASK;	
-
-            rtl::OUString result;
-            if (nLength != 0)
-            {
-                sal_Char const * const pUTF = reinterpret_cast<sal_Char const * >(readBuffer(nLength));
-
-                sal_Int32 const nStrLength = sal_Int32(nLength);
-                OSL_ASSERT(nStrLength >= 0);
-
-                rtl_TextEncoding const enc = bIsAscii ? RTL_TEXTENCODING_ASCII_US : RTL_TEXTENCODING_UTF8;
-
-                rtl_uString_internConvert(&result.pData, pUTF, nStrLength, enc,
-                                          OSTRING_TO_OUSTRING_CVTFLAGS, NULL);
-            }
-
-            return result;
-        }
-
-        // --------------------------------------------------------------------------
-        // BinaryReader implementation.
-        // --------------------------------------------------------------------------
-
-        BinaryReader::BinaryReader(rtl::OUString const & _sFileURL):
-            m_sFileURL(_sFileURL) {}
-
-        BinaryReader::~BinaryReader() {}
-
-        bool BinaryReader::open()
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            OSL_PRECOND(!m_xDataInputStream.is(),"Binary Reader: already open");
-            if (m_xDataInputStream.is())
-                return false;
-
-            if (m_sFileURL.getLength() == 0)
-                return false;
-
-            if (!FileHelper::fileExists(m_sFileURL))
-                return false;
-
-            m_xDataInputStream.set(new BinaryReader_Impl (m_sFileURL));
-            return true;
-        }
-
-        // --------------------------------------------------------------------------
-
-        inline BinaryReader_Impl * BinaryReader::getDataInputStream()
-        {
-            OSL_ENSURE(m_xDataInputStream.is(),"Binary Cache: Reader was not opened - no input stream");
-            return m_xDataInputStream.get();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(sal_Bool &_bValue) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _bValue = getDataInputStream()->readBoolean();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(sal_Int8 &_nValue) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _nValue = getDataInputStream()->readByte();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(sal_Int16 &_nValue) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _nValue = getDataInputStream()->readShort();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(sal_Int32 &_nValue) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _nValue = getDataInputStream()->readLong();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(sal_Int64 &_nValue)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _nValue = getDataInputStream()->readHyper();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(double &_nValue)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _nValue = getDataInputStream()->readDouble();
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read(rtl::OUString& _aStr) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _aStr = getDataInputStream()->readUTF();
-        }
-
-        // -----------------------------------------------------------------------------
-        template <class Element>
-        void readSequence(BinaryReader& _rReader, uno::Sequence< Element > & aSequence)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            // PRE: the Sequence must exist
-            sal_Int32 nLength;
-            _rReader.read(nLength);
-
-            aSequence.realloc(nLength);
-
-            Element* const pElement = aSequence.getArray();	 // fill the hole array
-            for(sal_Int32 i=0; i<nLength; ++i) 
-            {
-                _rReader.read(pElement[i]);					 // read one element
-            }
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read (uno::Sequence< sal_Int8 > &_aValue) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            readSequence(*this, _aValue);
-        }
-
-        // --------------------------------------------------------------------------
-
-        void BinaryReader::read (uno::Sequence< rtl::OUString > &_aValue) 
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            readSequence(*this, _aValue);
-        }
-
-        // --------------------------------------------------------------------------
-
-        uno::Sequence< sal_Int8 > const * const for_binary = 0;
-
-        #define CASE_READ_SEQUENCE(TYPE_CLASS, DATA_TYPE)   \
-            case TYPE_CLASS:                                \
-            {                                               \
-                OSL_ENSURE( ::getCppuType(static_cast<DATA_TYPE const*>(0)).getTypeClass() == (TYPE_CLASS), "Typeclass does not match element type" );    \
-                uno::Sequence< DATA_TYPE > aData;                \
-                readSequence(_rReader, aData);                   \
-                _aValue <<= aData;                               \
-            }   break                                             
-
-        bool readSequenceValue (
-            BinaryReader & _rReader,
-            uno::Any          & _aValue,
-            uno::Type const   & _aElementType)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            switch(_aElementType.getTypeClass())
-            {
-            CASE_READ_SEQUENCE( uno::TypeClass_BOOLEAN, sal_Bool );
-
-            CASE_READ_SEQUENCE( uno::TypeClass_SHORT, sal_Int16 );
-
-            CASE_READ_SEQUENCE( uno::TypeClass_LONG, sal_Int32 );
-
-            CASE_READ_SEQUENCE( uno::TypeClass_HYPER, sal_Int64 );
-
-            CASE_READ_SEQUENCE( uno::TypeClass_DOUBLE, double );
-
-            CASE_READ_SEQUENCE( uno::TypeClass_STRING, rtl::OUString );
-
-            case uno::TypeClass_SEQUENCE:  
-                if (_aElementType == ::getCppuType(for_binary))
-                {                                               
-                    uno::Sequence< sal_Int8 > aData;
-                    readSequence(_rReader, aData); 
-                    _aValue <<= aData;  
-                    break;
-                }
-                // else fall through
-
-            default: 
-                OSL_ENSURE(false, "Unexpected type for sequence elements");
-                return false;
-            }
-            return true;
-        }
-
-        #undef CASE_READ_SEQUENCE
-
-        // --------------------------------------------------------------------------
-
-        
-    }
-}
diff --git a/configmgr/source/backend/binaryreader.hxx b/configmgr/source/backend/binaryreader.hxx
deleted file mode 100644
index d299008b58..0000000000
--- a/configmgr/source/backend/binaryreader.hxx
+++ /dev/null
@@ -1,88 +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: binaryreader.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 CONFIGMGR_BINARYREADER_HXX
-#define CONFIGMGR_BINARYREADER_HXX
-
-#include <rtl/ref.hxx>
-#include <rtl/ustring.hxx>
-#include <osl/file.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace css = com::sun::star;
-    
-        namespace io   = css::io;
-        namespace uno  = css::uno;
-        namespace lang = css::lang;
-        // -----------------------------------------------------------------------------
-        class BinaryReader_Impl;
-        class BinaryReader 
-        {
-            rtl::OUString m_sFileURL;
-
-            rtl::Reference<BinaryReader_Impl> m_xDataInputStream;
-        public:
-            explicit BinaryReader (rtl::OUString const & _sFileURL);
-            
-            ~BinaryReader();
-
-        public:
-            bool open()     SAL_THROW( (io::IOException, uno::RuntimeException) );
-        
-            void read(sal_Bool &_nValue)    SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(sal_Int8 &_nValue)    SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(sal_Int16 &_nValue)   SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(sal_Int32 &_nValue)   SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(sal_Int64 &_nValue)   SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(double &_nValue)      SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(rtl::OUString& _aStr) SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(uno::Sequence< sal_Int8 > &_aValue)      SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void read(uno::Sequence< rtl::OUString > &_aValue)  SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-        private:
-            inline BinaryReader_Impl * getDataInputStream();
-        };
-        // --------------------------------------------------------------------------
-
-        bool readSequenceValue (
-            BinaryReader	  & _rReader,
-            uno::Any          & _aValue,
-            uno::Type const   & _aElementType) SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-        // --------------------------------------------------------------------------
-    }
-}
-#endif
diff --git a/configmgr/source/backend/binaryreadhandler.cxx b/configmgr/source/backend/binaryreadhandler.cxx
deleted file mode 100644
index eefca28952..0000000000
--- a/configmgr/source/backend/binaryreadhandler.cxx
+++ /dev/null
@@ -1,690 +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: binaryreadhandler.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_configmgr.hxx"
-#include "binaryreadhandler.hxx"
-#include "binarycache.hxx"
-#include "binarytype.hxx"
-#include "simpletypehelper.hxx"
-#include "typeconverter.hxx"
-#include "treenodefactory.hxx"
-
-#include "tracer.hxx"
-#include <com/sun/star/io/WrongFormatException.hpp>
-#include <com/sun/star/util/XTimeStamped.hpp>
-
-
-#define ASCII(x) rtl::OUString::createFromAscii(x)
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        
-        namespace css = com::sun::star;
-        namespace io   = css::io;
-        namespace util = css::util;
-        
-        // -----------------------------------------------------------------------------
-        BinaryReadHandler::BinaryReadHandler(rtl::OUString const & _aFileURL, 
-                                             rtl::OUString const & _aComponentName, 
-                                             uno::Reference<lang::XMultiServiceFactory> const & )
-        : m_BinaryReader(_aFileURL)
-        , m_aNodeFactory()
-        , m_aComponentName(_aComponentName)
-        {
-        }
-        // -----------------------------------------------------------------------------
-        BinaryReadHandler::~BinaryReadHandler()
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        static inline
-        bool isRequestingNoLocale(com::sun::star::lang::Locale const & aRequestedLocale)
-        {
-            rtl::OUString const & aLanguage = aRequestedLocale.Language;
-            return aLanguage.getLength() == 0 || localehelper::isDefaultLanguage(aLanguage);
-        }
-        // -----------------------------------------------------------------------------
-
-        static 
-        bool supportsLocale(uno::Sequence< rtl::OUString > const & aStoredLocales, rtl::OUString const & aRequestedLocale)
-        {
-            for (sal_Int32 ix=0; ix<aStoredLocales.getLength(); ++ix)
-                if (aStoredLocales[ix].equalsIgnoreAsciiCase(aRequestedLocale))
-                    return true;
-
-            return false;
-        }
-        // -----------------------------------------------------------------------------
-
-        static 
-        bool supportsAll(uno::Sequence< rtl::OUString > const & aStoredLocales, uno::Sequence< rtl::OUString > const & aRequestedLocales)
-        {
-            for (sal_Int32 jx=0; jx<aRequestedLocales.getLength(); ++jx)
-                if (!supportsLocale(aStoredLocales,aRequestedLocales[jx]))
-                    return false;
-
-            return true;
-        }
-        // -----------------------------------------------------------------------------
-
-        bool BinaryReadHandler::verifyFileHeader(  const uno::Reference<backenduno::XLayer> * pLayers,
-                                    sal_Int32 nNumLayers,
-                                    const rtl::OUString& _aSchemaVersion,
-                                    com::sun::star::lang::Locale const & aRequestedLocale,
-                                    std::vector< com::sun::star::lang::Locale > & outKnownLocales)
-        {
-            try
-            {
-                //Open the reader
-                sal_Int16 nMagic, nVersion;
-                m_BinaryReader.read(nMagic);
-                m_BinaryReader.read(nVersion);
-                if (nMagic !=binary::CFG_BINARY_MAGIC || nVersion != binary::CFG_BINARY_VERSION )	
-                    return false;
-
-                rtl::OUString aSchemaVersion;
-                m_BinaryReader.read(aSchemaVersion);
-                if (!aSchemaVersion.equals(_aSchemaVersion))
-                    return false;
-
-                uno::Sequence< rtl::OUString > aAvailableLocales;
-                uno::Sequence< rtl::OUString > aKnownLocales;
-                m_BinaryReader.read(aKnownLocales);
-                m_BinaryReader.read(aAvailableLocales);
-                outKnownLocales = localehelper::makeLocaleSequence(aKnownLocales);
-
-                if (isRequestingNoLocale(aRequestedLocale))
-                {
-                    // any existing combination of locales (including none) is valid
-                }
-                else if (!localehelper::designatesAllLocales(aRequestedLocale))
-                {
-                    // one particular locale requested
-                    rtl::OUString const aIsoLocale = localehelper::makeIsoLocale(aRequestedLocale);
-                    if (!supportsLocale(aKnownLocales,aIsoLocale))
-                    {
-                        // a locale we didn't load previously
-                        return false;
-                    }
-                    else if (! supportsLocale(aAvailableLocales,aIsoLocale))
-                    {
-                        // a locale we handled by fallback previously
-                        uno::Sequence< rtl::OUString > aNewlyAvailableLocales = 
-                            getAvailableLocales(pLayers,nNumLayers);
-
-                        // ... and that has become available now
-                        if (supportsLocale(aNewlyAvailableLocales,aIsoLocale))
-                            return false;
-
-                        // ... or other new locales have been added
-                        if (!supportsAll(aAvailableLocales,aNewlyAvailableLocales))
-                            return false;
-                    }
-                }
-                else
-                {
-                    uno::Sequence< rtl::OUString > aNewlyAvailableLocales = 
-                        getAvailableLocales(pLayers,nNumLayers);
-
-                    // not all locales were requested yet
-                    if (!supportsAll(aKnownLocales,aNewlyAvailableLocales))
-                        return false;
-
-                    // new locales have been added
-                    if (!supportsAll(aAvailableLocales,aNewlyAvailableLocales))
-                        return false;
-                }
-
-                rtl::OUString aComponentName;
-                m_BinaryReader.read(aComponentName);
-                if (!aComponentName.equals(m_aComponentName))
-                    return false;
-
-                return true;
-            }
-            catch (uno::Exception &)
-            {
-                CFG_TRACE_INFO("Binary Cache can't be used");
-                return false;
-            }
-        }
-        // -----------------------------------------------------------------------------
-        bool BinaryReadHandler::isUptodate(const std::vector<rtl::OUString> & _timeStamps)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            sal_Int32 nNumBinaryLayers;
-            m_BinaryReader.read(nNumBinaryLayers);
-            if (nNumBinaryLayers < 0 || sal_uInt32(nNumBinaryLayers) != _timeStamps.size())
-                return false;
-
-            for ( std::vector<rtl::OUString>::const_iterator it = _timeStamps.begin();
-                  it != _timeStamps.end();
-                  ++it)
-            {
-                rtl::OUString binaryTimeStamp;
-                m_BinaryReader.read(binaryTimeStamp);
-                if ( ! it->equals(binaryTimeStamp) )
-                {
-                    return false;
-                }
-            }
-        
-            return true;
-        }
-        // -----------------------------------------------------------------------------
-        binary::NodeType::Type BinaryReadHandler::readNodeType()
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            binary::NodeType::Type eType = binary::NodeType::invalid;
-
-            sal_Int8 nValue;
-            m_BinaryReader.read(nValue);
-
-            sal_uInt8 const nRightValue( nValue );
-            if ( (nRightValue & binary::NodeType::nodetype_mask) == nRightValue )
-                eType = binary::NodeType::Type(nRightValue);
-
-            if (eType == binary::NodeType::invalid)
-            {
-                OSL_ENSURE(false, "unknown or unhandled node type");
-                throw io::WrongFormatException();
-            }
-
-            return eType;
-        }
-
-        // -----------------------------------------------------------------------------
-        binary::ValueFlags::Type BinaryReadHandler::readValueFlags(bool& bSeq, bool& bHasValue, bool& bHasDefault )
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            sal_Int8 nValue;
-            m_BinaryReader.read(nValue);
-            
-            sal_uInt8 const nRightValue( nValue );
-            binary::ValueFlags::Type eType = binary::ValueFlags::Type(nRightValue & binary::ValueFlags::basictype_mask);
-            if ( eType >= binary::ValueFlags::val_invalid)
-            {
-                OSL_ENSURE(false, "unknown or unhandled value type");
-                throw io::WrongFormatException();
-            }
-
-
-            if (nRightValue & binary::ValueFlags::seq)
-                bSeq = true;
-            else
-                bSeq = false;
-
-            if (nRightValue & binary::ValueFlags::first_value_NULL)
-                bHasValue = false;
-            else
-                bHasValue = true;
-
-            if (nRightValue & binary::ValueFlags::second_value_NULL)
-                bHasDefault = false;
-            else
-                bHasDefault = true;
-
-            return eType;
-        }
-
-        // -----------------------------------------------------------------------------
-
-        void BinaryReadHandler::readName(rtl::OUString &_aString)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            m_BinaryReader.read (_aString);
-        }
-
-        // -----------------------------------------------------------------------------
-        void BinaryReadHandler::readAttributes(node::Attributes  &_aAttributes)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            sal_Int8 nValue;
-            m_BinaryReader.read(nValue);
-
-            _aAttributes.setState( node::State(nValue & 0x03) );
-
-            _aAttributes.setAccess( nValue & 0x04 ? true : false, nValue & 0x08 ? true : false);
-            
-            _aAttributes.setNullable(nValue & 0x10 ? true : false);
-            _aAttributes.setLocalized(nValue & 0x20 ? true : false);
-            if(nValue & 0x40 )
-            {
-                _aAttributes.markMandatory();	
-            }
-            if(nValue & 0x80)
-            {
-                _aAttributes.markRemovable();
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryReadHandler::readGroup(rtl::OUString &_aName, node::Attributes &_aAttributes)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            readAttributes(_aAttributes);
-            readName(_aName);
-        }
-        // -----------------------------------------------------------------------------	
-        void BinaryReadHandler::readSet(rtl::OUString &_aName, node::Attributes &_aAttributes,
-                        rtl::OUString &_sInstanceName, rtl::OUString &_sInstanceModule)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            readAttributes(_aAttributes);
-            readName(_aName);
-            readName(_sInstanceName);
-            readName(_sInstanceModule);
-        }
-            
-        // -----------------------------------------------------------------------------
-        template <class T>
-        inline
-        void readAsAny(BinaryReader& rBinaryReader, uno::Any & _aValue, uno::Type& _aType, T& _aVar)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            rBinaryReader.read(_aVar);
-            _aValue <<= _aVar;
-            _aType = _aValue.getValueType();
-        }
-
-        // -----------------------------------------------------------------------------
-        uno::Type convertValueTypeToType(binary::ValueFlags::Type eBasicValueType, bool bSeq)
-        {
-           uno::Type aType;
-
-           if (!bSeq)
-           {
-                switch(eBasicValueType)
-                {
-                // --------------- Simple types ---------------
-
-                case binary::ValueFlags::val_boolean:
-                    aType = SimpleTypeHelper::getBooleanType();
-                    break;
-                case binary::ValueFlags::val_int16:
-                    aType = SimpleTypeHelper::getShortType();
-                    break;
-                case binary::ValueFlags::val_int32:
-                    aType = SimpleTypeHelper::getIntType();
-                    break;
-                case binary::ValueFlags::val_int64:
-                    aType = SimpleTypeHelper::getLongType();
-                    break;
-                case binary::ValueFlags::val_double:
-                    aType = SimpleTypeHelper::getDoubleType();
-                    break;
-                case binary::ValueFlags::val_string:
-                    aType = SimpleTypeHelper::getStringType();
-                    break;
-                case binary::ValueFlags::val_binary:
-                    aType = SimpleTypeHelper::getBinaryType();
-                    break;
-                case binary::ValueFlags::val_any:
-                    aType = SimpleTypeHelper::getAnyType();
-                    break;
-                default:
-                    OSL_ENSURE(false,"Invalid value type");
-                    break;
-                }
-           }
-           else
-           {
-                // ------------ Sequences ------------
-                switch(eBasicValueType)
-                {
-                case binary::ValueFlags::val_boolean:
-                    aType = ::getCppuType(static_cast<uno::Sequence<sal_Bool> const*>(0));
-                    break;
-                case binary::ValueFlags::val_int16:
-                    aType = ::getCppuType(static_cast<uno::Sequence<sal_Int16> const*>(0));
-                    break;
-                case binary::ValueFlags::val_int32:
-                    aType = ::getCppuType(static_cast<uno::Sequence<sal_Int32> const*>(0));
-                    break;
-                case binary::ValueFlags::val_int64:
-                    aType = ::getCppuType(static_cast<uno::Sequence<sal_Int64> const*>(0));
-                    break;
-                case binary::ValueFlags::val_double:
-                    aType = ::getCppuType(static_cast<uno::Sequence<double> const*>(0));
-                    break;
-                case binary::ValueFlags::val_string:
-                    aType = ::getCppuType(static_cast<uno::Sequence<rtl::OUString> const*>(0));
-                    break;
-                case binary::ValueFlags::val_binary:
-                    aType = ::getCppuType(static_cast<uno::Sequence< uno::Sequence< sal_Int8 > > const*>(0));
-                    break;
-                default:
-                    OSL_ENSURE(false,"Invalid sequence value type");
-                    break;
-                }
-            }
-            
-            return aType;
-        }
-
-        // -----------------------------------------------------------------------------
-        void BinaryReadHandler::readValue(rtl::OUString &_aName, node::Attributes &_aAttributes,
-                                          uno::Any& _aValue, uno::Any& _aDefaultValue,uno::Type& _aType)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            bool bSeq = false;
-            bool bHasValue = false;
-            bool bHasDefault = false;
-
-            binary::ValueFlags::Type eBasicType = readValueFlags(bSeq, bHasValue, bHasDefault);
-            readAttributes(_aAttributes);
-            readName(_aName);
-            
-            if (!bSeq && (bHasValue || bHasDefault))
-            {
-                switch(eBasicType)
-                {
-                    case binary::ValueFlags::val_any:
-                    {
-                        OSL_ENSURE(false,"Node of type Any cannot have value");
-                                         throw io::WrongFormatException();
-                    }
-                    case binary::ValueFlags::val_string:
-                    {
-                        rtl::OUString aStr;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader, _aValue, _aType, aStr);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader,  _aDefaultValue, _aType, aStr);
-                        break;
-                    }
-                    case binary::ValueFlags::val_boolean:
-                    {
-                        sal_Bool nValue;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader,_aValue, _aType, nValue);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader,_aDefaultValue, _aType, nValue);
-                        break;
-                    }
-                    case binary::ValueFlags::val_int16:
-                    {
-                        sal_Int16 nValue;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader,_aValue, _aType, nValue);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader,_aDefaultValue, _aType, nValue);
-                        break;
-                    }
-                    case binary::ValueFlags::val_int32:
-                    {
-                        sal_Int32 nValue;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader,_aValue, _aType, nValue);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader,_aDefaultValue, _aType, nValue);
-                        break;
-                    }
-                    case binary::ValueFlags::val_int64:
-                    {
-                        sal_Int64 nValue;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader,_aValue, _aType, nValue);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader,_aDefaultValue, _aType, nValue);
-                        break;
-                    }
-                    case binary::ValueFlags::val_double:
-                    {
-                        double nValue;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader,_aValue, _aType, nValue);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader, _aDefaultValue, _aType, nValue);
-                        break;
-                    }
-                    case binary::ValueFlags::val_binary:
-                    {
-                        uno::Sequence< sal_Int8 > aValue;
-                        if (bHasValue)
-                            readAsAny(m_BinaryReader,_aValue, _aType, aValue);
-                        if (bHasDefault)
-                            readAsAny(m_BinaryReader,_aDefaultValue, _aType, aValue);
-                        break;
-                    }
-                    default:
-                        OSL_ENSURE(false, "Invalid value type");
-                        throw io::WrongFormatException();
-                }
-            }
-            else
-            {
-                _aType = convertValueTypeToType(eBasicType, bSeq);
-                if (_aType == uno::Type())
-                    throw io::WrongFormatException();
-            }
-            
-            if(bSeq)
-            {
-                OSL_ASSERT(_aType.getTypeClass() == uno::TypeClass_SEQUENCE);
-                uno::Type const aElementType = getSequenceElementType(_aType);
-                if (bHasValue)
-                    readSequenceValue(m_BinaryReader, _aValue, aElementType );
-
-                if(bHasDefault)
-                    readSequenceValue(m_BinaryReader, _aDefaultValue, aElementType );
-            }
-                
-        }
-        // -----------------------------------------------------------------------------
-        std::auto_ptr<ISubtree> BinaryReadHandler::readComponentTree()
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            binary::NodeType::Type eType = this->readNodeType();
-
-            if (eType != binary::NodeType::component)
-            {
-                // TODO: search for component tree
-                OSL_ENSURE(false, "binary Cache: unexpected tree type for component data");
-                throw io::WrongFormatException();
-            }
-
-            return readToplevelTree();
-        }
-        // -----------------------------------------------------------------------------
-        std::auto_ptr<ISubtree> BinaryReadHandler::readTemplatesTree()
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            binary::NodeType::Type eType = this->readNodeType();
-
-            if (eType != binary::NodeType::templates)
-            {
-                // TODO: search for templates tree
-                OSL_ENSURE(false, "binary Cache: unexpected tree type for template data");
-                throw io::WrongFormatException();
-            }
-
-            return readToplevelTree();
-        }
-        // -----------------------------------------------------------------------------
-
-        std::auto_ptr<ISubtree> BinaryReadHandler::readToplevelTree()
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            std::auto_ptr<ISubtree> pTree;
-                    
-            rtl::OUString aName;
-            node::Attributes aAttributes;
-            const bool not_extensible = false;
-
-            binary::NodeType::Type eType = this->readNodeType();
-            switch (eType)
-            {
-                case binary::NodeType::groupnode:
-                {
-                    this->readGroup(aName, aAttributes);	
-                    pTree  = m_aNodeFactory.createGroup(aName,not_extensible,aAttributes);
-                    break;
-                }
-                case binary::NodeType::setnode:
-                {
-                    backenduno::TemplateIdentifier aTemplate;
-                    this->readSet(aName, aAttributes,aTemplate.Name, aTemplate.Component);	
-                    pTree  = m_aNodeFactory.createSet(aName,aTemplate,not_extensible,aAttributes);
-                    break;
-                }
-                case binary::NodeType::nodata:
-                    break;
-
-                default:
-                    OSL_ENSURE(false, "binary Cache - cannot read data: unexpected node type for tree");
-                    throw io::WrongFormatException();
-                
-            }
-
-            if (pTree.get() != NULL)
-            {
-                readChildren(*pTree);
-
-                //read terminating stop node
-                eType = this->readNodeType();
-                OSL_ENSURE(binary::NodeType::stop == eType, "Missing stop node to mark end of tree");
-            }
-            return pTree;	
-        }
-        
-        
-    // -----------------------------------------------------------------------------
-        bool BinaryReadHandler::validateHeader( const uno::Reference<backenduno::XLayer> * pLayers,
-                                                sal_Int32 nNumLayers,
-                                                const rtl::OUString& _aSchemaVersion,
-                                                com::sun::star::lang::Locale const & aRequestedLocale,
-                                                std::vector< com::sun::star::lang::Locale > & outKnownLocales)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-
-            //Check here if the file exists
-            if (!m_BinaryReader.open())
-                return false;
-
-            if(!this->verifyFileHeader(pLayers, nNumLayers, _aSchemaVersion, aRequestedLocale, outKnownLocales))
-                return false;
-
-            //Check if layers are uptodate
-            std::vector <rtl::OUString> timeStamps(nNumLayers);
-            for (sal_Int32 i = 0 ; i < nNumLayers ; ++ i) 
-            {
-                uno::Reference<util::XTimeStamped> xTimeStamp = uno::Reference<util::XTimeStamped>(pLayers[i], uno::UNO_QUERY);
-                if (xTimeStamp.is())
-                {
-                    rtl::OUString aTimeStamp = xTimeStamp->getTimestamp();
-                    timeStamps[i] = aTimeStamp;
-                }
-            }
-                
-            return this->isUptodate(timeStamps);
-        }
-        // -----------------------------------------------------------------------------
-        void BinaryReadHandler::readChildren(ISubtree & rTree )
-        {	
-            OSL_ASSERT(!binary::NodeType::stop); // loop stops at stop node
-            while (binary::NodeType::Type eType = this->readNodeType())	
-            {
-                rtl::OUString aName;
-                node::Attributes aAttributes;
-                const bool not_extensible = false;
-                switch (eType)
-                {
-                    case binary::NodeType::groupnode:
-                    {
-                        this->readGroup(aName, aAttributes);	
-
-                        std::auto_ptr<ISubtree> pNewNode = m_aNodeFactory.createGroup(aName, not_extensible, aAttributes);
-                        if (pNewNode.get() == NULL)
-                        {
-                            OSL_ENSURE(false, "Error: factory returned NULL group node - skipping");
-                            continue;
-                        }
-
-                        readChildren( *pNewNode );
-                        rTree.addChild(base_ptr(pNewNode));
-                        break;
-                    }
-                    case binary::NodeType::setnode:
-                    {
-                        backenduno::TemplateIdentifier aTemplate;
-                        this->readSet(aName, aAttributes,aTemplate.Name, aTemplate.Component);	
-
-                        std::auto_ptr<ISubtree> pNewSetNode = m_aNodeFactory.createSet(aName,aTemplate,not_extensible,aAttributes);
-                        if (pNewSetNode.get() == NULL)
-                        {
-                            OSL_ENSURE(false, "Error: factory returned NULL set node - skipping");
-                            continue;
-                        }
-
-                        readChildren( *pNewSetNode );
-                        rTree.addChild(base_ptr(pNewSetNode));
-                        break;
-                    }
-                    case binary::NodeType::valuenode:
-                    {
-                        uno::Any aValue;
-                        uno::Any aDefaultValue;
-                        uno::Type aType;
-                        
-                        this->readValue(aName, aAttributes, aValue, aDefaultValue, aType);	
-
-                        OTreeNodeFactory & rValueFactory = m_aNodeFactory.getNodeFactory();
-
-                        std::auto_ptr<ValueNode> pValueNode; 
-                        if (aValue.hasValue() || aDefaultValue.hasValue())
-                        {
-                            pValueNode  = rValueFactory.createValueNode(aName,aValue, aDefaultValue, aAttributes);
-                        }
-                        else
-                        {
-                            pValueNode  = rValueFactory.createNullValueNode(aName,aType, aAttributes);
-                        }
-
-                        rTree.addChild(base_ptr(pValueNode));	
-                        break;
-                    }
-                    default:
-                        OSL_ENSURE(false, "Binary cache: Invalid node type");
-                        throw io::WrongFormatException();
-                }
-           }
-        }	
-    // -----------------------------------------------------------------------------	
-
-        // -----------------------------------------------------------------------------
-    }
-   // -----------------------------------------------------------------------------
-}
diff --git a/configmgr/source/backend/binaryreadhandler.hxx b/configmgr/source/backend/binaryreadhandler.hxx
deleted file mode 100644
index 7a7e75a607..0000000000
--- a/configmgr/source/backend/binaryreadhandler.hxx
+++ /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: binaryreadhandler.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 CONFIGMGR_BINARYREADHANDLER_HXX
-#define CONFIGMGR_BINARYREADHANDLER_HXX
-
-#include "binaryreader.hxx"
-#include "componentdatahelper.hxx"
-#include "valuenode.hxx"
-#include "binarytype.hxx"
-#include "attributes.hxx"
-#include "matchlocale.hxx"
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/io/IOException.hpp>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif // INCLUDED_MEMORY
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif // INCLUDED_VECTOR
-
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace css = com::sun::star;
-    
-        namespace io   = css::io;
-        namespace uno  = css::uno;
-        namespace backenduno = css::configuration::backend  ;
-        
-        // -----------------------------------------------------------------------------
-        
-        class BinaryReadHandler
-        {
-            BinaryReader         m_BinaryReader;	
-            ComponentDataFactory m_aNodeFactory;
-            rtl::OUString        m_aComponentName;
-
-        public:
-            BinaryReadHandler(rtl::OUString const & _aFileURL, rtl::OUString const & _aComponentName, uno::Reference<lang::XMultiServiceFactory> const & _aFactory);
-            ~BinaryReadHandler();
-
-            bool validateHeader(    const uno::Reference<backenduno::XLayer> * pLayers,
-                                    sal_Int32 nNumLayers,
-                                    const rtl::OUString& _aSchemaVersion,
-                                    com::sun::star::lang::Locale const & aRequestedLocale,
-                                    std::vector< com::sun::star::lang::Locale > & outKnownLocales)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            std::auto_ptr<ISubtree> readComponentTree()
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            std::auto_ptr<ISubtree> readTemplatesTree()
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-        private:
-            std::auto_ptr<ISubtree> readToplevelTree()
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            void readChildren(ISubtree & rTree)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-        private:
-            bool verifyFileHeader(  const uno::Reference<backenduno::XLayer> * pLayers,
-                                    sal_Int32 nNumLayers,
-                                    const rtl::OUString& _aSchemaVersion,
-                                    com::sun::star::lang::Locale const & aRequestedLocale,
-                                    std::vector< com::sun::star::lang::Locale > & outKnownLocales);
-
-            bool isUptodate(const std::vector<rtl::OUString> & _timeStamps)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void readChildNodes(ISubtree & rSubTree)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            binary::NodeType::Type readNodeType()
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            binary::ValueFlags::Type readValueFlags(bool& bSeq, bool& hasValue, bool& hasDefault )
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            void readAttributes(node::Attributes  &_aAttributes)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            void readGroup(rtl::OUString &_aName, node::Attributes &_aAttributes)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            void readSet(rtl::OUString &_aName, node::Attributes &_aAttributes,
-                                            rtl::OUString &_sInstanceName, rtl::OUString &_sInstanceModule)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void readValue(rtl::OUString &_aName, node::Attributes &_aAttributes,
-                                              uno::Any& _aValue, uno::Any& _aDefaultValue,uno::Type& _aType)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            void readName(rtl::OUString &_aString)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-        };
-    // ---------------------------------------------------------------------------
-    }
- // -----------------------------------------------------------------------------
-}// namespace configmgr
-#endif
diff --git a/configmgr/source/backend/binarytype.hxx b/configmgr/source/backend/binarytype.hxx
deleted file mode 100644
index 11e187a719..0000000000
--- a/configmgr/source/backend/binarytype.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef CONFIGMGR_BINARYTYPE_HXX
-#define CONFIGMGR_BINARYTYPE_HXX
-
-#include <sal/types.h>
-
-namespace configmgr
-{
-    namespace binary
-    {
-        const sal_uInt32 STR_ASCII_MASK	= 0x80000000;
-        const sal_Int16 CFG_BINARY_MAGIC = 10001;
-        const sal_Int16 CFG_BINARY_VERSION = 3;
-        
-        namespace ValueFlags
-        {	
-            enum Type
-            {
-                val_any,		// = 0
-                val_string,		// = 1
-                val_boolean,	// = 2
-                val_int16,      // = 3
-                val_int32,		// = 4
-                val_int64,      // = 5
-                val_double,     // = 6
-                val_binary,		// = 7
-                val_invalid,	// = 8
-                    
-                //Sequence Flag
-                seq = 0x10, 
-                
-                //Pairstate Flags
-                first_value_NULL = 0x20,
-                second_value_NULL = 0x40,
-
-                //Masks
-                basictype_mask	   = 0x0F,
-                valuetype_mask	   = 0x1F,
-                pairstate_mask	   = first_value_NULL | second_value_NULL
-            };
-        }
-
-        namespace NodeType
-        {
-            enum Type
-            {
-                //Node Type Identifiers
-                stop		  = 0,
-                valuenode	  = 0x20,
-                groupnode	  = 0x40,
-                setnode		  = 0x80,
-                component     = 0x60,
-                templates	  = 0xA0,
-                nodata        = 0xC0,
-                invalid       = 0xE0,
-                
-                nodetype_mask = 0xE0
-            };
-        }
-    }
-}
-#endif
diff --git a/configmgr/source/backend/binarywritehandler.cxx b/configmgr/source/backend/binarywritehandler.cxx
deleted file mode 100644
index bb168cb8a4..0000000000
--- a/configmgr/source/backend/binarywritehandler.cxx
+++ /dev/null
@@ -1,492 +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: binarywritehandler.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_configmgr.hxx"
-#include "binarywritehandler.hxx"
-#include "binarycache.hxx"
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include "typeconverter.hxx"
-#include "simpletypehelper.hxx"
-
-#define ASCII(x) rtl::OUString::createFromAscii(x)		
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        
-        namespace css = com::sun::star;
-        namespace util = css::util ;
-        
-        // -----------------------------------------------------------------------------
-            
-        BinaryWriteHandler::BinaryWriteHandler( rtl::OUString const & _aFileURL, 
-                                                rtl::OUString const & _aComponentName, 
-                                                uno::Reference<lang::XMultiServiceFactory> const & _aFactory)
-        : m_BinaryWriter(_aFileURL,_aFactory)
-        , m_aComponentName(_aComponentName)
-        {
-
-        }			
-        // -----------------------------------------------------------------------------
-        static
-        binary::ValueFlags::Type convertTypeToValueType(uno::Type const& _aType)
-        {
-            binary::ValueFlags::Type eType = binary::ValueFlags::val_invalid; 
-            uno::TypeClass const aClass = _aType.getTypeClass();
-            switch(aClass)
-            {
-            case uno::TypeClass_ANY:
-                eType = binary::ValueFlags::val_any;
-                break;
-            case uno::TypeClass_BOOLEAN:
-                eType = binary::ValueFlags::val_boolean;
-                break;
-            case uno::TypeClass_SHORT:
-                eType = binary::ValueFlags::val_int16;
-                break;
-            case uno::TypeClass_LONG:
-                eType = binary::ValueFlags::val_int32;
-                break;
-            case uno::TypeClass_HYPER:
-                eType = binary::ValueFlags::val_int64;
-                break;
-            case uno::TypeClass_DOUBLE:
-                eType = binary::ValueFlags::val_double;
-                break;
-            case uno::TypeClass_STRING:
-                eType = binary::ValueFlags::val_string;
-                break;
-            case uno::TypeClass_SEQUENCE:
-                if (_aType == SimpleTypeHelper::getBinaryType())
-                {
-                    eType = binary::ValueFlags::val_binary;
-                }
-                else
-                {
-                    uno::Type aType = configmgr::getSequenceElementType(_aType);
-                    eType = convertTypeToValueType(aType);
-
-                    OSL_ENSURE(!(eType & binary::ValueFlags::seq), "Binary Writer - Invalid value type: Multiple nesting of sequences");
-                    eType = binary::ValueFlags::Type( eType | binary::ValueFlags::seq );
-                }
-                break;
-            default:
-                OSL_ENSURE(false, "Binary Writer - Invalid value type: not supported");
-                break;
-            }
-            return eType;
-        }
-            
-        // -----------------------------------------------------------------------------
-        template <class T>
-        inline /* make performance crew happy ;-) */
-        void writeDirectly(BinaryWriter& _rWriter, T const& _aVal)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            _rWriter.write(_aVal);
-        }
-        // -----------------------------------------------------------------------------
-        static
-        inline
-        void writeDirectly(BinaryWriter& _rWriter, uno::Sequence<sal_Int8> const& _aBinary);
-        // -----------------------------------------------------------------------------
-        template <class T>
-        inline /* make performance crew happy ;-) */
-        void writeFromAny(BinaryWriter& _rWriter,uno::Any const& _aValue, T& _aVar)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            OSL_VERIFY(_aValue >>= _aVar ); // "Invalid Any for value"
-            writeDirectly(_rWriter,_aVar);
-        }
-        // -----------------------------------------------------------------------------
-
-        template <class Element>
-        void writeSequence(BinaryWriter& _rWriter, uno::Sequence< Element > const& aSequence)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            sal_Int32 const nLength = aSequence.getLength();
-            _rWriter.write(nLength);
-
-            for(sal_Int32 i=0; i<nLength; ++i) 
-            {
-                writeDirectly(_rWriter, aSequence[i]);
-            }
-        }
-        // -----------------------------------------------------------------------------
-        static
-        inline
-        void writeDirectly(BinaryWriter& _rWriter, uno::Sequence<sal_Int8> const& _aBinary)
-        {
-            writeSequence(_rWriter,_aBinary);
-        }
-        // -----------------------------------------------------------------------------
-        #define CASE_WRITE_SEQUENCE(TYPE_CLASS, DATA_TYPE)	\
-        case TYPE_CLASS:								\
-        {												\
-            uno::Sequence< DATA_TYPE > aData;				\
-            OSL_ASSERT( ::getCppuType(aData.getConstArray()).getTypeClass() == (TYPE_CLASS) );	\
-            OSL_VERIFY( _aValue >>= aData );										\
-            writeSequence(_rWriter,aData);						\
-        }	break						
-        
-        // -----------------------------------------------------------------------------
-        static
-        void  writeSequenceValue(BinaryWriter& _rWriter,  uno::Any const& _aValue, uno::Type const& aElementType)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            switch(aElementType.getTypeClass())
-            {
-                CASE_WRITE_SEQUENCE( uno::TypeClass_BOOLEAN, sal_Bool );
-
-                CASE_WRITE_SEQUENCE( uno::TypeClass_SHORT, sal_Int16 );
-
-                CASE_WRITE_SEQUENCE( uno::TypeClass_LONG, sal_Int32 );
-
-                CASE_WRITE_SEQUENCE( uno::TypeClass_HYPER, sal_Int64 );
-
-                CASE_WRITE_SEQUENCE( uno::TypeClass_DOUBLE, double );
-
-                CASE_WRITE_SEQUENCE( uno::TypeClass_STRING, rtl::OUString );
-
-                CASE_WRITE_SEQUENCE( uno::TypeClass_SEQUENCE, uno::Sequence<sal_Int8> );
-
-                default: 
-                    OSL_ENSURE(false, "Unexpected typeclass for sequence elements");
-                    break;
-            }
-        }
-        #undef CASE_WRITE_SEQUENCE
-        
-        // -----------------------------------------------------------------------------
-        static
-        void  writeSimpleValue(BinaryWriter& _rWriter, uno::Any const& _aValue, uno::Type const& _aType)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            // PRE: Header must be written
-            uno::TypeClass aDestinationClass = _aType.getTypeClass();
-            switch (aDestinationClass)
-            {
-                case uno::TypeClass_BOOLEAN:
-                {
-                    sal_Bool bValue = sal_False;
-                    writeFromAny(_rWriter, _aValue, bValue);
-                    break;
-                }
-                case uno::TypeClass_BYTE:
-                {
-                    sal_Int8 nValue = 0;
-                    writeFromAny(_rWriter, _aValue, nValue);
-                    break;
-                }
-                case uno::TypeClass_SHORT:
-                {
-                    sal_Int16 nValue = 0;
-                    writeFromAny(_rWriter, _aValue, nValue);
-                    break;
-                }
-                case uno::TypeClass_LONG:
-                {
-                    sal_Int32 nValue = 0;
-                    writeFromAny(_rWriter, _aValue, nValue);
-                    break;
-                }
-                case uno::TypeClass_HYPER:
-                {
-                    sal_Int64 nValue = 0;
-                    writeFromAny(_rWriter, _aValue, nValue);
-                    break;
-                }
-                case uno::TypeClass_DOUBLE:
-                {
-                    double nValue = 0;
-                    writeFromAny(_rWriter, _aValue, nValue);
-                    break;
-                }
-                case uno::TypeClass_STRING:
-                {
-                    rtl::OUString aStr;
-                    writeFromAny(_rWriter, _aValue, aStr);
-                    break;
-                }
-                case uno::TypeClass_SEQUENCE:
-                {
-                    OSL_ENSURE (_aType == SimpleTypeHelper::getBinaryType(),"Unexpected sequence as simple type");
-                    uno::Sequence<sal_Int8> aBinary;
-                    writeFromAny(_rWriter, _aValue, aBinary);
-                    break;
-                }
-                default: 
-                    OSL_ENSURE(false, "Unexpected typeclass for simple value");
-                    break;
-            }
-        }
-                    
-        // -----------------------------------------------------------------------------
-            
-        void BinaryWriteHandler::writeValue(uno::Any const& _aValue)
-        {
-            bool bSeq;
-            uno::Type aTargetType = getBasicType(_aValue.getValueType(), bSeq);
-
-            if (!bSeq)
-            {
-                writeSimpleValue(m_BinaryWriter,_aValue, aTargetType);
-            }
-            else
-            {
-                writeSequenceValue(m_BinaryWriter,_aValue, aTargetType);
-            }
-        }
-        // -----------------------------------------------------------------------------	
-
-        void BinaryWriteHandler::writeFileHeader(   rtl::OUString const & _aSchemaVersion, 
-                                                    const uno::Sequence<rtl::OUString> & aKnownLocales,
-                                                    const uno::Sequence<rtl::OUString> & aDataLocales  )
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            m_BinaryWriter.write(binary::CFG_BINARY_MAGIC);
-            m_BinaryWriter.write(binary::CFG_BINARY_VERSION);
-            m_BinaryWriter.write(_aSchemaVersion);
-            writeSequence(m_BinaryWriter,aKnownLocales);
-            writeSequence(m_BinaryWriter,aDataLocales);
-            m_BinaryWriter.write(m_aComponentName);
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::writeGroupNode(rtl::OUString const& _aName,node::Attributes const& _aAttributes )
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            writeAttributes(_aAttributes );
-            m_BinaryWriter.write(_aName);
-        }
-        
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::writeSetNode(rtl::OUString const& _aName,
-                                              rtl::OUString const& _aTemplateName,
-                                              rtl::OUString const& _aTemplateModule,
-                                              node::Attributes const& _aAttributes)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            writeAttributes(_aAttributes );
-            m_BinaryWriter.write(_aName);
-            m_BinaryWriter.write(_aTemplateName);
-            m_BinaryWriter.write(_aTemplateModule);
-        }
-        // -----------------------------------------------------------------------------
-        
-        void BinaryWriteHandler::writeLayerInfoList(uno::Reference<backenduno::XLayer> const * pLayers, sal_Int32 nNumLayers)                    
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            
-            m_BinaryWriter.write(nNumLayers);
-            for (sal_Int32 i = 0 ; i < nNumLayers ; ++ i) 
-            {
-                uno::Reference<util::XTimeStamped> xTimeStamp = uno::Reference<util::XTimeStamped>(pLayers[i], uno::UNO_QUERY);
-
-                rtl::OUString aTimeStamp = xTimeStamp.is() ? xTimeStamp->getTimestamp() : rtl::OUString();
-                m_BinaryWriter.write(aTimeStamp);
-            }
-            
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::writeNodeType(binary::NodeType::Type _eType)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            sal_Int8 nValue = static_cast< sal_Int8 >( _eType );
-            m_BinaryWriter.write(nValue);
-        
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::writeAttributes(node::Attributes const& _aAttributes)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-                    sal_Int8 nValue = static_cast< sal_Int8 >( _aAttributes.state() );
-
-            OSL_ASSERT(0 <= nValue && nValue <= 3);
-
-            OSL_ENSURE(!_aAttributes.isReadonly() || !_aAttributes.isFinalized(),"Unexpected attribute mix: node is both read-only and finalized");
-
-            nValue |= (_aAttributes.isReadonly()     ? 1 : 0) << 2;
-            nValue |= (_aAttributes.isFinalized()    ? 1 : 0) << 3;
-
-            nValue |= (_aAttributes.isNullable()	  ? 1 : 0) << 4;
-            nValue |= (_aAttributes.isLocalized()	  ? 1 : 0) << 5;
-
-            nValue |= (_aAttributes.isMandatory()	  ? 1 : 0) << 6;
-            nValue |= (_aAttributes.isRemovable()	  ? 1 : 0) << 7;
-            
-            m_BinaryWriter.write(nValue);
-        
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::writeValueNode(rtl::OUString const& _aName, 
-                                                node::Attributes const& _aAttributes,
-                                                uno::Type const& _aType, 
-                                                uno::Any const& _aUserValue, 
-                                                uno::Any const& _aDefaultValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            //write value flags
-            binary::ValueFlags::Type eType = convertTypeToValueType(_aType);
-            sal_Int8 nValueType = sal_Int8(eType);
-            
-            bool hasUserValue   = _aUserValue.hasValue();
-            bool hasDefault     = _aDefaultValue.hasValue();
-
-            if (!hasUserValue)  nValueType |=  binary::ValueFlags::first_value_NULL;
-            if (!hasDefault)    nValueType |=  binary::ValueFlags::second_value_NULL;
-
-            m_BinaryWriter.write(nValueType);
-            writeAttributes(_aAttributes );
-            m_BinaryWriter.write(_aName);	
-            
-            if(hasUserValue)    
-            {
-                OSL_ENSURE(_aUserValue.getValueType() == _aType, "Type mismatch in value node");
-                writeValue(_aUserValue);
-            }
-            if(hasDefault)
-            {
-                OSL_ENSURE(_aDefaultValue.getValueType() == _aType, "Type mismatch in value node");
-                writeValue(_aDefaultValue);
-            }
-        }
-        // -----------------------------------------------------------------------------
-        
-        void BinaryWriteHandler::writeStop()
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            sal_Int8 nStopValue = 0;
-            m_BinaryWriter.write(nStopValue);
-        }
-         // -----------------------------------------------------------------------------	
-
-        void BinaryWriteHandler::writeComponentTree(const ISubtree * _pComponentTree)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            this->writeNodeType(binary::NodeType::component);
-            if (_pComponentTree)
-            {
-                this->writeTree(*_pComponentTree);
-                this->writeStop();
-            }
-            else
-            {
-                this->writeNodeType(binary::NodeType::nodata);
-            }
-        }
-         // -----------------------------------------------------------------------------	
-
-        void BinaryWriteHandler::writeTemplatesTree(const ISubtree * _pTemplatesTree)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            this->writeNodeType(binary::NodeType::templates);
-            if (_pTemplatesTree)
-            {
-                this->writeTree(*_pTemplatesTree);
-                this->writeStop();
-            }
-            else
-            {
-                this->writeNodeType(binary::NodeType::nodata);
-            }
-        }
-         // -----------------------------------------------------------------------------	
-
-        void BinaryWriteHandler::writeTree(const ISubtree & rTree)
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            if ( rTree.isSetNode() )
-            {
-                this->writeNodeType(binary::NodeType::setnode);
-                this->writeSetNode( rTree.getName(),
-                                    rTree.getElementTemplateName(),
-                                    rTree.getElementTemplateModule(),
-                                    rTree.getAttributes());
-            }
-            else
-            {
-                this->writeNodeType(binary::NodeType::groupnode);
-                this->writeGroupNode( rTree.getName(), rTree.getAttributes() );
-            }	
-        
-            // process children
-            this->applyToChildren(rTree);	
-
-            this->writeStop();
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::handle(const ISubtree & rTree)
-        {
-            writeTree(rTree);
-        }
-        // -----------------------------------------------------------------------------
-
-        void BinaryWriteHandler::handle(const ValueNode & rValue)
-        {
-            this->writeNodeType(binary::NodeType::valuenode);
-
-            this->writeValueNode(   rValue.getName(), 
-                                    rValue.getAttributes(),
-                                    rValue.getValueType(),
-                                    rValue.getUserValue(),
-                                    rValue.getDefault() );
-        }
-        // -----------------------------------------------------------------------------
-
-        bool BinaryWriteHandler::generateHeader(const uno::Reference<backenduno::XLayer> * pLayers,
-                                                 sal_Int32 nNumLayers,
-                                                const rtl::OUString& aEntity, 
-                                                const std::vector< com::sun::star::lang::Locale > & aKnownLocales )
-            SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            //Open the writer
-            if (!m_BinaryWriter.open())
-                return false;
-
-            this->writeFileHeader(  aEntity, 
-                                    localehelper::makeIsoSequence(aKnownLocales), 
-                                    getAvailableLocales(pLayers,nNumLayers) );
-
-            this->writeLayerInfoList(pLayers, nNumLayers);
-            return true; 
-        }
-        // -----------------------------------------------------------------------------
-
-    }
-   // -----------------------------------------------------------------------------
-}
diff --git a/configmgr/source/backend/binarywritehandler.hxx b/configmgr/source/backend/binarywritehandler.hxx
deleted file mode 100644
index 366b4c78df..0000000000
--- a/configmgr/source/backend/binarywritehandler.hxx
+++ /dev/null
@@ -1,120 +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: binarywritehandler.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 CONFIGMGR_BINARYWRITEHANDLER_HXX
-#define CONFIGMGR_BINARYWRITEHANDLER_HXX
-
-#include "valuenode.hxx"
-#include "binarywriter.hxx"
-#include "binarytype.hxx"
-#include "attributes.hxx"
-#include "matchlocale.hxx"
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/io/IOException.hpp>
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace css = com::sun::star;
-    
-        namespace io   = css::io;
-        namespace uno  = css::uno;
-        namespace backenduno = css::configuration::backend  ;
-        
-        // -----------------------------------------------------------------------------
-        class BinaryWriteHandler : private NodeAction
-        {
-            BinaryWriter    m_BinaryWriter;
-            rtl::OUString   m_aComponentName;
-            
-        public:
-            BinaryWriteHandler(rtl::OUString const & _aFileURL, rtl::OUString const & _aComponentName, uno::Reference<lang::XMultiServiceFactory> const & _aFactory);
-
-            bool generateHeader(    const uno::Reference<backenduno::XLayer> * pLayers,
-                                     sal_Int32 nNumLayers,
-                                    const rtl::OUString& aEntity, 
-                                    const std::vector< com::sun::star::lang::Locale > & aKnownLocales )
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeComponentTree(const ISubtree * _pComponentTree)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void writeTemplatesTree(const ISubtree * _pTemplatesTree)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-        private:
-            void writeTree(ISubtree const & rTree)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-
-            // Node Action
-            virtual void handle(ISubtree  const & aSubtree);
-            virtual void handle(ValueNode const & aValue);
-        private:
-            void writeFileHeader(   rtl::OUString const & _aSchemaVersion, 
-                                    const uno::Sequence<rtl::OUString> & aKnownLocales,
-                                    const uno::Sequence<rtl::OUString> & aDataLocales  )
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeLayerInfoList(uno::Reference<backenduno::XLayer> const * pLayers, sal_Int32 nNumlayers)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeGroupNode(rtl::OUString const& _aName,node::Attributes const& _aAttributes)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeValueNode(rtl::OUString const& _aName, 
-                                node::Attributes const& _aAttributes,
-                                uno::Type const& _aType, 
-                                uno::Any const& _aUserValue, 
-                                uno::Any const& _aDefaultValue)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeSetNode(rtl::OUString const& _aName,
-                              rtl::OUString const& _aTemplateName,
-                              rtl::OUString const& _aTemplateModule,
-                              node::Attributes const& _aAttributes)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeAttributes(node::Attributes const& _aAttributes)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeNodeType(binary::NodeType::Type _eType)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeStop()
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-            
-            void writeValue( uno::Any const& _aValue)
-                SAL_THROW( (io::IOException, uno::RuntimeException) );
-        
-        };
-    // ---------------------------------------------------------------------------
-    }
- // -----------------------------------------------------------------------------
-}// namespace configmgr
-#endif
diff --git a/configmgr/source/backend/binarywriter.cxx b/configmgr/source/backend/binarywriter.cxx
deleted file mode 100644
index fafe25f3f1..0000000000
--- a/configmgr/source/backend/binarywriter.cxx
+++ /dev/null
@@ -1,218 +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: binarywriter.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_configmgr.hxx"
-
-#include "binarywriter.hxx"
-#include "valuenode.hxx"
-#include "filehelper.hxx"
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include "oslstream.hxx"
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XDataOutputStream.hpp>
-#include "typeconverter.hxx"
-#include "binarytype.hxx"
-#include "simpletypehelper.hxx"
-
-#define ASCII(x) rtl::OUString::createFromAscii(x)
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace uno = com::sun::star::uno;
-        namespace io = com::sun::star::io;
-
-        BinaryWriter::BinaryWriter(rtl::OUString const &_aFileURL, uno::Reference<lang::XMultiServiceFactory> const& _xServiceProvider)
-        : m_aFileURL(_aFileURL)
-        , m_xServiceProvider(_xServiceProvider)	
-        , m_xDataOutputStream()
-        {}
-    
-        bool BinaryWriter::open() SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            if (m_aFileURL.getLength() == 0)
-                return false;
-
-            OSL_ENSURE(!m_xDataOutputStream.is(), "Binary Writer: already open");
-            if ( m_xDataOutputStream.is())
-                return false;
-
-            if (FileHelper::fileExists(m_aFileURL))
-            {
-                if (osl::File::RC errorCode = osl::File::remove(m_aFileURL))
-                {
-                    // creating the file will fail later
-                    OSL_TRACE("Binary Cache: Cannot remove existing file [%d]",int(errorCode));
-                }
-            }
-            else
-            {
-                //create missing directories					
-                rtl::OUString parentDirectory = FileHelper::getParentDir(m_aFileURL) ;
-
-                if (osl::File::RC errorCode = FileHelper::mkdirs(parentDirectory)) 
-                {
-                    // creating the file will fail later
-                    OSL_TRACE("Binary Cache: Cannot create package cache directory [%d]",int(errorCode));
-                }
-            }
-            
-            uno::Reference<io::XOutputStream> xOutput = new BufferedFileOutputStream(m_aFileURL, true, 1024);
-
-            uno::Reference< io::XActiveDataSource > xFormattingStream(
-                    m_xServiceProvider->createInstance(ASCII("com.sun.star.io.DataOutputStream")), 
-                    uno::UNO_QUERY_THROW);
-
-            xFormattingStream->setOutputStream(xOutput);
-            
-            m_xDataOutputStream.set(xFormattingStream, uno::UNO_QUERY_THROW);
-
-            OSL_ASSERT(m_xDataOutputStream.is());
-            return m_xDataOutputStream.is();
-        }
-    
-        void BinaryWriter::close() SAL_THROW( (io::IOException, uno::RuntimeException) )
-        {
-            if (m_xDataOutputStream.is())
-                m_xDataOutputStream->closeOutput();
-    
-            m_xDataOutputStream.clear();
-        }
-
-        BinaryWriter::~BinaryWriter()
-        {
-            try 
-            {
-                close();
-            }
-            catch (uno::Exception& e)
-            {
-                            (void)e;
-                OSL_ENSURE(false, rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_ASCII_US).getStr());
-            }			
-        }
-    
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
-    void BinaryWriter::write(sal_Bool _aValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // write one byte
-        m_xDataOutputStream->writeBoolean(_aValue);
-    }
-    void BinaryWriter::write(sal_Int8 _aValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // write one byte
-        m_xDataOutputStream->writeByte(_aValue);
-    }
-    void BinaryWriter::write(sal_Int16 _aValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // write two bytes
-        m_xDataOutputStream->writeShort(_aValue);
-    }
-    void BinaryWriter::write(sal_Int32 _aValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // write four byte
-        m_xDataOutputStream->writeLong(_aValue);
-    }
-    void BinaryWriter::write(sal_Int64 _aValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // write eight byte
-        m_xDataOutputStream->writeHyper(_aValue);
-    }
-    void BinaryWriter::write(double _aValue)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // write eight byte
-        m_xDataOutputStream->writeDouble(_aValue);
-    }
-
-    // -----------------------------------------------------------------------------
-    bool isAsciiEncoding(rtl::OUString const& _aStr)
-    {
-        const sal_Unicode *pStr = _aStr.getStr();
-        sal_Int32 nLen = _aStr.getLength();
-        while (nLen--)
-        {
-            if (*pStr++ > 127)
-                return false;
-        }
-        return true;
-    }
-    
-    // -----------------------------------------------------------------------------
-    void BinaryWriter::write(rtl::OUString const& _aStr)
-        SAL_THROW( (io::IOException, uno::RuntimeException) )
-    {
-        // @@@ OBinaryBaseReader_Impl::readUTF() @@@
-
-        rtl::OString aUTF;
-        // to fasten the conversion for ascii data, we mask the length
-        bool bIsAscii = isAsciiEncoding(_aStr);
-        if (bIsAscii)
-            rtl_uString2String (
-                &(aUTF.pData), _aStr.getStr(), _aStr.getLength(),
-                RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS);
-        else
-            rtl_uString2String (
-                &(aUTF.pData), _aStr.getStr(), _aStr.getLength(),
-                RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-
-        sal_Int32 nLength = aUTF.getLength();		
-        uno::Sequence<sal_Int8> aData (nLength);
-        memcpy (aData.getArray(), aUTF.getStr(), nLength);
-
-        OSL_ENSURE((nLength & binary::STR_ASCII_MASK) == 0,"String too long");
-        if (bIsAscii) 
-        {
-            nLength |= binary::STR_ASCII_MASK;
-            OSL_ASSERT((nLength &  binary::STR_ASCII_MASK) == binary::STR_ASCII_MASK);
-            OSL_ASSERT(sal_Int32(nLength & ~binary::STR_ASCII_MASK) == aData.getLength());
-        }
-        m_xDataOutputStream->writeLong (nLength);
-
-        m_xDataOutputStream->writeBytes (aData);
-    }
-    
-    // -----------------------------------------------------------------------------
-
-    // -----------------------------------------------------------------------------
-   } 
-// -----------------------------------------------------------------------------
-}
diff --git a/configmgr/source/backend/binarywriter.hxx b/configmgr/source/backend/binarywriter.hxx
deleted file mode 100644
index 58c11b82c9..0000000000
--- a/configmgr/source/backend/binarywriter.hxx
+++ /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: binarywriter.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 CONFIGMGR_BINARYWRITER_HXX
-#define CONFIGMGR_BINARYWRITER_HXX
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XDataOutputStream.hpp>
-
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        namespace css = com::sun::star;
-    
-        namespace io   = css::io;
-        namespace uno  = css::uno;
-        namespace lang = css::lang;
-        // -----------------------------------------------------------------------------
-
-        class BinaryWriter
-        {
-            rtl::OUString      	m_aFileURL;
-            
-            uno::Reference<lang::XMultiServiceFactory> m_xServiceProvider;
-            uno::Reference< io::XDataOutputStream > m_xDataOutputStream;
-            
-        public:
-            BinaryWriter(rtl::OUString const& m_aFilename, uno::Reference<lang::XMultiServiceFactory> const& _rxServiceProvider);
-        
-            ~BinaryWriter();
-            bool open()  SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void close() SAL_THROW( (io::IOException, uno::RuntimeException) );		
-
-            // Type writer
-            void write(sal_Bool _bValue)    SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void write(sal_Int8 _nValue)    SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void write(sal_Int16 _nValue)   SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void write(sal_Int32 _nValue)   SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void write(sal_Int64 _nValue)   SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void write(double _nValue)      SAL_THROW( (io::IOException, uno::RuntimeException) );
-            void write(rtl::OUString const& _aStr) SAL_THROW( (io::IOException, uno::RuntimeException) );
-    
-        };
-    } //namespace backend
-} // namespace configmgr
-
-#endif
diff --git a/configmgr/source/backend/componentdatahelper.cxx b/configmgr/source/backend/componentdatahelper.cxx
deleted file mode 100644
index 0007ac1bb7..0000000000
--- a/configmgr/source/backend/componentdatahelper.cxx
+++ /dev/null
@@ -1,617 +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: componentdatahelper.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_configmgr.hxx"
-
-#include "componentdatahelper.hxx"
-#include "treenodefactory.hxx"
-#include "typeconverter.hxx"
-#include "strdecl.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/beans/IllegalTypeException.hpp>
-#include <com/sun/star/beans/PropertyExistException.hpp>
-#include <com/sun/star/beans/UnknownPropertyException.hpp>
-
-// -----------------------------------------------------------------------------
-#define OUSTR( str ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(str) )
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace beans     = ::com::sun::star::beans;
-        namespace container = ::com::sun::star::container;
-// -----------------------------------------------------------------------------
-
-DataBuilderContext::DataBuilderContext( uno::Reference< uno::XComponentContext > const & xContext ) 
-: m_aLogger(xContext)
-, m_aParentStack()
-, m_aActiveComponent()
-, m_pContext()
-, m_aExpectedComponentName(rtl::OUString())
-{
-
-}
-// -----------------------------------------------------------------------------
-
-DataBuilderContext::DataBuilderContext( uno::Reference< uno::XComponentContext > const & xContext, uno::XInterface * _pContext, ITemplateDataProvider* aTemplateProvider ) 
-: m_aLogger(xContext)
-, m_aParentStack()
-, m_aActiveComponent()
-, m_pContext(_pContext)
-, m_aExpectedComponentName()
-, m_aTemplateProvider( aTemplateProvider )
-{
-
-}
-// -----------------------------------------------------------------------------
-
-DataBuilderContext::DataBuilderContext( uno::Reference< uno::XComponentContext > const & xContext, uno::XInterface * _pContext, const rtl::OUString& aExpectedComponentName, ITemplateDataProvider* aTemplateProvider ) 
-: m_aLogger(xContext)
-, m_aParentStack()
-, m_aActiveComponent()
-, m_pContext(_pContext)
-, m_aExpectedComponentName( aExpectedComponentName )
-, m_aTemplateProvider( aTemplateProvider )
-{
-
-}
-// -----------------------------------------------------------------------------
-
-DataBuilderContext::DataBuilderContext(DataBuilderContext const & aBaseContext, uno::XInterface * _pContext)
-: m_aLogger(aBaseContext.m_aLogger)
-, m_aParentStack()
-, m_aActiveComponent()
-, m_pContext(_pContext)
-, m_aExpectedComponentName()
-, m_aTemplateProvider( aBaseContext.m_aTemplateProvider )
-{
-
-}
-// -----------------------------------------------------------------------------
-
-DataBuilderContext::~DataBuilderContext(  ) 
-{
-
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::raiseMalformedDataException(sal_Char const * _pText) const
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException, com::sun::star::uno::RuntimeException))
-{
-    rtl::OUString const sMessage = makeMessageWithPath(_pText);
-    m_aLogger.error(sMessage,"parse","configmgr::backend::DataBuilder");
-    throw backenduno::MalformedDataException(sMessage, m_pContext, uno::Any());
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::raiseIllegalTypeException(sal_Char const * _pText) const
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException, com::sun::star::uno::RuntimeException))
-{
-    rtl::OUString const sMessage = makeMessageWithPath(_pText);
-    beans::IllegalTypeException e(sMessage, m_pContext);
-
-    rtl::OUString const sFullMessage = OUSTR("Illegal Type: ").concat(sMessage);
-    m_aLogger.error(sFullMessage,"parse","configmgr::backend::DataBuilder");
-    throw backenduno::MalformedDataException(sFullMessage, m_pContext, uno::makeAny(e));
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::raiseIllegalArgumentException(sal_Char const * _pText, sal_Int16 _nPos) const
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    rtl::OUString const sMessage = makeMessageWithPath(_pText);
-    lang::IllegalArgumentException e(sMessage, m_pContext, _nPos);
-
-    rtl::OUString const sFullMessage = OUSTR("Illegal Argument: ").concat(sMessage);
-    m_aLogger.error(sFullMessage,"parse","configmgr::backend::DataBuilder");
-    throw backenduno::MalformedDataException(sFullMessage, m_pContext, uno::makeAny(e));
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::raiseNoSuchElementException(sal_Char const * _pText, rtl::OUString const & _sElement) const
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    rtl::OUString const sMessage = makeMessageWithName(_pText,_sElement);
-    container::NoSuchElementException e(sMessage, m_pContext);
-
-    rtl::OUString const sFullMessage = OUSTR("No Such Node: ").concat(sMessage);
-    m_aLogger.error(sFullMessage,"parse","configmgr::backend::DataBuilder");
-    throw backenduno::MalformedDataException(sFullMessage, m_pContext, uno::makeAny(e));
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::raiseElementExistException(sal_Char const * _pText, rtl::OUString const & _sElement) const
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    rtl::OUString const sMessage = makeMessageWithName(_pText,_sElement);
-    container::ElementExistException e(sMessage, m_pContext);
-
-    rtl::OUString const sFullMessage = OUSTR("Node Already Exists: ").concat(sMessage);
-    m_aLogger.error(sFullMessage,"parse","configmgr::backend::DataBuilder");
-    throw backenduno::MalformedDataException(sFullMessage, m_pContext, uno::makeAny(e));
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::raisePropertyExistException(sal_Char const * _pText, rtl::OUString const & _sElement) const
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    rtl::OUString const sMessage = makeMessageWithName(_pText,_sElement);
-    beans::PropertyExistException e(sMessage, m_pContext);
-
-    rtl::OUString const sFullMessage = OUSTR("No Such Property: ").concat(sMessage);
-    m_aLogger.error(sFullMessage,"parse","configmgr::backend::DataBuilder");
-    throw backenduno::MalformedDataException(sFullMessage, m_pContext, uno::makeAny(e));
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString DataBuilderContext::makeMessageWithPath(sal_Char const * _pText) const
-        SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    rtl::OUStringBuffer sMessage;
-    sMessage.appendAscii(_pText);
-
-    sMessage.appendAscii(" [@").append(getNodeParentagePath()).appendAscii("] ");
-
-    return sMessage.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString DataBuilderContext::makeMessageWithName(sal_Char const * _pText, rtl::OUString const & _aName) const
-        SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    rtl::OUStringBuffer sMessage;
-    sMessage.appendAscii(_pText);
-
-    if (_aName.getLength() != 0)
-        sMessage.appendAscii(" [").append(getNodePath(_aName)).appendAscii("] ");
-    else
-        sMessage.appendAscii(" [@").append(getNodeParentagePath()).appendAscii("] ");
-
-    return sMessage.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
-const sal_Unicode k_pathsep = '/';
-
-rtl::OUString DataBuilderContext::getNodeParentagePath() const
-{
-    rtl::OUStringBuffer path;
-
-    for (Stack< ISubtree * >::bottomup_iterator it = m_aParentStack.begin_up();
-            it != m_aParentStack.end_up(); ++it)
-    {
-        OSL_ASSERT(*it);
-        path.append(k_pathsep).append((**it).getName());
-    }
-
-    return path.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString DataBuilderContext::getNodePath(rtl::OUString const & aNodeName) const
-{
-    rtl::OUStringBuffer path( getNodeParentagePath() );
-
-    path.append(k_pathsep).append(aNodeName);
-
-    return path.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-bool DataBuilderContext::isDone() const
-{ 
-    OSL_ENSURE(m_aParentStack.empty() || hasActiveComponent(),"DataBuilderContext:Inconsistent Activity state");
-
-    return m_aParentStack.empty();
-}
-// -----------------------------------------------------------------------------
-
-ISubtree & DataBuilderContext::implGetCurrentParent() const
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    if (m_aParentStack.empty())
-        raiseMalformedDataException("Invalid Component Data: Operation requires open parent node.");
-
-    OSL_ENSURE( m_aParentStack.top(), "NULL tree on node-stack" );
-
-    return *m_aParentStack.top();
-}
-// -----------------------------------------------------------------------------
-
-bool DataBuilderContext::isWritable(INode const * pNode) const
-        SAL_THROW(())
-{
-    OSL_PRECOND(pNode,"Unexpected NULL node pointer");
-    return pNode->getAttributes().isWritable();
-
-}
-// -----------------------------------------------------------------------------
-
-bool DataBuilderContext::isRemovable(ISubtree const * pItem) const
-        SAL_THROW(())
-{
-    OSL_PRECOND(pItem,"Unexpected NULL item pointer");
-    return pItem->getAttributes().isRemovable();
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-rtl::OUString DataBuilderContext::getTemplateComponent( const backenduno::TemplateIdentifier& aItemType ) const
-{
-    if (aItemType.Component.getLength() != 0)
-        return aItemType.Component;
-
-    else
-        return getActiveComponent();
-}
-// -----------------------------------------------------------------------------
-
-backenduno::TemplateIdentifier DataBuilderContext::completeComponent( const backenduno::TemplateIdentifier& aItemType ) const
-{
-    backenduno::TemplateIdentifier aComplete(aItemType);
-    if (aComplete.Component.getLength() == 0)
-        aComplete.Component = getActiveComponent();
-
-    return aComplete;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-backenduno::TemplateIdentifier DataBuilderContext::getCurrentItemType() const 
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    ISubtree const * pCurrentSet = getCurrentParent().asISubtree();
-    if (!pCurrentSet || !pCurrentSet->isSetNode())
-        raiseMalformedDataException("Component Builder Context: Cannot add/replace node - context is not a set");
-    
-    backenduno::TemplateIdentifier aCompleteType;
-    
-    aCompleteType.Name      = pCurrentSet->getElementTemplateName();
-    aCompleteType.Component = pCurrentSet->getElementTemplateModule();
-   
-    return aCompleteType;
-}
-// -----------------------------------------------------------------------------
-
-backenduno::TemplateIdentifier DataBuilderContext::getValidItemType(backenduno::TemplateIdentifier const & aItemType) const 
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    ISubtree const * pCurrentSet = getCurrentParent().asISubtree();
-    if (!pCurrentSet || !pCurrentSet->isSetNode())
-        raiseMalformedDataException("Component Builder Context: Cannot add/replace node - context is not a set");
-        
-    backenduno::TemplateIdentifier aCompleteType = completeComponent( aItemType );
-    
-    // for now only a single item-type is supported
-    if (aCompleteType.Name != pCurrentSet->getElementTemplateName())
-        raiseIllegalTypeException("Component Builder Context: Cannot add/replace node - template is not permitted in containing set");
-
-    if (aCompleteType.Component != pCurrentSet->getElementTemplateModule())
-        raiseIllegalTypeException("Component Builder Context: Cannot add/replace node - template is not permitted in containing set (component mismatch)");
-
-    return aCompleteType;
-}
-// -----------------------------------------------------------------------------
-
-ISubtree  * DataBuilderContext::addNodeToCurrent(std::auto_ptr<ISubtree>  _aNode)
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(_aNode.get(), "ERROR: Adding a NULL node");
-
-    if (this->findChild(_aNode->getName()))
-        raiseElementExistException("Component Builder Context: The node to be added does already exist", _aNode->getName());
-
-    return getCurrentParent().addChild( base_ptr(_aNode) )->asISubtree();
-}
-// -----------------------------------------------------------------------------
-
-ISubtree  * DataBuilderContext::addLocalizedToCurrent(std::auto_ptr<ISubtree>  _aNode)
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(_aNode.get(), "ERROR: Adding a NULL node");
-
-    if (this->findChild(_aNode->getName()))
-        raisePropertyExistException("Component Builder Context: The property to be added does already exist", _aNode->getName());
-
-    return getCurrentParent().addChild( base_ptr(_aNode) )->asISubtree();
-}
-// -----------------------------------------------------------------------------
-
-ValueNode * DataBuilderContext::addPropertyToCurrent(std::auto_ptr<ValueNode> _aNode, bool _bMayReplace)
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(_aNode.get(), "ERROR: Adding a NULL node");
-    OSL_PRECOND(!_bMayReplace || _aNode->getAttributes().isReplacedForUser(), "Wrong status for added property");
-
-    if (this->findChild(_aNode->getName()))
-    {
-        // We currently may get a 'replace', when overriding an added property
-        if (_bMayReplace && getCurrentParent().isSetNode()) 
-        {
-            getCurrentParent().removeChild(_aNode->getName());
-            _aNode->modifyState(node::isReplaced);
-        }
-        else
-
-            raisePropertyExistException("Component Builder Context: The property to be added does already exist", _aNode->getName());
-    }
-    return getCurrentParent().addChild( base_ptr(_aNode) )->asValueNode();
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::markCurrentMerged()
-{
-    Stack< ISubtree * >::topdown_iterator it = m_aParentStack.begin_down(), end = m_aParentStack.end_down();
-    for ( ;it != end && (*it)->isDefault(); ++it)
-        (*it)->modifyState( node::isMerged );
-
-#if OSL_DEBUG_LEVEL > 0
-    for ( ;it != end; ++it)
-        OSL_ENSURE(!(*it)->isDefault(),"Found a default node in ancestry of a merged change");
-#endif
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-bool DataBuilderContext::isProperty(INode * pProp) const
-        SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(pProp, "ERROR: Unexpected NULL node");
-
-    if (pProp == NULL)
-    {
-        rtl::OUString sMsg =  makeMessageWithName("INTERNAL ERROR (DataBuilderContext): Trying to inspect NULL node",rtl::OUString() );
-        throw uno::RuntimeException( sMsg, m_pContext );
-    }
-    
-    if ( ISubtree * pTree = pProp->asISubtree() )
-        return isLocalizedValueSet( *pTree );
-
-    OSL_ASSERT(dynamic_cast< ValueNode * >(pProp) != 0);
-    return true;
-}
-// -----------------------------------------------------------------------------
-            
-INode * DataBuilderContext::findChild(rtl::OUString const & _aName)
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    return getCurrentParent().getChild(_aName);
-}
-// -----------------------------------------------------------------------------
-            
-INode * DataBuilderContext::findProperty(rtl::OUString const & _aName)
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    INode * pResult = findChild(_aName);
-    if (pResult && !isProperty(pResult))
-    {
-        raiseMalformedDataException("Component Builder Context: Found an existing inner node, where a property was expected");
-    }
-    return pResult;
-}
-// -----------------------------------------------------------------------------
-
-ISubtree * DataBuilderContext::findNode(rtl::OUString const & _aName) 
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    INode * pResult = findChild(_aName);
-
-    if (!pResult) 
-        return NULL;
-
-    if (!isNode(pResult))
-        raiseMalformedDataException("Component Builder Context: Found an existing property, where an inner node was expected");
-
-    OSL_ASSERT(dynamic_cast< ISubtree * >(pResult) != 0);
-    return pResult->asISubtree();
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::pushNode(ISubtree * pTree)
-        SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(hasActiveComponent(), "Component Builder Context: Entering a node without having an active component");
-    OSL_PRECOND(pTree, "ERROR: Pushing a NULL tree");
-
-    if (pTree == NULL)
-    {
-        rtl::OUString sMsg =  makeMessageWithName("INTERNAL ERROR (DataBuilderContext): Trying to push NULL tree",rtl::OUString() );
-        throw uno::RuntimeException( sMsg, m_pContext );
-    }
-    m_aParentStack.push(pTree);
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::popNode()
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(hasActiveComponent(), "Component Builder Context: Leaving a node without having an active component");
-    if (m_aParentStack.empty())
-        raiseMalformedDataException("Invalid Component Data: Unmatched end of node");
-
-    OSL_ENSURE( m_aParentStack.top(), "NULL tree on node-stack" );
-
-    m_aParentStack.pop();
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::startActiveComponent(rtl::OUString const & _aComponent)
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(!hasActiveComponent(), "Component Builder Context: Component is already active");
-    OSL_PRECOND(m_aParentStack.empty(),  "Component Builder Context: Starting Component/Template while inside a node");
-
-    if (!m_aParentStack.empty())
-        raiseMalformedDataException("Invalid Component Data: Starting component while node is still open");
-    
-    if (m_aExpectedComponentName.getLength()!=0)
-    {
-        if (m_aExpectedComponentName.compareTo ( _aComponent)!= 0 )
-            raiseMalformedDataException("Invalid Component Data: Component name does not match request");
-    }
-    m_aActiveComponent = _aComponent;
-
-    OSL_POSTCOND(hasActiveComponent(), "Component Builder Context: Could not start Component/Template");
-}
-// -----------------------------------------------------------------------------
-
-void DataBuilderContext::endActiveComponent()
-        SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND( hasActiveComponent(), "Component Builder Context: No Component active");
-    OSL_PRECOND(m_aParentStack.empty(), "Component Builder Context: Ending Component/Template while inside a node");
-
-    if (!m_aParentStack.empty())
-        raiseMalformedDataException("Invalid Component Data: Ending component while node is still open");
-
-    m_aActiveComponent = rtl::OUString();
-
-    OSL_POSTCOND(!hasActiveComponent(), "Component Builder Context: Could not end Component/Template");
-}
-// -----------------------------------------------------------------------------
-ResultHolder< TemplateInstance > DataBuilderContext::getTemplateData (TemplateRequest const & _aRequest  )
-{
-    return(m_aTemplateProvider->getTemplateData (_aRequest));
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-ComponentDataFactory::ComponentDataFactory() 
-: m_rNodeFactory( getDefaultTreeNodeFactory() )
-{
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ComponentDataFactory::createGroup( rtl::OUString const & _aName, 
-                                                            bool _bExtensible, 
-                                                            node::Attributes const & _aAttributes) const
-{
-    if (_bExtensible)
-    {
-        return getNodeFactory().createSetNode( _aName, 
-                                                toTemplateName(TYPE_ANY,false), 
-                                                TEMPLATE_MODULE_NATIVE_VALUE, 
-                                                _aAttributes );
-    }
-    else
-    {
-        return getNodeFactory().createGroupNode( _aName, 
-                                                 _aAttributes );
-    }
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ComponentDataFactory::createSet(rtl::OUString const & _aName, 
-                                                        backenduno::TemplateIdentifier const & _aItemType, 
-                                                        bool _bExtensible, 
-                                                        node::Attributes const & _aAttributes) const
-{
-    OSL_ENSURE(!_bExtensible, "DataBuilderContext: Unimplemented feature: Extensible Set node");
-    if (_bExtensible)
-        return std::auto_ptr<ISubtree>();
-
-    return getNodeFactory().createSetNode( _aName, 
-                                            _aItemType.Name, 
-                                            _aItemType.Component, 
-                                            _aAttributes );
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ComponentDataFactory::createLocalizedContainer( rtl::OUString const & _aName, 
-                                                                        uno::Type const & _aValueType, 
-                                                                        node::Attributes const & _aAttributes) const
-{
-    node::Attributes aLocalizedAttributes(_aAttributes);
-    aLocalizedAttributes.setLocalized (true);
-
-    return getNodeFactory().createSetNode( _aName, 
-                                            toTemplateName(_aValueType), 
-                                            TEMPLATE_MODULE_LOCALIZED_VALUE, 
-                                            aLocalizedAttributes );
-
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-namespace 
-{  
-    DECLARE_CONSTASCII_USTRING(INSTANCE_MARKER);
-    IMPLEMENT_CONSTASCII_USTRING(INSTANCE_MARKER, "instantiate@");
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ComponentDataFactory::createPlaceHolder(rtl::OUString const & _aName, 
-                                                                backenduno::TemplateIdentifier const & _aInstanceType) const
-{
-    return getNodeFactory().createSetNode( _aName,
-                                            INSTANCE_MARKER + _aInstanceType.Name,
-                                            _aInstanceType.Component,
-                                            node::Attributes());
-}
-// -----------------------------------------------------------------------------
-
-bool ComponentDataFactory::isInstancePlaceHolder(ISubtree const & _aInstanceTree)
-{
-    return !! _aInstanceTree.getElementTemplateName().match(INSTANCE_MARKER);
-}
-// -----------------------------------------------------------------------------
-
-backenduno::TemplateIdentifier ComponentDataFactory::getInstanceType(ISubtree const & _aInstanceTree)
-{
-    OSL_ENSURE( isInstancePlaceHolder(_aInstanceTree), "Instance placeholder tree expected" );
-
-    backenduno::TemplateIdentifier aResult;
-
-    if (isInstancePlaceHolder(_aInstanceTree))
-    {
-        aResult.Name      = _aInstanceTree.getElementTemplateName().copy( INSTANCE_MARKER.getLength() );
-        aResult.Component = _aInstanceTree.getElementTemplateModule();
-    }
-
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/componentdatahelper.hxx b/configmgr/source/backend/componentdatahelper.hxx
deleted file mode 100644
index f482274fca..0000000000
--- a/configmgr/source/backend/componentdatahelper.hxx
+++ /dev/null
@@ -1,222 +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: componentdatahelper.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.
- *
- ************************************************************************/
-
-/* PLEASE DON'T DELETE ANY COMMENT LINES, ALSO IT'S UNNECESSARY. */
-
-#ifndef CONFIGMGR_BACKEND_COMPONENTDATAHELPER_HXX
-#define CONFIGMGR_BACKEND_COMPONENTDATAHELPER_HXX
-
-#include "valuenode.hxx"
-#include "utility.hxx"
-#include "stack.hxx"
-#include <com/sun/star/configuration/backend/TemplateIdentifier.hpp>
-#include <com/sun/star/configuration/backend/MalformedDataException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-#include "mergeddataprovider.hxx"
-#ifndef CONFIGMGR_LOGGER_HXX_
-#include "logger.hxx"
-#endif
-#include "request.hxx"
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    class OTreeNodeFactory;
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno        = ::com::sun::star::uno;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-
-// -----------------------------------------------------------------------------
-
-        class DataBuilderContext
-        {
-            Logger                      m_aLogger;
-            Stack< ISubtree * >         m_aParentStack;
-            rtl::OUString                    m_aActiveComponent;
-            uno::XInterface *           m_pContext;
-            rtl::OUString					m_aExpectedComponentName;
-            ITemplateDataProvider *     m_aTemplateProvider;
-        public:
-            explicit DataBuilderContext(uno::Reference< uno::XComponentContext > const & xContext);
-            DataBuilderContext(uno::Reference< uno::XComponentContext > const & xContext, uno::XInterface * _pContext , ITemplateDataProvider*  aTemplateProvider = NULL);
-            DataBuilderContext(uno::Reference< uno::XComponentContext > const & xContext, uno::XInterface * _pContext, const rtl::OUString& aExpectedComponentName,ITemplateDataProvider*  aTemplateProvider = NULL );
-            DataBuilderContext(DataBuilderContext const & aBaseContext, uno::XInterface * _pContext);
-            ~DataBuilderContext();
-
-            bool        isDone() const;
-
-            bool        hasActiveComponent()    const { return m_aActiveComponent.getLength() != 0; }
-            rtl::OUString    getActiveComponent()    const { return m_aActiveComponent; }
-
-            ISubtree &          getCurrentParent()       
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-                { return implGetCurrentParent(); }
-
-            ISubtree const &    getCurrentParent() const 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-                { return implGetCurrentParent(); }
-
-            node::Attributes    getCurrentAttributes() const 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-                { return implGetCurrentParent().getAttributes(); }
-
-            ITemplateDataProvider * getTemplateProvider() const 
-            { return  m_aTemplateProvider; }
-            
-            rtl::OUString getTemplateComponent(backenduno::TemplateIdentifier const & aItemType ) const;
-
-            backenduno::TemplateIdentifier completeComponent(backenduno::TemplateIdentifier const & aItemType ) const;
-
-            backenduno::TemplateIdentifier getCurrentItemType() const 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            backenduno::TemplateIdentifier getValidItemType(backenduno::TemplateIdentifier const & aItemType) const 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void startActiveComponent(rtl::OUString const & _aComponent)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            void endActiveComponent()
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            bool isProperty(INode * pProp) const 
-                SAL_THROW((com::sun::star::uno::RuntimeException));
-
-            bool isNode(INode * pNode) const SAL_THROW((com::sun::star::uno::RuntimeException))
-            { return !isProperty(pNode); }
-
-            void pushNode(ISubtree * pTree)
-                SAL_THROW((com::sun::star::uno::RuntimeException));
-            void popNode()
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            INode    * findProperty(rtl::OUString const & _aName) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            ISubtree * findNode(rtl::OUString const & _aName)  
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            bool isWritable(INode const * pNode) const
-                SAL_THROW(());
-            bool isRemovable(ISubtree const * pItem) const
-                SAL_THROW(());
-
-            ISubtree  * addNodeToCurrent(std::auto_ptr<ISubtree>  _aNode)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            ISubtree  * addLocalizedToCurrent(std::auto_ptr<ISubtree>  _aNode)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            ValueNode * addPropertyToCurrent(std::auto_ptr<ValueNode> _aNode, bool _bMayReplace = false)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void markCurrentMerged();
-
-            // Logging support
-            Logger const & getLogger() const { return m_aLogger; }
-
-            rtl::OUString getNodeParentagePath() const;
-            rtl::OUString getNodePath(rtl::OUString const & aNodeName) const;
-            
-            // Exception support
-            void raiseMalformedDataException    (sal_Char const * _pText) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            void raiseIllegalArgumentException  (sal_Char const * _pText, sal_Int16 _nPos = 0) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            void raiseElementExistException     (sal_Char const * _pText, rtl::OUString const & _sElement) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            void raiseNoSuchElementException    (sal_Char const * _pText, rtl::OUString const & _sElement) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            void raisePropertyExistException    (sal_Char const * _pText, rtl::OUString const & _sElement) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            void raiseIllegalTypeException  (sal_Char const * _pText) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-            ResultHolder< TemplateInstance > getTemplateData (TemplateRequest const & _aRequest  );
-        private:
-            INode * findChild(rtl::OUString const & _aName)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            rtl::OUString makeMessageWithPath(sal_Char const * _pText) const
-                SAL_THROW((com::sun::star::uno::RuntimeException));
-
-            rtl::OUString makeMessageWithName(sal_Char const * _pText, rtl::OUString const & _aName) const
-                SAL_THROW((com::sun::star::uno::RuntimeException));
-
-            ISubtree & implGetCurrentParent() const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-           
-        };
-// -----------------------------------------------------------------------------
-
-        class ComponentDataFactory
-        {
-            OTreeNodeFactory &          m_rNodeFactory;
-        public:
-            ComponentDataFactory();
-
-            ComponentDataFactory(OTreeNodeFactory & _rNodeFactory)
-            : m_rNodeFactory(_rNodeFactory)
-            {}
-
-        public:
-            OTreeNodeFactory&   getNodeFactory() const { return m_rNodeFactory; }
-            
-            std::auto_ptr<ISubtree> createGroup(rtl::OUString const & _aName, 
-                                                bool _bExtensible, 
-                                                node::Attributes const & _aAttributes) const;
-
-            std::auto_ptr<ISubtree> createSet( rtl::OUString const & _aName, 
-                                                backenduno::TemplateIdentifier const & aItemType, 
-                                                bool _bExtensible, 
-                                                node::Attributes const & _aAttributes) const;
-
-            std::auto_ptr<ISubtree> createLocalizedContainer(rtl::OUString const & _aName, 
-                                                             uno::Type const & _aValueType, 
-                                                             node::Attributes const & _aAttributes) const;
-
-            std::auto_ptr<ISubtree> createPlaceHolder(rtl::OUString const & _aName, 
-                                                        backenduno::TemplateIdentifier const & _aInstanceType) const;
-
-            static bool isInstancePlaceHolder(ISubtree const & _aInstanceTree);
-            static backenduno::TemplateIdentifier getInstanceType(ISubtree const & _aInstanceTree);
-        };
-// -----------------------------------------------------------------------------
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/emptylayer.cxx b/configmgr/source/backend/emptylayer.cxx
deleted file mode 100644
index bd174556ee..0000000000
--- a/configmgr/source/backend/emptylayer.cxx
+++ /dev/null
@@ -1,228 +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: emptylayer.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_configmgr.hxx"
-
-#include "emptylayerimpl.hxx"
-#include "emptylayer.hxx"
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-        
-        uno::Reference< backenduno::XLayer > createEmptyLayer()
-        {
-            return new EmptyLayer();
-        }
-        // -----------------------------------------------------------------------------
-
-        bool checkEmptyLayer(uno::Reference< backenduno::XLayer > const & xLayer )
-        {
-            OSL_ENSURE(xLayer.is(),"Unexpected NULL Layer");
-            if (!xLayer.is()) return false;
-
-            RequireEmptyLayer * const pChecker = new RequireEmptyLayer;
-            uno::Reference< backenduno::XLayerHandler > xChecker(pChecker);
-
-            try
-            {
-                xLayer->readData(xChecker);
-            }
-            catch (uno::Exception &)
-            {
-                OSL_ENSURE(!pChecker->wasEmpty(), "Checking for empty layer: exception occurred after empty layer was ended");
-            }
-
-            return pChecker->wasEmpty();
-        }
-        
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-
-        EmptyLayer::~EmptyLayer( )
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL 
-            EmptyLayer::readData( const uno::Reference< backenduno::XLayerHandler >& aHandler ) 
-                throw (backenduno::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            if (aHandler.is()) 
-            {
-                aHandler->startLayer();
-                aHandler->endLayer();
-            }
-            else 
-                throw lang::NullPointerException(rtl::OUString::createFromAscii("EmptyLayer: Null Handler"),*this);
-        }
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-        
-        RequireEmptyLayer::RequireEmptyLayer()
-        : m_bStarted(false)
-        , m_bInvalid(false)
-        , m_bEmpty(false)
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        RequireEmptyLayer::~RequireEmptyLayer( )
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::startLayer(  ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            m_bInvalid  = false;
-            m_bEmpty    = false;
-
-            if (m_bStarted) fail("Layer started twice");
-            m_bStarted  = true;
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::endLayer(  ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            if (!m_bStarted) fail("Layer was not started");
-            m_bEmpty    = !m_bInvalid;
-            m_bStarted  = false;
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::overrideNode( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/, sal_Bool /*bClear*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::addOrReplaceNode( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::addOrReplaceNodeFromTemplate( const rtl::OUString& /*aName*/, const backenduno::TemplateIdentifier& /*aTemplate*/, sal_Int16 /*aAttributes*/) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::endNode(  ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::dropNode( const rtl::OUString& /*aName*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::addProperty( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/, const uno::Type& /*aType*/ )
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::addPropertyWithValue( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/, const uno::Any& /*aValue*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::overrideProperty( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/, const uno::Type& /*aType*/, sal_Bool /*bClear*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::endProperty(  ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::setPropertyValue( const uno::Any& /*aValue*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL RequireEmptyLayer::setPropertyValueForLocale( const uno::Any& /*aValue*/, const rtl::OUString& /*aLocale*/ ) 
-            throw (backenduno::MalformedDataException, uno::RuntimeException)
-        {
-            failNotEmpty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void RequireEmptyLayer::fail(sal_Char const * pMsg)
-        {
-            if (!m_bStarted & !m_bInvalid) pMsg = "Layer was not started";
-            m_bInvalid = true;
-            m_bStarted = false;
-
-            OSL_ASSERT(pMsg);
-            rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-
-            throw backenduno::MalformedDataException( sMsg, *this, uno::Any() );
-        }
-        
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-
-        // -----------------------------------------------------------------------------
-    } // namespace
-
-    // -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/emptylayerimpl.hxx b/configmgr/source/backend/emptylayerimpl.hxx
deleted file mode 100644
index 3c57face40..0000000000
--- a/configmgr/source/backend/emptylayerimpl.hxx
+++ /dev/null
@@ -1,139 +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: emptylayerimpl.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 CONFIGMGR_BACKEND_EMPTYLAYERIMPL_HXX
-#define CONFIGMGR_BACKEND_EMPTYLAYERIMPL_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace backenduno    = ::com::sun::star::configuration::backend;
-        // -----------------------------------------------------------------------------
-
-        class EmptyLayer : public cppu::WeakImplHelper1<backenduno::XLayer>
-        {
-        public:
-            virtual ~EmptyLayer();
-
-            // XLayer
-        public:
-            virtual void SAL_CALL 
-                readData( const uno::Reference< backenduno::XLayerHandler >& aHandler ) 
-                    throw (backenduno::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException);
-        };
-        // -----------------------------------------------------------------------------
-
-        class RequireEmptyLayer : public cppu::WeakImplHelper1<backenduno::XLayerHandler>
-        {
-        public:
-            RequireEmptyLayer();
-            virtual ~RequireEmptyLayer();
-
-            bool wasEmpty()     const { return m_bEmpty; }
-            bool wasInvalid()   const { return m_bInvalid; }
-            // XLayerHandler
-        public:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType )
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale ) 
-                    throw (backenduno::MalformedDataException, uno::RuntimeException);
-
-        private:
-            void failNotEmpty() { fail("layer is not empty"); }
-            void fail(sal_Char const * pMsg);
-
-        private:
-            bool m_bStarted;
-            bool m_bInvalid;
-            bool m_bEmpty;
-        };
-        // -----------------------------------------------------------------------------
-    } // namespace xml
-    // -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
diff --git a/configmgr/source/backend/importmergehandler.cxx b/configmgr/source/backend/importmergehandler.cxx
deleted file mode 100644
index df863cbc88..0000000000
--- a/configmgr/source/backend/importmergehandler.cxx
+++ /dev/null
@@ -1,299 +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: importmergehandler.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_configmgr.hxx"
-
-#include "importmergehandler.hxx"
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <rtl/ustrbuf.hxx>
-
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace beans = ::com::sun::star::beans;
-       
-// -----------------------------------------------------------------------------
-
-ImportMergeHandler::ImportMergeHandler( 
-    uno::Reference< backenduno::XBackend > const & xTargetBackend, Mode mode, rtl::OUString const & aEntity, sal_Bool const & bNotify )
-: BasicImportHandler(xTargetBackend,aEntity, bNotify)
-, m_xOutputHandler()
-, m_mode(mode)
-{
-}
-// -----------------------------------------------------------------------------
-
-void ImportMergeHandler::failNotStarted()
-{
-    OSL_ENSURE(!hasComponent(), "Import handler after failure to create output handler or after closing");
-    raiseMalformedDataException("configmgr::backend::ImportHandler: Trying to generate output before identifying the target component");
-}
-// -----------------------------------------------------------------------------
-
-inline bool ImportMergeHandler::isStarted()    const 
-{ 
-    return !! m_xOutputHandler.is(); 
-}
-// -----------------------------------------------------------------------------
-
-inline void ImportMergeHandler::checkStarted()  
-{ 
-    if (!isStarted()) failNotStarted(); 
-}
-// -----------------------------------------------------------------------------
-
-inline uno::Reference< backenduno::XUpdateHandler > ImportMergeHandler::getOutputHandler()
-{
-    checkStarted();
-    return m_xOutputHandler;
-}
-// -----------------------------------------------------------------------------
-
-static 
-bool setHandlerProperty(uno::Reference< uno::XInterface > const & xHandler, char const * property, sal_Bool value)
-{
-    OSL_ASSERT(property);
-    uno::Reference< lang::XInitialization > xInitHandler( xHandler, uno::UNO_QUERY );
-    if (xHandler.is())
-    try
-    {
-        uno::Sequence< uno::Any > aArgs(1);
-        aArgs[0] <<= beans::NamedValue( rtl::OUString::createFromAscii(property), uno::makeAny(value) );
-        xInitHandler->initialize(aArgs);
-        return true;
-    }
-    catch (uno::Exception & e)
-    {
-        OSL_TRACE("Configuration Import Handler - Could not set output handler property '%s': %s\n",
-                    property,rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_ASCII_US).getStr());
-
-        OSL_ENSURE(false, "Output Handler does not support expected property" );
-    }
-    else
-    {
-        OSL_TRACE("Configuration Import Handler - Could not set output handler property '%s': %s\n",
-                    property,"Object does not support expected interface");
-
-        OSL_ENSURE(false, "Output Handler does not support expected interface" );
-    }
-    return false;
-}
-// -----------------------------------------------------------------------------
-uno::Reference< backenduno::XUpdateHandler > ImportMergeHandler::createOutputHandler()
-{
-    OSL_PRECOND( hasComponent(), "Trying to create output-handler for Import Merger without setting a component first") ;
-    rtl::OUString const aComponentName = this->getComponent();
-
-    uno::Reference< backenduno::XUpdateHandler > xOutputHandler;
-    try
-    {
-        xOutputHandler =    hasEntity() ? getBackend()->getUpdateHandler(aComponentName,getEntity()) 
-                                        : getBackend()->getOwnUpdateHandler(aComponentName);
-    }
-    catch (lang::NoSupportException & e)
-    {
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("configmgr::backend::ImportHandler: ");
-        sMessage.appendAscii("Could not get output handler for component ").append(aComponentName);
-        sMessage.appendAscii(": Backend does not support updates - ").append( e.Message );
-
-        throw lang::WrappedTargetException(sMessage.makeStringAndClear(), *this, uno::makeAny(e));
-    }
-    catch (lang::IllegalArgumentException & e)
-    {
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("configmgr::backend::ImportHandler: ");
-        sMessage.appendAscii("Could not get output handler for component ").append(aComponentName);
-        sMessage.appendAscii(" due to a backend exception: ").append( e.Message );
-
-        throw lang::WrappedTargetException(sMessage.makeStringAndClear(), *this, uno::makeAny(e));
-    }
-
-    if (!xOutputHandler.is())
-    {
-        rtl::OUStringBuffer sMessage;
-        sMessage.appendAscii("configmgr::backend::ImportHandler: ");
-        sMessage.appendAscii("Cannot import. ERROR - The backend returns a NULL handler for component ")
-                .append(aComponentName).append( sal_Unicode('.') );
-
-        throw uno::RuntimeException(sMessage.makeStringAndClear(), *this);
-    }
-
-    switch (m_mode)
-    {
-    case merge: break;
-    case copy:          setHandlerProperty(xOutputHandler,"Truncate", sal_True);  break;
-    case no_overwrite:  setHandlerProperty(xOutputHandler,"Overwrite",sal_False); break;
-
-    default: OSL_ASSERT(false); break;
-    }
-
-    return xOutputHandler;
-}
-// -----------------------------------------------------------------------------
-
-// XLayerHandler
-
-void SAL_CALL ImportMergeHandler::startLayer(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    m_xOutputHandler.clear();
-
-    BasicImportHandler::startLayer();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::endLayer(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (isStarted())
-    try
-    {
-        getOutputHandler()->endUpdate();
-    }
-    catch (lang::IllegalAccessException & iae)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM("ImportHandler - no write access to layer: "));
-        throw lang::WrappedTargetException(sMsg.concat(iae.Message),*this,uno::makeAny(iae));
-    }
-    
-    BasicImportHandler::endLayer();
-    m_xOutputHandler.clear();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!isStarted() && startComponent(aName))
-    try
-    {
-        (m_xOutputHandler = createOutputHandler())->startUpdate(  );
-    }
-    catch (lang::IllegalAccessException & iae)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM("ImportHandler - no write access to layer: "));
-        throw lang::WrappedTargetException(sMsg.concat(iae.Message),*this,uno::makeAny(iae));
-    }
-
-    OSL_ENSURE(!bClear,"'clear' operation not supported properly on import");
-
-    bool bReset = (m_mode != merge) || bClear; // is not relevant for no_overwrite,but might be cheaper there 
-    getOutputHandler()->modifyNode(aName,aAttributes,aAttributes,bReset);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->addOrReplaceNode(aName,aAttributes);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->addOrReplaceNodeFromTemplate(aName,aAttributes,aTemplate);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::endNode(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->endNode();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::dropNode( const rtl::OUString& aName ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->removeNode(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    (void) bClear; // avoid warning about unused parameter
-    OSL_ENSURE(!bClear,"'clear' operation not supported on import");
-    getOutputHandler()->modifyProperty(aName,aAttributes,aAttributes,aType);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::endProperty(  ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->endProperty();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::setPropertyValue( const uno::Any& aValue ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->setPropertyValue(aValue);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->setPropertyValueForLocale(aValue,aLocale);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->addOrReplaceProperty(aName, aAttributes, aType);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL ImportMergeHandler::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    getOutputHandler()->addOrReplacePropertyWithValue(aName, aAttributes, aValue);
-}
-// -----------------------------------------------------------------------------
-        
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/importmergehandler.hxx b/configmgr/source/backend/importmergehandler.hxx
deleted file mode 100644
index 8e0983856c..0000000000
--- a/configmgr/source/backend/importmergehandler.hxx
+++ /dev/null
@@ -1,137 +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: importmergehandler.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 CONFIGMGR_BACKEND_IMPORTMERGEHANDLER_HXX
-#define CONFIGMGR_BACKEND_IMPORTMERGEHANDLER_HXX
-
-#include "basicimporthandler.hxx"
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class ImportMergeHandler : public BasicImportHandler
-        {
-        public:
-            enum Mode
-            {
-                merge,          // merge as update into existing data
-                copy,           // reset existing data first -> copy imported data
-                no_overwrite     // copy/merge only if no data is in the layer
-            };
-
-            explicit
-            ImportMergeHandler(uno::Reference< backenduno::XBackend > const & xTargetBackend, Mode mode, 
-                rtl::OUString const & aEntity = rtl::OUString(), sal_Bool const & bNotify = sal_False);       
-
-        // XLayerHandler
-        protected:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-        private:
-            bool isStarted()    const;
-            void checkStarted();
-            void failNotStarted();
-            
-            uno::Reference< backenduno::XUpdateHandler > getOutputHandler();
-
-            uno::Reference< backenduno::XUpdateHandler > createOutputHandler();
-        private:
-            uno::Reference< backenduno::XUpdateHandler >   m_xOutputHandler;
-            Mode            m_mode;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/importsvc.cxx b/configmgr/source/backend/importsvc.cxx
deleted file mode 100644
index 0e20097e1e..0000000000
--- a/configmgr/source/backend/importsvc.cxx
+++ /dev/null
@@ -1,338 +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: importsvc.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_configmgr.hxx"
-
-#include "importsvc.hxx"
-#include "importmergehandler.hxx"
-#include "backendfactory.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include <com/sun/star/beans/NamedValue.hpp>
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace beans = ::com::sun::star::beans;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-sal_Char const * const aMergeImporterServices[] = 
-{
-    "com.sun.star.configuration.backend.MergeImporter",
-    0,
-    "com.sun.star.configuration.backend.Importer",
-    0
-};
-const ServiceImplementationInfo aMergeImporterSI =
-{
-    "com.sun.star.comp.configuration.backend.MergeImporter",
-    aMergeImporterServices, aMergeImporterServices + 2
-};
-// -----------------------------------------------------------------------------
-
-const ServiceRegistrationInfo* getMergeImportServiceInfo()
-{ return getRegistrationInfo(& aMergeImporterSI); }
-// -----------------------------------------------------------------------------
-
-MergeImportService::MergeImportService(uno::Reference< uno::XComponentContext > const & _xContext)
-: ImportService(_xContext, &aMergeImporterSI)
-{
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL instantiateMergeImporter
-( uno::Reference< uno::XComponentContext > const& xContext )
-{
-    return * new MergeImportService( xContext );
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< backenduno::XLayerHandler > MergeImportService::createImportHandler(uno::Reference< backenduno::XBackend > const & xBackend, rtl::OUString const & aEntity)
-{
-    if (!xBackend.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("configmgr::backend::ImportService: Trying to import without a backend. No default backend could be created") );
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    uno::Reference< backenduno::XLayerHandler > aHandler( new ImportMergeHandler(xBackend, ImportMergeHandler::merge, aEntity, m_bSendNotification) );
-
-    return aHandler;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-sal_Char const * const aCopyImporterServices[] = 
-{
-    "com.sun.star.configuration.backend.CopyImporter",
-    0,
-    "com.sun.star.configuration.backend.Importer",
-    0
-};
-const ServiceImplementationInfo aCopyImporterSI =
-{
-    "com.sun.star.comp.configuration.backend.CopyImporter",
-    aCopyImporterServices, aCopyImporterServices + 2
-};
-// -----------------------------------------------------------------------------
-
-const ServiceRegistrationInfo* getCopyImportServiceInfo()
-{ return getRegistrationInfo(& aCopyImporterSI); }
-// -----------------------------------------------------------------------------
-
-CopyImportService::CopyImportService(uno::Reference< uno::XComponentContext > const & _xContext)
-: ImportService(_xContext, &aCopyImporterSI)
-{
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL instantiateCopyImporter
-( uno::Reference< uno::XComponentContext > const& xContext )
-{
-    return * new CopyImportService( xContext );
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< backenduno::XLayerHandler > CopyImportService::createImportHandler(uno::Reference< backenduno::XBackend > const & xBackend, rtl::OUString const & aEntity)
-{
-    if (!xBackend.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("configmgr::backend::ImportService: Trying to import without a backend. No default backend could be created") );
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    ImportMergeHandler::Mode aMode = m_bOverwrite ? ImportMergeHandler::copy : ImportMergeHandler::no_overwrite;
-    uno::Reference< backenduno::XLayerHandler > aHandler( new ImportMergeHandler(xBackend,aMode,aEntity) );
-
-    return aHandler;
-}
-// -----------------------------------------------------------------------------
-
-sal_Bool CopyImportService::setImplementationProperty(rtl::OUString const & aName, uno::Any const & aValue)
-{
-    if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Overwrite")))
-    {
-        return (aValue >>= m_bOverwrite);
-    }
-
-    return ImportService::setImplementationProperty(aName,aValue);
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-ImportService::ImportService(uno::Reference< uno::XComponentContext > const & _xContext, ServiceInfoHelper const & aSvcInfo )
-: m_bSendNotification(false)
-, m_aMutex()
-, m_xContext(_xContext)
-, m_xDestinationBackend()
-, m_aServiceInfo(aSvcInfo)
-{
-    if (!m_xContext.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration Importer: Unexpected NULL context"));
-        throw lang::NullPointerException(sMessage,NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-ImportService::~ImportService()
-{}
-// -----------------------------------------------------------------------------
-
-uno::Reference< backenduno::XBackend > ImportService::createDefaultBackend() const
-{
-    return BackendFactory::instance( m_xContext ).getUnoBackend();
-}
-// -----------------------------------------------------------------------------
-
-sal_Bool ImportService::setImplementationProperty(rtl::OUString const & aName, uno::Any const & aValue)
-{
-    if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Notify")))
-    {
-        return (aValue >>= m_bSendNotification);
-    }
-    
-    return false;
-}
-// -----------------------------------------------------------------------------
-
-// XInitialize
-
-void SAL_CALL 
-    ImportService::initialize( const uno::Sequence< uno::Any >& aArguments ) 
-        throw (uno::Exception, uno::RuntimeException)
-{
-    sal_Int16 const nCount = static_cast<sal_Int16>(aArguments.getLength());
-
-    if (sal_Int32(nCount) != aArguments.getLength())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Too many arguments to initialize a Configuration Importer"));
-        throw lang::IllegalArgumentException(sMessage,*this,0);
-    }
-
-    for (sal_Int16 i = 0; i < nCount; ++i)
-    {
-        beans::NamedValue aExtraArg;
-        if (aArguments[i] >>= aExtraArg)
-        {
-            OSL_VERIFY( setImplementationProperty(aExtraArg.Name, aExtraArg.Value) );
-
-            continue;
-        }
-
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Cannot use argument to initialize a Configuration Importer"
-                                                        "- NamedValue expected"));
-        throw lang::IllegalArgumentException(sMessage,*this,i+1);
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-// XLayerImporter
-
-uno::Reference< backenduno::XBackend > SAL_CALL 
-    ImportService::getTargetBackend(  ) 
-        throw (uno::RuntimeException)
-{
-    uno::Reference< backenduno::XBackend > xRet;
-    {
-        osl::MutexGuard aGuard(m_aMutex);
-        xRet = m_xDestinationBackend;
-    }
-    
-    if (!xRet.is())
-    {
-        xRet = createDefaultBackend();
-
-        osl::MutexGuard aGuard(m_aMutex);
-        if (!m_xDestinationBackend.is())
-            m_xDestinationBackend = xRet;
-    }
-    return xRet;
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    ImportService::setTargetBackend( const uno::Reference< backenduno::XBackend >& aBackend ) 
-        throw (lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aBackend.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("configmgr::backend::ImportService: Trying to set a NULL backend") );
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    osl::MutexGuard aGuard(m_aMutex);
-    m_xDestinationBackend = aBackend;
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    ImportService::importLayer( const uno::Reference< backenduno::XLayer >& aLayer ) 
-        throw ( backenduno::MalformedDataException,
-                lang::WrappedTargetException, lang::IllegalArgumentException, 
-                lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aLayer.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("configmgr::backend::ImportService: Trying to import a NULL layer") );
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    uno::Reference< backenduno::XLayerHandler > aInputHandler = createImportHandler( getTargetBackend() );
-    aLayer->readData( aInputHandler );
-
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    ImportService::importLayerForEntity( const uno::Reference< backenduno::XLayer >& aLayer, const rtl::OUString& aEntity ) 
-        throw ( backenduno::MalformedDataException,
-                lang::WrappedTargetException, lang::IllegalArgumentException, 
-                lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aLayer.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("configmgr::backend::ImportService: Trying to import a NULL layer") );
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    uno::Reference< backenduno::XLayerHandler > aInputHandler = createImportHandler( getTargetBackend(), aEntity );
-    aLayer->readData( aInputHandler );
-}
-// -----------------------------------------------------------------------------
-
-// XServiceInfo
-
-rtl::OUString SAL_CALL 
-    ImportService::getImplementationName(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getImplementationName( );
-}
-// -----------------------------------------------------------------------------
-
-
-sal_Bool SAL_CALL 
-    ImportService::supportsService( const rtl::OUString& ServiceName ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().supportsService( ServiceName );
-}
-// -----------------------------------------------------------------------------
-
-
-uno::Sequence< ::rtl::OUString > SAL_CALL 
-    ImportService::getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getSupportedServiceNames( );
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/importsvc.hxx b/configmgr/source/backend/importsvc.hxx
deleted file mode 100644
index a539882097..0000000000
--- a/configmgr/source/backend/importsvc.hxx
+++ /dev/null
@@ -1,157 +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: importsvc.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 CONFIGMGR_BACKEND_IMPORTSVC_HXX
-#define CONFIGMGR_BACKEND_IMPORTSVC_HXX
-
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/implbase3.hxx>
-#include <osl/mutex.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/configuration/backend/XLayerImporter.hpp>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class ImportService : public ::cppu::WeakImplHelper3< 
-                                            backenduno::XLayerImporter, 
-                                            lang::XInitialization,        
-                                            lang::XServiceInfo  
-                                        > 
-        {
-        public:
-            explicit
-            ImportService(uno::Reference< uno::XComponentContext > const & _xContext, ServiceInfoHelper const & aSvcInfo);
-            ~ImportService();
-
-            // XInitialization
-            virtual void SAL_CALL 
-                initialize( const uno::Sequence< uno::Any >& aArguments ) 
-                    throw (uno::Exception, uno::RuntimeException);
-
-            // XServiceInfo
-            virtual rtl::OUString SAL_CALL 
-                getImplementationName(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual sal_Bool SAL_CALL 
-                supportsService( const rtl::OUString& ServiceName ) 
-                    throw (uno::RuntimeException);
-
-            virtual uno::Sequence< rtl::OUString > SAL_CALL 
-                getSupportedServiceNames(  ) 
-                    throw (uno::RuntimeException);
-    
-            // XLayerImporter
-            virtual uno::Reference< backenduno::XBackend > SAL_CALL 
-                getTargetBackend(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setTargetBackend( const uno::Reference< backenduno::XBackend >& aBackend ) 
-                    throw (lang::NullPointerException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                importLayer( const uno::Reference< backenduno::XLayer >& aLayer ) 
-                throw ( backenduno::MalformedDataException,
-                        lang::WrappedTargetException, lang::IllegalArgumentException, 
-                        lang::NullPointerException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                importLayerForEntity( const uno::Reference< backenduno::XLayer >& aLayer, const rtl::OUString& aEntity ) 
-                    throw ( backenduno::MalformedDataException,
-                            lang::WrappedTargetException, lang::IllegalArgumentException, 
-                            lang::NullPointerException, uno::RuntimeException);
-        protected:
-            uno::Reference< backenduno::XBackend > createDefaultBackend() const;
-
-            //uno::Reference< lang::XMultiServiceFactory > getServiceFactory() const 
-
-            virtual sal_Bool setImplementationProperty( rtl::OUString const & aName, uno::Any const & aValue);
-             /** Notify backend of import */
-            sal_Bool        m_bSendNotification;
-        private:
-            // is pure virtual to allow different import services
-            virtual uno::Reference< backenduno::XLayerHandler > createImportHandler(uno::Reference< backenduno::XBackend > const & xBackend, rtl::OUString const & aEntity = rtl::OUString()) = 0;
-
-        private:
-            osl::Mutex      m_aMutex;
-            uno::Reference< uno::XComponentContext >         m_xContext;
-            uno::Reference< backenduno::XBackend >         m_xDestinationBackend;
-           
-
-            ServiceInfoHelper m_aServiceInfo;  
-            
-            ServiceInfoHelper const & getServiceInfo() const { return m_aServiceInfo; }
-        };
-// -----------------------------------------------------------------------------
-
-        class MergeImportService : public ImportService
-        {
-        public:
-            explicit MergeImportService(uno::Reference< uno::XComponentContext > const & _xContext);
-        private:
-            uno::Reference< backenduno::XLayerHandler > createImportHandler(uno::Reference< backenduno::XBackend > const & xBackend, rtl::OUString const & aEntity);
-        };
-// -----------------------------------------------------------------------------
-
-        class CopyImportService : public ImportService
-        {
-        public:
-            explicit CopyImportService(uno::Reference< uno::XComponentContext > const & _xContext);
-        private:
-            uno::Reference< backenduno::XLayerHandler > createImportHandler(uno::Reference< backenduno::XBackend > const & xBackend, rtl::OUString const & aEntity);
-            sal_Bool setImplementationProperty( rtl::OUString const & aName, uno::Any const & aValue);
-        private:
-            sal_Bool m_bOverwrite;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/layerdefaultremover.cxx b/configmgr/source/backend/layerdefaultremover.cxx
deleted file mode 100644
index 6cfe71a9d6..0000000000
--- a/configmgr/source/backend/layerdefaultremover.cxx
+++ /dev/null
@@ -1,278 +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: layerdefaultremover.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_configmgr.hxx"
-
-#include "layerdefaultremover.hxx"
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        // -----------------------------------------------------------------------------
-
-        LayerDefaultRemover::LayerDefaultRemover(uno::Reference< backenduno::XLayerHandler > const & _xResultHandler)
-            :m_xResultHandler(_xResultHandler) 
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        LayerDefaultRemover::~LayerDefaultRemover( )
-        {
-        }
-        // -----------------------------------------------------------------------------
-        
-        bool LayerDefaultRemover::hasPendingProperty()
-        {
-            return m_aPropName.Name.getLength()!=0;   
-        }
-        // -----------------------------------------------------------------------------
-        
-        void LayerDefaultRemover::clearPendingProperty()
-        {
-            m_aPropName = PropertyStruct();     
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::startLayer(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            clearPendingProperty();
-            m_xResultHandler->startLayer();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::endLayer(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            if (hasPendingProperty())
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal property started operation"; 
-                raiseMalformedDataException(pMsg);
-            }
-            if (!m_aNodeStack.empty())
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal node started operation"; 
-                raiseMalformedDataException(pMsg);
-            }
-            m_xResultHandler->endLayer();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            if (hasPendingProperty())
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal property started operation"; 
-                raiseMalformedDataException(pMsg);
-            }
-            if (aAttributes == 0 && !bClear)
-            {
-                m_aNodeStack.push_back(aName);
-            }
-            else
-            {
-                playBackNodeStack();
-                m_xResultHandler->overrideNode(aName,aAttributes,bClear);
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack();
-            m_xResultHandler->addOrReplaceNode(aName, aAttributes); 
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack();
-            m_xResultHandler->addOrReplaceNodeFromTemplate(aName,aTemplate,aAttributes);
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::endNode(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            if (hasPendingProperty())
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal property started operation"; 
-                raiseMalformedDataException(pMsg);
-            }
-            if (m_aNodeStack.empty())
-            {
-                m_xResultHandler->endNode();
-            }
-            else
-            {
-                m_aNodeStack.pop_back();
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::dropNode( const rtl::OUString& aName ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack();
-            m_xResultHandler->dropNode(aName);
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType )
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack();
-            m_xResultHandler->addProperty (aName,aAttributes,aType);
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack();
-            m_xResultHandler->addPropertyWithValue(aName,aAttributes,aValue);
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            if (hasPendingProperty())
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal property started operation"; 
-                raiseMalformedDataException(pMsg);
-            }
-            if (aAttributes != 0 || bClear)
-            {
-                m_aPropName.Name=rtl::OUString();
-                playBackNodeStack();
-                m_xResultHandler->overrideProperty(aName,aAttributes,aType,bClear);
-            }
-            else
-            {
-                m_aPropName.Name = aName;
-                m_aPropName.Type = aType;
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::endProperty(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            if (hasPendingProperty())
-            {
-                clearPendingProperty();
-            }
-            else
-                m_xResultHandler->endProperty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::setPropertyValue( const uno::Any& aValue ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack(true);
-            m_xResultHandler->setPropertyValue(aValue);
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerDefaultRemover::setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-        {
-            playBackNodeStack(true);
-            m_xResultHandler->setPropertyValueForLocale(aValue,aLocale);
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerDefaultRemover::playBackNodeStack(bool bPlayProperty)
-        {
-            if (!bPlayProperty && hasPendingProperty())
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal property started operation"; 
-                raiseMalformedDataException(pMsg);
-            }
-            if ( !hasPendingProperty() && bPlayProperty && !m_aNodeStack.empty() )
-            {
-                sal_Char const * pMsg = 
-                "LayerDefaultRemover: Illegal Operation: Operation requires a started property"; 
-                raiseMalformedDataException(pMsg);
-            }
-            if (!m_aNodeStack.empty())
-            {
-                for (std::vector<rtl::OUString>::iterator aIter = m_aNodeStack.begin();
-                     aIter != m_aNodeStack.end(); aIter++)
-                {
-                    m_xResultHandler->overrideNode(*aIter, 0,false);    
-                }
-                m_aNodeStack.clear();
-            }
-            if (bPlayProperty)
-            {
-                if (hasPendingProperty())
-                {
-                    m_xResultHandler->overrideProperty(m_aPropName.Name,0,m_aPropName.Type,false);
-                    clearPendingProperty();
-                }    
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerDefaultRemover::raiseMalformedDataException(sal_Char const * pMsg)
-        {
-            OSL_ASSERT(pMsg);
-            rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-
-            throw backenduno::MalformedDataException( sMsg, *this, uno::Any() );
-        }
-        
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-    } // namespace
-
-    // -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/layerdefaultremover.hxx b/configmgr/source/backend/layerdefaultremover.hxx
deleted file mode 100644
index 784b7f7a53..0000000000
--- a/configmgr/source/backend/layerdefaultremover.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: layerdefaultremover.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 CONFIGMGR_XML_LAYERDECORATOR_HXX
-#define CONFIGMGR_XML_LAYERDECORATOR_HXX
-
-#include <cppuhelper/implbase1.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace backenduno    = ::com::sun::star::configuration::backend;
-        // -----------------------------------------------------------------------------
-
-        class LayerDefaultRemover :	public cppu::WeakImplHelper1<backenduno::XLayerHandler>
-        {
-        public:
-            explicit
-                LayerDefaultRemover(uno::Reference< backenduno::XLayerHandler > const & _xResultHandler);
-            virtual ~LayerDefaultRemover();
-
-            // XLayerHandler
-        public:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType )
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-        private:
-            void playBackNodeStack( bool bPlayProperty=false);
-            void raiseMalformedDataException(sal_Char const * pMsg);
-            inline bool hasPendingProperty();
-            inline void clearPendingProperty();
-        private:
-            uno::Reference< backenduno::XLayerHandler >	m_xResultHandler;
-            std::vector<rtl::OUString> m_aNodeStack;
-            struct PropertyStruct
-            {
-                rtl::OUString Name; 
-                uno::Type Type;
-            }m_aPropName;
-        };
-        // -----------------------------------------------------------------------------
-    } // namespace xml
-    // -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
diff --git a/configmgr/source/backend/layermerge.cxx b/configmgr/source/backend/layermerge.cxx
deleted file mode 100644
index 05c11577ea..0000000000
--- a/configmgr/source/backend/layermerge.cxx
+++ /dev/null
@@ -1,1039 +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: layermerge.cxx,v $
- * $Revision: 1.28 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "layermerge.hxx"
-#include "treenodefactory.hxx"
-#include "matchlocale.hxx"
-#include "valuetypeconverter.hxx"
-#include "typeconverter.hxx"
-#include <com/sun/star/configuration/backend/SchemaAttribute.hpp>
-#include <com/sun/star/configuration/backend/NodeAttribute.hpp>
-
-#include <rtl/ustrbuf.hxx>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-        namespace SchemaAttribute   = backenduno::SchemaAttribute;
-        namespace NodeAttribute     = backenduno::NodeAttribute;
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//#if OSL_DEBUG_LEVEL > 0
-// currently not used in debug builds
-#if 0
-        static void check_if_complete(uno::Reference< uno::XComponentContext > const & _xContext) 
-        { 
-            MergedComponentData aData;
-
-            uno::Reference< backenduno::XLayerHandler > 
-                test(new LayerMergeHandler(_xContext, aData)); 
-        }
-#endif
-
-// -----------------------------------------------------------------------------
-    
-struct LayerMergeHandler::Converter
-{
-    explicit
-    Converter(uno::Reference< uno::XComponentContext > const & xContext);
-
-    uno::Any convertValue(uno::Type const & _aTargetType, uno::Any const & _aValue);
-
-    static uno::Reference< com::sun::star::script::XTypeConverter > createTCV(uno::Reference< uno::XComponentContext > const & xContext);
-
-    ValueConverter m_aConverter;   
-    bool m_bConvertData;
-};
-// -----------------------------------------------------------------------------
-LayerMergeHandler::LayerMergeHandler(uno::Reference< uno::XComponentContext > const & xContext, MergedComponentData & _rData, ITemplateDataProvider* aTemplateProvider ) 
-: m_rData(_rData)
-//, m_aContext(xContext,static_cast<backenduno::XLayerHandler*>(this),aTemplateProvider )
-, m_aContext(xContext)
-, m_aFactory()
-, m_aLocale()
-, m_pProperty(NULL)
-, m_pConverter( new Converter(xContext) )
-, m_nSkipping(0)
-, m_bSublayer(false)
-{
-    m_aContext = DataBuilderContext(xContext,static_cast<backenduno::XLayerHandler*>(this),aTemplateProvider );
-    OSL_ENSURE( m_rData.hasSchema(), "Creating layer merger without default data" );
-}
-// -----------------------------------------------------------------------------
-
-LayerMergeHandler::~LayerMergeHandler(  ) 
-{
-    delete m_pConverter;
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::prepareLayer()
-{
-    OSL_ENSURE(isDone(), "LayerMergeHandler: Warning: Previous layer or schema not terminated properly");
-    if (!isDone())
-        m_aContext.getLogger().error("Previous layer or schema not terminated properly", "prepareLayer()", "configmgr::LayerMergeHandler");
-
-    m_aLocale = localehelper:: getDefaultLanguage();
-    m_bSublayer = false;
-
-    promoteToDefault(m_rData);
-}
-// -----------------------------------------------------------------------------
-
-bool LayerMergeHandler::prepareSublayer(rtl::OUString const & aLocale)
-{
-    OSL_ENSURE(isDone(), "LayerMergeHandler: Warning: Previous layer not terminated properly");
-    if (!isDone())
-        m_aContext.getLogger().error("Previous layer not terminated properly", "prepareSublayer()", "configmgr::LayerMergeHandler");
-
-    m_aLocale = aLocale;
-    m_bSublayer = (aLocale.getLength() != 0);
-
-    return m_bSublayer;
-}
-// -----------------------------------------------------------------------------
-            
-namespace
-{
-    struct CheckRestrictedAccessVisitor : NodeAction
-    {
-        node::Access m_access;
-        
-        CheckRestrictedAccessVisitor(node::Access _access) : m_access(_access) {}
-
-        void handle(ValueNode const & _aNode) { check(_aNode); }
-
-        void handle(ISubtree const & _aNode) 
-        { 
-            node::Access aNext = check(_aNode);
-            CheckRestrictedAccessVisitor(aNext).applyToChildren(_aNode);
-        }
-
-        node::Access check(INode const & _aNode)
-        {
-            node::Attributes const aFoundAttr = _aNode.getAttributes();
-            node::Access const aFoundAccess = aFoundAttr.getAccess();
-            OSL_ENSURE(m_access <= aFoundAccess, "Subnode has more access than its parent");
-
-            return aFoundAccess;
-        }
-    };
-// --------------------
-    struct RestrictAccessVisitor : NodeModification
-    {
-        node::Access m_access;
-        
-        RestrictAccessVisitor(bool _bFinalize)
-        : m_access(_bFinalize ? node::accessFinal : node::accessReadonly) 
-        {}
-
-        void handle(ValueNode & _aNode) { restrict(_aNode); }
-
-        void handle(ISubtree  & _aNode) 
-        { 
-            if (restrict(_aNode)) 
-                this->applyToChildren(_aNode);
-            else
-                OSL_DEBUG_ONLY(CheckRestrictedAccessVisitor(m_access).applyToNode(_aNode));
-        }
-
-        bool restrict(INode & _aNode)
-        {
-            node::Attributes const aFoundAttr = _aNode.getAttributes();
-
-            if (aFoundAttr.getAccess() >= m_access) return false; // already restricted enough
-
-            _aNode.modifyAccess(m_access);
-            return true;
-        }
-    };
-}
-// -----------------------------------------------------------------------------
-void LayerMergeHandler::propagateAttributes(ISubtree & _rParent)
-{
-    node::Attributes aAttributes = _rParent.getAttributes();
-
-    if (aAttributes.isReadonly() || aAttributes.isFinalized())
-        RestrictAccessVisitor(aAttributes.isWritable()).applyToChildren(_rParent);
-}
-// -----------------------------------------------------------------------------
-
-node::Attributes LayerMergeHandler::makePropertyAttributes(sal_Int16 aSchemaAttributes)
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    const sal_uInt16 k_allPropertySchemaAttributes =
-        SchemaAttribute::REQUIRED;
-
-    if ((aSchemaAttributes & k_allPropertySchemaAttributes) != 
-        (aSchemaAttributes & SchemaAttribute::MASK))
-    {
-        sal_Char const * pMsg = (aSchemaAttributes & SchemaAttribute::LOCALIZED) ?
-            "Layer merging: Cannot add localized property to extensible node" :
-            "Layer merging: Unreckognized Schema Attribute for new Property" ;
-
-        m_aContext.raiseIllegalArgumentException(pMsg,2);
-    }
-    OSL_ASSERT( !(aSchemaAttributes & SchemaAttribute::LOCALIZED) ); // check the check
-
-    node::Attributes aAttributes = m_aContext.getCurrentAttributes();
-
-    if (aSchemaAttributes & SchemaAttribute::REQUIRED)
-        aAttributes.setNullable (false);
-
-    //Set state, removable and mandatory attribute flags
-    aAttributes.setState(node::isAdded);
-    aAttributes.setRemovability(true,true);
-
-
-    return aAttributes;
-    
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::checkPropertyType(uno::Type const & _aType)
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_ASSERT(m_pProperty);
-
-    if (ValueNode * pValue = m_pProperty->asValueNode())
-    {
-        if (pValue->getValueType() != _aType)
-        {
-            if (pValue->getValueType().getTypeClass() == uno::TypeClass_ANY)
-            {
-                OSL_ENSURE( pValue->isNull(), "Layer merging: Non-null 'any' value" );
-
-                if (_aType != uno::Type()) 
-                    OSL_VERIFY( pValue->setValueType(_aType) );
-
-                else
-                {
-                    OSL_TRACE("Layer merging: Illegal property type: VOID overriding ANY");
-                    m_aContext.getLogger().warning("Illegal property type: VOID overriding ANY - ignoring", 
-                                                    "checkPropertyType()", "configmgr::LayerMergeHandler");
-                    // m_aContext.raiseIllegalTypeException("Layer merging: Illegal property type: VOID overriding ANY");
-                }
-            }
-            else if (_aType == uno::Type() && m_pConverter)
-                m_pConverter->m_bConvertData = true;
-
-            else 
-                m_aContext.raiseIllegalTypeException("Layer merging: Cannot merge property value: types does not match");
-        }
-    }
-    else if (ISubtree *localisedSet = m_pProperty->asISubtree()) {
-        // We're dealing with localised data.
-        uno::Type valueType = parseTemplateName(
-                                    localisedSet->getElementTemplateName()) ;
-        
-        if (valueType != _aType) {
-            if (valueType.getTypeClass() == uno::TypeClass_ANY) {
-                if (_aType == uno::Type()) {
-                    // VOID value
-                    m_aContext.raiseIllegalTypeException(
-                        "Layer merging: VOID value for localised ANY type") ;
-                }
-                // TODO Could we have to set the localised data type?
-            }
-            else if (_aType == uno::Type() && m_pConverter) {
-                m_pConverter->m_bConvertData = sal_True ;
-            }
-            else {
-                m_aContext.raiseIllegalTypeException("Layer merging: property value does not match localised type") ;
-            }
-        }
-    }
-
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::setValueAndCheck(ValueNode& _rValueNode, uno::Any const & _aValue)
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    if (_aValue.hasValue() && m_pConverter && m_pConverter->m_bConvertData)
-    {
-        uno::Any aConvertedValue = m_pConverter->convertValue(_rValueNode.getValueType(),_aValue);
-        if (!aConvertedValue.hasValue())
-            m_aContext.raiseIllegalTypeException("Layer merging: Cannot merge property value: cannot convert data to type of property");
-
-        if (! _rValueNode.setValue(aConvertedValue) )
-            m_aContext.raiseIllegalTypeException("Layer merging: Cannot merge property value: converted type does not match");
-    }
-    else if (! _rValueNode.setValue(_aValue) )
-    {
-        m_aContext.raiseIllegalTypeException("Layer merging: Cannot merge property value: type does not match");
-    }
-
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::setLocalizedValue(ISubtree * pProperty, uno::Any const & _aValue, rtl::OUString const & _aLocale) 
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    if (ISubtree * pLocalizedCont = pProperty->asISubtree())
-    {
-        OSL_ENSURE(isLocalizedValueSet(*pLocalizedCont),"Layer merging: property node is not a value"); 
-
-        if (INode * pLocale = pLocalizedCont->getChild(_aLocale))
-        {
-            if (ValueNode * pLocValue = pLocale->asValueNode())
-            {
-                setValueAndCheck(*pLocValue,_aValue);
-            }
-            else
-            {
-                OSL_ENSURE(false,"Layer merging: Localized subnode is not a value");
-                m_aContext.getLogger().error("Localized subnode is not a value - ignoring data", 
-                                             "setLocalizedValue()", "configmgr::LayerMergeHandler");
-            }
-        }
-        else {
-            node::Attributes attributes = pLocalizedCont->getAttributes() ;
-            uno::Type valueType = parseTemplateName(
-                                    pLocalizedCont->getElementTemplateName()) ;
-
-            attributes.setLocalized(false) ;
-            OSL_ENSURE(valueType != uno::Type(), 
-                                "Cannot determine type for localised value") ;
-            std::auto_ptr<ValueNode> localisedValue =
-                m_aFactory.getNodeFactory().createNullValueNode(_aLocale,
-                                                                valueType, 
-                                                                attributes) ;
-
-            if (_aValue.hasValue()) {
-                setValueAndCheck(*localisedValue, _aValue) ;
-            }
-            pLocalizedCont->addChild(base_ptr(localisedValue)) ;
-        }
-    }
-
-    else if (ValueNode * pValue = pProperty->asValueNode())
-    {
-        OSL_ENSURE(false, "Layer merging: Got locale-dependent value for non-localized node");
-        m_aContext.getLogger().error("Got locale-dependent value for non-localized node", 
-                                     "setLocalizedValue()", "configmgr::LayerMergeHandler");
-        setValueAndCheck(*pValue,_aValue);
-    }
-
-    else
-    {
-        OSL_ENSURE(false, "Layer merging: Unknown node type for localized node");
-        m_aContext.getLogger().error("Unknown node type for localized node", 
-                                     "setLocalizedValue()", "configmgr::LayerMergeHandler");
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::applyPropertyValue(uno::Any const & _aValue) 
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_ASSERT(m_pProperty);
-
-    if (ValueNode * pValue = m_pProperty->asValueNode())
-    {
-        setValueAndCheck(*pValue,_aValue);
-    }
-
-    else if (ISubtree * pLocalizedCont = m_pProperty->asISubtree())
-    {
-        setLocalizedValue(pLocalizedCont,_aValue,m_aLocale);
-    }
-
-    else
-    {
-        OSL_ENSURE(false, "Layer merging: Unknown node type for property");
-        m_aContext.getLogger().error("Unknown node type for property", 
-                                     "applyPropertyValue()", "configmgr::LayerMergeHandler");
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::applyPropertyValue(uno::Any const & _aValue, rtl::OUString const & _aLocale) 
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_ASSERT(m_pProperty);
-
-    if (_aLocale.getLength() == 0)
-        m_aContext.raiseIllegalArgumentException("Locale string is empty");
-
-    if (ISubtree * pLocalizedCont = m_pProperty->asISubtree())
-    {
-        setLocalizedValue(pLocalizedCont,_aValue, _aLocale);
-    }
-
-    else if (ValueNode * pValue = m_pProperty->asValueNode())
-    {
-        //OSL_ENSURE(false, "Layer merging: Got locale-dependent value for non localized node");
-        setValueAndCheck(*pValue,_aValue);
-    }
-
-    else
-    {
-        OSL_ENSURE(false, "Layer merging: Unknown node type for localized property");
-        m_aContext.getLogger().error("Unknown node type for localized property", 
-                                     "applyPropertyValue()", "configmgr::LayerMergeHandler");
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::applyAttributes(INode * pNode, sal_Int16 aNodeAttributes) 
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    sal_Int16 const k_allNodeAttributes = 
-            NodeAttribute::MANDATORY |
-            NodeAttribute::FINALIZED |
-            NodeAttribute::READONLY;
-
-    if ((aNodeAttributes & k_allNodeAttributes) != 
-        (aNodeAttributes & NodeAttribute::MASK))
-    {
-        sal_Char const * pMsg = 
-            "Layer merging: Unreckognized Node Attribute" ;
-
-        m_aContext.raiseIllegalArgumentException(pMsg,2);
-    }
-
-    if (aNodeAttributes & NodeAttribute::READONLY)
-    {
-        OSL_ENSURE(!(aNodeAttributes & NodeAttribute::FINALIZED),
-                    "Layer merging: Warning: Node is both read-only and finalized");
-        if (aNodeAttributes & NodeAttribute::FINALIZED)
-            m_aContext.getLogger().warning("Node is both read-only and finalized - treating as readonly", 
-                                           "applyAttributes()", "configmgr::LayerMergeHandler");
-
-        pNode->modifyAccess(node::accessReadonly);
-    }
-    else if (aNodeAttributes & NodeAttribute::FINALIZED)
-    {
-        pNode->modifyAccess(node::accessFinal);
-    }
-                            
-    if ( m_aContext.isNode(pNode) )
-    {
-        if (aNodeAttributes & NodeAttribute::MANDATORY)
-        {
-            pNode->markMandatory();
-        }
-    }
-    else if (aNodeAttributes) // do this only if there actually was something to do
-    {
-        if (ISubtree * pLocCont = pNode->asISubtree())
-        {
-            OSL_ENSURE(isLocalizedValueSet(*pLocCont),"Layer merging: Property subtree must be a localized value set");
-            propagateAttributes(*pLocCont);
-        }
-    }
-
-
-}
-// -----------------------------------------------------------------------------
-
-static 
-void doLogRejection(sal_Int16 loglevel, DataBuilderContext const & aContext, 
-                    INode * pNode, bool bMandatory)
-{
-    rtl::OUStringBuffer aMessage;
-    aMessage.appendAscii("Rejecting override: Node/Property ")
-            .append(aContext.getNodePath(pNode->getName()))
-            .appendAscii(" is ").appendAscii(bMandatory ? "mandatory" : "finalized")
-            .appendAscii(" in a prior layer.");
-        
-    aContext.getLogger().log(loglevel,aMessage.makeStringAndClear(), 
-                              bMandatory ? "addOrReplace/dropNode()" : "startOverride()", 
-                              "configmgr::LayerMergeHandler");
-}
-
-static inline
-void logRejection(DataBuilderContext const & aContext, INode * pNode, bool bMandatory=false)
-{
-    const sal_Int16 loglevel = LogLevel::INFO;
-    if (aContext.getLogger().isLogging(loglevel))
-    {
-        doLogRejection(loglevel, aContext, pNode, bMandatory);
-    }
-}
-// -----------------------------------------------------------------------------
-
-bool LayerMergeHandler::startOverride(INode * pNode, sal_Bool bClear) /* ensure writable, mark merged */
-    SAL_THROW(())
-{
-    OSL_PRECOND(pNode,"startOverride: non-NULL base node required");
-    if (!m_aContext.isWritable(pNode)) 
-    {
-        // #i41700# write-protection is enforced, unless merging localizations
-        if (!m_bSublayer)
-        {
-            logRejection(m_aContext,pNode);
-            return false;
-        }
-        else
-            OSL_ASSERT(m_aLocale.getLength() != 0);
-    }
-
-    OSL_ENSURE(!bClear,"'clear' operation is not yet supported");
-    if (bClear)
-        m_aContext.getLogger().warning("'clear' operation is not yet supported", 
-                                       "startOverride()", "configmgr::LayerMergeHandler");
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::ensureUnchanged(INode const * pNode) const
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    // to do: change state handling to detect this within sets
-    OSL_PRECOND(pNode,"INTERNAL ERROR: Unexpected NULL node pointer");
-
-    if (!this->isInSublayer())
-        if (pNode->getAttributes().state() == node::isMerged)
-            m_aContext.raiseMalformedDataException("Layer merging: Duplicate node or property in this layer");
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// XLayerHandler
-
-void SAL_CALL LayerMergeHandler::startLayer( ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    ISubtree * pSchema = m_rData.getSchemaTree();
-    OSL_ENSURE(pSchema,"No base data to merge layer into");
-
-    if (!pSchema)
-    {
-        m_aContext.getLogger().error("No schema data for merging layer", "startLayer", "configmgr::LayerMergeHandler");
-        throw uno::RuntimeException(rtl::OUString::createFromAscii("Layer merging: No data to merge with"),*this);
-    }
-
-    m_aContext.startActiveComponent(pSchema->getName());
-
-    m_pProperty = NULL;
-    m_nSkipping = 0;
-
-    OSL_POSTCOND( m_aContext.hasActiveComponent(),  "Layer merging: could not set active component");
-    OSL_POSTCOND( m_aContext.isDone(),              "Layer merging: newly started component is not empty");
-    OSL_POSTCOND( !this->isSkipping(),              "Layer merging: newly started component is in skipping state");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::endLayer( ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-        m_aContext.raiseMalformedDataException("Layer merging: Unmatched data being skipped was not terminated properly.");
-
-    m_aContext.endActiveComponent();
-
-    m_bSublayer = false;
-
-    OSL_POSTCOND( !m_aContext.hasActiveComponent(), "Layer merging: could not clear active component");
-    OSL_POSTCOND(  m_aContext.isDone(), "Layer merging: could not finish processing");
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::overrideLayerRoot( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND( m_aContext.hasActiveComponent(),  "Layer merging: active component is not set");
-    OSL_PRECOND( m_aContext.isDone(), "Layer merging: node is not root");
-
-    if (m_aContext.getActiveComponent() != aName)
-        m_aContext.raiseIllegalArgumentException("Layer merging: Name of layer being merged does not match component name",1);
-    
-    // check the argument
-    if (ISubtree * pSchema = m_rData.getSchemaTree())
-    {
-        OSL_ENSURE(pSchema->getName() == aName,"Schema name does not match active component");
-
-        ensureUnchanged(pSchema);
-
-        if (startOverride(pSchema,bClear))
-        {
-            applyAttributes(pSchema,aAttributes);
-
-            m_aContext.pushNode(pSchema);
-
-            OSL_POSTCOND( m_aContext.hasActiveComponent(),  "Layer merging: could not set active component");
-            OSL_POSTCOND( !m_aContext.isDone(),             "Layer merging: could not start component");
-        }
-        else
-            this->skipNode();
-    }
-    else
-    {
-        OSL_ENSURE(false,"No base data to merge layer into");
-        m_aContext.getLogger().warning("No component data in schema for merging layer", 
-                                       "overrideNode() [for layer root]", "configmgr::LayerMergeHandler");
-        this->skipNode();
-    }
-}
-// -----------------------------------------------------------------------------
-
-static inline
-sal_Int16 getOverrideViolationLogLevel(bool bIsSublayer)
-{ return bIsSublayer ? LogLevel::FINER : LogLevel::INFO; }
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::implOverrideNode(
-    ISubtree * node, sal_Int16 attributes, bool clear)
-{
-    ensureUnchanged(node);
-    if (startOverride(node, clear)) {
-        applyAttributes(node, attributes);
-        m_aContext.pushNode(node);
-    } else {
-        skipNode();
-    }
-}
-
-void SAL_CALL LayerMergeHandler::overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-    {
-        this->skipNode();
-    }
-    else if (m_aContext.isDone())
-    {
-        this->overrideLayerRoot(aName,aAttributes,bClear);
-    }
-    else if (ISubtree * pNode = m_aContext.findNode(aName))
-    {
-        implOverrideNode(pNode, aAttributes, bClear);
-    }
-    else // ignore non-matched data
-    {
-        const sal_Int16 loglevel = getOverrideViolationLogLevel(m_bSublayer);
-        if (m_aContext.getLogger().isLogging(loglevel))
-        {
-            rtl::OUStringBuffer aMessage;
-            aMessage.appendAscii("Node ").append(m_aContext.getNodePath(aName))
-                    .appendAscii(" to be overridden does not exist - skipping");
-            
-            m_aContext.getLogger().log(loglevel,aMessage.makeStringAndClear(), "overrideNode()", "configmgr::LayerMergeHandler");
-        }
-        // m_aContext.raiseNoSuchElementException("Layer merging: The node to be overridden does not exist.",aName);
-        this->skipNode();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerMergeHandler::implAddOrReplaceNode( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-    SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException))
-{   
-    ISubtree * pReplacedNode = m_aContext.findNode(aName);
-    if (pReplacedNode)
-    {
-        if ((aAttributes & NodeAttribute::FUSE) == 0) {
-            this->ensureUnchanged(pReplacedNode);
-
-            if (!m_aContext.isRemovable(pReplacedNode))
-            {
-                logRejection(m_aContext,pReplacedNode,true);
-                this->skipNode();
-                return;
-            }
-        } else {
-            implOverrideNode(
-                pReplacedNode, aAttributes & ~NodeAttribute::FUSE, false);
-            return;
-        }
-    }
-
-    std::auto_ptr<INode> apNewInstance;
-    if (aTemplate.Component == m_aContext.getActiveComponent())
-    {
-        apNewInstance = m_rData.instantiateTemplate(aName, aTemplate.Name);
-    }
-    else
-    {
-        TemplateRequest aTemplateRequest(aTemplate.Name, aTemplate.Component);
-        apNewInstance = m_aContext.getTemplateData( aTemplateRequest ).extractDataAndClear();
-        if (apNewInstance.get())
-            apNewInstance->setName( aName );
-    }
-   
-    if (NULL == apNewInstance.get())
-        m_aContext.raiseNoSuchElementException("Layer merging: Cannot instantiate template.", aTemplate.Name);
-
-    applyAttributes(apNewInstance.get(), aAttributes & ~NodeAttribute::FUSE);
-    //Set removable flag
-    apNewInstance->markRemovable();
-
-    m_aContext.markCurrentMerged();
-
-    if (pReplacedNode) m_aContext.getCurrentParent().removeChild( aName );
-
-    INode * pAddedInstance = m_aContext.getCurrentParent().addChild( apNewInstance );
-
-    m_aContext.pushNode(pAddedInstance->asISubtree());
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-    {
-        this->skipNode();
-        return;
-    }
-
-    implAddOrReplaceNode( aName, m_aContext.getCurrentItemType(), aAttributes);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-    {
-        this->skipNode();
-        return;
-    }
-
-    // TODO: correct argument position (from 2 to 3) for an illegal argument exception wrt attributes
-    implAddOrReplaceNode( aName, m_aContext.getValidItemType(aTemplate), aAttributes);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::endNode( ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->leaveSkippedNode())
-        return;
-
-    this->propagateAttributes(m_aContext.getCurrentParent());
-
-    m_aContext.popNode();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::dropNode( const rtl::OUString& aName ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-        return;
-
-    if (!m_aContext.getCurrentParent().isSetNode())
-        m_aContext.raiseMalformedDataException("Layer merging: Removing child nodes is only possible in set nodes.");
-
-    if (ISubtree * pDropped = m_aContext.findNode(aName))
-    {
-        this->ensureUnchanged(pDropped);
-        if (!m_aContext.isRemovable(pDropped))
-        {
-            logRejection(m_aContext,pDropped,true);
-            return;
-        }
-    }
-    else
-    {
-        const sal_Int16 loglevel = getOverrideViolationLogLevel(m_bSublayer);
-        if (m_aContext.getLogger().isLogging(loglevel))
-        {
-            rtl::OUStringBuffer aMessage;
-            aMessage.appendAscii("Node ").append(m_aContext.getNodePath(aName))
-                    .appendAscii(" to be removed does not exist - ignoring");
-            
-            m_aContext.getLogger().log(loglevel,aMessage.makeStringAndClear(), "dropNode()", "configmgr::LayerMergeHandler");
-        }
-        // m_aContext.raiseNoSuchElementException("Layer merging: The node to be removed does not exist.",aName);
-    }
-    m_aContext.markCurrentMerged();
-    m_aContext.getCurrentParent().removeChild(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-    {
-        this->skipNode();
-    }
-    else if (INode * pProp = m_aContext.findProperty(aName))
-    {
-        ensureUnchanged(pProp);
-
-        if (startOverride(pProp,bClear))
-        {
-            applyAttributes(pProp,aAttributes);
-
-            m_pProperty = pProp;
-
-            checkPropertyType(aType);
-        }
-        else
-            this->skipNode();
-    }
-    else // ignore non-matched data
-    {
-        const sal_Int16 loglevel = getOverrideViolationLogLevel(m_bSublayer);
-        if (m_aContext.getLogger().isLogging(loglevel))
-        {
-            rtl::OUStringBuffer aMessage;
-            aMessage.appendAscii("Property ").append(m_aContext.getNodePath(aName))
-                    .appendAscii(" to be overridden does not exist - skipping");
-            
-            m_aContext.getLogger().log(loglevel,aMessage.makeStringAndClear(), "overrideNode()", "configmgr::LayerMergeHandler");
-        }
-        //   m_aContext.raiseUnknownPropertyException("Layer merging: The property to be overridden does not exist.",aName);
-        this->skipNode();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::endProperty( ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->leaveSkippedNode())
-        return;
-
-    if (!m_pProperty)
-        m_aContext.raiseMalformedDataException("Layer merging: Invalid data: Ending a property that wasn't started.");
-
-    if (ISubtree * pLocalizedSet = m_pProperty->asISubtree())
-        this->propagateAttributes(*pLocalizedSet);
-
-    m_pProperty = NULL;
-    if (m_pConverter) m_pConverter->m_bConvertData = false;
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-        return;
-
-    // TODO: add type validation
-    node::Attributes aValueAttributes = makePropertyAttributes(aAttributes & SchemaAttribute::MASK);
-
-    std::auto_ptr<ValueNode> aPropertyValue = 
-        m_aFactory.getNodeFactory().createNullValueNode(aName,aType,aValueAttributes);
-
-    applyAttributes(aPropertyValue.get(),aAttributes & NodeAttribute::MASK);
-
-    // can be a replace for dynamic properties (current update limitation)
-    m_aContext.markCurrentMerged();
-    m_aContext.addPropertyToCurrent(aPropertyValue, true);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-        return;
-
-    node::Attributes aValueAttributes = makePropertyAttributes(aAttributes & SchemaAttribute::MASK);
-
-    std::auto_ptr<ValueNode> aPropertyValue = 
-        m_aFactory.getNodeFactory().createValueNode(aName,aValue,aValueAttributes);
-
-    applyAttributes(aPropertyValue.get(),aAttributes & NodeAttribute::MASK);
-
-    // can be a replace for dynamic properties (current update limitation)
-    m_aContext.markCurrentMerged();
-    m_aContext.addPropertyToCurrent(aPropertyValue, true);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::setPropertyValue( const uno::Any& aValue ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-        return;
-
-    if (!m_pProperty)
-        m_aContext.raiseMalformedDataException("Layer merging: Invalid data: Overriding a value without a property.");
-
-    OSL_ASSERT( !m_pProperty->getAttributes().isReplacedForUser() );
-    m_pProperty->modifyState( node::isMerged );
-    m_aContext.markCurrentMerged();
-
-    applyPropertyValue(aValue);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerMergeHandler::setPropertyValueForLocale( const uno::Any& aValue, rtl::OUString const & aLocale ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (this->isSkipping())
-        return;
-
-    if (!m_pProperty)
-        m_aContext.raiseMalformedDataException("Layer merging: Invalid data: Overriding a (localized) value without a property.");
-
-    OSL_ASSERT( !m_pProperty->getAttributes().isReplacedForUser() );
-    m_pProperty->modifyState( node::isMerged );
-    m_aContext.markCurrentMerged();
-
-    applyPropertyValue(aValue,aLocale);
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-uno::Reference< com::sun::star::script::XTypeConverter >
-    LayerMergeHandler::Converter::createTCV(uno::Reference< uno::XComponentContext > const & xContext)
-{
-    OSL_ENSURE(xContext.is(),"Cannot create TypeConverter for LayerMergeHandler without a Context");
-
-    uno::Reference< lang::XMultiComponentFactory > xFactory = xContext->getServiceManager();
-    OSL_ENSURE(xFactory.is(),"Cannot create TypeConverter for LayerMergeHandler without a ServiceManager");
-
-    uno::Reference< com::sun::star::script::XTypeConverter > xTCV;
-    if (xFactory.is())
-    {
-        static const rtl::OUString k_sTCVService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"));
-
-        xTCV = uno::Reference< com::sun::star::script::XTypeConverter >::query(xFactory->createInstanceWithContext(k_sTCVService,xContext));
-    }
-    return xTCV;
-}
-// -----------------------------------------------------------------------------
-    
-LayerMergeHandler::Converter::Converter(uno::Reference< uno::XComponentContext > const & xContext)
-: m_aConverter( createTCV(xContext) )
-, m_bConvertData(false)
-{
-}
-// -----------------------------------------------------------------------------
-static 
-inline 
-uno::Type getBinaryDataType()
-{
-    uno::Sequence< sal_Int8 > const * const forBinary = 0;
-    return ::getCppuType(forBinary);
-}
-// -----------------------------------------------------------------------------
-
-uno::Any LayerMergeHandler::Converter::convertValue(uno::Type const & _aTargetType, uno::Any const & _aValue)
-{
-    OSL_ENSURE( m_bConvertData, "Unexpected: Calling convert data, when data conversion is not active");
-    OSL_ENSURE( _aValue.hasValue(), "Unexpected: Calling convert data, when data to convert is VOID");
-
-    if (_aTargetType == _aValue.getValueType()) return _aValue;
-
-    m_aConverter.reset(_aTargetType);
-
-    if (m_aConverter.isList())
-    {
-        uno::Sequence< rtl::OUString > aStringList;
-        if (_aValue >>= aStringList)
-            return m_aConverter.convertListToAny(aStringList);
-    }
-
-    rtl::OUString aContent;
-    if (_aValue >>= aContent)
-        return m_aConverter.convertToAny(aContent);
-
-
-    OSL_ENSURE(false, "Cannot convert typed value (not a string)");
-
-    return uno::Any();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-namespace
-{
-// -----------------------------------------------------------------------------
-    static inline bool isFinal(node::Attributes const& _aAttributes)
-    {
-        return _aAttributes.isFinalized() || _aAttributes.isReadonly();
-    }
-    // --------------------------------- AttributeSetter ---------------------------------
-
-    class DefaultPromoter : NodeModification
-    {
-    public:
-        explicit
-        DefaultPromoter() 
-        {}
-        
-        void adjustAccess(INode& _rNode);
-
-        using NodeModification::applyToNode;
-    private:
-        void handle(ValueNode& _rValueNode);
-        void handle(ISubtree& _rSubtree);
-    };
-// -----------------------------------------------------------------------------
-
-    void DefaultPromoter::adjustAccess(INode& _rNode)
-    {
-        _rNode.promoteAccessToDefault();
-    }
-// -----------------------------------------------------------------------------	
-
-    void DefaultPromoter::handle(ValueNode& _rValueNode)
-    {
-        _rValueNode.promoteToDefault();
-        adjustAccess(_rValueNode);
-    }
-// -----------------------------------------------------------------------------	
-
-    void DefaultPromoter::handle(ISubtree& _rSubtree)
-    {
-        _rSubtree.markAsDefault();
-        this->applyToChildren(_rSubtree);
-        adjustAccess(_rSubtree);
-    }
-//--------------------------------------------------------------------------
-
-}
-// -----------------------------------------------------------------------------
-void promoteToDefault(MergedComponentData & _rTree)
-{
-    if (ISubtree * pTreeData = _rTree.getSchemaTree())
-        DefaultPromoter().applyToNode(*pTreeData);
-
-    else
-        OSL_ENSURE(false,"No Data to promote to default");
-
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/layermerge.hxx b/configmgr/source/backend/layermerge.hxx
deleted file mode 100644
index c21e5d1a91..0000000000
--- a/configmgr/source/backend/layermerge.hxx
+++ /dev/null
@@ -1,191 +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: layermerge.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 CONFIGMGR_BACKEND_LAYERMERGE_HXX
-#define CONFIGMGR_BACKEND_LAYERMERGE_HXX
-
-#include "mergedcomponentdata.hxx"
-#include "componentdatahelper.hxx"
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    class OTreeNodeFactory;
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class LayerMergeHandler
-        :	public cppu::WeakImplHelper1<backenduno::XLayerHandler>
-        {
-        public:
-            explicit
-            LayerMergeHandler(uno::Reference< uno::XComponentContext > const & _xContext, MergedComponentData & _rData, ITemplateDataProvider* aTemplateProvider = NULL);
-            virtual ~LayerMergeHandler();
-
-        // prepare merging
-            void prepareLayer();
-            bool prepareSublayer(rtl::OUString const & aLocale);
-
-        // checking the result
-            bool isDone() const { return m_aContext.isDone(); }
-            bool isInSublayer() const { return m_bSublayer; }
-
-        // XLayerHandler
-        public:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-        private:
-            void propagateAttributes(ISubtree & _rParent);
-
-            node::Attributes makePropertyAttributes(sal_Int16 aSchemaAttributes)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void checkPropertyType(uno::Type const & _aType) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void applyPropertyValue(uno::Any const & _aValue) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void applyPropertyValue(uno::Any const & _aValue, rtl::OUString const & _aLocale) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void applyAttributes(INode * pNode, sal_Int16 aNodeAttributes)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void overrideLayerRoot( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
- 
-            bool startOverride(INode * pNode, sal_Bool bClear) /* check if writable, mark merged */
-                SAL_THROW(());
-                
-            void implOverrideNode(
-                ISubtree * node, sal_Int16 attributes, bool clear);
-
-            void implAddOrReplaceNode(const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes)
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void ensureUnchanged(INode const * pNode) const
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void setLocalizedValue(ISubtree * pProperty, uno::Any const & _aValue, rtl::OUString const & _aLocale) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-
-            void setValueAndCheck(ValueNode & _rValueNode, uno::Any const & _aValue) 
-                SAL_THROW((com::sun::star::configuration::backend::MalformedDataException , com::sun::star::uno::RuntimeException));
-       private:
-           void skipNode()          { ++m_nSkipping; }
-           bool isSkipping() const  { return m_nSkipping != 0; }
-           bool leaveSkippedNode()  { return m_nSkipping && m_nSkipping--; }
-       private:
-            struct Converter;
-            MergedComponentData &   m_rData;
-            DataBuilderContext      m_aContext;
-            ComponentDataFactory    m_aFactory;
-            rtl::OUString                m_aLocale;
-            INode *                 m_pProperty;
-            Converter *             m_pConverter;
-
-            sal_uInt32              m_nSkipping;
-            bool                    m_bSublayer;
-        };
-// -----------------------------------------------------------------------------
-
-        /// change attributes and states of the tree to make it a proper default layer
-        void promoteToDefault(MergedComponentData & _rTree);
-// -----------------------------------------------------------------------------
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/layerupdate.cxx b/configmgr/source/backend/layerupdate.cxx
deleted file mode 100644
index 8bbb401b39..0000000000
--- a/configmgr/source/backend/layerupdate.cxx
+++ /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: layerupdate.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_configmgr.hxx"
-
-#include "layerupdate.hxx"
-#include "updatedata.hxx"
-#include "configpath.hxx"
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-LayerUpdate::LayerUpdate()
-: m_xContextNode()
-{
-}
-// -----------------------------------------------------------------------------
-
-LayerUpdate::LayerUpdate(LayerUpdate const & _aOther)
-: m_xContextNode(_aOther.m_xContextNode)
-, m_aContextPath(_aOther.m_aContextPath)
-{
-}
-// -----------------------------------------------------------------------------
-
-LayerUpdate::~LayerUpdate()
-{
-}
-// -----------------------------------------------------------------------------
-
-LayerUpdate & LayerUpdate::operator =(LayerUpdate const & _aOther)
-{
-    m_xContextNode = _aOther.m_xContextNode;
-    return *this;
-}
-// -----------------------------------------------------------------------------
-            
-void LayerUpdate::setContextNode(rtl::Reference<NodeUpdate> const & _xContextNode)
-{
-    m_xContextNode = _xContextNode;
-    if (_xContextNode.is())
-        makeContextPath(_xContextNode->getName());
-
-    else
-        m_aContextPath.clear();
-}
-// -----------------------------------------------------------------------------
-            
-void LayerUpdate::makeContextPath(rtl::OUString const & _aPath)
-{
-    configuration::AbsolutePath const aParsedPath = configuration::AbsolutePath::parse(_aPath);
-
-    m_aContextPath.clear();
-    m_aContextPath.reserve( aParsedPath.getDepth() );
-    for (std::vector<configuration::Path::Component>::const_reverse_iterator it = aParsedPath.begin(); it != aParsedPath.end(); ++it)
-    {
-        m_aContextPath.push_back( it->getName() );
-    }
-}
-// -----------------------------------------------------------------------------
-
-rtl::Reference<NodeUpdate>   LayerUpdate::getContextNode() const 
-{ 
-    return m_xContextNode; 
-}
-// -----------------------------------------------------------------------------
-
-std::vector<rtl::OUString> const & LayerUpdate::getContextPath() const
-{
-    OSL_PRECOND( m_xContextNode.is(), "Cannot get context path without context node" );
-    
-    return m_aContextPath;
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/layerupdate.hxx b/configmgr/source/backend/layerupdate.hxx
deleted file mode 100644
index dfedfa9b5a..0000000000
--- a/configmgr/source/backend/layerupdate.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: layerupdate.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 CONFIGMGR_BACKEND_LAYERUPDATE_HXX
-#define CONFIGMGR_BACKEND_LAYERUPDATE_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/ustring.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace com { namespace sun { namespace star { namespace configuration { namespace backend {
-    class XLayerHandler;
-} } } } }
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno        = ::com::sun::star::uno;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-        class NodeUpdate;
-
-        class LayerUpdate
-        {
-        public:
-            LayerUpdate();
-            LayerUpdate(LayerUpdate const & _aOther);
-            ~LayerUpdate();
-            LayerUpdate & operator =(LayerUpdate const & _aOther);
-        public:
-            bool isEmpty() const { return ! m_xContextNode.is(); }
-
-            rtl::Reference<NodeUpdate>       getContextNode() const;
-            std::vector<rtl::OUString> const & getContextPath() const;
-
-            void setContextNode(rtl::Reference<NodeUpdate> const & _xContextNode);
-
-        private:
-            void makeContextPath(rtl::OUString const & _aContextPath);
-
-        private:
-            rtl::Reference<NodeUpdate>   m_xContextNode;
-            std::vector<rtl::OUString>     m_aContextPath;
-        };
-// -----------------------------------------------------------------------------
-
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/layerupdatebuilder.cxx b/configmgr/source/backend/layerupdatebuilder.cxx
deleted file mode 100644
index a461316096..0000000000
--- a/configmgr/source/backend/layerupdatebuilder.cxx
+++ /dev/null
@@ -1,302 +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: layerupdatebuilder.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_configmgr.hxx"
-
-#include "layerupdatebuilder.hxx"
-#include "updatedata.hxx"
-#include "layerupdate.hxx"
-#include <com/sun/star/configuration/backend/TemplateIdentifier.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-LayerUpdateBuilder::LayerUpdateBuilder()
-: m_aUpdate()
-, m_pCurrentNode(NULL)
-, m_pCurrentProp(NULL)
-{
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateBuilder::clear()
-{
-    m_pCurrentProp = NULL;
-    m_pCurrentNode = NULL;
-    m_aUpdate = LayerUpdate();
-
-    OSL_POSTCOND( this->isEmpty(), "LayerUpdateBuilder: Could not reset the stored update.");
-}
-// -----------------------------------------------------------------------------
-
-LayerUpdate const & LayerUpdateBuilder::result() const
-{
-    OSL_ENSURE(this->isComplete(), 
-                "LayerUpdateBuilder: There is no result to retrieve"
-                " - building the data is still in progress.");
-
-    return m_aUpdate;
-}
-// -----------------------------------------------------------------------------
-
-inline
-LayerUpdate & LayerUpdateBuilder::data()
-{
-    return m_aUpdate;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::init()
-{
-    if (m_pCurrentNode) return false;
-
-    LayerUpdate & update = data();
-    m_pCurrentNode = new NodeModification(NULL, rtl::OUString(), 0, 0, false);
-    update.setContextNode(m_pCurrentNode);
-
-    OSL_ENSURE(m_pCurrentProp == NULL, "LayerUpdateBuilder: Internal error: got a current property for a new context");
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::modifyNode(rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, sal_Bool _bReset)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    NodeUpdate * pNewNode = new NodeModification(m_pCurrentNode,_aName,_nFlags,_nFlagsMask,_bReset);  
-    rtl::Reference<ElementUpdate> xNewNode(pNewNode);
-
-    if (!m_pCurrentNode->addNodeUpdate(xNewNode))
-        return false;
-
-    m_pCurrentNode = pNewNode;
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::replaceNode(rtl::OUString const & _aName, sal_Int16 _nFlags, backenduno::TemplateIdentifier const * _pTemplate)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    NodeUpdate * pNewNode = _pTemplate ?
-        new NodeReplace(m_pCurrentNode,_aName,_nFlags,_pTemplate->Name,_pTemplate->Component) :
-        new NodeReplace(m_pCurrentNode,_aName,_nFlags);
-        
-    rtl::Reference<ElementUpdate> xNewNode(pNewNode);
-
-    if (!m_pCurrentNode->addNodeUpdate(xNewNode))
-        return false;
-
-    m_pCurrentNode = pNewNode;
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::finishNode()
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    if (m_pCurrentProp || !m_pCurrentNode) return false;
-    
-    m_pCurrentNode = m_pCurrentNode->getParent();
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::removeNode(rtl::OUString const & _aName)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-
-    NodeDrop * pNewNode = new NodeDrop(m_pCurrentNode,_aName);
-        
-    rtl::Reference<ElementUpdate> xNewNode(pNewNode);
-
-    if (!m_pCurrentNode->addNodeUpdate(xNewNode))
-        return false;
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::modifyProperty(rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, uno::Type const & _aType)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    PropertyUpdate * pNewProp = new PropertyUpdate(m_pCurrentNode,_aName,_nFlags,_nFlagsMask,_aType);  
-    rtl::Reference<ElementUpdate> xNewProp(pNewProp);
-
-    if (!m_pCurrentNode->addPropertyUpdate(xNewProp))
-        return false;
-
-    m_pCurrentProp = pNewProp;
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::setPropertyValue(uno::Any const & _aValue)
-{
-    OSL_PRECOND(m_pCurrentProp, "LayerUpdateBuilder: Illegal state for property operation");
-
-    return m_pCurrentProp->setValue(_aValue);
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::setPropertyValueForLocale(uno::Any const & _aValue, rtl::OUString const & _aLocale)
-{
-    OSL_PRECOND(m_pCurrentProp, "LayerUpdateBuilder: Illegal state for property operation");
-
-    return m_pCurrentProp->setValueFor(_aLocale, _aValue);
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::resetPropertyValue()
-{
-    OSL_PRECOND(m_pCurrentProp, "LayerUpdateBuilder: Illegal state for property operation");
-
-    return m_pCurrentProp->resetValue();
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::resetPropertyValueForLocale(rtl::OUString const & _aLocale)
-{
-    OSL_PRECOND(m_pCurrentProp, "LayerUpdateBuilder: Illegal state for property operation");
-
-    return m_pCurrentProp->resetValueFor(_aLocale);
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::finishProperty()
-{
-    OSL_PRECOND(m_pCurrentProp, "LayerUpdateBuilder: Illegal state for property operation");
-    if (!m_pCurrentProp) return false;
-    m_pCurrentProp->finishValue();
-
-    OSL_ASSERT(m_pCurrentNode == m_pCurrentProp->getParent());
-
-    m_pCurrentProp = NULL;
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::addNullProperty(rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Type const & _aType)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    PropertyAdd * pNewProp = new PropertyAdd(m_pCurrentNode,_aName,_nFlags,_aType); 
-    
-    rtl::Reference<ElementUpdate> xNewProp(pNewProp);
-
-    if (!m_pCurrentNode->addPropertyUpdate(xNewProp))
-        return false;
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::addProperty(rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Any const & _aValue)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    PropertyAdd * pNewProp = new PropertyAdd(m_pCurrentNode,_aName,_nFlags,_aValue); 
-    
-    rtl::Reference<ElementUpdate> xNewProp(pNewProp);
-
-    if (!m_pCurrentNode->addPropertyUpdate(xNewProp))
-        return false;
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::resetProperty(rtl::OUString const & _aName)
-{
-    OSL_PRECOND(m_pCurrentNode && !m_pCurrentProp, "LayerUpdateBuilder: Illegal state for this operation");
-    
-    PropertyReset * pNewProp = new PropertyReset(m_pCurrentNode,_aName); 
-    
-    rtl::Reference<ElementUpdate> xNewProp(pNewProp);
-
-    if (!m_pCurrentNode->addPropertyUpdate(xNewProp))
-        return false;
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::finish()
-{
-    if (!this->finishNode()) return false;
-
-    return m_pCurrentNode == NULL;
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::isEmpty() const
-{
-    OSL_ENSURE( !m_pCurrentNode || !m_aUpdate.isEmpty(), "LayerUpdateBuilder: Invariant violation: got a current node without a layer");
-    return m_aUpdate.isEmpty();
-}
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::isActive() const
-{
-    OSL_ENSURE( !m_pCurrentNode || !m_aUpdate.isEmpty(), "LayerUpdateBuilder: Invariant violation: got a current node without a layer");
-    return m_pCurrentNode != 0;
-}
-// -----------------------------------------------------------------------------
-#if OSL_DEBUG_LEVEL > 0
-bool LayerUpdateBuilder::isComplete() const
-{
-    OSL_ENSURE( !m_pCurrentNode || !m_aUpdate.isEmpty(), "LayerUpdateBuilder: Invariant violation: got a current node without a layer");
-    return !m_aUpdate.isEmpty() && m_pCurrentNode == NULL;
-}
-#endif
-// -----------------------------------------------------------------------------
-
-bool LayerUpdateBuilder::isPropertyActive() const
-{
-    OSL_ENSURE( !m_pCurrentNode || !m_aUpdate.isEmpty(), "LayerUpdateBuilder: Invariant violation: got a current node without a layer");
-    OSL_ENSURE(m_pCurrentNode || !m_pCurrentProp, "LayerUpdateBuilder: Invariant violation: got a current property without a node");
-    return m_pCurrentProp != 0;
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/layerupdatebuilder.hxx b/configmgr/source/backend/layerupdatebuilder.hxx
deleted file mode 100644
index 47e4b38612..0000000000
--- a/configmgr/source/backend/layerupdatebuilder.hxx
+++ /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: layerupdatebuilder.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 CONFIGMGR_BACKEND_LAYERUPDATEBUILDER_HXX
-#define CONFIGMGR_BACKEND_LAYERUPDATEBUILDER_HXX
-
-#include "layerupdate.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <rtl/ustring.hxx>
-
-namespace com { namespace sun { namespace star { namespace configuration { namespace backend {
-    struct TemplateIdentifier;
-} } } } }
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno = ::com::sun::star::uno;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-        class NodeUpdate;
-        class PropertyUpdate;
-
-        class LayerUpdateBuilder
-        {
-            LayerUpdate     m_aUpdate;
-            NodeUpdate      * m_pCurrentNode;
-            PropertyUpdate  * m_pCurrentProp;
-        public:
-            LayerUpdateBuilder();
-
-        public:
-            /// initialize the update
-            bool init();
-
-            bool modifyNode(rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, sal_Bool _bReset);
-            bool replaceNode(rtl::OUString const & _aName, sal_Int16 _nFlags, backenduno::TemplateIdentifier const * _pTemplate = NULL);
-            bool finishNode();
-
-            bool removeNode(rtl::OUString const & _aName);
-
-            bool modifyProperty(rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, uno::Type const & _aType);
-            bool setPropertyValue(uno::Any const & _aValue);
-            bool setPropertyValueForLocale(uno::Any const & _aValue, rtl::OUString const & _aLocale);
-            bool resetPropertyValue();
-            bool resetPropertyValueForLocale(rtl::OUString const & _aLocale);
-            bool finishProperty();
-
-            bool addNullProperty(rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Type const & _aType);
-            bool addProperty(rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Any const & _aValue);
-            bool resetProperty(rtl::OUString const & _aName);
-
-            bool finish();
-            void clear();
-
-            bool isEmpty()      const;
-            bool isActive()     const;
-#if OSL_DEBUG_LEVEL > 0
-            bool isComplete()   const;
-#endif
-            bool isPropertyActive()     const;
-
-            LayerUpdate const & result() const;
-        private:
-            LayerUpdate & data();
-        };
-// -----------------------------------------------------------------------------
-
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/layerupdatehandler.cxx b/configmgr/source/backend/layerupdatehandler.cxx
deleted file mode 100644
index 99ffd0db88..0000000000
--- a/configmgr/source/backend/layerupdatehandler.cxx
+++ /dev/null
@@ -1,316 +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: layerupdatehandler.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_configmgr.hxx"
-
-#include "layerupdatehandler.hxx"
-#include "layerupdatemerger.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/beans/PropertyExistException.hpp>
-
-// -----------------------------------------------------------------------------
-#define OUSTR( str ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( str ) )
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL instantiateUpdateMerger
-( uno::Reference< uno::XComponentContext > const& xContext )
-{
-    return * new LayerUpdateHandler( xContext );
-}
-
-// -----------------------------------------------------------------------------
-
-LayerUpdateHandler::LayerUpdateHandler(uno::Reference< uno::XComponentContext > const & _xContext)
-: UpdateService(_xContext)
-, m_aBuilder()
-{
-}
-// -----------------------------------------------------------------------------
-
-LayerUpdateHandler::~LayerUpdateHandler()
-{
-}
-// -----------------------------------------------------------------------------
-inline
-void LayerUpdateHandler::checkBuilder(bool _bForProperty)
-{
-    if ( m_aBuilder.isEmpty() ) 
-        raiseMalformedDataException("LayerUpdateHandler: Illegal operation - no update is in progress");
-
-    if ( !m_aBuilder.isActive() ) 
-        raiseMalformedDataException("LayerUpdateHandler: Illegal operation - no context for update available");
-
-    if ( m_aBuilder.isPropertyActive() != _bForProperty ) 
-        raiseMalformedDataException("LayerUpdateHandler: Illegal operation - a property is in progress");
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateHandler::raiseMalformedDataException(sal_Char const * pMsg)
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-    throw backenduno::MalformedDataException(sMsg,*this,uno::Any());
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateHandler::raiseNodeChangedBeforeException(sal_Char const * pMsg)
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-    throw backenduno::MalformedDataException(sMsg,*this,uno::Any());
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateHandler::raisePropChangedBeforeException(sal_Char const * pMsg)
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-    throw backenduno::MalformedDataException(sMsg,*this,uno::Any());
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateHandler::raisePropExistsException(sal_Char const * pMsg)
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-    com::sun::star::beans::PropertyExistException e(sMsg,*this);
-
-    throw backenduno::MalformedDataException(sMsg,*this, uno::makeAny(e));
-}
-// -----------------------------------------------------------------------------
-
-// XUpdateHandler
-void SAL_CALL 
-    LayerUpdateHandler::startUpdate(  ) 
-        throw ( backenduno::MalformedDataException, lang::IllegalAccessException, 
-                lang::WrappedTargetException, uno::RuntimeException)
-{
-    this->checkSourceLayer();
-    if (!m_aBuilder.init())
-        raiseMalformedDataException("LayerUpdateHandler: Cannot start update - update is already in progress");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::endUpdate(  ) 
-        throw ( backenduno::MalformedDataException, lang::IllegalAccessException, 
-                lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder();
-
-    if (!m_aBuilder.finish())
-        raiseMalformedDataException("LayerUpdateHandler: Cannot finish update - a node is still open.");
-    
-    uno::Reference< backenduno::XLayer > xMergedLayer( LayerUpdateMerger::getMergedLayer(this->getSourceLayer(), m_aBuilder.result()) );
-
-    m_aBuilder.clear();
-
-    this->writeUpdatedLayer(xMergedLayer);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::modifyNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Int16 aAttributeMask, sal_Bool bReset ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder();
-
-    if (!m_aBuilder.modifyNode(aName,aAttributes,aAttributeMask,bReset))
-        raiseNodeChangedBeforeException("LayerUpdateHandler: Cannot start node modification - node has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder();
-
-    if (!m_aBuilder.replaceNode(aName,aAttributes,NULL))
-        raiseNodeChangedBeforeException("LayerUpdateHandler: Cannot start added/replaced node - node has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, sal_Int16 aAttributes, const backenduno::TemplateIdentifier& aTemplate ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder();
-
-    if (!m_aBuilder.replaceNode(aName,aAttributes,&aTemplate))
-        raiseNodeChangedBeforeException("LayerUpdateHandler: Cannot start added/replaced node - node has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::endNode(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder();
-
-    if (!m_aBuilder.finishNode())
-    {
-        OSL_ENSURE(m_aBuilder.isPropertyActive() || !m_aBuilder.isActive(), "LayerUpdateHandler: Unexpected failure mode for finishNode");
-        if (m_aBuilder.isPropertyActive())
-            raiseMalformedDataException("LayerUpdateHandler: Cannot finish node update - open property has not been ended.");
-        else
-            raiseMalformedDataException("LayerUpdateHandler: Cannot finish node update - no node has been started.");
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::removeNode( const rtl::OUString& aName ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder();
-
-    if (!m_aBuilder.removeNode(aName))
-        raiseNodeChangedBeforeException("LayerUpdateHandler: Cannot remove node - node has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler:: modifyProperty( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Int16 aAttributeMask, const uno::Type & aType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder(false);
-
-    if (!m_aBuilder.modifyProperty(aName,aAttributes,aAttributeMask, aType))
-        raisePropChangedBeforeException("LayerUpdateHandler: Cannot start property modification - property has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler:: setPropertyValue( const uno::Any& aValue ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder(true); // already checks for open property
-
-    OSL_VERIFY( m_aBuilder.setPropertyValue(aValue) );
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler:: setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale )
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder(true); // already checks for open property
-
-    OSL_VERIFY( m_aBuilder.setPropertyValueForLocale(aValue,aLocale) );
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::resetPropertyValue( ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder(true); // already checks for open property
-
-    OSL_VERIFY( m_aBuilder.resetPropertyValue() );
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::resetPropertyValueForLocale( const rtl::OUString& aLocale ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder(true); // already checks for open property
-
-    OSL_VERIFY( m_aBuilder.resetPropertyValueForLocale(aLocale) );
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::endProperty(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    checkBuilder(true); // already checks for open property
-
-    OSL_VERIFY ( m_aBuilder.finishProperty() );
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::resetProperty( const rtl::OUString& aName ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!m_aBuilder.resetProperty(aName))
-        raisePropChangedBeforeException("LayerUpdateHandler: Cannot reset property - property has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::addOrReplaceProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!m_aBuilder.addNullProperty(aName,aAttributes,aType))
-        raisePropExistsException("LayerUpdateHandler: Cannot add property - property exists (and has already been changed).");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::addOrReplacePropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!m_aBuilder.addProperty(aName,aAttributes,aValue))
-        raisePropExistsException("LayerUpdateHandler: Cannot add property - property exists (and has already been changed).");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL 
-    LayerUpdateHandler::removeProperty( const rtl::OUString& aName ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    // treat 'remove' as 'reset'. (Note: does not verify that this actually amounts to dropping the property)
-    if (!m_aBuilder.resetProperty(aName))
-        raisePropChangedBeforeException("LayerUpdateHandler: Cannot remove property - property has already been changed.");
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/layerupdatehandler.hxx b/configmgr/source/backend/layerupdatehandler.hxx
deleted file mode 100644
index 93bd4a30e5..0000000000
--- a/configmgr/source/backend/layerupdatehandler.hxx
+++ /dev/null
@@ -1,157 +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: layerupdatehandler.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 CONFIGMGR_BACKEND_LAYERUPDATEHANDLER_HXX
-#define CONFIGMGR_BACKEND_LAYERUPDATEHANDLER_HXX
-
-#include "sal/config.h"
-
-#include "boost/utility.hpp"
-
-#include "updatesvc.hxx"
-#include "layerupdatebuilder.hxx"
-#include "utility.hxx"
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-        class LayerUpdateBuilder;
-
-        class LayerUpdateHandler: private boost::noncopyable, public UpdateService
-        {
-        public:
-            explicit
-            LayerUpdateHandler(uno::Reference< uno::XComponentContext > const & _xContext);
-            
-            ~LayerUpdateHandler();
-
-            // XUpdateHandler
-            virtual void SAL_CALL 
-                startUpdate(  ) 
-                    throw ( backenduno::MalformedDataException, lang::IllegalAccessException, 
-                            lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endUpdate(  ) 
-                    throw ( backenduno::MalformedDataException, lang::IllegalAccessException, 
-                            lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                modifyNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Int16 aAttributeMask, sal_Bool bReset ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, sal_Int16 aAttributes, const backenduno::TemplateIdentifier& aTemplate ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                removeNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                modifyProperty( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Int16 aAttributeMask, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale )
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                resetPropertyValue( ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                resetPropertyValueForLocale( const rtl::OUString& aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                resetProperty( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addOrReplaceProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addOrReplacePropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                removeProperty( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-    
-        private:
-            LayerUpdateBuilder & getUpdateBuilder();
-
-            void checkBuilder(bool _bForProperty = false);
-
-            void raiseMalformedDataException(sal_Char const * pMsg);
-            void raiseNodeChangedBeforeException(sal_Char const * pMsg);
-            void raisePropChangedBeforeException(sal_Char const * pMsg);
-            void raisePropExistsException(sal_Char const * pMsg);
-
-        private:
-            LayerUpdateBuilder                          m_aBuilder;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/layerupdatemerger.cxx b/configmgr/source/backend/layerupdatemerger.cxx
deleted file mode 100644
index c6bfcfc7f1..0000000000
--- a/configmgr/source/backend/layerupdatemerger.cxx
+++ /dev/null
@@ -1,515 +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: layerupdatemerger.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "layerupdatemerger.hxx"
-#include "layerupdatebuilder.hxx"
-#include "updatedata.hxx"
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-LayerUpdateMerger::LayerUpdateMerger(uno::Reference< backenduno::XLayer > const & _xSourceLayer, LayerUpdate const & _aLayerUpdate)
-: BasicUpdateMerger(_xSourceLayer)
-, m_aLayerUpdate(_aLayerUpdate)
-, m_xCurrentNode()
-{
-}
-// -----------------------------------------------------------------------------
-
-LayerUpdateMerger::~LayerUpdateMerger()
-{
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateMerger::flushUpdate()
-{
-    OSL_ENSURE(!BasicUpdateMerger::isHandling(), "LayerUpdateMerger: Unexpected: flushing data, while base implementation is active");
-    OSL_ENSURE(m_xCurrentNode.is(),"LayerUpdateMerger: No data for flushing.");
-    
-    if (m_xCurrentNode.is()) 
-    {
-        m_xCurrentNode->writeChildrenToLayer(getResultWriter().get());
-        m_xCurrentNode.clear();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::startLayer(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    BasicUpdateMerger::startLayer();
-
-    m_xCurrentNode = m_aLayerUpdate.getContextNode();
-
-    BasicUpdateMerger::findContext(m_aLayerUpdate.getContextPath());
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::endLayer(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    BasicUpdateMerger::endLayer();
-
-    OSL_ENSURE(!m_xCurrentNode.is(), "Path being updated not found in data - update not written");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::overrideNode(aName, aAttributes, bClear);
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getNodeByName(aName);
-    if (!xUpdate.is())
-    {
-        BasicUpdateMerger::overrideNode(aName, aAttributes, bClear);
-        OSL_ASSERT(BasicUpdateMerger::isHandling());
-        return;
-    }
-    m_xCurrentNode->removeNodeByName(aName);
-
-    if (NodeUpdate * pNodeUpdate = xUpdate->asNodeUpdate(true)) 
-    {
-        getResultWriter()->overrideNode(aName, pNodeUpdate->updateFlags(aAttributes), bClear);
-        m_xCurrentNode.set(pNodeUpdate);
-    }
-    else
-    { 
-        xUpdate->writeToLayer(getResultWriter().get());
-        BasicUpdateMerger::startSkipping();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::addOrReplaceNode(aName, aAttributes);
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getNodeByName(aName);
-    if (!xUpdate.is())
-    {
-        BasicUpdateMerger::addOrReplaceNode(aName, aAttributes);
-        OSL_ASSERT(BasicUpdateMerger::isHandling());
-        return;
-    }
-    m_xCurrentNode->removeNodeByName(aName);
-
-    if (NodeUpdate * pNodeUpdate = xUpdate->asNodeUpdate(true)) 
-    {
-        getResultWriter()->addOrReplaceNode(aName, pNodeUpdate->updateFlags(aAttributes));
-        m_xCurrentNode.set(pNodeUpdate);
-    }
-    else
-    { 
-        xUpdate->writeToLayer(getResultWriter().get());
-        BasicUpdateMerger::startSkipping();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::addOrReplaceNodeFromTemplate(aName, aTemplate, aAttributes);
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getNodeByName(aName);
-    if (!xUpdate.is())
-    {
-        BasicUpdateMerger::addOrReplaceNodeFromTemplate(aName, aTemplate, aAttributes);
-        OSL_ASSERT(BasicUpdateMerger::isHandling());
-        return;
-    }
-    m_xCurrentNode->removeNodeByName(aName);
-
-    if (NodeUpdate * pNodeUpdate = xUpdate->asNodeUpdate(true)) 
-    {
-        getResultWriter()->addOrReplaceNodeFromTemplate(aName, aTemplate, pNodeUpdate->updateFlags(aAttributes));
-        m_xCurrentNode.set(pNodeUpdate);
-    }
-    else
-    { 
-        xUpdate->writeToLayer(getResultWriter().get());
-        BasicUpdateMerger::startSkipping();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::endNode(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::endNode();
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    // write unhandled so far changes
-    m_xCurrentNode->writeChildrenToLayer( getResultWriter().get() );
-
-    rtl::Reference<NodeUpdate> xParent( m_xCurrentNode->getParent() );
-    
-    if (xParent.is())
-        getResultWriter()->endNode();
-
-    else
-        BasicUpdateMerger::leaveContext();
-
-    m_xCurrentNode = xParent;
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::dropNode( const rtl::OUString& aName ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::dropNode(aName);
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getNodeByName(aName);
-    if (xUpdate.is())
-    {
-        m_xCurrentNode->removeNodeByName(aName);
-
-        if (NodeUpdate * pNodeUpdate = xUpdate->asNodeUpdate()) 
-        {
-            if (pNodeUpdate-> getOperation() == NodeUpdate::replace)
-            {
-                xUpdate->writeToLayer( getResultWriter().get() );
-                return;
-            }
-            else
-            {
-                malformedUpdate("LayerUpdateMerger: Applying modification to dropped node");
-            }
-        }
-    }
-
-    getResultWriter()->dropNode(aName);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::overrideProperty(aName, aAttributes, aType, bClear);
-        return;
-    }
-
-    OSL_ASSERT( m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getPropertyByName(aName);
-    if (!xUpdate.is())
-    {
-        BasicUpdateMerger::overrideProperty(aName, aAttributes, aType, bClear);
-        OSL_ASSERT(BasicUpdateMerger::isHandling());
-        return;
-    }
-
-    m_xCurrentNode->removePropertyByName(aName);
-    
-    if (PropertyUpdate * pPropUpdate = xUpdate->asPropertyUpdate()) 
-    {
-        OSL_ENSURE( aType == pPropUpdate->getValueType() ||
-                    aType == uno::Type()                 || 
-                    pPropUpdate->getValueType() == uno::Type(),
-                    "Error in update merger: type mismatch overriding property ...");
-
-        getResultWriter()->overrideProperty(aName, pPropUpdate->updateFlags(aAttributes), aType, bClear);
-        m_xCurrentProp.set(pPropUpdate);
-    }
-    else
-    { 
-        xUpdate->writeToLayer(getResultWriter().get());
-        BasicUpdateMerger::startSkipping();
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::endProperty(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::endProperty();
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    if (!m_xCurrentProp.is())
-    {
-        rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("LayerUpdateMerger: Invalid data: Ending property that wasn't started.") );
-        throw backenduno::MalformedDataException( sMsg, *this, uno::Any() );
-    }
-
-    // write unhandled so far values
-    m_xCurrentProp->writeValuesToLayer( getResultWriter().get() );
-
-    getResultWriter()->endProperty();
-
-    m_xCurrentProp.clear();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::setPropertyValue( const uno::Any& aValue ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::setPropertyValue(aValue);
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    if (!m_xCurrentProp.is())
-    {
-        rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("LayerUpdateMerger: Invalid data: setting value, but no property is started.") );
-        throw backenduno::MalformedDataException( sMsg, *this, uno::Any() );
-    }
-
-    if (!m_xCurrentProp->hasChange())
-    {
-        BasicUpdateMerger::setPropertyValue(aValue);
-        return;
-    }
-
-#ifndef CFG_UPDATEMERGER_BATCHWRITE_PROPERTIES
-    if (m_xCurrentProp->hasValue())
-    {
-        getResultWriter()->setPropertyValue(m_xCurrentProp->getValue());
-    }
-    else
-    {
-        OSL_ENSURE(m_xCurrentProp->hasReset(),"LayerUpdateMerger: ERROR: Unknown change type in PropertyUpdate");
-        // write nothing to result
-    }
-
-    // mark handled
-    m_xCurrentProp->removeValue();
-#endif
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::setPropertyValueForLocale(aValue, aLocale);
-        return;
-    }
-
-    OSL_ASSERT(m_xCurrentNode.is());
-
-    if (!m_xCurrentProp.is())
-    {
-        rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("LayerUpdateMerger: Invalid data: setting value, but no property is started.") );
-        throw backenduno::MalformedDataException( sMsg, *this, uno::Any() );
-    }
-
-    if (!m_xCurrentProp->hasChangeFor(aLocale))
-    {
-        BasicUpdateMerger::setPropertyValueForLocale(aValue, aLocale);
-        return;
-    }
-
-#ifndef CFG_UPDATEMERGER_BATCHWRITE_PROPERTIES
-    if (m_xCurrentProp->hasValueFor(aLocale))
-    {
-        getResultWriter()->setPropertyValueForLocale(m_xCurrentProp->getValueFor(aLocale),aLocale);
-    }
-    else
-    {
-        OSL_ENSURE(m_xCurrentProp->hasResetFor(aLocale),"LayerUpdateMerger: ERROR: Unknown change type in PropertyUpdate");
-        // write nothing to result
-    }
-
-    // mark handled
-    m_xCurrentProp->removeValueFor(aLocale);
-#endif
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::addProperty(aName, aAttributes, aType);
-        return;
-    }
-    OSL_ASSERT( m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getPropertyByName(aName);
-    if (!xUpdate.is())
-    {
-        BasicUpdateMerger::addProperty(aName, aAttributes, aType);
-        return;
-    }
-
-    m_xCurrentNode->removePropertyByName(aName);
-    
-    if (PropertyUpdate * pPropUpdate = xUpdate->asPropertyUpdate()) 
-    {
-        if (pPropUpdate->hasValue() && pPropUpdate->getValue().hasValue())
-        {
-            // TODO: validate value-type
-            uno::Any aNewValue = pPropUpdate->getValue();
-            OSL_ASSERT( aNewValue.hasValue() );
-
-            if (aNewValue.getValueType() != aType)
-                malformedUpdate("LayerUpdateMerger: cannot do type conversion while writing updates");
-
-            getResultWriter()->addPropertyWithValue(aName, pPropUpdate->updateFlags(aAttributes), aNewValue);
-        }
-        else 
-        {
-            // TODO: validate type
-            if (pPropUpdate->getValueType() != aType && pPropUpdate->getValueType() != uno::Type())
-                malformedUpdate("LayerUpdateMerger: types for property update do not match");
-
-            OSL_ENSURE(!pPropUpdate->hasReset(),"Warning: resetting the value of an added property is undefined - reverting to NULL");
-            getResultWriter()->addProperty(aName, pPropUpdate->updateFlags(aAttributes), aType);
-        }
-    }
-    else
-    { 
-        xUpdate->writeToLayer(getResultWriter().get());
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerUpdateMerger::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (BasicUpdateMerger::isHandling())
-    {
-        BasicUpdateMerger::addPropertyWithValue(aName, aAttributes, aValue);
-        return;
-    }
-    OSL_ASSERT( m_xCurrentNode.is());
-
-    rtl::Reference<ElementUpdate> xUpdate = m_xCurrentNode->getPropertyByName(aName);
-    if (!xUpdate.is())
-    {
-        BasicUpdateMerger::addPropertyWithValue(aName, aAttributes, aValue);
-        return;
-    }
-
-    m_xCurrentNode->removePropertyByName(aName);
-    
-    if (PropertyUpdate * pPropUpdate = xUpdate->asPropertyUpdate()) 
-    {
-        if (!pPropUpdate->hasChange()) // attribute change only
-        {
-            getResultWriter()->addPropertyWithValue(aName, pPropUpdate->updateFlags(aAttributes), aValue);
-        }
-        else if (pPropUpdate->hasReset())
-        {
-            // write nothing
-        }
-        else if (pPropUpdate->getValue().hasValue()) // setting to non-NULL value
-        {
-            OSL_ASSERT(pPropUpdate->hasValue());
-
-            // TODO: validate value-type
-            uno::Any aNewValue = pPropUpdate->getValue();
-
-            if (aNewValue.getValueType() != aValue.getValueType())
-                malformedUpdate("LayerUpdateMerger: cannot do type conversion while writing updates");
-
-            getResultWriter()->addPropertyWithValue(aName, pPropUpdate->updateFlags(aAttributes), aNewValue);
-        }
-        else // setting to null value
-        {
-            OSL_ASSERT(pPropUpdate->hasValue());
-
-            // TODO: validate type
-            if (pPropUpdate->getValueType() != aValue.getValueType() && pPropUpdate->getValueType() != uno::Type())
-                malformedUpdate("LayerUpdateMerger: types for property update do not match");
-
-            getResultWriter()->addProperty(aName, pPropUpdate->updateFlags(aAttributes), aValue.getValueType());
-        }
-    }
-    else
-    { 
-        xUpdate->writeToLayer(getResultWriter().get());
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerUpdateMerger::malformedUpdate(sal_Char const * pMsg)
-{
-    { (void)pMsg; }
-    OSL_ENSURE(false,pMsg);
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/layerupdatemerger.hxx b/configmgr/source/backend/layerupdatemerger.hxx
deleted file mode 100644
index 751c5b7274..0000000000
--- a/configmgr/source/backend/layerupdatemerger.hxx
+++ /dev/null
@@ -1,133 +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: layerupdatemerger.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 CONFIGMGR_BACKEND_LAYERUPDATEMERGER_HXX
-#define CONFIGMGR_BACKEND_LAYERUPDATEMERGER_HXX
-
-#include "basicupdatemerger.hxx"
-#include "layerupdate.hxx"
-#include <rtl/ref.hxx>
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        class NodeUpdate;
-        class PropertyUpdate;
-
-        class LayerUpdateMerger : protected BasicUpdateMerger
-        {
-        public:
-            static uno::Reference< backenduno::XLayer > getMergedLayer(uno::Reference< backenduno::XLayer > const & _xSourceLayer, LayerUpdate const & _aLayerUpdate) 
-            { return new LayerUpdateMerger(_xSourceLayer, _aLayerUpdate); }
-
-        public:
-            explicit
-            LayerUpdateMerger( uno::Reference< backenduno::XLayer > const & _xSourceLayer, LayerUpdate const & _aLayerUpdate);       
-            
-            ~LayerUpdateMerger();
-        
-
-        // XLayerHandler overrides
-        protected:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString & aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-           
-        // BasicUpdateMerger
-            virtual void flushUpdate();
-        private:
-            void malformedUpdate(sal_Char const * pMsg);
-        private:
-            LayerUpdate                 m_aLayerUpdate;
-            rtl::Reference<NodeUpdate>               m_xCurrentNode;
-            rtl::Reference<PropertyUpdate>           m_xCurrentProp;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/makefile.mk b/configmgr/source/backend/makefile.mk
deleted file mode 100644
index 97e372929f..0000000000
--- a/configmgr/source/backend/makefile.mk
+++ /dev/null
@@ -1,81 +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.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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=backend
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/mergedcomponentdata.obj \
-    $(SLO)$/componentdatahelper.obj \
-    $(SLO)$/schemabuilder.obj \
-    $(SLO)$/layermerge.obj \
-    $(SLO)$/updatesvc.obj \
-    $(SLO)$/layerupdatehandler.obj \
-    $(SLO)$/basicupdatemerger.obj \
-    $(SLO)$/layerupdatemerger.obj \
-    $(SLO)$/layerupdatebuilder.obj \
-    $(SLO)$/layerupdate.obj \
-    $(SLO)$/updatedata.obj \
-    $(SLO)$/updatedispatch.obj \
-    $(SLO)$/singlebackendadapter.obj \
-    $(SLO)$/backendaccess.obj \
-    $(SLO)$/backendfactory.obj \
-    $(SLO)$/importsvc.obj \
-    $(SLO)$/basicimporthandler.obj \
-    $(SLO)$/importmergehandler.obj \
-    $(SLO)$/layerdefaultremover.obj \
-    $(SLO)$/emptylayer.obj \
-    $(SLO)$/binarywriter.obj \
-    $(SLO)$/binaryreader.obj \
-    $(SLO)$/binarywritehandler.obj \
-    $(SLO)$/binaryreadhandler.obj	\
-    $(SLO)$/binarycache.obj	\
-    $(SLO)$/backendnotifier.obj     \
-    $(SLO)$/backendstratalistener.obj		\
-    $(SLO)$/multistratumbackend.obj	\
-    
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/backend/mergedcomponentdata.cxx b/configmgr/source/backend/mergedcomponentdata.cxx
deleted file mode 100644
index bc3604fd0f..0000000000
--- a/configmgr/source/backend/mergedcomponentdata.cxx
+++ /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: mergedcomponentdata.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_configmgr.hxx"
-
-#include "mergedcomponentdata.hxx"
-#include "treenodefactory.hxx"
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-MergedComponentData::MergedComponentData(  ) 
-: m_pSchemaTree()
-, m_pTemplatesTree()
-{
-
-}
-// -----------------------------------------------------------------------------
-
-MergedComponentData::~MergedComponentData(  ) 
-{
-
-}
-// -----------------------------------------------------------------------------
-
-void MergedComponentData::clear(  ) 
-{
-    m_pTemplatesTree.reset();
-    m_pSchemaTree.reset();
-}
-// -----------------------------------------------------------------------------
-
-bool MergedComponentData::hasSchema()const 
-{ 
-    return m_pSchemaTree.get() != NULL; 
-}
-// -----------------------------------------------------------------------------
-
-
-bool MergedComponentData::hasTemplates() const
-{ 
-    return m_pTemplatesTree.get() != NULL; 
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString MergedComponentData::getTemplateAccessor (backenduno::TemplateIdentifier const & _aTemplateName) const
-{
-    return _aTemplateName.Name;
-}
-// -----------------------------------------------------------------------------
-
-bool MergedComponentData::hasTemplate(rtl::OUString const & _aTemplateName) const
-{ 
-    return m_pTemplatesTree.get() != NULL && 
-            m_pTemplatesTree->getChild( _aTemplateName ) != NULL; 
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree>	MergedComponentData::extractSchemaTree()
-{ 
-    return m_pSchemaTree;
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree>	MergedComponentData::extractTemplatesTree()
-{ 
-    return m_pTemplatesTree;
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<INode> MergedComponentData::extractTemplateNode(rtl::OUString const & _aTemplateName)
-{ 
-    if (m_pTemplatesTree.get() == NULL)
-        return std::auto_ptr<INode>();
-
-    return m_pTemplatesTree->removeChild(_aTemplateName);
-}
-// -----------------------------------------------------------------------------
-            
-ISubtree const * MergedComponentData::findTemplate(rtl::OUString const & _aTemplateName) const
-{
-    INode const * pTemplateNode = m_pTemplatesTree->getChild(_aTemplateName);
-
-    ISubtree const * pTemplateTree = pTemplateNode ? pTemplateNode->asISubtree() : NULL;
-
-    OSL_ENSURE(pTemplateTree || !pTemplateNode, "ERROR: Template is not a subtree");
-
-    return pTemplateTree;
-}
-// -----------------------------------------------------------------------------
-
-std::auto_ptr<INode>	MergedComponentData::instantiateTemplate(rtl::OUString const & _aName, rtl::OUString const & _aTemplateName) const
-{
-    if (INode const * pTemplateNode = m_pTemplatesTree->getChild(_aTemplateName))
-    {
-        std::auto_ptr<INode> aResult = pTemplateNode->clone();
-        aResult->setName(_aName);
-        return aResult;
-    }
-    else
-    {
-        return std::auto_ptr<INode>();
-    }
-}
-// -----------------------------------------------------------------------------
-
-ISubtree  * MergedComponentData::setSchemaRoot(std::auto_ptr<ISubtree>  _aSchemaRoot)
-{
-    OSL_PRECOND(_aSchemaRoot.get(),"ERROR: Setting a NULL schema root.");
-    OSL_PRECOND(!hasSchema(),"ERROR: Schema root already set");
-
-    m_pSchemaTree = _aSchemaRoot;
-
-    return m_pSchemaTree.get();
-}
-// -----------------------------------------------------------------------------
-void  MergedComponentData::setTemplatesTree(std::auto_ptr<ISubtree>  _aTemplateTree)
-{
-    OSL_PRECOND(!hasTemplates(),"ERROR: Template Tree already set");
-    m_pTemplatesTree = _aTemplateTree; 
-}
-// -----------------------------------------------------------------------------
-ISubtree  * MergedComponentData::addTemplate(std::auto_ptr<ISubtree>  _aNode, backenduno::TemplateIdentifier const & aTemplate)
-{
-    OSL_PRECOND(_aNode.get(), "ERROR: Adding a NULL template");
-
-    if (!m_pTemplatesTree.get())
-    {
-        m_pTemplatesTree = getDefaultTreeNodeFactory().createGroupNode( aTemplate.Component, node::Attributes() );
-    }
-    else
-    {
-        OSL_ENSURE(m_pTemplatesTree->getName().equals(aTemplate.Component),
-                    "Template Component names do not match");
-    }
-
-    return m_pTemplatesTree->addChild( base_ptr(_aNode) )->asISubtree();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/mergedcomponentdata.hxx b/configmgr/source/backend/mergedcomponentdata.hxx
deleted file mode 100644
index 6cda735aea..0000000000
--- a/configmgr/source/backend/mergedcomponentdata.hxx
+++ /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: mergedcomponentdata.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.
- *
- ************************************************************************/
-
-/* PLEASE DON'T DELETE ANY COMMENT LINES, ALSO IT'S UNNECESSARY. */
-
-#ifndef CONFIGMGR_BACKEND_MERGEDCOMPONENTDATA_HXX
-#define CONFIGMGR_BACKEND_MERGEDCOMPONENTDATA_HXX
-
-#include "valuenode.hxx"
-
-#include <com/sun/star/configuration/backend/TemplateIdentifier.hpp>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    class OTreeNodeFactory;
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace backenduno = ::com::sun::star::configuration::backend;
-
-// -----------------------------------------------------------------------------
-
-        class MergedComponentData
-        {
-        public:
-            MergedComponentData();
-            ~MergedComponentData();
-
-            bool hasSchema()    const;
-            bool hasTemplates() const;
-            bool hasTemplate(rtl::OUString const & _aTemplateName) const;
-
-            rtl::OUString getTemplateAccessor (backenduno::TemplateIdentifier const & _aTemplateName) const;
-
-            ISubtree const * getSchemaTree() const     { return m_pSchemaTree.get(); }
-            ISubtree const * getTemplatesTree() const  { return m_pTemplatesTree.get(); }
-            ISubtree const * findTemplate(rtl::OUString const & _aTemplateName) const;
-            
-            ISubtree * getSchemaTree()      { return m_pSchemaTree.get(); }
-            ISubtree * getTemplatesTree()   { return m_pTemplatesTree.get(); }
-
-            std::auto_ptr<INode> instantiateTemplate(rtl::OUString const & _aName, rtl::OUString const & _aTemplateName) const;
-
-            void clear();
-
-            ISubtree  * setSchemaRoot(std::auto_ptr<ISubtree>  _aSchemaRoot);
-            ISubtree  * addTemplate(std::auto_ptr<ISubtree>  _aNode, backenduno::TemplateIdentifier const & aTemplate);
-            void  setTemplatesTree(std::auto_ptr<ISubtree>  _aTemplateTree);
-            
-            std::auto_ptr<ISubtree>	extractSchemaTree();
-            std::auto_ptr<ISubtree>	extractTemplatesTree();
-            std::auto_ptr<INode>	extractTemplateNode(rtl::OUString const & _aTemplateName);
-        private:
-            std::auto_ptr<ISubtree> m_pSchemaTree;
-            std::auto_ptr<ISubtree> m_pTemplatesTree;
-
-        };
-// -----------------------------------------------------------------------------
-
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/multistratumbackend.cxx b/configmgr/source/backend/multistratumbackend.cxx
deleted file mode 100644
index 3bc3169a32..0000000000
--- a/configmgr/source/backend/multistratumbackend.cxx
+++ /dev/null
@@ -1,934 +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: multistratumbackend.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "multistratumbackend.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif // CONFIGMGR_API_FACTORY_HXX_
-#include "serviceinfohelper.hxx"
-#include "backendstratalistener.hxx"
-
-#ifndef _CONFIGMGR_BOOTSTRAP_HXX
-#include "bootstrap.hxx"
-#endif
-#include "simpleinteractionrequest.hxx"
-#include "configinteractionhandler.hxx"
-#include <com/sun/star/configuration/backend/XMultiLayerStratum.hpp>
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <com/sun/star/configuration/backend/StratumCreationException.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <rtl/ustrbuf.hxx>
-
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <stdio.h>
-
-//==============================================================================
-#define OU2A(rtlOUString)	(::rtl::OUStringToOString((rtlOUString), RTL_TEXTENCODING_ASCII_US).getStr())
-//==============================================================================
-
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
-namespace configmgr { namespace backend {
-
-//==============================================================================
-static const rtl::OUString kSchemaServiceParam(
-    RTL_CONSTASCII_USTRINGPARAM( CONTEXT_ITEM_PREFIX_ "SchemaSupplier"));
-
-static const rtl::OUString kStrataServiceParam(
-    RTL_CONSTASCII_USTRINGPARAM( CONTEXT_ITEM_PREFIX_ "Strata"));
-
-static const rtl::OUString kEntity(
-    RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"EntityLayer")) ;
-
-static const rtl::OUString kAdminModeFlag(
-    RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_ADMINFLAG)) ;
-
-static const rtl::OUString kThisOwnerEntity(
-    RTL_CONSTASCII_USTRINGPARAM("<ThisOwnerEntity>")) ;
-
-//------------------------------------------------------------------------------
-bool checkOptionalArg(rtl::OUString& aArg)
-    {
-        if (aArg.getLength() && aArg[0] == sal_Unicode('?'))
-        {
-            aArg = aArg.copy(1);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-//------------------------------------------------------------------------------
-void parseStrataInfo(const rtl::OUString aServiceList,
-                     std::vector< std::pair<rtl::OUString, rtl::OUString> >& aServiceInfoList,
-                     const uno::Reference<uno::XInterface>& pContext)
-{
-    sal_Int32 nNextToken =0;
-    sal_Int32 nLength = aServiceList.getLength();
-    
-    do
-    {
-        rtl::OUString aServiceName =aServiceList.getToken(0, ':',nNextToken);
-        if((nNextToken ==-1)||(aServiceName.getLength()==0))
-        {
-             throw backenduno::BackendSetupException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "Malformed Strata Service specified")),
-                        pContext, uno::Any()) ;
-        }
-        rtl::OUString aServiceData = aServiceList.getToken(0, ';',nNextToken);
-        
-        std::pair<rtl::OUString, rtl::OUString> aServiceInfo(aServiceName,aServiceData);
-        aServiceInfoList.push_back(aServiceInfo);
-    }
-    while (nNextToken >= 0 && nNextToken < nLength ) ;
-}
-//------------------------------------------------------------------------------
-MultiStratumBackend::MultiStratumBackend(
-        const uno::Reference<uno::XComponentContext>& xContext) 
-        : cppu::WeakComponentImplHelper7< backenduno::XBackend, backenduno::XBackendEntities, backenduno::XVersionedSchemaSupplier, backenduno::XBackendChangesNotifier, backenduno::XBackendChangesListener, lang::XInitialization, lang::XServiceInfo >(mMutex), mFactory(xContext->getServiceManager(),uno::UNO_QUERY_THROW)
-          ,mListenerList()
-{
-    
-}
-//------------------------------------------------------------------------------
-
-MultiStratumBackend::~MultiStratumBackend()
-{
-}
-//------------------------------------------------------------------------------
-bool MultiStratumBackend::checkOkState()
-{
-    if (!mSchemaSupplier.is())
-    {
-        if(rBHelper.bDisposed)
-        {
-            throw lang::DisposedException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "MultiStratumBackend: Backends already disposed")),*this);	
-        }
-        else
-        {
-            throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "MultiStratumBackend: Object was never Initialised")),*this);
-        }								
-    }
-    return true;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL MultiStratumBackend::initialize(
-        const uno::Sequence<uno::Any>& aParameters) 
-    throw (uno::RuntimeException, uno::Exception,
-           css::configuration::InvalidBootstrapFileException,
-           backenduno::BackendSetupException) {
-
-    if (aParameters.getLength() == 0) {
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "No parameters provided to MultiStratumBackend")),
-                *this, 0) ;
-    }
-    
-    uno::Reference<uno::XComponentContext> context ;
-
-    for (sal_Int32 i = 0 ; i < aParameters.getLength() ; ++ i) {
-        if (aParameters [i] >>= context) { break ; }
-    }
-    
-
-    try
-    {
-        //Initialize Backends
-        initializeSchemaSupplier (context); 
-        initializeBackendStrata(context);
-
-        sal_Bool bAdminMode = false;
-        context->getValueByName(kAdminModeFlag) >>= bAdminMode;
-    
-        if (bAdminMode)
-        {
-            // find given entity
-            rtl::OUString sDefaultEntity;
-            if ( (context->getValueByName(kEntity) >>= sDefaultEntity) && sDefaultEntity.getLength() )
-            {
-                for (sal_uInt32	i = 0; i < mBackendStrata.size(); i++)
-                {
-                    uno::Reference< backenduno::XBackendEntities > xEntities( mBackendStrata[i], uno::UNO_QUERY );
-                    if (xEntities.is()&& xEntities->supportsEntity(sDefaultEntity))
-                    {
-                        mBackendStrata.resize(i+1);
-                        mOwnerEntity = sDefaultEntity;
-                        break;
-                    }
-                }
-            }
-            else 
-            {
-                mBackendStrata.resize(1);
-            }
-         }
-    
-         if(mOwnerEntity.getLength()==0)
-         {
-             uno::Reference< backenduno::XBackendEntities > xEntities( 
-                 mBackendStrata[mBackendStrata.size()-1], uno::UNO_QUERY );
-             if (xEntities.is())
-             {
-                 mOwnerEntity = xEntities->getOwnerEntity(); 	
-             }
-             else
-             {
-                 mOwnerEntity = kThisOwnerEntity;
-             }
-         }
-         mStrataListener = new BackendStrataListener(*this);
-
-    }
-    catch(uno::Exception& )
-    {
-        mSchemaSupplier.clear();
-        mBackendStrata.clear() ; 
-
-        throw;
-    }  
-
-}
-//------------------------------------------------------------------------------
-void  MultiStratumBackend::initializeSchemaSupplier(const uno::Reference<uno::XComponentContext>& aContext)
-{
-    
-    rtl::OUString aServiceName;
-
-    aContext->getValueByName(kSchemaServiceParam) >>= aServiceName;
-    uno::Sequence< uno::Any > aInitArgs( 1 );
-    aInitArgs[0] <<= aContext;
-    mSchemaSupplier = uno::Reference<backenduno::XSchemaSupplier>::query(mFactory->createInstanceWithArguments(aServiceName,aInitArgs)) ;
-    if (!mSchemaSupplier.is())
-    {
-         throw backenduno::BackendSetupException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "MultiStratumBackend: Could not create Schema Supplier service")),
-                        *this, uno::Any()) ;
-    
-    }
-}
-//------------------------------------------------------------------------------
-static
-bool approveRecovery(const backenduno::StratumCreationException & aError)
-{
-    sal_uInt32 const k_supported_choices = apihelper::CONTINUATION_APPROVE ; //| apihelper::CONTINUATION_DISAPPROVE;
-
-    sal_uInt32 chosen = apihelper::CONTINUATION_UNKNOWN;
-
-    apihelper::ConfigurationInteractionHandler handler;
-    try {
-        uno::Reference< css::task::XInteractionHandler > h(handler.get());
-        if (h.is()) {
-            rtl::Reference< apihelper::SimpleInteractionRequest > req(
-                new apihelper::SimpleInteractionRequest(
-                    uno::makeAny(aError), k_supported_choices));
-            h->handle(req.get());
-            chosen = req->getResponse();
-        }
-    } catch (uno::Exception & e) {
-        OSL_TRACE("Warning - Configuration: Interaction handler failed: [%s]\n", OU2A(e.Message));
-    }
-
-    switch (chosen)
-    {
-    case apihelper::CONTINUATION_APPROVE:      return true;
-    case apihelper::CONTINUATION_DISAPPROVE:   return false;
-    case apihelper::CONTINUATION_UNKNOWN:      break;
-
-    default: OSL_ENSURE(false,"Unsolicited continuation chosen"); break;
-    }
-    // no choice available - default: disapprove 
-    return false;
-}
-//------------------------------------------------------------------------------
-void MultiStratumBackend::initializeBackendStrata(const uno::Reference<uno::XComponentContext>& aContext)
-{
-    
-    rtl::OUString sStrata;
-    //Get Strata
-    aContext->getValueByName(kStrataServiceParam) >>= sStrata;
-    if(sStrata.getLength()==0)
-    {
-        throw backenduno::BackendSetupException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "MultiStratumBackend: No Strata Services Specified")),
-                        *this, uno::Any()) ;
-    
-    }
-    
-    //need to parse the Strata to extract service names and data location
-    std::vector< std::pair<rtl::OUString, rtl::OUString> > aServiceInfoList;
-    parseStrataInfo(sStrata,aServiceInfoList,*this);
-    
-    for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::const_iterator it = aServiceInfoList.begin(); it != aServiceInfoList.end(); ++it)
-    {
-        uno::Sequence< uno::Any > aInitArgs( 1 );
-        rtl::OUString sServiceName = it->first;
-        const rtl::OUString& sServiceData = it->second;
-        aInitArgs[0] <<= sServiceData; 
-        uno::Reference <uno::XInterface> xBackend;
-        bool bOptional = checkOptionalArg(sServiceName);
-
-        try
-        {
-            xBackend= mFactory->createInstanceWithArguments(sServiceName,aInitArgs);
-        }
-        catch (uno::Exception& exception)
-        {
-            if(!bOptional)
-            {
-                static const sal_Char sErrContext[] = "MultiStratumBackend: Could not create Backend Stratum Service: ";
-                rtl::OUString const sContext(RTL_CONSTASCII_USTRINGPARAM(sErrContext));
-                rtl::OUString const sMessage = sContext.concat(exception.Message);
-                
-                backenduno::StratumCreationException error(sMessage,*this,
-                                                            ::cppu::getCaughtException(),
-                                                            sServiceName,sServiceData);
-                if (!approveRecovery(error))
-                    throw error;
-            }
-            
-        }
-        if (xBackend.is())
-        {
-            mBackendStrata.push_back(xBackend) ;		
-        }
-    }
-}
-//---------------------------------------------------------------------------------------------
-// XBackendEntities
-rtl::OUString SAL_CALL 
-    MultiStratumBackend::getOwnerEntity(  ) 
-        throw (uno::RuntimeException)
-{
-    
-    if (checkOkState())
-    {
-        return mOwnerEntity;
-    }
-    return rtl::OUString();
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL 
-    MultiStratumBackend::getAdminEntity() 
-        throw (uno::RuntimeException)
-{
-    osl::MutexGuard aGuard(mMutex);
-    if (checkOkState())
-    {
-        uno::Reference< backenduno::XBackendEntities > xEntities( mBackendStrata[0], uno::UNO_QUERY );
-        if(xEntities.is())
-        {
-            return xEntities->getAdminEntity();
-        }
-        else
-        {
-            return rtl::OUString();
-        }
-    }
-    return rtl::OUString();
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL
-    MultiStratumBackend::supportsEntity( const rtl::OUString& aEntity ) 
-    throw (backenduno::BackendAccessException, uno::RuntimeException)
-{
-    
-    osl::MutexGuard aGuard(mMutex);
-    if (checkOkState())
-    {
-        for (std::vector< uno::Reference <uno::XInterface> >::const_iterator it =  mBackendStrata.begin(); it !=  mBackendStrata.end(); ++it)
-        {
-            uno::Reference< backenduno::XBackendEntities > xEntities( *it, uno::UNO_QUERY );
-            if (xEntities.is())
-            {
-                if( xEntities->supportsEntity(aEntity))
-                    return true;
-            }
-        }
-        return false;
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL 
-    MultiStratumBackend::isEqualEntity( const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity ) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    osl::MutexGuard aGuard(mMutex);
-    if (aEntity.getLength() == 0)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid empty entity."));
-
-        throw lang::IllegalArgumentException(sMsg, *this, 1);
-    }
-    if (aOtherEntity.getLength() == 0)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid empty entity."));
-
-        throw lang::IllegalArgumentException(sMsg, *this, 2);
-    }
-
-
-    if (aEntity.equals(aOtherEntity))
-    {
-        return true;
-    }
-    
-    if (checkOkState())
-    {
-        for (std::vector< uno::Reference <uno::XInterface> >::const_iterator it =  mBackendStrata.begin(); it !=  mBackendStrata.end(); ++it)
-        {
-            uno::Reference< backenduno::XBackendEntities > xEntities( *it, uno::UNO_QUERY );
-            if (xEntities.is())
-            {
-                if( xEntities->supportsEntity(aEntity))
-                    return  xEntities->isEqualEntity(aEntity,aOtherEntity);
-            }
-        }
-        return false;
-    }
-    return false;
-}      
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL 
-    MultiStratumBackend::getSchemaVersion(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    osl::MutexGuard aGuard(mMutex);
-    
-    if (checkOkState())
-    {
-        uno::Reference<backenduno::XVersionedSchemaSupplier> xVersionSupplier(mSchemaSupplier,uno::UNO_QUERY);
-        if (xVersionSupplier.is())
-            return xVersionSupplier->getSchemaVersion(aComponent) ;
-    }
-    return rtl::OUString();
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XSchema> SAL_CALL 
-    MultiStratumBackend::getComponentSchema(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    osl::MutexGuard aGuard(mMutex);
-    
-    if (checkOkState())
-    {
-        return mSchemaSupplier->getComponentSchema(aComponent) ;
-    }
-    return NULL;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL 
-    MultiStratumBackend::listOwnLayers(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{ 
-    if (checkOkState())
-    {
-        return listLayers(aComponent, mOwnerEntity ) ;
-    }
-    return uno::Sequence<uno::Reference<backenduno::XLayer> >() ;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XUpdateHandler> SAL_CALL
-    MultiStratumBackend::getOwnUpdateHandler(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::NoSupportException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        return getUpdateHandler(aComponent, mOwnerEntity) ;
-    }
-    return NULL;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL
-    MultiStratumBackend::listLayers(const rtl::OUString& aComponent,
-                                    const rtl::OUString& aEntity) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    
-    osl::MutexGuard aGuard(mMutex);
-    if (checkOkState())
-    {
-        sal_Int32 nNumSupportedLayers = mBackendStrata.size();
-        if(aEntity != mOwnerEntity)
-        {
-            nNumSupportedLayers = findSupportingStratum(aEntity);	
-        }
-        return searchSupportingStrata(nNumSupportedLayers,aEntity,aComponent);	
-    }
-    return uno::Sequence<uno::Reference<backenduno::XLayer> >();
-}
-//------------------------------------------------------------------------------
-sal_Int32 MultiStratumBackend::findSupportingStratum(const rtl::OUString& aEntity) 
-{
-    sal_Int32 nNumLayers = mBackendStrata.size();
-    for (std::vector< uno::Reference <uno::XInterface> >::reverse_iterator it = mBackendStrata.rbegin(); it != mBackendStrata.rend(); ++it)
-    {
-        uno::Reference< backenduno::XBackendEntities > xEntities( *it, uno::UNO_QUERY );
-        if (xEntities.is())
-        {
-            if( xEntities->supportsEntity(aEntity))
-            {
-                return nNumLayers;
-            }
-        }		
-        nNumLayers--;
-    }
-    rtl::OUStringBuffer sMsg;
-    sMsg.appendAscii("\n MultiStratumBackend: No Backend supports Entity: \"");
-    sMsg.append(aEntity);
-    throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),
-                                         *this, 0) ;
-}
-//------------------------------------------------------------------------------
-uno::Sequence<uno::Reference<backenduno::XLayer> > 
-    MultiStratumBackend::searchSupportingStrata(sal_Int32 nNumLayers,
-                                                rtl::OUString aEntity,
-                                                const rtl::OUString& aComponent) 
-{
-    uno::Sequence<uno::Reference<backenduno::XLayer> > aLayers;
-    std::vector<uno::Reference<backenduno::XLayer> > aBackendLayers;
-    for (sal_Int32 i = 0 ; i < nNumLayers ; ++ i) 
-    {
-        uno::Sequence<uno::Reference<backenduno::XLayer> > aMultiLayers;
-        uno::Reference< backenduno::XBackendEntities > xEntities(mBackendStrata[i], uno::UNO_QUERY );
-        
-        uno::Reference<backenduno::XBackend> xBackend(mBackendStrata[i], uno::UNO_QUERY) ;
-        if (xBackend.is())
-        {
-            if (xEntities.is())
-            {
-                if( !xEntities->supportsEntity(aEntity))
-                {
-                    aEntity = xEntities->getOwnerEntity();
-                }
-                aMultiLayers = xBackend->listLayers(aComponent, aEntity) ;
-            }
-            else
-            {
-                aMultiLayers = xBackend->listOwnLayers(aComponent);	
-            }
-        }
-        else
-        {
-            uno::Reference<backenduno::XMultiLayerStratum> xMultiLayerStratum(
-                    mBackendStrata[i], uno::UNO_QUERY) ;
-                    
-            if (xMultiLayerStratum.is())
-            {
-                if (xEntities.is())
-                {
-                    if( !xEntities->supportsEntity(aEntity))
-                    {
-                        aEntity = xEntities->getOwnerEntity();
-                    }
-                    aMultiLayers = xMultiLayerStratum->getLayers(
-                        xMultiLayerStratum->listLayerIds(aComponent, aEntity),
-                        rtl::OUString()) ;
-
-                }
-                else
-                {
-                     throw backenduno::BackendSetupException(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "MultiStratumBackend: XMultiLayerStratum must support XBackendEntities")),
-                        *this, uno::Any()) ;
-                }
-            
-            }
-            else
-            {
-                uno::Reference<backenduno::XSingleLayerStratum> xSingleLayerStratum(
-                    mBackendStrata[i], uno::UNO_REF_QUERY_THROW) ;
-                if (xSingleLayerStratum.is())
-                {
-                    uno::Reference<backenduno::XLayer> xLayer = xSingleLayerStratum->getLayer( aComponent, rtl::OUString());
-                    //Could be an empty layer
-                    if (xLayer.is())
-                    {
-                        aBackendLayers.push_back(xLayer);
-                    }
-                }
-            }
-        }
-        // There might be non-existent layers in the list if there's no
-        // actual data associated to a given layer id. Hence we have to
-        // compress the list.
-        for (sal_Int32 j = 0 ; j < aMultiLayers.getLength() ; ++j) 
-        {
-            if (aMultiLayers [j].is()) 
-            {
-                aBackendLayers.push_back( aMultiLayers[j]);
-            }
-        }
-    }
-    aLayers.realloc(aBackendLayers.size());
-    for (sal_uInt32 k =0; k < aBackendLayers.size();k++)
-    {
-        aLayers[k] = aBackendLayers[k];
-    }
-    return aLayers;
-}
-//------------------------------------------------------------------------------
-uno::Reference<backenduno::XUpdateHandler> SAL_CALL
-    MultiStratumBackend::getUpdateHandler(const rtl::OUString& aComponent,
-                                          const rtl::OUString& aEntity) 
-        throw (backenduno::BackendAccessException,
-                lang::NoSupportException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    osl::MutexGuard aGuard(mMutex);
-    
-    if (checkOkState())
-    {
-
-        sal_Int32 nNumSupportedLayers = mBackendStrata.size();
-        rtl::OUString aUsedEntity;
-    
-        if(aEntity != mOwnerEntity)
-        {
-            nNumSupportedLayers = findSupportingStratum(aEntity);	
-            aUsedEntity = aEntity;
-        }
-        else
-        {
-            uno::Reference< backenduno::XBackendEntities > xEntities( mBackendStrata[mBackendStrata.size()-1], uno::UNO_QUERY );	
-            if 	(xEntities.is())
-            {
-                aUsedEntity = xEntities->getOwnerEntity();	
-            }
-        }
-        sal_Int32 nStrataIndex = nNumSupportedLayers -1;
-    
-        uno::Reference<backenduno::XBackend> xBackend(
-           mBackendStrata[nStrataIndex], uno::UNO_QUERY) ;
-           uno::Reference< uno::XInterface > xHandler;
-        if(xBackend.is())
-        {
-            if (aUsedEntity.getLength()==0) 
-            {
-                xHandler = xBackend->getOwnUpdateHandler(aComponent) ;
-                return uno::Reference<backenduno::XUpdateHandler>(xHandler,uno::UNO_REF_QUERY_THROW);
-            }
-            else 
-            { 
-                xHandler = xBackend->getUpdateHandler(aComponent, aUsedEntity) ; 
-                return uno::Reference<backenduno::XUpdateHandler>(xHandler,uno::UNO_REF_QUERY_THROW);
-            }
-        }
-        else
-        {
-        
-            uno::Sequence<uno::Any> arguments(1) ;
-    
-            uno::Reference< backenduno::XMultiLayerStratum > xMultiLayerStratum
-                (mBackendStrata[nStrataIndex], uno::UNO_QUERY );
-            if(xMultiLayerStratum.is())
-            {
-                arguments [0] <<= xMultiLayerStratum->getUpdatableLayer(
-                    xMultiLayerStratum->getUpdateLayerId(aComponent,aUsedEntity));
-            }
-            else
-            {
-                uno::Reference< backenduno::XSingleLayerStratum > xSingleLayerStratum( 
-                    mBackendStrata[nStrataIndex], uno::UNO_REF_QUERY_THROW );
-            
-                arguments [0] <<= xSingleLayerStratum->getUpdatableLayer(aComponent);
-        
-            }
-        
-            if(!xHandler.is())
-            {
-                try
-                {
-                    const rtl::OUString kUpdateMerger(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.configuration.backend.LayerUpdateMerger")) ;
-
-                
-                    if(!mFactory.is())
-                    {
-                        throw lang::DisposedException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "MultiStratumBackend: Service Factory already dispoed")),*this);	
-                    }
-                
-                    xHandler = mFactory->createInstanceWithArguments(kUpdateMerger, arguments);
-                }
-                catch (uno::RuntimeException & ) 
-                {throw;}
-                catch (uno::Exception & e) 
-                { 
-                    const rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM(
-                            "Configuration MultiStratumBackend: Cannot create UpdateMerger - error message: ")) ;
-                    throw uno::RuntimeException(sMessage.concat(e.Message),*this); 
-                }
-            }
-            return uno::Reference<backenduno::XUpdateHandler>(xHandler, uno::UNO_REF_QUERY_THROW) ;
-        }
-    }
-    return NULL;
-}
-// ---------------------------------------------------------------------------
-// ComponentHelper
-void SAL_CALL MultiStratumBackend::disposing()
-{
-    osl::MutexGuard aGuard(mMutex);
-    if (mFactory.is())
-    {
-        mFactory.clear();
-    }
-    if (mSchemaSupplier.is())
-    {
-        uno::Reference< lang::XComponent> xComp( mSchemaSupplier, uno::UNO_QUERY);
-        if (xComp.is())
-        {
-            xComp->dispose();
-        }
-        if (mSchemaSupplier.is())
-        {
-            mSchemaSupplier.clear();
-        }
-    }
-    if (!mBackendStrata.empty())
-    {
-        for (std::vector< uno::Reference <uno::XInterface> >::const_iterator it =  mBackendStrata.begin(); it !=  mBackendStrata.end(); ++it)
-        {
-            uno::Reference<  lang::XComponent> xComp( *it, uno::UNO_QUERY );
-            if (xComp.is())
-            {
-                try
-                {
-                    xComp->dispose();
-                }
-                catch(uno::Exception &){}
-            }
-        }
-        mBackendStrata.clear();
-    
-    }
-    
- }
-//------------------------------------------------------------------------------
-
-static const sal_Char * const kBackendService = "com.sun.star.configuration.backend.Backend" ;
-
-static const sal_Char * const kImplementation =
-                "com.sun.star.comp.configuration.backend.MultiStratumBackend" ;
-
-static sal_Char const * const kServiceNames [] = 
-{ 
-    kBackendService, 
-    0 
-} ;
-static const ServiceImplementationInfo kServiceInfo = 
-{ 
-    kImplementation, 
-    kServiceNames, 
-    0  
-} ;
-
-const ServiceRegistrationInfo *getMultiStratumBackendServiceInfo() 
-{ 
-    return getRegistrationInfo(&kServiceInfo) ; 
-}
-
-uno::Reference<uno::XInterface> SAL_CALL 
-    instantiateMultiStratumBackend(const uno::Reference< uno::XComponentContext >& xContext) 
-{
-    return *new MultiStratumBackend(xContext) ;
-}
-//------------------------------------------------------------------------------
-
-static const rtl::OUString kImplementationName(
-                                RTL_CONSTASCII_USTRINGPARAM(kImplementation)) ;
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL 
-    MultiStratumBackend::getImplementationName(void) 
-        throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&kServiceInfo).getImplementationName() ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL 
-    MultiStratumBackend::supportsService(const rtl::OUString& aServiceName) 
-        throw (uno::RuntimeException)
-{
-    return  ServiceInfoHelper(&kServiceInfo).supportsService(aServiceName) ;
-}
-//------------------------------------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL 
-    MultiStratumBackend::getSupportedServiceNames(void) 
-        throw (uno::RuntimeException)
-{
-    return ServiceInfoHelper(&kServiceInfo).getSupportedServiceNames() ;
-}
-//------------------------------------------------------------------------------
-void SAL_CALL MultiStratumBackend::addChangesListener( const uno::Reference<backenduno::XBackendChangesListener>& xListener,
-                                                       const rtl::OUString& aComponent)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    osl::MutexGuard aGuard(mMutex);
-    if(checkOkState())
-    {
-
-        mListenerList.insert( ListenerList::value_type(aComponent, xListener));
-        //Now register with lower layers
-        for (sal_uInt32 i = 0 ; i < mBackendStrata.size()  ; ++ i) 
-        {
-            uno::Reference<backenduno::XBackendChangesNotifier> xBackend(mBackendStrata[i], uno::UNO_QUERY) ;
-            if (xBackend.is())
-            {
-                xBackend->addChangesListener(mStrataListener, aComponent);
-            }
-        }
-    }
-}
-//------------------------------------------------------------------------------
-void SAL_CALL MultiStratumBackend::removeChangesListener( const uno::Reference<backenduno::XBackendChangesListener>& /*xListner*/,
-                                                          const rtl::OUString& aComponent)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    osl::MutexGuard aGuard(mMutex);
-    if(checkOkState())
-    {
-        sal_Int32 nCount =  mListenerList.count(aComponent); 
-        if (nCount == 0)
-        {
-            OSL_TRACE("MultiStratumBackend: removeListener: no listener registered for component %s"
-                      , aComponent.getStr());
-        }
-        else
-        {
-            ListenerList::iterator aIter;
-            aIter = mListenerList.find(aComponent);
-            mListenerList.erase(aIter);
-            if (nCount == 1)
-            {
-                //Deregister Listener from strata backend if they support notification
-                for (sal_uInt32 i = 0 ; i < mBackendStrata.size(); ++ i) 
-                {
-                    uno::Reference<backenduno::XBackendChangesNotifier> xBackend(mBackendStrata[i], uno::UNO_QUERY) ;
-                    if (xBackend.is())
-                    {
-                        xBackend->removeChangesListener(mStrataListener, aComponent);
-                    }
-                }
-            }
-        }
-    }
-}
-//------------------------------------------------------------------------------
-void MultiStratumBackend::componentDataChanged(const backenduno::ComponentChangeEvent& aEvent)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-     try
-     {
-         notifyListeners( aEvent);
-
-     }
-     catch (uno::RuntimeException& ) { throw; }
-     catch (uno::Exception& e) 
-     { 
-            throw lang::WrappedTargetRuntimeException(e.Message, *this, uno::makeAny(e));
-     }
-}
-//------------------------------------------------------------------------------
-void MultiStratumBackend::disposing( lang::EventObject const & /*rSource*/ )
-    throw (::com::sun::star::uno::RuntimeException)
-{}
-//------------------------------------------------------------------------------
-void MultiStratumBackend::notifyListeners(const backenduno::ComponentChangeEvent& aEvent)const
-{
-    //fire off notification to all registered listeners for specific Component
-    ListenerList::const_iterator aIter;
-    rtl::OUString aComponentName = aEvent.Component;
-    if (mListenerList.empty())
-    {
-        OSL_TRACE("MultiStratumBackend: notifyListeners: no listeners registered for component %s",
-                   aComponentName.getStr());
-    }
-    else
-    {
-        aIter = mListenerList.begin();
-        do{
-            if (aIter->first == aComponentName)
-            {
-                aIter->second->componentDataChanged(aEvent);
-            }
-            aIter++;
-        }while (aIter != mListenerList.end());
-    }
- }
-//------------------------------------------------------------------------------
-} } // configmgr.backend
-
diff --git a/configmgr/source/backend/multistratumbackend.hxx b/configmgr/source/backend/multistratumbackend.hxx
deleted file mode 100644
index 00865ea664..0000000000
--- a/configmgr/source/backend/multistratumbackend.hxx
+++ /dev/null
@@ -1,222 +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: multistratumbackend.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 CONFIGMGR_BACKEND_MULTISTRATUMBACKEND_HXX_
-#define CONFIGMGR_BACKEND_MULTISTRATUMBACKEND_HXX_
-
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include <com/sun/star/configuration/backend/XBackendEntities.hpp>
-#include <com/sun/star/configuration/backend/XVersionedSchemaSupplier.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/BackendSetupException.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesListener.hpp>
-#include <cppuhelper/compbase7.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace configmgr { namespace backend {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backenduno = css::configuration::backend ;
-
-/** 
-  Class implementing the Backend service for multibackend access.
-  It creates the required backends and coordinates access to them.
-  */
-class MultiStratumBackend : public cppu::WeakComponentImplHelper7< backenduno::XBackend, backenduno::XBackendEntities, backenduno::XVersionedSchemaSupplier, backenduno::XBackendChangesNotifier, backenduno::XBackendChangesListener, lang::XInitialization, lang::XServiceInfo > {
-    public :
-        /**
-          Service constructor from a service factory.
-
-          @param xContext   component context
-          */
-        explicit 
-        MultiStratumBackend(
-                const uno::Reference<uno::XComponentContext>& xContext) ;
-        /** Destructor  */
-        ~MultiStratumBackend() ;
-
-        // XInitialize
-        virtual void SAL_CALL initialize(
-                                const uno::Sequence<uno::Any>& aParameters) 
-            throw (uno::RuntimeException, uno::Exception,
-                   css::configuration::InvalidBootstrapFileException,
-                   backenduno::BackendSetupException) ;
-
-        // XVersionedSchemaSupplier
-        virtual rtl::OUString
-            SAL_CALL getSchemaVersion(const rtl::OUString& aComponent) 
-                throw (backenduno::BackendAccessException,
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException) ;
-
-        // XSchemaSupplier
-        virtual uno::Reference<backenduno::XSchema> 
-            SAL_CALL getComponentSchema(const rtl::OUString& aComponent) 
-                throw (backenduno::BackendAccessException,
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException) ;
-
-        // XBackend
-        virtual uno::Sequence<uno::Reference<backenduno::XLayer> > 
-            SAL_CALL listOwnLayers(const rtl::OUString& aComponent) 
-                throw (backenduno::BackendAccessException,
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException) ;
-
-        virtual uno::Reference<backenduno::XUpdateHandler> 
-            SAL_CALL getOwnUpdateHandler(const rtl::OUString& aComponent) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    lang::NoSupportException, 
-                    uno::RuntimeException) ;
-        virtual uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL 
-            listLayers(const rtl::OUString& aComponent,
-                       const rtl::OUString& aEntity) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    uno::RuntimeException) ;
-        virtual uno::Reference<backenduno::XUpdateHandler> SAL_CALL 
-            getUpdateHandler(const rtl::OUString& aComponent,
-                             const rtl::OUString& aEntity) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    lang::NoSupportException, 
-                    uno::RuntimeException) ;
-
-        // XBackendEntities
-        virtual rtl::OUString SAL_CALL 
-            getOwnerEntity(  ) 
-                throw (uno::RuntimeException);
-
-        virtual rtl::OUString SAL_CALL 
-            getAdminEntity(  ) 
-                throw (uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL
-            supportsEntity( const rtl::OUString& aEntity ) 
-                throw (backenduno::BackendAccessException, uno::RuntimeException);
-        
-        virtual sal_Bool SAL_CALL 
-            isEqualEntity( const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity ) 
-                throw ( backenduno::BackendAccessException, 
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException);
-        
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName() 
-            throw (uno::RuntimeException) ;
-        virtual sal_Bool SAL_CALL supportsService(
-                                            const rtl::OUString& aServiceName) 
-            throw (uno::RuntimeException) ;
-        virtual uno::Sequence<rtl::OUString> SAL_CALL 
-            getSupportedServiceNames(void) throw (uno::RuntimeException) ;
-        
-        // XBackendChangesNotifier
-        virtual void SAL_CALL addChangesListener( const uno::Reference<backenduno::XBackendChangesListener>& xListner,
-                                                  const rtl::OUString& aComponent)
-            throw (::com::sun::star::uno::RuntimeException);
-
-   
-        virtual void SAL_CALL removeChangesListener( const uno::Reference<backenduno::XBackendChangesListener>& xListner,
-                                                     const rtl::OUString& aComponent)
-            throw (::com::sun::star::uno::RuntimeException);
-
-       // XBackendChangesListener
-        virtual void SAL_CALL componentDataChanged(const backenduno::ComponentChangeEvent& aEvent)
-            throw (::com::sun::star::uno::RuntimeException);
-            
-        virtual void SAL_CALL disposing( lang::EventObject const & rSource )
-           throw (uno::RuntimeException);
-
-        void notifyListeners(const backenduno::ComponentChangeEvent& aEvent) const;
-  protected:
-    // ComponentHelper
-        virtual void SAL_CALL disposing();     
-   private :
-        /** Initialize the schema supplier backend
-            
-        */
-        void initializeSchemaSupplier(const uno::Reference<uno::XComponentContext>& aContext);
-        
-        /** Initialize strata(SingleLayer or MultiLayer) backend
-        */
-        void initializeBackendStrata(const uno::Reference<uno::XComponentContext>& aContext);
-        
-        /** Get Layers from Backend Strata
-        */
-        uno::Sequence<uno::Reference<backenduno::XLayer> >
-            searchSupportingStrata(sal_Int32 nNumLayer,
-                                   rtl::OUString aEntity,
-                                   const rtl::OUString& aComponent)  ;
-        
-        
-        /** Find the Stratum that supports the specified Entity
-        *   @return Number of Supported Strata
-        */
-        sal_Int32 findSupportingStratum(const rtl::OUString& aEntity) ;
-        
-        
-        /** 
-            Check state of MultiStratumBackend  -
-            @return    true if not disposed/uninitialized
-        */
-        bool checkOkState();
-        /** Service factory */
-        uno::Reference<lang::XMultiServiceFactory> mFactory ;
-        /** Mutex for resource protection */
-        osl::Mutex mMutex ;
-        
-        uno::Reference<backenduno::XSchemaSupplier> mSchemaSupplier ;
-        /** list of all backends */
-        std::vector< uno::Reference <uno::XInterface> > mBackendStrata;
-
-        rtl::OUString mOwnerEntity;
-
-        /** Helper object that listens to the Strata Backends */
-        uno::Reference<backenduno::XBackendChangesListener> mStrataListener;
-        /** List of higher level listeners */
-        typedef std::multimap< rtl::OUString, uno::Reference<backenduno::XBackendChangesListener> > ListenerList;
-        ListenerList mListenerList;
-} ;
-
-} } // configmgr.backend
-
-#endif // CONFIGMGR_BACKEND_MULTISTRATUMBACKEND_HXX_
diff --git a/configmgr/source/backend/schemabuilder.cxx b/configmgr/source/backend/schemabuilder.cxx
deleted file mode 100644
index 0956119e85..0000000000
--- a/configmgr/source/backend/schemabuilder.cxx
+++ /dev/null
@@ -1,539 +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: schemabuilder.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_configmgr.hxx"
-
-#include "schemabuilder.hxx"
-#include "treenodefactory.hxx"
-#include "matchlocale.hxx"
-#include <com/sun/star/configuration/backend/SchemaAttribute.hpp>
-#include <rtl/ustrbuf.hxx>
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-        namespace SchemaAttribute = backenduno::SchemaAttribute;
-// -----------------------------------------------------------------------------
-//#if OSL_DEBUG_LEVEL > 0
-// currently not used in debug builds
-#if 0
-        static void check_if_complete(MergedComponentData & md, uno::Reference< uno::XComponentContext > const & xContext) 
-        { 
-            uno::Reference< backenduno::XSchemaHandler > 
-                 test(new SchemaBuilder(xContext, rtl::OUString(),md,NULL)); 
-        }
-#endif
-// -----------------------------------------------------------------------------
-
-SchemaBuilder::SchemaBuilder(uno::Reference< uno::XComponentContext > const & xContext, const rtl::OUString& aExpectedComponentName, MergedComponentData & rData, ITemplateDataProvider* aTemplateProvider ) 
-: m_aData(rData)
-, m_aContext(xContext)
-//, m_aContext(xContext,static_cast<backenduno::XSchemaHandler*>(this), aExpectedComponentName, aTemplateProvider )
-, m_aFactory()
-{
-    m_aContext = DataBuilderContext(xContext,static_cast<backenduno::XSchemaHandler*>(this), aExpectedComponentName, aTemplateProvider );
-}
-// -----------------------------------------------------------------------------
-
-SchemaBuilder::~SchemaBuilder(  ) 
-{
-
-}
-// -----------------------------------------------------------------------------
-            
-// -----------------------------------------------------------------------------
-// XSchemaHandler
-
-void SAL_CALL SchemaBuilder::startSchema(  ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!this->isDone())
-        m_aContext.raiseMalformedDataException("Schema builder: Unexpected Restart of Schema");
-
-    m_aData.clear();
-
-    OSL_ASSERT(!m_aContext.hasActiveComponent());
-    OSL_ASSERT( m_aContext.isDone());
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::endSchema(  )
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!this->isDone())
-        m_aContext.raiseMalformedDataException("Schema builder: Unexpected End of Schema");
-
-    substituteInstances();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::importComponent( const rtl::OUString& /*aName*/ ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    //OSL_TRACE("WARNING: Configuration schema parser: Cross-component references are not yet supported\n");
-}
-// -----------------------------------------------------------------------------
-
-
-void SAL_CALL SchemaBuilder::startComponent( const rtl::OUString& aName ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (m_aData.hasSchema())
-        m_aContext.raiseElementExistException("Schema builder: The component schema is already loaded", rtl::OUString());
-
-    m_aContext.startActiveComponent(aName);
-
-    std::auto_ptr<ISubtree> apSchema = 
-        m_aFactory.createGroup(aName,0,getComponentRootAttributes());
-
-    ISubtree * pSchema = m_aData.setSchemaRoot(apSchema);
-
-    m_aContext.pushNode(pSchema);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::endComponent( ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    m_aContext.popNode();
-
-    m_aContext.endActiveComponent();
-}
-// -----------------------------------------------------------------------------
-
-bool SchemaBuilder::isExtensible(sal_Int16 aSchemaAttributes)
-{
-    sal_Int16 const aValidAttributes = aSchemaAttributes & SchemaAttribute::EXTENSIBLE;
-
-    if (aValidAttributes != aSchemaAttributes)
-        m_aContext.raiseIllegalArgumentException("Schema builder: Illegal attribute specified for node.",2);
-
-    return (aValidAttributes != 0);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::startGroupTemplate( const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (aTemplate.Component.getLength() == 0)
-        m_aContext.raiseIllegalArgumentException("Schema builder: Starting template without owning component",1);
-
-    m_aContext.startActiveComponent(aTemplate.Component);
-    
-    if (m_aData.hasTemplate(aTemplate.Name))
-        m_aContext.raiseElementExistException("Schema builder: Template already exists",aTemplate.Name);
-
-    rtl::OUString aName = m_aData.getTemplateAccessor(aTemplate);
-    bool bExtensible = isExtensible(aAttributes);
-
-    std::auto_ptr<ISubtree> aTemplateTree = 
-        m_aFactory.createGroup(aName,bExtensible,getTemplateBaseAttributes());
-
-    ISubtree * pTree = m_aData.addTemplate(aTemplateTree,aTemplate);
-
-    m_aContext.pushNode(pTree);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::startSetTemplate( const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes, const backenduno::TemplateIdentifier& aItemType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (aTemplate.Component.getLength() == 0)
-        m_aContext.raiseIllegalArgumentException("Schema builder: Starting template without owning component",1);
-
-    m_aContext.startActiveComponent(aTemplate.Component);
-
-    if (m_aData.hasTemplate(aTemplate.Name))
-        m_aContext.raiseElementExistException("Schema builder: Template already exists",aTemplate.Name);
-
-    rtl::OUString aName = m_aData.getTemplateAccessor(aTemplate);
-    backenduno::TemplateIdentifier aFullType = m_aContext.completeComponent(aItemType);
-    bool bExtensible = isExtensible(aAttributes);
-
-    std::auto_ptr<ISubtree> aTemplateTree = 
-        m_aFactory.createSet( aName,aFullType,bExtensible,getTemplateBaseAttributes());
-
-    ISubtree * pTree = m_aData.addTemplate(aTemplateTree,aTemplate);
-
-    m_aContext.pushNode(pTree);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::endTemplate( ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    m_aContext.popNode();
-
-    m_aContext.endActiveComponent();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::startGroup( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    bool bExtensible = isExtensible(aAttributes);
-
-    std::auto_ptr<ISubtree> aTree = m_aFactory.createGroup(aName,bExtensible,getNodeAttributes());
-
-    ISubtree * pTree = m_aContext.addNodeToCurrent(aTree);
-
-    m_aContext.pushNode(pTree);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::startSet( const rtl::OUString& aName, sal_Int16 aAttributes, const backenduno::TemplateIdentifier& aItemType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    backenduno::TemplateIdentifier aFullType = m_aContext.completeComponent(aItemType);
-    bool bExtensible = isExtensible(aAttributes);
-
-    std::auto_ptr<ISubtree> aTree = m_aFactory.createSet(aName,aFullType,bExtensible,getNodeAttributes());
-
-    ISubtree * pTree = m_aContext.addNodeToCurrent(aTree);
-
-    m_aContext.pushNode(pTree);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::endNode( ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    m_aContext.popNode();
-
-    if (m_aContext.isDone())
-        m_aContext.raiseMalformedDataException("Schema builder: Incorrect Termination");
-}
-// -----------------------------------------------------------------------------
-
-node::Attributes SchemaBuilder::makePropertyAttributes(sal_Int16 aSchemaAttributes) const
-{
-    const sal_uInt16 c_AllPropertyAttributes =
-        SchemaAttribute::REQUIRED | SchemaAttribute::LOCALIZED;
-
-    if ((aSchemaAttributes & c_AllPropertyAttributes) != aSchemaAttributes)
-        m_aContext.raiseIllegalArgumentException("SchemaBuilder: Unreckognized Attribute for Property",2);
-
-    node::Attributes aAttributes = getNodeAttributes();
-
-    if (aSchemaAttributes & SchemaAttribute::REQUIRED)
-        aAttributes.setNullable (false);
-
-    return aAttributes;
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    // TODO: add type validation
-    node::Attributes aValueAttributes = makePropertyAttributes(aAttributes);
-
-    if (aAttributes & SchemaAttribute::LOCALIZED)
-    {
-        std::auto_ptr<ISubtree> aLocalizedProp =
-            m_aFactory.createLocalizedContainer(aName,aType,aValueAttributes);
-
-        m_aContext.addLocalizedToCurrent(aLocalizedProp);
-    }
-    else
-    {
-        std::auto_ptr<ValueNode> aPropertyValue = 
-            m_aFactory.getNodeFactory().createNullValueNode(aName,aType,aValueAttributes);
-
-        m_aContext.addPropertyToCurrent(aPropertyValue);
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::addPropertyWithDefault( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aDefaultValue ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    // TODO: add parameter validation
-    node::Attributes aValueAttributes = makePropertyAttributes(aAttributes);
-
-    if (aAttributes & SchemaAttribute::LOCALIZED)
-    {
-        std::auto_ptr<ISubtree> aLocalizedProp =
-            m_aFactory.createLocalizedContainer(aName,aDefaultValue.getValueType(),aValueAttributes);
-
-        std::auto_ptr<ValueNode> aPropertyValue = 
-            m_aFactory.getNodeFactory().createValueNode(localehelper::getDefaultLanguage(),aDefaultValue,aValueAttributes);
-
-        aLocalizedProp->addChild( base_ptr(aPropertyValue) );
-
-        m_aContext.addLocalizedToCurrent(aLocalizedProp);
-    }
-    else
-    {
-        std::auto_ptr<ValueNode> aPropertyValue = 
-            m_aFactory.getNodeFactory().createValueNode(aName,aDefaultValue,aValueAttributes);
-
-
-        m_aContext.addPropertyToCurrent( aPropertyValue);
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::addInstance( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    backenduno::TemplateIdentifier aFullType = m_aContext.completeComponent(aTemplate);
-
-    std::auto_ptr<ISubtree> aPlaceHolder = 
-        m_aFactory.createPlaceHolder(aName,aFullType);
-
-    m_aContext.addNodeToCurrent(aPlaceHolder);
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaBuilder::addItemType( const backenduno::TemplateIdentifier& aItemType ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{ 
-    if ( m_aContext.getCurrentParent().getElementTemplateName() != aItemType.Name ||
-         m_aContext.getCurrentParent().getElementTemplateModule() != m_aContext.getTemplateComponent(aItemType) )
-    {
-        OSL_ENSURE(false, "SchemaBuilder: Multiple ItemTypes for Sets are currently not supported");
-        m_aContext.raiseMalformedDataException("SchemaBuilder: Unsupported Feature: Multiple ItemTypes for Sets");
-    }
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-node::Attributes SchemaBuilder::getNodeAttributes() const
-{
-    node::Attributes aResult = m_aContext.getCurrentAttributes();
-    aResult.setState( node::isDefault );
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-node::Attributes SchemaBuilder::getComponentRootAttributes()
-{
-    node::Attributes aResult;
-    aResult.setState( node::isDefault );
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-node::Attributes SchemaBuilder::getTemplateBaseAttributes()
-{
-    node::Attributes aResult;
-    aResult.setState( node::isReplaced );
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-namespace
-{
-    class SubstitutionHelper : NodeModification
-    {
-        MergedComponentData &   m_rData;
-        DataBuilderContext      m_aContext;
-        ComponentDataFactory    m_aFactory;
-        
-        std::vector< rtl::OUString >            m_aReplacementList;
-        std::vector< ISubtree const * >           m_aTemplateStack;
-    public:
-        SubstitutionHelper(DataBuilderContext const & aBaseContext, MergedComponentData & _rData, uno::XInterface * _pContext)
-        : m_rData(_rData)
-        , m_aContext(aBaseContext,_pContext)
-        , m_aReplacementList()
-        , m_aTemplateStack()
-        {}
-
-        void substituteInData();
-    private:
-        void substituteInComponent(ISubtree * _pComponent);
-        void substituteInNode(ISubtree & _rNode);
-        void substituteInList();
-
-        void substitute(rtl::OUString const & _aName);
-
-        virtual void handle(ValueNode&);
-        virtual void handle(ISubtree&);
-    };
-}
-// -----------------------------------------------------------------------------
-
-void SchemaBuilder::substituteInstances()
-{
-    SubstitutionHelper helper(m_aContext, m_aData, static_cast<backenduno::XSchemaHandler*>(this));
-
-    helper.substituteInData();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-namespace
-{
-// -----------------------------------------------------------------------------
-    void SubstitutionHelper::substituteInData() 
-    {
-        if (m_rData.hasTemplates())
-            substituteInComponent(m_rData.getTemplatesTree());
-
-        if (m_rData.hasSchema())
-            substituteInComponent(m_rData.getSchemaTree());
-    }
-    // -----------------------------------------------------------------------------
-
-    void SubstitutionHelper::substituteInComponent(ISubtree * _pComponent) 
-    {
-        OSL_ENSURE(_pComponent,"ERROR: Trying to substitute in NULL component");
-
-        if (_pComponent)
-        {
-            m_aContext.startActiveComponent(_pComponent->getName());
-            this->substituteInNode(*_pComponent);
-            m_aContext.endActiveComponent();
-        }
-    }
-    // -----------------------------------------------------------------------------
-
-    void SubstitutionHelper::substituteInNode(ISubtree & _rNode) 
-    {
-        std::vector< rtl::OUString > aSaveInstances;
-        aSaveInstances.swap(m_aReplacementList);
-
-        // todo: own stack to check against infinite recursion
-        m_aContext.pushNode(&_rNode); 
-
-        this->applyToChildren(_rNode); // fill the list
-
-        this->substituteInList();
-
-        m_aContext.popNode();
-
-        aSaveInstances.swap(m_aReplacementList);
-    }
-    // -----------------------------------------------------------------------------
-
-    void SubstitutionHelper::substituteInList() 
-    {
-        for(std::vector< rtl::OUString >::iterator it = m_aReplacementList.begin();
-            it != m_aReplacementList.end(); ++it)
-        {
-            this->substitute(*it);
-        }
-    }
-    // -----------------------------------------------------------------------------
-
-    void SubstitutionHelper::substitute(rtl::OUString const & _aName) 
-    {
-        
-        ISubtree & rParent = m_aContext.getCurrentParent();
-
-        std::auto_ptr<INode> pReplacedNode = rParent.removeChild(_aName);
-        OSL_ASSERT( pReplacedNode.get() != NULL );
-
-        ISubtree * pReplacedInstance = pReplacedNode->asISubtree();
-        OSL_ASSERT( pReplacedInstance != NULL );
-
-        backenduno::TemplateIdentifier aTemplateName = m_aFactory.getInstanceType(*pReplacedInstance);
-        if (aTemplateName.Component == m_aContext.getActiveComponent())
-        {
-            if (ISubtree const * pTemplate = m_rData.findTemplate(aTemplateName.Name))
-            {
-                std::vector< ISubtree const * >::iterator beg = m_aTemplateStack.begin(), end = m_aTemplateStack.end();
-                if (std::find(beg,end,pTemplate) != end)
-                    m_aContext.raiseMalformedDataException("SchemaBuilder: Could not expand instances: Template is recursive");
-
-                m_aTemplateStack.push_back(pTemplate);
-
-                std::auto_ptr< INode > pTemplateInstance = pTemplate->clone();
-
-                pTemplateInstance->setName(_aName);
-                // TODO: adjust state/attributes here (?)
-
-                ISubtree * pAddedTree = rParent.addChild(pTemplateInstance)->asISubtree();
-
-                OSL_ENSURE(pAddedTree, "Could not obtain added template instance");
-
-                this->substituteInNode(*pAddedTree);
-
-                m_aTemplateStack.pop_back();
-            }
-            else
-            {
-                m_aContext.raiseMalformedDataException("SchemaBuilder: Could not expand instances: Template not found");
-            }
-        }
-         //Import Template from different component
-        else
-        { 
-            TemplateRequest aTemplateRequest(aTemplateName.Name,
-                                             aTemplateName.Component );
-             ResultHolder< TemplateInstance > aResult = m_aContext.getTemplateData( aTemplateRequest );
-
-             std::auto_ptr<INode> pTemplateInstance = aResult.extractDataAndClear();
-             pTemplateInstance->setName(_aName);
-
-             // Add template instance - must be a tree as any template
-             OSL_VERIFY( 
-        rParent.addChild(pTemplateInstance)->asISubtree() );
-        }
-    }
-    // -----------------------------------------------------------------------------
-
-    void SubstitutionHelper::handle(ValueNode&) 
-    {
-    }
-    // -----------------------------------------------------------------------------
-
-    void SubstitutionHelper::handle(ISubtree& _rTree) 
-    {
-        if (m_aFactory.isInstancePlaceHolder(_rTree))
-            m_aReplacementList.push_back(_rTree.getName());
-
-        else
-            substituteInNode(_rTree);
-    }
-// -----------------------------------------------------------------------------
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/schemabuilder.hxx b/configmgr/source/backend/schemabuilder.hxx
deleted file mode 100644
index 4fc42c377e..0000000000
--- a/configmgr/source/backend/schemabuilder.hxx
+++ /dev/null
@@ -1,154 +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: schemabuilder.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_SCHEMABUILDER_HXX
-#define CONFIGMGR_BACKEND_SCHEMABUILDER_HXX
-
-#include "mergedcomponentdata.hxx"
-#include "componentdatahelper.hxx"
-#include "mergeddataprovider.hxx"
-#include <com/sun/star/configuration/backend/XSchemaHandler.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    class OTreeNodeFactory;
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class SchemaBuilder
-        :	public cppu::WeakImplHelper1<backenduno::XSchemaHandler>
-        {
-        public:
-            SchemaBuilder(uno::Reference< uno::XComponentContext > const & xContext, const rtl::OUString& aExpectedComponentName, MergedComponentData & rData, ITemplateDataProvider* aTemplateProvider = NULL );
-            virtual ~SchemaBuilder();
-
-        // checking the result
-            bool isDone() const { return m_aContext.isDone(); }
-
-            MergedComponentData &       result();
-            MergedComponentData const & result() const;
-
-        // XSchemaHandler
-        public:
-            virtual void SAL_CALL 
-                startSchema(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endSchema(  )
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                importComponent( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                startComponent( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endComponent(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL
-                startGroupTemplate( const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-          
-            virtual void SAL_CALL 
-                startSetTemplate( const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes, const backenduno::TemplateIdentifier& aItemType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-          
-            virtual void SAL_CALL 
-                endTemplate(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-           
-            virtual void SAL_CALL 
-                startGroup( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-         
-            virtual void SAL_CALL 
-                startSet( const rtl::OUString& aName, sal_Int16 aAttributes, const backenduno::TemplateIdentifier& aItemType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-          
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
- 
-            virtual void SAL_CALL 
-                addPropertyWithDefault( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aDefaultValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addInstance( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-            
-            virtual void SAL_CALL 
-                addItemType( const backenduno::TemplateIdentifier& aItemType ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-        private:
-            static node::Attributes getComponentRootAttributes();
-            static node::Attributes getTemplateBaseAttributes();
-            node::Attributes getNodeAttributes() const;
-            node::Attributes makePropertyAttributes(sal_Int16 aSchemaAttributes) const;
-
-            bool isExtensible(sal_Int16 aSchemaAttributes);
-
-            void substituteInstances();
-        private:
-            MergedComponentData &   m_aData;
-            DataBuilderContext      m_aContext;
-            ComponentDataFactory    m_aFactory;
-        };
-// -----------------------------------------------------------------------------
-
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/singlebackendadapter.cxx b/configmgr/source/backend/singlebackendadapter.cxx
deleted file mode 100644
index bcecbe7e5b..0000000000
--- a/configmgr/source/backend/singlebackendadapter.cxx
+++ /dev/null
@@ -1,339 +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: singlebackendadapter.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_configmgr.hxx"
-#include "singlebackendadapter.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif // CONFIGMGR_API_FACTORY_HXX_
-#include "serviceinfohelper.hxx"
-#include <com/sun/star/configuration/backend/XMultiLayerStratum.hpp>
-#include <com/sun/star/configuration/CannotLoadConfigurationException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-namespace configmgr { namespace backend {
-
-//==============================================================================
-
-SingleBackendAdapter::SingleBackendAdapter(
-        const uno::Reference<uno::XComponentContext>& xContext) 
-        : cppu::WeakComponentImplHelper5< backenduno::XBackend, backenduno::XBackendEntities, backenduno::XSchemaSupplier, lang::XInitialization, lang::XServiceInfo >(mMutex), mFactory(xContext->getServiceManager(),uno::UNO_QUERY) {
-}
-//------------------------------------------------------------------------------
-
-SingleBackendAdapter::~SingleBackendAdapter(void) {}
-//------------------------------------------------------------------------------
-
-void SAL_CALL SingleBackendAdapter::initialize(
-        const uno::Sequence<uno::Any>& aParameters) 
-    throw (uno::RuntimeException, uno::Exception) {
-
-    uno::Any const * const pParams = aParameters.getConstArray();
-    sal_Int32 nCount = aParameters.getLength();
-
-    for (sal_Int32 ix = 0; ix < nCount; ++ix)
-    {
-        if (pParams[ix] >>= mBackend) break;
-    }
-
-    if (!mBackend.is())
-    {
-        throw com::sun::star::configuration::CannotLoadConfigurationException(
-            rtl::OUString::createFromAscii("Online SingleBackend Adapter: Cannot operate without real (Single)Backend"),
-            *this); 
-    }
-}
-//------------------------------------------------------------------------------
-static inline rtl::OUString getSingleLayerDummyEntity() 
-{ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); }
-//------------------------------------------------------------------------------
-bool SingleBackendAdapter::checkOkState()
-{
-    if (!mBackend.is())
-    {
-        if(rBHelper.bDisposed)
-        {
-            throw lang::DisposedException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "SingleBackendAdapter: Backend already disposed")),*this);	
-        }
-        else
-        {
-            throw backenduno::BackendAccessException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "SingleBackendAdapter: Object was never Initialised")),*this,uno::Any() );
-        }								
-    }
-    return true;
-}
-
-//------------------------------------------------------------------------------
-
-// XBackendEntities
-rtl::OUString SAL_CALL 
-    SingleBackendAdapter::getOwnerEntity(  ) 
-        throw (uno::RuntimeException)
-{
-    if (mBackend.is())
-    {
-        uno::Reference< backenduno::XBackendEntities > xEntities( mBackend, uno::UNO_REF_QUERY_THROW );
-
-        return xEntities->getOwnerEntity();
-    }
-    else
-    {	
-        throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "SingleBackendAdapter: Object was never Initialised")),*this);
-    }
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL 
-    SingleBackendAdapter::getAdminEntity(  ) 
-        throw (uno::RuntimeException)
-{
-    if (mBackend.is())
-    {
-        uno::Reference< backenduno::XBackendEntities > xEntities( mBackend, uno::UNO_REF_QUERY_THROW );
-        return xEntities->getAdminEntity();
-    }
-    else
-    {	
-        throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "SingleBackendAdapter: Object was never Initialised")),*this);
-    }
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL
-    SingleBackendAdapter::supportsEntity( const rtl::OUString& aEntity ) 
-    throw (backenduno::BackendAccessException, uno::RuntimeException)
-{
-    if (checkOkState())
-    {
-        uno::Reference< backenduno::XBackendEntities > xEntities( mBackend, uno::UNO_REF_QUERY_THROW );
-        return xEntities->supportsEntity(aEntity);
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL 
-    SingleBackendAdapter::isEqualEntity( const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity ) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        uno::Reference< backenduno::XBackendEntities > xEntities( mBackend, uno::UNO_REF_QUERY_THROW );
-        return xEntities->isEqualEntity(aEntity,aOtherEntity);
-    }
-    return false;
-}      
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XSchema> SAL_CALL 
-    SingleBackendAdapter::getComponentSchema(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        return mBackend->getComponentSchema(aComponent) ;
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL 
-    SingleBackendAdapter::listOwnLayers(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        return listLayers(aComponent, this->getOwnerEntity()) ;
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XUpdateHandler> SAL_CALL
-    SingleBackendAdapter::getOwnUpdateHandler(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::NoSupportException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        return getUpdateHandler(aComponent, this->getOwnerEntity()) ;
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL
-    SingleBackendAdapter::listLayers(const rtl::OUString& aComponent,
-                                          const rtl::OUString& aEntity) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        uno::Reference< backenduno::XMultiLayerStratum > xBackend( mBackend, uno::UNO_REF_QUERY_THROW );
-    
-        uno::Sequence<uno::Reference<backenduno::XLayer> > retCode =
-            xBackend->getLayers(xBackend->listLayerIds(aComponent, aEntity),
-                            rtl::OUString()) ;
-
-        // There might be non-existent layers in the list if there's no
-        // actual data associated to a given layer id. Hence we have to
-        // compress the list.
-        sal_Int32 maxLayer = 0 ;
-
-        for (sal_Int32 i = 0 ; i < retCode.getLength() ; ++ i) 
-        {
-            if (retCode [i].is()) 
-            {
-                if (i != maxLayer) { retCode [maxLayer] = retCode [i] ; }
-                ++ maxLayer ;
-            }
-        }
-        retCode.realloc(maxLayer) ;
-        return retCode ;
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XUpdateHandler> SAL_CALL
-    SingleBackendAdapter::getUpdateHandler(const rtl::OUString& aComponent,
-                                                const rtl::OUString& aEntity) 
-        throw (backenduno::BackendAccessException,
-                lang::NoSupportException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    if (checkOkState())
-    {
-        uno::Reference< backenduno::XMultiLayerStratum > xBackend( mBackend, uno::UNO_REF_QUERY_THROW );
-    
-        uno::Sequence<uno::Any> arguments(1) ;
-
-        arguments [0] <<= xBackend->getUpdatableLayer(
-                                        xBackend->getUpdateLayerId(aComponent, 
-                                                                   aEntity)) ;
-        uno::Reference< uno::XInterface > xHandler;
-        try
-        {
-            const rtl::OUString kUpdateMerger(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.backend.LayerUpdateMerger")) ;
-
-            xHandler = mFactory->createInstanceWithArguments(kUpdateMerger, arguments);
-        }
-        catch (uno::RuntimeException & ) 
-        {throw;}
-        catch (uno::Exception & e) 
-        { 
-            const rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM(
-                "Configuration SingleBackendAdapter: Cannot create UpdateMerger - error message: ")) ;
-            throw uno::RuntimeException(sMessage.concat(e.Message),*this); 
-        }
-
-        return uno::Reference<backenduno::XUpdateHandler>(xHandler, uno::UNO_REF_QUERY_THROW) ;
-    }
-    return false;
-}
-//------------------------------------------------------------------------------
-
-static const sal_Char * const kBackendService = "com.sun.star.configuration.backend.Backend" ;
-static const sal_Char * const kAdapterService = "com.sun.star.configuration.backend.BackendAdapter" ;
-static const sal_Char * const kOnlineService  = "com.sun.star.configuration.backend.OnlineBackend" ;
-
-static const sal_Char * const kImplementation =
-                "com.sun.star.comp.configuration.backend.SingleBackendAdapter" ;
-
-static sal_Char const * const kServiceNames [] = 
-{ 
-    kOnlineService, 
-    kAdapterService,
-    0,
-    kBackendService, 
-    0 
-} ;
-static const ServiceImplementationInfo kServiceInfo = 
-{ 
-    kImplementation, 
-    kServiceNames, 
-    kServiceNames + 3 
-} ;
-
-const ServiceRegistrationInfo *getSingleBackendAdapterServiceInfo() 
-{ 
-    return getRegistrationInfo(&kServiceInfo) ; 
-}
-
-uno::Reference<uno::XInterface> SAL_CALL 
-    instantiateSingleBackendAdapter(const uno::Reference< uno::XComponentContext >& xContext) 
-{
-    return *new SingleBackendAdapter(xContext) ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL 
-    SingleBackendAdapter::getImplementationName(void) 
-        throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&kServiceInfo).getImplementationName() ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL 
-    SingleBackendAdapter::supportsService(const rtl::OUString& aServiceName) 
-        throw (uno::RuntimeException)
-{
-    return  ServiceInfoHelper(&kServiceInfo).supportsService(aServiceName) ;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL 
-    SingleBackendAdapter::getSupportedServiceNames(void) 
-        throw (uno::RuntimeException)
-{
-    return ServiceInfoHelper(&kServiceInfo).getSupportedServiceNames() ;
-}
-//------------------------------------------------------------------------------
-
-} } // configmgr.backend
-
diff --git a/configmgr/source/backend/singlebackendadapter.hxx b/configmgr/source/backend/singlebackendadapter.hxx
deleted file mode 100644
index 5790f27dd8..0000000000
--- a/configmgr/source/backend/singlebackendadapter.hxx
+++ /dev/null
@@ -1,145 +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: singlebackendadapter.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_SINGLEBACKENDADAPTER_HXX_
-#define CONFIGMGR_BACKEND_SINGLEBACKENDADAPTER_HXX_
-
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include <com/sun/star/configuration/backend/XBackendEntities.hpp>
-#include <com/sun/star/configuration/backend/XSchemaSupplier.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase5.hxx>
-
-namespace configmgr { namespace backend {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backenduno = css::configuration::backend ;
-
-/** 
-  Class implementing the Backend service for remote access.
-  It just transfers calls to a SingleBackend implementation.
-  */
-class SingleBackendAdapter : public cppu::WeakComponentImplHelper5< backenduno::XBackend, backenduno::XBackendEntities, backenduno::XSchemaSupplier, lang::XInitialization, lang::XServiceInfo > {
-    public :
-        /**
-          Service constructor from a service factory.
-
-          @param aFactory   service factory
-          */
-        SingleBackendAdapter(
-                const uno::Reference<uno::XComponentContext>& xContext) ;
-        /** Destructor  */
-        ~SingleBackendAdapter(void) ;
-
-        // XInitialize
-        virtual void SAL_CALL initialize(
-                                const uno::Sequence<uno::Any>& aParameters) 
-            throw (uno::RuntimeException, uno::Exception) ;
-
-        // XSchemaSupplier
-        virtual uno::Reference<backenduno::XSchema> 
-            SAL_CALL getComponentSchema(const rtl::OUString& aComponent) 
-                throw (backenduno::BackendAccessException,
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException) ;
-
-        // XBackend
-        virtual uno::Sequence<uno::Reference<backenduno::XLayer> > 
-            SAL_CALL listOwnLayers(const rtl::OUString& aComponent) 
-                throw (backenduno::BackendAccessException,
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException) ;
-
-        virtual uno::Reference<backenduno::XUpdateHandler> 
-            SAL_CALL getOwnUpdateHandler(const rtl::OUString& aComponent) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    lang::NoSupportException, 
-                    uno::RuntimeException) ;
-        virtual uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL 
-            listLayers(const rtl::OUString& aComponent,
-                       const rtl::OUString& aEntity) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    uno::RuntimeException) ;
-        virtual uno::Reference<backenduno::XUpdateHandler> SAL_CALL 
-            getUpdateHandler(const rtl::OUString& aComponent,
-                             const rtl::OUString& aEntity) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    lang::NoSupportException, 
-                    uno::RuntimeException) ;
-
-        // XBackendEntities
-        virtual rtl::OUString SAL_CALL 
-            getOwnerEntity(  ) 
-                throw (uno::RuntimeException);
-
-        virtual rtl::OUString SAL_CALL 
-            getAdminEntity(  ) 
-                throw (uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL
-            supportsEntity( const rtl::OUString& aEntity ) 
-                throw (backenduno::BackendAccessException, uno::RuntimeException);
-        
-        virtual sal_Bool SAL_CALL 
-            isEqualEntity( const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity ) 
-                throw ( backenduno::BackendAccessException, 
-                        lang::IllegalArgumentException, 
-                        uno::RuntimeException);
-        
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName(void) 
-            throw (uno::RuntimeException) ;
-        virtual sal_Bool SAL_CALL supportsService(
-                                            const rtl::OUString& aServiceName) 
-            throw (uno::RuntimeException) ;
-        virtual uno::Sequence<rtl::OUString> SAL_CALL 
-            getSupportedServiceNames(void) throw (uno::RuntimeException) ;
-    protected :
-    private :
-        /** Service factory */
-        uno::Reference<lang::XMultiServiceFactory> mFactory ;
-        /** Mutex for resource protection */
-        osl::Mutex mMutex ;
-        /** Remote backend that the offline cache is handling */
-        uno::Reference<backenduno::XSchemaSupplier> mBackend ;
-        /* checks if object is in initialized and undisposed state */
-        bool checkOkState();
-} ;
-
-} } // configmgr.backend
-
-#endif // CONFIGMGR_BACKEND_SINGLEBACKENDADAPTER_HXX_
diff --git a/configmgr/source/backend/updatedata.cxx b/configmgr/source/backend/updatedata.cxx
deleted file mode 100644
index 0f15d1a894..0000000000
--- a/configmgr/source/backend/updatedata.cxx
+++ /dev/null
@@ -1,458 +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: updatedata.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_configmgr.hxx"
-
-#include "updatedata.hxx"
-
-#include <com/sun/star/configuration/backend/NodeAttribute.hpp>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-
-#include <iterator>
-#include <algorithm>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-ElementUpdate::ElementUpdate(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask)
-: NamedUpdate(_aName)
-, m_pParent(_pParent)
-, m_nFlags(_nFlags)
-, m_nFlagsMask(_nFlagsMask)
-{
-}
-// -----------------------------------------------------------------------------
-
-sal_Int16 ElementUpdate::updateFlags(sal_Int16 _nFlags) const
-{
-    return (_nFlags & ~m_nFlagsMask) | (m_nFlags & m_nFlagsMask);
-}
-// -----------------------------------------------------------------------------
-
-NodeUpdate * ElementUpdate::asNodeUpdate(bool )
-{
-    return NULL;
-}
-// -----------------------------------------------------------------------------
-
-PropertyUpdate  * ElementUpdate::asPropertyUpdate()
-{
-    return NULL;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-NodeUpdate::NodeUpdate(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, Op _op)
-: ElementUpdate(_pParent,_aName,_nFlags, _nFlagsMask)
-, m_aNodes()
-, m_aProperties()
-, m_aRemovedElements()
-, m_op(_op)
-{
-} 
-// -----------------------------------------------------------------------------
-
-NodeUpdate * NodeUpdate::asNodeUpdate(bool _bMerged)
-{
-    return (!_bMerged || m_op == modify
-            || (updateFlags() & backenduno::NodeAttribute::FUSE) != 0)
-        ? this : NULL;
-}
-// -----------------------------------------------------------------------------
-
-bool NodeUpdate::addNodeUpdate(rtl::Reference<ElementUpdate> const & _aNode)
-{
-    OSL_PRECOND( _aNode.is(), "ERROR: NodeUpdate: Trying to add NULL node.");
-    OSL_PRECOND( _aNode->getParent() == this, "ERROR: NodeUpdate: Node being added has wrong parent.");
-    OSL_ENSURE(m_aNodes.find(_aNode->getName()) == m_aNodes.end(), 
-                "NodeUpdate: Child node being added already exists in this node.");
-
-    return m_aNodes.insert( ElementList::value_type(_aNode->getName(),_aNode) ).second;
-} 
-// -----------------------------------------------------------------------------
-
-bool NodeUpdate::addPropertyUpdate(rtl::Reference<ElementUpdate> const & _aProp)
-{
-    OSL_PRECOND( _aProp.is(), "ERROR: NodeUpdate: Trying to add NULL property.");
-    OSL_PRECOND( _aProp->getParent() == this, "ERROR: NodeUpdate: Property being added has wrong parent.");
-    OSL_ENSURE(m_aProperties.find(_aProp->getName()) == m_aProperties.end(),
-                "NodeUpdate: Property being added already exists in this node.");
-
-    return m_aProperties.insert( ElementList::value_type(_aProp->getName(),_aProp) ).second;
-} 
-// -----------------------------------------------------------------------------
-
-void NodeUpdate::removeNodeByName(rtl::OUString const & _aName)
-{
-    ElementList::iterator it = m_aNodes.find(_aName);
-    OSL_ENSURE(it != m_aNodes.end(), 
-                "NodeUpdate: Child node being removed is not in this node.");
-
-    if (it != m_aNodes.end())
-    {
-        m_aRemovedElements.insert(*it);
-        m_aNodes.erase(it);
-    }
-} 
-// -----------------------------------------------------------------------------
-
-void NodeUpdate::removePropertyByName  (rtl::OUString const & _aName)
-{
-    ElementList::iterator it = m_aProperties.find(_aName);
-    OSL_ENSURE(it != m_aProperties.end(), 
-                "NodeUpdate: Property being removed is not in this node.");
-
-    if (it != m_aProperties.end())
-    {
-        m_aRemovedElements.insert(*it);
-        m_aProperties.erase(it);
-    }
-} 
-// -----------------------------------------------------------------------------
-
-rtl::Reference<ElementUpdate> NodeUpdate::getNodeByName(rtl::OUString const & _aName) const
-{
-    ElementList::const_iterator it = m_aNodes.find(_aName);
-
-    return it != m_aNodes.end() ? it->second : rtl::Reference<ElementUpdate>();
-}
-// -----------------------------------------------------------------------------
-
-rtl::Reference<ElementUpdate> NodeUpdate::getPropertyByName  (rtl::OUString const & _aName) const
-{
-    ElementList::const_iterator it = m_aProperties.find(_aName);
-
-    return it != m_aProperties.end() ? it->second : rtl::Reference<ElementUpdate>();
-}
-// -----------------------------------------------------------------------------
-
-void NodeUpdate::writeChildrenToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-    for (ElementList::const_iterator itP = beginProperties(); itP != endProperties(); ++itP)
-        itP->second->writeToLayer(_pLayer);
-
-    for (ElementList::const_iterator itN = beginNodes(); itN != endNodes(); ++itN)
-        itN->second->writeToLayer(_pLayer);
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-NodeModification::NodeModification(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, sal_Bool _bReset)
-: NodeUpdate(_pParent,_aName,_nFlags, _nFlagsMask, _bReset ? reset : modify)
-{
-} 
-// -----------------------------------------------------------------------------
-
-void NodeModification::writeToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-
-    if ( this->getOperation() == reset &&   // if we have an empty
-        !this->changedFlags() &&            // 'reset' node, that means
-        !this->hasChildren() )              // we need to write 
-        return;                             // nothing
-        
-    _pLayer->overrideNode( this->getName(), this->updateFlags(), false );
-    this->writeChildrenToLayer(_pLayer);
-    _pLayer->endNode();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-NodeReplace::NodeReplace(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags)
-: NodeUpdate(_pParent,_aName,_nFlags, _nFlags, replace)
-, m_aTemplateName()
-, m_aTemplateComponent()
-{
-}
-// -----------------------------------------------------------------------------
-
-NodeReplace::NodeReplace(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, rtl::OUString const & _aTemplateName, rtl::OUString const & _aTemplateComponent)
-: NodeUpdate(_pParent,_aName,_nFlags, _nFlags, replace)
-, m_aTemplateName(_aTemplateName)
-, m_aTemplateComponent(_aTemplateComponent)
-{
-}
-// -----------------------------------------------------------------------------
-
-bool NodeReplace::hasTemplate() const
-{
-    return m_aTemplateName.getLength() != 0;
-}
-// -----------------------------------------------------------------------------
-
-void NodeReplace::writeToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-
-    if (this->hasTemplate())
-    {
-        backenduno::TemplateIdentifier aTemplate( m_aTemplateName, m_aTemplateComponent );
-        _pLayer->addOrReplaceNodeFromTemplate( this->getName(), aTemplate, this->updateFlags() );
-    }
-    else
-        _pLayer->addOrReplaceNode( this->getName(), this->updateFlags() );
-
-    this->writeChildrenToLayer(_pLayer);
-    _pLayer->endNode();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-NodeDrop::NodeDrop(NodeUpdate * _pParent, rtl::OUString const & _aName)
-: ElementUpdate(_pParent,_aName,0,0)
-{
-}
-// -----------------------------------------------------------------------------
-
-void NodeDrop::writeToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-    _pLayer->dropNode(this->getName());
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-PropertyUpdate::PropertyUpdate(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, uno::Type const & _aType)
-: ElementUpdate(_pParent,_aName,_nFlags,_nFlagsMask)
-, m_aValues()
-, m_aType(_aType)
-{}
-// -----------------------------------------------------------------------------
-
-PropertyUpdate  * PropertyUpdate::asPropertyUpdate()
-{
-    return this;
-}
-// -----------------------------------------------------------------------------
-
-static uno::Any makeResetMarker()
-{
-    uno::Reference< backenduno::XLayerHandler > xNull;
-    return uno::makeAny(xNull);
-}
-// -----------------------------------------------------------------------------
-
-inline bool PropertyUpdate::isResetMarker(uno::Any const & _aValue)
-{
-    OSL_ENSURE( _aValue.getValueTypeClass() != uno::TypeClass_INTERFACE ||
-                _aValue == makeResetMarker() && _aValue.getValueType() == makeResetMarker().getValueType(),
-                "Unexpected any: Interface reference will be taken as reset marker");
-
-    return _aValue.getValueTypeClass() == uno::TypeClass_INTERFACE;
-}
-// -----------------------------------------------------------------------------
-
-uno::Any const & PropertyUpdate::getResetMarker()
-{
-    static uno::Any const aMarker = makeResetMarker();
-
-    OSL_ASSERT( isResetMarker(aMarker) );
-
-    return aMarker;
-}
-// -----------------------------------------------------------------------------
-
-bool PropertyUpdate::setValueFor(rtl::OUString const & _aLocale, uno::Any const & _aValueUpdate)
-{
-    OSL_PRECOND( !isResetMarker(_aValueUpdate), "PropertyUpdate: ERROR: Trying to set a reset marker as regular value" );
-
-    OSL_ENSURE(m_aValues.find(_aLocale) == m_aValues.end(),
-                "PropertyUpdate: Locale being added already has a value in this property.");
-
-    if (_aValueUpdate.hasValue())
-    {
-        if (m_aType.getTypeClass() == uno::TypeClass_ANY)
-            m_aType = _aValueUpdate.getValueType();
-
-        else
-            OSL_ENSURE( m_aType == _aValueUpdate.getValueType() ||
-                        m_aType == uno::Type(),
-                        "ValueType mismatch in PropertyUpdate");
-    }
-    return m_aValues.insert( ValueList::value_type(_aLocale,_aValueUpdate) ).second;
-}
-// -----------------------------------------------------------------------------
-
-bool PropertyUpdate::resetValueFor(rtl::OUString const & _aLocale)
-{
-    OSL_ENSURE(m_aValues.find(_aLocale) == m_aValues.end(),
-                "PropertyUpdate: Locale being reset already has a value in this property.");
-
-    return m_aValues.insert( ValueList::value_type(_aLocale,getResetMarker()) ).second;
-}
-// -----------------------------------------------------------------------------
-
-void PropertyUpdate::removeValueFor(rtl::OUString const & _aLocale)
-{
-    OSL_ENSURE(m_aValues.find(_aLocale) != m_aValues.end(), 
-                "PropertyUpdate: Locale being removed is not in this node.");
-
-    m_aValues.erase(_aLocale);
-}
-// -----------------------------------------------------------------------------
-
-void PropertyUpdate::finishValue()
-{
-    if (m_aType.getTypeClass() == uno::TypeClass_ANY)
-        m_aType = uno::Type();
-}
-// -----------------------------------------------------------------------------
-
-bool PropertyUpdate::hasValueFor(rtl::OUString const & _aLocale) const
-{
-    ValueList::const_iterator it = m_aValues.find(_aLocale);
-
-    return it != m_aValues.end() && ! isResetMarker(it->second);
-}
-// -----------------------------------------------------------------------------
-
-bool PropertyUpdate::hasResetFor(rtl::OUString const & _aLocale) const
-{
-    ValueList::const_iterator it = m_aValues.find(_aLocale);
-
-    return it != m_aValues.end() && isResetMarker(it->second);
-}
-// -----------------------------------------------------------------------------
-
-bool PropertyUpdate::hasChangeFor(rtl::OUString const & _aLocale) const
-{
-    ValueList::const_iterator it = m_aValues.find(_aLocale);
-
-    return it != m_aValues.end();
-}
-// -----------------------------------------------------------------------------
-
-uno::Any PropertyUpdate::getValueFor(rtl::OUString const & _aLocale) const
-{
-    ValueList::const_iterator it = m_aValues.find(_aLocale);
-
-    OSL_ENSURE(it != m_aValues.end() && !isResetMarker(it->second),
-                "PropertyUpdate: Should not call getValue() unless hasValue() returns true" );
-
-    return it != m_aValues.end() && !isResetMarker(it->second) ? it->second : uno::Any();
-}
-// -----------------------------------------------------------------------------
-
-void PropertyUpdate::writeValueToLayer(backenduno::XLayerHandler * _pLayer, uno::Any const & _aValue)
-{
-    OSL_ASSERT(_pLayer);
-    if ( !isResetMarker(_aValue) )
-        _pLayer->setPropertyValue(_aValue);
-
-    // else - to reset - do nothing
-}
-// -----------------------------------------------------------------------------
-
-void PropertyUpdate::writeValueToLayerFor(backenduno::XLayerHandler * _pLayer, uno::Any const & _aValue, rtl::OUString const & _aLocale)
-{
-    OSL_ASSERT(_pLayer);
-    if (_aLocale == this->primarySlot())
-        this->writeValueToLayer(_pLayer,_aValue);
-
-    else if ( !isResetMarker(_aValue) )
-        _pLayer->setPropertyValueForLocale(_aValue,_aLocale);
-
-    // else - to reset - do nothing
-}
-// -----------------------------------------------------------------------------
-
-void PropertyUpdate::writeValuesToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-    for (ValueList::const_iterator itV = beginValues(); itV != endValues(); ++itV)
-        this->writeValueToLayerFor(_pLayer, itV->second, itV->first);
-}
-// -----------------------------------------------------------------------------
-
-void PropertyUpdate::writeToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-
-    _pLayer->overrideProperty( this->getName(), this->updateFlags(), this->m_aType, false );
-    this->writeValuesToLayer(_pLayer);
-    _pLayer->endProperty();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-
-PropertyAdd::PropertyAdd(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Type const & _aType)
-: ElementUpdate(_pParent,_aName,_nFlags,_nFlags)
-, m_aValueType(_aType)
-, m_aValue()
-{
-
-}
-// -----------------------------------------------------------------------------
-
-PropertyAdd::PropertyAdd(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Any const & _aValue)
-: ElementUpdate(_pParent,_aName,_nFlags,_nFlags)
-, m_aValueType(_aValue.getValueType())
-, m_aValue(_aValue)
-{
-} 
-// -----------------------------------------------------------------------------
-
-void PropertyAdd::writeToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    OSL_ASSERT(_pLayer);
-    if (this->hasValue())
-        _pLayer->addPropertyWithValue(this->getName(),this->updateFlags(),this->getValue());
-    else
-        _pLayer->addProperty(this->getName(),this->updateFlags(),this->getValueType());
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-PropertyReset::PropertyReset(NodeUpdate * _pParent, rtl::OUString const & _aName)
-: ElementUpdate(_pParent,_aName,0,0)
-{
-}
-// -----------------------------------------------------------------------------
-
-void PropertyReset::writeToLayer(backenduno::XLayerHandler * _pLayer)
-{
-    (void) _pLayer; // avoid warning about unused parameter
-    OSL_ASSERT(_pLayer);
-    // skip - nothing to write
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/updatedata.hxx b/configmgr/source/backend/updatedata.hxx
deleted file mode 100644
index e3785e3781..0000000000
--- a/configmgr/source/backend/updatedata.hxx
+++ /dev/null
@@ -1,269 +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: updatedata.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_UPDATEDATA_HXX
-#define CONFIGMGR_BACKEND_UPDATEDATA_HXX
-
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/ustring.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#include "utility.hxx"
-
-#ifndef INCLUDED_SET
-#include <set>
-#define INCLUDED_SET
-#endif
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace com { namespace sun { namespace star { namespace configuration { namespace backend {
-    class XLayerHandler;
-} } } } }
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno = ::com::sun::star::uno;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-        class ElementUpdate;
-        class NodeUpdate;
-        class NodeModification;
-        class NodeReplace;
-        class NodeDrop;
-        class PropertyUpdate;
-        class PropertyAdd;
-        class PropertyReset;
-
-// -----------------------------------------------------------------------------
-
-        class NamedUpdate : public salhelper::SimpleReferenceObject
-        {
-            rtl::OUString const  m_aName;
-
-        protected:
-            explicit
-            NamedUpdate(rtl::OUString const & _aName)
-            : m_aName(_aName)
-            {}
-
-            ~NamedUpdate() {};
-
-        public:
-            rtl::OUString const & getName() const { return m_aName; }
-        };
-// -----------------------------------------------------------------------------
-        class ElementUpdate : public NamedUpdate
-        {
-            NodeUpdate *    m_pParent;
-            sal_Int16       m_nFlags;
-            sal_Int16       m_nFlagsMask;
-        protected:
-            ElementUpdate(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask);
-
-        public:
-            virtual NodeUpdate      * asNodeUpdate(bool _bMerged = false);
-            virtual PropertyUpdate  * asPropertyUpdate();
-
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer) = 0;
-
-        public:
-            NodeUpdate * getParent() const { return m_pParent; }
-
-            sal_Int16 changedFlags() const { return m_nFlagsMask; }
-            sal_Int16 updateFlags(sal_Int16 _nFlags = 0) const;
-
-        };
-// -----------------------------------------------------------------------------
-
-        class NodeUpdate : public ElementUpdate
-        {
-            typedef std::map< rtl::OUString, rtl::Reference<ElementUpdate> > ElementList;
-        public:
-            enum Op { modify, reset, replace };
-
-        protected:
-            NodeUpdate(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, Op _op); 
-
-            virtual NodeUpdate * asNodeUpdate(bool _bMerged);
-
-        public:
-            bool addNodeUpdate      (rtl::Reference<ElementUpdate> const & _aNode);
-            bool addPropertyUpdate  (rtl::Reference<ElementUpdate> const & _aProp);
-            void removeNodeByName      (rtl::OUString const & _aName);
-            void removePropertyByName  (rtl::OUString const & _aName);
-
-            Op getOperation() const { return m_op; }
-            
-            rtl::Reference<ElementUpdate> getNodeByName      (rtl::OUString const & _aName) const;
-            rtl::Reference<ElementUpdate> getPropertyByName  (rtl::OUString const & _aName) const;
-
-            ElementList::const_iterator beginNodes()       const { return m_aNodes.begin(); }
-            ElementList::const_iterator endNodes()         const { return m_aNodes.end();   };
-            ElementList::const_iterator beginProperties()  const { return m_aProperties.begin(); };
-            ElementList::const_iterator endProperties()    const { return m_aProperties.end();   };
-
-            bool hasChildren() const { return !m_aNodes.empty() || !m_aProperties.empty(); }
-
-            void writeChildrenToLayer(backenduno::XLayerHandler * _pLayer);
-        private:
-            ElementList m_aNodes;
-            ElementList m_aProperties;
-            ElementList m_aRemovedElements;
-            Op          m_op;
-        };
-// -----------------------------------------------------------------------------
-
-        class NodeModification : public NodeUpdate
-        {
-        public:
-            NodeModification(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, sal_Bool _bReset); 
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer);
-        };
-// -----------------------------------------------------------------------------
-
-        class NodeReplace : public NodeUpdate
-        {
-        public:
-            NodeReplace(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags); 
-            NodeReplace(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, rtl::OUString const & _aTemplateName, rtl::OUString const & _aTemplateComponent); 
-
-            bool hasTemplate() const;
-            rtl::OUString getTemplateName()      const { return m_aTemplateName; }
-            rtl::OUString getTemplateComponent() const { return m_aTemplateComponent; }
-
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer);
-        private:
-            rtl::OUString m_aTemplateName;
-            rtl::OUString m_aTemplateComponent;
-        };
-// -----------------------------------------------------------------------------
-
-        class NodeDrop : public ElementUpdate
-        {
-        public:
-            NodeDrop(NodeUpdate * _pParent, rtl::OUString const & _aName);
-
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer);
-        };
-// -----------------------------------------------------------------------------
-
-        class PropertyUpdate : public ElementUpdate
-        {
-            typedef std::map< rtl::OUString, uno::Any > ValueList;
-
-            ValueList m_aValues;
-            uno::Type m_aType;
-        public:
-            PropertyUpdate(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, sal_Int16 _nFlagsMask, uno::Type const & _aType); 
-
-            bool setValueFor(rtl::OUString const & _aLocale, uno::Any const & _aValueUpdate);
-            bool resetValueFor(rtl::OUString const & _aLocale);
-            void removeValueFor(rtl::OUString const & _aLocale);
-
-            bool setValue(uno::Any const & _aValueUpdate)    { return setValueFor(primarySlot(), _aValueUpdate); }
-            bool resetValue()                                   { return resetValueFor(primarySlot()); }
-            void removeValue()                                  { removeValueFor(primarySlot()); }
-
-            void finishValue();
-
-            uno::Type const & getValueType()    const { return m_aType; }
-
-            bool hasValueFor(rtl::OUString const & _aLocale) const;
-            bool hasValue() const { return hasValueFor(primarySlot()); }
-
-            bool hasResetFor(rtl::OUString const & _aLocale) const;
-            bool hasReset() const { return hasResetFor(primarySlot()); }
-
-            bool hasChangeFor(rtl::OUString const & _aLocale) const;
-            bool hasChange() const { return hasChangeFor(primarySlot()); }
-
-            uno::Any getValueFor(rtl::OUString const & _aLocale) const;
-            uno::Any getValue() const { return getValueFor(primarySlot()); }
-
-            ValueList::const_iterator beginValues()  const { return m_aValues.begin(); }
-            ValueList::const_iterator endValues()    const { return m_aValues.end(); }
-
-            void writeValueToLayerFor(backenduno::XLayerHandler * _pLayer, uno::Any const & _aValue, rtl::OUString const & _aLocale);
-            void writeValueToLayer(backenduno::XLayerHandler * _pLayer, uno::Any const & _aValue);
-            void writeValuesToLayer(backenduno::XLayerHandler * _pLayer);
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer);
-        private:
-            rtl::OUString primarySlot() const { return rtl::OUString(); }
-
-            static uno::Any const & getResetMarker();
-            static inline bool isResetMarker(uno::Any const & _aValue);
-
-            virtual PropertyUpdate  * asPropertyUpdate();
-        };
-// -----------------------------------------------------------------------------
-
-        class PropertyAdd : public ElementUpdate
-        {
-            uno::Type m_aValueType;
-            uno::Any  m_aValue;
-        public:
-            PropertyAdd(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Type const & _aType); 
-            PropertyAdd(NodeUpdate * _pParent, rtl::OUString const & _aName, sal_Int16 _nFlags, uno::Any const & _aValue); 
-
-            bool hasValue() const { return !! m_aValue.hasValue(); }
-            uno::Any  const & getValue()        const { return m_aValue; }
-            uno::Type const & getValueType()    const { return m_aValueType; }
-
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer);
-        };
-// -----------------------------------------------------------------------------
-
-        class PropertyReset : public ElementUpdate
-        {
-        public:
-            PropertyReset(NodeUpdate * _pParent, rtl::OUString const & _aName); 
-
-            virtual void writeToLayer(backenduno::XLayerHandler * _pLayer);
-        };
-// -----------------------------------------------------------------------------
-
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/updatedispatch.cxx b/configmgr/source/backend/updatedispatch.cxx
deleted file mode 100644
index d4c44846cc..0000000000
--- a/configmgr/source/backend/updatedispatch.cxx
+++ /dev/null
@@ -1,499 +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: updatedispatch.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_configmgr.hxx"
-
-#include "treefragment.hxx"
-#include "updatedispatch.hxx"
-#include "configpath.hxx"
-#include "node.hxx"
-#include "matchlocale.hxx"
-
-#include <com/sun/star/configuration/backend/XUpdateHandler.hpp>
-#include <com/sun/star/configuration/backend/NodeAttribute.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-
-UpdateDispatcher::UpdateDispatcher(uno::Reference< backenduno::XUpdateHandler > const & _xUpdateHandler, rtl::OUString const & _aLocale) 
-: m_pContextPath(NULL)
-, m_xUpdateHandler(_xUpdateHandler) 
-, m_aLocale(_aLocale)
-, m_aElementName()
-, m_bInValueSet(false)
-, m_bInLocalizedValues(false)
-{
-}
-// -----------------------------------------------------------------------------
-
-UpdateDispatcher::~UpdateDispatcher()
-{
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::dispatchUpdate(configuration::AbsolutePath const & _aRootPath, SubtreeChange const& _anUpdate)
-{
-    if (!m_xUpdateHandler.is())
-    {
-        rtl::OUString sMsg( RTL_CONSTASCII_USTRINGPARAM("ERROR: Cannot dispatch update - no handler found") );
-        throw uno::RuntimeException(sMsg,NULL);
-    }
-
-    OSL_PRECOND( !_aRootPath.isRoot(), "Cannot apply update, where root is outside a component" );
-
-    OSL_PRECOND( m_pContextPath == NULL, "Update Dispatcher already has a context path" );
-    if (!_aRootPath.getParentPath().isRoot())
-    {
-        OSL_ENSURE(false,"Obsolete functionality used: starting update with non-empty context");
-        m_pContextPath = &_aRootPath;
-    }
-
-    this->startUpdate();
-    this->applyToChange(_anUpdate);
-    this->endUpdate();
-
-    m_pContextPath = NULL;
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::startUpdate()
-{
-    m_xUpdateHandler->startUpdate();
-    m_bInValueSet = false;
-    m_bInLocalizedValues = false;
-    m_aElementName = rtl::OUString();
-
-    if (m_pContextPath)
-    {
-        std::vector<configuration::Path::Component>::const_reverse_iterator   it = m_pContextPath->begin(); 
-        std::vector<configuration::Path::Component>::const_reverse_iterator   stop = m_pContextPath->end();
-
-        OSL_ASSERT(it != stop);
-        --stop;
-
-        for ( ; it != stop; ++it)
-        {
-            m_xUpdateHandler->modifyNode(it->getName(),0,0,false);
-        }
-    }
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::endUpdate()
-{
-    if (m_pContextPath)
-    {
-        std::vector<configuration::Path::Component>::const_reverse_iterator   it = m_pContextPath->begin(); 
-        std::vector<configuration::Path::Component>::const_reverse_iterator   stop = m_pContextPath->end();
-
-        OSL_ASSERT(it != stop);
-        --stop;
-
-        for ( ; it != stop; ++it)
-        {
-            m_xUpdateHandler->endNode();
-        }
-    }
-    m_xUpdateHandler->endUpdate();
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::handle(ValueChange const& aValueNode)
-{
-    // special case: doing members of a localized property (as set)
-    if (m_bInLocalizedValues)
-    {
-        rtl::OUString aLocale = aValueNode.getNodeName();
-
-        if (aLocale.getLength())
-        {
-            if ( aValueNode.isToDefault() )
-                m_xUpdateHandler->resetPropertyValueForLocale( aLocale );
-             else
-                m_xUpdateHandler->setPropertyValueForLocale( aValueNode.getNewValue(), aLocale );
-        }
-        else
-        {
-            if ( aValueNode.isToDefault() )
-                m_xUpdateHandler->resetPropertyValue( );
-             else
-                m_xUpdateHandler->setPropertyValue( aValueNode.getNewValue() );
-        }
-        return;
-    }
-
-    // normal case: updating a single property
-    switch (aValueNode.getMode())       
-    {
-    case ValueChange::wasDefault:
-        if (aValueNode.isReplacedValue())
-        {
-          
-            OSL_ENSURE(m_bInValueSet, "UpdateDispatcher: Cannot add/replace a value in a nonextensible node");
-            OSL_ENSURE(!aValueNode.isLocalizedValue(), "UpdateDispatcher: Cannot add a localized value in a layer");
-
-            sal_Int16 nAttr = getUpdateAttributes(aValueNode.getAttributes(),true);
-
-            if (aValueNode.getNewValue().hasValue())
-            {
-                m_xUpdateHandler->addOrReplacePropertyWithValue( aValueNode.getNodeName(), 
-                                                                 nAttr,
-                                                                 aValueNode.getNewValue());
-            }
-            else
-            {
-                m_xUpdateHandler->addOrReplaceProperty( aValueNode.getNodeName(), 
-                                                        nAttr,
-                                                        aValueNode.getValueType());
-            }
-
-            break;
-        }
-        // else fall thru to changeValue case
-
-    case ValueChange::changeValue:
-        {
-            sal_Int16 nAttr     = getUpdateAttributes(aValueNode.getAttributes(),false);
-            sal_Int16 nAttrMask = getUpdateAttributeMask(aValueNode.getAttributes());
-
-            m_xUpdateHandler->modifyProperty( aValueNode.getNodeName(), 
-                                                nAttr, nAttrMask,
-                                              aValueNode.getValueType() );
-
-            if (aValueNode.isLocalizedValue() && m_aLocale.getLength())
-            {
-                m_xUpdateHandler->setPropertyValueForLocale( aValueNode.getNewValue(), m_aLocale );
-            }
-            else
-            {
-                m_xUpdateHandler->setPropertyValue( aValueNode.getNewValue() );
-            }
-            
-            m_xUpdateHandler->endProperty();
-        }
-        break;
-
-    case ValueChange::setToDefault:
-        m_xUpdateHandler->resetProperty( aValueNode.getNodeName() );
-        break;
-
-    case ValueChange::changeDefault:
-        OSL_ENSURE(false, "Illegal mode in ValueChange");
-        break;
-
-    default:
-        OSL_ENSURE(false, "Illegal mode in ValueChange");
-        break;
-    };
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::handle(AddNode const& aAddNode)
-{
-    rtl::Reference< data::TreeSegment > aAddedTree = aAddNode.getNewTree();
-
-    OSL_ENSURE(aAddedTree.is(), "AddNode has no new data -> cannot add anything");
-
-    OSL_ENSURE( ((m_bInValueSet||m_bInLocalizedValues) == aAddedTree->fragment->nodes[0].isValue()),
-                "Found added subtree in value set (extensible group)\n" );
-
-    this->visitTree(aAddedTree->fragment);
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::handle(RemoveNode const& aRemoveNode)
-{
-    OSL_ENSURE( !m_bInLocalizedValues, "UpdateDispatcher: Removing values for a specific locale is currently not supported");
-
-    rtl::Reference< data::TreeSegment > aRemovedTree = aRemoveNode.getRemovedTree();
-
-    OSL_ENSURE( !aRemovedTree.is() ||
-                ((m_bInValueSet||m_bInLocalizedValues) == aRemovedTree->fragment->nodes[0].isValue()),
-                "Found removed subtree in value set (extensible group)\n" );
-
-    if (m_bInLocalizedValues)
-        OSL_TRACE("configmgr: UpdateDispatcher - Removing value for locale ignored");
-
-    else if (m_bInValueSet)
-        m_xUpdateHandler->removeProperty( aRemoveNode.getNodeName() );
-
-    else
-        m_xUpdateHandler->removeNode( aRemoveNode.getNodeName() );
-}
-// -----------------------------------------------------------------------------
-
-void UpdateDispatcher::handle(SubtreeChange const& aSubtree)
-{
-    OSL_ENSURE( !m_bInLocalizedValues, "UpdateDispatcher: A localized value cannot be a complete subtree");
-    OSL_ENSURE( !m_bInValueSet, "UpdateDispatcher: A dynamic property cannot be a complete subtree");
-
-    sal_Int16 nAttr     = getUpdateAttributes(aSubtree.getAttributes(),false);
-    sal_Int16 nAttrMask = getUpdateAttributeMask(aSubtree.getAttributes());
-
-    if (isLocalizedValueSet(aSubtree))
-    {
-        m_xUpdateHandler->modifyProperty( aSubtree.getNodeName(), 
-                                            nAttr, nAttrMask,
-                                            uno::Type() );
-
-        m_bInLocalizedValues = true;
-        this->applyToChildren(aSubtree);
-        m_bInLocalizedValues = false;
-
-        m_xUpdateHandler->endProperty();
-    }
-
-    else 
-    {
-        m_xUpdateHandler->modifyNode( aSubtree.getNodeName(), 
-                                       nAttr, nAttrMask, 
-                                      aSubtree.isToDefault() );
-
-        m_bInValueSet = isValueSet(aSubtree);
-        this->applyToChildren(aSubtree);
-        m_bInValueSet = false;
-
-        m_xUpdateHandler->endNode();
-    }
-}
-// -----------------------------------------------------------------------------
-
-bool UpdateDispatcher::handle(sharable::ValueNode * node)
-{
-    rtl::OUString aName;
-
-    // special case: doing members of a localized property (as set)
-    if (m_bInLocalizedValues)
-    {
-        // the node name is the locale
-        rtl::OUString aLocale;
-        OSL_VERIFY(testReplacedAndGetName(sharable::node(node), aLocale)); // "Adding a localized subvalue but not as root of element tree"
-
-        if (aLocale.getLength() && ! localehelper::isDefaultLanguage(aLocale))
-        {
-            m_xUpdateHandler->setPropertyValueForLocale(node->getValue(), aLocale);
-        }
-        else
-        {
-            m_xUpdateHandler->setPropertyValue(node->getValue());
-        }
-    }
-    else if (testReplacedAndGetName(sharable::node(node), aName) && sharable::node(node)->getAttributes().isRemovable()) // we must be inside a set of values
-    {
-       
-        OSL_ENSURE(!node->info.isLocalized(), "UpdateDispatcher: Cannot add a localized value in a layer .");
-
-        sal_Int16 nAttr = getUpdateAttributes(sharable::node(node)->getAttributes(),true);
-      
-        if (!node->isNull())
-        {
-            m_xUpdateHandler->addOrReplacePropertyWithValue( aName, 
-                                                             nAttr,
-                                                             node->getValue());
-        }
-        else
-        {
-            m_xUpdateHandler->addOrReplaceProperty( aName, 
-                                                    nAttr,
-                                                    node->getValueType());
-        }
-    }
-    else // normal case: updating a single property //Inserting set
-    {
-         sal_Int16 nAttr     = getUpdateAttributes(sharable::node(node)->getAttributes(),false);
-        sal_Int16 nAttrMask = getUpdateAttributeMask(sharable::node(node)->getAttributes());
-
-        m_xUpdateHandler->modifyProperty( aName, nAttr, nAttrMask, node->getValueType() );
-
-        if (node->info.isLocalized() && m_aLocale.getLength())
-        {
-            m_xUpdateHandler->setPropertyValueForLocale(node->getValue(), m_aLocale);
-        }
-        else
-        {
-            m_xUpdateHandler->setPropertyValue(node->getValue());
-        }
-        
-        m_xUpdateHandler->endProperty();
-    }
-    return false;
-}
-// -----------------------------------------------------------------------------
-
-bool UpdateDispatcher::handle(sharable::GroupNode * node)
-{
-    OSL_ENSURE( !m_bInLocalizedValues, "UpdateDispatcher: A localized value cannot be a complete group");
-
-    rtl::OUString aName;
-
-    if ( testReplacedAndGetName(sharable::node(node), aName) )
-    {
-        sal_Int16 nAttr = getUpdateAttributes(sharable::node(node)->getAttributes(),true);
-
-        m_xUpdateHandler->addOrReplaceNode( aName, nAttr );
-
-        this->visitChildren(node);
-
-        m_xUpdateHandler->endNode();
-    }
-    else
-    {
-        sal_Int16 nAttr     = getUpdateAttributes(sharable::node(node)->getAttributes(),false);
-        sal_Int16 nAttrMask = getUpdateAttributeMask(sharable::node(node)->getAttributes());
-
-        m_xUpdateHandler->modifyNode( aName, nAttr, nAttrMask, false );
-
-        this->visitChildren(node);
-
-        m_xUpdateHandler->endNode();
-    }   
-    return false;
-}
-// -----------------------------------------------------------------------------
-
-bool UpdateDispatcher::handle(sharable::SetNode * node)
-{
-    OSL_ENSURE( !m_bInLocalizedValues, "UpdateDispatcher: A localized value cannot be a complete set");
-
-    rtl::OUString aName;
-
-    if ( testReplacedAndGetName(sharable::node(node), aName) )
-    {
-        OSL_ENSURE( !node->info.isLocalized(), "UpdateDispatcher: Cannot add a localized value in a layer." );
-
-        sal_Int16 nAttr     = getUpdateAttributes(sharable::node(node)->getAttributes(),true);
-
-        m_xUpdateHandler->addOrReplaceNode( aName, nAttr );
-
-        this->visitElements(node);
-
-        m_xUpdateHandler->endNode();
-    }
-    else
-    {
-        sal_Int16 nAttr     = getUpdateAttributes(sharable::node(node)->getAttributes(),false);
-        sal_Int16 nAttrMask = getUpdateAttributeMask(sharable::node(node)->getAttributes());
-
-        if (node->info.isLocalized())
-        {
-            m_xUpdateHandler->modifyProperty( aName, nAttr, nAttrMask, uno::Type() );
-
-            m_bInLocalizedValues = true;
-            this->visitElements(node);
-            m_bInLocalizedValues = false;
-
-            m_xUpdateHandler->endProperty();
-        }
-
-        else
-        {
-            m_xUpdateHandler->modifyNode( aName, nAttr, nAttrMask, false );
-
-            this->visitElements(node);
-
-            m_xUpdateHandler->endNode();
-        }
-    }
-    return false;
-}
-// -----------------------------------------------------------------------------
-            
-bool UpdateDispatcher::testReplacedAndGetName(sharable::Node * node, rtl::OUString & _aName)
-{
-    if (m_aElementName.getLength())
-    {
-        OSL_ENSURE( node->isFragmentRoot(), "ERROR - UpdateDispatcher: Found orphaned 'element' name for inner node");
-        _aName = m_aElementName;
-        m_aElementName = rtl::OUString();
-        return true;
-    }
-    else
-    {
-        OSL_ENSURE(!node->isFragmentRoot(), "ERROR - UpdateDispatcher: Found no 'element' name for fragment root node");
-        _aName = node->getName();
-        return false;
-    }
-}
-// -----------------------------------------------------------------------------
-
-bool UpdateDispatcher::handle(sharable::TreeFragment * tree)
-{
-    m_aElementName = tree->getName();
-    bool done = SetVisitor::handle(tree); // dispatch to root node
-    m_aElementName = rtl::OUString(); // clear - just to be safe
-    return done;
-}
-// -----------------------------------------------------------------------------
-
-sal_Int16 UpdateDispatcher::getUpdateAttributes(node::Attributes const & _aAttributes, bool bAdded)
-{
-    namespace NodeAttribute = backenduno::NodeAttribute;
-
-    // no support for post-creation attribute changes yet
-    if (!bAdded) 
-    {
-        OSL_ENSURE( getUpdateAttributeMask(_aAttributes) == 0,
-                    "Incomplete support for attribute changes" );
-        return 0;
-    }
-
-    sal_Int16 nResult = 0;
-
-    if (_aAttributes.isReadonly())
-        nResult = NodeAttribute::READONLY;
-
-    if (_aAttributes.isFinalized())
-        nResult |= NodeAttribute::FINALIZED;
-
-    if (!_aAttributes.isNullable())
-        nResult |= NodeAttribute::MANDATORY;
-
-    return nResult;
-}
-// -----------------------------------------------------------------------------
-
-sal_Int16 UpdateDispatcher::getUpdateAttributeMask(node::Attributes const & /*_aAttributes*/)
-{
-    // no support for post-creation attribute changes yet
-    return 0;
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/backend/updatedispatch.hxx b/configmgr/source/backend/updatedispatch.hxx
deleted file mode 100644
index 642f8e1a9c..0000000000
--- a/configmgr/source/backend/updatedispatch.hxx
+++ /dev/null
@@ -1,106 +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: updatedispatch.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_UPDATEDISPATCH_HXX
-#define CONFIGMGR_BACKEND_UPDATEDISPATCH_HXX
-
-#include "change.hxx"
-#include "nodevisitor.hxx"
-#include "utility.hxx"
-#include <boost/utility.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-
-namespace com { namespace sun { namespace star { namespace configuration { namespace backend {
-    class XUpdateHandler;
-} } } } }
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace configuration 
-    { 
-        class AbsolutePath;
-    }
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-
-// -----------------------------------------------------------------------------
-
-        class UpdateDispatcher: private boost::noncopyable, private ChangeTreeAction, private data::SetVisitor
-        {
-        public:
-            UpdateDispatcher(uno::Reference< backenduno::XUpdateHandler > const & _xUpdateHandler, rtl::OUString const & _aLocale);
-            ~UpdateDispatcher();
-
-            void dispatchUpdate(configuration::AbsolutePath const & _aRootPath, SubtreeChange const& _anUpdate);
-
-        protected:
-            using data::NodeVisitor::handle;
-
-        private:
-            void startUpdate();
-            void endUpdate();
-
-            virtual void handle(ValueChange const& aValueNode);
-            virtual void handle(AddNode const& aAddNode);
-            virtual void handle(RemoveNode const& aRemoveNode);
-            virtual void handle(SubtreeChange const& aSubtree) ;
-            
-            virtual bool handle(sharable::ValueNode * node);
-            virtual bool handle(sharable::GroupNode * node);
-            virtual bool handle(sharable::SetNode * node);
-            virtual bool handle(sharable::TreeFragment * tree);
-        private:
-            sal_Int16 getUpdateAttributes(node::Attributes const & _aAttributes, bool bAdded);
-            sal_Int16 getUpdateAttributeMask(node::Attributes const & _aAttributes);
-
-            bool testReplacedAndGetName(sharable::Node * node, rtl::OUString & _aName);
-        private:
-            configuration::AbsolutePath const * m_pContextPath;
-            uno::Reference< backenduno::XUpdateHandler >   m_xUpdateHandler;
-            rtl::OUString        m_aLocale;
-            rtl::OUString        m_aElementName;
-            bool    m_bInValueSet;
-            bool    m_bInLocalizedValues;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace backend
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backend/updatesvc.cxx b/configmgr/source/backend/updatesvc.cxx
deleted file mode 100644
index ed042dc37d..0000000000
--- a/configmgr/source/backend/updatesvc.cxx
+++ /dev/null
@@ -1,281 +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: updatesvc.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_configmgr.hxx"
-
-#include "updatesvc.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include "emptylayer.hxx"
-#include <com/sun/star/configuration/backend/XUpdatableLayer.hpp>
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace beans = ::com::sun::star::beans;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-sal_Char const * const aUpdateMergerServices[] = 
-{
-    "com.sun.star.configuration.backend.LayerUpdateMerger",
-    0
-};
-const ServiceImplementationInfo aUpdateMergerSI =
-{
-    "com.sun.star.comp.configuration.backend.LayerUpdateMerger",
-    aUpdateMergerServices,
-    0
-};
-// -----------------------------------------------------------------------------
-
-const ServiceRegistrationInfo* getUpdateMergerServiceInfo()
-{ return getRegistrationInfo(& aUpdateMergerSI); }
-// -----------------------------------------------------------------------------
-
-inline
-ServiceInfoHelper UpdateService::getServiceInfo()
-{
-    return & aUpdateMergerSI;
-}
-// -----------------------------------------------------------------------------
-
-
-UpdateService::UpdateService(uno::Reference< uno::XComponentContext > const & _xContext)
-: m_xServiceFactory(_xContext->getServiceManager(),uno::UNO_QUERY)
-, m_aSourceMode(merge)
-{
-    if (!m_xServiceFactory.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration Update Merger: Context has no service manager (or missing interface)"));
-        throw uno::RuntimeException(sMessage,NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-// XInitialization
-
-void SAL_CALL 
-    UpdateService::initialize( const uno::Sequence< uno::Any >& aArguments ) 
-        throw (uno::Exception, uno::RuntimeException)
-{
-    sal_Int16 const nCount = static_cast<sal_Int16>(aArguments.getLength());
-
-    if (sal_Int32(nCount) != aArguments.getLength())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Too many arguments to initialize a Configuration Update Merger"));
-        throw lang::IllegalArgumentException(sMessage,*this,0);
-    }
-
-    for (sal_Int16 i = 0; i < nCount; ++i)
-    {
-        uno::Reference< backenduno::XUpdatableLayer > xUpdLayer;
-        if (aArguments[i] >>= xUpdLayer)
-        {
-            m_xSourceLayer = xUpdLayer.get();
-            m_xLayerWriter.clear();
-
-            OSL_ASSERT( uno::Reference< backenduno::XUpdatableLayer >::query(m_xSourceLayer).is() || !xUpdLayer.is() );
-
-            continue;
-        }
-
-        if (aArguments[i] >>= m_xSourceLayer) 
-            continue;
-
-        if (aArguments[i] >>= m_xLayerWriter)
-            continue;
-
-        beans::NamedValue aExtraArg;
-        if (aArguments[i] >>= aExtraArg)
-        {
-            OSL_VERIFY( setImplementationProperty(aExtraArg.Name, aExtraArg.Value) );
-
-            continue;
-        }
-
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Cannot use argument to initialize a Configuration Update Merger"
-                                                        "- XLayer, XLayerHandler or XUpdatableLayer expected"));
-        throw lang::IllegalArgumentException(sMessage,*this,i);
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-sal_Bool UpdateService::setImplementationProperty(rtl::OUString const & aName, uno::Any const & aValue)
-{
-    if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Overwrite")))
-    {
-        sal_Bool bOverwrite = sal_False;
-        if (aValue >>= bOverwrite)
-        {
-            if (!bOverwrite) 
-                m_aSourceMode = protect;
-
-            else if (protect == m_aSourceMode)
-                m_aSourceMode = merge;
-
-            return true;
-        }
-    }
-
-    else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Truncate")))
-    {
-        sal_Bool bTruncate = sal_False;
-        if (aValue >>= bTruncate)
-        {
-            if (!bTruncate) 
-                m_aSourceMode = merge;
-
-            else if (merge == m_aSourceMode)
-                m_aSourceMode = truncate;
-
-            return true;
-        }
-    }
-
-    return false;
-}
-// -----------------------------------------------------------------------------
-            
-bool UpdateService::validateSourceLayerAndCheckNotEmpty() SAL_THROW( (lang::IllegalAccessException) )
-{
-    switch (m_aSourceMode)
-    {
-    case merge:     // TODO: check for readonly layer
-                    return true;
-
-    case protect:   if (!checkEmptyLayer(m_xSourceLayer)) 
-                        raiseIllegalAccessException("UpdateService: Layer already exists");
-                    // else fall through
-
-    case truncate:  return false;
-
-    default:        OSL_ASSERT(!"not reached"); 
-                    return true;
-    }
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< backenduno::XLayer > UpdateService::getSourceLayer() SAL_THROW( (lang::IllegalAccessException) )
-{
-    if ( validateSourceLayerAndCheckNotEmpty() )
-        return m_xSourceLayer;
-    else
-        return createEmptyLayer();
-}
-// -----------------------------------------------------------------------------
-
-void UpdateService::raiseIllegalAccessException(sal_Char const * pMsg) 
-    SAL_THROW( (lang::IllegalAccessException) )
-{
-    rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-    throw lang::IllegalAccessException(sMsg,*this);
-}
-// -----------------------------------------------------------------------------
-
-void UpdateService::writeUpdatedLayer(uno::Reference< backenduno::XLayer > const & _xLayer)
-{
-    OSL_ENSURE( _xLayer.is(), "UpdateService: Trying to write NULL XLayer");
-
-    if (!_xLayer.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Update Merger - Internal error: trying to write a NULL Layer"));
-        throw uno::RuntimeException(sMessage,*this);
-    }
-
-    // use our layer writer, if we have one
-    if ( m_xLayerWriter.is() )
-    {
-        _xLayer->readData( m_xLayerWriter );
-        return;
-    }
-
-    // look for an updatable layer otherwise
-    uno::Reference< backenduno::XUpdatableLayer > xUpdLayer(m_xSourceLayer, uno::UNO_QUERY);
-    if (xUpdLayer.is())
-    {
-        xUpdLayer->replaceWith( _xLayer );
-        return;
-    }
-
-    rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Update Merger: Cannot write merge results - no recipient available."));
-    throw uno::RuntimeException(sMessage,*this);
-}
-// -----------------------------------------------------------------------------
-
-// XServiceInfo
-
-::rtl::OUString SAL_CALL 
-    UpdateService::getImplementationName(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getImplementationName( );
-}
-// -----------------------------------------------------------------------------
-
-
-sal_Bool SAL_CALL 
-    UpdateService::supportsService( const ::rtl::OUString& ServiceName ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().supportsService( ServiceName );
-}
-// -----------------------------------------------------------------------------
-
-
-uno::Sequence< ::rtl::OUString > SAL_CALL 
-    UpdateService::getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getSupportedServiceNames( );
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/backend/updatesvc.hxx b/configmgr/source/backend/updatesvc.hxx
deleted file mode 100644
index cf40e25e5f..0000000000
--- a/configmgr/source/backend/updatesvc.hxx
+++ /dev/null
@@ -1,125 +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: updatesvc.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 CONFIGMGR_BACKEND_UPDATESVC_HXX
-#define CONFIGMGR_BACKEND_UPDATESVC_HXX
-
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/implbase3.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/configuration/backend/XUpdateHandler.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace com { namespace sun { namespace star { namespace configuration { namespace backend {
-    class XLayerHandler;
-    class XLayer;
-} } } } }
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace backend
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-        class UpdateService : public ::cppu::WeakImplHelper3< 
-                                            lang::XInitialization,
-                                            lang::XServiceInfo,  
-                                            backenduno::XUpdateHandler         
-                                        > 
-        {
-        public:
-            explicit
-            UpdateService(uno::Reference< uno::XComponentContext > const & _xContext);
-
-            // XInitialization
-            virtual void SAL_CALL 
-                initialize( const uno::Sequence< uno::Any >& aArguments ) 
-                    throw (uno::Exception, uno::RuntimeException);
-
-            // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL 
-                getImplementationName(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual sal_Bool SAL_CALL 
-                supportsService( const ::rtl::OUString& ServiceName ) 
-                    throw (uno::RuntimeException);
-
-            virtual uno::Sequence< ::rtl::OUString > SAL_CALL 
-                getSupportedServiceNames(  ) 
-                    throw (uno::RuntimeException);
-    
-        protected:
-            uno::Reference< lang::XMultiServiceFactory > getServiceFactory() const 
-            { return m_xServiceFactory; }
-
-            void  checkSourceLayer() SAL_THROW( (lang::IllegalAccessException) )
-            { validateSourceLayerAndCheckNotEmpty(); }
-
-            uno::Reference< backenduno::XLayer > getSourceLayer()   SAL_THROW( (lang::IllegalAccessException) );
-
-            void writeUpdatedLayer(uno::Reference< backenduno::XLayer > const & _xLayer);
-
-            virtual sal_Bool setImplementationProperty(rtl::OUString const & aName, uno::Any const & aValue);
-
-            void raiseIllegalAccessException(sal_Char const * pMsg) 
-                SAL_THROW( (lang::IllegalAccessException) );
-
-        private:
-            bool validateSourceLayerAndCheckNotEmpty() SAL_THROW( (lang::IllegalAccessException) );
-
-        private:
-            uno::Reference< lang::XMultiServiceFactory >  m_xServiceFactory;
-            uno::Reference< backenduno::XLayer >           m_xSourceLayer;
-            uno::Reference< backenduno::XLayerHandler >     m_xLayerWriter;
-            enum { merge, truncate, protect } m_aSourceMode;
-
-            static ServiceInfoHelper getServiceInfo();
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/backendhelper/backendlayerhelper.cxx b/configmgr/source/backendhelper/backendlayerhelper.cxx
deleted file mode 100644
index f58f187ecb..0000000000
--- a/configmgr/source/backendhelper/backendlayerhelper.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: backendlayerhelper.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_configmgr.hxx"
-
-
-#include "backendlayerhelper.hxx"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-
-namespace configmgr { namespace backendhelper {
-
-//==============================================================================
-
-//------------------------------------------------------------------------------
-uno::Type toType(const ::rtl::OUString& _rType)
-    {
-        uno::Type aRet;
-
-        if  (_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("boolean")))  
-            aRet = ::getBooleanCppuType();
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("short")))	   
-            aRet = ::getCppuType(static_cast<sal_Int16 const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("int")))	   
-            aRet = ::getCppuType(static_cast<sal_Int32 const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("integer")))  
-            aRet = ::getCppuType(static_cast<sal_Int32 const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("long")))	   
-            aRet = ::getCppuType(static_cast<sal_Int64 const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("double")))   
-            aRet = ::getCppuType(static_cast<double const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("string")))   
-            aRet = ::getCppuType(static_cast<rtl::OUString const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("binary")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int8> const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("any")))   
-            aRet = ::getCppuType(static_cast<uno::Any const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("boolean-list")))  
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Bool> const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("short-list")))	   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int16> const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("int-list")))	   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int32> const*>(0));
-        
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("integer-list")))  
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int32> const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("long-list")))	   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int64> const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("double-list")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<double> const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("string-list")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<rtl::OUString> const*>(0));
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("binary-list")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<uno::Sequence<sal_Int8> > const*>(0));
-
-        else
-        {
-            ::rtl::OString aStr("Unknown type! ");
-            aStr += rtl::OUStringToOString(_rType,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSURE(0,aStr.getStr());
-        }
-
-        return aRet;
-    }
-
-//------------------------------------------------------------------------------
-
-IOONode::IOONode(const rtl::OUString& sName):
-    mName(sName)
-{
-}
-
-//------------------------------------------------------------------------------
-OOProperty::OOProperty(
-    const rtl::OUString& sName,const rtl::OUString& sPropType,
-    const uno::Any& aPropValue,sal_Bool bProtected)
-    :IOONode(sName), mPropType(sPropType), mPropValue(aPropValue),
-    mbProtected(bProtected)
-{
-}
-//------------------------------------------------------------------------------
-OONode::OONode(const rtl::OUString& sName)
-    :IOONode(sName)
-{
-}
-
-OONode::OONode()
-    :IOONode(rtl::OUString())
-{
-}
-IOONode* OONode::addChild(IOONode* aChild)
-{
-    mChildList.push_back(aChild);
-    return aChild;
-}
-const std::vector<IOONode*>& OONode::getChildren()
-{
-    return mChildList;
-}
-
-IOONode* OONode::getChild(const rtl::OUString& aChildName)
-{
-    for (sal_uInt32 i=0; i< mChildList.size();++i)
-    {
-        if (mChildList[i]->getName() == aChildName)
-            return mChildList[i];
-    }
-    return NULL;
-}
-OONode::~OONode()
-{
-    for (sal_uInt32 i=0; i< mChildList.size();++i)
-    {
-        delete mChildList[i];
-    }
-    mChildList.clear();
-}
-//------------------------------------------------------------------------------
- sal_Bool addChildrenToNodeTree(
-     OONode * aNode, 
-     sal_Int32 nNextToken,
-     const backend::PropertyInfo& aPropInfo,
-     const uno::Reference<uno::XInterface>& xContext)
-{
-    do
-    {
-        rtl::OUString aName = aPropInfo.Name.getToken(0, '/',nNextToken);
-        if (aName.getLength() == 0)
-        {
-            throw backend::MalformedDataException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "Malformed OpenOffice Key specified")),
-                        xContext, uno::Any()) ; 
-        }
-        //Check if Property -> nNextToken == -1
-        if(nNextToken != -1)
-        {
-            //check if child already exists
-            IOONode* aChildNode= aNode->getChild(aName);
-            if (aChildNode == NULL)
-            {
-                aChildNode = new OONode(aName);
-                if (aChildNode != 0)
-                {
-                    aNode->addChild( aChildNode);
-                }
-            }
-                
-            sal_Bool bFinished =addChildrenToNodeTree( 
-                aChildNode->getComposite(), 
-                nNextToken, 
-                aPropInfo,
-                xContext);
-            //Check that if you have finished parsing string therefore no
-            //more children
-            if (bFinished)
-                break;
-        } 
-        else 
-        {
-            //Add Property	
-            IOONode* aProperty = new OOProperty(aName,
-                                                aPropInfo.Type,
-                                                aPropInfo.Value,
-                                                aPropInfo.Protected);
-            if (aProperty != 0)
-            {
-                aNode->addChild( aProperty);
-            }
-            //Return finished is true when you are finished parsing the string
-            if( nNextToken == -1)
-            {
-                return sal_True;	
-            }
-        }
-    }
-    while (nNextToken >= 0 ) ;
-    return sal_True;	
-}
-//------------------------------------------------------------------------------
-void processChildren(
-     std::vector<IOONode*> aChildList,
-    const uno::Reference<backend::XLayerHandler>& xHandler)
-{
-    for(sal_uInt32 i=0; i <aChildList.size(); ++i)
-    {
-        OONode * aTestOONode = aChildList[i]->getComposite();
-        if (aTestOONode)
-        {
-            xHandler->overrideNode(aTestOONode->getName(),0,false);
-            processChildren(aTestOONode->getChildren(),xHandler);
-            xHandler->endNode();
-        }
-        else
-        {
-            OOProperty* aProperty = aChildList[i]->asOOProperty();
-            sal_Int16 aAttributes = aProperty->isProtected() ? 256:0;
-            //Convert Type either simple or list
-            uno::Type aType = toType( aProperty->getType());
-            
-            xHandler->overrideProperty(aProperty->getName(),
-                                       aAttributes,
-                                       aType,
-                                       false);
-            
-            xHandler->setPropertyValue(aProperty->getValue());
-            xHandler->endProperty();
-        }
-        
-    }
-}
-//------------------------------------------------------------------------------
-void buildNodeTree(
-    const uno::Sequence< backend::PropertyInfo >& aPropertyInfos,
-    const uno::Reference<uno::XInterface>& xContext,
-    OONode& aNodeTree)
-{
-    sal_Int32 nNextToken =0;
-    rtl::OUString aName = aPropertyInfos[0].Name.getToken(0, '/',nNextToken);
-    if((nNextToken ==-1)||(aName.getLength()==0))
-    {
-         throw backend::MalformedDataException(
-               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                       "Malformed OpenOffice Key specified")),
-                    xContext, uno::Any()) ; 
-            
-    }
-    aNodeTree.setName(aName);
-    sal_Int32 size = aPropertyInfos.getLength();
-    for (sal_Int32 i =0; i < size; ++i)
-    {
-        addChildrenToNodeTree(&aNodeTree, nNextToken,aPropertyInfos[i],xContext);              
-    }
-
-}
-//------------------------------------------------------------------------------
-BackendLayerHelper::BackendLayerHelper(
-    const uno::Reference<uno::XComponentContext>& /*xContext*/)
-    :cppu::WeakComponentImplHelper2<backend::XLayerContentDescriber, lang::XServiceInfo>(mMutex) 
-{
-}
-//------------------------------------------------------------------------------
-
-BackendLayerHelper::~BackendLayerHelper(void) {}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BackendLayerHelper::
-    getBackendLayerHelperName(void) 
-{
-    static const rtl::OUString kImplementationName(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.comp.configuration.backend.LayerDescriber")) ;
-
-    return kImplementationName ;
-}
-//------------------------------------------------------------------------------
-void SAL_CALL BackendLayerHelper::describeLayer( 
-    const uno::Reference< backend::XLayerHandler >& xHandler, 
-    const uno::Sequence< backend::PropertyInfo >& aPropertyInfos ) 
-        throw (lang::NullPointerException,  
-               backend::MalformedDataException, 
-               uno::RuntimeException)
-
-
-
-{
-    OONode aNodeTree;
-    buildNodeTree(aPropertyInfos, *this, aNodeTree);
-        
-    //Descirbe the Layer to the XHandler Object
-    xHandler->startLayer();
-    xHandler->overrideNode(aNodeTree.getName(),0,false);
-    std::vector<IOONode*> aChildList = aNodeTree.getChildren();
-    processChildren(aChildList,xHandler);
-    xHandler->endNode();
-    xHandler->endLayer();
-
-
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL BackendLayerHelper::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return getBackendLayerHelperName() ;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL BackendLayerHelper::
-    getBackendLayerHelperServiceNames(void) 
-{
-    uno::Sequence<rtl::OUString> aServices(1) ;
-    aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.LayerDescriber")) ;
-    return aServices ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL BackendLayerHelper::supportsService(
-    const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException)
-{
-    uno::Sequence< rtl::OUString > const svc = getBackendLayerHelperServiceNames();
-
-    for(sal_Int32 i = 0; i < svc.getLength(); ++i )
-        if(svc[i] == aServiceName)
-            return true;
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> 
-SAL_CALL BackendLayerHelper::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException)
-{
-    return getBackendLayerHelperServiceNames() ;
-}
-//------------------------------------------------------------------------------
-
-} // backendhelper
-} // configmgr
diff --git a/configmgr/source/backendhelper/backendlayerhelper.hxx b/configmgr/source/backendhelper/backendlayerhelper.hxx
deleted file mode 100644
index 785293d147..0000000000
--- a/configmgr/source/backendhelper/backendlayerhelper.hxx
+++ /dev/null
@@ -1,168 +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: backendlayerhelper.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 CONFIGMGR_BACKENDHELPER_BACKENDLAYERHELPER_HXX_
-#define CONFIGMGR_BACKENDHELPER_BACKENDLAYERHELPER_HXX_
-
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase2.hxx>
-
-namespace configmgr { namespace backendhelper {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-//------------------------------------------------------------------------------
-
-/**
-  *  Implements the LayerContentDescriber service. 
-  *  Describes a set of configuration data to an XLayerHandler
-  *  Object
-  */
-class BackendLayerHelper : public cppu::WeakComponentImplHelper2<backend::XLayerContentDescriber, lang::XServiceInfo> {
-public :
-    /**
-     Service constructor from a service factory.
-     @param xContext   component context
-    */
-    BackendLayerHelper(const uno::Reference<uno::XComponentContext>& xContext) ;
-
-    /** Destructor */
-    ~BackendLayerHelper(void) ;
-
-
-    // XServiceInfo
-    virtual rtl::OUString SAL_CALL 
-        getImplementationName(  ) 
-        throw (uno::RuntimeException) ;
-        
-    virtual sal_Bool SAL_CALL 
-        supportsService( const rtl::OUString& aServiceName ) 
-        throw (uno::RuntimeException) ;
-
-    virtual uno::Sequence<rtl::OUString> SAL_CALL 
-        getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException) ;
-
-        
-    //XLayerContentDescriber
-    virtual void SAL_CALL
-        describeLayer( const uno::Reference< backend::XLayerHandler >& xHandler, 
-                        const uno::Sequence< backend::PropertyInfo >& aPropertyInfos ) 
-        throw (lang::NullPointerException, 
-               backend::MalformedDataException, 
-               uno::RuntimeException);  
-
-    /**
-     Provides the implementation name.
-
-     @return   implementation name
-    */
-    static rtl::OUString SAL_CALL getBackendLayerHelperName(void) ;
-    /**
-     Provides the supported services names
-
-     @return   service names
-    */
-    static uno::Sequence<rtl::OUString> SAL_CALL getBackendLayerHelperServiceNames(void) ;
-private:
-    osl::Mutex mMutex;
-    
-} ;
-//------------------------------------------------------------------------------
-class OONode;
-class OOProperty;
-    
-/** 
-   Base class for representing OO properties and nodes
-*/
-class IOONode
-{
-public:
-    virtual OONode* getComposite(){return NULL;}
-    virtual ~IOONode(){};
-    virtual OOProperty* asOOProperty(){return NULL;}
-    rtl::OUString getName(){return mName;}
-    void  setName(const rtl::OUString& sName){mName = sName;}
-protected:
-    IOONode(const rtl::OUString& sName);
-private:
-    rtl::OUString mName;
-};
-//------------------------------------------------------------------------------
-class OONode :public IOONode
-{
-public:
-    
-    OONode(const rtl::OUString& sName);
-    OONode();
-    ~OONode();
-    
-    IOONode* addChild(IOONode* aChild);
-    OONode* getComposite(){return this;}
-    const std::vector<IOONode*>& getChildren();
-    IOONode* getChild(const rtl::OUString& aChildName);
-    
-private:
-    std::vector<IOONode*> mChildList;
-};
-//------------------------------------------------------------------------------
-class OOProperty :public IOONode
-{
-public:
-    OOProperty(const rtl::OUString& sName,
-               const rtl::OUString& sPropType,
-               const uno::Any& aPropValue,
-               sal_Bool bProtected);
-    ~OOProperty(){};
-
-    const rtl::OUString& getType(){return mPropType;}
-    uno::Any getValue(){return mPropValue;}
-    sal_Bool isProtected(){return mbProtected;}
-    OOProperty* asOOProperty(){return this;}
-
-private:
-    rtl::OUString mPropType;
-    uno::Any mPropValue;
-    sal_Bool mbProtected;
-};
-//------------------------------------------------------------------------------
-
-
-} } // configmgr.backendhelper
-
-#endif // CONFIGMGR_BACKENDHELPER_BACKENDLAYERHELPER_HXX_
-
-
diff --git a/configmgr/source/backendhelper/behelper.uno.xml b/configmgr/source/backendhelper/behelper.uno.xml
deleted file mode 100644
index 18bf50766b..0000000000
--- a/configmgr/source/backendhelper/behelper.uno.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice/DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>behelper.uno</module-name>
-    <component-description>
-        <author>Sarah Smith</author>
-        <name>com.sun.star.comp.configuration.backend.LayerDescriber</name>
-        <description>Describes the contents of a Layer to an XLayerHandler object. The contents of the layer
-is contained in a sequence of PropertyInfo structs</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="final"/>
-        <supported-services>com.sun.star.configuration.backend.LayerDescriber</supported-services>
-        <type>com.sun.star.configuration.backend.XLayerContentDescriber</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.uno.Any</type>
-        <type>com.sun.star.uno.Sequence</type>
-       </component-description>
-       <project-build-dependency>	comphelper	</project-build-dependency>
-       <project-build-dependency>	vos			</project-build-dependency>
-       <project-build-dependency>	cppuhelper	</project-build-dependency>
-       <project-build-dependency>	salhelper	</project-build-dependency>
-       <project-build-dependency>	cppu		</project-build-dependency>
-       <project-build-dependency>	sal			</project-build-dependency>
-       <runtime-module-dependency>	comphelp2$(COM)		</runtime-module-dependency>
-       <runtime-module-dependency>	vos2$(COM)			</runtime-module-dependency>
-       <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
-       <runtime-module-dependency>	salhelper3$(COM)	</runtime-module-dependency>
-       <runtime-module-dependency>	cppu3		</runtime-module-dependency>
-       <runtime-module-dependency>	sal3		</runtime-module-dependency>
-</module-description>
diff --git a/configmgr/source/backendhelper/componentdf.cxx b/configmgr/source/backendhelper/componentdf.cxx
deleted file mode 100644
index 137a112099..0000000000
--- a/configmgr/source/backendhelper/componentdf.cxx
+++ /dev/null
@@ -1,91 +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: componentdf.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_configmgr.hxx"
-#include "backendlayerhelper.hxx"
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <cppuhelper/implementationentry.hxx>
-#endif // _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-
-//==============================================================================
-
-static com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL createBackendLayerHelper(
-                   const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& aContext) {
-    return * new configmgr::backendhelper::BackendLayerHelper(aContext) ;
-}
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-static const cppu::ImplementationEntry kImplementations_entries[] = 
-{
-    {
-        createBackendLayerHelper,
-        configmgr::backendhelper::BackendLayerHelper::getBackendLayerHelperName,
-        configmgr::backendhelper::BackendLayerHelper::getBackendLayerHelperServiceNames,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL, NULL, NULL, NULL, NULL, 0 }
-} ;
-//------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /* ppEnv */
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-//------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void *aServiceManager, void *aRegistryKey)
-{
-    return cppu::component_writeInfoHelper(aServiceManager, 
-                                           aRegistryKey,
-                                           kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void *component_getFactory(
-    const sal_Char *aImplementationName, void *aServiceManager,
-    void *aRegistryKey)
-{
-    return cppu::component_getFactoryHelper(aImplementationName,
-                                            aServiceManager,
-                                            aRegistryKey,
-                                            kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
diff --git a/configmgr/source/backendhelper/makefile.mk b/configmgr/source/backendhelper/makefile.mk
deleted file mode 100644
index f9a27c8167..0000000000
--- a/configmgr/source/backendhelper/makefile.mk
+++ /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: 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=..$/..
-
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=behelper
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-.INCLUDE : $(PRJ)$/makefile.pmk
-DLLPRE =
-
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/backendlayerhelper.obj \
-    $(SLO)$/componentdf.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib        
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET).uno   
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp    
-DEF1DES=Configuration: Backend Helper
-
-# --- Targets ---
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
new file mode 100644
index 0000000000..bb77039dcc
--- /dev/null
+++ b/configmgr/source/broadcaster.cxx
@@ -0,0 +1,237 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/beans/XPropertiesChangeListener.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/XChangesListener.hpp"
+#include "osl/diagnose.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "broadcaster.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+void Broadcaster::addDisposeNotification(
+    css::uno::Reference< css::lang::XEventListener > const & listener,
+    css::lang::EventObject const & event)
+{
+    disposeNotifications_.push_back(DisposeNotification(listener, event));
+}
+
+void Broadcaster::addContainerElementReplacedNotification(
+    css::uno::Reference< css::container::XContainerListener > const & listener,
+    css::container::ContainerEvent const & event)
+{
+    containerElementReplacedNotifications_.push_back(
+        ContainerNotification(listener, event));
+}
+
+void Broadcaster::addContainerElementInsertedNotification(
+    css::uno::Reference< css::container::XContainerListener > const & listener,
+    css::container::ContainerEvent const & event)
+{
+    containerElementInsertedNotifications_.push_back(
+        ContainerNotification(listener, event));
+}
+
+void Broadcaster::addContainerElementRemovedNotification(
+    css::uno::Reference< css::container::XContainerListener > const & listener,
+    css::container::ContainerEvent const & event)
+{
+    containerElementRemovedNotifications_.push_back(
+        ContainerNotification(listener, event));
+}
+
+void Broadcaster::addPropertyChangeNotification(
+    css::uno::Reference< css::beans::XPropertyChangeListener > const & listener,
+    css::beans::PropertyChangeEvent const & event)
+{
+    propertyChangeNotifications_.push_back(
+        PropertyChangeNotification(listener, event));
+}
+
+void Broadcaster::addPropertiesChangeNotification(
+    css::uno::Reference< css::beans::XPropertiesChangeListener > const &
+        listener,
+    css::uno::Sequence< css::beans::PropertyChangeEvent > const & event)
+{
+    propertiesChangeNotifications_.push_back(
+        PropertiesChangeNotification(listener, event));
+}
+
+void Broadcaster::addChangesNotification(
+    css::uno::Reference< css::util::XChangesListener > const & listener,
+    css::util::ChangesEvent const & event)
+{
+    changesNotifications_.push_back(ChangesNotification(listener, event));
+}
+
+void Broadcaster::send() {
+    bool exception = false;
+    for (DisposeNotifications::iterator i(disposeNotifications_.begin());
+         i != disposeNotifications_.end(); ++i) {
+        try {
+            i->listener->disposing(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    for (ContainerNotifications::iterator i(
+             containerElementInsertedNotifications_.begin());
+         i != containerElementInsertedNotifications_.end(); ++i)
+    {
+        try {
+            i->listener->elementInserted(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    for (ContainerNotifications::iterator i(
+             containerElementRemovedNotifications_.begin());
+         i != containerElementRemovedNotifications_.end(); ++i)
+    {
+        try {
+            i->listener->elementRemoved(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    for (ContainerNotifications::iterator i(
+             containerElementReplacedNotifications_.begin());
+         i != containerElementReplacedNotifications_.end(); ++i)
+    {
+        try {
+            i->listener->elementReplaced(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    for (PropertyChangeNotifications::iterator i(
+             propertyChangeNotifications_.begin());
+         i != propertyChangeNotifications_.end(); ++i)
+    {
+        try {
+            i->listener->propertyChange(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    for (PropertiesChangeNotifications::iterator i(
+             propertiesChangeNotifications_.begin());
+         i != propertiesChangeNotifications_.end(); ++i)
+    {
+        try {
+            i->listener->propertiesChange(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    for (ChangesNotifications::iterator i(changesNotifications_.begin());
+         i != changesNotifications_.end(); ++i) {
+        try {
+            i->listener->changesOccurred(i->event);
+        } catch (css::lang::DisposedException &) {
+        } catch (css::uno::Exception &) {
+            exception = true;
+        }
+    }
+    if (exception) { //TODO
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr exceptions during listener notification")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+Broadcaster::DisposeNotification::DisposeNotification(
+    css::uno::Reference< css::lang::XEventListener > const & theListener,
+    css::lang::EventObject const & theEvent):
+    listener(theListener), event(theEvent)
+{
+    OSL_ASSERT(theListener.is());
+}
+
+Broadcaster::ContainerNotification::ContainerNotification(
+    css::uno::Reference< css::container::XContainerListener > const &
+        theListener,
+    css::container::ContainerEvent const & theEvent):
+    listener(theListener), event(theEvent)
+{
+    OSL_ASSERT(theListener.is());
+}
+
+Broadcaster::PropertyChangeNotification::PropertyChangeNotification(
+    css::uno::Reference< css::beans::XPropertyChangeListener > const &
+        theListener,
+    css::beans::PropertyChangeEvent const & theEvent):
+    listener(theListener), event(theEvent)
+{
+    OSL_ASSERT(theListener.is());
+}
+
+Broadcaster::PropertiesChangeNotification::PropertiesChangeNotification(
+    css::uno::Reference< css::beans::XPropertiesChangeListener > const &
+        theListener,
+    css::uno::Sequence< css::beans::PropertyChangeEvent > const & theEvent):
+    listener(theListener), event(theEvent)
+{
+    OSL_ASSERT(theListener.is());
+}
+
+Broadcaster::ChangesNotification::ChangesNotification(
+    css::uno::Reference< css::util::XChangesListener > const & theListener,
+    css::util::ChangesEvent const & theEvent):
+    listener(theListener), event(theEvent)
+{
+    OSL_ASSERT(theListener.is());
+}
+
+}
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
new file mode 100644
index 0000000000..95c4b1fac4
--- /dev/null
+++ b/configmgr/source/broadcaster.hxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_BROADCASTER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_BROADCASTER_HXX
+
+#include "sal/config.h"
+
+#include <vector>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/util/ChangesEvent.hpp"
+
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertiesChangeListener;
+        class XPropertyChangeListener;
+    }
+    namespace container { class XContainerListener; }
+    namespace lang { class XEventListener; }
+    namespace util { class XChangesListener; }
+} } }
+
+namespace configmgr {
+
+class Access;
+
+class Broadcaster: private boost::noncopyable {
+public:
+    void addDisposeNotification(
+        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+            const & listener,
+        com::sun::star::lang::EventObject const & event);
+
+    void addContainerElementInsertedNotification(
+        com::sun::star::uno::Reference<
+            com::sun::star::container::XContainerListener > const & listener,
+        com::sun::star::container::ContainerEvent const & event);
+
+    void addContainerElementRemovedNotification(
+        com::sun::star::uno::Reference<
+            com::sun::star::container::XContainerListener > const & listener,
+        com::sun::star::container::ContainerEvent const & event);
+
+    void addContainerElementReplacedNotification(
+        com::sun::star::uno::Reference<
+            com::sun::star::container::XContainerListener > const & listener,
+        com::sun::star::container::ContainerEvent const & event);
+
+    void addPropertyChangeNotification(
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertyChangeListener > const & listener,
+        com::sun::star::beans::PropertyChangeEvent const & event);
+
+    void addPropertiesChangeNotification(
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertiesChangeListener > const & listener,
+        com::sun::star::uno::Sequence<
+            com::sun::star::beans::PropertyChangeEvent > const & event);
+
+    void addChangesNotification(
+        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
+            const & listener,
+        com::sun::star::util::ChangesEvent const & event);
+
+    void send();
+
+private:
+    struct DisposeNotification {
+        com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
+            listener;
+        com::sun::star::lang::EventObject event;
+
+        DisposeNotification(
+            com::sun::star::uno::Reference<
+                com::sun::star::lang::XEventListener > const & theListener,
+            com::sun::star::lang::EventObject const & theEvent);
+    };
+
+    struct ContainerNotification {
+        com::sun::star::uno::Reference<
+            com::sun::star::container::XContainerListener > listener;
+        com::sun::star::container::ContainerEvent event;
+
+        ContainerNotification(
+            com::sun::star::uno::Reference<
+                com::sun::star::container::XContainerListener > const &
+                    theListener,
+            com::sun::star::container::ContainerEvent const & theEvent);
+    };
+
+    struct PropertyChangeNotification {
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertyChangeListener > listener;
+        com::sun::star::beans::PropertyChangeEvent event;
+
+        PropertyChangeNotification(
+            com::sun::star::uno::Reference<
+                com::sun::star::beans::XPropertyChangeListener > const &
+                theListener,
+            com::sun::star::beans::PropertyChangeEvent const & theEvent);
+    };
+
+    struct PropertiesChangeNotification {
+        com::sun::star::uno::Reference<
+            com::sun::star::beans::XPropertiesChangeListener > listener;
+        com::sun::star::uno::Sequence<
+            com::sun::star::beans::PropertyChangeEvent > event;
+
+        PropertiesChangeNotification(
+            com::sun::star::uno::Reference<
+                com::sun::star::beans::XPropertiesChangeListener > const &
+                theListener,
+            com::sun::star::uno::Sequence<
+                com::sun::star::beans::PropertyChangeEvent > const & theEvent);
+    };
+
+    struct ChangesNotification {
+        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
+            listener;
+        com::sun::star::util::ChangesEvent event;
+
+        ChangesNotification(
+            com::sun::star::uno::Reference<
+                com::sun::star::util::XChangesListener > const & theListener,
+            com::sun::star::util::ChangesEvent const & theEvent);
+    };
+
+    typedef std::vector< DisposeNotification > DisposeNotifications;
+
+    typedef std::vector< ContainerNotification > ContainerNotifications;
+
+    typedef std::vector< PropertyChangeNotification >
+        PropertyChangeNotifications;
+
+    typedef std::vector< PropertiesChangeNotification >
+        PropertiesChangeNotifications;
+
+    typedef std::vector< ChangesNotification > ChangesNotifications;
+
+    DisposeNotifications disposeNotifications_;
+    ContainerNotifications containerElementInsertedNotifications_;
+    ContainerNotifications containerElementRemovedNotifications_;
+    ContainerNotifications containerElementReplacedNotifications_;
+    PropertyChangeNotifications propertyChangeNotifications_;
+    PropertiesChangeNotifications propertiesChangeNotifications_;
+    ChangesNotifications changesNotifications_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
new file mode 100644
index 0000000000..ef2b213d4e
--- /dev/null
+++ b/configmgr/source/childaccess.cxx
@@ -0,0 +1,391 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <vector>
+
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppu/unotype.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "osl/mutex.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/string.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/types.h"
+
+#include "access.hxx"
+#include "childaccess.hxx"
+#include "components.hxx"
+#include "data.hxx"
+#include "groupnode.hxx"
+#include "localizedpropertynode.hxx"
+#include "localizedvaluenode.hxx"
+#include "lock.hxx"
+#include "modifications.hxx"
+#include "node.hxx"
+#include "path.hxx"
+#include "propertynode.hxx"
+#include "rootaccess.hxx"
+#include "setnode.hxx"
+#include "type.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+css::uno::Sequence< sal_Int8 > ChildAccess::getTunnelId() {
+    static css::uno::Sequence< sal_Int8 > id;
+    if (id.getLength() == 0) {
+        css::uno::Sequence< sal_Int8 > uuid(16);
+        rtl_createUuid(
+            reinterpret_cast< sal_uInt8 * >(uuid.getArray()), 0, false);
+        id = uuid;
+    }
+    return id;
+}
+
+ChildAccess::ChildAccess(
+    Components & components, rtl::Reference< RootAccess > const & root,
+    rtl::Reference< Access > const & parent, rtl::OUString const & name,
+    rtl::Reference< Node > const & node):
+    Access(components), root_(root), parent_(parent), name_(name), node_(node),
+    inTransaction_(false)
+{
+    OSL_ASSERT(root.is() && parent.is() && node.is());
+}
+
+ChildAccess::ChildAccess(
+    Components & components, rtl::Reference< RootAccess > const & root,
+    rtl::Reference< Node > const & node):
+    Access(components), root_(root), node_(node), inTransaction_(false)
+{
+    OSL_ASSERT(root.is() && node.is());
+}
+
+Path ChildAccess::getAbsolutePath() {
+    OSL_ASSERT(getParentAccess().is());
+    Path path(getParentAccess()->getAbsolutePath());
+    path.push_back(name_);
+    return path;
+}
+
+Path ChildAccess::getRelativePath() {
+    Path path;
+    rtl::Reference< Access > parent(getParentAccess());
+    if (parent.is()) {
+        path = parent->getRelativePath();
+    }
+    path.push_back(name_);
+    return path;
+}
+
+rtl::OUString ChildAccess::getRelativePathRepresentation() {
+    rtl::OUStringBuffer path;
+    rtl::Reference< Access > parent(getParentAccess());
+    if (parent.is()) {
+        path.append(parent->getRelativePathRepresentation());
+        if (path.getLength() != 0) {
+            path.append(sal_Unicode('/'));
+        }
+    }
+    path.append(Data::createSegment(node_->getTemplateName(), name_));
+    return path.makeStringAndClear();
+}
+
+rtl::Reference< Node > ChildAccess::getNode() {
+    return node_;
+}
+
+bool ChildAccess::isFinalized() {
+    return node_->getFinalized() != Data::NO_LAYER ||
+        (parent_.is() && parent_->isFinalized());
+}
+
+rtl::OUString ChildAccess::getNameInternal() {
+    return name_;
+}
+
+rtl::Reference< RootAccess > ChildAccess::getRootAccess() {
+    return root_;
+}
+
+rtl::Reference< Access > ChildAccess::getParentAccess() {
+    return parent_;
+}
+
+void ChildAccess::acquire() throw () {
+    Access::acquire();
+}
+
+void ChildAccess::release() throw () {
+    Access::release();
+}
+
+css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return static_cast< cppu::OWeakObject * >(parent_.get());
+}
+
+void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
+    throw (css::lang::NoSupportException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    throw css::lang::NoSupportException(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setParent")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+sal_Int64 ChildAccess::getSomething(
+    css::uno::Sequence< sal_Int8 > const & aIdentifier)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    return aIdentifier == getTunnelId()
+        ? reinterpret_cast< sal_Int64 >(this) : 0;
+}
+
+void ChildAccess::bind(
+    rtl::Reference< RootAccess > const & root,
+    rtl::Reference< Access > const & parent, rtl::OUString const & name)
+    throw ()
+{
+    OSL_ASSERT(
+        !parent_.is() && root.is() && parent.is() && name.getLength() != 0);
+    root_ = root;
+    parent_ = parent;
+    name_ = name;
+}
+
+void ChildAccess::unbind() throw () {
+    OSL_ASSERT(parent_.is());
+    parent_->releaseChild(name_);
+    parent_.clear();
+    inTransaction_ = true;
+}
+
+void ChildAccess::committed() {
+    inTransaction_ = false;
+}
+
+void ChildAccess::setNode(rtl::Reference< Node > const & node) {
+    node_ = node;
+}
+
+void ChildAccess::setProperty(
+    css::uno::Any const & value, Modifications * localModifications)
+{
+    OSL_ASSERT(localModifications != 0);
+    Type type = TYPE_ERROR;
+    bool nillable = false;
+    switch (node_->kind()) {
+    case Node::KIND_PROPERTY:
+        {
+            PropertyNode * prop = dynamic_cast< PropertyNode * >(node_.get());
+            type = prop->getStaticType();
+            nillable = prop->isNillable();
+        }
+        break;
+    case Node::KIND_LOCALIZED_PROPERTY:
+        {
+            rtl::OUString locale(getRootAccess()->getLocale());
+            if (!Components::allLocales(locale)) {
+                rtl::Reference< ChildAccess > child(getChild(locale));
+                if (child.is()) {
+                    child->setProperty(value, localModifications);
+                } else {
+                    insertLocalizedValueChild(
+                        locale, value, localModifications);
+                }
+                return;
+            }
+        }
+        break;
+    case Node::KIND_LOCALIZED_VALUE:
+        {
+            LocalizedPropertyNode * locprop =
+                dynamic_cast< LocalizedPropertyNode * >(getParentNode().get());
+            type = locprop->getStaticType();
+            nillable = locprop->isNillable();
+        }
+        break;
+    default:
+        break;
+    }
+    checkValue(value, type, nillable);
+    getParentAccess()->markChildAsModified(this);
+    changedValue_.reset(new css::uno::Any(value));
+    localModifications->add(getRelativePath());
+}
+
+css::uno::Any ChildAccess::asValue() {
+    if (changedValue_.get() != 0) {
+        return *changedValue_;
+    }
+    switch (node_->kind()) {
+    case Node::KIND_PROPERTY:
+        return dynamic_cast< PropertyNode * >(node_.get())->getValue(
+            getComponents());
+    case Node::KIND_LOCALIZED_PROPERTY:
+        {
+            rtl::OUString locale(getRootAccess()->getLocale());
+            if (!Components::allLocales(locale)) {
+                // Find best match using an adaption of RFC 4647 lookup matching
+                // rules, removing "-" or "_" delimited segments from the end;
+                // defaults are the empty string locale, the "en-US" locale, the
+                // first child (if any), or a nil value (even though it may be
+                // illegal for the given property), in that order:
+                rtl::Reference< ChildAccess > child;
+                for (;;) {
+                    child = getChild(locale);
+                    if (child.is() || locale.getLength() == 0) {
+                        break;
+                    }
+                    sal_Int32 i = locale.getLength() - 1;
+                    while (i > 0 && locale[i] != '-' && locale[i] != '_') {
+                        --i;
+                    }
+                    locale = locale.copy(0, i);
+                }
+                if (!child.is()) {
+                    child = getChild(
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")));
+                    if (!child.is()) {
+                        std::vector< rtl::Reference< ChildAccess > > all(
+                            getAllChildren());
+                        if (!all.empty()) {
+                            child = all.front();
+                        }
+                    }
+                }
+                return child.is() ? child->asValue() : css::uno::Any();
+            }
+        }
+        break;
+    case Node::KIND_LOCALIZED_VALUE:
+        return dynamic_cast< LocalizedValueNode * >(node_.get())->getValue();
+    default:
+        break;
+    }
+    return css::uno::makeAny(
+        css::uno::Reference< css::uno::XInterface >(
+            static_cast< cppu::OWeakObject * >(this)));
+}
+
+void ChildAccess::commitChanges(bool valid, Modifications * globalModifications)
+{
+    OSL_ASSERT(globalModifications != 0);
+    commitChildChanges(valid, globalModifications);
+    if (valid && changedValue_.get() != 0) {
+        Path path(getAbsolutePath());
+        getComponents().addModification(path);
+        globalModifications->add(path);
+        switch (node_->kind()) {
+        case Node::KIND_PROPERTY:
+            dynamic_cast< PropertyNode * >(node_.get())->setValue(
+                Data::NO_LAYER, *changedValue_);
+            break;
+        case Node::KIND_LOCALIZED_VALUE:
+            dynamic_cast< LocalizedValueNode * >(node_.get())->setValue(
+                Data::NO_LAYER, *changedValue_);
+            break;
+        default:
+            OSL_ASSERT(false); // this cannot happen
+            break;
+        }
+    }
+    changedValue_.reset();
+}
+
+ChildAccess::~ChildAccess() {
+    osl::MutexGuard g(lock);
+    if (parent_.is()) {
+        parent_->releaseChild(name_);
+    }
+}
+
+void ChildAccess::addTypes(std::vector< css::uno::Type > * types) const {
+    OSL_ASSERT(types != 0);
+    types->push_back(cppu::UnoType< css::container::XChild >::get());
+    types->push_back(cppu::UnoType< css::lang::XUnoTunnel >::get());
+}
+
+void ChildAccess::addSupportedServiceNames(
+    std::vector< rtl::OUString > * services)
+{
+    OSL_ASSERT(services != 0);
+    services->push_back(
+        getParentNode()->kind() == Node::KIND_GROUP
+        ? rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.GroupElement"))
+        : rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.SetElement")));
+}
+
+css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    css::uno::Any res(Access::queryInterface(aType));
+    return res.hasValue()
+        ? res
+        : cppu::queryInterface(
+            aType, static_cast< css::container::XChild * >(this),
+            static_cast< css::lang::XUnoTunnel * >(this));
+}
+
+}
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
new file mode 100644
index 0000000000..c1cb148969
--- /dev/null
+++ b/configmgr/source/childaccess.hxx
@@ -0,0 +1,157 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_CHILDACCESS_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_CHILDACCESS_HXX
+
+#include "sal/config.h"
+
+#include <memory>
+#include <vector>
+
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "rtl/ref.hxx"
+#include "sal/types.h"
+
+#include "access.hxx"
+#include "path.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+    class Type;
+    class XInterface;
+} } } }
+
+namespace configmgr {
+
+class Components;
+class Modifications;
+class Node;
+class RootAccess;
+
+class ChildAccess:
+    public Access, public com::sun::star::container::XChild,
+    public com::sun::star::lang::XUnoTunnel
+{
+public:
+    static com::sun::star::uno::Sequence< sal_Int8 > getTunnelId();
+
+    ChildAccess(
+        Components & components, rtl::Reference< RootAccess > const & root,
+        rtl::Reference< Access > const & parent, rtl::OUString const & name,
+        rtl::Reference< Node > const & node);
+
+    ChildAccess(
+        Components & components, rtl::Reference< RootAccess > const & root,
+        rtl::Reference< Node > const & node);
+
+    virtual Path getAbsolutePath();
+
+    virtual Path getRelativePath();
+
+    virtual rtl::OUString getRelativePathRepresentation();
+
+    virtual rtl::Reference< Node > getNode();
+
+    virtual bool isFinalized();
+
+    virtual rtl::OUString getNameInternal();
+
+    virtual rtl::Reference< RootAccess > getRootAccess();
+
+    virtual rtl::Reference< Access > getParentAccess();
+
+    virtual void SAL_CALL acquire() throw ();
+
+    virtual void SAL_CALL release() throw ();
+
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+    SAL_CALL getParent()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setParent(
+        com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+            const &)
+        throw (
+            com::sun::star::lang::NoSupportException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int64 SAL_CALL getSomething(
+        com::sun::star::uno::Sequence< sal_Int8 > const & aIdentifier)
+        throw (com::sun::star::uno::RuntimeException);
+
+    void bind(
+        rtl::Reference< RootAccess > const & root,
+        rtl::Reference< Access > const & parent, rtl::OUString const & name)
+        throw ();
+
+    void unbind() throw ();
+
+    bool isInTransaction() const { return inTransaction_; }
+
+    void committed();
+
+    void setNode(rtl::Reference< Node > const & node);
+
+    void setProperty(
+        com::sun::star::uno::Any const & value,
+        Modifications * localModifications);
+
+    com::sun::star::uno::Any asValue();
+
+    void commitChanges(bool valid, Modifications * globalModifications);
+
+private:
+    virtual ~ChildAccess();
+
+    virtual void addTypes(
+        std::vector< com::sun::star::uno::Type > * types) const;
+
+    virtual void addSupportedServiceNames(
+        std::vector< rtl::OUString > * services);
+
+    virtual com::sun::star::uno::Any SAL_CALL queryInterface(
+        com::sun::star::uno::Type const & aType)
+        throw (com::sun::star::uno::RuntimeException);
+
+    rtl::Reference< RootAccess > root_;
+    rtl::Reference< Access > parent_; // null iff free node
+    rtl::OUString name_;
+    rtl::Reference< Node > node_;
+    std::auto_ptr< com::sun::star::uno::Any > changedValue_;
+    bool inTransaction_;
+        // to determine if a free node can be inserted underneath some root
+};
+
+}
+
+#endif
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
new file mode 100644
index 0000000000..51a1a6547d
--- /dev/null
+++ b/configmgr/source/components.cxx
@@ -0,0 +1,652 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <algorithm>
+#include <list>
+
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "osl/file.hxx"
+#include "rtl/bootstrap.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/string.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "components.hxx"
+#include "data.hxx"
+#include "modifications.hxx"
+#include "node.hxx"
+#include "parsemanager.hxx"
+#include "rootaccess.hxx"
+#include "writemodfile.hxx"
+#include "xcdparser.hxx"
+#include "xcuparser.hxx"
+#include "xcsparser.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+struct UnresolvedListItem {
+    rtl::OUString name;
+    rtl::Reference< ParseManager > manager;
+
+    UnresolvedListItem(
+        rtl::OUString const & theName,
+        rtl::Reference< ParseManager > theManager):
+        name(theName), manager(theManager) {}
+};
+
+typedef std::list< UnresolvedListItem > UnresolvedList;
+
+void parseXcsFile(rtl::OUString const & url, int layer, Data * data,
+    Modifications * modifications)
+    SAL_THROW((
+        css::container::NoSuchElementException, css::uno::RuntimeException))
+{
+    OSL_ASSERT(modifications == 0); (void) modifications;
+    OSL_VERIFY(
+        rtl::Reference< ParseManager >(
+            new ParseManager(url, new XcsParser(layer, data)))->parse());
+}
+
+void parseXcuFile(
+    rtl::OUString const & url, int layer, Data * data,
+    Modifications * modifications)
+    SAL_THROW((
+        css::container::NoSuchElementException, css::uno::RuntimeException))
+{
+    OSL_VERIFY(
+        rtl::Reference< ParseManager >(
+            new ParseManager(url, new XcuParser(layer, data, modifications)))->
+        parse());
+}
+
+rtl::OUString expand(rtl::OUString const & str) {
+    rtl::OUString s(str);
+    rtl::Bootstrap::expandMacros(s); //TODO: detect failure
+    return s;
+}
+
+static bool singletonCreated = false;
+static Components * singleton; // leaks
+
+}
+
+void Components::initSingleton(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
+{
+    OSL_ASSERT(context.is());
+    if (!singletonCreated) {
+        singletonCreated = true;
+        singleton = new Components(context);
+    }
+}
+
+Components & Components::getSingleton() {
+    OSL_ASSERT(singletonCreated);
+    if (singleton == 0) {
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "configmgr no Components singleton")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    return *singleton;
+}
+
+bool Components::allLocales(rtl::OUString const & locale) {
+    return locale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"));
+}
+
+rtl::Reference< Node > Components::resolvePathRepresentation(
+    rtl::OUString const & pathRepresentation, Path * path,
+    int * finalizedLayer) const
+{
+    return data_.resolvePathRepresentation(
+        pathRepresentation, path, finalizedLayer);
+}
+
+rtl::Reference< Node > Components::getTemplate(
+    int layer, rtl::OUString const & fullName) const
+{
+    return data_.getTemplate(layer, fullName);
+}
+
+void Components::addRootAccess(rtl::Reference< RootAccess > const & access) {
+    roots_.insert(access.get());
+}
+
+void Components::removeRootAccess(RootAccess * access) {
+    roots_.erase(access);
+}
+
+void Components::initGlobalBroadcaster(
+    Modifications const & modifications,
+    rtl::Reference< RootAccess > const & exclude, Broadcaster * broadcaster)
+{
+    //TODO: Iterate only over roots w/ listeners:
+    for (WeakRootSet::iterator i(roots_.begin()); i != roots_.end(); ++i) {
+        rtl::Reference< RootAccess > root;
+        if ((*i)->acquireCounting() > 1) {
+            root.set(*i); // must not throw
+        }
+        (*i)->releaseNondeleting();
+        if (root.is()) {
+            if (root != exclude) {
+                Path path(root->getAbsolutePath());
+                Modifications::Node const * mods = &modifications.getRoot();
+                for (Path::iterator j(path.begin()); j != path.end(); ++j) {
+                    Modifications::Node::Children::const_iterator k(
+                        mods->children.find(*j));
+                    if (k == mods->children.end()) {
+                        mods = 0;
+                        break;
+                    }
+                    mods = &k->second;
+                }
+                //TODO: If the complete tree of which root is a part is deleted,
+                // or replaced, mods will be null, but some of the listeners
+                // from within root should probably fire nonetheless:
+                if (mods != 0) {
+                    root->initBroadcaster(*mods, broadcaster);
+                }
+            }
+        }
+    }
+}
+
+void Components::addModification(Path const & path) {
+    data_.modifications.add(path);
+}
+
+void Components::writeModifications() {
+    writeModFile(*this, getModificationFileUrl(), data_);
+}
+
+void Components::insertExtensionXcsFile(
+    bool shared, rtl::OUString const & fileUri)
+{
+    try {
+        parseXcsFile(fileUri, shared ? 9 : 13, &data_, 0);
+    } catch (css::container::NoSuchElementException & e) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "insertExtensionXcsFile does not exist: ")) +
+             e.Message),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+void Components::insertExtensionXcuFile(
+    bool shared, rtl::OUString const & fileUri, Modifications * modifications)
+{
+    OSL_ASSERT(modifications != 0);
+    try {
+        parseXcuFile(fileUri, shared ? 10 : 14, &data_, modifications);
+    } catch (css::container::NoSuchElementException & e) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "insertExtensionXcuFile does not exist: ")) +
+             e.Message),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+css::beans::Optional< css::uno::Any > Components::getExternalValue(
+    rtl::OUString const & descriptor)
+{
+    sal_Int32 i = descriptor.indexOf(' ');
+    if (i <= 0) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("bad external value descriptor ")) +
+             descriptor),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    //TODO: Do not make calls with mutex locked:
+    rtl::OUString name(descriptor.copy(0, i));
+    ExternalServices::iterator j(externalServices_.find(name));
+    if (j == externalServices_.end()) {
+        css::uno::Reference< css::uno::XInterface > service;
+        try {
+            service = css::uno::Reference< css::lang::XMultiComponentFactory >(
+                context_->getServiceManager(), css::uno::UNO_SET_THROW)->
+                createInstanceWithContext(name, context_);
+        } catch (css::uno::RuntimeException &) {
+            // Assuming these exceptions are real errors:
+            throw;
+        } catch (css::uno::Exception & e) {
+            // Assuming these exceptions indicate that the service is not
+            // installed:
+            OSL_TRACE(
+                "createInstance(%s) failed with %s",
+                rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(),
+                rtl::OUStringToOString(
+                    e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        }
+        css::uno::Reference< css::beans::XPropertySet > propset;
+        if (service.is()) {
+            propset = css::uno::Reference< css::beans::XPropertySet >(
+                service, css::uno::UNO_QUERY_THROW);
+        }
+        j = externalServices_.insert(
+            ExternalServices::value_type(name, propset)).first;
+    }
+    css::beans::Optional< css::uno::Any > value;
+    if (j->second.is()) {
+        try {
+            if (!(j->second->getPropertyValue(descriptor.copy(i + 1)) >>=
+                  value))
+            {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "cannot obtain external value through ")) +
+                     descriptor),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+        } catch (css::beans::UnknownPropertyException & e) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "unknwon external value descriptor ID: ")) +
+                 e.Message),
+                css::uno::Reference< css::uno::XInterface >());
+        } catch (css::lang::WrappedTargetException & e) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "cannot obtain external value: ")) +
+                 e.Message),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+    }
+    return value;
+}
+
+Components::Components(
+    css::uno::Reference< css::uno::XComponentContext > const & context):
+    context_(context)
+{
+    OSL_ASSERT(context.is());
+/*SB*/try{
+    parseXcsXcuLayer(
+        0,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
+    parseModuleLayer(
+        2,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "$OOO_BASE_DIR/share/registry/modules"))));
+    parseResLayer(
+        3,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
+    parseXcsXcuLayer(
+        4,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "$BRAND_BASE_DIR/share/registry"))));
+    parseModuleLayer(
+        6,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "$BRAND_BASE_DIR/share/registry/modules"))));
+    parseXcsXcuLayer( //TODO: migrate
+        7,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+                    ":UNO_SHARED_PACKAGES_CACHE}/registry/"
+                    "com.sun.star.comp.deployment.configuration."
+                    "PackageRegistryBackend/registry"))));
+    parseXcsXcuIniLayer(
+        9,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+                    ":UNO_SHARED_PACKAGES_CACHE}/registry/"
+                    "com.sun.star.comp.deployment.configuration."
+                    "PackageRegistryBackend/configmgr.ini"))));
+    parseXcsXcuLayer( //TODO: migrate
+        11,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+                    ":UNO_USER_PACKAGES_CACHE}/registry/"
+                    "com.sun.star.comp.deployment.configuration."
+                    "PackageRegistryBackend/registry"))));
+    parseXcsXcuIniLayer(
+        13,
+        expand(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+                    ":UNO_USER_PACKAGES_CACHE}/registry/"
+                    "com.sun.star.comp.deployment.configuration."
+                    "PackageRegistryBackend/configmgr.ini"))));
+/*SB*/}catch(css::uno::Exception&e){fprintf(stderr,"caught <%s>\n",rtl::OUStringToOString(e.Message,RTL_TEXTENCODING_UTF8).getStr());throw;}
+    try {
+        parseModificationLayer();
+    } catch (css::uno::Exception & e) { //TODO: more specific exception catching
+        // Silently ignore unreadable parts of a corrupted
+        // registrymodifications.xcu file, instead of completely preventing OOo
+        // from starting:
+        OSL_TRACE(
+            "configmgr error reading user modification layer: %s",
+            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+    }
+}
+
+Components::~Components() {}
+
+void Components::parseFiles(
+    int layer, rtl::OUString const & extension,
+    void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
+    rtl::OUString const & url, bool recursive)
+{
+    osl::Directory dir(url);
+    switch (dir.open()) {
+    case osl::FileBase::E_None:
+        break;
+    case osl::FileBase::E_NOENT:
+        if (!recursive) {
+            return;
+        }
+        // fall through
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot open directory ")) +
+             url),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    for (;;) {
+        osl::DirectoryItem i;
+        osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+        if (rc == osl::FileBase::E_NOENT) {
+            break;
+        }
+        if (rc != osl::FileBase::E_None) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("cannot iterate directory ")) +
+                 url),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        osl::FileStatus stat(
+            FileStatusMask_Type | FileStatusMask_FileName |
+            FileStatusMask_FileURL);
+        if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("cannot stat in directory ")) +
+                 url),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
+            parseFiles(layer, extension, parseFile, stat.getFileURL(), true);
+        } else {
+            rtl::OUString file(stat.getFileName());
+            if (file.getLength() >= extension.getLength() &&
+                file.match(extension, file.getLength() - extension.getLength()))
+            {
+                try {
+                    (*parseFile)(stat.getFileURL(), layer, &data_, 0);
+                } catch (css::container::NoSuchElementException & e) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "stat'ed file does not exist: ")) +
+                         e.Message),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+            }
+        }
+    }
+}
+
+void Components::parseFileList(
+    int layer,
+    void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
+    rtl::OUString const & urls, rtl::Bootstrap const & ini)
+{
+    for (sal_Int32 i = 0;;) {
+        rtl::OUString url(urls.getToken(0, ' ', i));
+        if (url.getLength() != 0) {
+            ini.expandMacrosFrom(url); //TODO: detect failure
+            try {
+                (*parseFile)(url, layer, &data_, 0);
+            } catch (css::container::NoSuchElementException & e) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "stat'ed file does not exist: ")) +
+                     e.Message),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+        }
+        if (i == -1) {
+            break;
+        }
+    }
+}
+
+void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
+    osl::Directory dir(url);
+    switch (dir.open()) {
+    case osl::FileBase::E_None:
+        break;
+    case osl::FileBase::E_NOENT:
+        return;
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot open directory ")) +
+             url),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    UnresolvedList unres;
+    XcdParser::Dependencies deps;
+    for (;;) {
+        osl::DirectoryItem i;
+        osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+        if (rc == osl::FileBase::E_NOENT) {
+            break;
+        }
+        if (rc != osl::FileBase::E_None) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("cannot iterate directory ")) +
+                 url),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        osl::FileStatus stat(
+            FileStatusMask_Type | FileStatusMask_FileName |
+            FileStatusMask_FileURL);
+        if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("cannot stat in directory ")) +
+                 url),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
+            rtl::OUString file(stat.getFileName());
+            if (file.getLength() >= RTL_CONSTASCII_LENGTH(".xcd") &&
+                file.matchAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM(".xcd"),
+                    file.getLength() - RTL_CONSTASCII_LENGTH(".xcd")))
+            {
+                rtl::OUString name(
+                    file.copy(
+                        0, file.getLength() - RTL_CONSTASCII_LENGTH(".xcd")));
+                rtl::Reference< ParseManager > manager;
+                try {
+                    manager = new ParseManager(
+                        stat.getFileURL(), new XcdParser(layer, deps, &data_));
+                } catch (css::container::NoSuchElementException & e) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "stat'ed file does not exist: ")) +
+                         e.Message),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+                if (manager->parse()) {
+                    deps.insert(name);
+                } else {
+                    unres.push_back(UnresolvedListItem(name, manager));
+                }
+            }
+        }
+    }
+    while (!unres.empty()) {
+        bool resolved = false;
+        for (UnresolvedList::iterator i(unres.begin()); i != unres.end();) {
+            if (i->manager->parse()) {
+                deps.insert(i->name);
+                unres.erase(i++);
+                resolved = true;
+            } else {
+                ++i;
+            }
+        }
+        if (!resolved) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "xcd: unresolved dependencies in ")) +
+                 url),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+    }
+}
+
+void Components::parseXcsXcuLayer(int layer, rtl::OUString const & url) {
+    parseXcdFiles(layer, url);
+    parseFiles(
+        layer, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcs")),
+        &parseXcsFile,
+        url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/schema")), false);
+    parseFiles(
+        layer + 1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+        &parseXcuFile,
+        url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/data")), false);
+}
+
+void Components::parseXcsXcuIniLayer(int layer, rtl::OUString const & url) {
+    //TODO: rtl::Bootstrap::getFrom "first trie[s] to retrieve the value via the
+    // global function"
+    rtl::Bootstrap ini(url);
+    rtl::OUString urls;
+    if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCHEMA")), urls))
+    {
+        parseFileList(layer, &parseXcsFile, urls, ini);
+    }
+    if (ini.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA")), urls))
+    {
+        parseFileList(layer + 1, &parseXcuFile, urls, ini);
+    }
+}
+
+void Components::parseModuleLayer(int layer, rtl::OUString const & url) {
+    parseFiles(
+        layer, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+        &parseXcuFile, url, false);
+}
+
+void Components::parseResLayer(int layer, rtl::OUString const & url) {
+    rtl::OUString resUrl(
+        url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/res")));
+    parseXcdFiles(layer, resUrl);
+    parseFiles(
+        layer, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+        &parseXcuFile, resUrl, false);
+}
+
+rtl::OUString Components::getModificationFileUrl() const {
+    return expand(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+                ":UserInstallation}/user/registrymodifications.xcu")));
+}
+
+void Components::parseModificationLayer() {
+    try {
+        parseXcuFile(getModificationFileUrl(), Data::NO_LAYER, &data_, 0);
+    } catch (css::container::NoSuchElementException &) {
+        OSL_TRACE(
+            "configmgr user registrymodifications.xcu does not (yet) exist");
+        // Migrate old user layer data (can be removed once migration is no
+        // longer relevant; also see hack for xsi namespace in XmlReader
+        // constructor):
+        parseFiles(
+            Data::NO_LAYER, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+            &parseXcuFile,
+            expand(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+                        ":UserInstallation}/user/registry/data"))),
+            false);
+    }
+}
+
+}
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
new file mode 100644
index 0000000000..8523b02cbb
--- /dev/null
+++ b/configmgr/source/components.hxx
@@ -0,0 +1,151 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_COMPONENTS_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_COMPONENTS_HXX
+
+#include "sal/config.h"
+
+#include <map>
+#include <set>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "rtl/ref.hxx"
+
+#include "data.hxx"
+#include "path.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace beans { class XPropertySet; }
+    namespace uno {
+        class Any;
+        class XComponentContext;
+    }
+} } }
+namespace rtl {
+    class Bootstrap;
+    class OUString;
+}
+
+namespace configmgr {
+
+class Broadcaster;
+class Modifications;
+class Node;
+class RootAccess;
+
+class Components: private boost::noncopyable {
+public:
+    static void initSingleton(
+        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+            const & context);
+
+    static Components & getSingleton();
+
+    static bool allLocales(rtl::OUString const & locale);
+
+    rtl::Reference< Node > resolvePathRepresentation(
+        rtl::OUString const & pathRepresentation, Path * path,
+        int * finalizedLayer) const;
+
+    rtl::Reference< Node > getTemplate(
+        int layer, rtl::OUString const & fullName) const;
+
+    void addRootAccess(rtl::Reference< RootAccess > const & access);
+
+    void removeRootAccess(RootAccess * access);
+
+    void initGlobalBroadcaster(
+        Modifications const & modifications,
+        rtl::Reference< RootAccess > const & exclude,
+        Broadcaster * broadcaster);
+
+    void addModification(Path const & path);
+
+    void writeModifications();
+
+    void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri);
+
+    void insertExtensionXcuFile(
+        bool shared, rtl::OUString const & fileUri,
+        Modifications * modifications);
+
+    com::sun::star::beans::Optional< com::sun::star::uno::Any >
+    getExternalValue(rtl::OUString const & descriptor);
+
+private:
+    Components(
+        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+            const & context);
+
+    ~Components();
+
+    void parseFiles(
+        int layer, rtl::OUString const & extension,
+        void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
+        rtl::OUString const & url, bool recursive);
+
+    void parseFileList(
+        int layer,
+        void (* parseFile)(rtl::OUString const &, int, Data *, Modifications *),
+        rtl::OUString const & urls, rtl::Bootstrap const & ini);
+
+    void parseXcdFiles(int layer, rtl::OUString const & url);
+
+    void parseXcsXcuLayer(int layer, rtl::OUString const & url);
+
+    void parseXcsXcuIniLayer(int layer, rtl::OUString const & url);
+
+    void parseModuleLayer(int layer, rtl::OUString const & url);
+
+    void parseResLayer(int layer, rtl::OUString const & url);
+
+    rtl::OUString getModificationFileUrl() const;
+
+    void parseModificationLayer();
+
+    typedef std::set< RootAccess * > WeakRootSet;
+
+    typedef
+        std::map<
+            rtl::OUString,
+            com::sun::star::uno::Reference<
+                com::sun::star::beans::XPropertySet > >
+        ExternalServices;
+
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        context_;
+    Data data_;
+    WeakRootSet roots_;
+    ExternalServices externalServices_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
new file mode 100644
index 0000000000..a89540a881
--- /dev/null
+++ b/configmgr/source/configurationprovider.cxx
@@ -0,0 +1,519 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <vector>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/XLocalizable.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/XFlushListener.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "com/sun/star/util/XRefreshListener.hpp"
+#include "com/sun/star/util/XRefreshable.hpp"
+#include "comphelper/locale.hxx"
+#include "cppu/unotype.hxx"
+#include "cppuhelper/compbase5.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "osl/mutex.hxx"
+#include "sal/types.h"
+#include "rtl/ref.hxx"
+#include "rtl/unload.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "components.hxx"
+#include "configurationprovider.hxx"
+#include "lock.hxx"
+#include "rootaccess.hxx"
+
+namespace configmgr { namespace configuration_provider {
+
+namespace {
+
+namespace css = com::sun::star;
+
+char const accessServiceName[] =
+    "com.sun.star.configuration.ConfigurationAccess";
+char const updateAccessServiceName[] =
+    "com.sun.star.configuration.ConfigurationUpdateAccess";
+
+void badNodePath() {
+    throw css::uno::Exception(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationProvider expects a"
+                " single, non-empty, string nodepath argument")),
+        0);
+}
+
+typedef
+    cppu::WeakComponentImplHelper5<
+        css::lang::XServiceInfo, css::lang::XMultiServiceFactory,
+        css::util::XRefreshable, css::util::XFlushable,
+        css::lang::XLocalizable >
+    ServiceBase;
+
+class Service:
+    private osl::Mutex, public ServiceBase, private boost::noncopyable
+{
+public:
+    Service(
+        css::uno::Reference< css::uno::XComponentContext > const context,
+        rtl::OUString const & locale):
+        ServiceBase(*static_cast< osl::Mutex * >(this)), context_(context),
+        locale_(locale)
+    {
+        OSL_ASSERT(context.is());
+    }
+
+private:
+    virtual ~Service() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return configuration_provider::getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return configuration_provider::getSupportedServiceNames(); }
+        //TODO: DefaultProvider?
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
+        rtl::OUString const & aServiceSpecifier)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArguments(
+        rtl::OUString const & ServiceSpecifier,
+        css::uno::Sequence< css::uno::Any > const & Arguments)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getAvailableServiceNames() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL refresh() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addRefreshListener(
+        css::uno::Reference< css::util::XRefreshListener > const & l)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL removeRefreshListener(
+        css::uno::Reference< css::util::XRefreshListener > const & l)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL flush() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addFlushListener(
+        css::uno::Reference< css::util::XFlushListener > const & l)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL removeFlushListener(
+        css::uno::Reference< css::util::XFlushListener > const & l)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale)
+        throw (css::uno::RuntimeException);
+
+    virtual css::lang::Locale SAL_CALL getLocale()
+        throw (css::uno::RuntimeException);
+
+    css::uno::Reference< css::uno::XComponentContext > context_;
+    rtl::OUString locale_;
+};
+
+css::uno::Reference< css::uno::XInterface > Service::createInstance(
+    rtl::OUString const & aServiceSpecifier)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    return createInstanceWithArguments(
+        aServiceSpecifier, css::uno::Sequence< css::uno::Any >());
+}
+
+css::uno::Reference< css::uno::XInterface >
+Service::createInstanceWithArguments(
+    rtl::OUString const & ServiceSpecifier,
+    css::uno::Sequence< css::uno::Any > const & Arguments)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    rtl::OUString nodepath;
+    rtl::OUString locale;
+    for (sal_Int32 i = 0; i < Arguments.getLength(); ++i) {
+        css::beans::NamedValue v1;
+        css::beans::PropertyValue v2;
+        rtl::OUString name;
+        css::uno::Any value;
+        if (Arguments[i] >>= v1) {
+            name = v1.Name;
+            value = v1.Value;
+        } else if (Arguments[i] >>= v2) {
+            name = v2.Name;
+            value = v2.Value;
+        } else if (Arguments.getLength() == 1 && (Arguments[i] >>= nodepath)) {
+            // For backwards compatibility, allow a single string argument that
+            // denotes nodepath.
+            if (nodepath.getLength() == 0) {
+                badNodePath();
+            }
+            break;
+        } else {
+            throw css::uno::Exception(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.ConfigurationProvider"
+                        " expects NamedValue or PropertyValue arguments")),
+                0);
+        }
+        // For backwards compatibility, allow "nodepath" and "Locale" in any
+        // case:
+        if (name.equalsIgnoreAsciiCaseAsciiL(
+                RTL_CONSTASCII_STRINGPARAM("nodepath")))
+        {
+            if (nodepath.getLength() != 0 || !(value >>= nodepath) ||
+                nodepath.getLength() == 0)
+            {
+                badNodePath();
+            }
+        } else if (name.equalsIgnoreAsciiCaseAsciiL(
+                       RTL_CONSTASCII_STRINGPARAM("locale")))
+        {
+            if (locale.getLength() != 0 || !(value >>= locale) ||
+                locale.getLength() == 0)
+            {
+                throw css::uno::Exception(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationProvider"
+                            " expects at most one, non-empty, string Locale"
+                            " argument")),
+                    0);
+            }
+        }
+    }
+    if (nodepath.getLength() == 0) {
+        badNodePath();
+    }
+    // For backwards compatibility, allow a notepath that misses the leading
+    // slash:
+    if (nodepath[0] != '/') {
+        nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;
+    }
+    if (locale.getLength() == 0) {
+        //TODO: should the Access use the dynamically changing locale_ instead?
+        locale = locale_;
+        if (locale.getLength() == 0) {
+            locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+        }
+    }
+    bool update;
+    if (ServiceSpecifier.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM(accessServiceName)))
+    {
+        update = false;
+    } else if (ServiceSpecifier.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM(updateAccessServiceName)))
+    {
+        update = true;
+    } else {
+        throw css::uno::Exception(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationProvider does not"
+                    " support service ")) +
+             ServiceSpecifier),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    osl::MutexGuard guard(lock);
+    Components::initSingleton(context_);
+    Components & components = Components::getSingleton();
+    rtl::Reference< RootAccess > root(
+        new RootAccess(components, nodepath, locale, update));
+    if (root->isValue()) {
+        throw css::uno::Exception(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationProvider: there is"
+                    " a leaf value at nodepath ")) +
+             nodepath),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    components.addRootAccess(root);
+    return static_cast< cppu::OWeakObject * >(root.get());
+}
+
+css::uno::Sequence< rtl::OUString > Service::getAvailableServiceNames()
+    throw (css::uno::RuntimeException)
+{
+    css::uno::Sequence< rtl::OUString > names(2);
+    names[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(accessServiceName));
+    names[1] = rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(updateAccessServiceName));
+    return names;
+}
+
+void Service::refresh() throw (css::uno::RuntimeException) {
+    //TODO
+    cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
+        cppu::UnoType< css::util::XRefreshListener >::get());
+    if (cont != 0) {
+        css::lang::EventObject ev(static_cast< cppu::OWeakObject * >(this));
+        cont->notifyEach(&css::util::XRefreshListener::refreshed, ev);
+    }
+}
+
+void Service::addRefreshListener(
+    css::uno::Reference< css::util::XRefreshListener > const & l)
+    throw (css::uno::RuntimeException)
+{
+    rBHelper.addListener(
+        cppu::UnoType< css::util::XRefreshListener >::get(), l);
+}
+
+void Service::removeRefreshListener(
+    css::uno::Reference< css::util::XRefreshListener > const & l)
+    throw (css::uno::RuntimeException)
+{
+    rBHelper.removeListener(
+        cppu::UnoType< css::util::XRefreshListener >::get(), l);
+}
+
+void Service::flush() throw (css::uno::RuntimeException) {
+    //TODO
+    cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
+        cppu::UnoType< css::util::XFlushListener >::get());
+    if (cont != 0) {
+        css::lang::EventObject ev(static_cast< cppu::OWeakObject * >(this));
+        cont->notifyEach(&css::util::XFlushListener::flushed, ev);
+    }
+}
+
+void Service::addFlushListener(
+    css::uno::Reference< css::util::XFlushListener > const & l)
+    throw (css::uno::RuntimeException)
+{
+    rBHelper.addListener(cppu::UnoType< css::util::XFlushListener >::get(), l);
+}
+
+void Service::removeFlushListener(
+    css::uno::Reference< css::util::XFlushListener > const & l)
+    throw (css::uno::RuntimeException)
+{
+    rBHelper.removeListener(
+        cppu::UnoType< css::util::XFlushListener >::get(), l);
+}
+
+void Service::setLocale(css::lang::Locale const & eLocale)
+    throw (css::uno::RuntimeException)
+{
+    osl::MutexGuard guard(lock);
+    locale_ = comphelper::Locale(
+        eLocale.Language, eLocale.Country, eLocale.Variant).toISO();
+}
+
+css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
+    osl::MutexGuard guard(lock);
+    css::lang::Locale loc;
+    if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {
+        loc.Language = locale_;
+    } else if (locale_.getLength() != 0) {
+        try {
+            comphelper::Locale l(locale_);
+            loc.Language = l.getLanguage();
+            loc.Country = l.getCountry();
+            loc.Variant = l.getVariant();
+        } catch (comphelper::Locale::MalFormedLocaleException & e) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("MalformedLocaleException: ")) +
+                 e.Message),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+    }
+    return loc;
+}
+
+class Factory:
+    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    private boost::noncopyable
+{
+public:
+    Factory() {}
+
+private:
+    virtual ~Factory() {}
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithContext(
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any > const & Arguments,
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+};
+
+css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    return createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any >(), Context);
+}
+
+css::uno::Reference< css::uno::XInterface >
+Factory::createInstanceWithArgumentsAndContext(
+    css::uno::Sequence< css::uno::Any > const & Arguments,
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    if (Arguments.getLength() == 0) {
+        css::uno::Reference< css::uno::XInterface > instance;
+        if (!(Context->getValueByName(
+                  rtl::OUString(
+                      RTL_CONSTASCII_USTRINGPARAM(
+                          "/singletons/"
+                          "com.sun.star.configuration.theDefaultProvider")))
+              >>= instance) ||
+            !instance.is())
+        {
+            throw css::uno::DeploymentException(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "component context fails to supply singleton"
+                        " com.sun.star.configuration.theDefaultProvider")),
+                Context);
+        }
+        return instance;
+    } else {
+        rtl::OUString locale;
+        for (sal_Int32 i = 0; i < Arguments.getLength(); ++i) {
+            css::beans::NamedValue v1;
+            css::beans::PropertyValue v2;
+            rtl::OUString name;
+            css::uno::Any value;
+            if (Arguments[i] >>= v1) {
+                name = v1.Name;
+                value = v1.Value;
+            } else if (Arguments[i] >>= v2) {
+                name = v2.Name;
+                value = v2.Value;
+            } else {
+                throw css::uno::Exception(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationProvider"
+                            " factory expects NamedValue or PropertyValue"
+                            " arguments")),
+                    0);
+            }
+            // For backwards compatibility, allow "Locale" in any case:
+            if (name.equalsIgnoreAsciiCaseAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("locale")))
+            {
+                if (locale.getLength() != 0 || !(value >>= locale) ||
+                    locale.getLength() == 0)
+                {
+                    throw css::uno::Exception(
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.configuration."
+                                "ConfigurationProvider factory expects at most"
+                                " one, non-empty, string Locale argument")),
+                        0);
+                }
+            } else {
+                //TODO
+                throw css::uno::Exception(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationProvider"
+                            " factory: unknown argument ")) + name,
+                    0);
+            }
+        }
+        return static_cast< cppu::OWeakObject * >(new Service(Context, locale));
+    }
+}
+
+}
+
+css::uno::Reference< css::uno::XInterface > createDefault(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
+{
+    return static_cast< cppu::OWeakObject * >(
+        new Service(context, rtl::OUString()));
+}
+
+rtl::OUString getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.ConfigurationProvider"));
+}
+
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.ConfigurationProvider"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::lang::XSingleComponentFactory >
+createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(())
+{
+    return new Factory;
+}
+
+} }
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
new file mode 100644
index 0000000000..4a8c383837
--- /dev/null
+++ b/configmgr/source/configurationprovider.hxx
@@ -0,0 +1,67 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_CONFIGURATIONPROVIDER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_CONFIGURATIONPROVIDER_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppuhelper/factory.hxx"
+#include "rtl/unload.h"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star {
+    namespace lang { class XSingleComponentFactory; }
+    namespace uno {
+        class XComponentContext;
+        class XInterface;
+    }
+} } }
+namespace rtl { class OUString; }
+
+namespace configmgr { namespace configuration_provider {
+
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createDefault(
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        const & context);
+
+rtl::OUString SAL_CALL getImplementationName();
+
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+getSupportedServiceNames();
+
+com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+SAL_CALL createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(());
+
+} }
+
+#endif
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
new file mode 100644
index 0000000000..ffd7174c0a
--- /dev/null
+++ b/configmgr/source/configurationregistry.cxx
@@ -0,0 +1,950 @@
+/*************************************************************************
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/Property.hpp"
+#include "com/sun/star/beans/XProperty.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/registry/InvalidRegistryException.hpp"
+#include "com/sun/star/registry/InvalidValueException.hpp"
+#include "com/sun/star/registry/MergeConflictException.hpp"
+#include "com/sun/star/registry/RegistryKeyType.hpp"
+#include "com/sun/star/registry/RegistryValueType.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/TypeClass.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "cppu/unotype.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "osl/mutex.hxx"
+#include "rtl/unload.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "configurationregistry.hxx"
+
+namespace com { namespace sun { namespace star { namespace util {
+    class XFlushListener;
+} } } }
+
+namespace configmgr { namespace configuration_registry {
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Service:
+    public cppu::WeakImplHelper3<
+        css::lang::XServiceInfo, css::registry::XSimpleRegistry,
+        css::util::XFlushable >,
+    private boost::noncopyable
+{
+public:
+    Service(css::uno::Reference< css::uno::XComponentContext > const & context);
+
+private:
+    virtual ~Service() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return configuration_registry::getImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return configuration_registry::getSupportedServiceNames(); }
+
+    virtual rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL open(
+        rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL close()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual void SAL_CALL destroy()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
+    getRootKey()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL mergeKey(rtl::OUString const &, rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::MergeConflictException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL flush() throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL addFlushListener(
+        css::uno::Reference< css::util::XFlushListener > const &)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL removeFlushListener(
+        css::uno::Reference< css::util::XFlushListener > const &)
+        throw (css::uno::RuntimeException);
+
+    void checkValid();
+
+    void checkValid_RuntimeException();
+
+    void doClose();
+
+    css::uno::Reference< css::lang::XMultiServiceFactory > provider_;
+    osl::Mutex mutex_;
+    css::uno::Reference< css::uno::XInterface > access_;
+    rtl::OUString url_;
+    bool readOnly_;
+
+    friend class RegistryKey;
+};
+
+class RegistryKey:
+    public cppu::WeakImplHelper1< css::registry::XRegistryKey >,
+    private boost::noncopyable
+{
+public:
+    RegistryKey(Service & service, css::uno::Any const & value):
+        service_(service), value_(value) {}
+
+private:
+    virtual ~RegistryKey() {}
+
+    virtual rtl::OUString SAL_CALL getKeyName()
+        throw (css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL isReadOnly()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException);
+
+    virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
+        rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::registry::RegistryValueType SAL_CALL getValueType()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getLongValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setLongValue(sal_Int32)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setLongListValue(
+        css::uno::Sequence< sal_Int32 > const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getAsciiValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setAsciiValue(rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAsciiListValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setAsciiListValue(
+        css::uno::Sequence< rtl::OUString > const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getStringValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setStringValue(rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getStringListValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setStringListValue(
+        css::uno::Sequence< rtl::OUString > const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::registry::InvalidValueException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
+        rtl::OUString const & aKeyName)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
+    createKey(rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual void SAL_CALL closeKey()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual void SAL_CALL deleteKey(rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual
+    css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
+    SAL_CALL openKeys()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getKeyNames()
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL createLink(
+        rtl::OUString const &, rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual void SAL_CALL deleteLink(rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getLinkTarget(rtl::OUString const &)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    virtual rtl::OUString SAL_CALL getResolvedName(
+        rtl::OUString const & aKeyName)
+        throw (
+            css::registry::InvalidRegistryException,
+            css::uno::RuntimeException);
+
+    Service & service_;
+    css::uno::Any value_;
+};
+
+Service::Service(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
+{
+    OSL_ASSERT(context.is());
+    try {
+        provider_ = css::uno::Reference< css::lang::XMultiServiceFactory >(
+            (css::uno::Reference< css::lang::XMultiComponentFactory >(
+                context->getServiceManager(), css::uno::UNO_SET_THROW)->
+             createInstanceWithContext(
+                 rtl::OUString(
+                     RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.configuration.DefaultProvider")),
+                 context)),
+            css::uno::UNO_QUERY_THROW);
+    } catch (css::uno::RuntimeException &) {
+        throw;
+    } catch (css::uno::Exception & e) {
+        throw css::uno::DeploymentException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "component context fails to supply service"
+                    " com.sun.star.configuration.DefaultProvider of type"
+                    " com.sun.star.lang.XMultiServiceFactory: ")) +
+             e.Message),
+            context);
+    }
+}
+
+rtl::OUString Service::getURL() throw (css::uno::RuntimeException) {
+    osl::MutexGuard g(mutex_);
+    checkValid_RuntimeException();
+    return url_;
+}
+
+void Service::open(rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    //TODO: bCreate
+    osl::MutexGuard g(mutex_);
+    if (access_.is()) {
+        doClose();
+    }
+    css::uno::Sequence< css::uno::Any > args(1);
+    args[0] <<= css::beans::NamedValue(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+        css::uno::makeAny(rURL));
+    try {
+        access_ = provider_->createInstanceWithArguments(
+            (bReadOnly
+             ? rtl::OUString(
+                 RTL_CONSTASCII_USTRINGPARAM(
+                     "com.sun.star.configuration.ConfigurationAccess"))
+             : rtl::OUString(
+                 RTL_CONSTASCII_USTRINGPARAM(
+                     "com.sun.star.configuration.ConfigurationUpdateAccess"))),
+            args);
+    } catch (css::uno::RuntimeException &) {
+        throw;
+    } catch (css::uno::Exception & e) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationRegistry: open"
+                    " failed: ")) +
+             e.Message),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    url_ = rURL;
+    readOnly_ = bReadOnly;
+}
+
+sal_Bool Service::isValid() throw (css::uno::RuntimeException) {
+    osl::MutexGuard g(mutex_);
+    return access_.is();
+}
+
+void Service::close()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(mutex_);
+    checkValid();
+    doClose();
+}
+
+void Service::destroy()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(mutex_);
+    checkValid();
+    return new RegistryKey(*this, css::uno::makeAny(access_));
+}
+
+sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException) {
+    osl::MutexGuard g(mutex_);
+    checkValid_RuntimeException();
+    return readOnly_;
+}
+
+void Service::mergeKey(rtl::OUString const &, rtl::OUString const &)
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::MergeConflictException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void Service::flush() throw (css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void Service::addFlushListener(
+    css::uno::Reference< css::util::XFlushListener > const &)
+    throw (css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void Service::removeFlushListener(
+    css::uno::Reference< css::util::XFlushListener > const &)
+    throw (css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void Service::checkValid() {
+    if (!access_.is()) {
+        throw css::registry::InvalidRegistryException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationRegistry: not"
+                    " valid")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+}
+
+void Service::checkValid_RuntimeException() {
+    if (!access_.is()) {
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationRegistry: not"
+                    " valid")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+}
+
+void Service::doClose() {
+    access_.clear();
+}
+
+rtl::OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) {
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+    css::uno::Reference< css::container::XNamed > named;
+    if (value_ >>= named) {
+        return named->getName();
+    }
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+sal_Bool RegistryKey::isReadOnly()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+    return service_.readOnly_; //TODO: read-only sub-nodes in update access?
+}
+
+sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException) {
+    return service_.isValid();
+}
+
+css::registry::RegistryKeyType RegistryKey::getKeyType(rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    return css::registry::RegistryKeyType_KEY;
+}
+
+css::registry::RegistryValueType RegistryKey::getValueType()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    css::uno::Type t(value_.getValueType());
+    switch (t.getTypeClass()) {
+    case css::uno::TypeClass_LONG:
+        return css::registry::RegistryValueType_LONG;
+    case css::uno::TypeClass_STRING:
+        return css::registry::RegistryValueType_STRING;
+    case css::uno::TypeClass_SEQUENCE:
+        if (t == cppu::UnoType< css::uno::Sequence< sal_Int8 > >::get()) {
+            return css::registry::RegistryValueType_BINARY;
+        } else if (t == cppu::UnoType< css::uno::Sequence< sal_Int32 > >::get())
+        {
+            return css::registry::RegistryValueType_LONGLIST;
+        } else if (t ==
+                   cppu::UnoType< css::uno::Sequence< rtl::OUString > >::get())
+        {
+            return css::registry::RegistryValueType_STRINGLIST;
+        }
+        // fall through
+    default:
+        return css::registry::RegistryValueType_NOT_DEFINED;
+    }
+}
+
+sal_Int32 RegistryKey::getLongValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    sal_Int32 v = 0;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setLongValue(sal_Int32)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    css::uno::Sequence< sal_Int32 > v;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+rtl::OUString RegistryKey::getAsciiValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    rtl::OUString v;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setAsciiValue(rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Sequence< rtl::OUString > RegistryKey::getAsciiListValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    css::uno::Sequence< rtl::OUString > v;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setAsciiListValue(css::uno::Sequence< rtl::OUString > const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+rtl::OUString RegistryKey::getStringValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    rtl::OUString v;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setStringValue(rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Sequence< rtl::OUString > RegistryKey::getStringListValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    css::uno::Sequence< rtl::OUString > v;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setStringListValue(
+    css::uno::Sequence< rtl::OUString > const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
+    throw (
+        css::registry::InvalidRegistryException,
+        css::registry::InvalidValueException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid();
+    css::uno::Sequence< sal_Int8 > v;
+    if (value_ >>= v) {
+        return v;
+    }
+    throw css::registry::InvalidValueException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
+    rtl::OUString const & aKeyName)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+    css::uno::Reference< css::container::XHierarchicalNameAccess > access;
+    if (value_ >>= access) {
+        try {
+            return new RegistryKey(
+                service_, access->getByHierarchicalName(aKeyName));
+        } catch (css::container::NoSuchElementException &) {}
+    }
+    return css::uno::Reference< css::registry::XRegistryKey >();
+}
+
+css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
+    rtl::OUString const &)
+    throw (
+        css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+void RegistryKey::closeKey()
+    throw (
+        css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+}
+
+void RegistryKey::deleteKey(rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
+RegistryKey::openKeys()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Sequence< rtl::OUString > RegistryKey::getKeyNames()
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    throw css::uno::RuntimeException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationRegistry: not"
+                " implemented")),
+        static_cast< cppu::OWeakObject * >(this));
+}
+
+sal_Bool RegistryKey::createLink(rtl::OUString const &, rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+    return false;
+}
+
+void RegistryKey::deleteLink(rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+}
+
+rtl::OUString RegistryKey::getLinkTarget(rtl::OUString const &)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+    return rtl::OUString();
+}
+
+rtl::OUString RegistryKey::getResolvedName(rtl::OUString const & aKeyName)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+{
+    osl::MutexGuard g(service_.mutex_);
+    service_.checkValid_RuntimeException();
+    return aKeyName;
+}
+
+class Factory:
+    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    private boost::noncopyable
+{
+public:
+    Factory() {}
+
+private:
+    virtual ~Factory() {}
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithContext(
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any > const & Arguments,
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+};
+
+css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    return createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any >(), Context);
+}
+
+css::uno::Reference< css::uno::XInterface >
+Factory::createInstanceWithArgumentsAndContext(
+    css::uno::Sequence< css::uno::Any > const & Arguments,
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    if (Arguments.getLength() != 0) {
+        throw css::uno::Exception(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationRegistry must be"
+                    " instantiated without arguments")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    return static_cast< cppu::OWeakObject * >(new Service(Context));
+}
+
+}
+
+rtl::OUString getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.ConfigurationRegistry"));
+}
+
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.ConfigurationRegistry"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(())
+{
+    return new Factory;
+}
+
+} }
diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx
new file mode 100644
index 0000000000..6cba122188
--- /dev/null
+++ b/configmgr/source/configurationregistry.hxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+* 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_CONFIGMGR_SOURCE_CONFIGURATIONREGISTRY_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_CONFIGURATIONREGISTRY_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppuhelper/factory.hxx"
+#include "rtl/unload.h"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace lang {
+    class XSingleComponentFactory;
+} } } }
+namespace rtl { class OUString; }
+
+namespace configmgr { namespace configuration_registry {
+
+rtl::OUString SAL_CALL getImplementationName();
+
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+getSupportedServiceNames();
+
+com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+SAL_CALL createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(());
+
+} }
+
+#endif
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
new file mode 100644
index 0000000000..5540a40fd5
--- /dev/null
+++ b/configmgr/source/data.cxx
@@ -0,0 +1,318 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <algorithm>
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "rtl/ref.hxx"
+#include "rtl/string.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "data.hxx"
+#include "groupnode.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "setnode.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+bool decode(
+    rtl::OUString const & encoded, sal_Int32 begin, sal_Int32 end,
+    rtl::OUString * decoded)
+{
+    OSL_ASSERT(
+        begin >= 0 && begin <= end && end <= encoded.getLength() &&
+        decoded != 0);
+    rtl::OUStringBuffer buf;
+    while (begin != end) {
+        sal_Unicode c = encoded[begin++];
+        if (c == '&') {
+            if (encoded.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("amp;"), begin))
+            {
+                buf.append(sal_Unicode('&'));
+                begin += RTL_CONSTASCII_LENGTH("amp;");
+            } else if (encoded.matchAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("quot;"), begin))
+            {
+                buf.append(sal_Unicode('"'));
+                begin += RTL_CONSTASCII_LENGTH("quot;");
+            } else if (encoded.matchAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("apos;"), begin))
+            {
+                buf.append(sal_Unicode('\''));
+                begin += RTL_CONSTASCII_LENGTH("apos;");
+            } else {
+                return false;
+            }
+            OSL_ASSERT(begin <= end);
+        } else {
+            buf.append(c);
+        }
+    }
+    *decoded = buf.makeStringAndClear();
+    return true;
+}
+
+}
+
+rtl::OUString Data::createSegment(
+    rtl::OUString const & templateName, rtl::OUString const & name)
+{
+    if (templateName.getLength() == 0) {
+        return name;
+    }
+    rtl::OUStringBuffer buf(templateName);
+        //TODO: verify template name contains no bad chars?
+    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("['"));
+    for (sal_Int32 i = 0; i < name.getLength(); ++i) {
+        sal_Unicode c = name[i];
+        switch (c) {
+        case '&':
+            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("&amp;"));
+            break;
+        case '"':
+            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("&quot;"));
+            break;
+        case '\'':
+            buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("&apos;"));
+            break;
+        default:
+            buf.append(c);
+            break;
+        }
+    }
+    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("']"));
+    return buf.makeStringAndClear();
+}
+
+sal_Int32 Data::parseSegment(
+    rtl::OUString const & path, sal_Int32 index, rtl::OUString * name,
+    bool * setElement, rtl::OUString * templateName)
+{
+    OSL_ASSERT(
+        index >= 0 && index <= path.getLength() && name != 0 &&
+        setElement != 0);
+    sal_Int32 i = index;
+    while (i < path.getLength() && path[i] != '/' && path[i] != '[') {
+        ++i;
+    }
+    if (i == path.getLength() || path[i] == '/') {
+        *name = path.copy(index, i - index);
+        *setElement = false;
+        return i;
+    }
+    if (templateName != 0) {
+        if (i - index == 1 && path[index] == '*') {
+            *templateName = rtl::OUString();
+        } else {
+            *templateName = path.copy(index, i - index);
+        }
+    }
+    if (++i == path.getLength()) {
+        return -1;
+    }
+    sal_Unicode del = path[i++];
+    if (del != '\'' && del != '"') {
+        return -1;
+    }
+    sal_Int32 j = path.indexOf(del, i);
+    if (j == -1 || j + 1 == path.getLength() || path[j + 1] != ']' ||
+        !decode(path, i, j, name))
+    {
+        return -1;
+    }
+    *setElement = true;
+    return j + 2;
+}
+
+rtl::OUString Data::fullTemplateName(
+    rtl::OUString const & component, rtl::OUString const & name)
+{
+    if (component.indexOf(':') != -1 || name.indexOf(':') != -1) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "bad component/name pair containing colon ")) +
+             component + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+             name),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::OUStringBuffer buf(component);
+    buf.append(sal_Unicode(':'));
+    buf.append(name);
+    return buf.makeStringAndClear();
+}
+
+bool Data::equalTemplateNames(
+    rtl::OUString const & shortName, rtl::OUString const & longName)
+{
+    if (shortName.indexOf(':') == -1) {
+        sal_Int32 i = longName.indexOf(':') + 1;
+        OSL_ASSERT(i > 0);
+        return
+            rtl_ustr_compare_WithLength(
+                shortName.getStr(), shortName.getLength(),
+                longName.getStr() + i, longName.getLength() - i) ==
+            0;
+    } else {
+        return shortName == longName;
+    }
+}
+
+rtl::Reference< Node > Data::findNode(
+    int layer, NodeMap const & map, rtl::OUString const & name)
+{
+    NodeMap::const_iterator i(map.find(name));
+    return i == map.end() || i->second->getLayer() > layer
+        ? rtl::Reference< Node >() : i->second;
+}
+
+rtl::Reference< Node > Data::resolvePathRepresentation(
+    rtl::OUString const & pathRepresentation, Path * path, int * finalizedLayer)
+    const
+{
+    if (pathRepresentation.getLength() == 0 || pathRepresentation[0] != '/') {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+             pathRepresentation),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::OUString seg;
+    bool setElement;
+    sal_Int32 n = parseSegment(pathRepresentation, 1, &seg, &setElement, 0);
+    if (n == -1 || setElement)
+    {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+             pathRepresentation),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    NodeMap::const_iterator i(components.find(seg));
+    if (path != 0) {
+        path->clear();
+    }
+    rtl::Reference< Node > parent;
+    int finalized = NO_LAYER;
+    for (rtl::Reference< Node > p(i == components.end() ? 0 : i->second);;) {
+        if (!p.is()) {
+            return p;
+        }
+        if (path != 0) {
+            path->push_back(seg);
+        }
+        finalized = std::min(finalized, p->getFinalized());
+        if (n != pathRepresentation.getLength() &&
+            pathRepresentation[n++] != '/')
+        {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+                 pathRepresentation),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        // for backwards compatibility, ignore a final slash
+        if (n == pathRepresentation.getLength()) {
+            if (finalizedLayer != 0) {
+                *finalizedLayer = finalized;
+            }
+            return p;
+        }
+        parent = p;
+        rtl::OUString templateName;
+        n = parseSegment(
+            pathRepresentation, n, &seg, &setElement, &templateName);
+        if (n == -1) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+                 pathRepresentation),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        // For backwards compatibility, allow set members to be accessed with
+        // simple path segments, like group members:
+        p = p->getMember(seg);
+        if (setElement) {
+            switch (parent->kind()) {
+            case Node::KIND_LOCALIZED_PROPERTY:
+                if (templateName.getLength() != 0) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+                         pathRepresentation),
+                    css::uno::Reference< css::uno::XInterface >());
+                }
+                break;
+            case Node::KIND_SET:
+                if (templateName.getLength() != 0 &&
+                    !dynamic_cast< SetNode * >(parent.get())->isValidTemplate(
+                        templateName))
+                {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+                         pathRepresentation),
+                    css::uno::Reference< css::uno::XInterface >());
+                }
+                break;
+            default:
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+                     pathRepresentation),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            if (templateName.getLength() != 0 && p != 0) {
+                OSL_ASSERT(p->getTemplateName().getLength() != 0);
+                if (!equalTemplateNames(templateName, p->getTemplateName())) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
+                         pathRepresentation),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+            }
+        }
+    }
+}
+
+rtl::Reference< Node > Data::getTemplate(
+    int layer, rtl::OUString const & fullName) const
+{
+    return findNode(layer, templates, fullName);
+}
+
+}
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
new file mode 100644
index 0000000000..495ca12338
--- /dev/null
+++ b/configmgr/source/data.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_DATA_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_DATA_HXX
+
+#include "sal/config.h"
+
+#include <climits>
+#include <vector>
+
+#include "boost/noncopyable.hpp"
+#include "rtl/ref.hxx"
+#include "sal/types.h"
+
+#include "modifications.hxx"
+#include "nodemap.hxx"
+#include "path.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Node;
+
+struct Data: private boost::noncopyable {
+    enum { NO_LAYER = INT_MAX };
+
+    NodeMap templates;
+
+    NodeMap components;
+
+    Modifications modifications;
+
+    static rtl::OUString createSegment(
+        rtl::OUString const & templateName, rtl::OUString const & name);
+
+    static sal_Int32 parseSegment(
+        rtl::OUString const & path, sal_Int32 index, rtl::OUString * name,
+        bool * setElement, rtl::OUString * templateName);
+
+    static rtl::OUString fullTemplateName(
+        rtl::OUString const & component, rtl::OUString const & name);
+
+    //TODO: better rules under which circumstances a short template name matches
+    static bool equalTemplateNames(
+        rtl::OUString const & shortName, rtl::OUString const & longName);
+
+    static rtl::Reference< Node > findNode(
+        int layer, NodeMap const & map, rtl::OUString const & name);
+
+    rtl::Reference< Node > resolvePathRepresentation(
+        rtl::OUString const & pathRepresentation, Path * path,
+        int * finalizedLayer) const;
+
+    rtl::Reference< Node > getTemplate(
+        int layer, rtl::OUString const & fullName) const;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/data/anydata.cxx b/configmgr/source/data/anydata.cxx
deleted file mode 100644
index e92b59faf3..0000000000
--- a/configmgr/source/data/anydata.cxx
+++ /dev/null
@@ -1,471 +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: anydata.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_configmgr.hxx"
-
-#include "anydata.hxx"
-#include "sequence.hxx"
-#include "flags.hxx"
-#include "typeconverter.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------	
-    namespace sharable
-    {
-//-----------------------------------------------------------------------------	
-        namespace Type = data::Type;
-        namespace uno = ::com::sun::star::uno;
-//-----------------------------------------------------------------------------	
-
-sal_uInt8 getTypeCode(uno::Type const & _aType)
-{
-    switch (_aType.getTypeClass())
-    {
-    case uno::TypeClass_ANY:
-    case uno::TypeClass_VOID:
-        return Type::value_any;
-
-    case uno::TypeClass_STRING:
-        return Type::value_string;
-
-    case uno::TypeClass_BOOLEAN:
-        return Type::value_boolean;
-
-    case uno::TypeClass_SHORT:
-        return Type::value_short;
-
-    case uno::TypeClass_LONG:
-        return Type::value_int;
-
-    case uno::TypeClass_HYPER:
-        return Type::value_long;
-
-    case uno::TypeClass_FLOAT:
-    case uno::TypeClass_DOUBLE:
-        return Type::value_double;
-
-    case uno::TypeClass_SEQUENCE:
-        {
-            uno::Type aElementType = getSequenceElementType(_aType);
-
-            if (aElementType.getTypeClass() == uno::TypeClass_BYTE)
-                return Type::value_binary;
-
-            OSL_ASSERT(aElementType != _aType); // would cause infinite recursion
-            sal_uInt8 aElementTC = getTypeCode(aElementType);
-
-            OSL_ASSERT(Type::value_invalid & Type::flag_sequence); // ensure check works for invalid types
-
-            if (aElementTC & Type::flag_sequence) // no sequence of sequence
-                return Type::value_invalid;
-            
-            return sal_uInt8( aElementTC | Type::flag_sequence );
-        }
-    default:
-        return Type::value_invalid;
-    }
-}
-//-----------------------------------------------------------------------------	
-
-static uno::Type getUnoSimpleType( sal_uInt8 _aSimpleType)
-{
-    OSL_ENSURE( _aSimpleType == (_aSimpleType & Type::mask_basetype), "Invalid type code" );
-
-    switch (_aSimpleType)
-    {
-    case Type::value_string:
-        return ::getCppuType(static_cast<rtl::OUString const *>(0));
-
-    case Type::value_boolean:
-        return ::getBooleanCppuType();
-
-    case Type::value_short:
-        return ::getCppuType(static_cast<sal_Int16 const *>(0));
-
-    case Type::value_int:
-        return ::getCppuType(static_cast<sal_Int32 const *>(0));
-
-    case Type::value_long:
-        return ::getCppuType(static_cast<sal_Int64 const *>(0));
-
-    case Type::value_double:
-        return ::getCppuType(static_cast<double const *>(0));
-
-    case Type::value_binary:
-        return ::getCppuType(static_cast<uno::Sequence<sal_Int8> const *>(0));
-
-    case Type::value_any:
-        //return ::getVoidCppuType();
-        return ::getCppuType(static_cast<uno::Any const *>(0));
-
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        return ::getVoidCppuType();      
-    }
-}
-//-----------------------------------------------------------------------------	
-
-static uno::Type getUnoSequenceType( sal_uInt8 _aSimpleType)
-{
-    OSL_ENSURE( _aSimpleType == (_aSimpleType & Type::mask_basetype), "Invalid type code" );
-
-    switch (_aSimpleType)
-    {
-    case Type::value_string:
-        return ::getCppuType(static_cast<uno::Sequence<rtl::OUString> const *>(0));
-
-    case Type::value_boolean:
-        return ::getCppuType(static_cast<uno::Sequence<sal_Bool> const *>(0));
-
-    case Type::value_short:
-        return ::getCppuType(static_cast<uno::Sequence<sal_Int16> const *>(0));
-
-    case Type::value_int:
-        return ::getCppuType(static_cast<uno::Sequence<sal_Int32> const *>(0));
-
-    case Type::value_long:
-        return ::getCppuType(static_cast<uno::Sequence<sal_Int64> const *>(0));
-
-    case Type::value_double:
-        return ::getCppuType(static_cast<uno::Sequence<double> const *>(0));
-
-    case Type::value_binary:
-        return ::getCppuType(static_cast<uno::Sequence<uno::Sequence<sal_Int8> > const *>(0));
-
-    case Type::value_any: // results from value_invalid
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        return ::getVoidCppuType();      
-    }
-}
-//-----------------------------------------------------------------------------	
-
-uno::Type getUnoType( sal_uInt8 _aType)
-{
-    OSL_ENSURE( _aType == (_aType & Type::mask_valuetype), "Invalid type code" );
-
-    if (_aType & Type::flag_sequence)
-        return getUnoSequenceType( sal_uInt8(_aType & Type::mask_basetype));
-
-    else
-        return getUnoSimpleType(_aType);
-}
-//-----------------------------------------------------------------------------	
-
-static
-AnyData allocSimpleData(sal_uInt8 _aSimpleType, uno::Any const & _aAny)
-{
-    OSL_ENSURE( _aSimpleType == (_aSimpleType & Type::mask_basetype), "Invalid type code" );
-
-    AnyData aResult;
-    aResult.data = 0;
-    
-    switch (_aSimpleType)
-    {
-    case Type::value_string:
-        {
-            rtl::OUString sValue;
-            OSL_VERIFY(_aAny >>= sValue );
-            aResult.stringValue = acquireString(sValue);
-        }
-        break;
-
-    case Type::value_boolean:
-        OSL_VERIFY(_aAny >>= aResult.boolValue );
-        break;
-
-    case Type::value_short:
-        OSL_VERIFY(_aAny >>= aResult.shortValue);
-        break;
-
-    case Type::value_int:
-        OSL_VERIFY(_aAny >>= aResult.intValue);
-        break;
-
-    case Type::value_long:
-        {
-            sal_Int64 nValue = 0;
-            OSL_VERIFY(_aAny >>= nValue);
-
-            aResult.longValue = new sal_Int64( nValue );
-        }
-        break;
-
-    case Type::value_double:
-        {
-            double dValue = 0;
-            OSL_VERIFY(_aAny >>= dValue);
-
-            aResult.doubleValue = new double( dValue );
-        }
-        break;
-
-    case Type::value_binary:
-        {
-            uno::Sequence<sal_Int8> aValue;
-            OSL_VERIFY(_aAny >>= aValue);
-            aResult.binaryValue = allocBinary(aValue);
-        }
-        break;
-
-    case Type::value_any: 
-        OSL_ENSURE( false, "Trying to allocate void value" );
-        break;      
-
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        break;      
-    }
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------	
-
-template <class E>
-inline
-sal_Sequence const * extractSequenceData(uno::Sequence< E > & _rSeq, uno::Any const & _aAny)
-{
-    if (_aAny >>= _rSeq)
-    {
-        return _rSeq.get();
-    }
-
-    else
-    {
-        OSL_ENSURE(false, "Could not extract sequence from Any");
-        return NULL;
-    }
-}
-//-----------------------------------------------------------------------------	
-
-static
-AnyData allocSequenceData(sal_uInt8 _aSimpleType, uno::Any const & _aAny)
-{
-    OSL_ENSURE( _aSimpleType == (_aSimpleType & Type::mask_basetype), "Invalid type code" );
-
-    sal_uInt8 * aSequence = 0;
-
-    switch (_aSimpleType)
-    {
-    case Type::value_string:
-        {
-            uno::Sequence<rtl::OUString> aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_boolean:
-        {
-            uno::Sequence<sal_Bool> aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_short:
-        {
-            uno::Sequence<sal_Int16> aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_int:
-        {
-            uno::Sequence<sal_Int32> aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_long:
-        {
-            uno::Sequence<sal_Int64> aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_double:
-        {
-            uno::Sequence<double> aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_binary:
-        {
-            uno::Sequence<uno::Sequence<sal_Int8> > aSeqValue;
-            if (sal_Sequence const * pData = extractSequenceData(aSeqValue,_aAny))
-                aSequence = allocSequence(_aSimpleType,pData);
-        }
-        break;
-
-    case Type::value_any: // results from value_invalid
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        break;      
-    }
-
-    AnyData aResult;
-    aResult.sequenceValue = aSequence;
-    return aResult;
-}
-//-----------------------------------------------------------------------------	
-
-AnyData allocData(sal_uInt8 _aType, uno::Any const & _aAny)
-{
-    OSL_ENSURE( _aType == (_aType & Type::mask_valuetype), "Invalid type code" );
-    OSL_ENSURE( _aType == getTypeCode(_aAny.getValueType()), "Type code does not match value" );
-
-    if (_aType & Type::flag_sequence)
-        return allocSequenceData(sal_uInt8( _aType & Type::mask_basetype),_aAny);
-    else
-        return allocSimpleData(_aType,_aAny);
-}
-//-----------------------------------------------------------------------------	
-
-static
-void freeSimpleData(sal_uInt8 _aSimpleType, AnyData const & _aData)
-{
-    OSL_ENSURE( _aSimpleType == (_aSimpleType & Type::mask_basetype), "Invalid type code" );
-
-    switch (_aSimpleType)
-    {
-    case Type::value_string:
-        rtl_uString_release(_aData.stringValue);
-        break;
-
-    case Type::value_boolean:
-    case Type::value_short:
-    case Type::value_int:
-        // nothing to do
-        break;
-
-        // free memory for oversized values
-    case Type::value_long:
-        delete _aData.longValue;
-        break;
-
-    case Type::value_double:
-        delete _aData.doubleValue;
-        break;
-
-    case Type::value_binary:
-        freeBinary(_aData.binaryValue);
-        break;
-
-    case Type::value_any: 
-        // nothing to do for void value
-        break;      
-
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        break;      
-    }
-}
-//-----------------------------------------------------------------------------	
-
-void    freeData(sal_uInt8 _aType, AnyData _aData)
-{
-    OSL_ENSURE( _aType == (_aType & Type::mask_valuetype), "Invalid type code" );
-
-    if (_aType & Type::flag_sequence)
-        freeSequence(sal_uInt8(_aType & Type::mask_basetype),_aData.sequenceValue);
-
-    else
-        freeSimpleData(_aType,_aData);
-}
-//-----------------------------------------------------------------------------	
-
-static
-uno::Any readSimpleData(sal_uInt8 _aSimpleType, AnyData const & _aData)
-{
-    OSL_ENSURE( _aSimpleType == (_aSimpleType & Type::mask_basetype), "Invalid type code" );
-
-    switch (_aSimpleType)
-    {
-    case Type::value_string:
-        {
-            rtl::OUString sValue = rtl::OUString(_aData.stringValue);
-            return uno::makeAny(sValue);
-        }
-
-    case Type::value_boolean:
-        return uno::makeAny( _aData.boolValue );
-
-    case Type::value_short:
-        return uno::makeAny( _aData.shortValue );
-
-    case Type::value_int:
-        return uno::makeAny( _aData.intValue );
-
-    case Type::value_long:
-    return uno::makeAny( *_aData.longValue );
-
-    case Type::value_double:
-    return uno::makeAny( *_aData.doubleValue );
-
-    case Type::value_binary:
-        {
-            uno::Sequence<sal_Int8> aValue = readBinary( _aData.binaryValue );
-            return uno::makeAny( aValue );
-        }
-
-    case Type::value_any: // void value
-        return uno::Any();      
-
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        return uno::Any();      
-    }
-}
-//-----------------------------------------------------------------------------	
-
-uno::Any readData(sal_uInt8 _aType, AnyData _aData)
-{
-    OSL_ENSURE( _aType == (_aType & Type::mask_valuetype), "Invalid type code" );
-
-    if (_aType & Type::flag_sequence)
-        return readAnySequence(sal_uInt8(_aType & Type::mask_basetype),_aData.sequenceValue);
-
-    else
-        return readSimpleData(_aType,_aData);
-}
-
-//-----------------------------------------------------------------------------	
-    }
-//-----------------------------------------------------------------------------	
-} // namespace
- 
diff --git a/configmgr/source/data/sequence.cxx b/configmgr/source/data/sequence.cxx
deleted file mode 100644
index dfcd4c39b8..0000000000
--- a/configmgr/source/data/sequence.cxx
+++ /dev/null
@@ -1,493 +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: sequence.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_configmgr.hxx"
-
-#include "datalock.hxx"
-#include "sequence.hxx"
-#include "flags.hxx"
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-
-#ifndef INCLUDED_STRING_H
-#include <string.h>
-#define INCLUDED_STRING_H
-#endif
-
-#include "utility.hxx"
-
-#ifndef SIMPLE_REFERENCE_FAST
-#  include <stdio.h>
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------	
-    namespace sharable
-    {
-//-----------------------------------------------------------------------------	
-        namespace Type = data::Type;
-        namespace uno = ::com::sun::star::uno;
-//-----------------------------------------------------------------------------	
-static 
-sal_uInt32 implGetElementSize(sal_uInt8 _aElementType)
-{
-    OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-    switch (_aElementType)
-    {
-
-    case Type::value_boolean:   return sizeof(sal_Bool);
-
-    case Type::value_short:     return sizeof(sal_Int16);
-
-    case Type::value_int:       return sizeof(sal_Int32);
-
-    case Type::value_long:      return sizeof(sal_Int64);
-
-    case Type::value_double:    return sizeof(double);
-
-    case Type::value_string:    return sizeof(rtl_uString *);
-
-    case Type::value_binary:    return sizeof(sal_uInt8 *);
-
-    case Type::value_any: // results from value_invalid
-    default:
-        OSL_ENSURE( false, "Invalid type code" );
-        return 0;      
-    }
-}
-
-//-----------------------------------------------------------------------------	
-static inline
-sal_uInt32 implGetHeaderSize(sal_uInt32 _nElemSize)
-{
-    // pad header to elem size, if larger (for safe alignment)
-    OSL_ASSERT(_nElemSize > sizeof(sal_Int32) || sizeof(sal_Int32)  % _nElemSize== 0);
-    return _nElemSize > sizeof(sal_Int32) ? _nElemSize : sizeof(sal_Int32);
-}
-
-//-----------------------------------------------------------------------------	
-static 
-inline
-sal_Int32& implGetSize(sal_uInt8 * _aSeq)
-{
-    return * (sal_Int32 *) _aSeq;
-}
-
-//-----------------------------------------------------------------------------	
-static 
-sal_uInt8 * implSeqAlloc(sal_Int32 _nElements, sal_uInt32 _nElemSize)
-{
-    sal_uInt32 nTotalSize = implGetHeaderSize(_nElemSize) + _nElements * _nElemSize;
-
-    sal_uInt8 * aResult = (sal_uInt8 *) (new sal_uInt8[nTotalSize]);
-
-    implGetSize(aResult) = _nElements;
-
-    return aResult;
-}
-
-//-----------------------------------------------------------------------------	
-
-static
-void allocSeqData(sal_uInt8 *_pDestAddr, 
-                 sal_uInt8 _aElementType, 
-                 sal_Int32 _nElements, sal_uInt32 _nElementSize, 
-                 void const * _pSourceData)
-{
-    OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-    OSL_ASSERT(_nElementSize == implGetElementSize(_aElementType));
-    switch (_aElementType)
-    {
-    case Type::value_boolean:
-    case Type::value_short:
-    case Type::value_int:
-    case Type::value_long:
-    case Type::value_double:
-        ::memcpy(_pDestAddr,_pSourceData,_nElements * _nElementSize);
-        break;
-
-    case Type::value_string: 
-        {
-            OSL_ASSERT(_nElementSize == sizeof(rtl_uString *));
-
-            rtl::OUString const * pSource = static_cast<rtl::OUString const *>(_pSourceData);
-
-            while (--_nElements >= 0)
-            {
-                rtl_uString * aElement = acquireString(*pSource);
-
-                rtl_uString * * pDest = reinterpret_cast<rtl_uString **>(_pDestAddr);
-                *pDest = aElement;
-                
-                ++pSource;
-                _pDestAddr += sizeof *pDest;
-            }
-        }
-        break;
-
-    case Type::value_binary:
-        {
-            OSL_ASSERT(_nElementSize == sizeof(sal_uInt8 *));
-
-            uno::Sequence< sal_Int8 > const * pSource = static_cast<uno::Sequence< sal_Int8 > const *>(_pSourceData);
-
-            while (--_nElements >= 0)
-            {
-                sal_uInt8 * aElement = allocBinary(*pSource);
-
-                sal_uInt8 * * pDest = (sal_uInt8 * *) _pDestAddr;
-                *pDest = aElement;
-                
-                ++pSource;
-                _pDestAddr += sizeof *pDest;
-            }
-        }
-        break;
-
-    case Type::value_any:
-    default:
-        OSL_ENSURE(false, "Invalid element type");
-        break;
-    }
-}
-
-//-----------------------------------------------------------------------------	
-sal_uInt8 * allocSequence(sal_uInt8 _aElementType, ::sal_Sequence const * _pSeqData)
-{
-    OSL_ENSURE(_aElementType == (_aElementType & Type::mask_valuetype), "Invalid type code");
-
-    OSL_ENSURE(_pSeqData, "ERROR: Trying to allocate from a NULL sequence");
-    if (_pSeqData == NULL) return 0;
-
-    // OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-    _aElementType &= Type::mask_basetype;
-
-    sal_uInt32 const nElementSize = implGetElementSize(_aElementType);
-    sal_Int32  const nElements = _pSeqData->nElements;
-
-    sal_uInt8 * aResult = implSeqAlloc(nElements,nElementSize);
-
-    if (aResult)
-        allocSeqData( aResult + implGetHeaderSize(nElementSize), 
-                        _aElementType, nElements, nElementSize,
-                        _pSeqData->elements);
-
-    return aResult;
-}
-
-//-----------------------------------------------------------------------------	
-sal_uInt8 * allocBinary(uno::Sequence<sal_Int8> const & _aBinaryValue)
-{
-    sal_uInt32 const nElementSize = 1;
-    sal_Int32  const nLength = _aBinaryValue.getLength();
-
-    sal_uInt8 * aResult = implSeqAlloc(nLength,nElementSize);
-
-    if (aResult)
-    {
-        sal_uInt8 *pElementBaseAddr = aResult + implGetHeaderSize(nElementSize);
-        ::memcpy(pElementBaseAddr, _aBinaryValue.getConstArray(), nLength);
-    }
-
-    return aResult;
-}
-
-//-----------------------------------------------------------------------------	
-static
-void freeSeqData(sal_uInt8 *_pDataAddr, 
-                 sal_uInt8 _aElementType, sal_Int32 _nElements)
-{
-    OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-
-    switch (_aElementType)
-    {
-    case Type::value_boolean:
-    case Type::value_short:
-    case Type::value_int:
-    case Type::value_long:
-    case Type::value_double:
-        // nothing to do
-        break;
-
-    case Type::value_string: 
-        {
-            rtl_uString * * pElements = reinterpret_cast<rtl_uString **>( _pDataAddr );
-
-            for (sal_Int32 i = 0; i < _nElements; ++i)
-            {
-                rtl_uString_release(pElements[i]);
-            }
-        }
-        break;
-
-    case Type::value_binary:
-        {
-            sal_uInt8 * * pElements = reinterpret_cast<sal_uInt8 **>( _pDataAddr );
-
-            for (sal_Int32 i = 0; i < _nElements; ++i)
-            {
-                freeBinary(pElements[i]);
-            }
-        }
-        break;
-
-    case Type::value_any:
-    default:
-        OSL_ENSURE(false, "Invalid element type");
-        break;
-    }
-}
-
-//-----------------------------------------------------------------------------	
-void freeSequence(sal_uInt8 _aElementType, sal_uInt8 * _aSeq)
-{
-    OSL_ENSURE(_aElementType == (_aElementType & Type::mask_valuetype), "Invalid type code");
-
-    OSL_ENSURE(_aSeq, "ERROR: Trying to free a NULL sequence");
-    if (_aSeq == 0) return;
-
-    // OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-    _aElementType &= Type::mask_basetype;
-
-    sal_uInt32 nHeaderSize = implGetHeaderSize( implGetElementSize( _aElementType ) );
-
-    freeSeqData(_aSeq + nHeaderSize, _aElementType, implGetSize(_aSeq));
-
-    delete[] (sal_uInt8 *)_aSeq;
-}
-
-//-----------------------------------------------------------------------------	
-void freeBinary(sal_uInt8 * _aSeq)
-{
-    OSL_ENSURE(_aSeq, "ERROR: Trying to free a NULL sequence");
-    if (_aSeq == 0) return;
-
-    delete[] (sal_uInt8 *)_aSeq;
-}
-
-//-----------------------------------------------------------------------------	
-
-static inline
-sal_Sequence * implCreateSequence(void const * _pElements, sal_uInt8 _aElementType, sal_Int32 _nElements)
-{
-    uno::Type aUnoType = getUnoType( sal_uInt8( _aElementType | Type::flag_sequence ));
-    
-    sal_Sequence * pResult = NULL;
-    ::uno_type_sequence_construct( &pResult, aUnoType.getTypeLibType(),
-                                    const_cast< void * >( _pElements ), 
-                                    _nElements, NULL );
-
-    OSL_ASSERT(pResult->nRefCount == 1);
-    return pResult;
-}
-
-//-----------------------------------------------------------------------------	
-static
-sal_Sequence * readSeqData(sal_uInt8 *_pDataAddr, sal_uInt8 _aElementType, sal_Int32 _nElements)
-{
-    OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-
-    void const * pElementData = (void const *)_pDataAddr;
-    switch (_aElementType)
-    {
-    case Type::value_boolean:
-    case Type::value_short:
-    case Type::value_int:
-    case Type::value_long:
-    case Type::value_double:
-        return implCreateSequence(pElementData,_aElementType,_nElements);
-
-    case Type::value_string: 
-        {
-            uno::Sequence<rtl::OUString> aResult(_nElements);
-            rtl::OUString * pResult = aResult.getArray();
-
-            rtl_uString * const * pElements = static_cast<rtl_uString * const *>( pElementData );
-
-            for (sal_Int32 i = 0; i < _nElements; ++i)
-            {
-                pResult[i] = rtl::OUString(pElements[i]);
-            }
-
-            sal_Sequence * pRet = aResult.get();
-            ++pRet->nRefCount;
-            return pRet;
-        }
-
-    case Type::value_binary:
-        {
-            uno::Sequence< uno::Sequence< sal_Int8 > > aResult(_nElements);
-            uno::Sequence< sal_Int8 > * pResult = aResult.getArray();
-
-            sal_uInt8 * const * pElements = static_cast<sal_uInt8 * const *>( pElementData );
-
-            for (sal_Int32 i = 0; i < _nElements; ++i)
-            {
-                pResult[i] = readBinary(pElements[i]);
-            }
-
-            sal_Sequence * pRet = aResult.get();
-            ++pRet->nRefCount;
-            return pRet;
-        }
-
-    case Type::value_any:
-    default:
-        OSL_ENSURE(false, "Invalid element type");
-        return NULL;
-    }
-}
-
-//-----------------------------------------------------------------------------	
-
-::sal_Sequence * readSequence(sal_uInt8 _aElementType, sal_uInt8 * _aSeq)
-{
-    OSL_ENSURE(_aElementType == (_aElementType & Type::mask_valuetype), "Invalid type code");
-
-    OSL_ENSURE(_aSeq, "ERROR: Trying to read from a NULL sequence");
-    if (_aSeq == 0) return NULL;
-
-    // OSL_ASSERT(_aElementType == (_aElementType & Type::mask_basetype));
-    _aElementType &= Type::mask_basetype;
-
-    sal_uInt32 nHeaderSize = implGetHeaderSize( implGetElementSize( _aElementType ) );
-
-    return readSeqData(_aSeq + nHeaderSize, _aElementType, implGetSize(_aSeq));
-}
-
-//-----------------------------------------------------------------------------	
-uno::Any readAnySequence(sal_uInt8 _aElementType, sal_uInt8 * _aSeq)
-{
-    sal_Sequence * pRawSequence = readSequence(_aElementType, _aSeq);
-
-    uno::Any aResult;
-
-    if (pRawSequence != NULL)
-        switch (_aElementType & Type::mask_basetype)
-        {
-        case Type::value_string:
-            {
-                uno::Sequence< rtl::OUString > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_boolean:
-            {
-                uno::Sequence< sal_Bool > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_short:
-            {
-                uno::Sequence< sal_Int16 > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_int:
-            {
-                uno::Sequence< sal_Int32 > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_long:
-            {
-                uno::Sequence< sal_Int64 > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_double:
-            {
-                uno::Sequence< double > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_binary:
-            {
-                uno::Sequence< uno::Sequence< sal_Int8 > > aSequence(pRawSequence,SAL_NO_ACQUIRE); 
-                aResult <<=aSequence ;
-            }
-            break;
-
-        case Type::value_any: // from value_invalid ??
-        default:
-            OSL_ENSURE( false, "Invalid type code" );
-            break;      
-        }
-
-    OSL_ASSERT(!aResult.hasValue() || aResult.getValueType() == getUnoType(sal_uInt8(_aElementType | Type::flag_sequence)));
-
-    return aResult;
-}
-
-//-----------------------------------------------------------------------------	
-uno::Sequence<sal_Int8> readBinary(sal_uInt8 * _aSeq)
-{
-    OSL_ENSURE(_aSeq, "ERROR: Trying to read from a NULL sequence");
-    if (_aSeq == 0) return uno::Sequence<sal_Int8>();
-
-    return uno::Sequence< sal_Int8 >((const sal_Int8 *)(_aSeq + implGetHeaderSize(1)),
-                     implGetSize(_aSeq));
-}
-
-//-----------------------------------------------------------------------------	
-    }
-//-----------------------------------------------------------------------------	
-} // namespace
-
-// Remaining 'global' mutex bits - should move to api2 ...
-namespace configmgr
-{
-    osl::Mutex UnoApiLock::aCoreLock;
-    volatile oslInterlockedCount UnoApiLock::nHeld = 0;
-
-    UnoApiLockReleaser::UnoApiLockReleaser()
-    {
-        mnCount = UnoApiLock::nHeld;
-        for (oslInterlockedCount i = 0; i < mnCount; i++)
-            UnoApiLock::release();
-    }
-
-    UnoApiLockReleaser::~UnoApiLockReleaser()
-    {
-        for (oslInterlockedCount i = 0; i < mnCount; i++)
-            UnoApiLock::acquire();
-    }
-} // namespace configmgr
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
new file mode 100644
index 0000000000..d069663290
--- /dev/null
+++ b/configmgr/source/defaultprovider.cxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/weak.hxx"
+#include "sal/types.h"
+#include "rtl/unload.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "configurationprovider.hxx"
+#include "lock.hxx"
+
+namespace configmgr { namespace default_provider {
+
+namespace {
+
+namespace css = com::sun::star;
+
+class Factory:
+    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    private boost::noncopyable
+{
+public:
+    Factory() {}
+
+private:
+    virtual ~Factory() {}
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithContext(
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any > const & Arguments,
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+};
+
+css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    return createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any >(), Context);
+}
+
+css::uno::Reference< css::uno::XInterface >
+Factory::createInstanceWithArgumentsAndContext(
+    css::uno::Sequence< css::uno::Any > const & Arguments,
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    if (Arguments.getLength() != 0) {
+        throw css::uno::Exception(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.DefaultProvider must be"
+                    " instantiated without arguments")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    osl::MutexGuard guard(lock);
+    static css::uno::Reference< css::uno::XInterface > singleton(
+        configuration_provider::createDefault(Context));
+    return singleton;
+}
+
+}
+
+rtl::OUString getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.DefaultProvider"));
+}
+
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.DefaultProvider"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::lang::XSingleComponentFactory >
+SAL_CALL createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(())
+{
+    return new Factory;
+}
+
+} }
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
new file mode 100644
index 0000000000..7b267a80b4
--- /dev/null
+++ b/configmgr/source/defaultprovider.hxx
@@ -0,0 +1,59 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_DEFAULTPROVIDER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_DEFAULTPROVIDER_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppuhelper/factory.hxx"
+#include "rtl/unload.h"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace lang {
+    class XSingleComponentFactory;
+} } } }
+namespace rtl { class OUString; }
+
+namespace configmgr { namespace default_provider {
+
+rtl::OUString SAL_CALL getImplementationName();
+
+com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+getSupportedServiceNames();
+
+com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+SAL_CALL createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(());
+
+} }
+
+#endif
diff --git a/configmgr/source/groupnode.cxx b/configmgr/source/groupnode.cxx
new file mode 100644
index 0000000000..60d825451d
--- /dev/null
+++ b/configmgr/source/groupnode.cxx
@@ -0,0 +1,88 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "data.hxx"
+#include "groupnode.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+
+namespace configmgr {
+
+GroupNode::GroupNode(
+    int layer, bool extensible, rtl::OUString const & templateName):
+    Node(layer), extensible_(extensible), templateName_(templateName),
+    mandatory_(Data::NO_LAYER)
+{}
+
+rtl::Reference< Node > GroupNode::clone() const {
+    return new GroupNode(*this);
+}
+
+NodeMap & GroupNode::getMembers() {
+    return members_;
+}
+
+rtl::OUString GroupNode::getTemplateName() const {
+    return templateName_;
+}
+
+void GroupNode::setMandatory(int layer) {
+    mandatory_ = layer;
+}
+
+int GroupNode::getMandatory() const {
+    return mandatory_;
+}
+
+bool GroupNode::isExtensible() const {
+    return extensible_;
+}
+
+GroupNode::GroupNode(GroupNode const & other):
+    Node(other), extensible_(other.extensible_),
+    templateName_(other.templateName_), mandatory_(other.mandatory_)
+{
+    cloneNodeMap(other.members_, &members_);
+}
+
+GroupNode::~GroupNode() {}
+
+Node::Kind GroupNode::kind() const {
+    return KIND_GROUP;
+}
+
+void GroupNode::clear() {
+    members_.clear();
+}
+
+}
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
new file mode 100644
index 0000000000..be4907b86c
--- /dev/null
+++ b/configmgr/source/groupnode.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_GROUPNODE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_GROUPNODE_HXX
+
+#include "sal/config.h"
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "node.hxx"
+#include "nodemap.hxx"
+
+namespace configmgr {
+
+class GroupNode: public Node {
+public:
+    GroupNode(int layer, bool extensible, rtl::OUString const & templateName);
+
+    virtual rtl::Reference< Node > clone() const;
+
+    virtual NodeMap & getMembers();
+
+    virtual rtl::OUString getTemplateName() const;
+
+    virtual void setMandatory(int layer);
+
+    virtual int getMandatory() const;
+
+    bool isExtensible() const;
+
+private:
+    GroupNode(GroupNode const & other);
+
+    virtual ~GroupNode();
+
+    virtual Kind kind() const;
+
+    virtual void clear();
+
+    bool extensible_;
+    NodeMap members_;
+    rtl::OUString templateName_;
+        // non-empty iff this node is a template, free node, or set member
+    int mandatory_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/inc/anydata.hxx b/configmgr/source/inc/anydata.hxx
deleted file mode 100644
index cc971949ff..0000000000
--- a/configmgr/source/inc/anydata.hxx
+++ /dev/null
@@ -1,81 +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: anydata.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 INCLUDED_SHARABLE_ANYDATA_HXX
-#define INCLUDED_SHARABLE_ANYDATA_HXX
-
-#include "rtl/ustring.h"
-#include "sal/types.h"
-
-//-----------------------------------------------------------------------------
-namespace com { namespace sun { namespace star { namespace uno {
-    class Any;
-    class Type;
-} } } }
-//-----------------------------------------------------------------------------
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-
-    namespace sharable
-    {
-    //-----------------------------------------------------------------------------
-
-        union AnyData
-        {
-            sal_Bool    boolValue;
-            sal_Int16   shortValue;
-            sal_Int32   intValue;
-            sal_Int64  *longValue;
-            double     *doubleValue;
-            sal_uInt8 *      binaryValue;    // points to counted sal_(u)Int8 []
-            rtl_uString *      stringValue;    // points to counted sal_Unicode []
-            sal_uInt8 *      sequenceValue;  // points to counted AnyData [] (or SomeType [] ?)
-            void       *data;           // used to initialize to 0
-        };
-
-    //-----------------------------------------------------------------------------
-
-        sal_uInt8 getTypeCode(::com::sun::star::uno::Type const & _aType);
-        ::com::sun::star::uno::Type getUnoType( sal_uInt8 _aType);
-
-        AnyData allocData(sal_uInt8 _aType, ::com::sun::star::uno::Any const & _aAny);
-        void    freeData(sal_uInt8 _aType, AnyData _aData);
-        ::com::sun::star::uno::Any readData(sal_uInt8 _aType, AnyData _aData);
-
-    //-----------------------------------------------------------------------------
-    } 
-//-----------------------------------------------------------------------------
-}
-
-
-#endif // INCLUDED_SHARABLE_ANYDATA_HXX
- 
diff --git a/configmgr/source/inc/anynoderef.hxx b/configmgr/source/inc/anynoderef.hxx
deleted file mode 100644
index 29683dad19..0000000000
--- a/configmgr/source/inc/anynoderef.hxx
+++ /dev/null
@@ -1,160 +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: anynoderef.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 CONFIGMGR_CONFIGANYNODE_HXX_
-#define CONFIGMGR_CONFIGANYNODE_HXX_
-
-#include "noderef.hxx"
-
-namespace configmgr
-{
-    namespace configapi { class Factory; }
-    namespace node { struct Attributes; }
-
-    namespace configuration
-    {
-    //-------------------------------------------------------------------------
-        class NodeRef;
-        class ValueRef;
-        class AnyNodeRef;
-        class NodeID;
-        class Tree;	
-    //-------------------------------------------------------------------------
-
-        /// represents any node in some tree
-        class AnyNodeRef
-        {
-        public:
-            /// constructs an empty (invalid) node
-            AnyNodeRef(); 
-
-            AnyNodeRef(unsigned int nParentPos, unsigned int m_nDepth);
-            AnyNodeRef(rtl::OUString const& aName, unsigned int nParentPos);
-
-            /// converts an inner node
-            explicit AnyNodeRef(NodeRef const& aInnerNode); 
-            /// converts a value node
-            explicit AnyNodeRef(ValueRef const& aValueNode); 
-
-            /// copy a node (with reference semantics)
-            AnyNodeRef(AnyNodeRef const& rOther); 
-            /// copy a node (with reference semantics)
-            AnyNodeRef& operator=(AnyNodeRef const& rOther); 
-
-            void swap(AnyNodeRef& rOther);
-
-            ~AnyNodeRef();
-            
-            /// checks, if this represents an existing node
-            inline bool isValid() const;
-
-            /// checks if this a node (rather than a value only)
-            bool isNode() const;
-
-            /// converts this, if it is a value
-            ValueRef toValue() const;
-
-            /// converts this, if it is a inner node
-            NodeRef toNode() const;
-
-#if OSL_DEBUG_LEVEL > 0
-            bool checkValidState() const;
-#endif
-
-            rtl::OUString m_sNodeName;
-            unsigned int	m_nUsedPos;
-            unsigned int	m_nDepth;
-        };
-    //-------------------------------------------------------------------------
-
-        /** checks whether there is an immediate child of <var>aNode</var> (which is in <var>aTree</var>)
-            specified by <var>aName</var>
-
-            @return 
-                <TRUE/> if the child node exists 
-                <FALSE/> otherwise
-        */
-        inline
-        bool hasChildOrElement(rtl::Reference< Tree > const& aTree, AnyNodeRef const& aNode, rtl::OUString const& aName)
-        { return aNode.isNode() && hasChildOrElement(aTree,aNode.toNode(),aName); }
-
-        /** tries to find the immediate child of <var>aNode</var> (which is in <var>aTree</var>)
-            specified by <var>aName</var>
-            <p>	On return <var>aNode</var> is modified to refer to the node found and
-                <var>aTree</var> will then refer to the tree that node is in.
-            <p/>
-
-            @return The requested child node, if it exists
-                (then <var>aTree</var> refers to the tree containing the desired node),
-        */
-        AnyNodeRef getChildOrElement(rtl::Reference< Tree > & aTree, NodeRef const& aParentNode, rtl::OUString const& aName);
-
-        /** tries to find the descendant of <var>aNode</var> specified by <var>aPath</var> within <var>aTree</var>
-            <p>	This function follows the given path stepwise, until a requested node is missing in the tree.</p>
-            <p>	On return <var>aNode</var> is modified to refer to the last inner node found 
-                and <var>aTree</var> will be unchanged (except for deprecated usage).
-            <p/>
-            <p>	Also, <var>aPath</var> is modified to contain the unresolved part of the original path.
-            </p>
-
-            @return the requested node, if the path could be resolved completely
-                (so <var>aNode</var> refers to the desired node or its parent,
-                and <var>aPath</var> is empty)<BR/>
-                an invalid node otherwise
-        */
-        AnyNodeRef getLocalDescendant(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, RelativePath const& aPath);
-
-        /** tries to find the descendant of <var>aNode</var> (which is in <var>aTree</var>) specified by <var>aPath</var>
-            <p>	This function follows the given path stepwise, until a requested node is missing in the tree.</p>
-            <p>	On return <var>aNode</var> is modified to refer to the last inner node found and
-                <var>aTree</var> will then refer to the tree that node is in.
-            <p/>
-            <p>	Also, <var>aPath</var> is modified to contain the unresolved part of the original path.
-            </p>
-
-            @return the requested node, if the path could be resolved completely
-                (so <var>aNode</var> and <var>aTree</var> refer to the desired node or its parent,
-                and <var>aPath</var> is empty)<BR/>
-                an invalid node otherwise
-        */
-        AnyNodeRef getDeepDescendant(rtl::Reference< Tree > & aTree, NodeRef& aNode, RelativePath& aPath);
-
-    //-------------------------------------------------------------------------
-        inline bool AnyNodeRef::isValid() const 
-        {
-            OSL_ASSERT( m_nUsedPos == 0 || checkValidState() ); 
-            return m_nUsedPos != 0;
-        }
-
-    //-------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGANYNODE_HXX_
diff --git a/configmgr/source/inc/anypair.hxx b/configmgr/source/inc/anypair.hxx
deleted file mode 100644
index 3694076385..0000000000
--- a/configmgr/source/inc/anypair.hxx
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef CFGMGR_ANYPAIR_HXX
-#define CFGMGR_ANYPAIR_HXX
-
-#include <uno/any2.h>
-#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-namespace configmgr
-{
-    namespace css  = com::sun::star;
-    namespace uno  = css::uno;
-    namespace lang = css::lang;
-    
-    //==========================================================================
-    //= flags for handling the state of an Anypair
-    //==========================================================================
-    enum { 
-        cfgmgr_SELECT_FIRST  = 0x01, 
-        cfgmgr_SELECT_SECOND = 0x02, 
-        cfgmgr_SELECT_BOTH = cfgmgr_SELECT_FIRST | cfgmgr_SELECT_SECOND
-    };
-
-    //==========================================================================
-    //= data structure for descriptive data for an AnyPair
-    //==========================================================================
-    struct cfgmgr_AnyPair_Desc
-    {
-        typelib_TypeDescriptionReference *  pType;
-        sal_uInt8 nState;
-    };
-
-    inline bool cfgmgr_AnyPair_isNull(cfgmgr_AnyPair_Desc const* _pDesc, sal_uInt8 nSelect)
-    { return (_pDesc->nState & nSelect) == 0; }
-
-    inline bool cfgmgr_AnyPair_isEmpty(cfgmgr_AnyPair_Desc const* _pDesc) 
-    { return (typelib_TypeClass_VOID == _pDesc->pType->eTypeClass); }
-
-    //==========================================================================
-    //= cfgmgr_AnyPair Basic (POD) data structure for a nullable pair of Anys
-    //==========================================================================
-
-    struct cfgmgr_AnyPair
-    {
-        cfgmgr_AnyPair_Desc                desc;
-        const void * first;
-        const void * second;
-    };
-
-// -----------------------------------------------------------------------------
-    //==========================================================================
-    //= AnyPair
-    //==========================================================================
-    // this AnyPair holds 2 nullable Any's which have to have the same type.
-
-    class AnyPair
-    {
-        cfgmgr_AnyPair m_aAnyPair;
-        
-    public:
-        enum SelectMember
-        {
-           SELECT_FIRST   = cfgmgr_SELECT_FIRST, 
-           SELECT_SECOND  = cfgmgr_SELECT_SECOND, 
-           SELECT_BOTH    = cfgmgr_SELECT_BOTH
-        };
-    public:
-        explicit AnyPair(uno::Type const& _aType); // one Type, any's are null
-        explicit AnyPair(uno::Any const& _aAny, SelectMember _select); // one selected any 
-        
-        explicit AnyPair(uno::Any const& _aAny, uno::Any const& _aAny2) SAL_THROW((lang::IllegalArgumentException));
-
-        // copy
-        AnyPair(AnyPair const& _aAny);
-        AnyPair& operator=(AnyPair const& _aAny);
-        
-        // d-tor
-        ~AnyPair();
-        
-        // elementwise setters
-        sal_Bool setFirst(uno::Any const& _aAny);
-        sal_Bool setSecond(uno::Any const& _aAny);
-
-        // clear data (but not type)
-        void clear(SelectMember _select = SELECT_BOTH);
-
-
-        // checking state and availablity of values
-        bool isEmpty()   const { return cfgmgr_AnyPair_isEmpty(&m_aAnyPair.desc); }
-
-        bool isNull  ()  const { return ! hasValue(); } 
-
-        bool hasValue(SelectMember _select = SELECT_BOTH)  const 
-        { 
-            return !cfgmgr_AnyPair_isNull(&m_aAnyPair.desc, (sal_uInt8)_select);
-        }
-        bool hasFirst()  const 
-        { 
-            return hasValue(SELECT_FIRST);
-        }
-        bool hasSecond() const
-        { 
-            return hasValue(SELECT_SECOND);
-        }
-
-        // elementwise getters
-        uno::Type getValueType() const;
-        uno::Any getFirst() const;
-        uno::Any getSecond() const;
-        uno::Any getValue(SelectMember _select) const;
-
-    };
-
-
-
-
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/apitypes.hxx b/configmgr/source/inc/apitypes.hxx
deleted file mode 100644
index a6518d86f8..0000000000
--- a/configmgr/source/inc/apitypes.hxx
+++ /dev/null
@@ -1,92 +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: apitypes.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_APITYPES_HXX_
-#define CONFIGMGR_API_APITYPES_HXX_
-
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <rtl/ustring.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif  //  INCLUDED_VECTOR
-
-namespace configmgr
-{
-    namespace configapi
-    {
-        namespace uno = ::com::sun::star::uno;
-
-        inline 
-        uno::Type getAnyType( )
-        {
-            return ::getCppuType( static_cast< uno::Any const * >(0) );
-        }
-
-        inline 
-        uno::Type getUnoInterfaceType( )
-        {
-            return ::getCppuType( static_cast< uno::Reference< uno::XInterface > const * >(0) );
-        }
-
-        template <typename Interface>
-        inline 
-        uno::Type getReferenceType( Interface const* )
-        {
-            return ::getCppuType( static_cast< uno::Reference<Interface> const * >(0) );
-        }
-
-        template <typename Type>
-        inline 
-        uno::Type getSequenceType( Type const* )
-        {
-            return ::getCppuType( static_cast< uno::Sequence<Type> const * >(0) );
-        }
-
-        template <typename T>
-        inline 
-        uno::Sequence<T> makeSequence(::std::vector<T> const& aVector)
-        {
-            if (aVector.empty())
-                return uno::Sequence<T>();
-            return uno::Sequence<T>(&aVector[0],aVector.size());
-        }
-    }
-
-}
-
-#endif // CONFIGMGR_API_APITYPES_HXX_
-
-
diff --git a/configmgr/source/inc/attributes.hxx b/configmgr/source/inc/attributes.hxx
deleted file mode 100644
index ca5b18be48..0000000000
--- a/configmgr/source/inc/attributes.hxx
+++ /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: attributes.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGURATION_ATTRIBUTES_HXX_
-#define CONFIGMGR_CONFIGURATION_ATTRIBUTES_HXX_
-namespace configmgr
-{
-    namespace node
-    {
-        enum State          
-        {
-            isDefault,          isToDefault     = isDefault,
-            isMerged,           isModification  = isMerged,
-            isReplaced,         isReplacement   = isReplaced,
-            isAdded,            isAddition      = isAdded
-        };
-        enum Access       
-        {
-            accessNull = 0,
-            accessWritable = 0, 
-            accessFinal = 1,   
-            accessReadonly = 2,
-            accessReadonlyAndFinal = 3
-        };
-        inline Access makeAccess(bool readonly, bool final)
-        { return Access( (readonly ? accessReadonly : accessNull) | (final ? accessFinal : accessNull) ); }
-        inline bool isAccessReadonly(Access access)
-        { return (access & accessReadonly) != 0; }
-        inline bool isAccessFinal(Access access)
-        { return (access & accessFinal) != 0; }
-
-        inline bool existsInDefault(State eState)   { return eState <= isReplaced;}
-        inline bool isReplacedForUser(State eState) { return eState >= isReplaced;}
-
-        /// holds attributes a node in the schema
-        struct Attributes
-        {
-            Attributes()
-            : state_(node::isMerged)
-            , bReadonly(false)
-            , bFinalized(false)
-            , bNullable(true)
-            , bLocalized(false)
-            , bMandatory(false)
-            , bRemovable(false)
-            {}
-
-            State state() const         { return State(0x03 & state_); }
-            void setState(State _state) { this->state_ = _state; }
-            
-            bool isWritable() const			     { return!bReadonly; }
-            bool isReadonly() const			     { return bReadonly; }			
-            bool isFinalized() const			 { return bFinalized; }
-
-            void markReadonly() { bReadonly = true; }
-            
-            Access getAccess() const
-            { return makeAccess(bReadonly,bFinalized); }
-            
-            void setAccess(bool _bReadonly, bool _bFinalized)
-            { bReadonly = _bReadonly; bFinalized = _bFinalized; }
-
-            void setAccess(Access _aAccessLevel)
-            { setAccess( isAccessReadonly(_aAccessLevel), isAccessFinal(_aAccessLevel) );  }
-            
-            bool isNullable() const			     { return bNullable; }
-            void setNullable (bool _bNullable)   {bNullable = _bNullable; }
-            
-            bool isLocalized() const			 { return bLocalized; }
-            void setLocalized (bool _bLocalized) {bLocalized = _bLocalized; }
-            
-            bool isMandatory() const			 { return bMandatory; }
-            bool isRemovable() const			 { return bRemovable; }
-
-            void markMandatory() { bMandatory = true; }
-            void markRemovable() { bRemovable = true; }
-
-            void setRemovability(bool _bRemovable, bool _bMandatory)
-            { bRemovable = _bRemovable; bMandatory = _bMandatory; }
-            
-            bool isDefault()            const { return this->state() == node::isDefault;}
-            bool existsInDefault()      const { return node::existsInDefault(this->state());}
-            bool isReplacedForUser()    const { return node::isReplacedForUser(this->state());}
-
-            void markAsDefault(bool _bDefault = true)
-            {
-                if (_bDefault)
-                    this->state_ = node::isDefault;
-                else if (this->isDefault())
-                    this->state_ = node::isMerged;
-            }
-        
-        private:    
-            State state_	    : 2;	// merged/replaced/default state
-
-            bool bReadonly		: 1;    // write-protected, if true
-            bool bFinalized		: 1;    // can not be overridden - write protected when merged upwards
-
-            bool bNullable		: 1;    // values only: can be NULL
-            bool bLocalized		: 1;    // values only: value may depend on locale
-
-            bool bMandatory		: 1;    // cannot be removed/replaced in subsequent layers
-            bool bRemovable		: 1;    // can be removed
-        };
-
-    } 
-}
-
-#endif
diff --git a/configmgr/source/inc/autoobject.hxx b/configmgr/source/inc/autoobject.hxx
deleted file mode 100644
index f3b459a716..0000000000
--- a/configmgr/source/inc/autoobject.hxx
+++ /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: autoobject.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 CONFIGMGR_AUTOOBJECT_HXX
-#define CONFIGMGR_AUTOOBJECT_HXX
-
-#include "sal/config.h"
-
-#include "boost/utility.hpp"
-
-#include "utility.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    template < class Object >
-    class AutoObject: private boost::noncopyable
-    {
-    public:
-        AutoObject() : m_pObject(NULL) {}
-        AutoObject(Object * _obj) : m_pObject(_obj) {}
-        ~AutoObject() { delete m_pObject; }
-
-        bool is()   const;
-        Object * get()   const;
-        Object * getOrCreate();
-    private:
-        Object * internalCreate();
-    private:
-        Object *  m_pObject;
-    };
-//-----------------------------------------------------------------------------
-
-    template < class Object >
-    inline
-    Object * AutoObject<Object>::get() const
-    {
-        return m_pObject;
-    }
-//-----------------------------------------------------------------------------
-
-    template < class Object >
-    inline
-    bool AutoObject<Object>::is() const
-    {
-        return get() != NULL;
-    }
-//-----------------------------------------------------------------------------
-
-    template < class Object >
-    Object * AutoObject<Object>::getOrCreate()
-    {    
-        Object * p = get();
-        return p ? p : internalCreate();
-    }
-//-----------------------------------------------------------------------------
-
-    template < class Object >
-    Object * AutoObject<Object>::internalCreate()
-    {    
-        if (m_pObject == NULL)
-            m_pObject = new Object();
-        return m_pObject;
-
-    }
-//-----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/autoreferencemap.hxx b/configmgr/source/inc/autoreferencemap.hxx
deleted file mode 100644
index 220ca2257b..0000000000
--- a/configmgr/source/inc/autoreferencemap.hxx
+++ /dev/null
@@ -1,132 +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: autoreferencemap.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 CONFIGMGR_AUTOREFERENCEMAP_HXX
-#define CONFIGMGR_AUTOREFERENCEMAP_HXX
-
-#include <rtl/ref.hxx>
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-
-    template < class Key, class Object, class KeyCompare = std::less<Key> >
-    class AutoReferenceMap
-    {
-    public:
-        typedef std::map<Key,rtl::Reference<Object>,KeyCompare>   Map;
-    public:
-        AutoReferenceMap()  {}
-        ~AutoReferenceMap() {}
-
-        Map copy() const
-        {
-            return m_aMap;
-        }
-        void swap(Map & _rOtherData)
-        {
-            m_aMap.swap( _rOtherData );
-        }
-        void swap(AutoReferenceMap & _rOther)
-        {
-            this->swap( _rOther.m_aMap );
-        }
-
-
-        bool has(Key const & _aKey) const;
-        rtl::Reference<Object> get(Key const & _aKey) const;
-
-        rtl::Reference<Object> insert(Key const & _aKey, rtl::Reference<Object> const & _anEntry);
-        rtl::Reference<Object> remove(Key const & _aKey);
-
-    private:
-        rtl::Reference<Object> internalGet(Key const & _aKey) const
-        {
-            typename Map::const_iterator it = m_aMap.find(_aKey);
-
-            return it != m_aMap.end() ? it->second : rtl::Reference<Object>();
-        }
-
-        rtl::Reference<Object> internalAdd(Key const & _aKey, rtl::Reference<Object> const & _aNewRef)
-        {
-            return m_aMap[_aKey] = _aNewRef;
-        }
-
-        void internalDrop(Key const & _aKey)
-        {
-            m_aMap.erase(_aKey);
-        }
-    private:
-        Map                 m_aMap;
-    };
-//-----------------------------------------------------------------------------
-
-    template < class Key, class Object, class KeyCompare >
-    bool AutoReferenceMap<Key,Object,KeyCompare>::has(Key const & _aKey) const
-    {
-        return internalGet(_aKey).is();
-    }
-//-----------------------------------------------------------------------------
-
-    template < class Key, class Object, class KeyCompare >
-    rtl::Reference<Object> AutoReferenceMap<Key,Object,KeyCompare>::get(Key const & _aKey) const
-    {
-        return internalGet(_aKey);
-    }
-//-----------------------------------------------------------------------------
-
-    template < class Key, class Object, class KeyCompare >
-    rtl::Reference<Object> AutoReferenceMap<Key,Object,KeyCompare>::insert(Key const & _aKey, rtl::Reference<Object> const & _anEntry)
-    {    
-        rtl::Reference<Object> aRef = internalAdd(_aKey,_anEntry);
-        return aRef;
-
-    }
-//-----------------------------------------------------------------------------
-
-    template < class Key, class Object, class KeyCompare >
-    rtl::Reference<Object> AutoReferenceMap<Key,Object,KeyCompare>::remove(Key const & _aKey)
-    {
-        rtl::Reference<Object> aRef = internalGet(_aKey);
-        internalDrop(_aKey);
-        return aRef;
-    }
-//-----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/backendfactory.hxx b/configmgr/source/inc/backendfactory.hxx
deleted file mode 100644
index 82b6cccdb0..0000000000
--- a/configmgr/source/inc/backendfactory.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: backendfactory.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 CONFIGMGR_BACKENDFACTORY_HXX_
-#define CONFIGMGR_BACKENDFACTORY_HXX_
-
-#include <rtl/ref.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace backend
-    {
-//-----------------------------------------------------------------------------
-
-        struct IMergedDataProvider;
-//-----------------------------------------------------------------------------
-        class BackendFactory
-        {
-        public:
-            rtl::Reference<IMergedDataProvider> createBackend();
-
-            com::sun::star::uno::Reference< com::sun::star::configuration::backend::XBackend > getUnoBackend();
-
-            static BackendFactory instance(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & _xCtx);
-
-        private:
-            explicit
-            BackendFactory(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & _xCtx)
-            : m_xCtx(_xCtx)
-            {}
-
-            com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xCtx;
-        };
-//-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
-
-#endif 
-
diff --git a/configmgr/source/inc/bootstrap.hxx b/configmgr/source/inc/bootstrap.hxx
deleted file mode 100644
index 8443003852..0000000000
--- a/configmgr/source/inc/bootstrap.hxx
+++ /dev/null
@@ -1,243 +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: bootstrap.hxx,v $
- * $Revision: 1.29 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 CONFIGMGR_BOOTSTRAP_HXX_
-#define CONFIGMGR_BOOTSTRAP_HXX_
-
-#include "bootstrapcontext.hxx"
-
-// ---------------------------------------------------------------------------------------
-#define BOOTSTRAP_ITEM_INIFILE              "CFG_INIFILE"
-// ---------------------------------------------------------------------------------------
-// standard settings
-#define SETTING_UNOSERVICE					"BackendService"
-#define SETTING_UNOWRAPPER					"BackendWrapper"
-#define SETTING_OFFLINE						"Offline"
-#define SETTING_LOCALE_NEW					"Locale"
-#define SETTING_ASYNC_NEW					"EnableAsync"
-#define SETTING_INIFILE                     "Inifile"
-
-// Prefixes
-#define CONTEXT_MODULE_PREFIX_              "/modules/com.sun.star.configuration/"
-#define CONTEXT_SECTION_BOOTSTRAP_          "bootstrap/"
-#define CONTEXT_ITEM_PREFIX_                CONTEXT_MODULE_PREFIX_ CONTEXT_SECTION_BOOTSTRAP_
-#define BOOTSTRAP_ITEM_PREFIX_              "CFG_"
-
-// special internal context values
-#define CONTEXT_SECTION_INTERNAL_           "factory/"
-#define CONTEXT_INTERNAL_PREFIX_            CONTEXT_MODULE_PREFIX_ CONTEXT_SECTION_INTERNAL_
-#define CONTEXT_ITEM_ADMINFLAG		        CONTEXT_INTERNAL_PREFIX_"isAdminConfiguration" 
-#define CONTEXT_ITEM_BOOTSTRAP_ERROR        CONTEXT_INTERNAL_PREFIX_"theBootstrapError" 
-
-#define CONTEXT_ITEM_IS_WRAPPER_CONTEXT     CONTEXT_INTERNAL_PREFIX_"isWrapperContext" 
-#define CONTEXT_ITEM_IS_BOOTSTRAP_CONTEXT   CONTEXT_INTERNAL_PREFIX_"isBootstrapContext" 
-
-// ---------------------------------------------------------------------------------------
-#define A_DefaultProviderSingletonName "com.sun.star.configuration.theDefaultProvider"
-#define K_DefaultBackendSingletonName       "com.sun.star.configuration.backend.theDefaultBackend" 
-#define A_BootstrapContextSingletonName     "com.sun.star.configuration.bootstrap.theBootstrapContext"
-// -------------------------------------------------------------------------
-#define A_DefaultProviderServiceAndImplName     "com.sun.star.configuration.DefaultProvider"
-#define K_DefaultBackendServiceAndImplName         "com.sun.star.configuration.backend.DefaultBackend"
-// ---------------------------------------------------------------------------------------
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------------
-    
-    namespace uno = ::com::sun::star::uno;
-    namespace lang = ::com::sun::star::lang;
-    namespace beans = ::com::sun::star::beans;
-    // -----------------------------------------------------------------------------------
-
-    /** Customized ComponentContext for configuration bootstrap data and runtime arguments
-    */
-    class BootstrapContext : public ComponentContext
-    {
-    // creation and destruction
-    private:
-        friend uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateBootstrapContext( uno::Reference< uno::XComponentContext > const& xContext );
-
-        // constructor
-        BootstrapContext(uno::Reference< uno::XComponentContext > const & _xContext);
-
-        // two-phase construct
-        void initialize();
-
-    protected:
-        using ComponentContext::initialize;
-
-    public:
-         // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName() 
-            throw (uno::RuntimeException) ;
-        virtual sal_Bool SAL_CALL supportsService(
-            const rtl::OUString& aServiceName) 
-            throw (uno::RuntimeException) ;
-        virtual uno::Sequence<rtl::OUString> SAL_CALL 
-            getSupportedServiceNames(void) throw (uno::RuntimeException) ;
-        
-        
-        /** Constructs a Context based on the given arguments and context.
-            @param _xContext
-                The base context of this component context.
-
-            @param _aArguments
-                The arguments used to create this component context.  
-        */
-        static uno::Reference< uno::XComponentContext > createWrapper(uno::Reference< uno::XComponentContext > const & _xContext, uno::Sequence < beans::NamedValue > const & _aOverrides);
-
-        /** Checks, if the given context is a wrapper.
-            @param _xContext
-                The context that is checked.
-        */
-        static sal_Bool isWrapper(uno::Reference< uno::XComponentContext > const & _xContext);
-
-        /** Retrieves the BootstrapContext for the given non-bootstrap context.
-            @param _xContext
-                The context from which the bootstrap context should be retrieved.
-
-        */
-        static uno::Reference< uno::XComponentContext > get(uno::Reference< uno::XComponentContext > const & _xContext);
-
-        /// Destroys this BootstrapContext
-        ~BootstrapContext();
-
-        // gets the INI that should be used for bootstrap data by default
-        static rtl::OUString getDefaultConfigurationBootstrapURL();
-
-    // interface implementations
-    public:
-    // XComponentContext
-        /** Retrieves a value from this context. 
-            
-            @param name
-                The name of the value to retrieve.
-                A prefix of "com.sun.star.configuration.bootstrap." is stripped/ignored
-
-            @returns 
-                The requested value, or <VOID/> if the value is not found.
-        */
-        virtual uno::Any SAL_CALL 
-            getValueByName( const rtl::OUString& name )
-                throw (uno::RuntimeException);
-
-    public: // used by ArgumentHelper
-        static rtl::OUString makeContextName (rtl::OUString const & _aShortName);
-    
-    private:
-        static rtl::OUString makeBootstrapName(rtl::OUString const & _aLongName);
-        uno::Any makeBootstrapException();
-    };
-// -----------------------------------------------------------------------------
-    class ContextReader
-    {
-    public:
-        explicit
-        ContextReader(uno::Reference< uno::XComponentContext > const & context);
-
-    // the underlying contexts
-        sal_Bool hasBootstrapContext()          const { return m_fullcontext.is(); }
-        uno::Reference< uno::XComponentContext > const & getBootstrapContext()   const { return m_fullcontext; }
-        uno::Reference< uno::XComponentContext > const & getBaseContext()        const { return m_basecontext; }
-        uno::Reference< uno::XComponentContext > const & getBestContext()        const { return m_fullcontext.is() ? m_fullcontext : m_basecontext; }
-
-        uno::Reference< lang::XMultiComponentFactory > getServiceManager() const;
-
-        /** Checks, if the given context has the given 'admin' flag setting..
-            @param _xContext
-                The context that is checked.
-        */
-        static bool testAdminService(uno::Reference< uno::XComponentContext > const & context, bool bAdmin);
-
-    // general settings
-        sal_Bool    isUnoBackend() const;
-
-        sal_Bool    hasUnoBackendService() const;
-        sal_Bool    hasUnoBackendWrapper() const;
-
-        sal_Bool	hasLocale() const;
-        sal_Bool	hasAsyncSetting() const;
-        sal_Bool    hasOfflineSetting() const;
-
-        rtl::OUString    getUnoBackendService() const;
-        rtl::OUString    getUnoBackendWrapper() const;
-
-        rtl::OUString	getLocale() const;
-        sal_Bool	getAsyncSetting() const;
-        sal_Bool	getOfflineSetting() const;
-
-    // internal settings - should only ever be in configmgr::BootstrapContext instances
-        // get a special setting
-        sal_Bool	isAdminService() const;
-
-        // access to error diagnostics
-        sal_Bool    isBootstrapValid() const;
-        uno::Any    getBootstrapError() const;
-    private:
-        sal_Bool hasSetting(rtl::OUString const & _aSetting) const;
-        sal_Bool getBoolSetting(rtl::OUString const & _aSetting, sal_Bool bValue) const;
-        rtl::OUString getStringSetting(rtl::OUString const & _aSetting, rtl::OUString aValue) const;
-        uno::Any getSetting(rtl::OUString const & _aSetting) const;
-    private:
-        uno::Reference< uno::XComponentContext > m_basecontext;
-        uno::Reference< uno::XComponentContext > m_fullcontext;
-    };
-    //------------------------------------------------------------------------
-
-    class ArgumentHelper
-    {
-    public:
-        explicit
-        ArgumentHelper(uno::Reference< uno::XComponentContext > const & context) 
-        : m_context(context) 
-        , m_bHasBackendArguments(false)
-        {}
-
-        bool hasBackendArguments() const { return m_bHasBackendArguments; }
-        bool checkBackendArgument(beans::NamedValue const & aAdjustedValue);
-
-        bool filterAndAdjustArgument(beans::NamedValue & rValue);
-
-        static 
-        bool extractArgument(beans::NamedValue & rValue, uno::Any const & aArgument);
-
-        static beans::NamedValue makeAdminServiceOverride(sal_Bool bAdmin);
-    private:
-        uno::Reference< uno::XComponentContext > m_context; // context used to strip identical arguments
-        bool m_bHasBackendArguments;
-    };
-// -----------------------------------------------------------------------------------
-
-}
-
-#endif // CONFIGMGR_BOOTSTRAP_HXX_
-
-
diff --git a/configmgr/source/inc/bootstrapcontext.hxx b/configmgr/source/inc/bootstrapcontext.hxx
deleted file mode 100644
index 5b54e86ab6..0000000000
--- a/configmgr/source/inc/bootstrapcontext.hxx
+++ /dev/null
@@ -1,171 +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: bootstrapcontext.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BOOTSTRAPCONTEXT_HXX_
-#define CONFIGMGR_BOOTSTRAPCONTEXT_HXX_
-
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <rtl/bootstrap.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/XCurrentContext.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
-
-// -----------------------------------------------------------------------------
-#define SINGLETON_ "/singletons/"
-#define SINGLETON( NAME ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SINGLETON_ NAME ) )
-// -----------------------------------------------------------------------------
-namespace configmgr 
-{
-// -----------------------------------------------------------------------------
-    namespace uno   = ::com::sun::star::uno;
-    namespace lang  = ::com::sun::star::lang;
-    namespace beans = ::com::sun::star::beans;
-// -----------------------------------------------------------------------------
-    /** Base class for customized ComponentContext using bootstrap data and overrides
-    */
-    class ComponentContext : public cppu::WeakComponentImplHelper3 < uno::XComponentContext, uno::XCurrentContext, lang::XServiceInfo >
-    {
-    // creation and destruction
-    public:
-        /** Constructs a ComponentContext based on the given overrides and context.
-            Initially no bootstrap data will be used.
-
-            @param _xContext
-                The base context of this component context.
-                Values from here take precedence over values from bootstrap data.
-
-            @param _aOverrides
-                The overrides used to create this component context.  
-                These values take precedence over values from the base context or bootstrap data.
-        */
-        explicit
-        ComponentContext(uno::Reference< uno::XComponentContext > const & _xContext);
-
-        /// Destroys this BootstrapContext
-        ~ComponentContext();
-
-        // gets the INI in use for getting bootstrap data
-        rtl::OUString getBootstrapURL() const;
-
-        static sal_Bool isPassthrough(uno::Reference< uno::XComponentContext > const & _xContext);
-
-        static beans::NamedValue makePassthroughMarker(sal_Bool bPassthrough = true);
-    // interface implementations
-    public:
-
-    // XComponentContext only
-        virtual uno::Reference< lang::XMultiComponentFactory > SAL_CALL 
-            getServiceManager(  ) 
-                throw (uno::RuntimeException);
-   
-    protected:
-    // ComponentHelper
-        virtual void SAL_CALL disposing();
-
-    protected:
-        // two phase construct - also initialized the bootstrap data
-        void initialize(const rtl::OUString& _aBootstrapURL);
-
-        bool lookupInContext  ( uno::Any & _rValue, const rtl::OUString& _aName ) const;
-        bool lookupInBootstrap( uno::Any & _rValue, const rtl::OUString& _aName ) const;
-
-        uno::Reference< uno::XComponentContext > const & basecontext() const { return m_xContext; }
-
-    private:
-        /// The context that most requests are delegated to
-        uno::Reference< uno::XComponentContext >             m_xContext;
-        /// The bootstrap data consulted as fallback
-        rtlBootstrapHandle  m_hBootstrapData;
-        /// The service manager associated with this context
-        uno::Reference< lang::XMultiComponentFactory >      m_xServiceManager;    
-    };
-// -----------------------------------------------------------------------------
-
-    class UnoContextTunnel
-    {
-    public:
-        UnoContextTunnel();
-        ~UnoContextTunnel();
-        void tunnel(uno::Reference< uno::XComponentContext > const & xContext);
-        void passthru(uno::Reference< uno::XComponentContext > const & xContext);
-        uno::Any recoverFailure(bool bRaise); // true, if there is a failure
-
-        static uno::Reference< uno::XComponentContext > recoverContext(uno::Reference< uno::XComponentContext > const & xFallback = uno::Reference< uno::XComponentContext >());
-        static bool tunnelFailure(uno::Any const & aException, bool bRaise = false);
-    private:
-        uno::Reference< uno::XCurrentContext >  m_xOldContext;
-        uno::Reference< lang::XUnoTunnel >   m_xActiveTunnel;
-        class Tunnel;
-    };
-// -----------------------------------------------------------------------------
-
-    class DisposingForwarder : public cppu::WeakImplHelper1< lang::XEventListener >
-    {
-        uno::Reference< lang::XComponent > m_xTarget;
-    
-        DisposingForwarder( uno::Reference< lang::XComponent > const & xTarget ) SAL_THROW( () )
-        : m_xTarget( xTarget )
-        { OSL_ASSERT( m_xTarget.is() ); }
-    
-        virtual void SAL_CALL disposing( lang::EventObject const & rSource )
-            throw (uno::RuntimeException);
-    public:
-        // listens at source for disposing, then disposes target
-        static inline void forward(
-            uno::Reference< lang::XComponent > const & xSource,
-            uno::Reference< lang::XComponent > const & xTarget )
-            SAL_THROW( (uno::RuntimeException) );
-    };
-//__________________________________________________________________________________________________
-    inline void DisposingForwarder::forward(
-        uno::Reference< lang::XComponent > const & xSource,
-        uno::Reference< lang::XComponent > const & xTarget )
-        SAL_THROW( (uno::RuntimeException) )
-    {
-        if (xSource.is())
-        {
-            xSource->addEventListener( new DisposingForwarder( xTarget ) );
-        }
-    }
-// -----------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif 
-
-
diff --git a/configmgr/source/inc/bufferedfile.hxx b/configmgr/source/inc/bufferedfile.hxx
deleted file mode 100644
index a49fbce6f2..0000000000
--- a/configmgr/source/inc/bufferedfile.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: bufferedfile.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 CONFIGMGR_BUFFEREDFILE_HXX
-#define CONFIGMGR_BUFFEREDFILE_HXX
-
-#include "utility.hxx"
-#include <boost/utility.hpp>
-#include <osl/file.hxx>
-#include <com/sun/star/io/IOException.hpp>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-    
-    namespace io = com::sun::star::io;
-
-    class BufferedOutputFile: private boost::noncopyable, public osl::FileBase
-    {
-        osl::File * m_pFile;
-        std::vector<sal_uInt8>      m_buffer;
-    public:
-        BufferedOutputFile( rtl::OUString const& aFileURL, sal_uInt32 nBufferSizeHint = 0 );
-        ~BufferedOutputFile ();
-        
-        RC open( sal_uInt32 uFlags );
-        RC close();
-        
-        //RC getPos( sal_uInt64& uPos )
-        RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten);
-
-        // as opposed to osl::File, this method is not const here
-        RC sync();
-    };
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/builddata.hxx b/configmgr/source/inc/builddata.hxx
deleted file mode 100644
index 232aec06a4..0000000000
--- a/configmgr/source/inc/builddata.hxx
+++ /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: builddata.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 CONFIGMGR_BUILDDATA_HXX
-#define CONFIGMGR_BUILDDATA_HXX
-
-#include "treefragment.hxx"
-#ifndef INCLUDED_MEMORY
-#define INCLUDED_MEMORY
-#include <memory>
-#endif
-//-----------------------------------------------------------------------------
-namespace rtl { class OUString; }
-//-----------------------------------------------------------------------------
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class INode;
-    class ISubtree;
-    class ValueNode;
-//-----------------------------------------------------------------------------
-    namespace sharable { struct TreeFragment; }
-    namespace data
-    {
-//-----------------------------------------------------------------------------
-        sharable::TreeFragment * buildTree(sharable::TreeFragment * tree);
-//-----------------------------------------------------------------------------
-        sharable::TreeFragment * buildTree(rtl::OUString const & _aTreeName, INode const& _aNode, bool _bWithDefaults);
-//-----------------------------------------------------------------------------
-        sharable::TreeFragment * buildElementTree(INode const& _aNode, rtl::OUString const & _aTypeName, bool _bWithDefaults);
-//-----------------------------------------------------------------------------
-        void mergeDefaults(sharable::TreeFragment * _aBaseAddress, INode const& _aDefaultNode);
-//-----------------------------------------------------------------------------
-        void destroyTree(sharable::TreeFragment * _aBaseAddress);
-//-----------------------------------------------------------------------------
-        std::auto_ptr<INode> convertTree(sharable::TreeFragment * tree, bool _bUseTreeName);
-//-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}	// namespace configmgr
-//-----------------------------------------------------------------------------
-
-#endif // CONFIGMGR_BUILDDATA_HXX
-
-
diff --git a/configmgr/source/inc/cachefactory.hxx b/configmgr/source/inc/cachefactory.hxx
deleted file mode 100644
index 7d4c4c7ba4..0000000000
--- a/configmgr/source/inc/cachefactory.hxx
+++ /dev/null
@@ -1,54 +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: cachefactory.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 CONFIGMGR_CACHEFACTORY_HXX_
-#define CONFIGMGR_CACHEFACTORY_HXX_
-
-#include <rtl/ref.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class TreeManager;
-//-----------------------------------------------------------------------------
-    struct CacheFactory
-    {
-        rtl::Reference<TreeManager> 
-            createCacheManager(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext);
-
-        static CacheFactory & instance();
-    };
-//-----------------------------------------------------------------------------
-}
-
-
-#endif // CONFIGMGR_CACHEFACTORY_HXX_
-
diff --git a/configmgr/source/inc/change.hxx b/configmgr/source/inc/change.hxx
deleted file mode 100644
index 00f8d01cbc..0000000000
--- a/configmgr/source/inc/change.hxx
+++ /dev/null
@@ -1,507 +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: change.hxx,v $
- * $Revision: 1.28 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CHANGE_HXX
-#define CONFIGMGR_CHANGE_HXX
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable : 4350) // behavior change: 'member1' called instead of 'member2'
-#endif
-
-#include "valuenode.hxx"
-#include "treesegment.hxx"
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-
-    namespace uno = com::sun::star::uno;
-
-    class Change;
-    class SubtreeChange;
-    class ValueChange;
-    class AddNode;
-    class RemoveNode;
-
-
-    //==========================================================================
-    //= ChangeTreeAction
-    //==========================================================================
-    struct ChangeTreeAction
-    {
-        virtual void handle(ValueChange const& aValueNode) = 0;
-        virtual void handle(AddNode const& aAddNode) = 0;
-        virtual void handle(RemoveNode const& aRemoveNode) = 0;
-        virtual void handle(SubtreeChange const& aSubtree) = 0;
-
-        void applyToChange(Change const& aChange);
-        void applyToChildren(SubtreeChange const& aSubtree);
-    protected:
-        virtual ~ChangeTreeAction() {}
-    };
-
-    struct ChangeTreeModification
-    {
-        virtual void handle(ValueChange& aValueNode) = 0;
-        virtual void handle(AddNode& aAddNode) = 0;
-        virtual void handle(RemoveNode& aRemoveNode) = 0;
-        virtual void handle(SubtreeChange& aSubtree) = 0;
-
-        void applyToChange(Change& aChange);
-        void applyToChildren(SubtreeChange& aSubtree);
-    protected:
-        virtual ~ChangeTreeModification() {}
-    };
-
-    //==========================================================================
-    //= Change
-    //==========================================================================
-    class Change
-    {
-    protected:
-        rtl::OUString m_aName;
-        bool m_bIsToDefault;
-
-        void swap(Change& aOther);
-
-    public:
-        explicit
-        Change(rtl::OUString const& _rName, bool _bToDefault)
-        : m_aName(_rName)
-        , m_bIsToDefault(_bToDefault)
-        {}
-
-        virtual ~Change() {}
-
-        rtl::OUString getNodeName() const { return m_aName; }
-        void setNodeName(const rtl::OUString &aName) {m_aName = aName;}
-
-        bool isToDefault() const { return m_bIsToDefault;  }
-
-        Change* getSubChange(rtl::OUString const& _rName) { return doGetChild(_rName); }
-        Change const* getSubChange(rtl::OUString const& _rName) const { return doGetChild(_rName); }
-
-        virtual void dispatch(ChangeTreeAction& anAction) const = 0;
-        virtual void dispatch(ChangeTreeModification& anAction) = 0;
-
-        virtual std::auto_ptr<Change> clone() const = 0;
-
-    private:
-        virtual Change* doGetChild(rtl::OUString const& ) const { return 0; }
-    };
-
-    //==========================================================================
-    //= ValueChange
-    //==========================================================================
-    class ValueChange : public Change
-    {
-    public:
-        struct SetToDefault {};
-        enum Mode { wasDefault, changeValue, setToDefault, changeDefault };
-
-    private:
-        uno::Type		    m_aValueType;
-        uno::Any		    m_aValue;
-        uno::Any		    m_aOldValue;
-        node::Attributes	m_aAttributes;
-        Mode			    m_eMode;
-    public:
-        ValueChange(
-            rtl::OUString const& _rName,
-            const node::Attributes& _rAttributes,
-            Mode aMode,
-            uno::Any const & aNewValue,
-            uno::Any const & aOldValue = uno::Any());
-
-        virtual std::auto_ptr<Change> clone() const;
-
-        bool isChange() const;
-
-        uno::Type	getValueType() const { return m_aValueType; }
-
-        uno::Any	getNewValue() const { return m_aValue; }
-        uno::Any	getOldValue() const { return m_aOldValue; }
-
-        void		setNewValue(const uno::Any& _rNewVal);
-        void		setNewValue(const uno::Any& _rNewVal, Mode aMode)
-        { setNewValue(_rNewVal); m_eMode = aMode;}
-
-        bool isReplacedValue()   const {return m_aAttributes.isReplacedForUser();}
-        bool isLocalizedValue()  const {return m_aAttributes.isLocalized();}
-
-        Mode getMode() const { return m_eMode; }
-
-        const node::Attributes& getAttributes() const {return m_aAttributes;}
-
-        void applyChangeNoRecover(ValueNode& aNode) const;
-
-        virtual void dispatch(ChangeTreeAction& anAction) const { anAction.handle(*this); }
-        virtual void dispatch(ChangeTreeModification& anAction) { anAction.handle(*this); }
-
-        friend class ApplyValueChange;
-    };
-
-    //==========================================================================
-    //= AddNode
-    //==========================================================================
-    class AddNode : public Change
-    {
-        rtl::Reference< data::TreeSegment > m_aOwnNewNode;
-        rtl::Reference< data::TreeSegment > m_aOwnOldNode;
-        sharable::TreeFragment *	m_aInsertedTree;
-        bool				m_bReplacing;
-
-    private:
-        void operator=(AddNode const&); // not implemented
-
-        // needed for clone()
-        AddNode(AddNode const&);
-    public:
-        AddNode(rtl::Reference< data::TreeSegment > const & _aAddedTree, rtl::OUString const& _rName, bool _bToDefault);
-        ~AddNode();
-
-        virtual std::auto_ptr<Change> clone() const;
-
-        /// marks this as not merely adding a node but replacing another
-        void setReplacing() { m_bReplacing = true; }
-        /// is this  not merely adding a node but replacing another ?
-        bool isReplacing() const { return m_bReplacing; }
-
-        /// has this been applied and inserted
-        bool wasInserted() const { return m_aInsertedTree != NULL; }
-
-        /** returns the node this change represents, even if this node does not own the new Node object any more. 
-            This is somewhat dangerous if the node referenced by this object dies before the object itself does.<BR>
-            In this case all calls to this method will return nonsense. This case can be detected by testing 
-            whether <method>getAddedNode</method> returns NULL.
-        */
-        sharable::TreeFragment *   getInsertedTree()	const { return m_aInsertedTree; }
-
-        /** returns the node this change represents; The Node object is owned by this change until
-            <method>releaseAddedNode</method> is called.<BR>
-            After ownership is lost this method returns NULL.
-        */
-        sharable::TreeFragment const * getNewTreeData()	const  { return m_aOwnNewNode.is() ? m_aOwnNewNode->fragment : 0; }
-
-        /** returns the node the change represents. .
-        */
-        rtl::Reference< data::TreeSegment > getNewTree() const   { return m_aOwnNewNode; }
-
-        /** returns the node the change represents, and releases ownership of it. This means that 
-            afterwards <method>getAddedNode</method> will return NULL. This change object keeps a reference 
-            to the node though which can be retrieved using <method>getAddedNode_unsafe</method>.
-        */
-        void clearNewTree() { m_aOwnNewNode.clear(); }
-
-        /** .
-        */
-        void setInsertedAddress(sharable::TreeFragment * const & _aInsertedAddress);
-
-
-        /** returns the node this change replaces, ihe Node object is owned by this change.
-            After ownership is lost this method returns NULL.
-        */
-        sharable::TreeFragment const * getReplacedTreeData() const	{ return m_aOwnOldNode.is() ? m_aOwnOldNode->fragment : 0; }
-
-        /** returns the node the change replaces.
-        */
-        rtl::Reference< data::TreeSegment > getReplacedTree() const	{ return m_aOwnOldNode; }
-
-        /** forgets about the node the change replaces
-        */
-        void clearReplacedTree() { m_aOwnOldNode.clear(); }
-
-        void takeReplacedTree(rtl::Reference< data::TreeSegment > const& _aTree);
-
-        virtual void dispatch(ChangeTreeAction& anAction) const { anAction.handle(*this); }
-        virtual void dispatch(ChangeTreeModification& anAction) { anAction.handle(*this); }
-    };
-
-    //==========================================================================
-    //= RemoveNode
-    //==========================================================================
-    class RemoveNode : public Change
-    {
-    protected:
-        rtl::Reference< data::TreeSegment > m_aOwnOldNode;
-        bool                            m_bIsToDefault;
-
-    private:
-        RemoveNode& operator=(const RemoveNode&); // not implemented
-        // needed for clone()
-        RemoveNode(const RemoveNode&);
-    public:
-        explicit
-        RemoveNode(rtl::OUString const& _rName, bool _bToDefault);
-        ~RemoveNode();
-
-        virtual std::auto_ptr<Change> clone() const;
-
-        virtual void dispatch(ChangeTreeAction& anAction) const { anAction.handle(*this); }
-        virtual void dispatch(ChangeTreeModification& anAction) { anAction.handle(*this); }
-
-        /** returns the node this change removes, ihe Node object is owned by this change.
-            After ownership is lost this method returns NULL.
-        */
-        sharable::TreeFragment const * getRemovedTreeData() const { return m_aOwnOldNode.is() ? m_aOwnOldNode->fragment : 0; }
-        /** returns the node the change removes.
-        */
-        rtl::Reference< data::TreeSegment > getRemovedTree()	        const   { return m_aOwnOldNode; }
-
-        /** forgets about the node the change removes, returning the previous setting with ownership
-        */
-        void clearRemovedTree()	{ m_aOwnOldNode.clear(); }
-
-        void takeRemovedTree(rtl::Reference< data::TreeSegment > const & _aTree);
-    };
-
-    //==========================================================================
-    //= SubtreeChange
-    //==========================================================================
-    class SubtreeChange : public Change
-    {	
-    protected:
-        typedef ::std::map< ::rtl::OUString,Change* > Children;
-        Children					m_aChanges;
-        ::rtl::OUString				m_sTemplateName;			/// path of the template for child instantiation
-        ::rtl::OUString				m_sTemplateModule;			/// module of the template for child instantiation
-        node::Attributes	        m_aAttributes;
-        
-        // don't create copy ops automatically
-        SubtreeChange(const SubtreeChange&);
-        void operator=(SubtreeChange&);
-
-              using Change::swap;
-
-    public:
-        class ChildIterator;
-        ChildIterator begin() const throw();
-        ChildIterator end() const throw();
-
-        class MutatingChildIterator;
-        MutatingChildIterator begin_changes() throw();
-        MutatingChildIterator end_changes() throw();
-
-        friend class MutatingChildIterator;
-    public:
-        SubtreeChange(const rtl::OUString& _rName, 
-                      const node::Attributes& _rAttr,
-                      bool _bToDefault = false)
-        : Change(_rName,_bToDefault)
-        , m_aAttributes(_rAttr)
-        {
-            m_aAttributes.markAsDefault(_bToDefault);
-        }
-        
-        SubtreeChange(const rtl::OUString& _rName, 
-                      const rtl::OUString& _rTemplateName,
-                      const rtl::OUString& _rTemplateModule,
-                      const node::Attributes& _rAttr,
-                      bool _bToDefault = false)
-        : Change(_rName,_bToDefault)
-        , m_sTemplateName(_rTemplateName)
-        , m_sTemplateModule(_rTemplateModule)
-        , m_aAttributes(_rAttr)
-        {
-            m_aAttributes.markAsDefault(_bToDefault);
-        }
-        
-        SubtreeChange(const ISubtree& _rTree, bool _bToDefault = false)
-        : Change(_rTree.getName(),_bToDefault)
-        , m_sTemplateName(_rTree.getElementTemplateName())
-        , m_sTemplateModule(_rTree.getElementTemplateModule())
-        , m_aAttributes(_rTree.getAttributes())
-        {
-            m_aAttributes.markAsDefault(_bToDefault);
-        }
-
-        SubtreeChange(const SubtreeChange& _rChange, treeop::NoChildCopy) 
-        : Change(_rChange)
-        , m_sTemplateName(_rChange.getElementTemplateName())
-        , m_sTemplateModule(_rChange.getElementTemplateModule())
-        , m_aAttributes(_rChange.getAttributes())
-        {}
-        
-        ~SubtreeChange();
-
-        SubtreeChange(const SubtreeChange&, treeop::DeepChildCopy);
-
-        virtual std::auto_ptr<Change> clone() const;
-
-        void swap(SubtreeChange& aOther);
-
-        bool isReplacedNode()       const { return m_aAttributes.isReplacedForUser();  }
-        bool isLocalizedContainer() const { return m_aAttributes.isLocalized(); }
-
-        const node::Attributes& getAttributes() const {return m_aAttributes;}
-        
-        bool			isSetNodeChange() const { return m_sTemplateName.getLength() != 0; }
-
-        rtl::OUString	getElementTemplateName() const { return m_sTemplateName; }
-        rtl::OUString	getElementTemplateModule() const { return m_sTemplateModule; }
-
-        void			setElementTemplate(const rtl::OUString& _rName, const rtl::OUString& _rModule) 
-        { m_sTemplateName = _rName; m_sTemplateModule = _rModule; }
-
-        sal_Int32                       size() const { return m_aChanges.size(); }
-        uno::Sequence< rtl::OUString >	elementNames() const;
-
-        void					addChange(std::auto_ptr<Change> aChange);
-        ::std::auto_ptr<Change>	removeChange(rtl::OUString const& _rName);
-
-        Change* getChange(rtl::OUString const& _rName);
-        Change const* getChange(rtl::OUString const& _rName) const;
-
-        virtual void dispatch(ChangeTreeAction& _anAction) const;
-        virtual void dispatch(ChangeTreeModification& _anAction);
-
-        void forEachChange(ChangeTreeAction& _anAction) const;
-        void forEachChange(ChangeTreeModification& _anAction);
-
-    private:
-        virtual Change* doGetChild(rtl::OUString const& _rName) const;
-    };
-
-    /** iterates through all children of a <type>SubtreeChange</type>. Every non-const action on the object
-        which is beeing iterated invalidates the iterator.
-        <BR>
-        beware of the lifetime of the tree change object : it has to live as long as the iterator does (at least) !!
-    */
-    class SubtreeChange::ChildIterator
-    {
-    protected:
-        uno::Sequence< rtl::OUString >	m_aNames;
-        const SubtreeChange*			m_pTree;		
-        sal_Int32						m_nPos;
-
-        friend class SubtreeChange;
-        struct EndPos { };
-        ChildIterator(const SubtreeChange* _pTree, struct EndPos);
-
-        inline sal_Bool isValid() const { return m_nPos >= 0 && m_nPos < m_aNames.getLength(); }
-
-    public:
-        ChildIterator(const SubtreeChange* _pTree);
-
-        const Change& operator*() const;
-        const Change* operator->() const;
-
-        ChildIterator& operator++();
-        ChildIterator operator++(int) { ChildIterator ret(*this); ++*this; return ret; }
-
-        ChildIterator& operator--();
-        ChildIterator operator--(int) { ChildIterator ret(*this); --*this; return ret; }
-
-        friend bool operator==(ChildIterator const& lhs, ChildIterator const& rhs);
-        friend bool operator!=(ChildIterator const& lhs, ChildIterator const& rhs) { return !(lhs == rhs); }
-    };
-
-    /** iterates through all children of a <type>SubtreeChange</type>. Every non-const action on the object
-        which is beeing iterated invalidates the iterator.
-        <BR>
-        beware of the lifetime of the tree change object : it has to live as long as the iterator does (at least) !!
-    */
-    class SubtreeChange::MutatingChildIterator
-    {
-    protected:
-        SubtreeChange::Children::iterator m_aBaseIter;
-
-        friend class SubtreeChange;
-        MutatingChildIterator(SubtreeChange::Children::iterator aBase) : m_aBaseIter(aBase) {};
-
-    public:
-        Change& current() const { return *m_aBaseIter->second; }
-
-        Change& operator*() const { return current(); }
-        Change* operator->() const { return &current(); }
-
-        MutatingChildIterator& operator++()		{ ++m_aBaseIter; return *this; }
-        MutatingChildIterator operator++(int)	{ return MutatingChildIterator(m_aBaseIter++); }
-
-        MutatingChildIterator& operator--()		{ ++m_aBaseIter; return *this; }
-        MutatingChildIterator operator--(int)	{ return MutatingChildIterator(m_aBaseIter++); }
-
-        friend bool operator==(MutatingChildIterator const& lhs, MutatingChildIterator const& rhs)
-        { return lhs.m_aBaseIter == rhs.m_aBaseIter; }
-        friend bool operator!=(MutatingChildIterator const& lhs, MutatingChildIterator const& rhs) { return !(lhs == rhs); }
-    };
-    //==========================================================================
-    //= SubtreeChangeReferrer
-    //==========================================================================
-    /** a specialized SubtreeChange, which, upon desctruction, does not delete the changes
-        it holds
-
-        <BR>
-        This implies that when using this class, you have to beware of the lifetime of the involved objects
-    */
-    class SubtreeChangeReferrer : public SubtreeChange
-    {
-        // no explicit construction
-        SubtreeChangeReferrer() : SubtreeChange(::rtl::OUString(), node::Attributes()) { }
-
-    public:
-        SubtreeChangeReferrer(const SubtreeChange& _rSource);
-        ~SubtreeChangeReferrer();
-    };
-
-////////////////////////////////////////////////////////////////////////////////
-    //==========================================================================
-    extern bool isLocalizedValueSet(SubtreeChange const& _aSubtree);
-    extern bool isValueSet(SubtreeChange const& _aSubtree);
-
-    //==========================================================================
-    //= inlines
-    //==========================================================================
-    inline void ChangeTreeAction::applyToChange(Change const& aChange)
-    { aChange.dispatch(*this); }
-    inline void ChangeTreeAction::applyToChildren(SubtreeChange const& aSubtree)
-    { aSubtree.forEachChange(*this); }
-
-    inline void ChangeTreeModification::applyToChange(Change& aChange)
-    { aChange.dispatch(*this); }
-    inline void ChangeTreeModification::applyToChildren(SubtreeChange& aSubtree)
-    { aSubtree.forEachChange(*this); }
-
-////////////////////////////////////////////////////////////////////////////////	
-
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/confapifactory.hxx b/configmgr/source/inc/confapifactory.hxx
deleted file mode 100644
index 1ca7f09818..0000000000
--- a/configmgr/source/inc/confapifactory.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: confapifactory.hxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 CONFIGMGR_API_FACTORY_HXX_
-#define CONFIGMGR_API_FACTORY_HXX_
-
-#include <sal/types.h>
-
-namespace com { namespace sun { namespace star {	
-    namespace uno 
-    { 
-        class XInterface;
-        template <class> class Reference;
-        class XComponentContext;
-    }
-    namespace lang 
-    { 
-        class XSingleComponentFactory;
-    }
-} } }
-namespace rtl { class OUString; }
-
-namespace configmgr
-{
-    namespace uno  = ::com::sun::star::uno;
-    namespace lang = ::com::sun::star::lang;
-
-    extern
-    uno::Reference< lang::XSingleComponentFactory > SAL_CALL
-        createProviderFactory(
-            ::rtl::OUString const & aImplementationName,
-            bool bAdmin
-        )
-        SAL_THROW( () );
-
-    struct ServiceRegistrationInfo;
-    struct SingletonRegistrationInfo;
-
-// provider instantiation
-    uno::Reference<uno::XInterface> SAL_CALL 
-        getDefaultConfigProviderSingleton( uno::Reference< uno::XComponentContext > const& xContext );
-
-    uno::Reference<uno::XInterface> SAL_CALL 
-        instantiateDefaultProvider( uno::Reference< uno::XComponentContext > const& xContext );
-
-// provider service info
-    const SingletonRegistrationInfo * getDefaultProviderSingletonInfo();
-    const ServiceRegistrationInfo   * getConfigurationProviderServiceInfo();
-    const ServiceRegistrationInfo   * getDefaultProviderServiceInfo();
-    const ServiceRegistrationInfo   * getAdminProviderServiceInfo();
-
-// other services - instantiation and info
-    uno::Reference< uno::XInterface > SAL_CALL 
-        instantiateConfigRegistry( uno::Reference< uno::XComponentContext > const& xContext );
-
-    const ServiceRegistrationInfo* getConfigurationRegistryServiceInfo();
-
-// bootstrap context support
-    uno::Reference<uno::XInterface> SAL_CALL 
-        instantiateBootstrapContext( uno::Reference< uno::XComponentContext > const& xContext );
-
-    const SingletonRegistrationInfo * getBootstrapContextSingletonInfo();
-    const ServiceRegistrationInfo   * getBootstrapContextServiceInfo();
-
-    namespace xml
-    {
-        uno::Reference< uno::XInterface > SAL_CALL instantiateSchemaParser
-        ( uno::Reference< uno::XComponentContext > const& xContext );
-        uno::Reference< uno::XInterface > SAL_CALL instantiateLayerParser
-        ( uno::Reference< uno::XComponentContext > const& xContext );
-        uno::Reference< uno::XInterface > SAL_CALL instantiateLayerWriter
-        ( uno::Reference< uno::XComponentContext > const& xContext );
-
-        const ServiceRegistrationInfo* getSchemaParserServiceInfo();
-        const ServiceRegistrationInfo* getLayerParserServiceInfo();
-        const ServiceRegistrationInfo* getLayerWriterServiceInfo();
-    }
-    namespace backend
-    {
-        uno::Reference<uno::XInterface> SAL_CALL 
-            getDefaultBackendSingleton( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateDefaultBackend( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference< uno::XInterface > SAL_CALL 
-            instantiateUpdateMerger( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateSingleBackendAdapter( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference< uno::XInterface > SAL_CALL 
-            instantiateMergeImporter( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference< uno::XInterface > SAL_CALL 
-            instantiateCopyImporter( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateMultiStratumBackend( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        const SingletonRegistrationInfo * getDefaultBackendSingletonInfo();
-        const ServiceRegistrationInfo   * getDefaultBackendServiceInfo();
-
-        const ServiceRegistrationInfo * getUpdateMergerServiceInfo();
-        const ServiceRegistrationInfo * getSingleBackendAdapterServiceInfo();
-        const ServiceRegistrationInfo * getMergeImportServiceInfo();
-        const ServiceRegistrationInfo * getCopyImportServiceInfo();
-        const ServiceRegistrationInfo * getMultiStratumBackendServiceInfo();
-    }
-    namespace localbe 
-    {
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalBackend( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalDataImporter( uno::Reference< uno::XComponentContext > const& xContext );
-
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalHierarchyBrowser( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalSchemaSupplier( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalLegacyStratum( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalDataStratum( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalReadonlyStratum( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalResourceStratum( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        uno::Reference<uno::XInterface> SAL_CALL 
-            instantiateLocalMultiStratum( uno::Reference< uno::XComponentContext > const& xContext );
-        
-        const ServiceRegistrationInfo * getLocalBackendServiceInfo();
-        const ServiceRegistrationInfo * getLocalDataImportServiceInfo();
-        const ServiceRegistrationInfo * getLocalHierarchyBrowserServiceInfo();
-        const ServiceRegistrationInfo * getLocalSchemaSupplierServiceInfo();
-        const ServiceRegistrationInfo * getLocalLegacyStratumServiceInfo();
-        const ServiceRegistrationInfo * getLocalDataStratumServiceInfo();
-        const ServiceRegistrationInfo * getLocalReadonlyStratumServiceInfo();
-        const ServiceRegistrationInfo * getLocalResourceStratumServiceInfo();
-        const ServiceRegistrationInfo * getLocalMultiStratumServiceInfo();
-    } // localbe
-   
-} //  namespace configmgr
-
-#endif // CONFIGMGR_API_FACTORY_HXX_
-
-
diff --git a/configmgr/source/inc/confevents.hxx b/configmgr/source/inc/confevents.hxx
deleted file mode 100644
index 6b1376213a..0000000000
--- a/configmgr/source/inc/confevents.hxx
+++ /dev/null
@@ -1,216 +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: confevents.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_API_EVENTS_HXX_
-#define CONFIGMGR_API_EVENTS_HXX_
-
-#include <hash_set>
-#include <map>
-#include <set>
-
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "configpath.hxx"
-#include "utility.hxx"
-
-namespace rtl { class OUString; }
-
-namespace configmgr
-{
-    class Change;
-    struct TreeChangeList;
-    class TreeManager;
-
-    namespace configuration { class AbsolutePath; }
-
-    struct IConfigListener : public salhelper::SimpleReferenceObject
-    {
-        virtual void disposing(TreeManager * pSource) = 0;
-    };
-    struct INodeListener : IConfigListener
-    {
-        virtual void nodeChanged(Change const& aChange, configuration::AbsolutePath const& aPath, TreeManager * pSource) = 0;
-        virtual void nodeDeleted(configuration::AbsolutePath const& aPath, TreeManager * pSource) = 0;
-    };
-
-    namespace internal
-    {
-
-    ////////////////////////////////////////////////////////////////////////
-        template <class ListenerRef>
-        class BroadcastImplHelper
-        {
-        public:
-            osl::Mutex mutex;
-
-        public:
-            BroadcastImplHelper() 
-            {}
-
-            ~BroadcastImplHelper() 
-            { 
-                OSL_ENSURE(m_aInterfaces.empty(), "Configuration Broadcaster was not disposed properly");
-            }
-
-        public:
-            typedef std::set<ListenerRef> Interfaces;
-
-        public:
-            typename Interfaces::iterator addListener(ListenerRef aListener) 
-            { 
-                return m_aInterfaces.insert(aListener).first; 
-            }
-            void removeListener(ListenerRef aListener) 
-            { 
-                m_aInterfaces.erase(aListener); 
-            }
-            
-            void disposing(TreeManager * pSource); 
-
-        public:
-            typename Interfaces::const_iterator begin() const { return m_aInterfaces.begin(); }
-            typename Interfaces::const_iterator end() const { return m_aInterfaces.end(); }
-
-            typename Interfaces::const_iterator find(ListenerRef aListener) const   { return m_aInterfaces.find(aListener); }
-            typename Interfaces::iterator findFull(ListenerRef aListener) { return m_aInterfaces.find(aListener); }
-        private:
-            Interfaces m_aInterfaces;
-
-            // no implementation - not copyable
-            BroadcastImplHelper(BroadcastImplHelper&);
-            void operator=(BroadcastImplHelper&);
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        template <class Listener>
-        void BroadcastImplHelper<Listener>::disposing(TreeManager * pSource)
-        {
-            osl::ClearableMutexGuard aGuard(this->mutex);	// ensure that no notifications are running
-
-            Interfaces aTargets;
-            aTargets.swap(m_aInterfaces);
-
-            aGuard.clear();
-            for(typename Interfaces::iterator it = aTargets.begin(); it != aTargets.end(); )
-            {
-                typename Interfaces::iterator cur = it++;
-                if (*cur)
-                    (*cur)->disposing(pSource);
-            }
-        }
-
-
-    /////////////////////////////////////////////////////////////////////////
-    
-        class NodeListenerInfo
-        {
-        public:
-            typedef std::hash_set<configuration::AbsolutePath, configuration::Path::Hash, configuration::Path::Equiv> Pathes;
-
-        public:
-            NodeListenerInfo(rtl::Reference<INodeListener> const&	pListener)
-                : m_pListener(pListener)
-            {
-            }
-
-        // path handling
-            Pathes const& pathList() const { return m_aPathes; }
-
-            void addPath(configuration::AbsolutePath const& sPath) const { m_aPathes.insert(sPath); }
-            void removePath(configuration::AbsolutePath const& sPath) const { m_aPathes.erase(sPath); }
-            //void removeChildPathes(OUString const& sPath);
-            
-        // behave as pointer for use as a 'reference' class 
-            rtl::Reference<INodeListener> get() const { return m_pListener; }
-            rtl::Reference<INodeListener> operator->() const { return get(); }
-            INodeListener& operator*() const { return *m_pListener; }
-        // needed to allow if (info) ... 
-            struct HasListener;
-            operator HasListener const*() const { return reinterpret_cast<HasListener*>(m_pListener.get()); }
-
-            bool operator < (NodeListenerInfo const& aInfo) const
-            { return std::less<INodeListener*>()(m_pListener.get(), aInfo.m_pListener.get()); }
-            
-            bool operator == (NodeListenerInfo const& aInfo) const 
-            { return !!( m_pListener == aInfo.m_pListener); }
-
-            bool operator > (NodeListenerInfo const& aInfo) const
-            { return aInfo.operator < (*this); }
-            bool operator >= (NodeListenerInfo const& aInfo) const
-            { return !operator<(aInfo); }
-            bool operator <= (NodeListenerInfo const& aInfo) const
-            { return !operator>(aInfo); }
-
-            bool operator != (NodeListenerInfo const& aInfo) const
-            { return !operator==(aInfo); }
-
-        private:
-            rtl::Reference<INodeListener> m_pListener;
-            mutable Pathes m_aPathes; // hack to be mutable even as set element
-        };
-    } // namespace
-
-    /////////////////////////////////////////////////////////////////////////
-    class ConfigChangeBroadcastHelper // broadcasts changes for a given set of options
-    {
-    public:
-        ConfigChangeBroadcastHelper();
-        ~ConfigChangeBroadcastHelper();
-
-        void broadcast(TreeChangeList const& anUpdate, sal_Bool bError, TreeManager * pSource);
-
-        void addListener(configuration::AbsolutePath const& aName, rtl::Reference<INodeListener> const& );
-        void removeListener(rtl::Reference<INodeListener> const&);
-
-        void dispose(TreeManager * pSource);
-
-    private:
-        void add(configuration::AbsolutePath const& aPath, rtl::Reference<INodeListener> const& pListener);
-        void remove(rtl::Reference<INodeListener> const& pListener);
-
-        void dispatch(Change const& rBaseChange, configuration::AbsolutePath const& sChangeLocation, sal_Bool _bError, TreeManager * pSource);
-        void dispatch(TreeChangeList const& rList_, sal_Bool _bError, TreeManager * pSource);
-        void disposing(TreeManager * pSource);
-
-        void dispatchInner(rtl::Reference<INodeListener> const& pTarget, configuration::AbsolutePath const& sTargetPath, Change const& rBaseChange, configuration::AbsolutePath const& sChangeLocation, sal_Bool _bError, TreeManager * pSource);
-        void dispatchOuter(rtl::Reference<INodeListener> const& pTarget, configuration::AbsolutePath const& sTargetPath, Change const& rBaseChange, configuration::AbsolutePath const& sChangeLocation, sal_Bool _bError, TreeManager * pSource);
-
-        typedef std::multimap<configuration::AbsolutePath, internal::BroadcastImplHelper<internal::NodeListenerInfo>::Interfaces::iterator, configuration::Path::Before> PathMap;
-        internal::BroadcastImplHelper<internal::NodeListenerInfo> m_aListeners;
-        PathMap m_aPathMap;
-    };
-} // namespace
-
-#endif // CONFIGMGR_API_EVENTS_HXX_
-
-
-
diff --git a/configmgr/source/inc/configdefaultprovider.hxx b/configmgr/source/inc/configdefaultprovider.hxx
deleted file mode 100644
index c8eff20009..0000000000
--- a/configmgr/source/inc/configdefaultprovider.hxx
+++ /dev/null
@@ -1,98 +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: configdefaultprovider.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 CONFIGMGR_CONFIG_DEFAULTPROVIDER_HXX_
-#define CONFIGMGR_CONFIG_DEFAULTPROVIDER_HXX_
-
-#include "utility.hxx"
-#include <com/sun/star/uno/Exception.hpp>
-#include <rtl/ref.hxx>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class ISubtree;
-    class IDefaultableTreeManager;
-    class RequestOptions;
-    class TreeManager;
-
-    namespace uno = com::sun::star::uno;
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-        class Tree;
-        class NodeRef;
-//-----------------------------------------------------------------------------
-
-        /// provides access to the default for a given request
-        class DefaultProviderProxy;
-
-        class DefaultProvider
-        {
-            rtl::Reference< DefaultProviderProxy > m_aProxy;
-        public:
-            // factory methods
-            static DefaultProvider createEmpty();
-            static DefaultProvider create(rtl::Reference< Tree > const& _aRootTree, 
-                                          RequestOptions const& _xOptions, 
-                                          rtl::Reference< TreeManager > const & _xDefaultProvider,
-                                          IDefaultableTreeManager* _pDefaultableTree);
-
-            // actual c'tor
-            explicit
-            DefaultProvider(rtl::Reference< DefaultProviderProxy > const& _xProviderProxy);
-
-        // standard c/d-tors to make compiler barrier
-            DefaultProvider(DefaultProvider const& _aOther);
-            DefaultProvider& operator=(DefaultProvider const& _aOther);
-            ~DefaultProvider();
-
-            bool isValid() const { return !! m_aProxy.is(); }
-
-        /// tries to load a default instance of the specified node
-            std::auto_ptr<ISubtree> getDefaultTree(rtl::Reference< Tree > const& _aTree, NodeRef const& _aNode) const SAL_THROW((com::sun::star::uno::Exception));
-
-        /// tries to load default data into the specified tree
-            bool fetchDefaultData(rtl::Reference< Tree > const& _aTreeRef) const SAL_THROW((com::sun::star::uno::Exception));
-        };
-
-//-----------------------------------------------------------------------------
-
-    }
-}
-
-#endif // CONFIGMGR_CONFIG_DEFAULTPROVIDER_HXX_
diff --git a/configmgr/source/inc/configexcept.hxx b/configmgr/source/inc/configexcept.hxx
deleted file mode 100644
index c9fa1c0f38..0000000000
--- a/configmgr/source/inc/configexcept.hxx
+++ /dev/null
@@ -1,120 +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: configexcept.hxx,v $
- * $Revision: 1.6.10.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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGEXCEPT_HXX_
-#define CONFIGMGR_CONFIGEXCEPT_HXX_
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-namespace configmgr
-{
-//-------------------------------------------------------------------------
-    namespace uno  = ::com::sun::star::uno;
-    namespace lang = ::com::sun::star::lang;
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-    //-------------------------------------------------------------------------
-
-        class Exception
-        {
-            rtl::OString m_sAsciiMessage;
-        public:
-            Exception(char const* sAsciiMessage);
-            Exception(rtl::OString const& sAsciiMessage);
-            virtual ~Exception() {}
-
-            virtual rtl::OUString message() const;
-            virtual char const* what() const;
-        };
-    //-------------------------------------------------------------------------
-
-        class InvalidName : public Exception
-        {
-            rtl::OUString m_sName;
-        public:
-            InvalidName(rtl::OUString const& sName, char const* sAsciiDescription);
-
-            virtual rtl::OUString message() const;
-        };
-    //-------------------------------------------------------------------------
-
-        class ConstraintViolation
-        : public Exception
-        {
-        public:
-            ConstraintViolation(char const* sConstraint);
-        };
-    //-------------------------------------------------------------------------
-
-        class TypeMismatch : public Exception
-        {
-            rtl::OUString m_sTypes;
-            static rtl::OUString describe(rtl::OUString const& sFoundType, rtl::OUString const& sExpectedType);
-        public:
-            TypeMismatch(rtl::OUString const& sFoundType, rtl::OUString const& sExpectedType);
-            TypeMismatch(rtl::OUString const& sFoundType, rtl::OUString const& sExpectedType, char const* sAsciiDescription);
-
-            virtual rtl::OUString message() const;
-        };
-    //-------------------------------------------------------------------------
-    }
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-    namespace configapi
-    {
-    //-------------------------------------------------------------------------
-        class ExceptionMapper
-        {
-            configuration::Exception& m_eOriginal;
-            uno::Reference<uno::XInterface> m_xContext;
-            rtl::OUString m_sMessage;
-        public:
-            ExceptionMapper(configuration::Exception& e);
-            ~ExceptionMapper();
-
-            void setContext(uno::XInterface* pContext);
-
-            rtl::OUString message() const;
-            uno::Reference<uno::XInterface> context() const;
-
-            void illegalArgument(sal_Int16 nArgument = -1) throw(lang::IllegalArgumentException);
-            void unhandled() throw(uno::RuntimeException);
-        };
-    //-------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
-#endif // CONFIGMGR_CONFIGEXCEPT_HXX_
diff --git a/configmgr/source/inc/configgroup.hxx b/configmgr/source/inc/configgroup.hxx
deleted file mode 100644
index c9fd42f732..0000000000
--- a/configmgr/source/inc/configgroup.hxx
+++ /dev/null
@@ -1,117 +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: configgroup.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGGROUP_HXX_
-#define CONFIGMGR_CONFIGGROUP_HXX_
-
-#include "configexcept.hxx"
-#include "noderef.hxx"
-#include "configdefaultprovider.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace script { class XTypeConverter; } 
-} } }
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-        class NodeChange;
-        class RelativePath;
-//-----------------------------------------------------------------------------
-
-        /// helper for updating a <type>NodeRef</type> that refers to a Group
-        class GroupUpdateHelper 
-        {
-            rtl::Reference< Tree > m_aTree;
-            NodeRef m_aNode;
-        public:
-            GroupUpdateHelper(rtl::Reference< Tree > const& aParentTree, NodeRef const& aGroupNode);
-            ~GroupUpdateHelper() {}
-
-            void validateNode(ValueRef const& aNode) const;
-            void validateNode(NodeRef const& aNode) const;
-
-            rtl::Reference< Tree > const& tree() const { return m_aTree; }
-            NodeRef const& node() const { return m_aNode; }
-        private:
-            void implValidateTree(rtl::Reference< Tree > const& aTree) const;
-            void implValidateNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode) const;
-            void implValidateNode(rtl::Reference< Tree > const& aTree, ValueRef const& aNode) const;
-        };
-//-----------------------------------------------------------------------------
-        /// allows to update values of a simple type within a <type>NodeRef</type> that refers to a Group
-        class GroupUpdater 
-        {
-            GroupUpdateHelper   m_aHelper;
-            com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter>    m_xTypeConverter;
-        public:
-            GroupUpdater(rtl::Reference< Tree > const& aParentTree, NodeRef const& aGroupNode, com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> const& xConverter);
-
-            NodeChange validateSetValue(ValueRef const& aValueNode, com::sun::star::uno::Any const& newValue );
-
-        private:
-            com::sun::star::uno::Any implValidateValue(rtl::Reference< Tree > const& aTree, ValueRef const& aNode, com::sun::star::uno::Any const& aValue) const;
-        };
-//-----------------------------------------------------------------------------
-
-        /// allows to reset to default value or state members of a <type>NodeRef</type> that refers to a Group
-        class GroupDefaulter
-        {
-            GroupUpdateHelper   m_aHelper;
-            DefaultProvider     m_aDefaultProvider;
-            bool                m_bHasDoneSet;
-        public:
-            GroupDefaulter(rtl::Reference< Tree > const& _aParentTree, NodeRef const& _aGroupNode, DefaultProvider const& _aProvider);
-
-            bool hasDoneSet() const { return m_bHasDoneSet; }
-
-            NodeChange validateSetToDefaultValue(ValueRef const& aValueNode);
-
-            NodeChange validateSetToDefaultState(NodeRef const& aNode);
-
-            NodeChanges validateSetAllToDefault();
-
-            static bool isDataAvailable(rtl::Reference< Tree > const& _aParentTree, NodeRef const& _aGroupNode);
-            static bool ensureDataAvailable(rtl::Reference< Tree > const& _aParentTree, NodeRef const& _aGroupNode, DefaultProvider const& _aSource);
-        };
-//-----------------------------------------------------------------------------
-        bool isPossibleValueType(com::sun::star::uno::Type const& aValueType); 
-//-----------------------------------------------------------------------------
-        bool convertCompatibleValue(com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> const& xConverter, uno::Any& rConverted, 
-                                    com::sun::star::uno::Any const& rNewValue, com::sun::star::uno::Type const& rTargetType); 
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGGROUP_HXX_
diff --git a/configmgr/source/inc/configinteractionhandler.hxx b/configmgr/source/inc/configinteractionhandler.hxx
deleted file mode 100644
index 6b1d3f2b36..0000000000
--- a/configmgr/source/inc/configinteractionhandler.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: configinteractionhandler.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 CONFIGMGR_CONFIGINTERACTIONHANDLER_HXX
-#define CONFIGMGR_CONFIGINTERACTIONHANDLER_HXX
-
-#include "sal/config.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "rtl/ref.hxx"
-#include "uno/current_context.hxx"
-
-namespace com { namespace sun { namespace star {
-    namespace task { class XInteractionHandler; }
-    namespace uno { class Any; }
-} } }
-namespace rtl { class OUString; }
-
-namespace configmgr { namespace apihelper {
-
-/**
-   represents the InteractionHandler for configuration errors from the current
-   context.
-
-   <p>Should only be kept in scope while the error is being handled.</p>
-*/
-class ConfigurationInteractionHandler {
-public:
-    ConfigurationInteractionHandler();
-
-    ~ConfigurationInteractionHandler();
-
-    com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >
-    get() const; // throw (com::sun::star::uno::RuntimeException)
-
-    void setRecursive(
-        com::sun::star::uno::Reference<
-        com::sun::star::task::XInteractionHandler > const & handler);
-
-private:
-    ConfigurationInteractionHandler(ConfigurationInteractionHandler &);
-        // not defined
-    void operator =(ConfigurationInteractionHandler &); // not defined
-
-    com::sun::star::uno::Any getPreviousContextValue(
-        rtl::OUString const & name) const;
-        // throw (com::sun::star::uno::RuntimeException)
-
-    class Context;
-    friend class Context;
-
-    rtl::Reference< Context > m_context;
-    com::sun::star::uno::ContextLayer m_layer;
-};
-
-} }
-
-#endif
diff --git a/configmgr/source/inc/configpath.hxx b/configmgr/source/inc/configpath.hxx
deleted file mode 100644
index 05b09337f8..0000000000
--- a/configmgr/source/inc/configpath.hxx
+++ /dev/null
@@ -1,449 +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: configpath.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGPATH_HXX_
-#define CONFIGMGR_CONFIGPATH_HXX_
-
-#include <rtl/ustring.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif // INCLUDED_VECTOR
- 
-namespace configmgr
-{
-    namespace configuration
-    {
-        //--------------------------------------------------------------------
-
-        /** check if this is a well-formed name for a 
-            config Node (excluding set elements)
-        */
-        bool isSimpleName(rtl::OUString const& sName) SAL_THROW(());
-    
-        /** make a name out of <var>sName</var>, 
-            validating that it can be used for a config Node (excluding set elements)
-            or template name.
-            @throws InvalidName
-                if the name is not valid for that purpose
-        */
-        rtl::OUString validateNodeName(rtl::OUString const& sName);
-
-        /** make a name out of <var>sName</var>
-            validating that it can be used for a config set element
-            @throws InvalidName
-                if the name is not valid for that purpose
-        */
-        rtl::OUString validateElementName(rtl::OUString const& sName);
-    //------------------------------------------------------------------------
-
-    //------------------------------------------------------------------------
-        namespace Path
-        {
-        //------------------------------------------------------------------------
-
-            class Component
-            {
-                /// holds the contents of this path component
-                rtl::OUString m_aName;
-            public:
-                /// construct a path component from a string, without any validation
-                Component(rtl::OUString const& _sName) SAL_THROW(());
-
-                /// is this component an empty name ?
-                bool isEmpty()    const SAL_THROW(()) { return m_aName.getLength() == 0; }
-                /// is this component a simple name ?
-                bool isSimpleName()    const SAL_THROW(());
-                /// get the inner name for this component
-                rtl::OUString getName()         const SAL_THROW(());
-                /// get the embedded type name for this component (if any)
-                rtl::OUString getTypeName()     const SAL_THROW(());
-
-                /// get the contents of this as string (unparsed).
-                rtl::OUString toPathString() const SAL_THROW(()) { return m_aName; }
-            
-                // hashing - for hash maps. compatible to equiv or matches
-                size_t hashCode() const SAL_THROW(())
-                { return this->getName().hashCode(); }
-
-                /// get the contents of this as a name (unparsed). Use with care !
-                rtl::OUString const& getInternalName() const SAL_THROW(()) { return m_aName; }
-
-            };
-
-        //-------------------------------------------------------------------------
-
-            /// compare taking type wildcards into account
-            bool matches(Component const& lhs,Component const& rhs) SAL_THROW(());
-
-            /// compare by inner names only
-            bool before(Component const& lhs,Component const& rhs) SAL_THROW(());
-
-            /// compare by inner names only
-            bool equiv(Component const& lhs,Component const& rhs) SAL_THROW(());
-        //-------------------------------------------------------------------------
-
-            /// construct a empty path component
-            Component makeEmptyComponent() SAL_THROW(());
-
-        //-------------------------------------------------------------------------
-            /// construct a path component from a name, validating it as simple name
-            Component wrapSimpleName(rtl::OUString const& _aName);
-
-            /// construct a path component from a type and element name, using a wildcard if no type is available
-            Component makeCompositeName(rtl::OUString const& _aElementName, rtl::OUString const& _aTypeName);
-
-    //-----------------------------------------------------------------------------
-            /// construct a composite path component from a element name or string, using a wildcard type
-            template <class NameRep>
-            Component wrapElementName(NameRep const& _aElementName) SAL_THROW(())
-            {
-                return makeCompositeName(_aElementName, NameRep());
-            }
-
-        //-------------------------------------------------------------------------
-            /// construct a path component from an arbitrary na,e or string
-            template <class NameRep>
-            Component wrapSafeName(NameRep const& _aName) SAL_THROW(())
-            {
-                return isSimpleName(_aName) ? wrapSimpleName(_aName) : wrapElementName(_aName);
-            }
-
-    //-----------------------------------------------------------------------------
-            /** lower-level representation of a path within the configuration
-                <p>Keeps the data in a vector of names in reverse order! </P>
-            */
-            class Rep
-            {
-            public:
-                /// construct an empty path
-                Rep() SAL_THROW(()) : m_aComponents() {}
-
-                /// construct a path consisting of a single component <var>_aName</var>
-                explicit Rep(Component const& _aName) SAL_THROW(()) : m_aComponents(1,_aName) {}
-
-                /// construct a path consisting of a path subrange
-                explicit Rep(std::vector<Component>::const_reverse_iterator const& _first, std::vector<Component>::const_reverse_iterator const& _last) 
-                : m_aComponents(_last.base(), _first.base()) {}
-
-                /// swap contents with another instance
-                void swap(Rep& _aOther) SAL_THROW(()) { m_aComponents.swap(_aOther.m_aComponents); }
-
-                /// modify a path by prepending <var>aName</var>
-                void prepend(Component const& _aName) SAL_THROW(()) { m_aComponents.push_back(_aName); }
-
-                /// modify a path by prepending <var>aName</var>
-                void prepend(Rep const& _aOther) SAL_THROW(());
-
-                /// get the local name (the last component of this path)
-                Component const& getLocalName() const { check_not_empty(); return m_aComponents.front(); }
-
-                /// get the next name (the first component of this path)
-                Component const& getFirstName() const { check_not_empty(); return m_aComponents.back(); }
-
-                /// set this to the remainder after the first name (drop the first component of this path)
-                void dropFirstName() { check_not_empty(); m_aComponents.pop_back(); }
-
-                /// get a /-separated string representation of this
-                rtl::OUString toString(bool _bAbsolute) const SAL_THROW(());
-
-            public:
-                /// check if this is an empty path
-                bool isEmpty() const SAL_THROW(()) { return m_aComponents.empty(); }
-
-                /// Count the components of this
-                std::vector<Component>::size_type countComponents() const SAL_THROW(()) { return m_aComponents.size(); }
-
-                /// Insert a component into this path
-                void insertComponent(std::vector<Component>::reverse_iterator _it, Component _aName) 
-                { m_aComponents.insert(_it.base(),_aName); }
-
-                /// Remove a component from this path
-                void removeComponent(std::vector<Component>::reverse_iterator _it) { m_aComponents.erase(_it.base()); }
-
-                /// Remove all components from this path
-                void clearComponents() SAL_THROW(()) { m_aComponents.clear(); }
-
-                /// get a STL style iterator to the first component 
-                std::vector<Component>::const_reverse_iterator begin() const SAL_THROW(()) { return m_aComponents.rbegin(); }
-                /// get a STL style iterator to after the last component
-                std::vector<Component>::const_reverse_iterator end()   const SAL_THROW(()) { return m_aComponents.rend(); }
-
-                /// get a STL style iterator to the first component 
-                std::vector<Component>::reverse_iterator begin_mutate() SAL_THROW(()) { return m_aComponents.rbegin(); }
-                /// get a STL style iterator to after the last component
-                std::vector<Component>::reverse_iterator end_mutate() SAL_THROW(())   { return m_aComponents.rend(); }
-
-                // hashing - for hash maps
-                size_t hashCode() const SAL_THROW(());
-
-                /// preflight check for operations that require a non-empty path
-                void check_not_empty() const;
-
-            private:
-                std::vector<Component> m_aComponents;
-            };
-        //------------------------------------------------------------------------
-
-            /// compare taking type wildcards into account
-            bool matches(Rep const& lhs,Rep const& rhs) SAL_THROW(());
-
-            /// compare by inner names only
-            bool before(Rep const& lhs,Rep const& rhs) SAL_THROW(());
-
-            /// compare by inner names only
-            bool equiv(Rep const& lhs,Rep const& rhs) SAL_THROW(());
-        //------------------------------------------------------------------------
-
-            /// check a path for a prefix
-            bool hasMatchingPrefix(Rep const& _aPath,Rep const& _aPrefix) SAL_THROW(());
-
-            /// remove a prefix from a path. Throws InvalidName if it isn't a prefix
-            Rep stripMatchingPrefix(Rep const& _aPath,Rep const& _aPrefix);
-        //------------------------------------------------------------------------
-
-            /// distinguishes which kind of path is present in a string
-            bool isAbsolutePath(rtl::OUString const& _sPath);
-        //------------------------------------------------------------------------
-        }
-    //------------------------------------------------------------------------
-
-        class RelativePath
-        {
-            Path::Rep m_aRep;
-        public:
-        // Construction
-            /// construct a relative path from <var>aString</var> throwing InvalidName for parse errors
-            static  RelativePath parse(rtl::OUString const& _aString);
-
-            /// construct an empty relative path
-            RelativePath() SAL_THROW(()) : m_aRep() { init(); }
-
-            /// construct a relative path having <var>aRep</var> as representation 
-            explicit RelativePath(Path::Rep const& _aRep) 
-            : m_aRep(_aRep) { init(); }
-
-            /// CONVERSION: construct a relative path having <var>aName</var> as single component 
-            RelativePath(Path::Component const& _aName) SAL_THROW(());
-
-            /// build the Path that results from appending <var>aPath</var> to this
-            RelativePath compose(RelativePath const& _aPath) const SAL_THROW(());
-
-            /// check if this is an empty path
-            bool isEmpty() const SAL_THROW(()) { return m_aRep.isEmpty(); }
-
-            /// Count the components of this
-            std::vector<Path::Component>::size_type getDepth() const SAL_THROW(()) { return m_aRep.countComponents(); }
-
-            /// get the local name (the last component of this path)
-            Path::Component const& getLocalName() const { return m_aRep.getLocalName(); }
-
-            /// get the local name (the first component of this path)
-            Path::Component const& getFirstName() const { return m_aRep.getFirstName(); }
-
-            /// set this to the remainder of this path after the first name (drop the first component of this path)
-            void dropFirstName() { m_aRep.dropFirstName(); }
-
-            /// get a /-separated string representation of this
-            rtl::OUString toString() const SAL_THROW(());
-        public:
-        // Iteration support
-            /// get a STL style iterator to the first component 
-            std::vector<Path::Component>::const_reverse_iterator begin() const SAL_THROW(()) { return m_aRep.begin(); }
-            /// get a STL style iterator to after the last component
-            std::vector<Path::Component>::const_reverse_iterator end()   const SAL_THROW(()) { return m_aRep.end(); }
-
-            /// get a STL style iterator to the first component 
-            std::vector<Path::Component>::reverse_iterator begin_mutate() SAL_THROW(()) { return m_aRep.begin_mutate(); }
-            /// get a STL style iterator to after the last component
-            std::vector<Path::Component>::reverse_iterator end_mutate() SAL_THROW(())   { return m_aRep.end_mutate(); }
-
-        // Direct access - 'package' visible
-            /// Get a reference to (or copy of) the internal PathRep of this
-            Path::Rep const& rep() const SAL_THROW(()) { return m_aRep; }
-
-        private:
-            void init();
-        };
-        
-        /// compare taking type wildcards into account
-        inline bool matches(RelativePath const& lhs,RelativePath const& rhs) SAL_THROW(())
-        { return Path::matches(lhs.rep(),rhs.rep()); }
-
-    //------------------------------------------------------------------------
-
-        class AbsolutePath
-        {
-            Path::Rep m_aRep;
-        public:
-        // Construction
-            /// construct a absolute path from <var>aString</var> throwing InvalidName for parse errors 
-            static AbsolutePath parse(rtl::OUString const& _aString);
-
-            /// construct a absolute path to a whole module (toplevel) without error checking
-            static AbsolutePath makeModulePath(rtl::OUString const& _aString) SAL_THROW(());
-
-            /// construct an absolute path to the (virtual) hierarchy root
-            static  AbsolutePath root() SAL_THROW(());
-
-            /// construct an (otherwise invalid) substitute path for the root of a free-floating node
-            static  AbsolutePath detachedRoot() SAL_THROW(());
-
-            /// construct a absolute path having <var>aRep</var> as representation 
-            explicit AbsolutePath(Path::Rep const& _aRep) SAL_THROW(()) 
-            : m_aRep(_aRep) { init(); }
-
-            /// build the absolute path that results from appending <var>aPath</var> to this
-            AbsolutePath compose(RelativePath const& _aPath) const SAL_THROW(());
-
-            /// build the absolute path that results from removing the last component of this
-            AbsolutePath getParentPath() const;
-
-            /// check if this is the path to the (imaginary) root node
-            bool isRoot() const SAL_THROW(()) { return m_aRep.isEmpty(); }
-#if OSL_DEBUG_LEVEL > 0
-            /// check if this is a path to a detached node
-            bool isDetached() const SAL_THROW(());
-#endif
-            /// get the local name (the last component of this path)
-            Path::Component const& getLocalName() const { return m_aRep.getLocalName(); }
-
-            rtl::OUString const & getModuleName() const { return m_aRep.getFirstName().getInternalName(); }
-
-            /// get a /-separated string representation of this
-            rtl::OUString toString() const SAL_THROW(());
-
-            /// Count the components of this
-            std::vector<Path::Component>::size_type getDepth() const SAL_THROW(()) { return m_aRep.countComponents(); }
-        public:
-        // Iteration support
-            /// get a STL style iterator to the first component 
-            std::vector<Path::Component>::const_reverse_iterator begin() const SAL_THROW(()) { return m_aRep.begin(); }
-            /// get a STL style iterator to after the last component
-            std::vector<Path::Component>::const_reverse_iterator end()   const SAL_THROW(()) { return m_aRep.end(); }
-
-            /// get a STL style iterator to the first component 
-            std::vector<Path::Component>::reverse_iterator begin_mutate() SAL_THROW(()) { return m_aRep.begin_mutate(); }
-            /// get a STL style iterator to after the last component
-            std::vector<Path::Component>::reverse_iterator end_mutate() SAL_THROW(())   { return m_aRep.end_mutate(); }
-
-        // Direct access - 'package' visible
-            /// Get a reference to (or copy of) the internal PathRep of this
-            Path::Rep const& rep() const SAL_THROW(()) { return m_aRep; }
-        private:
-            void init() SAL_THROW(());
-        };
-
-        /// compare taking type wildcards into account
-        inline bool matches(AbsolutePath const& lhs,AbsolutePath const& rhs) SAL_THROW(())
-        { return Path::matches(lhs.rep(),rhs.rep()); }
-
-        namespace Path
-        {
-    //------------------------------------------------------------------------
-            template <class PathClass>
-            bool hasPrefix(PathClass const& _aPath, PathClass const& _aPrefix) SAL_THROW(())
-            { 
-                return hasMatchingPrefix(_aPath.rep(),_aPrefix.rep() ); 
-            }
-    //------------------------------------------------------------------------
-
-            template <class PathClass>
-            RelativePath stripPrefix(PathClass const& _aPath, PathClass const& _aPrefix)
-            { 
-                return RelativePath( stripMatchingPrefix(_aPath.rep(),_aPrefix.rep()) ); 
-            }
-    //------------------------------------------------------------------------
-
-    // STL Helpers
-    //------------------------------------------------------------------------
-
-            /// a weak strict ordering considering only the name part
-            struct Before 
-            {
-                bool operator()(Component const& lhs, Component const& rhs) const SAL_THROW(())
-                { return before(lhs,rhs); }
-                bool operator()(Rep const& lhs, Rep const& rhs) const SAL_THROW(())
-                { return before(lhs,rhs); }
-                bool operator()(AbsolutePath const& lhs, AbsolutePath const& rhs) const SAL_THROW(())
-                { return before(lhs.rep(),rhs.rep()); }
-                bool operator()(RelativePath const& lhs, RelativePath const& rhs) const SAL_THROW(())
-                { return before(lhs.rep(),rhs.rep()); }
-            };
-    //------------------------------------------------------------------------
-
-            /// an equality relation considering only the name part (compatible to Before)
-            struct Equiv 
-            {
-                bool operator()(Component const& lhs, Component const& rhs) const SAL_THROW(())
-                { return equiv(lhs,rhs); }
-                bool operator()(Rep const& lhs, Rep const& rhs) const SAL_THROW(())
-                { return equiv(lhs,rhs); }
-                bool operator()(AbsolutePath const& lhs, AbsolutePath const& rhs) const SAL_THROW(())
-                { return equiv(lhs.rep(),rhs.rep()); }
-                bool operator()(RelativePath const& lhs, RelativePath const& rhs) const SAL_THROW(())
-                { return equiv(lhs.rep(),rhs.rep()); }
-            };
-    //------------------------------------------------------------------------
-
-            /// a hash generator (compatible to Equiv and Before)
-            struct Hash
-            {
-                size_t operator()(Component const& _aObject) const SAL_THROW(())
-                { return _aObject.hashCode(); }
-                size_t operator()(Rep const& _aObject) const SAL_THROW(())
-                { return _aObject.hashCode(); }
-                size_t operator()(AbsolutePath const& _aObject) const SAL_THROW(())
-                { return _aObject.rep().hashCode(); }
-                size_t operator()(RelativePath const& _aObject) const SAL_THROW(())
-                { return _aObject.rep().hashCode(); }
-            };
-    //------------------------------------------------------------------------
-            /// a binary predicate that is not (!) an equivalence relation
-
-            struct Matches 
-            {
-                bool operator()(Component const& lhs, Component const& rhs) const SAL_THROW(())
-                { return matches(lhs,rhs); }
-                bool operator()(Rep const& lhs, Rep const& rhs) const SAL_THROW(())
-                { return matches(lhs,rhs); }
-                bool operator()(AbsolutePath const& lhs, AbsolutePath const& rhs) const SAL_THROW(())
-                { return matches(lhs.rep(),rhs.rep()); }
-                bool operator()(RelativePath const& lhs, RelativePath const& rhs) const SAL_THROW(())
-                { return matches(lhs.rep(),rhs.rep()); }
-            };
-    //------------------------------------------------------------------------
-        }
-    //------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGNAME_HXX_
diff --git a/configmgr/source/inc/configset.hxx b/configmgr/source/inc/configset.hxx
deleted file mode 100644
index 62651a963f..0000000000
--- a/configmgr/source/inc/configset.hxx
+++ /dev/null
@@ -1,146 +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: configset.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGSET_HXX_
-#define CONFIGMGR_CONFIGSET_HXX_
-
-#include "configexcept.hxx"
-#include "configdefaultprovider.hxx"
-#include "template.hxx"
-#include "noderef.hxx"
-#include <rtl/ref.hxx>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace com { namespace sun { namespace star {
-    namespace script { class XTypeConverter; } 
-} } }
-
-namespace configmgr
-{
-    namespace data { class TreeSegment; }
-    
-    namespace configuration
-    {
-        namespace Path { class Component; }
-        //---------------------------------------------------------------------
-
-        class ElementTree;
-
-        class NodeChange;
-        class Template;
-
-        class SetElementFactory
-        {
-            TemplateProvider m_aProvider;
-        public:
-            SetElementFactory(TemplateProvider const& aProvider);
-            SetElementFactory(SetElementFactory const& aOther);
-            SetElementFactory& operator=(SetElementFactory const& aOther);
-            ~SetElementFactory();
-
-            rtl::Reference< ElementTree > instantiateTemplate(rtl::Reference<Template> const& aTemplate);
-            rtl::Reference< ElementTree > instantiateOnDefault(rtl::Reference< data::TreeSegment > const& _aTree, rtl::Reference<Template> const& aDummyTemplate);
-
-            static TemplateProvider findTemplateProvider(rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-        };
-
-//-----------------------------------------------------------------------------
-
-        /// allows to insert,remove and replace an element of a <type>Node</type> that is a Container ("set") of full-fledged trees.
-        class TreeSetUpdater 
-        {
-            rtl::Reference< Tree > m_aParentTree;
-            NodeRef m_aSetNode;
-            rtl::Reference<Template>	m_aTemplate;
-        public:
-            TreeSetUpdater(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode, rtl::Reference< Template > const& aTemplate);
-
-            NodeChange validateInsertElement (rtl::OUString const& aName, rtl::Reference< ElementTree > const& aNewElement);
-
-            NodeChange validateReplaceElement(rtl::Reference< ElementTree > const& aElement, rtl::Reference< ElementTree > const& aNewElement);
-
-            NodeChange validateRemoveElement (rtl::Reference< ElementTree > const& aElement);
-        private:
-            void		        implValidateSet();
-            Path::Component		implValidateElement(rtl::Reference< ElementTree > const& aElement, bool bReqRemovable);
-            void		        implValidateTree(rtl::Reference< ElementTree > const& aElementTree);
-        };
-//-----------------------------------------------------------------------------
-        /// allows to insert,remove and replace an element of a <type>Node</type> that is a Container ("set") of simple values.
-        class ValueSetUpdater 
-        {
-            rtl::Reference< Tree > m_aParentTree;
-            NodeRef m_aSetNode;
-            rtl::Reference<Template>	m_aTemplate;
-            com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> m_xTypeConverter;
-        public:
-            ValueSetUpdater(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode, 
-                            rtl::Reference< Template > const& aTemplate, com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> const& xConverter);
-
-            NodeChange validateInsertElement (rtl::OUString const& aName, com::sun::star::uno::Any const& aNewValue);
-
-            NodeChange validateReplaceElement(rtl::Reference< ElementTree > const& aElement, com::sun::star::uno::Any const& aNewValue);
-
-            NodeChange validateRemoveElement (rtl::Reference< ElementTree > const& aElement);
-        private:
-            void implValidateSet();
-            Path::Component     implValidateElement(rtl::Reference< ElementTree > const& aElement, bool bReqRemovable);
-            com::sun::star::uno::Any implValidateValue(rtl::Reference< Tree > const& aElementTree, com::sun::star::uno::Any const& aValue);
-            com::sun::star::uno::Any implValidateValue(com::sun::star::uno::Any const& aValue);
-
-            rtl::Reference<ElementTree> makeValueElement(rtl::OUString const& aName, rtl::Reference< Tree > const& aElementTree, com::sun::star::uno::Any const& aValue, bool bInserting);
-            rtl::Reference<ElementTree> makeValueElement(rtl::OUString const& aName, com::sun::star::uno::Any const& aValue, bool bInserting);
-            rtl::Reference< Tree > extractElementNode(rtl::Reference< ElementTree > const& aElement);
-        };
-//-----------------------------------------------------------------------------
-
-        /// allows to restore to its default state a <type>Node</type> that is a Container ("set") of full-fledged trees.
-        class SetDefaulter
-        {
-            rtl::Reference< Tree > m_aParentTree;
-            NodeRef m_aSetNode;
-            DefaultProvider m_aDefaultProvider;
-        public:
-            SetDefaulter(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode, DefaultProvider const& aDefaultProvider);
-
-            NodeChange validateSetToDefaultState();
-
-        private:
-            void implValidateSet();
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGSET_HXX_
diff --git a/configmgr/source/inc/confsvccomponent.hxx b/configmgr/source/inc/confsvccomponent.hxx
deleted file mode 100644
index 237f3a6f1f..0000000000
--- a/configmgr/source/inc/confsvccomponent.hxx
+++ /dev/null
@@ -1,91 +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: confsvccomponent.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 CONFIGMGR_API_SVCCOMPONENT_HXX_
-#define CONFIGMGR_API_SVCCOMPONENT_HXX_
-
-#include "serviceinfohelper.hxx"
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/typeprovider.hxx>
-
-#ifndef _OSL_MUTEX_HXX_
-#include <osl/Mutex.hxx>
-#endif
-#include <rtl/ustring.hxx>
-
-namespace configmgr 
-{
-
-//----------------------------------------------------------------------------
-    namespace css   = ::com::sun::star;
-    namespace uno   = css::uno;
-    namespace lang  = css::lang;
-
-//----------------------------------------------------------------------------
-    class ServiceComponentImpl
-        : public ::cppu::WeakComponentImplHelper1< lang::XServiceInfo >
-    {
-    protected:
-        ServiceImplementationInfo const*const     m_info;
-    public:
-        ServiceComponentImpl(ServiceImplementationInfo const* aInfo);
-
-        // XTypeProvider
-        virtual uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(uno::RuntimeException);
-        //virtual uno::Sequence<uno::Type> SAL_CALL getTypes(  ) throw(uno::RuntimeException) = 0;
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName(  ) throw(uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException);
-        virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(uno::RuntimeException);
-
-        // Component Helper - force override
-        virtual void SAL_CALL disposing() = 0;
-        // Component Helper - check object state
-        virtual void checkAlive() throw (uno::RuntimeException);
-        void checkAlive(char const* message) throw (uno::RuntimeException) 
-            { checkAlive( rtl::OUString::createFromAscii(message) ); }
-        void checkAlive(rtl::OUString const& message) throw (uno::RuntimeException);
-
-        // Extra helpers
-        static uno::Sequence<sal_Int8> getStaticImplementationId(ServiceImplementationInfo const* pServiceInfo) throw(uno::RuntimeException);
-
-    private: // no implementation
-        ServiceComponentImpl(ServiceComponentImpl&);
-        void operator=(ServiceComponentImpl&);
-    };
-//----------------------------------------------------------------------------
-
-} // namespace configmgr
-
-#endif // CONFIGMGR_API_SVCCOMPONENT_HXX_
-
-
diff --git a/configmgr/source/inc/datalock.hxx b/configmgr/source/inc/datalock.hxx
deleted file mode 100644
index b86166139f..0000000000
--- a/configmgr/source/inc/datalock.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: datalock.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 CONFIGMGR_DATALOCK_HXX_
-#define CONFIGMGR_DATALOCK_HXX_
-
-#include "sal/config.h"
-
-#include "osl/interlck.h"
-#include "osl/mutex.hxx"
-
-namespace configmgr {
-
-    class UnoApiLock
-    {
-        static osl::Mutex aCoreLock;
-    public:
-        static volatile oslInterlockedCount nHeld;
-        UnoApiLock()  { acquire(); }
-        ~UnoApiLock() { release(); }
-
-        static osl::Mutex &getLock() { return aCoreLock; }
-        static void acquire() { aCoreLock.acquire(); nHeld++; }
-        static void release() { nHeld--; aCoreLock.release(); }
-        static bool isHeld() { return nHeld != 0; }
-    };
-    class UnoApiLockReleaser
-    {
-        oslInterlockedCount mnCount;
-    public:
-        UnoApiLockReleaser();
-        ~UnoApiLockReleaser();
-    };
-    class UnoApiLockClearable : public UnoApiLock
-    {
-        bool mbSet;
-    public:
-        UnoApiLockClearable() : mbSet(true)  { acquire(); }
-        ~UnoApiLockClearable() { clear(); }
-        void clear() { if (mbSet) { mbSet = false; release(); } }
-    };
-}
-
-#endif // CONFIGMGR_DATALOCK_HXX_
diff --git a/configmgr/source/inc/defaultprovider.hxx b/configmgr/source/inc/defaultprovider.hxx
deleted file mode 100644
index 8137b2ffe3..0000000000
--- a/configmgr/source/inc/defaultprovider.hxx
+++ /dev/null
@@ -1,76 +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: defaultprovider.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 CONFIGMGR_DEFAULTPROVIDER_HXX
-#define CONFIGMGR_DEFAULTPROVIDER_HXX
-
-#include "sal/config.h"
-
-#include "com/sun/star/uno/Exception.hpp"
-#include "sal/types.h"
-
-#include "utility.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-        class AbsolutePath;
-    }
-    //-------------------------
-    class RequestOptions;
-    //==========================================================================
-    //= IDefaultableTreeManager
-    //==========================================================================
-    /* is a supplementary interface for an <type>OProviderImpl</type>.
-       <p>Supports functionality to load default data into the managed tree</p>
-    */
-    class SAL_NO_VTABLE IDefaultableTreeManager
-    {
-    public:
-        /** attempt to load default data into the tree named by a path using certain options 
-            and requiring a specific loading depth.
-
-            @returns
-                <TRUE/>,  if some default data is available within the tree
-                <FALSE/>, if no default data is available for the tree
-        */
-        virtual sal_Bool fetchDefaultData(configuration::AbsolutePath const& aSubtreePath, 
-                                          const RequestOptions& _xOptions
-                                          ) SAL_THROW((com::sun::star::uno::Exception)) = 0;
-
-    };
-
-////////////////////////////////////////////////////////////////////////////////
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/emptylayer.hxx b/configmgr/source/inc/emptylayer.hxx
deleted file mode 100644
index dc22dc2289..0000000000
--- a/configmgr/source/inc/emptylayer.hxx
+++ /dev/null
@@ -1,56 +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: emptylayer.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 CONFIGMGR_BACKEND_EMPTYLAYER_HXX
-#define CONFIGMGR_BACKEND_EMPTYLAYER_HXX
-
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace backend
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno           = ::com::sun::star::uno;
-        namespace backenduno    = ::com::sun::star::configuration::backend;
-
-        // -----------------------------------------------------------------------------
-        uno::Reference< backenduno::XLayer > createEmptyLayer();
-
-        bool checkEmptyLayer(uno::Reference< backenduno::XLayer > const & xLayer );
-        // -----------------------------------------------------------------------------
-    } // namespace xml
-    // -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
diff --git a/configmgr/source/inc/filehelper.hxx b/configmgr/source/inc/filehelper.hxx
deleted file mode 100644
index 30677ed511..0000000000
--- a/configmgr/source/inc/filehelper.hxx
+++ /dev/null
@@ -1,117 +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: filehelper.hxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONFIGMGR_FILEHELPER_HXX_
-#define _CONFIGMGR_FILEHELPER_HXX_
-
-#include "utility.hxx"
-#include <osl/file.hxx>
-#include <com/sun/star/io/IOException.hpp>
-
-namespace io = com::sun::star::io;		
-
-namespace configmgr 
-{	
-    //==========================================================================
-    //= FileHelper
-    //==========================================================================
-    /** Within the FileHelper namespace there is a list of methods declared, which ease
-        specific file operations.
-    */
-    namespace FileHelper
-    {
-        /// delimiter used in URLs and ConfPath
-        static const ::sal_Unicode  delimiter = sal_Unicode('/');		
-        
-        /// Tests if the file exists. 
-        bool fileExists(rtl::OUString const& _sFileURL);
-        
-        /// Tests if the directory exists. 
-        bool dirExists(rtl::OUString const& _sDirURL);		
-        
-        /** Returns the parent part of the pathname of this File URL, 
-            or an empty string if the name has no parent part. 
-            The parent part is generally everything leading up to the last occurrence 
-            of the separator character.
-        */
-        rtl::OUString getParentDir(rtl::OUString const& _aFileURL);
-
-        /**
-          Returns the file name part of a file URL.
-
-          @param aFileUrl   file URL
-          @return   everything in the URL from the last delimiter on
-          */
-        rtl::OUString getFileName(const rtl::OUString& aFileUrl) ;
-
-        /** 
-          Splits a file URL between its parent directory/file name
-          parts.
-
-          @param aFileUrl           file URL
-          @param aParentDirectory   parent directory filled on return
-          @param aFileName          file name filled on return
-          */
-        void splitFileUrl(const rtl::OUString& aFileUrl,
-                          rtl::OUString& aParentDirectory,
-                          rtl::OUString& aFileName) ;
-
-        /** creates a directory whose pathname is specified by a FileURL.
-            @return	true if directory could be created or does exist, otherwise false.
-        */
-        osl::FileBase::RC mkdir(rtl::OUString const& _sDirURL);			
-        
-        /** creates a directory whose pathname is specified by a FileURL, 
-            including any necessary parent directories. 
-            @return	true if directory (or directories) could be created or do(es) exist, otherwise false.
-        */
-        osl::FileBase::RC mkdirs(rtl::OUString const& _aDirectory); 
-
-        /** replaces a file specified by _aToURL with a file specified by _aFromURL.			
-        */
-        void replaceFile(const rtl::OUString& _aToURL, const rtl::OUString &_aFromURL) SAL_THROW((io::IOException));
-
-        /** removes a file specified by _aURL. Ignores the case of a non-existing file.
-        */
-        bool tryToRemoveFile(const rtl::OUString& _aURL, bool tryBackupFirst);
-
-        /** creates an error msg string for a given file error return code.
-        */
-        rtl::OUString createOSLErrorString(osl::FileBase::RC eError);
-
-        /** determines the status of a directory entry specified by a URL. 
-            @return	the Size of the file in bytes and the TimeValue of the last modification, if the file exists,
-                    otherwise 0 and a TimeValue(0,0).
-        */
-        sal_uInt64 getModifyStatus(rtl::OUString const& _aNormalizedFilename, TimeValue & rModifyTime);
-    }
-} // namespace configmgr
-
-#endif
diff --git a/configmgr/source/inc/flags.hxx b/configmgr/source/inc/flags.hxx
deleted file mode 100644
index 1f39166d30..0000000000
--- a/configmgr/source/inc/flags.hxx
+++ /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: flags.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 INCLUDED_DATA_FLAGS_HXX
-#define INCLUDED_DATA_FLAGS_HXX
-
-#include <sal/types.h>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace data
-    {
-    //-----------------------------------------------------------------------------
-    // node type + value type selector - fits into a byte (bit 5 currently unassigned)
-        namespace Type
-        {
-            enum Type
-            {
-            // Primitive Data Type is stored in bits 0-4 (bit 3 currently unused)
-                // base data types
-                value_any,       // = 0
-                value_string,    // = 1
-                value_boolean,   // = 2
-                value_short,     // = 3
-                value_int,       // = 4
-                value_long,      // = 5
-                value_double,    // = 6
-                value_binary,    // = 7
-
-                mask_basetype = 0x0F,
-
-                // sequence data types
-                flag_sequence = 0x10,
-
-                value_invalid        = value_any | flag_sequence,
-
-                value_string_list    = value_string   | flag_sequence,  
-                value_boolean_list   = value_boolean  | flag_sequence,
-                value_short_list     = value_short    | flag_sequence,
-                value_int_list       = value_int      | flag_sequence, 
-                value_long_list      = value_long     | flag_sequence,
-                value_double_list    = value_double   | flag_sequence,
-                value_binary_list    = value_binary   | flag_sequence,
-
-                mask_valuetype = mask_basetype | flag_sequence, // 0x1F
-
-            // Node Type is stored in bits 6+7
-                nodetype_shift_ = 6, 
-                mask_nodetype  = 0x03 << nodetype_shift_, // 0xC0
-
-                // maybe we should use 0 for node type 'value' 
-                // to make the complete type be the valuetype ?
-                nodetype_invalid= 0x00,
-
-                nodetype_value  = 0x01 << nodetype_shift_, // 0x40
-                nodetype_group  = 0x02 << nodetype_shift_, // 0x80
-                nodetype_set    = 0x03 << nodetype_shift_, // 0xC0
-
-                flag_innernode = 0x02 << nodetype_shift_, // 0x80
-                flag_setnode   = 0x01 << nodetype_shift_  // 0x40
-            };
-        }
-
-    //-----------------------------------------------------------------------------
-    // node attributes
-        namespace Flags
-        {
-            enum Type
-            {
-                readonly    = 0x01,
-                finalized   = 0x02,
-
-                nullable    = 0x04,
-                localized   = 0x08,
-
-                valueAvailable   = 0x10, // only used for value nodes
-                defaultAvailable = 0x20, // only used for value nodes
-
-                defaulted   = 0x40, // somewhat redundant with State
-                defaultable = 0x80  // redundant with State (merged || defaulted)
-            };
-        }
-    //-----------------------------------------------------------------------------
-        // set element or tree state 
-        namespace State
-        {
-            enum Type
-            {
-                merged,     // = 0, - result of merging defaults + changes
-                defaulted,  // = 1, - result of copying defaults unchanged
-                replaced,   // = 2, - result of copying new layer unchanged
-                added,      // = 3, - same as 'replaced', but it is known, 
-                                  //        that there is no corresponding default
-
-                mask_state = 0x0F, // leaves bits 3+4 reserved for states
-
-                flag_mandatory      = 0x10, // marks this element as non-removable/replacable
-                flag_readonly       = 0x20, // marks this element as read-only
-                flag_default_avail  = 0x40, // marks this element as containing default values
-                flag_removable      = 0x80  // marks this element as removable
-            };
-        }
-    //-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
-#endif // INCLUDED_DATA_FLAGS_HXX 
diff --git a/configmgr/source/inc/interactionrequest.hxx b/configmgr/source/inc/interactionrequest.hxx
deleted file mode 100644
index 46fa906260..0000000000
--- a/configmgr/source/inc/interactionrequest.hxx
+++ /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: interactionrequest.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 CONFIGMGR_INTERACTIONREQUEST_HXX
-#define CONFIGMGR_INTERACTIONREQUEST_HXX
-
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionRetry.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-namespace configmgr {
-namespace apihelper {
-    namespace uno  = com::sun::star::uno;
-    namespace task = com::sun::star::task;
-//============================================================================
-
-/**
-  * This class implements the interface XInteractionRequest. Instances can
-  * be passed directly to XInteractionHandler::handle(...). Each interaction
-  * request contains an exception describing the error and a number of
-  * interaction continuations describing the possible "answers" for the request.
-  * After the request was passed to XInteractionHandler::handle(...) the method
-  * getSelection() returns the continuation choosen by the interaction handler.
-  *
-  * The typical usage of this class would be:
-  *
-  * 1) Create exception object that shall be handled by the interaction handler.
-  * 2) Create InteractionRequest, supply exception as ctor parameter
-  * 3) Create continuations needed and add them to a sequence
-  * 4) Supply the continuations to the InteractionRequest by calling
-  *    setContinuations(...)
-  *
-  * This class can also be used as base class for more specialized requests,
-  * like authentication requests.
-  */
-class InteractionRequest : public cppu::WeakImplHelper1<com::sun::star::task::XInteractionRequest>
-{
-    struct Impl;
-    Impl * m_pImpl;
-
-protected:
-    virtual ~InteractionRequest();
-public:
-    /**
-      * Constructor.
-      *
-      * @param rRequest is the exception describing the error.
-      */
-    InteractionRequest( const com::sun::star::uno::Any & rRequest );
-
-    /**
-      * This method sets the continuations for the request.
-      *
-      * @param rContinuations contains the possible continuations.
-      */
-    void setContinuations(
-        const uno::Sequence< uno::Reference< task::XInteractionContinuation > > &
-                    rContinuations );
-
-    // XInteractionRequest
-    virtual uno::Any SAL_CALL
-        getRequest()
-            throw( uno::RuntimeException );
-
-    virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL
-        getContinuations()
-            throw( com::sun::star::uno::RuntimeException );
-
-    // Non-interface methods.
-
-    /**
-      * After passing this request to XInteractionHandler::handle, this method
-      * returns the continuation that was choosen by the interaction handler.
-      *
-      * @return the continuation choosen by an interaction handler or an empty
-      *         reference, if the request was not (yet) handled.
-      */
-    uno::Reference< task::XInteractionContinuation > getSelection() const;
-
-    /**
-      * This method sets a continuation for the request. It also can be used
-      * to reset the continuation set by a previous XInteractionHandler::handle
-      * call in order to use this request object more then once.
-      *
-      * @param rxSelection is the interaction continuation to activate for
-      *        the request or an empty reference in order to reset the
-      *        current selection.
-      */
-    void setSelection(
-        const uno::Reference< task::XInteractionContinuation > & rxSelection );
-};
-
-//============================================================================
-
-/**
-  * This template class  implements a simple standard interaction continuation
-  * interface provided as template parameter. Classes instantiated from this 
-  * template work together with class InteractionRequest.
-  * Instances of such a class can be passed along with an interaction request 
-  * to indicate the possiblity to continue the operation that caused the request 
-  * as indicated by the interface.
-  */
-template <class XThisContinuation >
-class InteractionContinuation   : public cppu::WeakImplHelper1< XThisContinuation >
-{
-    InteractionRequest * m_pRequest;
-public:
-    InteractionContinuation( InteractionRequest * pRequest )
-    : m_pRequest( pRequest ) {}
-
-    // XInteractionContinuation
-    /**
-      * This method marks this continuation as "selected" at the request it
-      * belongs to.
-      *
-      * Derived classes must implement their XInteractionContinuation::select()
-      * method the way that they call this method.
-      */
-    virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
-};
-//============================================================================
-
-template <class XThisContinuation >
-void SAL_CALL InteractionContinuation< XThisContinuation >::select()
-    throw( com::sun::star::uno::RuntimeException )
-{
-    m_pRequest->setSelection(this);
-}
-//============================================================================
-
-
-} // namespace apihelper
-} // namespace configmgr
-
-#endif /* !CONFIGMGR_INTERACTIONREQUEST_HXX */
diff --git a/configmgr/source/inc/localizedtreeactions.hxx b/configmgr/source/inc/localizedtreeactions.hxx
deleted file mode 100644
index 94fbb2c067..0000000000
--- a/configmgr/source/inc/localizedtreeactions.hxx
+++ /dev/null
@@ -1,55 +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: localizedtreeactions.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 CONFIGMGR_LOCALIZEDTREEACTIONS_HXX
-#define CONFIGMGR_LOCALIZEDTREEACTIONS_HXX
-
-#include "valuenode.hxx"
-#include "treesegment.hxx"
-//..........................................................................
-namespace configmgr
-{
-class SubtreeChange;
-
-//==========================================================================
-// Helper function to invoke the previous ones properly
-
-// convert to the given locale format, assuming the original representation was expanded
-rtl::Reference< data::TreeSegment > cloneExpandedForLocale(sharable::TreeFragment * tree, rtl::OUString const& _sLocale);
-// convert to the given locale format, assuming the original representation was expanded
-std::auto_ptr<INode> reduceExpandedForLocale(std::auto_ptr<ISubtree> _pNode, rtl::OUString const& _sLocale);
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-#endif // CONFIGMGR_LOCALIZEDTREEACTIONS_HXX
-
-
diff --git a/configmgr/source/inc/logger.hxx b/configmgr/source/inc/logger.hxx
deleted file mode 100644
index 9eb103ca1d..0000000000
--- a/configmgr/source/inc/logger.hxx
+++ /dev/null
@@ -1,116 +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: logger.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 CONFIGMGR_LOGGER_HXX
-#define CONFIGMGR_LOGGER_HXX
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/logging/XLogger.hpp>
-#include <com/sun/star/util/logging/LogLevel.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace uno = com::sun::star::uno;
-    namespace logging = com::sun::star::util::logging;
-    namespace LogLevel = logging::LogLevel;
-    
-    /// class providing access to a log output sink in the context
-    class Logger
-    {
-        uno::Reference< logging::XLogger > m_xLogger;
-    public:
-        Logger() : m_xLogger() {}
-
-        Logger(uno::Reference< logging::XLogger > const &  xLogger)
-        : m_xLogger(xLogger)
-        {}
-
-        explicit
-        Logger(uno::Reference< uno::XComponentContext > const &  xContext)
-        : m_xLogger( getUnoLoggerFromContext(xContext) )
-        {}
-
-        sal_Int32 level() const
-        { return m_xLogger.is() ? m_xLogger->getLevel() : LogLevel::OFF; }
-
-        bool isLogging(sal_Int32 nLogLevel) const
-        { return m_xLogger.is() && m_xLogger->isLoggable(nLogLevel); }
-
-        /// log output to the logger
-        void log(sal_Int32 nLevel, const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const;
-        void log(sal_Int32 nLevel, const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const;
-
-        void error(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::SEVERE, msg, sourceMethod, sourceClass); }
-        void error(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::SEVERE, msg, sourceMethod, sourceClass); }
-
-        void warning(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::WARNING, msg, sourceMethod, sourceClass); }
-        void warning(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::WARNING, msg, sourceMethod, sourceClass); }
-        
-        void info(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::INFO, msg, sourceMethod, sourceClass); }
-        void info(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::INFO, msg, sourceMethod, sourceClass); }
-        
-        void config(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::CONFIG, msg, sourceMethod, sourceClass); }
-        void config(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::CONFIG, msg, sourceMethod, sourceClass); }
-        
-        void fine(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::FINE, msg, sourceMethod, sourceClass); }
-        void fine(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::FINE, msg, sourceMethod, sourceClass); }
-        
-        void finer(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::FINER, msg, sourceMethod, sourceClass); }
-        void finer(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::FINER, msg, sourceMethod, sourceClass); }
-        
-        void finest(const rtl::OUString & msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::FINEST, msg, sourceMethod, sourceClass); }
-        void finest(const char * msg, const char * sourceMethod = 0, const char * sourceClass = 0) const
-        { log( LogLevel::FINEST, msg, sourceMethod, sourceClass); }
-        
-        uno::Reference< logging::XLogger > getUnoLogger() const { return m_xLogger; }
-
-        static 
-        uno::Reference< logging::XLogger > 
-            getUnoLoggerFromContext(uno::Reference< uno::XComponentContext > const & xContext);
-    };
-// -----------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif // CONFIGMGR_LOGGER_HXX
-
diff --git a/configmgr/source/inc/matchlocale.hxx b/configmgr/source/inc/matchlocale.hxx
deleted file mode 100644
index c6b87c5d3f..0000000000
--- a/configmgr/source/inc/matchlocale.hxx
+++ /dev/null
@@ -1,218 +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: matchlocale.hxx,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.
- *
- ************************************************************************/
-
-/* PLEASE DON'T DELETE ANY COMMENT LINES, ALSO IT'S UNNECESSARY. */
-
-#ifndef CONFIGMGR_MATCHLOCALE_HXX
-#define CONFIGMGR_MATCHLOCALE_HXX
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-
-#include <rtl/ustring.hxx>
-#include <vector>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-
-    namespace localehelper
-    {
-    // -------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace lang		= ::com::sun::star::lang;
-
-    // -------------------------------------------------------------------------
-        extern char const * const c_sAnyLanguage;
-        extern char const * const c_sDefLanguage;
-    
-        extern bool isAnyLanguage(rtl::OUString const & _sLanguage);
-        extern bool isDefaultLanguage(rtl::OUString const & _sLanguage);
-
-        extern rtl::OUString getAnyLanguage();
-        extern rtl::OUString getDefaultLanguage();
-
-        extern com::sun::star::lang::Locale getAnyLocale();
-        extern com::sun::star::lang::Locale getDefaultLocale();
-
-    // -------------------------------------------------------------------------
-        // the max value of std::vector< com::sun::star::lang::Locale >::size_type - marks out-of-range (Value == -1 == ~0)
-        std::vector< com::sun::star::lang::Locale >::size_type const c_noPosition = std::vector< com::sun::star::lang::Locale >::size_type(0)-std::vector< com::sun::star::lang::Locale >::size_type(1);
-
-        // conversion helpers
-        com::sun::star::lang::Locale makeLocale(rtl::OUString const& sLocaleName_);
-        rtl::OUString makeIsoLocale(com::sun::star::lang::Locale const& aUnoLocale_);
-
-        std::vector< com::sun::star::lang::Locale > makeLocaleSequence(uno::Sequence<rtl::OUString> const& sLocaleNames_);
-        uno::Sequence<rtl::OUString> makeIsoSequence(std::vector< com::sun::star::lang::Locale > const& aLocales_);
-
-        inline
-        bool equalLocale(com::sun::star::lang::Locale const & lhs, com::sun::star::lang::Locale const & rhs)
-        { return lhs.Language == rhs.Language && lhs.Country == rhs.Country; }
-
-        inline
-        bool equalLanguage(com::sun::star::lang::Locale const & lhs, com::sun::star::lang::Locale const & rhs)
-        { return lhs.Language == rhs.Language; }
-    // -------------------------------------------------------------------------
-        bool designatesAllLocales(com::sun::star::lang::Locale const& aLocale_);
-        bool designatesAllLocales(std::vector< com::sun::star::lang::Locale > const& aLocales_);
-    // -------------------------------------------------------------------------
-
-        /// result of matching a locale against a target locale
-        enum  MatchQuality
-        { 
-            MISMATCH = 0,			/// match: locales do not match (must be zero!)
-            MATCH_LANGUAGE,			/// match: languages match - country mismatch
-            MATCH_LANGUAGE_PLAIN,	/// match: languages match - no country to match
-            MATCH_LOCALE,			/// match: full match
-            BEST_MATCH = MATCH_LOCALE			
-        };
-
-        /// compare two locales for 'nearness'
-        MatchQuality match(com::sun::star::lang::Locale const& aLocale_, com::sun::star::lang::Locale const& aTarget_);
-
-
-    // -------------------------------------------------------------------------
-        /// result of matching a Locale against a target sequence of locales
-        class MatchResult 
-        { 
-            std::vector< com::sun::star::lang::Locale >::size_type		m_nPos;
-            MatchQuality	m_eQuality;
-
-        public:
-            /// construct a default (no match) result
-            MatchResult() 
-            { reset(); }
-
-            /// construct a result from given parameters - use with care
-            MatchResult(std::vector< com::sun::star::lang::Locale >::size_type nPos_, MatchQuality eQuality_) 
-            : m_nPos( nPos_ )
-            , m_eQuality(eQuality_) 
-            {}
-
-            /// construct an optimum result
-            static MatchResult best() { return MatchResult(0,MATCH_LOCALE); }
-
-            /// has there been a match
-            bool isMatch() const { return m_eQuality != MISMATCH; }
-            /// is this the best match possible ?
-            bool isBest() const { return m_nPos == 0 && m_eQuality == MATCH_LOCALE; }
-
-            /// retrieve the position that was matched
-            std::vector< com::sun::star::lang::Locale >::size_type position() const { return m_nPos; }
-            /// retrieve the quality of match
-            MatchQuality quality() const { return m_eQuality; }
-
-            /// assign the given position and quality, if they are an improvement
-            bool improve(std::vector< com::sun::star::lang::Locale >::size_type nPos, MatchQuality eQuality_);
-
-            /// reset to no match or best match state
-            void reset()
-            {
-                m_nPos =  c_noPosition;
-                m_eQuality = MISMATCH; 
-            }
-
-            // ---------------------------------------------------------------------
-            // comparing MatchResults
-            friend bool operator ==(MatchResult const& lhs, MatchResult const& rhs)
-            { 
-                return	lhs.m_nPos == rhs.m_nPos && 
-                        lhs.m_eQuality == rhs.m_eQuality; 
-            }
-
-            // ordering of MatchResults - greater is better
-            friend bool operator < (MatchResult const& lhs, MatchResult const& rhs)
-            { 
-                if (lhs.m_nPos > rhs.m_nPos) return true; // greater position is worse
-                if (lhs.m_nPos < rhs.m_nPos) return false; 
-
-                return (lhs.m_eQuality < rhs.m_eQuality);  // least Quality is worse
-            }
-
-        };
-
-        // ---------------------------------------------------------------------
-        // derived relational operators
-        inline bool operator !=(MatchResult const& lhs, MatchResult const& rhs)
-        { return !(lhs == rhs); }
-        inline bool operator > (MatchResult const& lhs, MatchResult const& rhs)
-        { return rhs < lhs; }
-        inline bool operator <= (MatchResult const& lhs, MatchResult const& rhs)
-        { return !(rhs < lhs); }
-        inline bool operator >=(MatchResult const& lhs, MatchResult const& rhs)
-        { return !(lhs < rhs); }
-
-        /// improve an existing match of a locale against a sequence of locales 
-        bool improveMatch(MatchResult& rMatch_, com::sun::star::lang::Locale const& aLocale_, std::vector< com::sun::star::lang::Locale > const& aTarget_);
-
-        /// match a locale against a sequence of locales for a given quality level
-        bool isMatch(com::sun::star::lang::Locale const& aLocales, std::vector< com::sun::star::lang::Locale > const& aTarget_, MatchQuality eRequiredQuality_);
-
-    // -------------------------------------------------------------------------
-        /// add defaults to a sequence of locales 
-        void addFallbackLocales(std::vector< com::sun::star::lang::Locale >& aTargetList_);
-
-    // -------------------------------------------------------------------------
-        class FindBestLocale
-        {
-        public:
-            /// construct a MatchLocale with a single target locale
-            FindBestLocale(com::sun::star::lang::Locale const& aTarget_);
-
-            /// is there any match ?
-            bool isMatch() const { return m_aResult.isMatch(); }
-
-            /// is there an optimum match (so we are done) ?
-            bool isBestMatch() const { return m_aResult.isBest(); }
-
-            /// get the quality of the best match found
-            MatchQuality getMatchQuality() const { return m_aResult.quality(); }
-
-            /// check, if the given locale improves the quality. if it does, accept it
-            bool accept(com::sun::star::lang::Locale const& aLocale_);
-
-            /// reset the match result, indicating whether a match is needed at all
-            void reset(bool bNeedLocale_ = true);
-
-        private:
-            void implSetTarget(std::vector< com::sun::star::lang::Locale > const& aTarget_);
-
-            std::vector< com::sun::star::lang::Locale >	m_aTarget;
-            MatchResult		m_aResult;
-        };
-    
-    } // namespace
-// -----------------------------------------------------------------------------
-
-} // namespace
-
-#endif
-
diff --git a/configmgr/source/inc/mergechange.hxx b/configmgr/source/inc/mergechange.hxx
deleted file mode 100644
index fd2554a56b..0000000000
--- a/configmgr/source/inc/mergechange.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: mergechange.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 INCLUDED_CONFIGMGR_MERGECHANGE_HXX
-#define INCLUDED_CONFIGMGR_MERGECHANGE_HXX
-
-#include "namecreator.hxx"
-#include "change.hxx"
-#include "treechangelist.hxx"
-
-namespace configmgr 
-{
-    // method that applies changes on a existing subtree
-    void combineUpdates     (SubtreeChange  const& _anUpdate, SubtreeChange& _aCombinedUpdate);
-
-    // -----------------------------------------------------------------------------
-    class OStripDefaults : private ChangeTreeModification
-    {
-        SubtreeChange& m_rParent;
-    public:
-        OStripDefaults(SubtreeChange& _rSubtree) : m_rParent(_rSubtree) {}
-
-        bool isEmpty() const { return m_rParent.size() == 0; }
-
-        OStripDefaults& strip();
-
-        static bool strip(SubtreeChange& _rSubtree)
-        {
-            return OStripDefaults(_rSubtree).strip().isEmpty();
-        }
-    private:
-        void stripOne(Change& _rChange);
-
-        virtual void handle(ValueChange& _rValueNode);
-        virtual void handle(AddNode& _rAddNode);
-        virtual void handle(RemoveNode& _rRemoveNode);
-        virtual void handle(SubtreeChange& _rSubtree);
-    };
-
-    // -----------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/mergeddataprovider.hxx b/configmgr/source/inc/mergeddataprovider.hxx
deleted file mode 100644
index e8378a85e1..0000000000
--- a/configmgr/source/inc/mergeddataprovider.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: mergeddataprovider.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 CONFIGMGR_BACKEND_MERGEDDATAPROVIDER_HXX
-#define CONFIGMGR_BACKEND_MERGEDDATAPROVIDER_HXX
-
-#include "sal/config.h"
-
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "request.hxx"
-#include "requesttypes.hxx"
-#include "utility.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-// ---------------------------------------------------------------------------
-    /** Listener interface for receiving notifications 
-        about changes to previously requested data
-    */
-    struct SAL_NO_VTABLE INodeDataListener
-    {
-        /** is called to indicate changes within the data being observed.
-              
-            @param _aOriginalRequest
-                identifies the data that changed
-        */
-        virtual void dataChanged(ComponentRequest const & _aOriginalRequest) SAL_THROW(()) = 0;
-    };
-// ---------------------------------------------------------------------------
-
-    /// Interface providing access to template (schema) data
-    struct SAL_NO_VTABLE ITemplateDataProvider
-    {
-        /** loads a given template and returns it as return value
-
-            @param _aRequest
-                identifies the template to be loaded
-
-            @returns
-                A valid instance of the given template.
-
-                <p> Currently a request with empty template name 
-                    will retrieve a group node holding all templates 
-                    of a component.
-                </p>
-
-            @throws com::sun::star::uno::Exception
-                if the template cannot be retrieved.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        virtual ResultHolder< TemplateInstance > getTemplateData(TemplateRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception)) = 0;
-    };
-// ---------------------------------------------------------------------------
-
-    /** Composite interface providing full access to merged configuration data 
-        from some data store. 
-
-        <p> Loading and updating of data is supported. 
-            Support for notification depends on the backend.
-        </p>
-    */
-    struct IMergedDataProvider
-    : salhelper::SimpleReferenceObject
-    , ITemplateDataProvider
-    {
-        /** loads merged data for a (partial) tree and returns it as return value.
-
-            @param _aRequest
-                identifies the component to be loaded
-
-            @param _pListener
-                a listener to observe subsequent changes to the data requested
-
-                <p> If NULL, no notifications will be sent. </p>
-
-                <p> Otherwise the listener will be notified of changes. 
-                    The listener must subsequently be removed by calling
-                    <member>removeRequestListener</member>.
-                    The listener must live at least until it is removed.
-                </p>
-
-            @returns
-                A valid component instance for the given request.
-
-            @throws com::sun::star::uno::Exception
-                if the node cannot be retrieved.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        virtual ResultHolder< ComponentInstance > getNodeData(ComponentRequest const & _aRequest, 
-                                            ITemplateDataProvider*   _aTemplateProvider,
-                                            INodeDataListener * _pListener = NULL) 
-            SAL_THROW((com::sun::star::uno::Exception)) = 0;
-
-        /** remove a listener registered for a previous request. 
-            <p>This may also release some open resources for the request.</p>
-
-            @param _pListener
-                a listener that was passed to a previous succes
-        
-             @param _aRequest
-                identifies the component associated with the listener
-        */
-        virtual void removeRequestListener(INodeDataListener * _pListener,
-                                           const ComponentRequest& aRequest) SAL_THROW(()) = 0;
-
-        /** applies an update to the stored data. 
-
-            @param _anUpdate
-                identifies the node to be updated and 
-                describes the changes to be applied.
-
-            @throws com::sun::star::uno::Exception
-                if the node cannot be updated.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        virtual void updateNodeData(UpdateRequest const & _anUpdate)
-            SAL_THROW((com::sun::star::uno::Exception)) = 0;
-
-        /** loads default data for a (partial) tree and returns it as return value
-
-            @param _aRequest
-                identifies the node to be loaded
-
-            @returns
-                A valid node instance for the default state of the given node.
-
-                <p>May be NULL, if the node exists but has no default equivalent.</p>
-
-            @throws com::sun::star::uno::Exception
-                if the default cannot be retrieved.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        virtual ResultHolder< NodeInstance > getDefaultData(NodeRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception)) = 0;
-    };
-
-// ---------------------------------------------------------------------------
-    } // namespace backend
-
-// ---------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/namecreator.hxx b/configmgr/source/inc/namecreator.hxx
deleted file mode 100644
index e33e64b02e..0000000000
--- a/configmgr/source/inc/namecreator.hxx
+++ /dev/null
@@ -1,76 +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: namecreator.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 INCLUDED_CONFIGMGR_NAMECREATOR_HXX
-#define INCLUDED_CONFIGMGR_NAMECREATOR_HXX
-
-#include "configpath.hxx"
-
-namespace configmgr 
-{
-    // -----------------------------------------------------------------------------
-    class Change;
-    class SubtreeChange;
-    // -----------------------------------------------------------------------------
-
-    class ONameCreator
-    {
-    public:
-        ONameCreator() {}
-
-        void pushName(const configuration::Path::Component &_aName) { m_aNameList.push_back(_aName); }
-        void popName()                       { m_aNameList.pop_back(); }
-
-        void clear() { m_aNameList.clear(); }
-
-        static configuration::Path::Component createName(Change const& _rChange, SubtreeChange const* _pParent);
-    private:
-        std::vector< configuration::Path::Component >     m_aNameList;
-    };
-
-    template <class PathClass>
-    class OPathCreator : public ONameCreator
-    {
-    public:
-        OPathCreator() : m_aBasePath( configuration::Path::Rep() ) {}
-        OPathCreator(PathClass const & _aBasePath) : m_aBasePath(_aBasePath) {}
-
-        void init(PathClass const & _aBasePath)
-        { clear(); m_aBasePath = _aBasePath; }
-
-    private:
-        PathClass m_aBasePath;
-    };
-    // -----------------------------------------------------------------------------
-
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/node.hxx b/configmgr/source/inc/node.hxx
deleted file mode 100644
index 92d7494c5c..0000000000
--- a/configmgr/source/inc/node.hxx
+++ /dev/null
@@ -1,232 +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: node.hxx,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.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_SHARABLE_NODE_HXX
-#define INCLUDED_SHARABLE_NODE_HXX
-
-#include "rtl/ustring.hxx"
-
-#include "flags.hxx"
-#include "anydata.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace node { struct Attributes; }
-//-----------------------------------------------------------------------------
-    namespace sharable
-    {
-        struct  TreeFragment;
-        union   Node;
-    //-----------------------------------------------------------------------------
-        struct NodeInfo
-        {
-            rtl_uString *            name;
-            sal_uInt16          parent; // always counts backwards
-            sal_uInt8    flags;
-            sal_uInt8    type;   // contains discriminator for union
-
-            rtl::OUString       getName() const;
-            node::Attributes    getNodeInfoAttributes() const;
-            bool isDefault() const;
-            bool isLocalized() const;
-
-            void markAsDefault(bool bDefault = true);
-        };
-    //-----------------------------------------------------------------------------
-        struct GroupNode
-        {
-            NodeInfo info;
-            sal_uInt16   numDescendants;   // = number of descendants
-
-            bool hasDefaultsAvailable()   const;
-
-            Node * getFirstChild()  const;
-            Node * getNextChild(Node * child) const;
-            Node * getChild(rtl::OUString const & name) const;
-
-            static inline GroupNode * from(Node * node);
-        };
-    //-----------------------------------------------------------------------------
-        struct SetNode
-        {
-
-            NodeInfo info;
-            sal_uInt8 *  elementType; // points to template [MM:SetNode *?]
-            TreeFragment *     elements;    // points to first element (TreeFragmentHeader)
-
-            rtl::OUString getElementTemplateName() const;		
-            rtl::OUString getElementTemplateModule() const;
-
-            TreeFragment * getFirstElement() const;
-            TreeFragment * getNextElement(TreeFragment * _pElement) const;
-            TreeFragment * getElement(rtl::OUString const & name) const;
-
-            void addElement(TreeFragment * newElement);
-            TreeFragment * removeElement(rtl::OUString const & name);
-
-            static inline SetNode * from(Node * node);
-
-            // low-level helper for template data abstraction
-            static
-            sal_uInt8 * allocTemplateData(const rtl::OUString &rName,
-                                      const rtl::OUString &rModule);
-            static 
-            sal_uInt8 * copyTemplateData(sal_uInt8 * _aTemplateData);
-            static
-            void releaseTemplateData(sal_uInt8 * _aTemplateData);
-        };
-    //-----------------------------------------------------------------------------
-        struct ValueNode
-        {
-            NodeInfo info;
-            AnyData  value;
-            AnyData  defaultValue;
-
-            bool isNull()       const;
-            bool hasUsableDefault()   const;
-            
-            com::sun::star::uno::Any    getValue() const;
-            com::sun::star::uno::Type   getValueType() const;
-            com::sun::star::uno::Any    getUserValue() const;
-            com::sun::star::uno::Any    getDefaultValue() const;
-
-            void setValue(com::sun::star::uno::Any const & newValue);
-            void setToDefault();
-            void changeDefault(com::sun::star::uno::Any const & newDefault);
-
-            static inline ValueNode * from(Node * node);
-
-        private:
-            void releaseValue();
-            sal_uInt8 adaptType(com::sun::star::uno::Any const & newValue);
-        };
-    //-----------------------------------------------------------------------------
-        // TODO: optimized representation of localized values (now as set; mapping locale->element-name)
-        // TODO (?): better representation of sets of values
-    //-----------------------------------------------------------------------------
-        union Node
-        {
-            NodeInfo info;
-            GroupNode group;
-            SetNode   set;
-            ValueNode value;
-
-            // info access
-            bool isNamed(rtl::OUString const & _aName) const;
-            rtl::OUString       getName() const;
-            node::Attributes    getAttributes() const;
-            bool isDefault() const;
-
-            // type checks
-            bool isGroup()  const  { return typeIs (data::Type::nodetype_group); }
-            bool isSet()    const  { return typeIs (data::Type::nodetype_set); }
-            bool isValue()  const  { return typeIs (data::Type::nodetype_value); }
-
-            // checked access
-            inline GroupNode       * groupData();
-            inline GroupNode const * groupData() const;
-            inline SetNode         * setData();
-            inline SetNode   const * setData()   const;
-            inline ValueNode       * valueData();
-            inline ValueNode const * valueData() const;
-
-            // navigation
-            bool isFragmentRoot() const;
-#if OSL_DEBUG_LEVEL > 0
-            Node        * getParentNode();
-            Node const  * getParentNode() const;
-#endif
-            TreeFragment        * getTreeFragment();
-            TreeFragment const  * getTreeFragment() const;
-
-            Node * getSubnode(rtl::OUString const & name);
-
-        private:
-            bool typeIs(data::Type::Type eType) const
-                { return (info.type & data::Type::mask_nodetype) == eType; }
-        };
-
-    //-----------------------------------------------------------------------------
-        inline GroupNode * GroupNode::from(Node * node)
-        { return node == 0 ? 0 : node->groupData(); }
-
-        inline SetNode * SetNode::from(Node * node)
-        { return node == 0 ? 0 : node->setData(); }
-
-        inline ValueNode * ValueNode::from(Node * node)
-        { return node == 0 ? 0 : node->valueData(); }
-
-        inline GroupNode       * Node::groupData()
-            { return isGroup() ? &this->group : NULL; }
-        inline GroupNode const * Node::groupData() const
-            { return isGroup() ? &this->group : NULL; }
-        inline SetNode       * Node::setData()
-            { return isSet() ? &this->set : NULL; }
-        inline SetNode const * Node::setData()   const
-            { return isSet() ? &this->set : NULL; }
-        inline ValueNode       * Node::valueData()
-            { return isValue() ? &this->value : NULL; }
-        inline ValueNode const * Node::valueData() const
-            { return isValue() ? &this->value : NULL; }
-
-        inline Node * node(ValueNode * pNode)        
-        { return reinterpret_cast<Node*>(pNode); }
-        inline Node * node(GroupNode * pNode)        
-        { return reinterpret_cast<Node*>(pNode); }
-        inline Node * node(SetNode * pNode)        
-        { return reinterpret_cast<Node*>(pNode); }
-
-        inline Node const * node(ValueNode const* pNode)   
-        { return reinterpret_cast<Node const*>(pNode); }
-        inline Node const * node(GroupNode const* pNode)   
-        { return reinterpret_cast<Node const*>(pNode); }
-        inline Node const * node(SetNode const* pNode)   
-        { return reinterpret_cast<Node const*>(pNode); }
-    //-----------------------------------------------------------------------------
-        inline Node & node(ValueNode & pNode)        
-        { return reinterpret_cast<Node&>(pNode); }
-        inline Node & node(GroupNode & pNode)        
-        { return reinterpret_cast<Node&>(pNode); }
-        inline Node & node(SetNode & pNode)        
-        { return reinterpret_cast<Node&>(pNode); }
-
-        inline Node const & node(ValueNode const& pNode)   
-        { return reinterpret_cast<Node const&>(pNode); }
-        inline Node const & node(GroupNode const& pNode)   
-        { return reinterpret_cast<Node const&>(pNode); }
-        inline Node const & node(SetNode const& pNode)   
-        { return reinterpret_cast<Node const&>(pNode); }
-    //-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
-#endif // INCLUDED_SHARABLE_NODE_HXX 
diff --git a/configmgr/source/inc/nodechange.hxx b/configmgr/source/inc/nodechange.hxx
deleted file mode 100644
index 30536d85d0..0000000000
--- a/configmgr/source/inc/nodechange.hxx
+++ /dev/null
@@ -1,160 +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: nodechange.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGCHANGE_HXX_
-#define CONFIGMGR_CONFIGCHANGE_HXX_
-
-#include "rtl/ref.hxx"
-
-#include "configexcept.hxx"
-
-#include <vector>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class AbsolutePath;
-        class RelativePath;
-        class NodeRef;
-        class NodeID;
-        class SubNodeID;
-        class Tree;
-//-----------------------------------------------------------------------------
-
-        class NodeChange;
-        class NodeChangeImpl;
-        class NodeChangeLocation;
-        class NodeChangeInformation;
-        class NodeChangesInformation;
-//-----------------------------------------------------------------------------
-
-        /// represents a node position in some tree
-        class NodeChange
-        {
-        public:
-            /// constructs an empty (unchanging) node change
-            NodeChange(); 
-            /// constructs a  node change with a given implementation
-            NodeChange(NodeChangeImpl* pImpl); 
-            /// copies a node change with reference semantics
-            NodeChange(NodeChange const& rOther); 
-            /// copies a node change with reference semantics
-            NodeChange& operator=(NodeChange const& rOther); 
-            /// swaps the contents of this with another NodeChange
-            void swap(NodeChange& rOther); 
-            /// destroys a node change
-            ~NodeChange(); 
-
-            /// checks, if this may represent an actual change (might not be tested)
-            bool maybeChange() const;
-            /// checks, if this represents an actual change (PRE: must be tested)
-            bool isChange() const;
-            /// retrieve information about the changed data, appending to a sequence, returning the count 
-            sal_uInt32 getChangeInfos(NodeChangesInformation& rInfo) const;
-            /// retrieve information about what node is changed
-            bool getChangeLocation(NodeChangeLocation& rLoc) const;
-
-            /// test whether this would really be a change (as close as possible)
-            NodeChange& test();
-            NodeChange const& test() const;
-
-            /// apply this change and check whether the target node changed
-            NodeChange& apply();
-            NodeChange const& apply() const;
-
-            // retrieve the tree where the change is actually taking place
-            rtl::Reference< Tree > getAffectedTree() const;
-            // retrieve the node where the change is actually taking place
-            NodeRef getAffectedNode() const;
-
-            // Comparison
-            friend bool operator==(NodeChange const& lhs, NodeChange const& rhs)
-            {
-                return lhs.m_pImpl == rhs.m_pImpl;
-            }
-            friend bool operator!=(NodeChange const& lhs, NodeChange const& rhs)
-            {
-                return lhs.m_pImpl != rhs.m_pImpl;
-            }
-
-            /// provides access to the internal Implementation for related classes
-            NodeChangeImpl* impl() const { return m_pImpl; }
-        private:
-            NodeChangeImpl* m_pImpl;
-            void init(), deinit();
-        };
-
-        /**	represents a collection of updates to nodes (identified by <type>NodeChange</type>s) within a hierarchy of config entries
-        */
-        class NodeChanges
-        {
-        public:
-            /// Constructs an empty collection of changes
-            NodeChanges();
-
-            /// checks whether there are any (non-empty) changes in this
-            bool isEmpty() const;
-
-            /// retrieves the total count of changes in this collection
-            std::vector<NodeChange>::size_type getCount() const { return m_aChanges.size(); }
-
-            /// retrieve information about the changed data, appending to a sequence, returning the count
-            sal_uInt32 getChangesInfos(NodeChangesInformation& rInfos) const;
-
-            /// test all changes
-            NodeChanges& test()				{ implTest(); return *this; }
-            NodeChanges const& test() const { implTest(); return *this; }
-
-            /// remove all changes known to be doing nothing from this collection.
-            NodeChanges& compact();
-
-            /** insert a change into this collection
-            */
-            void add(NodeChange const& aChange);
-
-            /// returns an STL-style iterator to the first element of the collection
-            std::vector<NodeChange>::const_iterator begin() const		{ return m_aChanges.begin(); }
-            std::vector<NodeChange>::iterator begin()	{ return m_aChanges.begin(); }
-
-            /// returns an STL-style iterator to past the last element of the collection
-            std::vector<NodeChange>::const_iterator end() const	{ return m_aChanges.end(); }
-            std::vector<NodeChange>::iterator end()	{ return m_aChanges.end(); }
-
-        private:
-            void implTest() const;
-            std::vector<NodeChange> m_aChanges;
-        };
-
-    }
-}
-
-#endif // CONFIGMGR_CONFIGCHANGE_HXX_
diff --git a/configmgr/source/inc/nodechangeinfo.hxx b/configmgr/source/inc/nodechangeinfo.hxx
deleted file mode 100644
index 840f13ef83..0000000000
--- a/configmgr/source/inc/nodechangeinfo.hxx
+++ /dev/null
@@ -1,249 +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: nodechangeinfo.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGCHANGEINFO_HXX_
-#define CONFIGMGR_CONFIGCHANGEINFO_HXX_
-
-#include "configpath.hxx"
-#include "noderef.hxx"
-#include "valueref.hxx"
-#include <rtl/ref.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class NodeRef;
-        class ValueRef;
-        class NodeID;
-        class SubNodeID;
-
-        class ElementTree;
-        
-//-----------------------------------------------------------------------------
-        /// captures the values of something changing
-        template <class DataT>
-        struct DataChange
-        {
-            DataT newValue;
-            DataT oldValue;
-
-            DataChange()
-            : newValue(), oldValue() 
-            {}
-
-            DataChange(DataT const& newValue_, DataT const& oldValue_) 
-            : newValue(newValue_), oldValue(oldValue_) 
-            {}
-
-            // note: maybe we should support a comparison object
-            bool isDataChange() const 
-            { return !(oldValue == newValue); } // not using != to avoid conversion warning
-        };
-
-//-----------------------------------------------------------------------------
-        /// information about what changed (but close to no context)
-        class NodeChangeData
-        {
-        public:
-        //-------------------------------------------------
-            enum Type
-            {
-                eNoChange,
-
-            // Changes to value nodes
-                eSetValue,
-                eSetDefault,
-
-            // Changes to set nodes
-                eInsertElement,
-                eReplaceElement,
-                eRemoveElement,
-
-                eRenameElementTree, // not fully supported yet
-
-                eResetSetDefault
-            };
-        //-------------------------------------------------
-
-            bool isEmptyChange()	const { return eNoChange == type; }
-            bool isValueChange()	const { return eSetValue <= type && type <= eSetDefault; }
-            bool isSetChange()		const { return eInsertElement <= type && type <= eRemoveElement; }
-            bool isRemoveSetChange() const { return eRemoveElement == type;}
-            bool isReplaceSetChange() const { return eReplaceElement == type;}
-        //-------------------------------------------------
-            bool isDataChange()	const;
-
-        //-------------------------------------------------
-        // wrapper object creation 
-            rtl::Reference< Tree > getNewElementTree() const;
-            rtl::Reference< Tree > getOldElementTree() const;
-
-            NodeID	getNewElementNodeID() const;
-            NodeID	getOldElementNodeID() const;
-        //-------------------------------------------------
-
-        //-- Compiler barrier for element tree ------------
-            NodeChangeData();
-            NodeChangeData(NodeChangeData const& aOther);
-            NodeChangeData& operator=(NodeChangeData const& aOther);
-            ~NodeChangeData();
-        //-------------------------------------------------
-            Type type;
-
-            // Value change: old/new value; Set change: new/old api element (if known); Rename: old/new name
-            DataChange< com::sun::star::uno::Any				> unoData;
-            // Value change: NULL,NULL; Set change: new/old tree element; Rename: the affected element-tree (twice)
-            DataChange< rtl::Reference<ElementTree>	> element;
-        //-------------------------------------------------
-        };
-
-        //-------------------------------------------------
-        // Identify the location of a change. Interpretation of members may depend upon 
-        class NodeChangeLocation
-        {
-        public:
-        //-------------------------------------------------
-            // checks whether the base has been properly set up.
-            // Does not check for existence of the affected node
-#if OSL_DEBUG_LEVEL > 0
-            /// check whether the location has been initialized properly
-            bool isValidData() const;
-#endif
-            /// check whether the location is for a valid object
-            bool isValidLocation() const;
-
-        //-------------------------------------------------
-            /// retrieve the path from the base node to the changed node (which might be a child of the affected node)
-            RelativePath getAccessor() const { return m_path; }
-
-            /// retrieve the tree where the change is actually initiated/reported
-            rtl::Reference< Tree > getBaseTree() const;
-            /// retrieve the node where the change is actually initiated/reported
-            NodeRef getBaseNode() const;
-
-            /// retrieve the tree where the change is actually taking place (may be Empty, if the tree has never been accessed)
-            rtl::Reference< Tree > getAffectedTreeRef() const;
-            /// identify the node where the change is actually taking place
-            NodeID getAffectedNodeID() const;
-
-            /// identify the node (within the affected tree), that actually is changed (this one may be a value node)
-            SubNodeID getChangingValueID() const;
-
-        //-------------------------------------------------
-            void setAccessor( RelativePath const& aAccessor );
-
-            void setBase( NodeID const& aBaseID );
-            void setBase( rtl::Reference< Tree > const& aBaseTree, NodeRef const& aBaseNode )
-            { setBase( NodeID(aBaseTree,aBaseNode) ); }
-
-            void setAffected( NodeID const& aTargetID );
-            void setAffected( rtl::Reference< Tree > const& aTargetTree, NodeRef const& aTargetNode )
-            { setAffected( NodeID(aTargetTree,aTargetNode) ); }
-
-            void setChangingSubnode( bool bSubnode = true );
-        //-------------------------------------------------
-            NodeChangeLocation();
-        //	NodeChangeLocation(NodeChangeLocation const& aOther);
-        //	NodeChangeLocation& operator=(NodeChangeLocation const& aOther);
-        //	~NodeChangeLocation();
-        //-------------------------------------------------
-        private:
-            RelativePath	m_path;		// path from baseNode to changing node
-            NodeID			m_base;		// a (non-empty) node
-            NodeID			m_affected;	// identifies the affected node (if available)
-            bool	    	m_bSubNodeChanging;	// do we change a value ?
-        //-------------------------------------------------
-        };
-//-----------------------------------------------------------------------------
-        class NodeChangeInformation
-        {
-        public:
-        //-------------------------------------------------
-            explicit
-            NodeChangeInformation()
-            : change()
-            , location()
-            {
-            }
-        //-------------------------------------------------
-            NodeChangeData		change;
-            NodeChangeLocation	location;
-
-        //-------------------------------------------------
-            bool hasValidLocation() const { return location.isValidLocation(); }
-            bool isDataChange()		const { return change.isDataChange(); }
-
-            bool isEmptyChange()	const { return change.isEmptyChange(); }
-            bool isValueChange()	const { return change.isValueChange(); }
-            bool isSetChange()		const { return change.isSetChange(); }
-        //-------------------------------------------------
-        };
-//-----------------------------------------------------------------------------
-
-        class NodeChangesInformation
-        {
-        public:
-            std::vector< NodeChangeInformation >::size_type size() const { return m_data.size(); }
-            bool empty() const { return m_data.empty(); }
-
-            void reserve(std::vector< NodeChangeInformation >::size_type sz_)	{ m_data.reserve(sz_); }
-            void clear() { m_data.clear(); }
-            void swap(NodeChangesInformation& aOther) throw() { m_data.swap(aOther.m_data); }
-
-            void push_back(NodeChangeInformation const& aChange_)
-            { m_data.push_back(aChange_); }
-
-            std::vector< NodeChangeInformation >::const_iterator begin() const { return m_data.begin(); }
-            std::vector< NodeChangeInformation >::const_iterator end() const { return m_data.end(); }
-        private:
-            std::vector< NodeChangeInformation > m_data;
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#if !defined(WNT) || (defined(WNT) && _MSC_VER < 1400)
-namespace std
-{
-    template <> 
-    inline
-    void swap(configmgr::configuration::NodeChangesInformation& lhs, configmgr::configuration::NodeChangesInformation& rhs)
-    { lhs.swap(rhs); }
-}
-#endif
-
-#endif // CONFIGMGR_CONFIGCHANGEINFO_HXX_
diff --git a/configmgr/source/inc/nodeconverter.hxx b/configmgr/source/inc/nodeconverter.hxx
deleted file mode 100644
index 1475b66681..0000000000
--- a/configmgr/source/inc/nodeconverter.hxx
+++ /dev/null
@@ -1,64 +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: nodeconverter.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 CONFIGMGR_NODECONVERTER_HXX
-#define CONFIGMGR_NODECONVERTER_HXX
-
-#include "change.hxx"
-
-//..........................................................................
-namespace configmgr
-{
-//..........................................................................
-    class OTreeNodeFactory;
-//..........................................................................
-    class OTreeNodeConverter
-    {
-        OTreeNodeFactory& m_rFactory;
-    public:
-        OTreeNodeConverter();
-        OTreeNodeConverter(OTreeNodeFactory& _rFactory) 
-            : m_rFactory(_rFactory) {}
-
-        OTreeNodeFactory& nodeFactory() const { return m_rFactory; }
-    // node conversion functions
-        std::auto_ptr<ISubtree>  createCorrespondingNode(SubtreeChange   const& _rChange);
-        std::auto_ptr<ValueNode> createCorrespondingNode(ValueChange     const& _rChange);
-
-        std::auto_ptr<ISubtree>  createCorrespondingTree(SubtreeChange& _rChange);
-    };
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-#endif // CONFIGMGR_NODECONVERTER_HXX
-
-
diff --git a/configmgr/source/inc/noderef.hxx b/configmgr/source/inc/noderef.hxx
deleted file mode 100644
index 78cee2868e..0000000000
--- a/configmgr/source/inc/noderef.hxx
+++ /dev/null
@@ -1,271 +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: noderef.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGNODE_HXX_
-#define CONFIGMGR_CONFIGNODE_HXX_
-
-#include "rtl/ref.hxx"
-
-#include "configexcept.hxx"
-#include "configpath.hxx"
-#include "tree.hxx"
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-    class INode;
-
-    namespace view      { class ViewTreeAccess; }
-    namespace configapi { class Factory; }
-    namespace node      { struct Attributes; }
-    namespace configuration
-    {
-    //-------------------------------------------------------------------------
-    class AbsolutePath;
-    class RelativePath;
-        namespace Path { class Component; }
-
-        class NodeChange;
-        class NodeChanges;
-        class NodeRef;
-        class ValueRef;
-        class AnyNodeRef;
-
-        class NodeID;
-
-        const unsigned int C_TreeDepthAll = ~0u;
-    //-------------------------------------------------------------------------
-
-        /// represents a inner node position in some tree
-        class NodeRef
-        {
-        public:
-            /// constructs an empty (invalid) node
-            NodeRef();
-
-            NodeRef(unsigned int nPos, unsigned int nDepth);
-
-            /// copy a node (with reference semantics)
-            NodeRef(NodeRef const& rOther);
-            /// copy a node (with reference semantics)
-            NodeRef& operator=(NodeRef const& rOther);
-
-            void swap(NodeRef& rOther);
-
-            ~NodeRef();
-
-            /// checks, if this represents an existing node
-            inline bool isValid() const;
-
-            /// returns the offset of this Node
-            inline unsigned int getOffset() const;
-
-            /// returns the offset of this Node
-            inline unsigned int getDepth() const;
-
-        private:
-            friend class AnyNodeRef;
-        private:
-            unsigned int	m_nPos;
-            unsigned int	m_nDepth;
-        };
-    //-------------------------------------------------------------------------
-
-        class NodeID
-        {
-        public:
-            NodeID(rtl::Reference< Tree > const& rTree, NodeRef const& rNode);
-            NodeID(Tree* pImpl, unsigned int nNode);
-
-        // comparison
-            // equality
-            friend bool operator==(NodeID const& lhs, NodeID const& rhs)
-            { return lhs.m_pTree == rhs.m_pTree && lhs.m_nNode == rhs.m_nNode; }
-            // ordering
-            friend bool operator < (NodeID const& lhs, NodeID const& rhs);
-            // checking
-            bool isEmpty() const;
-            // checking
-            bool isValidNode() const;
-            // hashing
-            size_t hashCode() const;
-            // use as index - returns a value in the range 0..rTree.getContainedNodes() for the tree used to construct this
-            unsigned int toIndex() const;
-
-            Tree * getTree() const { return m_pTree; }
-
-            unsigned int getOffset() const { return m_nNode; }
-
-            NodeRef getNode() const;
-
-        private:
-            Tree*	m_pTree;
-            unsigned int	m_nNode;
-        };
-    //-------------------------------------------------------------------------
-
-        /** make a name out of <var>sName</var>.
-            @throws InvalidName
-                if <var>sName</var> is not a valid name for a member of group <var>aNode</var> within <var>aTree</var>
-
-        */
-        rtl::OUString validateChildName(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode );
-
-        /** make a name out of <var>sName</var>.
-            @throws InvalidName
-                if <var>sName</var> is not a valid name for an element of set <var>aNode</var> within <var>aTree</var>
-
-        */
-        rtl::OUString validateElementName(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode );
-
-        /** make a name out of <var>sName</var>.
-            @throws InvalidName
-                if <var>sName</var> is not a valid name for a child of <var>aNode</var> within <var>aTree</var>
-
-        */
-        rtl::OUString validateChildOrElementName(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode );
-
-        /** make one path component out of <var>sName</var>.
-            @throws InvalidName
-                if <var>sName</var> is not a valid name for an element of set <var>aNode</var> within <var>aTree</var>
-
-        */
-        Path::Component validateElementPathComponent(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode );
-
-        /** parse <var>aPath</var> into a relative path,
-            valid in the context of node <var>aNode<var/> in <var>aTree<var/>.
-
-            @returns
-                <var>aPath<var/> parsed as a relative path
-            @throws InvalidName
-                if <var>aPath<var/> is not a relative path or not valid in the context of <var>aNode<var/>
-        */
-        RelativePath validateRelativePath(rtl::OUString const& aPath, rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-
-        /** parse <var>aPath</var> as a configuration path
-            and reduce it to be relative to node <var>aNode<var/> in <var>aTree<var/>.
-
-            @returns
-                the result of parsing <var>aPath<var/>, if that results in a relative path, or
-                the part of it relative to <var>aNode<var/>,
-                  if it is an absolute path to a descendant of <var>aNode<var/>
-            @throws InvalidName
-                if <var>aPath<var/> is not awell-formed path or
-                if it is an absolute path that is not to a descendant of <var>aNode<var/>
-        */
-        RelativePath validateAndReducePath(rtl::OUString const& aPath, rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-        /** checks whether there is an immediate child of <var>aNode</var> (which is in <var>aTree</var>)
-            specified by <var>aName</var>
-
-            @return
-                <TRUE/> if the child node exists
-                <FALSE/> otherwise
-        */
-        bool hasChildOrElement(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, rtl::OUString const& aName);
-
-        /** checks whether there is an immediate child of <var>aNode</var> (which is in <var>aTree</var>)
-            specified by <var>aName</var>
-
-            @return
-                <TRUE/> if the child node exists
-                <FALSE/> otherwise
-        */
-        bool hasChildOrElement(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, Path::Component const& aName);
-
-        /** tries to find the immediate child of <var>aNode</var> (which is in <var>aTree</var>)
-            specified by <var>aName</var>
-            <p>	On return <var>aNode</var> is modified to refer to the node found and
-                <var>aTree</var> will then refer to the tree that node is in.
-            <p/>
-            <p>Caution: May miss an existing child unless the child has been accessed before.</p>
-
-            @return
-                <TRUE/> if the child node exists and is available
-                (so <var>aNode</var> and <var>aTree</var> refer to the desired node),
-                <FALSE/> otherwise
-
-            @see NodeRef::getAvailableChild
-        */
-        bool findInnerChildOrAvailableElement(rtl::Reference< Tree >& aTree, NodeRef& aNode, rtl::OUString const& aName);
-
-        /// test whether the given node is a structural (inner) node
-        bool isStructuralNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-
-        /// test whether the given inner node is a group node
-        bool isGroupNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-
-        /// get the value for a node that is a simple value (as tree element)
-        com::sun::star::uno::Any getSimpleElementValue(rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-
-        /// test whether the given inner node is a set node
-        bool isSetNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-
-        void getAllContainedNodes(rtl::Reference< Tree > const& aTree, std::vector<NodeID>& aList);
-        NodeID findNodeFromIndex(rtl::Reference< Tree > const& aTreeRef, unsigned int nIndex);
-
-    //-------------------------------------------------------------------------
-        inline bool NodeRef::isValid() const
-        {
-            return m_nPos != 0;
-        }
-
-    //-------------------------------------------------------------------------
-        inline unsigned int NodeRef::getOffset() const
-        {
-            return m_nPos;
-        }
-
-    //-------------------------------------------------------------------------
-        inline unsigned int NodeRef::getDepth() const
-        {
-            return m_nDepth;
-        }
-
-    //-------------------------------------------------------------------------
-        inline bool operator!=(NodeID const& lhs, NodeID const& rhs)
-        { return !(lhs == rhs); }
-        //---------------------------------------------------------------------
-
-        inline bool operator>=(NodeID const& lhs, NodeID const& rhs)
-        { return !(lhs < rhs); }
-        //---------------------------------------------------------------------
-        inline bool operator > (NodeID const& lhs, NodeID const& rhs)
-        { return  (rhs < lhs); }
-        inline bool operator<=(NodeID const& lhs, NodeID const& rhs)
-        { return !(rhs < lhs); }
-    //-------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGNODE_HXX_
diff --git a/configmgr/source/inc/nodevisitor.hxx b/configmgr/source/inc/nodevisitor.hxx
deleted file mode 100644
index a61b48f9ed..0000000000
--- a/configmgr/source/inc/nodevisitor.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: nodevisitor.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_CONFIGMGR_SOURCE_INC_NODEVISITOR_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_INC_NODEVISITOR_HXX
-
-#include "sal/config.h"
-
-namespace configmgr { namespace sharable {
-    struct GroupNode;
-    struct SetNode;
-    struct TreeFragment;
-    struct ValueNode;
-    union Node;
-} }
-
-namespace configmgr { namespace data {
-
-class NodeVisitor {
-public:
-    virtual ~NodeVisitor() = 0;
-
-    bool visitNode(sharable::Node * node);
-
-    bool visitChildren(sharable::GroupNode * node);
-
-protected:
-    virtual bool handle(sharable::Node * node);
-
-    virtual bool handle(sharable::ValueNode * node);
-
-    virtual bool handle(sharable::GroupNode * node);
-
-    virtual bool handle(sharable::SetNode * node);
-};
-
-class SetVisitor: public NodeVisitor {
-public:
-    virtual ~SetVisitor() = 0;
-
-    bool visitTree(sharable::TreeFragment * tree);
-
-    bool visitElements(sharable::SetNode * node);
-
-protected:
-    using NodeVisitor::handle;
-
-    virtual bool handle(sharable::TreeFragment * tree);
-};
-
-} }
-
-#endif
diff --git a/configmgr/source/inc/options.hxx b/configmgr/source/inc/options.hxx
deleted file mode 100644
index 6ec446df7e..0000000000
--- a/configmgr/source/inc/options.hxx
+++ /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: options.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_MISC_OPTIONS_HXX_
-#define CONFIGMGR_MISC_OPTIONS_HXX_
-
-#include "requestoptions.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include "utility.hxx"
-#include <salhelper/simplereferenceobject.hxx>
-#include <vos/ref.hxx>
-
-namespace configmgr
-{
-    namespace css  = ::com::sun::star;
-
-    /**
-       class OOptions is created one time per Configuration[update]Access
-       all important options should stored in this class.
-       The object will be forwarded to all other objects so we only
-       need to extend this classobject and all other class can work with
-       the new options or important options etc.
-    */
-    
-    class OOptions : public salhelper::SimpleReferenceObject
-    {
-        RequestOptions  m_aRequestOptions;  // current options to use
-
-    public:
-        OOptions()
-        : m_aRequestOptions()
-        {}
-        
-        explicit
-        OOptions(const RequestOptions& _aDefaultOptions)
-        : m_aRequestOptions(_aDefaultOptions)
-        {
-        }
-        
-        OOptions(const OOptions& _aOtherOptions)
-        : SimpleReferenceObject()
-        , m_aRequestOptions(_aOtherOptions.m_aRequestOptions)
-        {
-        }
-        
-        bool isForSessionUser()     const { return ! m_aRequestOptions.hasEntity(); }
-
-        rtl::OUString    getLocale() const { return m_aRequestOptions.getLocale(); }	
-        rtl::OUString          getUser()   const { return m_aRequestOptions.getEntity(); }
-
-        RequestOptions const & getRequestOptions() const
-        { return m_aRequestOptions; }
-
-        void setUser(const rtl::OUString & _rUser)
-        { m_aRequestOptions.setEntity(_rUser); }
-
-        void setLocale(const com::sun::star::lang::Locale & _rLocale)
-        { m_aRequestOptions.setLocale(_rLocale); }
-
-        void setMultiLocaleMode()
-        { m_aRequestOptions.setAllLocales(); }
-
-        void enableAsync(bool _bEnable)         
-        { m_aRequestOptions.enableAsync(_bEnable); }
-    };
-
-    struct ltOptions
-    {
-        lessRequestOptions ltData;
-        bool operator()(vos::ORef<OOptions> const &o1, vos::ORef<OOptions> const &o2) const
-        {
-            return ltData(o1->getRequestOptions(),o2->getRequestOptions());
-        }		
-    };
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/oslstream.hxx b/configmgr/source/inc/oslstream.hxx
deleted file mode 100644
index 4ea8868b63..0000000000
--- a/configmgr/source/inc/oslstream.hxx
+++ /dev/null
@@ -1,134 +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: oslstream.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 _CONFIGMGR_OSLSTREAM_HXX_
-#define _CONFIGMGR_OSLSTREAM_HXX_
-
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <osl/mutex.hxx>
-
-#include "bufferedfile.hxx"
-
-namespace osl
-{
-    class File;
-}
-
-namespace configmgr
-{
-    namespace stario	= ::com::sun::star::io;
-    namespace staruno	= ::com::sun::star::uno;
-    
-// -----------------------------------------------------------------------------
-    /// OSLInputStreamWrapper - implementation of XInputStream on an (unbuffered) osl::File
-    class OSLInputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XInputStream>
-    {
-        ::osl::Mutex      m_aMutex;
-        ::osl::File*	m_pFile;
-        sal_Bool		m_bFileOwner : 1;
-
-    public:
-        /// c'tor. _rStream must live at least until closeInput() is called on this stream
-        OSLInputStreamWrapper(::osl::File& _rStream);
-        /// c'tor. if bOwner is <FALSE/> *pStream must live at least until closeInput() is called on this stream
-        OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=sal_False);
-        virtual ~OSLInputStreamWrapper();
-
-    // stario::XInputStream
-        virtual sal_Int32	SAL_CALL	
-            readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) 
-                throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-        
-        virtual sal_Int32	SAL_CALL	
-            readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) 
-                throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-        
-        virtual void		SAL_CALL	
-            skipBytes(sal_Int32 nBytesToSkip) 
-                throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-
-        virtual sal_Int32	SAL_CALL	available() throw(stario::NotConnectedException, staruno::RuntimeException);
-        virtual void		SAL_CALL	closeInput() throw(stario::NotConnectedException, staruno::RuntimeException);
-    };
-
-// -----------------------------------------------------------------------------
-    /// OSLOutputStreamWrapper - implementation of XOutputStream on an (unbuffered) osl::File
-    class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream>
-    {
-        ::osl::Mutex      m_aMutex;
-        ::osl::File&		rFile;
-
-    public:
-        /// c'tor. _rStream must live at least until closeOutput() is called on this stream
-        OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { }
-
-    // stario::XOutputStream
-        virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) 
-            throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-        
-        virtual void SAL_CALL flush() 
-            throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-        
-        virtual void SAL_CALL closeOutput() 
-            throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
-    };
-// -----------------------------------------------------------------------------
-    /// BufferedFileOutputStream - buffered implementation of XOutputStream on an osl::File
-    class BufferedFileOutputStream: public ::cppu::WeakImplHelper1<stario::XOutputStream>
-    {
-        BufferedOutputFile	m_aFile;
-
-    public:
-        BufferedFileOutputStream(rtl::OUString const & aFileURL, bool bCreate=true, sal_uInt32 nBufferSizeHint=0);
-        virtual ~BufferedFileOutputStream();
-
-    // stario::XOutputStream
-        virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) 
-            throw(stario::NotConnectedException, stario::BufferSizeExceededException, 
-                    stario::IOException, staruno::RuntimeException);
-        
-        virtual void SAL_CALL flush() 
-            throw(stario::NotConnectedException, stario::BufferSizeExceededException, 
-                    stario::IOException, staruno::RuntimeException);
-        
-        virtual void SAL_CALL closeOutput() 
-            throw(stario::NotConnectedException, stario::BufferSizeExceededException,
-                   stario::IOException, staruno::RuntimeException);
-    };
-// -----------------------------------------------------------------------------
-
-}	// namespace configmgr
-
-#endif // _CONFIGMGR_OSLSTREAM_HXX_
-
-
-
diff --git a/configmgr/source/inc/propertysethelper.hxx b/configmgr/source/inc/propertysethelper.hxx
deleted file mode 100644
index 201e120320..0000000000
--- a/configmgr/source/inc/propertysethelper.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: 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
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 CONFIGMGR_MISC_PROPERTYSETHELPER_HXX
-#define CONFIGMGR_MISC_PROPERTYSETHELPER_HXX
-
-#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/weak.hxx>
-
-//..........................................................................
-namespace configmgr {
-    namespace apihelper {
-//..........................................................................
-        namespace uno   = com::sun::star::uno;
-        namespace lang  = com::sun::star::lang;
-        namespace beans = com::sun::star::beans;
-//..........................................................................
-class BroadcasterBase
-{
-    osl::Mutex              m_aMutex;
-    cppu::OBroadcastHelper  m_aBroadcastHelper;
-
-protected:
-    BroadcasterBase() : m_aMutex(), m_aBroadcastHelper(m_aMutex) {}
-    ~BroadcasterBase() {}
-
-    osl::Mutex &             getBroadcastMutex()  { return m_aMutex; }
-    cppu::OBroadcastHelper & getBroadcastHelper() { return m_aBroadcastHelper; }
-};
-  
-//..........................................................................
-
-class PropertySetHelper : protected BroadcasterBase // must be first
-                        , public cppu::OWeakObject
-                        , public cppu::OPropertySetHelper // not copyable
-{
-public:
-    PropertySetHelper();
-    ~PropertySetHelper();
-
-    // XInterface
-    virtual uno::Any SAL_CALL queryInterface( uno::Type const & rType ) throw (uno::RuntimeException);
-    virtual void SAL_CALL acquire() throw ();
-    virtual void SAL_CALL release() throw ();
-    // XTypeProvider
-    virtual uno::Sequence< uno::Type > SAL_CALL getTypes() throw (uno::RuntimeException);
-
-    // to be provided by derived classes
-    // virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (uno::RuntimeException) = 0;
-
-    // XPropertySet
-     virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL 
-         getPropertySetInfo(  ) throw (uno::RuntimeException);
-
-
-protected: 
-// new methods still to be overridden
-    virtual cppu::IPropertyArrayHelper * SAL_CALL newInfoHelper() = 0;
-
-// cppu::OPropertySetHelper interface
-#if 0 // these methods still must be overridden
-    virtual cppu::IPropertyArrayHelper * SAL_CALL newInfoHelper() = 0;
-
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue )
-            throw (uno::Exception) = 0;
-
-    virtual void SAL_CALL getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) const = 0;
-#endif
-    virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-    // default implementation: does not do any conversion
-    virtual sal_Bool SAL_CALL convertFastPropertyValue(
-        uno::Any & rConvertedValue, uno::Any & rOldValue, 
-        sal_Int32 nHandle, const uno::Any& rValue )
-            throw (lang::IllegalArgumentException);
-private:
-    cppu::IPropertyArrayHelper * m_pHelper;
-};
-//..........................................................................
-    }	// namespace apihelper
-}	// namespace configmgr
-//..........................................................................
-
-#endif 
-
-
diff --git a/configmgr/source/inc/request.hxx b/configmgr/source/inc/request.hxx
deleted file mode 100644
index 1d553abb5c..0000000000
--- a/configmgr/source/inc/request.hxx
+++ /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: request.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 CONFIGMGR_BACKEND_REQUEST_HXX_
-#define CONFIGMGR_BACKEND_REQUEST_HXX_
-
-#include "requestoptions.hxx"
-#include "requesttypes.hxx"
-#include "configpath.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-// ---------------------------------------------------------------------------
-
-        class NodeRequest
-        {
-            configuration::AbsolutePath    m_aNodePath;
-            RequestOptions  m_aOptions;
-        public:
-            NodeRequest(configuration::AbsolutePath const& _aNodePath, RequestOptions const & _aOptions)
-            : m_aNodePath(_aNodePath)
-            , m_aOptions(_aOptions)
-            {
-            }
-
-            configuration::AbsolutePath    const & getPath()       const { return m_aNodePath; }
-            RequestOptions  const & getOptions()    const { return m_aOptions; }
-        };
-// ---------------------------------------------------------------------------
-
-        class ComponentRequest
-        {
-            rtl::OUString m_aComponentName;
-            RequestOptions  m_aOptions;
-            bool            m_bForcedReload;
-        public:
-            ComponentRequest(rtl::OUString const& _aComponentName, RequestOptions const & _aOptions)
-            : m_aComponentName(_aComponentName)
-            , m_aOptions(_aOptions)
-            , m_bForcedReload(false)
-            {
-            }
-
-            rtl::OUString const & getComponentName()  const { return m_aComponentName; }
-            RequestOptions  const & getOptions()        const { return m_aOptions; }
-            
-            bool isForcingReload() const { return m_bForcedReload; }
-            void forceReload(bool _bForce = true) { m_bForcedReload = _bForce; }
-     };
-// ---------------------------------------------------------------------------
-
-        class TemplateRequest
-        {
-            rtl::OUString m_aComponentName;
-            rtl::OUString m_aTemplateName;
-
-        public:
-            static
-            TemplateRequest forComponent(rtl::OUString const & _aComponentName)
-            {
-                return TemplateRequest( rtl::OUString(), _aComponentName);
-            }
-
-            explicit
-            TemplateRequest(rtl::OUString const & _aTemplateName, rtl::OUString const & _aComponentName)
-            : m_aComponentName(_aComponentName)
-            , m_aTemplateName(_aTemplateName)
-            {}
-
-            bool isComponentRequest() const { return m_aTemplateName.getLength() == 0; }
-            rtl::OUString getTemplateName()      const { return m_aTemplateName; }
-            rtl::OUString getComponentName()     const { return m_aComponentName; }
-
-        };
-
-// ---------------------------------------------------------------------------
-
-        class UpdateRequest
-        {
-            ConstUpdateInstance  m_aUpdate;
-            RequestOptions  m_aOptions;
-            rtl::OUString       m_aRQID;
-        public:
-            explicit
-            UpdateRequest(  UpdateInstance const & _aUpdate, 
-                            RequestOptions const & _aOptions)
-            : m_aUpdate(_aUpdate)
-            , m_aOptions(_aOptions)
-            {}
-
-            explicit
-            UpdateRequest(  ConstUpdateInstance const & _aUpdate, 
-                            RequestOptions const & _aOptions)
-            : m_aUpdate(_aUpdate)
-            , m_aOptions(_aOptions)
-            {}
-
-            explicit
-            UpdateRequest(  ConstUpdateInstance::Data _aUpdateData, 
-                            configuration::AbsolutePath const & _aRootpath, 
-                            RequestOptions const & _aOptions)
-            : m_aUpdate(_aUpdateData, _aRootpath)
-            , m_aOptions(_aOptions)
-            {}
-
-            bool isSyncRequired() const { return !m_aOptions.isAsyncEnabled(); }
-
-            RequestOptions const & getOptions()  const { return m_aOptions; }
-            configuration::AbsolutePath const & getUpdateRoot()     const { return m_aUpdate.root(); }
-
-            ConstUpdateInstance const & getUpdate()   const { return m_aUpdate; }
-            ConstUpdateInstance::Data getUpdateData() const { return m_aUpdate.data(); }
-
-            void setRequestId(rtl::OUString const & _aRQID) { m_aRQID = _aRQID; }
-            rtl::OUString getRequestId() const { return m_aRQID; }
-        };
-
-        inline ComponentRequest getComponentRequest(UpdateRequest const & _aUR)
-        { return ComponentRequest(_aUR.getUpdateRoot().getModuleName(), _aUR.getOptions()); }
-// ---------------------------------------------------------------------------
-    } // namespace
-// ---------------------------------------------------------------------------
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/requestoptions.hxx b/configmgr/source/inc/requestoptions.hxx
deleted file mode 100644
index bf3ba310cc..0000000000
--- a/configmgr/source/inc/requestoptions.hxx
+++ /dev/null
@@ -1,124 +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: requestoptions.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_MISC_REQUESTOPTIONS_HXX_
-#define CONFIGMGR_MISC_REQUESTOPTIONS_HXX_
-
-#include <com/sun/star/lang/Locale.hpp>
-#include <rtl/ustring.hxx>
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-
-    /**
-        Options which can be used to modify a request for data
-    */
-    class RequestOptions
-    {
-    public:
-        /// Default constructor. Sets options to use defaults.
-        RequestOptions()
-        : m_sLocale() 
-        , m_sEntity()
-        , m_bEnableAsync(true)
-        , m_bReload(false)
-        {}
-        
-        /// @returns <TRUE/>, if data can be written asynchronously
-        bool isAsyncEnabled() const { return m_bEnableAsync; }
-        /// @returns <TRUE/>, if data is reloaded into cache
-        bool isRefreshEnabled() const { return m_bReload; }
-        /** @returns 
-                <TRUE/>,  if a locale is specified, <BR/>
-                <FALSE/>, if the default locale should be used
-        */
-        bool    hasLocale() const { return m_sLocale.Language.getLength() != 0; }
-        /// @returns the locale to get data for
-        bool    isForAllLocales() const;
-        /// @returns the locale to get data for - compatibilty version
-        rtl::OUString  getLocale() const { return getIsoLocale(); }
-        /// @returns the locale to get data for
-        rtl::OUString  getIsoLocale() const;
-        /// @returns the locale to get data for
-        com::sun::star::lang::Locale const & getUnoLocale() const { return m_sLocale; }
-        
-        /** @returns 
-            <TRUE/>,  if an entity is specified, <BR/>
-            <FALSE/>, if data of the session user is requested 
-        */
-        bool    hasEntity() const { return m_sEntity.getLength() != 0; }
-        /// @returns the entity to get data for
-        rtl::OUString  getEntity() const { return m_sEntity; }
-        
-        /// sets the entity to get data for to the given entity
-        void setEntity(rtl::OUString const & _sEntity) { m_sEntity = _sEntity; }
-        /// resets the entity to get data for to be the session user
-        void clearEntity()   { m_sEntity = rtl::OUString(); }
-
-        /// sets the locale so data is gotten for all locales
-        void setAllLocales();
-        /// sets the locale to get data for to the given locale
-        void setLocale(com::sun::star::lang::Locale const & _aLocale) { m_sLocale = _aLocale; }
-        /// sets the locale to get data for to the given locale
-        void setIsoLocale(rtl::OUString const & _sLocale);
-        /// sets a fallback locale, if no locale is set yet
-        void ensureLocaleSet();
-
-        /// marks asyncronous access a enabled or disabled
-        void enableAsync(bool _bEnable = true)  { m_bEnableAsync = _bEnable; }
-        /// enforce a refresh to cache
-        void forceRefresh(bool _bEnable = true)  { m_bReload = _bEnable; }
-    // comparison/container helpers
-        /// function that defines a weak strict ordering on RequestOptions
-        friend sal_Int32 compareRequestOptions(RequestOptions const& lhs, RequestOptions const& rhs);
-    private:
-        com::sun::star::lang::Locale	    m_sLocale;								/// locale to fetch data for
-        rtl::OUString	    m_sEntity;								/// user/group/role to fetch data for
-        bool    	m_bEnableAsync;							/// true, if data may be
-        bool        m_bReload;                              /// reload into cache from backend
-    };
-
-// ---------------------------------------------------------------------------
-    struct lessRequestOptions
-    {
-        bool operator()(RequestOptions const & lhs, RequestOptions const & rhs) const
-        { return compareRequestOptions(lhs,rhs) < 0; }
-    };
-// ---------------------------------------------------------------------------
-    struct equalRequestOptions
-    {
-        bool operator()(RequestOptions const & lhs, RequestOptions const & rhs) const
-        { return compareRequestOptions(lhs,rhs) == 0; }
-    };
-// ---------------------------------------------------------------------------
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/requesttypes.hxx b/configmgr/source/inc/requesttypes.hxx
deleted file mode 100644
index 9fb6d8ac7e..0000000000
--- a/configmgr/source/inc/requesttypes.hxx
+++ /dev/null
@@ -1,237 +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: requesttypes.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_REQUESTTYPES_HXX_
-#define CONFIGMGR_BACKEND_REQUESTTYPES_HXX_
-
-#include "sal/config.h"
-
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "valuenode.hxx"
-#include "treechangelist.hxx"
-#include "configpath.hxx"
-
-#ifndef _CONFIGMGR_UTILITY_HXX_
-#include <utility.hxx>
-#endif
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-// ---------------------------------------------------------------------------
-        struct ComponentDataStruct
-        {
-            const std::auto_ptr<ISubtree>& data;   
-            rtl::OUString name;
-            ComponentDataStruct (const std::auto_ptr<ISubtree>& _data, rtl::OUString _name)
-              : data(_data), name(_name) {}
-        };
-// ---------------------------------------------------------------------------
-        struct NodeInstance
-        {
-            typedef std::auto_ptr<ISubtree> Data;
-            
-            explicit
-            NodeInstance(Data _node, configuration::AbsolutePath const & _rootpath)
-            : m_node(_node)
-            , m_root(_rootpath)
-            {
-            }
-
-            Data        const & data() const { return m_node; }
-            configuration::AbsolutePath const & root() const { return m_root; }
-            
-            Data &  mutableData() { return m_node; }
-            Data extractData() { return m_node; }
-        private:
-            Data        m_node; 
-            configuration::AbsolutePath m_root;
-        };
-// ---------------------------------------------------------------------------
-        struct TemplateInstance
-        {
-            typedef std::auto_ptr<INode> Data;
-
-            explicit
-            TemplateInstance(Data _node, rtl::OUString const & _name, rtl::OUString const & _component)
-            : m_node(_node)
-            , m_name(_name)
-            , m_component(_component)
-            {
-            }
-
-            Data        const & data() const { return m_node; }
-            rtl::OUString const & name() const { return m_name; }
-            rtl::OUString const & component() const { return m_component; }
-
-            Data extractData() { return m_node; }
-    private:
-            Data m_node;
-            rtl::OUString m_name; // if empty, this is a complete set of component templates
-            rtl::OUString m_component; 
-        };
-// ---------------------------------------------------------------------------
-        struct ComponentInstance
-        {
-            typedef std::auto_ptr<ISubtree> Data;
-          
-            explicit
-            ComponentInstance(Data _node, Data _template, rtl::OUString const & _component)
-            : m_node(_node)
-            , m_template(_template)
-            , m_component(_component)
-            {
-            }
-
-            Data        const & data() const { return m_node; }
-            Data        const & templateData() const { return m_template; }
-            rtl::OUString const & component() const { return m_component; }
-            
-            ComponentDataStruct  componentTemplateData () const { return ComponentDataStruct(m_template,m_component);} 
-            ComponentDataStruct  componentNodeData () const { return ComponentDataStruct(m_node,m_component);} 
-            Data &  mutableData() { return m_node; }
-            Data extractData() { return m_node; }
-            Data extractTemplateData() { return m_template; }
-        private:
-            Data        m_node; 
-            Data        m_template;
-            rtl::OUString m_component;
-        };
-// ---------------------------------------------------------------------------
-        struct UpdateInstance
-        {
-            typedef SubtreeChange *         Data;
-
-            explicit
-            UpdateInstance(Data _update, configuration::AbsolutePath const & _rootpath)
-            : m_update(_update)
-            , m_root(_rootpath)
-            {
-            }
-
-            UpdateInstance(UpdateInstance & _aModifiableOther)
-            : m_update(_aModifiableOther.m_update)
-            , m_root(_aModifiableOther.m_root)
-            {
-            }
-
-            Data                data()       { return m_update; }
-            SubtreeChange const *           data() const { return m_update; }
-            configuration::AbsolutePath const & root() const { return m_root; }
-        private:
-            Data        m_update;
-            configuration::AbsolutePath m_root;
-        };
-// ---------------------------------------------------------------------------
-        struct ConstUpdateInstance
-        {
-            typedef SubtreeChange const *   Data;
-
-            explicit
-            ConstUpdateInstance(Data _update, configuration::AbsolutePath const & _rootpath)
-            : m_update(_update)
-            , m_root(_rootpath)
-            {
-            }
-
-            // conversion
-            ConstUpdateInstance(UpdateInstance const & _aModifiable)
-            : m_update(_aModifiable.data())
-            , m_root(_aModifiable.root())
-            {
-            }
-
-            Data                data() const { return m_update; }
-            configuration::AbsolutePath const & root() const { return m_root; }
-        private:
-            Data        m_update;
-            configuration::AbsolutePath m_root;
-        };
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-// Due to the use of auto_ptr, the XxxInstance classes cannot easily be used as return values
-// To return them, they should be wrapped into a ResultHolder
-
-        template <class Instance_>
-        class ResultHolder
-        {
-            struct RCInstance : public salhelper::SimpleReferenceObject
-            {
-                RCInstance(Instance_ & _instance)
-                    : instance(_instance) {}
-                Instance_ instance;
-            };
-
-            rtl::Reference< RCInstance > m_xInstance;
-        public:
-            explicit
-            ResultHolder(Instance_ & _rInstance) 
-            : m_xInstance( new RCInstance(_rInstance) ) 
-            {}
-            
-            bool isEmpty() const { return !m_xInstance.is(); }
-
-            bool is() const { return m_xInstance.is() && m_xInstance->instance.data().get(); }
-
-            Instance_ const & instance() const { return  m_xInstance->instance; }
-
-            Instance_ const & operator *() const { return  instance(); }
-            Instance_ const * operator->() const { return &instance(); }
-            Instance_ & mutableInstance() { return m_xInstance->instance; }
-            
-            typename Instance_::Data extractDataAndClear() 
-            {
-                typename Instance_::Data aData = m_xInstance->instance.extractData();
-                this->clear();
-                return aData;
-            }
-
-            void releaseAndClear() 
-            {
-                typename Instance_::Data aData = this->extractDataAndClear();
-                aData.release();
-            }
-
-            void clear() { m_xInstance.clear(); }
-        };
-// ---------------------------------------------------------------------------
-    }
-// ---------------------------------------------------------------------------
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/roottree.hxx b/configmgr/source/inc/roottree.hxx
deleted file mode 100644
index 7e6cee11dc..0000000000
--- a/configmgr/source/inc/roottree.hxx
+++ /dev/null
@@ -1,115 +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: roottree.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_ROOTTREE_HXX_
-#define CONFIGMGR_ROOTTREE_HXX_
-
-#include "sal/config.h"
-
-#include <memory>
-
-#include "boost/utility.hpp"
-#include "rtl/ref.hxx"
-
-#include "utility.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace sharable { union Node; }
-    class SubtreeChange;
-    struct TreeChangeList;
-
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class Tree; 
-        class NodeRef;
-        class NodeChangesInformation;
-        class AbsolutePath;
-        class TemplateProvider;
-
-//-----------------------------------------------------------------------------
-
-        rtl::Reference< Tree > createReadOnlyTree(	AbsolutePath const& aRootPath, 
-                                                    sharable::Node * _aCacheNode, 
-                                        unsigned int nDepth,
-                                        TemplateProvider const& aTemplateProvider);
-
-        rtl::Reference< Tree > createUpdatableTree(	AbsolutePath const& aRootPath, 
-                                                    sharable::Node * _aCacheNode, 
-                                        unsigned int nDepth,
-                                        TemplateProvider const& aTemplateProvider);
-
-//-----------------------------------------------------------------------------
-        class CommitHelper: private boost::noncopyable
-        {
-            struct Data;
-
-            std::auto_ptr<Data> m_pData;
-            Tree*           m_pTree;
-        public:
-            CommitHelper(rtl::Reference< Tree > const& aTree);
-            ~CommitHelper();
-
-            // collect all changes into rChangeList
-            bool prepareCommit(TreeChangeList& rChangeList);
-
-            // finish and clean up the changes in rChangeList after they are integrated
-            void finishCommit(TreeChangeList& rChangeList);
-            // throw away and clean up the changes in rChangeList after a commit failed
-            void failedCommit(TreeChangeList& rChangeList);
-        };
-
-//-----------------------------------------------------------------------------
-        /** adjusts <var>aTree</var> tree to the (externally produced) changes under <var>aExternalChanges</var>
-            and collects the changes this induces locally.
-            @param rLocalChanges 
-                a collection that will hold the changes induced by <var>aExternalChanges</var>. 
-            @param aExternalChanges 
-                a structured change that has already been applied to the master tree. 
-            @param aBaseTree
-                the tree that contains (directly) the affected node of <var>aExternalChanges</var>.
-            @param aBaseNode
-                a NodeRef referring to the (directly) affected node of <var>aExternalChanges</var>.
-            @return 
-                <TRUE/> if any changes occur in this tree (so rLocalChanges is not empty), <FALSE/> otherwise.
-                    
-        */
-        bool adjustToChanges(	NodeChangesInformation& rLocalChanges, 
-                                rtl::Reference< Tree > const& aBaseTree, NodeRef const& aBaseNode, 
-                                SubtreeChange const& aExternalChange) ;
-
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_ROOTTREE_HXX_
diff --git a/configmgr/source/inc/sequence.hxx b/configmgr/source/inc/sequence.hxx
deleted file mode 100644
index 2b3702c062..0000000000
--- a/configmgr/source/inc/sequence.hxx
+++ /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: sequence.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 INCLUDED_SHARABLE_SEQUENCE_HXX
-#define INCLUDED_SHARABLE_SEQUENCE_HXX
-
-#include "anydata.hxx"
-#include <com/sun/star/uno/Sequence.hxx>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace sharable
-    {
-    //-----------------------------------------------------------------------------
-       
-        sal_uInt8 * allocSequence(sal_uInt8 _aElementType, ::sal_Sequence const * _pSeqData);
-        void     freeSequence(sal_uInt8 _aElementType, sal_uInt8 * _aSeq);
-
-        ::sal_Sequence * readSequence(sal_uInt8 _aElementType, sal_uInt8 * _aSeq);
-        ::com::sun::star::uno::Any readAnySequence(sal_uInt8 _aElementType, sal_uInt8 * _aSeq);
-    //-----------------------------------------------------------------------------
-
-        sal_uInt8 * allocBinary(::com::sun::star::uno::Sequence<sal_Int8> const & _aBinaryValue);
-        void freeBinary(sal_uInt8 * _aSeq);
-
-        ::com::sun::star::uno::Sequence<sal_Int8> readBinary(sal_uInt8 * _aSeq);
-    //-----------------------------------------------------------------------------
-
-        template <class ET>
-        inline
-        sal_uInt8 getElementTypeCode(::com::sun::star::uno::Sequence<ET> const & )
-        {
-            ::com::sun::star::uno::Type aElementType = ::getCppuType( static_cast<ET const *>(NULL) );
-            return getTypeCode(aElementType);
-        }
-
-        template <class ET>
-        sal_uInt8 * allocSequence(::com::sun::star::uno::Sequence<ET> const & _aSeq)
-        {
-            sal_uInt8 aTC = getElementTypeCode(_aSeq);
-            ::sal_Sequence const * pSeqData = _aSeq.get();
-            return allocSequence(aTC, pSeqData);
-        }
-
-        template <class ET>
-        void readSequence(::com::sun::star::uno::Sequence<ET> & _rSeq, sal_uInt8 * _aSeq)
-        {
-            sal_uInt8 aElementType = getElementTypeCode(_rSeq);
-
-            ::sal_Sequence * pNewSequence = readSequence(aElementType, _aSeq);
-
-            if (!pNewSequence) return;
-
-            ::com::sun::star::uno::Sequence<ET> aNewSequence(pNewSequence, SAL_NO_ACQUIRE);
-
-            _rSeq = aNewSequence;
-        }
-
-        template <class ET>
-        bool readSequence(::com::sun::star::uno::Sequence<ET> & _rSeq, sal_uInt8 _aElementType, sal_uInt8 * _aSeq)
-        {
-            if (getElementTypeCode(_rSeq) != _aElementType) return false;
-
-            ::sal_Sequence * pNewSequence = readSequence(_aElementType, _aSeq);
-
-            if (!pNewSequence) return false;
-
-            ::com::sun::star::uno::Sequence<ET> aNewSequence(pNewSequence, SAL_NO_ACQUIRE);
-
-            _rSeq = aNewSequence;
-
-            return true;
-        }
-//-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------    
-}
-
-
-#endif //  INCLUDED_SHARABLE_SEQUENCE_HXX
diff --git a/configmgr/source/inc/serviceinfohelper.hxx b/configmgr/source/inc/serviceinfohelper.hxx
deleted file mode 100644
index 1be7b1e2a2..0000000000
--- a/configmgr/source/inc/serviceinfohelper.hxx
+++ /dev/null
@@ -1,138 +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: serviceinfohelper.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 CONFIGMGR_SERVICEINFOHELPER_HXX_
-#define CONFIGMGR_SERVICEINFOHELPER_HXX_
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-namespace configmgr 
-{
-// -----------------------------------------------------------------------------
-    namespace uno   = ::com::sun::star::uno;
-    namespace lang  = ::com::sun::star::lang;
-// -----------------------------------------------------------------------------
-
-    /// POD struct describing the registration information of a service implementation
-    struct ServiceRegistrationInfo
-    {
-        /// The implementation name of this service implementation
-        sal_Char const * implementationName;
-        /// The services for which this service implementation is registered
-        sal_Char const * const * registeredServiceNames;
-    };
-// -----------------------------------------------------------------------------
-
-    /// POD struct describing the implementation information of a service implementation
-    struct ServiceImplementationInfo
-    {
-        /// The implementation name of this service implementation
-        sal_Char const * implementationName;
-        /// The services for which this service implementation is registered
-        sal_Char const * const * registeredServiceNames;
-        /// Additional services implemented by this service implementation, for which it is not registered
-        sal_Char const * const * additionalServiceNames;
-    };
-// -----------------------------------------------------------------------------
-
-    // ServiceImplementationInfo has a compatible initial sequence with struct ServiceRegistrationInfo
-
-    inline 
-    ServiceRegistrationInfo const * 
-        getRegistrationInfo(ServiceImplementationInfo const * _info)
-    {
-        return reinterpret_cast<ServiceRegistrationInfo const *>(_info);
-    }
-// -----------------------------------------------------------------------------
-
-    /// POD struct describing the registration information of a singleton
-    struct SingletonRegistrationInfo
-    {
-        /// The name of this singleton
-        sal_Char const * singletonName;
-        /// The implementation, which owns this singleton
-        sal_Char const * implementationName;
-        /// The service, which should be instatiated for this singleton
-        sal_Char const * instantiatedServiceName;
-        /// A name for a pseudo-implementation, which is mapped to this singleton
-        ServiceRegistrationInfo const * mappedImplementation;
-    };
-// -----------------------------------------------------------------------------
-
-    class ServiceRegistrationHelper
-    {
-        ServiceRegistrationInfo const*const m_info;
-
-    public:
-        ServiceRegistrationHelper(ServiceRegistrationInfo const* _info) 
-        : m_info(_info) 
-        {}
-
-        ServiceRegistrationHelper(ServiceImplementationInfo const* _info) 
-        : m_info(getRegistrationInfo(_info)) 
-        {}
-
-        sal_Int32 countServices() const;
-
-        rtl::OUString getImplementationName( ) const 
-            throw(uno::RuntimeException);
-
-        uno::Sequence< rtl::OUString > getRegisteredServiceNames( ) const 
-            throw(uno::RuntimeException);
-    };
-// -----------------------------------------------------------------------------
-
-    class ServiceInfoHelper
-    {
-        ServiceImplementationInfo const*const m_info;
-
-    public:
-        ServiceInfoHelper(ServiceImplementationInfo const* _info) 
-        : m_info(_info) 
-        {}
-
-        sal_Int32 countServices() const;
-
-        rtl::OUString getImplementationName( ) const 
-            throw(uno::RuntimeException);
-
-        sal_Bool supportsService( rtl::OUString const & ServiceName ) const 
-            throw(uno::RuntimeException);
-
-        uno::Sequence< rtl::OUString > getSupportedServiceNames( ) const 
-            throw(uno::RuntimeException);
-    };
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-
-#endif 
-
-
diff --git a/configmgr/source/inc/simpleinteractionrequest.hxx b/configmgr/source/inc/simpleinteractionrequest.hxx
deleted file mode 100644
index 852216ff88..0000000000
--- a/configmgr/source/inc/simpleinteractionrequest.hxx
+++ /dev/null
@@ -1,104 +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: simpleinteractionrequest.hxx,v $
- * $Revision: 1.4.18.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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_SIMPLEINTERACTIONREQUEST_HXX
-#define CONFIGMGR_SIMPLEINTERACTIONREQUEST_HXX
-
-#include "interactionrequest.hxx"
-
-// this file was copied and adapted from the corresponding file in module ucbhelper
-
-namespace configmgr {
-namespace apihelper {
-
-    namespace uno = com::sun::star::uno;
-/**
-    This class implements a simple interaction request. The user must not deal
-    with XInteractionContinuations directly, but can use constants that are
-    mapped internally to the according objects. This class encapsulates the
-    standard Interaction Continuations "Abort", "Retry", "Approve" and
-    "Disaprrove". Instances can be passed directly to
-    XInteractionHandler::handle(...).
-      
-    @see InteractionRequest
-    @see InteractionAbort
-    @see InteractionRetry
-    @see InteractionApprove
-    @see InteractionDisapprove
-  */
-    class SimpleInteractionRequest : public InteractionRequest
-    {
-    public:
-        /**
-        * Constructor.
-        *
-        * @param rRequest is the exception describing the error.
-        * @param nContinuations contains the possible "answers" for the request.
-        *        This can be any of the CONTINUATION_* constants combinations
-        *        listed above.
-        */
-        SimpleInteractionRequest( const uno::Any & rRequest,
-                                const sal_uInt32 nContinuations );
-
-        /**
-        * After passing this request to XInteractionHandler::handle, this method
-        * returns the continuation that was choosen by the interaction handler.
-        *
-        * @return the continuation choosen by an interaction handler or
-        *         CONTINUATION_UNKNOWN, if the request was not (yet) handled.
-        */
-        sal_uInt32 getResponse() const;
-    };
-
-/** These are the constants that can be passed to the constructor of class
-  * SimpleInteractionRequest and that are returned by method
-  * SimpleInteractionRequest::getResponse().
-  */
-
-    /** The request was not (yet) handled by the interaction handler. */
-    const sal_uInt32 CONTINUATION_UNKNOWN    = 0;
-
-    /** The interaction handler selected XInteractionAbort. */
-    const sal_uInt32 CONTINUATION_ABORT      = 1;
-
-    /** The interaction handler selected XInteractionRetry. */
-    const sal_uInt32 CONTINUATION_RETRY      = 2;
-
-    /** The interaction handler selected XInteractionApprove. */
-    const sal_uInt32 CONTINUATION_APPROVE    = 4;
-
-    /** The interaction handler selected XInteractionDisapprove. */
-    const sal_uInt32 CONTINUATION_DISAPPROVE = 8;
-
-
-} // namespace apihelper
-} // namespace configmgr
-
-#endif /* !CONFIGMGR_SIMPLEINTERACTIONREQUEST_HXX */
diff --git a/configmgr/source/inc/simpletypehelper.hxx b/configmgr/source/inc/simpletypehelper.hxx
deleted file mode 100644
index 3c3f75f1a3..0000000000
--- a/configmgr/source/inc/simpletypehelper.hxx
+++ /dev/null
@@ -1,56 +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: simpletypehelper.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 CONFIGMGR_SIMPLETYPEHELPER_HXX
-#define CONFIGMGR_SIMPLETYPEHELPER_HXX
-
-#include <com/sun/star/uno/Type.hxx>
-
-namespace configmgr
-{
-    namespace uno = com::sun::star::uno;
-
-    namespace SimpleTypeHelper
-    {	
-        uno::Type getBooleanType();
-        
-        uno::Type getShortType();
-        uno::Type getIntType();
-        uno::Type getLongType();
-        
-        uno::Type getDoubleType();
-        
-        uno::Type getStringType();	
-        
-        uno::Type getBinaryType();
-        uno::Type getAnyType();
-    }
-}
-#endif
diff --git a/configmgr/source/inc/stack.hxx b/configmgr/source/inc/stack.hxx
deleted file mode 100644
index 0208e489b5..0000000000
--- a/configmgr/source/inc/stack.hxx
+++ /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: stack.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 CONFIGMGR_STACK_HXX_
-#define CONFIGMGR_STACK_HXX_
-
-#ifndef INCLUDED_STACK
-#include <stack>
-#define INCLUDED_STACK
-#endif
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-
-    // simple wrapper for a vector-based stack
-    template <typename T_>
-    struct Stack : public std::stack< T_, std::vector<T_> >
-    {
-        typedef typename std::vector<T_>::const_iterator bottomup_iterator;
-        typedef typename std::vector<T_>::const_reverse_iterator topdown_iterator;
-        bottomup_iterator begin_up() const { return this->c.begin(); }
-        bottomup_iterator end_up() const { return this->c.end(); }
-        topdown_iterator begin_down() const { return this->c.rbegin(); }
-        topdown_iterator end_down() const { return this->c.rend(); }
-    };
-}
-
-#endif // CONFIGMGR_STACK_HXX_
-
-
diff --git a/configmgr/source/inc/strdecl.hxx b/configmgr/source/inc/strdecl.hxx
deleted file mode 100644
index 03a5e74bea..0000000000
--- a/configmgr/source/inc/strdecl.hxx
+++ /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: strdecl.hxx,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.
- *
- ************************************************************************/
-#ifndef _CONFIGMGR_STRDECL_HXX_
-#define _CONFIGMGR_STRDECL_HXX_
-
-#include "strings.hxx"
-
-//.........................................................................
-namespace configmgr
-{
-//.........................................................................
-
-// extern declaration for predefined strings
-
-    // simple types names
-    DECLARE_CONSTASCII_USTRING(TYPE_BOOLEAN);
-    DECLARE_CONSTASCII_USTRING(TYPE_SHORT);
-    DECLARE_CONSTASCII_USTRING(TYPE_INT);	
-    DECLARE_CONSTASCII_USTRING(TYPE_LONG);
-    DECLARE_CONSTASCII_USTRING(TYPE_DOUBLE);
-    DECLARE_CONSTASCII_USTRING(TYPE_STRING);
-    // Type: Sequence<bytes>
-    DECLARE_CONSTASCII_USTRING(TYPE_BINARY);
-    // Universal type: Any
-    DECLARE_CONSTASCII_USTRING(TYPE_ANY);
-
-    // special template names for native/localized value types
-    DECLARE_CONSTASCII_USTRING(TEMPLATE_MODULE_NATIVE_PREFIX);
-    DECLARE_CONSTASCII_USTRING(TEMPLATE_MODULE_NATIVE_VALUE);
-    DECLARE_CONSTASCII_USTRING(TEMPLATE_MODULE_LOCALIZED_VALUE);
-
-    DECLARE_CONSTASCII_USTRING(TEMPLATE_LIST_SUFFIX);
-    
-} // namespace configmgr
-#endif
-
diff --git a/configmgr/source/inc/strings.hxx b/configmgr/source/inc/strings.hxx
deleted file mode 100644
index 238eb1de93..0000000000
--- a/configmgr/source/inc/strings.hxx
+++ /dev/null
@@ -1,77 +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.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 _CONFIGMGR_STRINGS_HXX_
-#define _CONFIGMGR_STRINGS_HXX_
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
-
-//.........................................................................
-namespace configmgr
-{
-//.........................................................................
-
-struct UStringDescription
-{
-    const sal_Char*     m_pZeroTerminatedName;
-    sal_Int32           m_nLen;
-    rtl_TextEncoding    m_encoding;
-
-    UStringDescription(const sal_Char* _pName, sal_Int32 _nLen, rtl_TextEncoding _encoding)
-        : m_pZeroTerminatedName( _pName )
-        , m_nLen( _nLen ) 
-        , m_encoding(_encoding )
-        , m_aString (_pName, _nLen, _encoding)
-        {
-        }
-
-    sal_Int32 getLength() const { return m_nLen; }
-    operator ::rtl::OUString const&() const { return m_aString; }
-    operator const sal_Char*() const { return m_pZeroTerminatedName; }
-
-private:
-    rtl::OUString m_aString; 
-    UStringDescription();
-};
-
-#define DECLARE_CONSTASCII_USTRING(name)	\
-    extern ::configmgr::UStringDescription name
-
-#define IMPLEMENT_CONSTASCII_USTRING(name, asciivalue)	\
-    ::configmgr::UStringDescription name(RTL_CONSTASCII_USTRINGPARAM(asciivalue))
-
-//.........................................................................
-}	// namespace frm
-//.........................................................................
-
-#endif // _CONFIGMGR_STRINGS_HXX_
-
diff --git a/configmgr/source/inc/template.hxx b/configmgr/source/inc/template.hxx
deleted file mode 100644
index 49fea66201..0000000000
--- a/configmgr/source/inc/template.hxx
+++ /dev/null
@@ -1,110 +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: template.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGTEMPLATE_HXX_
-#define CONFIGMGR_CONFIGTEMPLATE_HXX_
-
-#include "configexcept.hxx"
-#include "configpath.hxx"
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#ifndef _CONFIGMGR_UTILITY_HXX_
-#include <utility.hxx>
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class RequestOptions;
-    class TreeManager;
-    namespace sharable { struct SetNode; }
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-        class AbsolutePath;
-//-----------------------------------------------------------------------------
-
-        struct TemplateProvider_Impl;
-        class TemplateProvider 
-        {
-            friend class SetElementFactory;
-            friend class TemplateImplHelper;
-
-            rtl::Reference<TemplateProvider_Impl> m_aImpl;
-        public:
-            TemplateProvider(); // creates an empty (invalid) template instance provider
-            TemplateProvider(rtl::Reference< TreeManager > const & xProvider, RequestOptions const& xOptions);
-            TemplateProvider(TemplateProvider const& aOther);
-            TemplateProvider& operator=(TemplateProvider const& aOther);
-            ~TemplateProvider();
-
-            bool isValid() const { return !!m_aImpl.is(); }
-        };
-//-----------------------------------------------------------------------------
-
-        /// provides information about the elements of a <type>Node</type> that is a Container ("set").
-        class Template : public salhelper::SimpleReferenceObject
-        {
-            rtl::OUString m_aName;
-            rtl::OUString m_aModule;
-            com::sun::star::uno::Type		m_aInstanceType;
-        private:
-            explicit Template(rtl::OUString const& aName, rtl::OUString const& aModule,com::sun::star::uno::Type const& aType);
-
-        public:
-        /// checks if the type of an instance of this is known
-            bool			isInstanceTypeKnown() const;
-
-        /// checks if this is a 'value' template <p> PRE: the instance type is known </p>
-            bool			isInstanceValue() const;
-
-        /// get the UNO type for instances (primarily (only ?) for 'value' templates) <p> PRE: the instance type is known </p>
-            com::sun::star::uno::Type			getInstanceType() const;
-
-        /// get the path where the template is located
-            rtl::OUString    	getPathString() const;
-
-        /// get the local name of the template
-            rtl::OUString getName() const { return m_aName; }
-
-        /// get the package name of the template
-            rtl::OUString getModule() const { return m_aModule; }
-
-            friend class TemplateImplHelper;
-        };
-
-        /// make a template instance that matches the elements of the given set. Ensures that the element type is known
-        rtl::Reference<Template> makeSetElementTemplate(sharable::SetNode * set, TemplateProvider const& _aProvider);
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGTEMPLATE_HXX_
diff --git a/configmgr/source/inc/tracer.hxx b/configmgr/source/inc/tracer.hxx
deleted file mode 100644
index fe890d97f5..0000000000
--- a/configmgr/source/inc/tracer.hxx
+++ /dev/null
@@ -1,138 +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: tracer.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 _CONFIGMGR_TRACER_HXX_
-#define _CONFIGMGR_TRACER_HXX_
-
-#if OSL_DEBUG_LEVEL > 0
-#define CFG_ENABLE_TRACING
-#endif
-
-#ifdef CFG_ENABLE_TRACING
-
-#include <sal/types.h>
-#include <rtl/string.hxx>
-#include <osl/mutex.hxx>
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#ifdef WNT
-#include <sys/timeb.h>
-#else
-#include <sys/time.h>
-#endif
-
-#define OUSTRING2ASCII(rtlOUString)	::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), RTL_TEXTENCODING_ASCII_US).getStr()
-
-#define CFG_TRACE_INFO			OTraceIndent aIndent; OConfigTracer::traceInfo
-// FIXME: do something more intelligent here
-// the CFG_TRACE_INFO2 macro exists only to have a unique name of aIndent2
-// so it does not hide aIndent in an outer scope (which would produce a
-// a shadowing warning
-#define CFG_TRACE_INFO2			OTraceIndent aIndent2; OConfigTracer::traceInfo
-#define CFG_TRACE_WARNING		OTraceIndent aIndent; OConfigTracer::traceWarning
-#define CFG_TRACE_ERROR			OTraceIndent aIndent; OConfigTracer::traceError
-#define CFG_TRACE_INFO_NI		OConfigTracer::traceInfo
-#define CFG_TRACE_WARNING_NI	OConfigTracer::traceWarning
-#define CFG_TRACE_ERROR_NI		OConfigTracer::traceError
-
-namespace configmgr
-{
-
-struct OTracerSetup;
-class OConfigTracer
-{
-    friend class OTraceIndent;
-
-protected:
-    static	::osl::Mutex &	getMutex();
-    static OTracerSetup*	s_pImpl;
-#ifdef WNT
-    static timeb			s_aStartTime;
-#else
-    static timeval			s_aStartTime;
-#endif
-
-private:
-    OConfigTracer();	// never implemented, no instantiation of this class allowed, only static members
-
-public:
-    static void traceInfo(const sal_Char* _pFormat, ...);
-#if OSL_DEBUG_LEVEL > 0
-    static void traceWarning(const sal_Char* _pFormat, ...);
-    static void traceError(const sal_Char* _pFormat, ...);
-#endif
-protected:
-    static void implTrace(const sal_Char* _pType, const sal_Char* _pFormat, va_list args);
-    static void startGlobalTimer();
-    static sal_uInt32 getGlobalTimer();
-
-    static void inc();
-    static void dec();
-
-    static void indent();
-
-    static void ensureData();
-    static void ensureInitalized();
-};
-
-class OTraceIndent
-{
-public:
-    OTraceIndent() { OConfigTracer::inc(); }
-    ~OTraceIndent() { OConfigTracer::dec(); }
-};
-
-}	// namespace configmgr
-
-#else   // !CFG_ENABLE_TRACING
-
-#include <stdio.h>
-
-#define OUSTRING2ASCII(rtlOUString) "nothing"
-
-namespace configmgr {
-inline static void dont_trace(const char*,...) {}
-}
-
-#define CFG_TRACE_INFO			dont_trace
-#define CFG_TRACE_INFO2			dont_trace
-#define CFG_TRACE_WARNING		dont_trace
-#define CFG_TRACE_ERROR			dont_trace
-#define CFG_TRACE_INFO_NI		dont_trace
-#define CFG_TRACE_WARNING_NI		dont_trace
-#define CFG_TRACE_ERROR_NI		dont_trace
-#define CFG_TRACE_TO_DEVICE		dont_trace
-
-#endif  // CFG_ENABLE_TRACING
-
-#endif // _CONFIGMGR_TRACER_HXX_
-
diff --git a/configmgr/source/inc/tree.hxx b/configmgr/source/inc/tree.hxx
deleted file mode 100644
index f9675be2b3..0000000000
--- a/configmgr/source/inc/tree.hxx
+++ /dev/null
@@ -1,668 +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$
- * $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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGNODEIMPL_HXX_
-#define CONFIGMGR_CONFIGNODEIMPL_HXX_
-
-#include "change.hxx"
-#include "configpath.hxx"
-#include "template.hxx"
-#include "utility.hxx"
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#include <osl/diagnose.h>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-    namespace node { struct Attributes; }
-    namespace sharable { union Node; }
-    namespace view { class ViewStrategy; }
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class AnyNodeRef;
-        class ElementTree;
-        class GroupNodeImpl;
-        class NodeChange;
-        class NodeChanges;
-        class NodeImpl;
-        class NodeRef;
-        class SetNodeImpl;
-        class TemplateProvider;
-        class Tree;
-        class ValueElementNodeImpl;
-        class ValueMemberNode;
-        class ValueRef;
-//-----------------------------------------------------------------------------
-        // WARNING: a similar item is in noderef.hxx
-        const unsigned int c_TreeDepthAll = ~0u;
-
-//-----------------------------------------------------------------------------
-        inline
-        unsigned int& incDepth(unsigned int& rDepth)
-        { 
-            if (rDepth != c_TreeDepthAll) ++rDepth; 
-            return rDepth; 
-        }
-
-        inline
-        unsigned int& decDepth(unsigned int& rDepth)
-        { 
-            OSL_ENSURE(rDepth != 0,"Cannot decrement zero depth");
-            if (rDepth != c_TreeDepthAll && rDepth != 0) --rDepth; 
-            return rDepth; 
-        }
-
-        inline
-        unsigned int childDepth(unsigned int nDepth)
-        { return decDepth(nDepth); }
-
-        inline
-        unsigned int parentDepth(unsigned int nDepth)
-        { return incDepth(nDepth); }
-
-        inline
-        unsigned int remainingDepth(unsigned int nOuterDepth, unsigned int nRelativeDepth)
-        { 
-            OSL_ENSURE(nRelativeDepth != c_TreeDepthAll,"RelativeDepth can't be infinite");
-            OSL_ENSURE(nRelativeDepth <= nOuterDepth,"ERROR: RelativeDepth is larger than enclosing depth");
-
-            unsigned int nInnerDepth = (nOuterDepth == c_TreeDepthAll) ? nOuterDepth :
-                                    (nRelativeDepth < nOuterDepth)  ? nOuterDepth-nRelativeDepth :
-                                                                      0; 
-            return nInnerDepth;
-        }
-    //-------------------------------------------------------------------------
-
-        /// interface for a class that can be used to do some operation on a set of <type>NodeRef</type>s and <type>ValueRef</type>s.
-        struct NodeVisitor
-        {
-            /// returned from <method>handle</method> to indicate whether the operation is complete or should continue
-            enum Result { DONE, CONTINUE };
-            /// do the operation on <var>aNode</var>. needs to be implemented by concrete visitor classes
-            virtual Result handle(rtl::Reference< Tree > const& aTree, NodeRef const& aNode) = 0;
-            /// do the operation on <var>aValue</var>. needs to be implemented by concrete visitor classes
-            virtual Result handle(rtl::Reference< Tree > const& aTree, ValueRef const& aValue) = 0;
-        protected:
-            virtual ~NodeVisitor() {}
-        };
-//-----------------------------------------------------------------------------
-
-// class Node Impl
-//-----------------------------------------------------------------------------
-
-        /** is the Implementation class for class <type>Node</type>, held inside a <type>Tree</type>.
-            <p>	Implements some functionality common to all node types. 
-            </p>
-            <p>	Otherwise it provides (not really typesafe) access to a 
-                <type scope='configmgr::configuration::NodeType>NodeImpl</type> which implements
-                functionality for a node of a given type 
-                (as given by a <type scope='configmgr::configuration::NodeType>Enum</type> value).
-            </p>
-        */
-        class NodeData
-        {
-            rtl::Reference<NodeImpl> m_pSpecificNode;
-            rtl::OUString m_aName_; // cached for better performance
-            unsigned int			     m_nParent;
-        public:
-            NodeData(rtl::Reference<NodeImpl> const& aSpecificNodeImpl, rtl::OUString const& aName, unsigned int nParent);
-
-            void rebuild(rtl::Reference<view::ViewStrategy> const& _xNewStrategy, sharable::Node * _aNewData);
-        // COMMON: information
-            rtl::OUString getName()       const { return m_aName_; }
-            unsigned int			getParent()     const { return m_nParent; }
-
-        // change management
-        public:
-        // BASIC NODE: access to common attributes
-            NodeImpl &          nodeImpl()          { return implGetNodeImpl(); }
-            NodeImpl const &    nodeImpl() const    { return implGetNodeImpl(); }
-
-        // SET: access to child elements
-            bool				isSetNode()		const;
-            SetNodeImpl&		setImpl()			  { return implGetSetImpl(); }
-            SetNodeImpl const&	setImpl()		const { return implGetSetImpl(); }
-
-        // VALUES: access to data
-            bool				        isValueElementNode()	const;
-            ValueElementNodeImpl&		valueElementImpl()			  { return implGetValueImpl(); }
-            ValueElementNodeImpl const& valueElementImpl()		const { return implGetValueImpl(); }
-
-        // GROUP: access to children 
-            bool				isGroupNode()	const;
-            GroupNodeImpl&		groupImpl()			  { return implGetGroupImpl(); }
-            GroupNodeImpl const&groupImpl()		const { return implGetGroupImpl(); }
-
-        // access helper
-        public:
-            sharable::Node * getOriginalNodeAccess() const;
-        
-        private:
-            NodeImpl&       implGetNodeImpl() const; 
-            SetNodeImpl&    implGetSetImpl()   const; 
-            GroupNodeImpl&  implGetGroupImpl() const ;
-            ValueElementNodeImpl& implGetValueImpl() const ;
-        };
-//-----------------------------------------------------------------------------
-        /**	represents a hierarchy of config entries (identified by <type>NodeRef</type>s and <type>ValueRef</type>s)
-
-            <p>Examples for trees include</p>
-            <ulist>
-                <li>A module tree (for a specific set of parameters).</li>
-                <li>An updating tree (for a part of the whole).</li>
-                <li>A set element (updating or not), which could be detached.</li>
-            <ulist>
-            <p>	Holds a list of <type>Node</type> which it allows to access by 
-                <type>unsigned int</type> (which is basically a one-based index).
-            </p>
-            <p>	Also provides for navigation to the context this tree is located in
-            </p>
-        */
-        class Tree : public salhelper::SimpleReferenceObject
-        {
-            friend class view::ViewStrategy;
-        protected:
-        //  Construction
-            /// creates a Tree for a detached, virgin tree
-            Tree( );
-
-            /// creates a Tree with a parent tree
-            Tree(Tree& rParentTree, unsigned int nParentNode);
-
-            virtual ~Tree() = 0;
-
-            /// fills this Tree starting from _aRootNode, using the given factory and the tree's template provider
-            void build(rtl::Reference<view::ViewStrategy> const& _xStrategy, sharable::Node * _aRootNode, unsigned int nDepth, TemplateProvider const& aTemplateProvider);
-
-            void rebuild(rtl::Reference<view::ViewStrategy> const& _xNewStrategy, sharable::Node * _aNewData);
-
-        public:
-            // realeses the data this refers to
-            virtual void disposeData();
-
-        // Context Access
-            /// gets the path to the root node of this tree
-            AbsolutePath	getRootPath() const;
-            /// gets the tree of parent node of this tree
-            Tree*		getContextTree()		{ return m_pParentTree; }
-            /// gets the tree of parent node of this tree
-            Tree const *getContextTree() const	{ return m_pParentTree; }
-            /// gets the offset of parent node of this tree within its tree
-            unsigned int		getContextNode() const	{ return m_nParentNode; }
-
-        // Node Collection information
-            /// checks whether <var>nNode</var> is a valid node offset in this tree
-            bool isValidNode(unsigned int nNode)	const;
-
-            bool isRootNode(NodeRef const & node) const;
-
-            NodeRef getRootNode() const;
-
-            NodeRef getContextNodeRef() const;
-
-            bool isValidValueNode(ValueRef const & value);
-
-#if OSL_DEBUG_LEVEL > 0
-            bool isValidAnyNode(AnyNodeRef const & node);
-#endif
-
-            /// checks whether the node has any element nodes (of its own)
-            bool hasElements(NodeRef const & node);
-
-            bool hasElement(NodeRef const & node, rtl::OUString const & name);
-
-            bool hasElement(NodeRef const & node, Path::Component const & name);
-
-            /** gets the element with the given name of the given node
-                <p>PRE: <code>hasElement(node, name)</code></p>
-                <p>If there is no such element, may return an empty node or
-                raise an exception (?)</p>
-
-                @throws InvalidName
-                    if name is not a valid child name for this node
-            */
-            rtl::Reference< ElementTree > getElement(
-                NodeRef const & node, rtl::OUString const & name);
-
-            /** gets the element with the given name of the given node, if it is
-                available
-                <p>PRE: <code>hasElement(node, name)</code></p>
-                <p>If there is no such element, may return an empty node or
-                raise an exception (?)</p>
-                <p>Caution: May miss existing children unless hasChild/getChild
-                has been called before.</p>
-
-                @throws InvalidName
-                    if name is not a valid child name for this node
-            */
-            rtl::Reference< ElementTree > getAvailableElement(
-                NodeRef const & node, rtl::OUString const & name);
-
-            /// checks whether the node has any child nodes (in this tree)
-            bool hasChildren(NodeRef const & node);
-
-            bool hasChildValue(
-                NodeRef const & node, rtl::OUString const & name);
-
-            bool hasChildNode(NodeRef const & node, rtl::OUString const & name);
-
-            bool hasChild(NodeRef const & node, rtl::OUString const & name);
-
-            /** gets the child value (in this tree) with the given name of the
-                given node
-                <p>PRE: <code>hasChildValue(node, name)</code></p>
-                <P>If there is no such node, may return an empty node or raise
-                an exception (?)</p>
-
-                @throws InvalidName
-                    if <var>aName</var> is not a valid child name for this node
-            */
-            ValueRef getChildValue(
-                NodeRef const & node, rtl::OUString const & name);
-
-            NodeRef getChildNode(
-                NodeRef const & node, rtl::OUString const & name);
-
-            AnyNodeRef getAnyChild(
-                NodeRef const& node, rtl::OUString const & name);
-
-            node::Attributes getAttributes(NodeRef const & node);
-
-            node::Attributes getAttributes(AnyNodeRef const & node);
-
-            node::Attributes getAttributes(ValueRef const & value);
-
-            com::sun::star::uno::Type getUnoType(ValueRef const & value);
-
-            /// return the parent of the given node (or an empty node, if it is
-            /// the tree root)
-            NodeRef getParent(NodeRef const & node);
-
-            /// return the parent of the given value (or an empty node, if it is
-            /// the tree root)
-            NodeRef getParent(ValueRef const & value);
-
-            AbsolutePath getAbsolutePath(NodeRef const & node);
-
-            /// retrieves the current value for the given node, provided there
-            /// is one and it is available (only works for value nodes)
-            com::sun::star::uno::Any getNodeValue(ValueRef const & value);
-
-            /// checks whether the given node has a default value (only works
-            /// for value nodes)
-            bool hasNodeDefault(ValueRef const & value);
-
-            /// checks whether the given node assumes its default value (only
-            /// works for value nodes)
-            bool isNodeDefault(ValueRef const & value);
-
-            /// checks whether the given node has a default state
-            bool hasNodeDefault(NodeRef const & node);
-
-            /// checks whether the given node assumes its default state
-            bool isNodeDefault(NodeRef const & node);
-
-            /// checks whether the given node has a default state
-            bool hasNodeDefault(AnyNodeRef const & node);
-
-            /// checks whether the given node assumes its default state
-            bool isNodeDefault(AnyNodeRef const & node);
-
-            /// checks whether the default values are available for the children
-            /// of the given node (if applicable)
-            bool areValueDefaultsAvailable(NodeRef const & node);
-
-            /// retrieves the default value for the given node, provided there
-            /// is one and it is available (only works for value nodes)
-            com::sun::star::uno::Any getNodeDefaultValue(
-                ValueRef const & value);
-
-            bool hasChanges();
-
-            /// lists any pending changes on this tree
-            bool collectChanges(NodeChanges & changes);
-
-            void integrate(
-                NodeChange & change, NodeRef const & node, bool local);
-
-            void integrate(
-                NodeChanges & changes, NodeRef const & node, bool local);
-
-            NodeVisitor::Result visit(
-                NodeRef const & node, NodeVisitor & visitor)
-            { return visitor.handle(this, node); }
-
-            NodeVisitor::Result visit(
-                ValueRef const & value, NodeVisitor & visitor)
-            { return visitor.handle(this, value); }
-
-            /** lets the given visitor visit the child nodes of the given node
-
-                The order in which nodes are visited is repeatable (but
-                currently unspecified).  Visits nodes until NodeVisitor::DONE is
-                returned, then returns NodeVisitor::DONE.  If all visits return
-                NodeVisitor::CONTINUE, returns NodeVisitor::CONTINUE.  If no
-                children are present, returns NodeVisitor::CONTINUE.
-            */
-            NodeVisitor::Result dispatchToChildren(
-                NodeRef const & node, NodeVisitor & visitor);
-
-            NodeRef getNode(unsigned int offset) const;
-
-            rtl::Reference< Template > extractElementInfo(NodeRef const & node);
-
-            /// gets the depth that is available in this tree (due to the original request)
-            unsigned int getAvailableDepth()		const	{ return m_nDepth; }
-
-            /// gets the depth that is available in this tree within the given node
-            unsigned int getRemainingDepth(unsigned int nNode) const
-            { return remainingDepth(getAvailableDepth(),depthTo(nNode)); }
-
-        // Node Collection navigation
-            /** gets the simple name of the node <var>nNode</var> 
-                <p>PRE: <code>isValidNode(nNode)</code>
-                </p>
-            */
-            rtl::OUString getSimpleNodeName(unsigned int nNode) const;
-
-            /** gets the simple name of the root node (i.e. of the tree as a whole)
-            */
-            virtual rtl::OUString getSimpleRootName() const;
-
-            /** gets the full name of the root node 
-            */
-            Path::Component getExtendedRootName() const;
-
-            /** gets the number of hierarchy levels from the root node to node <var>nNode</var> 
-                in this tree
-                <p>In particular <code>depthTo(N) == 0</code> if <code>N == root()</code>
-                </p>
-                <p>PRE: <code>isValidNode(nNode)</code>
-                </p>
-            */
-            unsigned int		depthTo(unsigned int nNode) const;
-
-            /// append the local path (relative to root) to a node to a collection of names
-            void	prependLocalPathTo(unsigned int nNode, Path::Rep& rNames);
-
-            // check whether defaults are available
-            bool	hasDefaults(unsigned int _nNode) const;
-        public:
-            enum { ROOT = 1 }; /// base of <type>unsigned int</type>s used in this class
-
-            /** gets the <type>unsigned int</type> of the parent node <var>nNode</var> in this tree
-                or 0 (zero) if it is the root node
-                <p>PRE: <code>isValidNode(nNode)</code>
-                </p>
-            */
-            unsigned int		parent_(unsigned int nNode) const;
-
-        // Node iteration and access
-            /** gets the <type>unsigned int</type> of the first child node
-                of node <var>nParent</var> in this tree (in list order)
-                or 0 (zero) if it has no children in this tree
-                <p>PRE: <code>isValidNode(nParent)</code>
-                </p>
-            */
-            unsigned int		firstChild_ (unsigned int nParent) const;
-
-            /** gets the <type>unsigned int</type> of the first child node
-                of node <var>nParent</var> that is after 
-                node <var>nNode</var> in this tree (in list order)
-                or 0 (zero) if there is no such node
-                <p>if <code>nStartAfter == 0</code> searching starts at the beginning
-                </p>
-                <p>PRE: <code>isValidNode(nParent)</code>
-                </p>
-                <p>PRE: <code>isValidNode(nStartAfter) || nStartAfter == 0</code>
-                </p>
-            */
-            unsigned int		findNextChild_(unsigned int nParent, unsigned int nStartAfter) const;
-
-            /** gets the <type>unsigned int</type> of the first (and only) child node
-                of node <var>nParent</var> in this tree (in list order)
-                where the name of the node is <var>aName</var>,
-                or 0 (zero) if there is no such node
-                <p>PRE: <code>isValidNode(nParent)</code>
-                </p>
-            */
-            unsigned int		findChild_(unsigned int nParent, rtl::OUString const& aName) const;
-
-        // Node Collection access
-            /// get the number of nodes in this tree
-            unsigned int		nodeCount() const;
-
-            /// get the <type>NodeData</type> for node <var>nNode</var> in this tree
-            NodeData*		nodeData(unsigned int nNode);
-            /// get the <type>NodeData</type> for node <var>nNode</var> in this tree
-            NodeData const* nodeData(unsigned int nNode) const;
-            /// get the <type>NodeData</type> for node <var>nNode</var> in this tree
-            NodeImpl&		nodeImpl(unsigned int nNode)       { return nodeData(nNode)->nodeImpl(); }
-            /// get the <type>NodeData</type> for node <var>nNode</var> in this tree
-            NodeImpl const&	nodeImpl(unsigned int nNode) const { return nodeData(nNode)->nodeImpl(); }
-
-            unsigned int nodeOffset(NodeData const & rNodeData) const;
-
-        // Behavior
-            rtl::Reference< view::ViewStrategy > getViewBehavior() const;
-        protected:
-            // immediate commit
-/*			// implementation of  commit protocol
-            void commitDirect();
-
-            void implCommitDirectFrom(unsigned int nNode);
-*/
-            void implRebuild(unsigned int nNode, sharable::Node * _aNewData);
-
-        protected:
-            /// set a new parent context for this tree
-            void setContext(Tree* pParentTree, unsigned int nParentNode);
-            /// set no-parent context for this tree
-            void clearContext();
-
-            inline // is protected and should be used only in the implementation
-            rtl::OUString implGetOriginalName(unsigned int nNode) const;
-
-        private:
-            /// get the full name of the root of this tree
-            virtual Path::Component doGetRootName() const = 0;
-
-            /// prepend the absolute path to the root of this tree (no context use)
-            virtual void doFinishRootPath(Path::Rep& rPath) const = 0;
-
-            ValueMemberNode getMemberNode(ValueRef const & value);
-
-            rtl::Reference<view::ViewStrategy> m_xStrategy;
-            std::vector<NodeData>	m_aNodes;
-            Tree*	m_pParentTree;
-            unsigned int	m_nParentNode;
-            unsigned int	m_nDepth;
-
-            /// prepend the absolute path to the root of this tree (using context if present)
-            void implPrependRootPath(Path::Rep& rPath) const;
-
-            friend class TreeImplBuilder;
-        };
-
-        /// checks, if tree represents a real tree
-        bool isEmpty(Tree * tree);
-//-----------------------------------------------------------------------------
-
-        class ElementTree : public Tree
-        {
-        public:
-
-            /// creates a Tree for a detached, virgin instance of <var>aTemplate</var> (always will be direct)
-            ElementTree(rtl::Reference< data::TreeSegment > const& _aElementData, rtl::Reference<Template> aTemplate, TemplateProvider const& aTemplateProvider  );
-
-            /** creates a Tree with a parent tree, that (supposedly) 
-                is an instance of <var>aTemplateInfo</var>
-            */
-            ElementTree(rtl::Reference<view::ViewStrategy> const& _xStrategy,
-                            Tree& rParentTree, unsigned int nParentNode, 
-                            sharable::TreeFragment * dataTree, unsigned int nDepth,
-                            rtl::Reference<Template> aTemplateInfo, 
-                            TemplateProvider const& aTemplateProvider );
-
-            /** creates a Tree with no parent node, that (supposedly) 
-                is an instance of <var>aTemplateInfo</var>
-            */
-            ElementTree(rtl::Reference<view::ViewStrategy> const& _xStrategy, 
-                            sharable::TreeFragment * dataTree, unsigned int nDepth,
-                            rtl::Reference<Template> aTemplateInfo, 
-                            TemplateProvider const& aTemplateProvider );
-
-            ~ElementTree();
-
-        // realeses the data this refers to
-            virtual void disposeData();
-
-        // rebuilding
-            using Tree::rebuild;
-            void rebuild(rtl::Reference<view::ViewStrategy> const& _xNewStrategy, sharable::TreeFragment * newData);
-
-        // data access
-            sharable::TreeFragment * getOriginalTreeAccess() const { return m_aDataAddress; }
-
-        // Tree information
-            virtual rtl::OUString getSimpleRootName() const;
-            /// checks whether this is an instance of a known template
-            bool isTemplateInstance() const	{ return !!m_aInstanceInfo.is(); } 
-            /// checks whether this is an instance of the given template
-            bool isInstanceOf(rtl::Reference<Template> const& aTemplateInfo) const 
-            { return m_aInstanceInfo == aTemplateInfo && aTemplateInfo.is(); } 
-            /// retrieves the template that this is an instance of
-            rtl::Reference<Template> getTemplate() const { return m_aInstanceInfo; } 
-            /// makes a complete name from a simple name and template information
-            Path::Component makeExtendedName(rtl::OUString const& aSimpleName) const;
-
-        // node control operation
-            /// check if this is a free-floating tree
-            bool isFree() const { return m_aOwnData.is(); }
-            /// transfer ownership to the given set
-            void attachTo(sharable::SetNode * updatableSetNode, rtl::OUString const& aElementName);
-            /// tranfer ownership from the given set
-            void detachFrom(sharable::SetNode * updatableSetNode, rtl::OUString const& aElementName);
-
-            /// take ownership of the given tree (which must not already be the one in use)
-            void takeTreeAndRebuild(rtl::Reference< data::TreeSegment > const& _aElementData);
-            /// take ownership of the given tree (which must already be the one in use)
-            void takeTreeBack(rtl::Reference< data::TreeSegment > const& _aElementData);
-
-            /// release ownership 
-            rtl::Reference< data::TreeSegment > releaseOwnedTree();
-
-        // context operation
-            /// set a new root name 
-            void renameTree(rtl::OUString const& aNewName);
-            /// set a new parent context for this tree
-            void moveTree(Tree* pParentTree, unsigned int nParentNode);
-            /// set no-parent context for this tree
-            void detachTree();
-
-        private:
-            static bool isUpdatableSegment(Tree& _rTree);
-
-            virtual Path::Component doGetRootName() const;
-
-            virtual void doFinishRootPath(Path::Rep& rPath) const;
-        private:
-            rtl::Reference<Template>	const   m_aInstanceInfo;
-            rtl::OUString m_aElementName;
-            sharable::TreeFragment *       m_aDataAddress;
-            rtl::Reference< data::TreeSegment > m_aOwnData; 
-        };
-//-----------------------------------------------------------------------------
-        inline
-        bool Tree::isValidNode(unsigned int nNode) const 
-        {
-            return ROOT <= nNode && nNode < nodeCount() + ROOT;
-        }
-        //---------------------------------------------------------------------
-        inline
-        unsigned int Tree::nodeCount() const 
-        {
-            return m_aNodes.size(); 
-        }
-        //---------------------------------------------------------------------
-        inline
-        NodeData* Tree::nodeData(unsigned int nNode)		
-        { 
-            if (nNode == 0) return NULL;
-            OSL_ASSERT(isValidNode(nNode)); 
-            return &m_aNodes[nNode - ROOT];
-        }
-        //---------------------------------------------------------------------
-        inline
-        NodeData const* Tree::nodeData(unsigned int nNode) const
-        { 
-            if (nNode == 0) return NULL;
-            OSL_ASSERT(isValidNode(nNode)); 
-            return &m_aNodes[nNode - ROOT];
-        }
-        //---------------------------------------------------------------------
-        inline
-        unsigned int Tree::nodeOffset(NodeData const & rNode) const
-        { 
-            unsigned int nOffset = ROOT + (&rNode - &m_aNodes[0]);
-            OSL_ASSERT(isValidNode(nOffset)); 
-            return nOffset; 
-        }
-
-//-----------------------------------------------------------------------------
-// helper for other impl classes
-//-----------------------------------------------------------------------------
-#if OSL_DEBUG_LEVEL > 0
-    struct ElementHelper 
-    {
-        static 
-        com::sun::star::uno::Type getUnoType(rtl::Reference< ElementTree > const& aElement);
-    };
-#endif
-//-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
-#endif // CONFIGMGR_CONFIGNODEIMPL_HXX_
diff --git a/configmgr/source/inc/treeactions.hxx b/configmgr/source/inc/treeactions.hxx
deleted file mode 100644
index 7d60b78562..0000000000
--- a/configmgr/source/inc/treeactions.hxx
+++ /dev/null
@@ -1,92 +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: treeactions.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CONFIGMGR_TREEACTIONS_HXX_
-#define _CONFIGMGR_TREEACTIONS_HXX_
-
-#include "change.hxx"
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-//..........................................................................
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-
-//==========================================================================
-//= OChangeActionCounter
-//==========================================================================
-/** collects meta data about a changes tree
-*/
-struct OChangeActionCounter : public ChangeTreeAction
-{
-    sal_Int32		nValues, nAdds, nRemoves;	
-
-    OChangeActionCounter() :nValues(0), nAdds(0), nRemoves(0) {}
-
-    virtual void handle(ValueChange const& aValueNode);
-    virtual void handle(AddNode const& aAddNode);
-    virtual void handle(RemoveNode const& aRemoveNode);
-    virtual void handle(SubtreeChange const& aSubtree);
-    
-    sal_Bool hasChanges() const {return nValues || nAdds || nRemoves;}
-};
-
-// ===================================================================
-// = CollectNames
-// ===================================================================
-class CollectNames :  public NodeAction
-{
-public:
-    std::vector<rtl::OUString> const& list() const { return aList; }
-
-    CollectNames() : aList() {}
-
-    void handle(ValueNode const& aValue)	{ add(aValue); }
-    void handle(ISubtree const&  m_aSubtree)	{ add(m_aSubtree); }
-
-    void add(INode const& aNode) 
-    { 
-        aList.push_back(aNode.getName());
-    }
-private:
-    std::vector<rtl::OUString> aList;
-};
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-#endif // _CONFIGMGR_TREEACTIONS_HXX_
-
-
diff --git a/configmgr/source/inc/treechangefactory.hxx b/configmgr/source/inc/treechangefactory.hxx
deleted file mode 100644
index 93a33c0b0d..0000000000
--- a/configmgr/source/inc/treechangefactory.hxx
+++ /dev/null
@@ -1,107 +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: treechangefactory.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 CONFIGMGR_TREE_CHANGEFACTORY_HXX
-#define CONFIGMGR_TREE_CHANGEFACTORY_HXX
-
-#include "change.hxx"
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-
-namespace configmgr
-{
-
-    namespace uno = ::com::sun::star::uno;
-    
-    //==========================================================================
-
-    class OTreeChangeFactory
-    {
-    public:
-        //-----------------------------------------------
-        std::auto_ptr<SubtreeChange> createSetNodeChange(
-                                        rtl::OUString const& _aName,
-                                        rtl::OUString const& _aTemplateName, 
-                                        rtl::OUString const& _aTemplateModule,
-                                        node::Attributes _aAttrs,
-                                        bool _bToDefault = false);
-        //-----------------------------------------------
-
-    //= Set Changes ============================================================
-        std::auto_ptr<AddNode>      createAddNodeChange(
-            rtl::Reference< data::TreeSegment > const & _aNewTree,
-                                        rtl::OUString const& _aName,
-                                        bool _bToDefault = false);
-
-        //-----------------------------------------------
-        std::auto_ptr<RemoveNode>   createRemoveNodeChange(
-                                        rtl::OUString const& _aName,
-                                        bool _bToDefault = false);
-
-    //= special case: Dummy ISubtree ============================================================
-        static std::auto_ptr<SubtreeChange> createDummyChange(
-            rtl::OUString const& _aName,
-            rtl::OUString const& _aElementTypeName);
-
-    //-----------------------------------------------
-    };
-
-    OTreeChangeFactory& getDefaultTreeChangeFactory();
-    //==========================================================================
-    inline
-    std::auto_ptr<Change> base_ptr(std::auto_ptr<SubtreeChange> pChange)
-    { return std::auto_ptr<Change>(pChange.release()); }
-    //==========================================================================
-    inline
-    std::auto_ptr<Change> base_ptr(std::auto_ptr<ValueChange> pChange)
-    { return std::auto_ptr<Change>(pChange.release()); }
-    //==========================================================================
-    inline
-    std::auto_ptr<Change> base_ptr(std::auto_ptr<AddNode> pChange)
-    { return std::auto_ptr<Change>(pChange.release()); }
-    //==========================================================================
-    inline
-    std::auto_ptr<Change> base_ptr(std::auto_ptr<RemoveNode> pChange)
-    { return std::auto_ptr<Change>(pChange.release()); }
-    //==========================================================================
-
-    bool isGenericSetElementType(rtl::OUString const& _aElementType);
-    bool isDummySetElementModule(rtl::OUString const& _aElementModule);
-    rtl::OUString getGenericSetElementType();
-    rtl::OUString getDummySetElementModule();
-    //==========================================================================
-    
-} // namespace configmgr
-
-#endif
diff --git a/configmgr/source/inc/treechangelist.hxx b/configmgr/source/inc/treechangelist.hxx
deleted file mode 100644
index 5d291cb5f2..0000000000
--- a/configmgr/source/inc/treechangelist.hxx
+++ /dev/null
@@ -1,123 +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: treechangelist.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.
- *
- ************************************************************************/
-
-/* PLEASE DON'T DELETE ANY COMMENT LINES, ALSO IT'S UNNECESSARY. */
-
-
-#ifndef CONFIGMGR_TREECHANGELIST_HXX
-#define CONFIGMGR_TREECHANGELIST_HXX
-
-#include "change.hxx"
-#include "attributes.hxx"
-#include "configpath.hxx"
-#include "requestoptions.hxx"
-
-namespace configmgr
-{
-
-////////////////////////////////////////////////////////////////////////////////
-    
-    //==========================================================================
-    //= TreeChangeList
-    //==========================================================================
-    struct TreeChangeList
-    {
-        TreeChangeList(const RequestOptions& _aOptions, 
-                        const configuration::AbsolutePath& _rRootPath,
-                        const SubtreeChange& _aSubtree,
-                        treeop::DeepChildCopy _doDeepCopy)
-                : root(_aSubtree,_doDeepCopy)
-                , m_aLocation(_rRootPath)
-                , m_aOptions(_aOptions)
-            {}
-
-        /** ctor
-        @param		_rRootPath		path to the root of the whole to-be-updated subtree
-        */
-        TreeChangeList( const RequestOptions& _aOptions,
-                        const configuration::AbsolutePath& _rRootPath, 
-                        const node::Attributes& _rAttr = node::Attributes())
-                : root(_rRootPath.getLocalName().getName(), _rAttr)
-                , m_aLocation(_rRootPath)
-                , m_aOptions(_aOptions)
-        {}
-        
-        /** ctor
-        @param		_rLocalName			relative path within the to-be-updated subtree
-        */
-        TreeChangeList( const RequestOptions& _aOptions,
-                        const configuration::AbsolutePath& _rRootPath,
-                        rtl::OUString const & _rChildTemplateName, 
-                        rtl::OUString const & _rChildTemplateModule, 
-                        const node::Attributes& _rAttr = node::Attributes())
-                : root(_rRootPath.getLocalName().getName(), _rChildTemplateName, _rChildTemplateModule, _rAttr)
-                , m_aLocation(_rRootPath)
-                , m_aOptions(_aOptions)
-        {}
-
-        /** ctor
-        @param		_rTreeList			list to initialize the path, no childs are copied			
-        */
-        TreeChangeList( const TreeChangeList& _rTree, treeop::NoChildCopy _rNoCopy)
-            : root(_rTree.root, _rNoCopy)
-            , m_aLocation(_rTree.m_aLocation)
-            , m_aOptions(_rTree.m_aOptions)
-        {}	
-
-        /// is root a change for the module root
-        bool isModuleRootChange() const { return m_aLocation.getDepth() <= 1; }
-
-        /// get the module these changes belong to
-        rtl::OUString getModuleName() const { return m_aLocation.getModuleName(); }
-        
-        /// get the full path to the root (location + root-name)
-        void setRootPath(const configuration::AbsolutePath& _rRootPath) 
-        { m_aLocation = _rRootPath; }
-
-        /// get the full path to the root (location + root-name)
-        configuration::AbsolutePath const& getRootNodePath() const { return m_aLocation; }
-
-        /// get the full path to the root (location)
-        configuration::AbsolutePath getRootContextPath() const { return m_aLocation.getParentPath(); }
-
-        RequestOptions const & getOptions() const { return m_aOptions; }
-
-    public:
-        SubtreeChange root;						 // the root of the whole tree of updates
-    private:
-        configuration::AbsolutePath            m_aLocation;	 // absolute path to the parent of the node corresponding to this->root
-        RequestOptions          m_aOptions;		 // options for the tree that is concerned by these changes
-    };
-//----------------------------------------------------------------------------
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/inc/treefragment.hxx b/configmgr/source/inc/treefragment.hxx
deleted file mode 100644
index 2430c3b7ab..0000000000
--- a/configmgr/source/inc/treefragment.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: treefragment.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 INCLUDED_SHARABLE_TREEFRAGMENT_HXX
-#define INCLUDED_SHARABLE_TREEFRAGMENT_HXX
-
-#include "flags.hxx"
-#include "node.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace sharable
-    {
-    //-----------------------------------------------------------------------------
-    /* a TreeFragment header is interpreted differently, depending on the kind of TreeFragment
-   
-         - for a set element
-             name points to the element name (the name in the root node is the template name) 
-             parent  points to the SetNode that is the parent. The containing treefragment can
-                     be recovered from this with some care
-             next points to the next element of the same set. It is null for the last element.
-             state is fully used here
-  
-         - for a template tree
-             name points to the template name (same as the name in the root node) 
-             component points to the home component name of the template
-                        (often the same as 'component' in the component tree)
-             next points to another template TreeFragment. It is null for the last template.
-             state must be 'replaced' here (rarely it might be marked as mandatory)
-  
-         - for a component tree
-             name points to the component name (same as the name in the root node) 
-             component is equal to name (or NULL ?)
-             next points to another template TreeFragment. It is null if there is no template.
-             state must be either 'defaulted' or 'merged' 
-                   (it should be marked as mandatory although that is not used yet)
-    */
-        struct TreeFragmentHeader
-        {
-            struct TreeFragment *next;       // next sibling set element or template
-            rtl_uString *               name;       // element-name/template name
-            union // context
-            {
-                union Node *parent;          // parent node
-                rtl_uString *      component;       // component name 
-            };
-            sal_uInt16               count;      // number of contained nodes
-            sal_uInt8         state;      
-            sal_uInt8            reserved;
-       };
-    //-----------------------------------------------------------------------------
-    /* a tree fragment is stored as a variable-sized struct
-       containing a header and a fixed sequence of nodes 
-
-        R - - A - - A1
-           |     |
-           |      - A2
-           | 
-            - B
-           | 
-            - C - - C1 - - C11
-           |     |      |
-           |     |       - C12
-           |     |
-           |      - C2 - - C21
-           |
-            - D
-
-      is stored as
-
-          H(count = 12) : [R;A;A1;A2;B;C;C1;C11;C12;C2;C21;D]
-    */
-    //-----------------------------------------------------------------------------
-    /* tree fragments are used for: Component trees, Template trees, Set elements
-
-        They are only fragments, as for a TreeFragment a Set is considered a leaf node.
-        Set elements are maintained as a singly linked list that is accessible from the set node
-
-        A cache component has the Root (component tree) TreeFragment at a well-known location.
-        The 'next' element of the component tree points to the list of template TreeFragments 
-        used in the component.
-    */
-        struct TreeFragment 
-        {
-            TreeFragmentHeader  header;     // really variable-sized:
-            Node                nodes[1];   //   nodes[header.count]
-
-            // header info access
-            bool hasDefaultsAvailable() const;
-
-            bool isDefault() const;
-            bool isNew() const;
-
-            bool isNamed(rtl::OUString const & _aName) const;
-
-            rtl::OUString               getName() const;
-
-            void setName(rtl::OUString const & name);
-
-            configmgr::node::Attributes getAttributes()const;
-
-            Node * getRootNode() { return nodes; }
-
-            static TreeFragment *allocate(sal_uInt32 nFragments);
-            static void free_shallow( TreeFragment *pFragment );
-        };
-    //-----------------------------------------------------------------------------
-
-    }
-//-----------------------------------------------------------------------------
-}
-
-#endif // INCLUDED_SHARABLE_TREEFRAGMENT_HXX 
diff --git a/configmgr/source/inc/treemanager.hxx b/configmgr/source/inc/treemanager.hxx
deleted file mode 100644
index b261f4e43e..0000000000
--- a/configmgr/source/inc/treemanager.hxx
+++ /dev/null
@@ -1,160 +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: treemanager.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 CONFIGMGR_TREEMANAGER_HXX_
-#define CONFIGMGR_TREEMANAGER_HXX_
-
-#include <memory>
-
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "defaultprovider.hxx"
-#include "confevents.hxx"
-#include "options.hxx"
-#include "autoreferencemap.hxx"
-#include "autoobject.hxx"
-
-namespace configmgr
-{
-    namespace uno	    = ::com::sun::star::uno;
-
-    namespace backend {
-        class CacheController;
-        class ComponentRequest;
-        class UpdateRequest;
-    }
-    namespace sharable {
-        struct TreeFragment;
-        union Node;
-    }
-
-    //==========================================================================
-    //= TreeManager
-    //==========================================================================
-    class CacheClientAccess;
-    class CacheData;
-    class ConfigChangeBroadcastHelper;
-    class ISubtree;
-    //==========================================================================
-    class TreeManager: public salhelper::SimpleReferenceObject {
-        typedef AutoReferenceMap< RequestOptions, CacheClientAccess, lessRequestOptions>    CacheList;
-
-        osl::Mutex          m_aCacheControllerMutex;
-        rtl::Reference< backend::CacheController >     m_xCacheController;
-
-        rtl::Reference< backend::CacheController > maybeGetBackendCache() SAL_THROW(());
-        rtl::Reference< backend::CacheController > getCacheLoader() SAL_THROW((com::sun::star::uno::RuntimeException));
-        void disposeBackendCache() SAL_THROW(());
-
-        CacheList		    m_aCacheList; // Map
-        AutoObject< CacheData >	    m_aTemplates;
-        sal_Bool            m_bEnableAsync;
-
-        virtual ~TreeManager();
-
-    public:
-        /** ctor
-        */
-        explicit
-        TreeManager(rtl::Reference< backend::CacheController > const & _xBackend);
-
-        // disposing the cache before destroying		
-        void dispose();
-
-        /** requests a node given by it's path. Basicly, this means
-            that the node is fetch from the cache when it contains it else it ask the server
-            system into it's cache.
-            @param			_rSubtreePath	the path to the node in URI notation.
-            @param			_nMinLevels		indicates how many tree levels under the node determined by <arg>_rSubtreePath</arg>
-                                            should be loaded
-        */
-        sharable::Node * requestSubtree(configuration::AbsolutePath const& _rSubtreePath,
-                                                RequestOptions const& _aOptions
-                                               ) SAL_THROW((com::sun::star::uno::Exception));
-
-        void updateTree(TreeChangeList& aChanges) SAL_THROW((com::sun::star::uno::Exception));
-
-        void saveAndNotifyUpdate(TreeChangeList const& aChanges) SAL_THROW((com::sun::star::uno::Exception));
-
-        void releaseSubtree(configuration::AbsolutePath const& aSubtreePath,
-                                    RequestOptions const& _aOptions ) SAL_THROW(());
-
-        void fetchSubtree(  configuration::AbsolutePath const& aSubtreePath,
-                                    RequestOptions const& _xOptions
-                                 ) SAL_THROW(());
-
-        void refreshAll() SAL_THROW((com::sun::star::uno::Exception));
-        void flushAll() SAL_THROW(());
-        void enableAsync(const sal_Bool& bEnableAsync) SAL_THROW(()) ;
-
-        sal_Bool fetchDefaultData(  configuration::AbsolutePath const& aSubtreePath,
-                                            RequestOptions const& _aOptions
-                                         ) SAL_THROW((com::sun::star::uno::Exception));
-
-        std::auto_ptr<ISubtree> requestDefaultData(configuration::AbsolutePath const& aSubtreePath, 
-                                                            const RequestOptions& _aOptions
-                                                          ) SAL_THROW((com::sun::star::uno::Exception));
-
-        sharable::TreeFragment * requestTemplate( rtl::OUString const& aName, rtl::OUString const& aModule
-                                                  ) SAL_THROW((com::sun::star::uno::Exception));		
-        
-    // implementation interfaces
-        void refreshSubtree(const configuration::AbsolutePath &_aAbsoluteSubtreePath, 
-                            const RequestOptions& _aOptions) SAL_THROW((com::sun::star::uno::Exception));
-        
-        void addListener(configuration::AbsolutePath const& aName, const RequestOptions& _aOptions, rtl::Reference<INodeListener> const& pListener);
-        void removeListener(const RequestOptions& _aOptions, rtl::Reference<INodeListener> const& pListener);
-
-        void componentCreated(backend::ComponentRequest const & _aComponent) SAL_THROW(());
-        void componentChanged(backend::UpdateRequest  const & _anUpdate)     SAL_THROW(());
-
-    private:
-        CacheData & getTemplates() { return * m_aTemplates.get(); }
-
-        configuration::AbsolutePath encodeTemplateLocation(rtl::OUString const & _rLogicalTemplateName, rtl::OUString const &_rModule);
-
-    private:
-        rtl::Reference<CacheClientAccess> getCacheAlways(RequestOptions const & _aOptions);
-
-        // disposing
-        void disposeAll();
-
-        void fireChanges(TreeChangeList const& _aChanges, sal_Bool _bError);
-        ConfigChangeBroadcastHelper* getBroadcastHelper(RequestOptions const& _aOptions, bool bCreate);
-        void disposeBroadcastHelper(ConfigChangeBroadcastHelper* pHelper);
-
-        void nodeUpdated(TreeChangeList& _rChanges);
-    };
-
-}
-
-
-#endif 
-
diff --git a/configmgr/source/inc/treenodefactory.hxx b/configmgr/source/inc/treenodefactory.hxx
deleted file mode 100644
index 06d8791587..0000000000
--- a/configmgr/source/inc/treenodefactory.hxx
+++ /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: treenodefactory.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 CONFIGMGR_TREE_NODEFACTORY_HXX
-#define CONFIGMGR_TREE_NODEFACTORY_HXX
-
-#include "valuenode.hxx"
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#pragma warning(disable : 4350)
-#endif
-namespace configmgr
-{
-
-    namespace uno = ::com::sun::star::uno;
-
-    //==========================================================================
-
-    class OTreeNodeFactory
-    {
-    public:
-    //= ValueNodes ============================================================
-        std::auto_ptr<ValueNode> createValueNode(
-                                    rtl::OUString const& aName,
-                                    uno::Any const& aValue,
-                                    node::Attributes _aAttrs);
-
-        //-----------------------------------------------
-        std::auto_ptr<ValueNode> createValueNode(
-                                    rtl::OUString const& aName,
-                                    uno::Any const& aValue,
-                                    uno::Any const& aDefault,
-                                    node::Attributes _aAttrs);
-
-        //-----------------------------------------------
-        std::auto_ptr<ValueNode>  createNullValueNode(
-                                    rtl::OUString const& aName,
-                                    uno::Type const& aType,
-                                    node::Attributes _aAttrs);
-
-    //= ISubtree ============================================================
-        std::auto_ptr<ISubtree> createGroupNode(
-                                    rtl::OUString const& aName,
-                                    node::Attributes _aAttrs);
-
-        //-----------------------------------------------
-        std::auto_ptr<ISubtree> createSetNode(
-                                    rtl::OUString const& aName,
-                                    rtl::OUString const& _rTemplateName,
-                                    rtl::OUString const& _rTemplateModule,
-                                    node::Attributes _aAttrs);
-    };
-
-    OTreeNodeFactory& getDefaultTreeNodeFactory();
-    //==========================================================================
-    inline
-    std::auto_ptr<INode> base_ptr(std::auto_ptr<ISubtree> pNode)
-    { return std::auto_ptr<INode>(pNode.release()); }
-    //==========================================================================
-    inline
-    std::auto_ptr<INode> base_ptr(std::auto_ptr<ValueNode> pNode)
-    { return std::auto_ptr<INode>(pNode.release()); }
-    //==========================================================================
-
-
-} // namespace configmgr
-
-#endif
diff --git a/configmgr/source/inc/treesegment.hxx b/configmgr/source/inc/treesegment.hxx
deleted file mode 100644
index ca8769c82a..0000000000
--- a/configmgr/source/inc/treesegment.hxx
+++ /dev/null
@@ -1,76 +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: treesegment.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_CONFIGMGR_SOURCE_INC_TREESEGMENT_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_INC_TREESEGMENT_HXX
-
-#include "sal/config.h"
-
-#include <memory>
-
-#include "rtl/ref.hxx"
-#include "salhelper/simplereferenceobject.hxx"
-
-namespace rtl { class OUString; }
-
-namespace configmgr {
-    class INode;
-    namespace sharable { struct TreeFragment; }
-
-    namespace data {
-        // rtl::Reference< TreeSegment > is a reference counted
-        // sharable::TreeFragment *.  A null reference is always modeled as an
-        // empty rtl::Reference< TreeSegment >, never as a null fragment.
-        class TreeSegment: public salhelper::SimpleReferenceObject {
-        public:
-            static rtl::Reference< TreeSegment > create(
-                std::auto_ptr< INode > tree, rtl::OUString const & type);
-
-            static rtl::Reference< TreeSegment > create(
-                rtl::OUString const & name, std::auto_ptr< INode > tree);
-
-            static rtl::Reference< TreeSegment > create(
-                sharable::TreeFragment * tree);
-
-            static rtl::Reference< TreeSegment > create(
-                rtl::Reference< TreeSegment > const & tree)
-            { return create(tree.is() ? tree->fragment : 0); }
-
-            sharable::TreeFragment * const fragment; // non-null
-
-        private:
-            TreeSegment(sharable::TreeFragment * tree);
-
-            virtual ~TreeSegment();
-        };
-    }
-}
-
-#endif
diff --git a/configmgr/source/inc/typeconverter.hxx b/configmgr/source/inc/typeconverter.hxx
deleted file mode 100644
index a4d0b1505d..0000000000
--- a/configmgr/source/inc/typeconverter.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: typeconverter.hxx,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.
- *
- ************************************************************************/
-#ifndef CONFIGMGR_TYPECONVERTER_HXX
-#define CONFIGMGR_TYPECONVERTER_HXX
-
-#include "utility.hxx"
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-namespace configmgr
-{
-    namespace uno = ::com::sun::star::uno;
-    namespace script = ::com::sun::star::script;
-
-    // UNO Type handling
-    uno::Type getSequenceElementType(uno::Type const& rSequenceType);
-
-    uno::Type getBasicType(uno::Type const& rType, bool& bSequence);
-    inline
-    uno::Type getBasicType(uno::Type const& rType)
-    { bool dummy; return getBasicType(rType,dummy); }
-
-    // Any Conversion - uses TypeConverter
-    uno::Any toAny( const uno::Reference< script::XTypeConverter >& xTypeConverter,
-                    const ::rtl::OUString& _rValue,
-                    const uno::TypeClass& _rTypeClass) 
-                SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-
-    rtl::OUString toString(const uno::Reference< script::XTypeConverter >& xTypeConverter, const uno::Any& rValue) 
-                SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-    
-    // Type conversion
-    ::rtl::OUString toTypeName(const uno::TypeClass& _rTypeClass);
-
-    uno::Type toType(const ::rtl::OUString& _rsType);
-    uno::Type toListType(const ::rtl::OUString& _rsElementType);
-    ::rtl::OUString toTypeName(const uno::Type& _rType);
-
-    inline 
-    uno::Type toType(const ::rtl::OUString& _rsSimpleType, bool isList)
-    {
-        return isList ? toListType(_rsSimpleType) : toType(_rsSimpleType);
-    }
-
-    // template names
-    ::rtl::OUString toTemplateName(const uno::Type& _rType);
-    ::rtl::OUString toTemplateName(const uno::TypeClass& _rBasicType, bool bList = false);
-    ::rtl::OUString toTemplateName(const ::rtl::OUString& _rBasicTypeName, bool bList = false);
-
-     uno::Type parseTemplateName(::rtl::OUString const& sTypeName);
-     bool parseTemplateName(::rtl::OUString const& sTypeName, ::rtl::OUString& _rBasicName, bool& bList);
-
-} // namespace configmgr
-
-#endif /* CONFIGMGR_TYPECONVERTER_HXX */
diff --git a/configmgr/source/inc/updatehelper.hxx b/configmgr/source/inc/updatehelper.hxx
deleted file mode 100644
index 24bc378167..0000000000
--- a/configmgr/source/inc/updatehelper.hxx
+++ /dev/null
@@ -1,49 +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: updatehelper.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 CONFIGMGR_UPDATEHELPER_HXX
-#define CONFIGMGR_UPDATEHELPER_HXX
-
-#include "change.hxx"
-
-namespace configmgr {
-    namespace sharable { union Node; }
-
-// apply a already matching set of changes to the target tree
-    void applyUpdateToTree(SubtreeChange& _anUpdateTree, sharable::Node * _aRootNode);
-
-// apply a set of changes to the target tree
-    void applyUpdateWithAdjustmentToTree(SubtreeChange& _anUpdateTree, sharable::Node * _aRootNode);
-
-// apply a set of changes to the target tree, return true, if there are changes found
-    bool createUpdateFromDifference(SubtreeChange& _rResultingUpdateTree, sharable::Node * existingData, ISubtree const & _aNewData);
-}
-
-#endif
diff --git a/configmgr/source/inc/valuenode.hxx b/configmgr/source/inc/valuenode.hxx
deleted file mode 100644
index b2645b504c..0000000000
--- a/configmgr/source/inc/valuenode.hxx
+++ /dev/null
@@ -1,296 +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: valuenode.hxx,v $
- * $Revision: 1.32 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 _CONFIGMGR_TREE_VALUENODE_HXX
-#define _CONFIGMGR_TREE_VALUENODE_HXX
-
-#include "attributes.hxx"
-#include "anypair.hxx"
-#include <com/sun/star/uno/Any.h>
-#include <rtl/ustring.hxx>
-
-#include <string.h>
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-
-    namespace css = com::sun::star;
-    namespace uno = css::uno;
-
-    class INode;
-    class ISubtree;
-    class ValueNode;	
-
-    // helper (tag) class
-    namespace treeop { struct NoChildCopy {}; struct DeepChildCopy {}; enum { ALL_LEVELS = -1 }; }
-    //==========================================================================
-    //= Visitors
-    //==========================================================================
-    struct NodeAction
-    {
-        virtual void handle(ValueNode const&) = 0;
-        virtual void handle(ISubtree const&) = 0;
-
-        void applyToNode(INode const&);
-        void applyToChildren(ISubtree const&);
-    protected:  
-        virtual ~NodeAction() {}
-    };
-
-    struct NodeModification
-    {
-        virtual void handle(ValueNode&) = 0;
-        virtual void handle(ISubtree&) = 0;
-
-        void applyToNode(INode&);
-        void applyToChildren(ISubtree&);
-    protected:  
-        virtual ~NodeModification() {}
-    };
-
-    class INode
-    {
-        rtl::OUString          m_aName;
-        node::Attributes  m_aAttributes;
-
-    protected:
-        INode(){}
-
-        void markAsDefault(bool _bDefault = true) 
-        { 
-            m_aAttributes.markAsDefault(_bDefault);
-        }
-    public:
-        explicit 
-        INode(rtl::OUString const& aName, node::Attributes);
-
-        virtual ~INode();
-
-        virtual std::auto_ptr<INode> clone() const = 0;
-    public:
-        
-        const rtl::OUString& getName() const { return m_aName; }
-        node::Attributes getAttributes() const { return m_aAttributes; }
-
-        bool isDefault()   const { return m_aAttributes.isDefault(); }
-        bool isLocalized() const { return m_aAttributes.isLocalized(); }
-
-        void modifyState(node::State _eNewState); 
-        void modifyAccess(node::Access _aAccessLevel);
-        void markMandatory();
-        void markRemovable();
-        void promoteAccessToDefault();
-
-            // to be used with caution. If the node is referenced from somewhere else under it's old name,
-            // you may have problems with this inconsistence
-        void setName(const rtl::OUString& _rNewName) { m_aName = _rNewName; }
-        
-        virtual ValueNode* asValueNode();
-        virtual ValueNode const* asValueNode() const;
-        virtual ISubtree* asISubtree();
-        virtual ISubtree const* asISubtree() const;
-
-        // double dispatch support
-        virtual void dispatch(NodeAction&) const = 0;
-        virtual void dispatch(NodeModification&) = 0;
-    };																  
-
-// -----------------------------------------------------------------------------
-
-    //==========================================================================
-    //= ISubtree
-    //==========================================================================
-    class ISubtree : public INode
-    {			
-        sal_Int16 	    m_nLevel;					/// determines if everything is read
-        sal_Int16 		m_nDefaultLevels;			/// determines if defaults are read
-        rtl::OUString		m_sId;
-        rtl::OUString		m_sTemplateName;			/// path of the template for child instantiation		
-        rtl::OUString		m_sTemplateModule;			/// module of the template for child instantiation		
-    
-        virtual INode* doGetChild(rtl::OUString const& name) const = 0;		
-
-    protected:
-        ISubtree():m_nLevel(0){}
-
-        ISubtree(ISubtree const& other)
-        :INode(other)
-        ,m_nLevel(other.m_nLevel)
-        ,m_nDefaultLevels(other.m_nDefaultLevels)
-        ,m_sId() // do not copy ID while cloning !
-        ,m_sTemplateName(other.m_sTemplateName)
-        ,m_sTemplateModule(other.m_sTemplateModule)
-        {}
-
-    public:
-        // Ctor for group trees
-        ISubtree(const rtl::OUString& aName, const node::Attributes& _rAttrs) 
-            :INode(aName, _rAttrs)
-            ,m_nLevel(0)
-            ,m_nDefaultLevels(0)
-            {}		
-
-        // Ctor for set trees
-        ISubtree(const rtl::OUString& aName, 
-                 const rtl::OUString& _rTemplateName,
-                 const rtl::OUString& _rTemplateModule, 
-                 const node::Attributes& _rAttrs) 
-            :INode(aName, _rAttrs)
-            ,m_nLevel(0)
-            ,m_nDefaultLevels(0)
-            ,m_sTemplateName(_rTemplateName)
-            ,m_sTemplateModule(_rTemplateModule){}	
-    
-        INode* getChild(rtl::OUString const& name)				{ return doGetChild(name); }
-        INode const* getChild(rtl::OUString const& name) const	{ return doGetChild(name); }
-        
-        ISubtree* asISubtree();
-        ISubtree const* asISubtree() const;
-
-        using INode::markAsDefault;
-
-        sal_Int16 getLevel()         const { return m_nLevel; }
-
-        void setLevels(sal_Int16 _nLevel,sal_Int16 _nDefaultsLevel);
-
-        bool isSetNode() const { return m_sTemplateName.getLength() != 0; }
-
-        void makeSetNode(rtl::OUString const& _sTemplateName, rtl::OUString const& _sTemplateModule) 
-        { m_sTemplateName = _sTemplateName; m_sTemplateModule = _sTemplateModule; }
-
-        rtl::OUString const& getElementTemplateName()   const { return m_sTemplateName; }		
-        rtl::OUString const& getElementTemplateModule() const { return m_sTemplateModule; }	
-        
-        virtual INode* addChild(std::auto_ptr<INode> node) =0;						// takes ownership
-        virtual ::std::auto_ptr<INode> removeChild(rtl::OUString const& name) =0;	// releases ownership
-        
-        // Iteration support, stop if (action returns true)
-        virtual void forEachChild(NodeAction& anAction) const = 0;
-        virtual void forEachChild(NodeModification& anAction) = 0;
-        
-        // double dispatch support
-        virtual void dispatch(NodeAction& anAction) const { anAction.handle(*this); }
-        virtual void dispatch(NodeModification& anAction) { anAction.handle(*this); } 
-    };
-
-    //==========================================================================
-    //= ValueNode
-    //==========================================================================
-    class ValueNode : public INode
-    {
-        AnyPair m_aValuePair;
-        // uno::Type		m_aType;
-        // uno::Any		m_aValue;
-        // uno::Any		m_aDefaultValue;		
-
-    public:
-        //ValueNode(){}
-        
-        //explicit ValueNode(node::Attributes _aAttrs):INode(_aAttrs){}
-        
-        /*
-        ValueNode(rtl::OUString const& aName, node::Attributes _aAttrs)
-        : INode(aName, _aAttrs)
-        , m_aValuePair()
-        {}
-        */
-        ValueNode(rtl::OUString const& aName,uno::Type const& aType, node::Attributes _aAttrs)
-        : INode(aName, _aAttrs)
-        , m_aValuePair(aType) 
-        {
-        }
-        ValueNode(rtl::OUString const& aName,uno::Any const& anAny, node::Attributes _aAttrs)
-        : INode(aName, _aAttrs)
-        , m_aValuePair(anAny, selectMember(_aAttrs.isDefault()))
-        {
-        }
-        ValueNode(rtl::OUString const& aName,uno::Any const& anAny,uno::Any const& aDefault, node::Attributes _aAttrs)
-        : INode(aName, _aAttrs)
-        , m_aValuePair(anAny, aDefault) 
-        {
-        }
-    
-        bool isEmpty()      const {return  m_aValuePair.isEmpty();}
-        bool isValid()      const {return !m_aValuePair.isEmpty();}
-        
-        bool isNull()       const {return m_aValuePair.isNull();}
-        bool hasUsableDefault()   const {return getAttributes().isNullable() || m_aValuePair.hasSecond();}
-        
-        uno::Type   getValueType()  const {return m_aValuePair.getValueType();}
-        uno::Any    getValue()      const {return m_aValuePair.getValue( selectMember(this->isDefault()) );}
-        uno::Any    getUserValue()  const {return m_aValuePair.getFirst();}
-        uno::Any    getDefault()    const {return m_aValuePair.getSecond();}
-        
-        bool setValueType(uno::Type const& _aType);
-        bool setValue(uno::Any const& _aValue);
-        void setDefault();
-
-        bool changeDefault(uno::Any const& _aValue);
-        void promoteToDefault();
-        
-        virtual std::auto_ptr<INode> clone() const;
-
-        ValueNode* asValueNode();
-        ValueNode const* asValueNode() const;
-        // double dispatch support
-        virtual void dispatch(NodeAction& anAction) const { anAction.handle(*this); }
-        virtual void dispatch(NodeModification& anAction) { anAction.handle(*this); } 
-
-    private:
-        static AnyPair::SelectMember selectValue() { return AnyPair::SELECT_FIRST; }
-        static AnyPair::SelectMember selectDeflt() { return AnyPair::SELECT_SECOND; }
-        static AnyPair::SelectMember selectMember(bool bDeflt) 
-        { return bDeflt ? AnyPair::SELECT_SECOND : AnyPair::SELECT_FIRST; }
-    };
-    //==========================================================================
-
-    extern bool isLocalizedValueSet(ISubtree const& _aSubtree);
-
-    //==========================================================================
-    //= inlines
-    //==========================================================================
-    inline void NodeAction::applyToNode(INode const& aNode)
-    { aNode.dispatch(*this); }
-    inline void NodeAction::applyToChildren(ISubtree const& aSubtree)
-    { aSubtree.forEachChild(*this); }
-
-    inline void NodeModification::applyToNode(INode& aNode)
-    { aNode.dispatch(*this); }
-    inline void NodeModification::applyToChildren(ISubtree& aSubtree)
-    { aSubtree.forEachChild(*this); }
-
-    
-} // namespace configmgr
-
-#endif
diff --git a/configmgr/source/inc/valueref.hxx b/configmgr/source/inc/valueref.hxx
deleted file mode 100644
index 3973586896..0000000000
--- a/configmgr/source/inc/valueref.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: valueref.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 CONFIGMGR_CONFIGVALUEREF_HXX_
-#define CONFIGMGR_CONFIGVALUEREF_HXX_
-
-#include "noderef.hxx"
-
-namespace configmgr
-{
-    namespace node { struct Attributes; }
-
-    namespace configuration
-    {
-    //-------------------------------------------------------------------------
-        class Tree;	
-    //-------------------------------------------------------------------------
-
-        /// represents a value node in some tree
-        class ValueRef
-        {
-        public:
-            /// constructs an empty (invalid) node
-            ValueRef(); 
-
-            ValueRef(rtl::OUString const& aName, unsigned int nParentPos);
-
-            /// copy a node (with reference semantics)
-            ValueRef(ValueRef const& rOther); 
-            /// copy a node (with reference semantics)
-            ValueRef& operator=(ValueRef const& rOther); 
-
-            void swap(ValueRef& rOther);
-
-            ~ValueRef();
-            
-            /// checks, if this represents an existing node
-            inline bool isValid() const;
-
-            bool checkValidState() const;
-
-            rtl::OUString m_sNodeName;
-            unsigned int	m_nParentPos;
-        };
-    //-------------------------------------------------------------------------
-
-        /** extract the value from a plain value
-        */
-        inline
-        com::sun::star::uno::Any getSimpleValue(rtl::Reference< Tree > const& aTree, ValueRef const& aNode)
-        { return aTree->getNodeValue( aNode ); }
-
-    //-------------------------------------------------------------------------
-        inline bool ValueRef::isValid() const 
-        {
-            OSL_ASSERT( m_nParentPos == 0 || checkValidState() ); 
-            return m_nParentPos != 0;
-        }
-
-    //-------------------------------------------------------------------------
-
-        class SubNodeID
-        {
-        public:
-            static SubNodeID createEmpty() { return SubNodeID(); }
-            SubNodeID(rtl::Reference< Tree > const& rTree, NodeRef const& rParentNode, rtl::OUString const& aName);
-            SubNodeID(NodeID const& rParentNodeID, rtl::OUString const& aName);
-
-        // comparison
-            // equality
-            friend bool operator==(SubNodeID const& lhs, SubNodeID const& rhs)
-            { return lhs.m_aParentID == rhs.m_aParentID && lhs.m_sNodeName == rhs.m_sNodeName; }
-            // ordering
-            friend bool operator < (SubNodeID const& lhs, SubNodeID const& rhs);
-            // checking
-            bool isValidNode() const;
-            // hashing
-            size_t hashCode() const { return m_aParentID.hashCode() + 5*m_sNodeName.hashCode(); }
-            // containing node this
-            NodeID getParentID() const { return m_aParentID; }
-            // containing node this
-            rtl::OUString getNodeName() const { return m_sNodeName; }
-        private:
-            SubNodeID(); // create an empty one
-            rtl::OUString m_sNodeName;
-            NodeID	m_aParentID;
-        };
-    //-------------------------------------------------------------------------
-
-        void getAllChildrenHelper(NodeID const& aNode, std::vector<SubNodeID>& aList);
-
-    //-------------------------------------------------------------------------
-        inline bool operator!=(SubNodeID const& lhs, SubNodeID const& rhs)
-        { return !(lhs == rhs); }
-        //---------------------------------------------------------------------
-
-        inline bool operator>=(SubNodeID const& lhs, SubNodeID const& rhs)
-        { return !(lhs < rhs); }
-        //---------------------------------------------------------------------
-        inline bool operator > (SubNodeID const& lhs, SubNodeID const& rhs)
-        { return  (rhs < lhs); }
-        inline bool operator<=(SubNodeID const& lhs, SubNodeID const& rhs)
-        { return !(rhs < lhs); }
-    //-------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGVALUENODE_HXX_
diff --git a/configmgr/source/inc/valuetypeconverter.hxx b/configmgr/source/inc/valuetypeconverter.hxx
deleted file mode 100644
index 097f1a6c3f..0000000000
--- a/configmgr/source/inc/valuetypeconverter.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: valuetypeconverter.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 CONFIGMGR_VALUECONVERTER_HXX
-#define CONFIGMGR_VALUECONVERTER_HXX
-
-#include "utility.hxx"
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.hxx>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-    namespace uno		= ::com::sun::star::uno;
-    namespace script	= ::com::sun::star::script;
-
-// -----------------------------------------------------------------------------
-    class ValueConverter
-    {
-        /// TypeConverter is used for converting type from string values
-        uno::Reference< script::XTypeConverter > m_xTypeConverter;
-        /// Value info 
-        uno::Type   m_aType;
-        rtl::OUString    m_sSeparator;
-        bool        m_bNull;
-    public:
-        /// construct a value converter with no initial type info
-        ValueConverter(const uno::Reference< script::XTypeConverter > & _xTC)
-        : m_xTypeConverter(_xTC)
-        , m_aType() 
-        {
-            implReset();
-        }
-        
-        /// construct a value converter with a type 
-        ValueConverter(uno::Type const& _aType, const uno::Reference< script::XTypeConverter > & _xTC)
-        : m_xTypeConverter(_xTC)
-        , m_aType(_aType) 
-        {
-            implReset();
-        }
-        
-        /// provide access to the TypeConverter that is used for converting string format
-        uno::Reference< script::XTypeConverter > const& getTypeConverter() const SAL_THROW(())
-        { 
-            return m_xTypeConverter; 
-        }
-
-        /// (re)start the converter with the current type
-        void restart()
-        {
-            implReset();
-        }
-
-        /// (re)start the converter with a new type info (or none)
-        void reset(uno::Type const & _aType = uno::Type())
-        {
-            m_aType = _aType;
-            implReset();
-        }
-
-        /// set the NULL state of this converter
-        void setIsNull(bool bNull = true)
-        {
-            m_bNull = bNull;
-        }
-
-        /// set the separator of this converter
-        void setSeparator(rtl::OUString const & _aSeparator)
-        {
-            m_sSeparator = _aSeparator;
-        }
-
-        /// get the (UNO) type
-        bool isTypeSet() const { return m_aType.getTypeClass() != uno::TypeClass_VOID; } 
-
-        /// get the (UNO) type
-        uno::Type getType() const { return m_aType; } 
-
-        /// is this marked null
-        bool isNull() const { return m_bNull; } 
-
-        /// does this have a list type
-        bool isList() const; 
-
-        /// does this have a separator set
-        bool hasSeparator() const { return m_sSeparator.getLength() != 0; } 
-
-        /// converting a value
-        uno::Any convertToAny(rtl::OUString const& aContent) const
-            SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-
-        /// converting a list
-        uno::Any convertListToAny(uno::Sequence< rtl::OUString > const& aContentList) const
-            SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-
-        /// converting a binary value
-        uno::Sequence<sal_Int8> parseBinary(rtl::OUString const& aBinaryString) const
-            SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-    
-        /// splits a string list
-        uno::Sequence< rtl::OUString > splitStringList(rtl::OUString const& aContent) const;
-    private:
-        /// converting a list
-        bool convertListToAny(std::vector< rtl::OUString > const& aContentList, uno::Any& rValue) const
-            SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-
-        /// converting a scalar value
-        bool convertScalarToAny(rtl::OUString const& aContent, uno::Any& rValue) const
-            SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException));
-
-        /// splitting a string list
-        void splitListData(rtl::OUString const& aContent, std::vector< rtl::OUString >& rContentList) const
-            SAL_THROW(());
-    private:
-        void implReset() SAL_THROW(()) 
-        {
-            m_sSeparator = rtl::OUString();
-            m_bNull = false;
-        } 
-    };
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-} // namespace
-
-#endif
diff --git a/configmgr/source/inc/wrapexception.hxx b/configmgr/source/inc/wrapexception.hxx
deleted file mode 100644
index 39aba0e419..0000000000
--- a/configmgr/source/inc/wrapexception.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: wrapexception.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 CONFIGMGR_WRAPEXCEPTION_HXX
-#define CONFIGMGR_WRAPEXCEPTION_HXX
-
-#include <com/sun/star/configuration/MissingBootstrapFileException.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/InstallationIncompleteException.hpp>
-#include <com/sun/star/configuration/CannotLoadConfigurationException.hpp>
-#include <com/sun/star/configuration/backend/BackendSetupException.hpp>
-#include <com/sun/star/configuration/backend/AuthenticationFailedException.hpp>
-#include <com/sun/star/configuration/backend/InvalidAuthenticationMechanismException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/ConnectionLostException.hpp>
-#include <com/sun/star/configuration/backend/MalformedDataException.hpp>
-
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-
-#define WRAP_EXCEPTION( ETyp, Raise ) \
-    catch (ETyp & _e_) { Raise( uno::makeAny(_e_) ); }
-
-#define WRAP_EXCEPTION1( ETyp, Raise, Arg ) \
-    catch (ETyp & _e_) { Raise( uno::makeAny(_e_), (Arg) ); }
-
-#define PASS_EXCEPTION( ETyp ) \
-    catch (ETyp & ) { throw; }
-
-#define WRAP_CONFIGBACKEND_CREATION_EXCEPTIONS( Raise )      \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::InsufficientAccessRightsException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::AuthenticationFailedException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::InvalidAuthenticationMechanismException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::CannotConnectException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::BackendSetupException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::BackendAccessException, Raise)     \
-    WRAP_EXCEPTION(::com::sun::star::configuration::MissingBootstrapFileException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::InvalidBootstrapFileException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::InstallationIncompleteException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::CannotLoadConfigurationException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::lang::WrappedTargetException, Raise)                   \
-    WRAP_EXCEPTION(::com::sun::star::lang::WrappedTargetRuntimeException, Raise)            \
-    WRAP_EXCEPTION(::com::sun::star::lang::DisposedException, Raise)                        \
-    WRAP_EXCEPTION(::com::sun::star::uno::RuntimeException, Raise)      \
-    WRAP_EXCEPTION(::com::sun::star::uno::Exception, Raise)
-
-#define WRAP_CONFIGBACKEND_EXCEPTIONS( Raise )      \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::InsufficientAccessRightsException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::ConnectionLostException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::BackendAccessException, Raise)     \
-
-#define WRAP_CONFIGDATA_EXCEPTIONS( Raise )      \
-    WRAP_EXCEPTION(::com::sun::star::configuration::backend::MalformedDataException, Raise)     \
-    WRAP_CONFIGBACKEND_EXCEPTIONS( Raise )      \
-    WRAP_EXCEPTION(::com::sun::star::lang::WrappedTargetException, Raise)                   \
-
-#define WRAP_SAX_EXCEPTIONS( Raise )      \
-    WRAP_EXCEPTION(::com::sun::star::xml::sax::SAXParseException, Raise)    \
-    WRAP_EXCEPTION(::com::sun::star::xml::sax::SAXException, Raise)         \
-
-#define WRAP_OTHER_EXCEPTIONS( Raise ) \
-    WRAP_EXCEPTION(::com::sun::star::uno::Exception, Raise)
-
-#define WRAP_CONFIGBACKEND_CREATION_EXCEPTIONS1( Raise, Arg )      \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::InsufficientAccessRightsException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::AuthenticationFailedException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::InvalidAuthenticationMechanismException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::CannotConnectException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::BackendSetupException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::BackendAccessException, Raise, Arg)     \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::MissingBootstrapFileException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::InvalidBootstrapFileException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::InstallationIncompleteException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::CannotLoadConfigurationException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::lang::WrappedTargetException, Raise, Arg)                   \
-    WRAP_EXCEPTION1(::com::sun::star::lang::WrappedTargetRuntimeException, Raise, Arg)            \
-    WRAP_EXCEPTION1(::com::sun::star::lang::DisposedException, Raise, Arg)                        \
-    WRAP_EXCEPTION1(::com::sun::star::uno::RuntimeException, Raise, Arg)      \
-    WRAP_EXCEPTION1(::com::sun::star::uno::Exception, Raise, Arg)
-
-#define WRAP_CONFIGBACKEND_EXCEPTIONS1( Raise, Arg )      \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::InsufficientAccessRightsException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::ConnectionLostException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::BackendAccessException, Raise, Arg)     \
-
-#define WRAP_CONFIGDATA_EXCEPTIONS1( Raise, Arg )      \
-    WRAP_EXCEPTION1(::com::sun::star::configuration::backend::MalformedDataException, Raise, Arg)     \
-    WRAP_CONFIGBACKEND_EXCEPTIONS1( Raise, Arg )      \
-    WRAP_EXCEPTION1(::com::sun::star::lang::WrappedTargetException, Raise, Arg)                   \
-
-#define WRAP_SAX_EXCEPTIONS1( Raise, Arg )      \
-    WRAP_EXCEPTION1(::com::sun::star::xml::sax::SAXParseException, Raise, Arg)    \
-    WRAP_EXCEPTION1(::com::sun::star::xml::sax::SAXException, Raise, Arg)         \
-
-#define WRAP_OTHER_EXCEPTIONS1( Raise, Arg ) \
-    WRAP_EXCEPTION1(::com::sun::star::uno::Exception, Raise, Arg)
-
-#endif // CONFIGMGR_WRAPEXCEPTION_HXX
diff --git a/configmgr/source/localbe/localdataimportsvc.cxx b/configmgr/source/localbe/localdataimportsvc.cxx
deleted file mode 100644
index a06472a589..0000000000
--- a/configmgr/source/localbe/localdataimportsvc.cxx
+++ /dev/null
@@ -1,360 +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: localdataimportsvc.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_configmgr.hxx"
-
-#include "localdataimportsvc.hxx"
-#include "localsinglebackend.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/configuration/backend/XLayerImporter.hpp>
-
-// -----------------------------------------------------------------------------
-#define OUSTRING( constascii ) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(constascii))
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace localbe
-    {
-// -----------------------------------------------------------------------------
-        namespace backend = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-sal_Char const * const aLocalDataImportServices[] = 
-{
-    "com.sun.star.configuration.backend.LocalDataImporter",
-    0,
-    "com.sun.star.configuration.backend.DataImporter",
-    0
-};
-const ServiceImplementationInfo aLocalDataImportSI =
-{
-    "com.sun.star.comp.configuration.backend.LocalDataImporter",
-    aLocalDataImportServices,
-    aLocalDataImportServices + 3
-};
-// -----------------------------------------------------------------------------
-
-const ServiceRegistrationInfo* getLocalDataImportServiceInfo()
-{ return getRegistrationInfo(& aLocalDataImportSI); }
-// -----------------------------------------------------------------------------
-
-inline
-ServiceInfoHelper LocalDataImportService::getServiceInfo()
-{
-    return & aLocalDataImportSI;
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL instantiateLocalDataImporter
-( uno::Reference< uno::XComponentContext > const& xContext )
-{
-    return * new LocalDataImportService( xContext );
-}
-// -----------------------------------------------------------------------------
-
-LocalDataImportService::LocalDataImportService(uno::Reference< uno::XComponentContext > const & _xContext)
-: m_xServiceFactory(_xContext->getServiceManager(), uno::UNO_QUERY)
-{
-    if (!m_xServiceFactory.is())
-    {
-        rtl::OUString sMessage = OUSTRING("Configuration Importer: Context has no service manager (or interface is missing)");
-        throw lang::NullPointerException(sMessage,NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-LocalDataImportService::~LocalDataImportService()
-{}
-// -----------------------------------------------------------------------------
-
-namespace 
-{
-// -----------------------------------------------------------------------------
-    struct JobDesc
-    {
-        explicit JobDesc(task::XJob * pJob, const uno::Sequence< beans::NamedValue >& aArguments);
-
-        rtl::OUString aLayerDataUrl;
-        rtl::OUString aImporterService;
-
-        rtl::OUString aComponent;
-        rtl::OUString aEntity;
-
-        uno::Reference< backend::XLayer > xLayerFilter;
-
-        sal_Bool overwrite;
-        sal_Bool truncate;
-
-        sal_Bool use_component;
-        sal_Bool use_entity;
-        sal_Bool use_overwrite;
-        sal_Bool use_truncate;
-    };
-    // -----------------------------------------------------------------------------
-
-    JobDesc::JobDesc(task::XJob * pJob, const uno::Sequence< beans::NamedValue >& aArguments)
-    : aLayerDataUrl()
-    , aImporterService()
-    , aComponent()
-    , aEntity()
-    , xLayerFilter()
-    , overwrite(true)
-    , truncate(false)
-    , use_component(false)
-    , use_entity(false)
-    , use_overwrite(false)
-    , use_truncate(false)
-    {
-        sal_Int16 const nCount = static_cast<sal_Int16>(aArguments.getLength());
-
-        if (sal_Int32(nCount) != aArguments.getLength())
-        {
-            rtl::OUString sMessage = OUSTRING("Too many arguments for LocalDataImporter Job");
-            throw lang::IllegalArgumentException(sMessage,pJob,0);
-        }
-
-        for (sal_Int16 i=0; i < nCount; ++i)
-        {
-            sal_Bool bKnown = false;
-            sal_Bool bGood  = false;
-            
-            if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LayerDataUrl")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= aLayerDataUrl);
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ImporterService")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= aImporterService);
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Component")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= aComponent);
-                use_component = bGood && (aComponent.getLength() != 0);
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Entity")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= aEntity);
-                use_entity = bGood && (aEntity.getLength() != 0);
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LayerFilter")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= xLayerFilter);
-                if (xLayerFilter.is() && !uno::Reference<lang::XInitialization>::query(xLayerFilter).is())
-                    bGood = false;
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OverwriteExisting")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= overwrite);
-                use_overwrite = bGood;
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TruncateExisting")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= truncate);
-                use_truncate = bGood;
-            }
-
-            if (!bGood)
-            {
-                rtl::OUStringBuffer sMsg;
-                sMsg.appendAscii("LocalDataImportService - Illegal argument: ");
-                if (bKnown) 
-                    sMsg.appendAscii("Wrong value type for argument '");
-                else
-                    sMsg.appendAscii("Unknown argument '");
-
-                sMsg.append(aArguments[i].Name).appendAscii("'.");
-
-                throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),pJob,i+1);
-            }
-        }
-        if (aLayerDataUrl.getLength() == 0)
-        {
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii("LocalDataImportService - Missing argument: ");
-            sMsg.appendAscii("No data URL available");
-            throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),pJob,0);
-        }
-        if (aImporterService.getLength() == 0)
-        {
-            if ( (use_truncate && truncate) || (use_overwrite && !overwrite) )
-                aImporterService = OUSTRING("com.sun.star.configuration.backend.CopyImporter");
-            else
-                aImporterService = OUSTRING("com.sun.star.configuration.backend.MergeImporter");
-        }
-    }
-    // -----------------------------------------------------------------------------
-
-    static 
-    inline 
-    uno::Type getOverwriteFailedExceptionType()
-    {
-        lang::IllegalAccessException const * const selected = 0;
-        return ::getCppuType(selected);
-    }
-// -----------------------------------------------------------------------------
-}
-// -----------------------------------------------------------------------------
-// XJob
-
-uno::Any SAL_CALL 
-    LocalDataImportService::execute( const uno::Sequence< beans::NamedValue >& Arguments ) 
-        throw (lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
-{
-    JobDesc const aJob(this,Arguments);
-
-    uno::Reference< lang::XMultiServiceFactory > aFactory = this->getServiceFactory();
-
-    uno::Reference< backend::XLayer > xLayer = aJob.use_component ? 
-        LocalSingleBackend::createSimpleLayer(aFactory,aJob.aLayerDataUrl, aJob.aComponent ):
-        LocalSingleBackend::createSimpleLayer(aFactory,aJob.aLayerDataUrl) ;
-
-    if (!xLayer.is())
-    {
-        rtl::OUString sMessage = OUSTRING("LocalDataImportService - Cannot create layer to import from");
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    uno::Reference< lang::XInitialization > xFilterInit(aJob.xLayerFilter,uno::UNO_QUERY);
-    if (xFilterInit.is())
-    {
-        beans::NamedValue argvalue(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Source") ),
-            uno::makeAny( xLayer) );
-
-        uno::Sequence< uno::Any > args(1);
-        args[0] <<= argvalue;
-        
-        xFilterInit->initialize(args);
-
-        xLayer = aJob.xLayerFilter;
-    }
-
-    uno::Reference< backend::XLayerImporter > xImporter;
-    
-    int nArgCount = 0;
-    if (aJob.use_overwrite) ++nArgCount;
-    if (aJob.use_truncate)  ++nArgCount;
-    
-    if (nArgCount)
-    {
-        uno::Sequence< uno::Any > aArgs(nArgCount);
-
-        int n = 0;
-        if (aJob.use_overwrite) 
-            aArgs[n++] <<= beans::NamedValue(OUSTRING("Overwrite"), uno::makeAny(aJob.overwrite));
-
-        if (aJob.use_truncate)  
-            aArgs[n++] <<= beans::NamedValue(OUSTRING("Truncate"),  uno::makeAny(aJob.truncate));
-
-        OSL_ASSERT(n == nArgCount);
-
-        xImporter.set( aFactory->createInstanceWithArguments(aJob.aImporterService,aArgs), uno::UNO_QUERY); 
-    }
-    else
-        xImporter.set( aFactory->createInstance(aJob.aImporterService), uno::UNO_QUERY); 
-
-    if (!xImporter.is())
-    {
-        rtl::OUString sMessage = OUSTRING("LocalDataImportService - Cannot create importer service: ") + aJob.aImporterService;
-        throw lang::NullPointerException(sMessage,*this);
-    }
-
-    try
-    {
-        if (aJob.use_entity)
-            xImporter->importLayerForEntity(xLayer,aJob.aEntity);
-
-        else
-            xImporter->importLayer(xLayer);
-    }
-    catch (lang::WrappedTargetException & e)
-    {
-        if (aJob.overwrite || !e.TargetException.isExtractableTo(getOverwriteFailedExceptionType())) throw;
-        return e.TargetException;
-    }
-    catch (lang::WrappedTargetRuntimeException & e)
-    {
-        if (aJob.overwrite || !e.TargetException.isExtractableTo(getOverwriteFailedExceptionType())) throw;
-        return e.TargetException;
-    }
-
-    return uno::Any();
-}
-// -----------------------------------------------------------------------------
-
-// XServiceInfo
-
-rtl::OUString SAL_CALL 
-    LocalDataImportService::getImplementationName(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getImplementationName( );
-}
-// -----------------------------------------------------------------------------
-
-
-sal_Bool SAL_CALL 
-    LocalDataImportService::supportsService( const rtl::OUString& ServiceName ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().supportsService( ServiceName );
-}
-// -----------------------------------------------------------------------------
-
-
-uno::Sequence< ::rtl::OUString > SAL_CALL 
-    LocalDataImportService::getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getSupportedServiceNames( );
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/localbe/localdataimportsvc.hxx b/configmgr/source/localbe/localdataimportsvc.hxx
deleted file mode 100644
index 187e6703e4..0000000000
--- a/configmgr/source/localbe/localdataimportsvc.hxx
+++ /dev/null
@@ -1,101 +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: localdataimportsvc.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 CONFIGMGR_LOCALBE_IMPORTSVC_HXX
-#define CONFIGMGR_LOCALBE_IMPORTSVC_HXX
-
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/implbase2.hxx>
-#include <osl/mutex.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/XJob.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace localbe
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace task  = ::com::sun::star::task;
-        namespace beans = ::com::sun::star::beans;
-// -----------------------------------------------------------------------------
-
-        class LocalDataImportService : public ::cppu::WeakImplHelper2< 
-                                            task::XJob,         
-                                            lang::XServiceInfo  
-                                        > 
-        {
-        public:
-            explicit
-            LocalDataImportService(uno::Reference< uno::XComponentContext > const & _xContext);
-            ~LocalDataImportService();
-
-            // XServiceInfo
-            virtual rtl::OUString SAL_CALL 
-                getImplementationName(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual sal_Bool SAL_CALL 
-                supportsService( const rtl::OUString& ServiceName ) 
-                    throw (uno::RuntimeException);
-
-            virtual uno::Sequence< rtl::OUString > SAL_CALL 
-                getSupportedServiceNames(  ) 
-                    throw (uno::RuntimeException);
-    
-            // XJob
-            virtual uno::Any SAL_CALL 
-                execute( const uno::Sequence< beans::NamedValue >& Arguments ) 
-                    throw (lang::IllegalArgumentException, uno::Exception, uno::RuntimeException);
-
-        protected:
-            uno::Reference< lang::XMultiServiceFactory > getServiceFactory() const 
-            { return m_xServiceFactory; }
-
-        private:
-            uno::Reference< lang::XMultiServiceFactory >  m_xServiceFactory;
-            
-            static ServiceInfoHelper getServiceInfo();
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/localbe/localfilehelper.cxx b/configmgr/source/localbe/localfilehelper.cxx
deleted file mode 100644
index 6d8e9762c0..0000000000
--- a/configmgr/source/localbe/localfilehelper.cxx
+++ /dev/null
@@ -1,245 +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: localfilehelper.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_configmgr.hxx"
-#include "localfilehelper.hxx"
-#include "filehelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include "tools/getprocessworkingdir.hxx"
-#include <vector>
-
-namespace configmgr 
-{	
- namespace localbe
- {
-    //------------------------------------------------------------------------------
-    bool isValidFileURL (rtl::OUString const& _sFileURL)
-    {
-        rtl::OUString sSystemPath;
-        return _sFileURL.getLength() && (osl::File::E_None == osl::File::getSystemPathFromFileURL(_sFileURL, sSystemPath));
-    }
-    //------------------------------------------------------------------------------
-    void validateFileURL(const rtl::OUString& _sFileURL, const uno::Reference<uno::XInterface>& pContext)
-        throw(css::configuration::InvalidBootstrapFileException)
-    {
-        if (!isValidFileURL( _sFileURL))
-        {
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii(" Not a Valid File URL: \"");
-            sMsg.append(_sFileURL);
-            sMsg.appendAscii("\"");
-            throw com::sun::star::configuration::InvalidBootstrapFileException(
-                sMsg.makeStringAndClear(),pContext, rtl::OUString() ) ;
-        }
-    }
-    //------------------------------------------------------------------------------
-    void checkFileExists(const rtl::OUString& _sFileURL,const uno::Reference<uno::XInterface>& pContext)
-        throw (backend::CannotConnectException)
-    {
-        if (!FileHelper::fileExists(_sFileURL))
-        {
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii(" No Such File or Directory: \"");
-            sMsg.append(_sFileURL);
-            sMsg.appendAscii("\"");
-        
-            throw backend::CannotConnectException(sMsg.makeStringAndClear(), pContext, uno::Any()) ;
-        }
-    }    
-    //------------------------------------------------------------------------------
-    void checkIfDirectory(const rtl::OUString& _sFileURL, const uno::Reference<uno::XInterface>& pContext)
-        throw (backend::BackendSetupException)
-    {
-        if (!FileHelper::dirExists(_sFileURL))
-        {
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii(" File:\"");
-            sMsg.append(_sFileURL);
-            sMsg.appendAscii("\" Must be a Directory\"");
-        
-            throw backend::BackendSetupException(sMsg.makeStringAndClear(),pContext, uno::Any()) ;
-        }
-    }
-
-    // ---------------------------------------------------------------------------------------
-    bool implEnsureAbsoluteURL(rtl::OUString & _rsURL) // also strips embedded dots etc.
-    {
-        rtl::OUString sBasePath;
-        OSL_VERIFY(tools::getProcessWorkingDir(&sBasePath));
-
-        rtl::OUString sAbsolute;
-        if ( osl::File::E_None == osl::File::getAbsoluteFileURL(sBasePath, _rsURL, sAbsolute))
-        {
-            _rsURL = sAbsolute;
-            return true;
-        }
-        else
-        {
-            OSL_ENSURE(false, "Could not get absolute file URL for valid URL");
-            return false;
-        }
-    }
-    // ---------------------------------------------------------------------------------------
-    osl::DirectoryItem::RC implNormalizeURL(rtl::OUString & _sURL, osl::DirectoryItem& aDirItem)
-    {
-        OSL_PRECOND(aDirItem.is(), "Opened DirItem required");
-
-        static const sal_uInt32 cFileStatusMask = FileStatusMask_FileURL;
-
-        osl::FileStatus aFileStatus(cFileStatusMask);
-
-        osl::DirectoryItem::RC rc = aDirItem.getFileStatus(aFileStatus);
-
-        if (rc == osl::DirectoryItem::E_None)
-        {
-            rtl::OUString aNormalizedURL = aFileStatus.getFileURL();
-
-            if (aNormalizedURL.getLength() != 0)
-                _sURL = aNormalizedURL;
-            else
-                rc = osl::DirectoryItem::E_INVAL;
-        }
-        return rc;
-    }
-
-    // ---------------------------------------------------------------------------------------
-        
-    bool normalizeURL(rtl::OUString & _sURL,  const uno::Reference<uno::XInterface>& pContext, bool bNothrow )
-      throw (backend::InsufficientAccessRightsException, backend::BackendAccessException)
-    {
-        if (_sURL.getLength() == 0)
-            return false;
-
-        osl::DirectoryItem aDirItem;
-        
-        osl::DirectoryItem::RC rc = osl::DirectoryItem::get(_sURL, aDirItem);
-
-        if (rc == osl::DirectoryItem::E_None)
-            rc = implNormalizeURL(_sURL,aDirItem);
-
-        switch (rc)
-        {
-        case osl::DirectoryItem::E_None:  return true;
-
-        case osl::DirectoryItem::E_NOENT: return true;
-
-        case osl::DirectoryItem::E_ACCES: 
-           if (!bNothrow)
-           {
-               rtl::OUStringBuffer msg;
-               msg.appendAscii("LocalBackend: Cannot normalize URL \"" );
-               msg.append(_sURL);
-               msg.appendAscii("\" - InsufficientAccess");
-               throw backend::InsufficientAccessRightsException(msg.makeStringAndClear(),pContext,uno::Any());
-           }
-           return false;
-
-        default:
-            if (!bNothrow)
-            {
-                rtl::OUStringBuffer msg;
-                msg.appendAscii("LocalBackend: Cannot normalize URL \"" );
-                msg.append(_sURL);
-                msg.appendAscii("\" - ").append(FileHelper::createOSLErrorString(rc));
-                throw backend::BackendAccessException(msg.makeStringAndClear(),pContext,uno::Any());
-            }
-            return false;
-
-        }
-    }
-
-    // ---------------------------------------------------------------------------------------
-    static const sal_Unicode kComponentSeparator = '.' ;
-    static const sal_Unicode kPathSeparator = '/' ;
-
-    rtl::OUString componentToPath(const rtl::OUString& aComponent) 
-    {
-        rtl::OUStringBuffer retCode ;
-
-        retCode.append(kPathSeparator) ;
-        retCode.append(aComponent.replace(kComponentSeparator, kPathSeparator)) ;
-        return retCode.makeStringAndClear() ;
-    }
-    //------------------------------------------------------------------------------
-    rtl::OUString layeridToPath(const rtl::OUString& aLayerId)
-    {
-        sal_Int32 const nSplit = aLayerId.indexOf(k_cLayerIdSeparator);
-        if (nSplit < 0)
-            return componentToPath(aLayerId);
-
-        rtl::OUString const aComponent= aLayerId.copy(0,nSplit);
-        rtl::OUString const aSubid = aLayerId.copy(nSplit+1);
-
-        rtl::OUStringBuffer retCode ;
-
-        retCode.append(kPathSeparator) ;
-        retCode.append(aComponent.replace(kComponentSeparator, kPathSeparator)) ;
-        retCode.append(kPathSeparator) ;
-        retCode.append(aSubid) ;
-        return retCode.makeStringAndClear() ;
-    }
-    //------------------------------------------------------------------------------
-    bool checkOptionalArg(rtl::OUString& aArg)
-    {
-        if (aArg.getLength() && aArg[0] == sal_Unicode('?'))
-        {
-            aArg = aArg.copy(1);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    //------------------------------------------------------------------------------
-    void fillFromBlankSeparated(const rtl::OUString& aList,
-                                uno::Sequence<rtl::OUString>& aTarget) 
-    {
-        std::vector<rtl::OUString> tokens ;
-        sal_Int32 nextToken = 0 ;
-
-        do {
-            tokens.push_back(aList.getToken(0, ' ', nextToken)) ;
-        } while (nextToken >= 0) ;
-        if (tokens.size() > 0) {
-            aTarget.realloc(tokens.size()) ;
-            std::vector<rtl::OUString>::const_iterator token ;
-            sal_Int32 i = 0 ;
-
-            for (token = tokens.begin() ; token != tokens.end() ; ++ token) {
-                aTarget [i ++] = *token ;
-            }
-        }
-    }
-    //------------------------------------------------------------------------------
-  }
-} // namespace configmgr
diff --git a/configmgr/source/localbe/localfilehelper.hxx b/configmgr/source/localbe/localfilehelper.hxx
deleted file mode 100644
index f042150933..0000000000
--- a/configmgr/source/localbe/localfilehelper.hxx
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef CONFIGMGR_LOCALBE_LOCALFILEHELPER_HXX_
-#define CONFIGMGR_LOCALBE_LOCALFILEHELPER_HXX_
-
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <osl/file.hxx>
-
-
-namespace configmgr 
-{	
-    
-    namespace localbe
-    {
-        namespace css = com::sun::star ;
-        namespace uno = css::uno ;
-        namespace backend = css::configuration::backend ;
-
-        /**
-          Validates a file URL
-
-          @param _sFileURL    URL of the file to validate
-          @return bool       true if URL valid, false if URL invalid
-          */
-        
-        bool isValidFileURL (rtl::OUString const& _sFileURL);
-        /**
-            Ensures Absolute URL
-            @param _sFileURL    URL of the file to validate
-            @return bool       true if URL is absolute URL, 
-                               false if URL is not absolute URL
-            */
-        
-        bool implEnsureAbsoluteURL(rtl::OUString & _sFileURL);
-        /**
-            Normalize  URL
-            @param _sFileURL    URL of the file to validate
-            @param aDirItem	   Directory Item
-            @return RC         error code 
-            */
-        
-        osl::DirectoryItem::RC implNormalizeURL(rtl::OUString & _sFileURL, osl::DirectoryItem& aDirItem);
-        /**
-            Normalize  URL
-            @param _sFileURL    URL of the file to validate
-            @param pContext     pointer to context class
-            @param bNothrow     param indicating that exception should not be thrown
-            @return bool	   true if URL is normalized URL
-                               false if URL is not normalized URL
-            */
-        
-        
-        bool normalizeURL(rtl::OUString & _sFileURL, 
-                          const uno::Reference<uno::XInterface>& pContext,
-                          bool bNothrow = false )
-            throw (backend::InsufficientAccessRightsException,
-                   backend::BackendAccessException);
-
-         /**
-          Validates a file URL
-
-          @param _sFileURL    URL of the file to validate
-          @param pContext    pointer to context class
-          @throws css::configuration::InvalidBootstrapFileException
-          */
-        void validateFileURL(const rtl::OUString& _sFileURL, 
-                             const uno::Reference<uno::XInterface>& pContext)
-            throw(css::configuration::InvalidBootstrapFileException);
-        /**
-           Checks if a Directory exist for a given file URL
-
-          @param _sFileURL    URL of the file to validate
-          @param pContext    pointer to context class
-          @throws backend::BackendSetupException
-          */
-        void checkIfDirectory(const rtl::OUString& _sFileURL, 
-                              const uno::Reference<uno::XInterface>& pContext )
-            throw (backend::BackendSetupException);
-        /**
-           Checks if a File exist for a given file URL
-          @param pContext    pointer to context class   
-          @param _sFileURL    URL of the file to validate
-          @throws backend::CannotConnectException
-          */
-        void checkFileExists(const rtl::OUString& _sFileURL, 
-                             const uno::Reference<uno::XInterface>& pContext)
-            throw (backend::CannotConnectException);
-
-        /**
-           Convert Component name to Path name
-           @param aComponent	Component name
-           */
-        rtl::OUString componentToPath(const rtl::OUString& aComponent); 
-        
-        /// character that can be used to delimit a sub-id within a layerid
-        const sal_Unicode k_cLayerIdSeparator   = ':'; 
-        /**
-           Convert layer id to Path name
-           Format of layer id is <component> [:<sub-id>]
-           @param aLayerId	layer id
-           */
-        rtl::OUString layeridToPath(const rtl::OUString& aLayerId); 
-        
-
-        /**
-           Checks if Arguement is Optional
-          @param aArg	Argument
-          @return bool	returns true is Argument is Optional, false otherwise
-          */
-        bool checkOptionalArg(rtl::OUString& aArg);
-        
-        /* 
-            parses sequence of strings from blank separated list
-            @param aList	blank separated list
-            @param aTarget  sequence of parsed strings
-            */
-        void fillFromBlankSeparated(const rtl::OUString& aList,
-                                    uno::Sequence<rtl::OUString>& aTarget); 
-
-    }
-}
-#endif
diff --git a/configmgr/source/localbe/localfilelayer.cxx b/configmgr/source/localbe/localfilelayer.cxx
deleted file mode 100644
index f3470c5f77..0000000000
--- a/configmgr/source/localbe/localfilelayer.cxx
+++ /dev/null
@@ -1,611 +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: localfilelayer.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-#include "localfilelayer.hxx"
-#include "localoutputstream.hxx"
-#include "oslstream.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-BasicLocalFileLayer::BasicLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aComponentFile) 
-: mFactory(xFactory)
-, mFileUrl(aComponentFile) 
-{
-    static const rtl::OUString kXMLLayerParser(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.backend.xml.LayerParser")) ;
-    
-    mLayerReader = uno::Reference<backend::XLayer>::query(
-                                    mFactory->createInstance(kXMLLayerParser)) ;
-
-}
-//------------------------------------------------------------------------------
-
-SimpleLocalFileLayer::SimpleLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aComponentFile) 
-: BasicLocalFileLayer(xFactory,aComponentFile)
-{
-}
-//------------------------------------------------------------------------------
-
-SimpleLocalFileLayer::SimpleLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent) 
-: BasicLocalFileLayer(xFactory,aBaseDir + aComponent) 
-{
-}
-//------------------------------------------------------------------------------
-
-FlatLocalFileLayer::FlatLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent)
-: BasicLocalFileLayer(xFactory,aBaseDir + aComponent) 
-, mLayerWriter( createLayerWriter() ) 
-{
-}
-//------------------------------------------------------------------------------
-
-BasicCompositeLocalFileLayer::BasicCompositeLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aComponentFile) 
-: BasicLocalFileLayer(xFactory,aComponentFile)
-{
-}
-//------------------------------------------------------------------------------
-
-CompositeLocalFileLayer::CompositeLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aComponent,
-        const std::vector<rtl::OUString>& aSublayerDirectories)
-: BasicCompositeLocalFileLayer(xFactory,rtl::OUString()) 
-{
-    fillSubLayerLists(aSublayerDirectories, aComponent) ;
-}
-//------------------------------------------------------------------------------
-
-FullCompositeLocalFileLayer::FullCompositeLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory, 
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent,
-        const std::vector<rtl::OUString>& aSublayerDirectories)
-: BasicCompositeLocalFileLayer(xFactory,aBaseDir + aComponent) 
-, mLayerWriter( createLayerWriter() ) 
-{
-    fillSubLayerLists(aSublayerDirectories, aComponent) ;
-}
-//------------------------------------------------------------------------------
-
-BasicLocalFileLayer::~BasicLocalFileLayer() {}
-//------------------------------------------------------------------------------
-
-SimpleLocalFileLayer::~SimpleLocalFileLayer() {}
-//------------------------------------------------------------------------------
-
-FlatLocalFileLayer::~FlatLocalFileLayer() {}
-//------------------------------------------------------------------------------
-
-CompositeLocalFileLayer::~CompositeLocalFileLayer() {}
-//------------------------------------------------------------------------------
-
-FullCompositeLocalFileLayer::~FullCompositeLocalFileLayer() {}
-//------------------------------------------------------------------------------
-        
-uno::Reference<backend::XLayerHandler> BasicLocalFileLayer::createLayerWriter()
-{
-    static const rtl::OUString kXMLLayerWriter(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.configuration.backend.xml.LayerWriter")) ;
-    
-    uno::Reference< uno::XInterface > xWriter = mFactory->createInstance(kXMLLayerWriter);
-
-    return uno::Reference<backend::XLayerHandler>(xWriter,uno::UNO_REF_QUERY_THROW) ;
-}
-//------------------------------------------------------------------------------
-
-static inline void readEmptyLayer(const uno::Reference<backend::XLayerHandler>& xHandler)
-{
-    OSL_ASSERT(xHandler.is());
-    xHandler->startLayer();
-    xHandler->endLayer();
-}
-//------------------------------------------------------------------------------
-
-void BasicLocalFileLayer::readData(
-        backend::XLayer * pContext,
-        const uno::Reference<backend::XLayerHandler>& xHandler, 
-        const rtl::OUString& aFileUrl) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-    if (!xHandler.is())
-    {
-        rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM(
-            "LocalFileLayer - Cannot readData: Handler is NULL."));
-
-        throw  lang::NullPointerException(sMessage,pContext);
-    }
-
-    osl::File blobFile(aFileUrl) ;
-    osl::File::RC errorCode = blobFile.open(OpenFlag_Read) ;
-
-    switch (errorCode)
-    { 
-    case osl::File::E_None: // got it
-        {
-            uno::Reference<io::XActiveDataSink> xAS(mLayerReader, uno::UNO_QUERY_THROW);
-
-            uno::Reference<io::XInputStream> xStream( new OSLInputStreamWrapper(blobFile) );
-
-            xAS->setInputStream(xStream);
-
-            mLayerReader->readData(xHandler) ;
-        } 
-        break;
-
-    case osl::File::E_NOENT: // no layer => empty layer
-        readEmptyLayer(xHandler);
-        break;
-
-    default:
-        {
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii("LocalFile Layer: Cannot open input file \"");
-            sMsg.append(aFileUrl);
-            sMsg.appendAscii("\" : ");
-            sMsg.append(FileHelper::createOSLErrorString(errorCode));
-
-            io::IOException ioe(sMsg.makeStringAndClear(),pContext);
-
-            sMsg.appendAscii("LocalFileLayer - Cannot readData: ").append(ioe.Message);
-            throw backend::BackendAccessException(sMsg.makeStringAndClear(),pContext,uno::makeAny(ioe));
-        }        
-    }
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL SimpleLocalFileLayer::readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-    BasicLocalFileLayer::readData(this,xHandler, getFileUrl()) ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL FlatLocalFileLayer::readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-    BasicLocalFileLayer::readData(this,xHandler, getFileUrl() ) ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL CompositeLocalFileLayer::readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-    if (!xHandler.is())
-    {
-        rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM(
-            "LocalFileLayer - Cannot readData: Handler is NULL."));
-
-        throw  lang::NullPointerException(sMessage,*this);
-    }
-
-    readEmptyLayer(xHandler) ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL FullCompositeLocalFileLayer::readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-    BasicLocalFileLayer::readData(static_cast<backend::XCompositeLayer*>(this),xHandler, getFileUrl() ) ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL BasicCompositeLocalFileLayer::readSubLayerData(
-        backend::XCompositeLayer * pContext,
-        const uno::Reference<backend::XLayerHandler>& xHandler,
-        const rtl::OUString& aSubLayerId) 
-    throw ( backend::MalformedDataException,
-            lang::IllegalArgumentException, 
-            lang::NullPointerException,
-            lang::WrappedTargetException,
-            uno::RuntimeException)
-{
-    if (!xHandler.is())
-    {
-        rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM(
-            "CompositeLocalFileLayer - Cannot readSubLayerData: Handler is NULL."));
-
-        throw  lang::NullPointerException(sMessage,pContext);
-    }
-
-    sal_Int32 i ; 
-    
-    for (i = 0 ; i < mSubLayers.getLength() ; ++ i) {
-        if (mSubLayers [i].equals(aSubLayerId)) { break ; }
-    }
-    if (i == mSubLayers.getLength()) 
-    { 
-        rtl::OUStringBuffer message ;
-
-        message.appendAscii("Sublayer Id '").append(aSubLayerId) ;
-        message.appendAscii("' is unknown") ;
-        throw lang::IllegalArgumentException(message.makeStringAndClear(),
-                                             pContext, 2) ;
-    }
-    if (mSubLayerFiles[i].getLength() != 0)
-        BasicLocalFileLayer::readData(pContext,xHandler, mSubLayerFiles [i]) ;
-    else
-        readEmptyLayer(xHandler);
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL CompositeLocalFileLayer::readSubLayerData(
-        const uno::Reference<backend::XLayerHandler>& xHandler,
-        const rtl::OUString& aSubLayerId) 
-    throw ( backend::MalformedDataException,
-            lang::IllegalArgumentException, 
-            lang::NullPointerException,
-            lang::WrappedTargetException,
-            uno::RuntimeException)
-{
-    return BasicCompositeLocalFileLayer::readSubLayerData(this,xHandler,aSubLayerId);
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL FullCompositeLocalFileLayer::readSubLayerData(
-        const uno::Reference<backend::XLayerHandler>& xHandler,
-        const rtl::OUString& aSubLayerId) 
-    throw ( backend::MalformedDataException,
-            lang::IllegalArgumentException, 
-            lang::NullPointerException,
-            lang::WrappedTargetException,
-            uno::RuntimeException)
-{
-    return BasicCompositeLocalFileLayer::readSubLayerData(this,xHandler,aSubLayerId);
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL FlatLocalFileLayer::replaceWith(
-        const uno::Reference<backend::XLayer>& aNewLayer) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-    if (!aNewLayer.is())
-    {
-        rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM(
-            "LocalFileLayer - Cannot replaceWith: Replacement layer is NULL."));
-
-        throw  lang::NullPointerException(sMessage,*this);
-    }
-    OSL_ENSURE( !uno::Reference<backend::XCompositeLayer>::query(aNewLayer).is(),
-                "Warning: correct updates with composite layers are not implemented");
-
-    uno::Reference<io::XActiveDataSource> xAS(mLayerWriter, uno::UNO_QUERY_THROW);
-
-    LocalOutputStream * pStream = new LocalOutputStream(getFileUrl());
-    uno::Reference<io::XOutputStream> xStream( pStream );
-        
-    xAS->setOutputStream(xStream);
-
-    aNewLayer->readData(mLayerWriter) ;
-
-    pStream->finishOutput();
-
-    // clear the output stream
-    xStream.clear();
-    xAS->setOutputStream(xStream);
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL FullCompositeLocalFileLayer::replaceWith(
-        const uno::Reference<backend::XLayer>& aNewLayer) 
-    throw (backend::MalformedDataException, lang::NullPointerException,
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if (!aNewLayer.is())
-    {
-        rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM(
-            "LocalFileLayer - Cannot replaceWith: Replacement layer is NULL."));
-
-        throw  lang::NullPointerException(sMessage,*this);
-    }
-    OSL_ENSURE( !uno::Reference<backend::XCompositeLayer>::query(aNewLayer).is(),
-                "Warning: correct updates with composite layers are not implemented");
-
-    uno::Reference<io::XActiveDataSource> xAS(mLayerWriter, uno::UNO_QUERY_THROW);
-
-    LocalOutputStream * pStream = new LocalOutputStream(getFileUrl());
-    uno::Reference<io::XOutputStream> xStream( pStream );
-        
-    xAS->setOutputStream(xStream);
-
-    aNewLayer->readData(mLayerWriter) ;
-
-    pStream->finishOutput();
-
-    // clear the output stream
-    xStream.clear();
-    xAS->setOutputStream(xStream);
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString BasicLocalFileLayer::getTimestamp(const rtl::OUString& aFileUrl) 
-{
-    TimeValue timevalue  = {0,0};
-    sal_uInt64 aSize = FileHelper::getModifyStatus(aFileUrl,timevalue) ;
-    oslDateTime fileStamp ;
-    rtl::OUString retCode ;
-
-    if (osl_getDateTimeFromTimeValue(&timevalue, &fileStamp)) 
-    {
-        // truncate to 32 bits
-        unsigned long aLongSize = static_cast<sal_Int32>(aSize);
-        
-        sal_Char asciiStamp [50] ;
-
-        sprintf(asciiStamp, "%04u%02u%02u%02u%02u%02uZ%010lu",
-                unsigned(fileStamp.Year), unsigned(fileStamp.Month), unsigned(fileStamp.Day),
-                unsigned(fileStamp.Hours), unsigned(fileStamp.Minutes), unsigned(fileStamp.Seconds),
-                aLongSize) ;
-        retCode = rtl::OUString::createFromAscii(asciiStamp) ;
-    }
-    return retCode ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SimpleLocalFileLayer::getTimestamp() 
-    throw (uno::RuntimeException)
-{
-    rtl::OUString sStamp = BasicLocalFileLayer::getTimestamp(getFileUrl());
-
-    return sStamp;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString FlatLocalFileLayer::getTimestamp() 
-    throw (uno::RuntimeException)
-{
-    rtl::OUString sStamp = BasicLocalFileLayer::getTimestamp(getFileUrl());
-
-    return sStamp;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString FullCompositeLocalFileLayer::getTimestamp() 
-    throw (uno::RuntimeException)
-{
-    rtl::OUString sStamp = BasicLocalFileLayer::getTimestamp(getFileUrl());
-#if 0 // thus far composite layers are only manipulated via the main layer
-    for (std::vector<rtl::OUString>::const_iterator it = mSubLayerFiles.begin();
-         it != mSubLayerFiles.end();
-         ++it)
-    {
-        rtl::OUString sSublayerTime = BasicLocalFileLayer::getTimestamp(*it);
-        if (sStamp < sSublayerTime)
-            sStamp = sSublayerTime;
-    }
-#endif
-    return sStamp;
-}
-//------------------------------------------------------------------------------
-
-void BasicCompositeLocalFileLayer::fillSubLayerLists( const std::vector<rtl::OUString>& aSublayerDirectories,
-                                                const rtl::OUString& aComponent) 
-{
-    std::vector<rtl::OUString>::size_type const nSublayerCount = aSublayerDirectories.size();
-    mSubLayers.realloc(nSublayerCount);
-    mSubLayerFiles.resize(nSublayerCount);
-
-    for (std::vector<rtl::OUString>::size_type i = 0; i < nSublayerCount; ++i)
-    {
-        mSubLayers[i] = FileHelper::getFileName(aSublayerDirectories[i]);
-
-        // Let's check whether the sublayer exists for the
-        // particular component.
-        rtl::OUString subLayerFile(aSublayerDirectories[i] + aComponent) ;
-        if (FileHelper::fileExists(subLayerFile))
-        {
-            mSubLayerFiles[i] =  subLayerFile;
-        }
-        else
-            OSL_ASSERT(mSubLayerFiles[i].getLength() == 0);
-    }
-}
-//------------------------------------------------------------------------------
-
-static bool findSubLayers(const rtl::OUString& aResDir,
-                          std::vector<rtl::OUString>& aSublayerDirectories)
-{
-    if (aResDir.getLength() == 0) return false;
-
-    // Extract the directory where the file is located
-    osl::Directory directory(aResDir) ;
-    if (directory.open() != osl::Directory::E_None) return false;
-
-    osl::DirectoryItem item ;
-    osl::FileStatus status(osl_FileStatus_Mask_Type |
-                           osl_FileStatus_Mask_FileURL) ;
-
-    while (directory.getNextItem(item) == osl::Directory::E_None) 
-    {
-        if (item.getFileStatus(status) == osl::Directory::E_None) 
-        {
-            if (status.getFileType() == osl::FileStatus::Directory) 
-            {
-                aSublayerDirectories.push_back(status.getFileURL()) ;
-            }
-        }
-    }
-    return !aSublayerDirectories.empty();
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XLayer> createReadonlyLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent, 
-        const rtl::OUString& aResDir) 
-{
-    uno::Reference<backend::XLayer> xResult;
-
-    std::vector<rtl::OUString> aSublayers;
-    if (aBaseDir.getLength() == 0)
-    {
-        findSubLayers(aResDir,aSublayers);
-        xResult.set( new CompositeLocalFileLayer(xFactory,aComponent,aSublayers) );
-    }
-    else if (findSubLayers(aResDir,aSublayers))
-    {
-        // there is no readonly full composite layer - take the updatable one
-        backend::XCompositeLayer * pNewLayer = 
-            new FullCompositeLocalFileLayer(xFactory,aBaseDir,aComponent,aSublayers);
-        xResult.set( pNewLayer );
-    }
-    else
-    {
-        xResult.set( new SimpleLocalFileLayer(xFactory,aBaseDir,aComponent) );
-    }
-    return xResult;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XUpdatableLayer> createUpdatableLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent, 
-        const rtl::OUString& aResDir) 
-{
-    uno::Reference<backend::XUpdatableLayer> xResult;
-
-    std::vector<rtl::OUString> aSublayers;
-    if (findSubLayers(aResDir,aSublayers))
-    {
-        xResult.set( new FullCompositeLocalFileLayer(xFactory,aBaseDir,aComponent,aSublayers) );
-    }
-    else if (aBaseDir.getLength() != 0)
-    {
-        xResult.set( new FlatLocalFileLayer(xFactory,aBaseDir,aComponent) );
-    }
-    else
-        OSL_ENSURE(false,"WARNING: Trying to create an updatable ressource-only layer");
-
-    return xResult;
-}
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-enum
-{
-    LAYER_PROPERTY_URL = 1
-};
-
-#define PROPNAME( name ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) )
-#define PROPTYPE( type ) getCppuType( static_cast< type const *>( 0 ) )
-
-// cppu::OPropertySetHelper 
-cppu::IPropertyArrayHelper * SAL_CALL LayerPropertyHelper::newInfoHelper()
-{
-    com::sun::star::beans::Property properties[] =
-    {
-        com::sun::star::beans::Property(PROPNAME("URL"), LAYER_PROPERTY_URL, PROPTYPE(rtl::OUString), com::sun::star::beans::PropertyAttribute::READONLY)
-    };
-
-    return new cppu::OPropertyArrayHelper(properties, sizeof(properties)/sizeof(properties[0]));
-}
-
-#define MESSAGE( text ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ERROR: Layer Properties: " text ) )
-
-void SAL_CALL LayerPropertyHelper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& /*rValue*/ )
-            throw (uno::Exception)
-{
-    namespace beans = com::sun::star::beans;
-
-    switch (nHandle)
-    {
-    case LAYER_PROPERTY_URL:
-        OSL_ENSURE(false, "Error: trying to set a READONLY property");
-        throw beans::PropertyVetoException(MESSAGE("Property 'URL' is read-only"),*this);
-
-    default:
-        OSL_ENSURE(false, "Error: trying to set an UNKNOWN property");
-        throw beans::UnknownPropertyException(MESSAGE("Trying to set an unknown property"),*this);
-    }
-}
-
-void SAL_CALL LayerPropertyHelper::getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) const
-{
-    switch (nHandle)
-    {
-    case LAYER_PROPERTY_URL: 
-        rValue = uno::makeAny( this->getLayerUrl() );
-        break;
-
-    default:
-        OSL_ENSURE(false, "Error: trying to get an UNKNOWN property");
-        break;
-    }
-}
-
-//------------------------------------------------------------------------------
-} } // configmgr.localbe
-
diff --git a/configmgr/source/localbe/localfilelayer.hxx b/configmgr/source/localbe/localfilelayer.hxx
deleted file mode 100644
index 64cd208030..0000000000
--- a/configmgr/source/localbe/localfilelayer.hxx
+++ /dev/null
@@ -1,495 +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: localfilelayer.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_LOCALBE_LOCALFILELAYER_HXX_
-#define CONFIGMGR_LOCALBE_LOCALFILELAYER_HXX_
-
-#include "propertysethelper.hxx"
-#include <com/sun/star/configuration/backend/XUpdatableLayer.hpp>
-#include <com/sun/star/configuration/backend/XCompositeLayer.hpp>
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-#ifndef VECTOR_INCLUDED_
-#define VECTOR_INCLUDED_
-#include <vector>
-#endif // VECTOR_INCLUDED_
-
-namespace configmgr { namespace localbe {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace util = css::util ;
-namespace backend = css::configuration::backend ;
-
-/**
-  Basic Implementation of the readonly XLayer interfaces for a local file access.
-  The read data is accessible through a canned implementation of an XML parser.
-  The layer is defined by the URL of the file containing its contents.
-  */
-class BasicLocalFileLayer 
-{
-protected :
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-      An optional resource directory provides the location
-      of sublayers of the component.
-
-      @param xFactory   service factory used to access canned services
-      @param aComponentFile path describing the component file
-      */
-    BasicLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aComponentFile) ;
-    /** Destructor */
-    ~BasicLocalFileLayer() ;
-
-protected :
-    /**
-      Describes the contents of a particular file to a handler.
-
-      @param xHandler   handler to describe the data to
-      @param aFileUrl   URL of the file
-      @throws com::sun::star::configuration::backend::MalformedDataException
-              if the file contains invalid data.
-      @throws com::sun::star::lang::NullPointerException
-              if pContext is NULL.
-      @throws com::sun::star::lang::WrappedTargetException
-              if an error occurs while accessing the data.
-      */
-    void readData(backend::XLayer * pContext,
-                  const uno::Reference<backend::XLayerHandler>& xHandler,
-                  const rtl::OUString& aFileUrl)
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-
-    /**
-      Returns an object that can be used to write a layer.
-      */
-    uno::Reference<backend::XLayerHandler> createLayerWriter();
-
-public:
-    /**
-      Returns a timestamp associated to a file defined by its URL.
-
-      @param aFileUrl   URL of the file
-      @return   timestamp
-      */
-    static rtl::OUString getTimestamp(const rtl::OUString& aFileUrl) ;
-
-    rtl::OUString const & getFileUrl() const { return mFileUrl; };
-
-private :
-    /** Service factory */
-    uno::Reference<lang::XMultiServiceFactory> const mFactory ;
-    /** URL of the file being accessed */
-    rtl::OUString const mFileUrl ;
-    /** XLayer implementation used for readData */
-    uno::Reference<backend::XLayer> mLayerReader ;
-
-} ;
-
-// provides properties for file layers
-class LayerPropertyHelper : public apihelper::PropertySetHelper
-{
-protected:
-    LayerPropertyHelper(){};
-    virtual ~LayerPropertyHelper(){};
-
-protected:
-    virtual rtl::OUString const & getLayerUrl() const = 0;
-
-protected:
-    // cppu::OPropertySetHelper 
-    virtual cppu::IPropertyArrayHelper * SAL_CALL newInfoHelper();
-
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue )
-            throw (uno::Exception);
-
-    using PropertySetHelper::getFastPropertyValue;
-    virtual void SAL_CALL getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) const;
-
-};
-
-/**
-  Implementation of the readonly XLayer interfaces for a local file access.
-  The read data is accessible through a canned implementation of
-  an XML parser.
-  The layer is defined by the URL of the file containing its 
-  contents.
-  */
-class SimpleLocalFileLayer  : public BasicLocalFileLayer
-                             , public cppu::ImplInheritanceHelper2< LayerPropertyHelper,
-                                                                    backend::XLayer,
-                                                                    util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-      An optional resource directory provides the location
-      of sublayers of the component.
-
-      @param xFactory   service factory used to access canned services
-      @param aComponentFile URL describing the component file
-      */
-    SimpleLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aComponentFile) ;
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-      An optional resource directory provides the location
-      of sublayers of the component.
-
-      @param xFactory   service factory used to access canned services
-      @param aBaseDir   base directory
-      @param aComponent subpath describing the component file
-      */
-    SimpleLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aBaseDir,
-            const rtl::OUString& aComponent) ;
-
-    /** Destructor */
-    ~SimpleLocalFileLayer() ;
-
-    // XLayer
-    using BasicLocalFileLayer::readData;
-    virtual void SAL_CALL readData(
-            const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-    
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp() 
-        throw (uno::RuntimeException);
-
-protected:
-    virtual rtl::OUString const & getLayerUrl() const 
-    { return getFileUrl(); }
-} ;
-
-/**
-  Implementation of the XUpdatableLayer 
-  interface for a local file access.
-  The read data is accessible through a canned implementation of
-  an XML parser, and the write data is defined through a canned
-  implementation of an XML writer.
-  The layer is defined by the URL of the file containing its 
-  contents, and that file will be either read or updated by 
-  the access to the handlers.
-  The timestamp is refreshed on each read operation only.
-  */
-class FlatLocalFileLayer : public BasicLocalFileLayer
-                         , public cppu::ImplInheritanceHelper2< LayerPropertyHelper,
-                                                                backend::XUpdatableLayer,
-                                                                util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-
-      @param xFactory   service factory used to access canned services
-      @param aBaseDir   base directory
-      @param aComponent subpath describing the component file
-      */
-    FlatLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aBaseDir,
-            const rtl::OUString& aComponent) ;
-    /** Destructor */
-    ~FlatLocalFileLayer(void) ;
-
-    // XLayer
-    using BasicLocalFileLayer::readData;
-    virtual void SAL_CALL readData(
-            const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-
-    // XUpdatableLayer
-    virtual void SAL_CALL replaceWith(
-            const uno::Reference<backend::XLayer>& aNewLayer) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp() 
-        throw (uno::RuntimeException);
-
-protected:
-    virtual rtl::OUString const & getLayerUrl() const 
-    { return getFileUrl(); }
-
-private :
-    /** XLayerHandler implementation for getWriteHandler */
-    uno::Reference<backend::XLayerHandler> mLayerWriter ;
-
-} ;
-
-/**
-  Implementation of the XCompositeLayer
-  interface for a local file access.
-  The read data is accessible through a canned implementation of
-  an XML parser.
-  The layer is defined by the URL of the file containing its 
-  contents, and that file will be either read or updated by 
-  the access to the handlers.
-  The timestamp is refreshed on each read operation only.
-  */
-class BasicCompositeLocalFileLayer : public BasicLocalFileLayer
-{
-protected:
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-      An resource directory provides the location
-      of sublayers of the component.
-
-      @param xFactory   service factory used to access canned services
-      @param aComponent path describing the component file
-      */
-    BasicCompositeLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aComponent) ;
-    
-    // XCompositeLayer helpers
-    uno::Sequence<rtl::OUString> SAL_CALL listSubLayerIds()
-        throw (lang::WrappedTargetException, uno::RuntimeException)
-    { return mSubLayers ; }
- 
-    void SAL_CALL readSubLayerData(
-            backend::XCompositeLayer * context,
-            const uno::Reference<backend::XLayerHandler>& xHandler,
-            const rtl::OUString& aSubLayerId) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, lang::IllegalArgumentException,
-               uno::RuntimeException);
-
-    /**
-      Fills the list of available sublayers.
-
-      @param aResDir    resource directory containing potential sublayers
-      @param aComponent component subpath
-      */
-    void fillSubLayerLists(const std::vector<rtl::OUString>& aSublayerDirectories,
-                           const rtl::OUString& aComponent) ;
-private :
-    /** List of available sublayers... */
-    uno::Sequence<rtl::OUString> mSubLayers ;
-    /** .. and the corresponding file URLs. */
-    std::vector<rtl::OUString> mSubLayerFiles ;
-
-};
-
-/**
-  Implementation of the XCompositeLayer
-  interface for a local file access.
-  The read data is accessible through a canned implementation of
-  an XML parser.
-  The layer is defined by the URL of the file containing its 
-  contents, and that file will be either read or updated by 
-  the access to the handlers.
-  The timestamp is refreshed on each read operation only.
-  */
-class CompositeLocalFileLayer : public BasicCompositeLocalFileLayer
-                     , public cppu::WeakImplHelper1< backend::XCompositeLayer> 
-{
-public :
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-      An resource directory provides the location
-      of sublayers of the component.
-
-      @param xFactory   service factory used to access canned services
-      @param aBaseDir   base directory
-      @param aComponent subpath describing the component file
-      @param aResDir    resource directory, if empty it is
-                        assumed the layer does not have sublayers.
-      */
-    CompositeLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aComponent, 
-            const std::vector<rtl::OUString>& aSublayerDirectories) ;
-    /** Destructor */
-    ~CompositeLocalFileLayer(void) ;
-    // XLayer
-    using BasicCompositeLocalFileLayer::readData;
-    virtual void SAL_CALL readData(
-            const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-
-    // XCompositeLayer
-    virtual uno::Sequence<rtl::OUString> SAL_CALL listSubLayerIds()
-        throw (lang::WrappedTargetException, uno::RuntimeException)
-    { return BasicCompositeLocalFileLayer::listSubLayerIds() ; }
-
-    using BasicCompositeLocalFileLayer::readSubLayerData;
-    virtual void SAL_CALL readSubLayerData(
-            const uno::Reference<backend::XLayerHandler>& xHandler,
-            const rtl::OUString& aSubLayerId) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, lang::IllegalArgumentException,
-               uno::RuntimeException);
-
-private :
-    // not implemented: warn of attempts to use this here
-    void getFileUrl() const;
-} ;
-/**
-  Implementation of the XUpdatableLayer and XCompositeLayer
-  interfaces for a local file access.
-  The read data is accessible through a canned implementation of
-  an XML parser, and the write data is defined through a canned
-  implementation of an XML writer.
-  The layer is defined by the URL of the file containing its 
-  contents, and that file will be either read or updated by 
-  the access to the handlers.
-  The timestamp is refreshed on each read operation only.
-  */
-class FullCompositeLocalFileLayer : public BasicCompositeLocalFileLayer
-                                    , public cppu::ImplInheritanceHelper3< 
-                                                    LayerPropertyHelper,
-                                                    backend::XUpdatableLayer,
-                                                    backend::XCompositeLayer,
-                                                    util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor providing the base directory and the
-      file subpath describing the file to access.
-      An resource directory provides the location
-      of sublayers of the component.
-
-      @param xFactory   service factory used to access canned services
-      @param aBaseDir   base directory
-      @param aComponent subpath describing the component file
-      @param aResDir    resource directory, if empty it is
-                        assumed the layer does not have sublayers.
-      */
-    FullCompositeLocalFileLayer(
-            const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-            const rtl::OUString& aBaseDir,
-            const rtl::OUString& aComponent, 
-            const std::vector<rtl::OUString>& aSublayerDirectories) ;
-    /** Destructor */
-    ~FullCompositeLocalFileLayer(void) ;
-    // XLayer
-    using BasicCompositeLocalFileLayer::readData;
-    virtual void SAL_CALL readData(
-            const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-
-    // XUpdatableLayer
-    virtual void SAL_CALL replaceWith(
-            const uno::Reference<backend::XLayer>& aNewLayer) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, uno::RuntimeException);
-
-    // XCompositeLayer
-    virtual uno::Sequence<rtl::OUString> SAL_CALL listSubLayerIds()
-        throw (lang::WrappedTargetException, uno::RuntimeException)
-    { return BasicCompositeLocalFileLayer::listSubLayerIds() ; }
- 
-    using BasicCompositeLocalFileLayer::readSubLayerData;
-    virtual void SAL_CALL readSubLayerData(
-            const uno::Reference<backend::XLayerHandler>& xHandler,
-            const rtl::OUString& aSubLayerId) 
-        throw (backend::MalformedDataException, lang::NullPointerException, 
-               lang::WrappedTargetException, lang::IllegalArgumentException,
-               uno::RuntimeException);
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp() 
-        throw (uno::RuntimeException);
-
-protected:
-    virtual rtl::OUString const & getLayerUrl() const 
-    { return getFileUrl(); }
-
-private :
-    /** XLayerHandler implementation for getWriteHandler */
-    uno::Reference<backend::XLayerHandler> mLayerWriter ;
-} ;
-/**
-  Factory function to create the appropriate Flat- or Composite-
-  LocalFileLayer for a set of parameters.
-
-  Arguments provide the base directory and the
-  file subpath describing the file to access.
-  An optional resource directory provides the location
-  of sublayers of the component.
-
-  @param xFactory   service factory used to access canned services
-  @param aBaseDir   base directory
-  @param aComponent subpath describing the component file
-  @param aResDir    resource directory, if empty it is
-                    assumed the layer does not have sublayers.
-  */
-uno::Reference<backend::XLayer> createReadonlyLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent, 
-        const rtl::OUString& aResDir) ;
-
-/**
-  Factory function to create the appropriate Flat- or Composite-
-  LocalFileLayer for a set of parameters.
-
-  Arguments provide the base directory and the
-  file subpath describing the file to access.
-  An optional resource directory provides the location
-  of sublayers of the component.
-
-  @param xFactory   service factory used to access canned services
-  @param aBaseDir   base directory
-  @param aComponent subpath describing the component file
-  @param aResDir    resource directory, if empty it is
-                    assumed the layer does not have sublayers.
-  */
-uno::Reference<backend::XUpdatableLayer> createUpdatableLocalFileLayer(
-        const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-        const rtl::OUString& aBaseDir,
-        const rtl::OUString& aComponent, 
-        const rtl::OUString& aResDir) ;
-
-} } // configmgr.localbe
-
-#endif // CONFIGMGR_LOCALBE_LOCALFILELAYER_HXX_
diff --git a/configmgr/source/localbe/localhierarchybrowsersvc.cxx b/configmgr/source/localbe/localhierarchybrowsersvc.cxx
deleted file mode 100644
index 65e9bf8bef..0000000000
--- a/configmgr/source/localbe/localhierarchybrowsersvc.cxx
+++ /dev/null
@@ -1,536 +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: localhierarchybrowsersvc.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_configmgr.hxx"
-
-#include "localhierarchybrowsersvc.hxx"
-#include "localsinglebackend.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include <com/sun/star/lang/NullPointerException.hpp>
-#include <rtl/ustrbuf.hxx>
-
-#include <algorithm>
-// -----------------------------------------------------------------------------
-
-#define OUSTRING( constascii ) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(constascii))
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace localbe
-    {
-// -----------------------------------------------------------------------------
-
-sal_Char const * const aLocalHierarchyBrowserServices[] = 
-{
-    "com.sun.star.configuration.backend.LocalHierarchyBrowser",
-    0,
-    "com.sun.star.configuration.backend.HierarchyBrowser",
-    0
-};
-const ServiceImplementationInfo aLocalHierarchyBrowserSI =
-{
-    "com.sun.star.comp.configuration.backend.LocalHierarchyBrowser",
-    aLocalHierarchyBrowserServices,
-    aLocalHierarchyBrowserServices + 3
-};
-// -----------------------------------------------------------------------------
-
-const ServiceRegistrationInfo* getLocalHierarchyBrowserServiceInfo()
-{ return getRegistrationInfo(& aLocalHierarchyBrowserSI); }
-// -----------------------------------------------------------------------------
-
-inline
-ServiceInfoHelper LocalHierarchyBrowserService::getServiceInfo()
-{
-    return & aLocalHierarchyBrowserSI;
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL instantiateLocalHierarchyBrowser
-( uno::Reference< uno::XComponentContext > const& rServiceManager )
-{
-    return * new LocalHierarchyBrowserService( rServiceManager );
-}
-// -----------------------------------------------------------------------------
-
-LocalHierarchyBrowserService::LocalHierarchyBrowserService(uno::Reference< uno::XComponentContext > const & _xContext)
-: m_xServiceFactory(_xContext->getServiceManager(), uno::UNO_QUERY)
-{
-    if (!m_xServiceFactory.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration Importer: Unexpected NULL context"));
-        throw lang::NullPointerException(sMessage,NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-LocalHierarchyBrowserService::~LocalHierarchyBrowserService()
-{}
-// -----------------------------------------------------------------------------
-
-namespace 
-{
-    struct JobDesc
-    {
-        explicit JobDesc(task::XJob * pJob, const uno::Sequence< beans::NamedValue >& aArguments);
-
-        enum Mode   { findNone, findSchemas, findLayers };
-        enum Result { getDefault,getUrls, getNames };
-
-        rtl::OUString                    aBaseDataUrl;
-        uno::Sequence< rtl::OUString >   aExcludeList;
-        Mode                        mode;
-        Result                      result_type;
-    };
-
-    JobDesc::JobDesc(task::XJob * pJob, const uno::Sequence< beans::NamedValue >& aArguments)
-    : aBaseDataUrl()
-    , aExcludeList()
-    , mode(findNone)
-    , result_type(getDefault)
-    {
-        sal_Int16 const nCount = static_cast<sal_Int16>(aArguments.getLength());
-
-        if (sal_Int32(nCount) != aArguments.getLength())
-        {
-            rtl::OUString sMessage = OUSTRING("Too many arguments for LocalHierarchyBrowser Job");
-            throw lang::IllegalArgumentException(sMessage,pJob,0);
-        }
-
-        for (sal_Int16 i=0; i < nCount; ++i)
-        {
-            sal_Bool bKnown = false;
-            sal_Bool bGood  = false;
-            
-            if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SchemaDataUrl")))
-            {
-                bKnown = true;
-                bGood  = (aArguments[i].Value >>= aBaseDataUrl);
-                mode = (bGood && aBaseDataUrl.getLength()) ? findSchemas : findNone;
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LayerDataUrl")))
-            {
-                bKnown = true;
-
-                rtl::OUString aLayerBaseUrl;
-                bGood  = (aArguments[i].Value >>= aLayerBaseUrl);
-
-                if (aLayerBaseUrl.getLength())
-                {
-                    rtl::OUString aLocalizedSubDir;
-                    LocalSingleBackend::getLayerSubDirectories(aLayerBaseUrl,this->aBaseDataUrl,aLocalizedSubDir);
-
-                    mode = findLayers;
-                }
-                else
-                {
-                    mode = findNone;
-                }
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExcludeComponents")))
-            {
-                bKnown = true;
-
-                sal_Int32 const nNextIndex = aExcludeList.getLength();
-
-                switch (aArguments[i].Value.getValueTypeClass())
-                {
-                case uno::TypeClass_STRING:
-                    {
-                        rtl::OUString aComponent;
-                        bGood = (aArguments[i].Value >>= aComponent);
-
-                        OSL_ASSERT(bGood);
-
-                        aExcludeList.realloc(nNextIndex + 1);
-                        aExcludeList[nNextIndex] = aComponent;
-                    }
-                    break;
-
-                case uno::TypeClass_SEQUENCE:
-                    {
-                        uno::Sequence<rtl::OUString> aComponentList;
-                        bGood = (aArguments[i].Value >>= aComponentList);
-                        
-                        if (bGood)
-                        {
-                            sal_Int32 const nCompListCount = aComponentList.getLength();
-                            aExcludeList.realloc(nNextIndex + nCompListCount);
-
-                            rtl::OUString const * pSrc = aComponentList.getConstArray();
-                            std::copy(pSrc,pSrc+nCompListCount,aExcludeList.getArray());
-                        }
-                    }
-                    break;
-
-                default:
-                    OSL_ASSERT(!bGood);
-                    break;
-                }
-            }
-            else if (aArguments[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FetchComponentNames")))
-            {
-                sal_Bool bComponents = sal_False;
-
-                bKnown = true;
-                if (aArguments[i].Value.hasValue())
-                {
-                    bGood  = (aArguments[i].Value >>= bComponents);
-                    if (bGood) result_type = bComponents ? getNames : getUrls;
-                }
-                else
-                {
-                    bGood = true;
-                    result_type = getDefault;
-                }
-            }
-
-            if (!bGood)
-            {
-                rtl::OUStringBuffer sMsg;
-                sMsg.appendAscii("LocalHierarchyBrowser - Illegal argument: ");
-                if (bKnown) 
-                    sMsg.appendAscii("Wrong value type for argument '");
-                else
-                    sMsg.appendAscii("Unknown argument '");
-
-                sMsg.append(aArguments[i].Name).appendAscii("'.");
-
-                throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),pJob,i+1);
-            }
-        }
-        if (findNone == mode)
-        {
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii("LocalHierarchyBrowser - Missing argument: ");
-            sMsg.appendAscii("No data URL available");
-            throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),pJob,0);
-        }
-        if (getDefault == result_type)
-            result_type = (mode == findSchemas) ? getNames : getUrls;
-
-    }
-
-    static
-    inline 
-    rtl::OUString getDataFileExtension(JobDesc::Mode mode)
-    {
-        switch (mode)
-        {
-        case JobDesc::findSchemas: return OUSTRING(".xcs");
-        case JobDesc::findLayers:  return OUSTRING(".xcu");
-        default: OSL_ASSERT(false); return rtl::OUString();
-        }
-    }
-}
-// -----------------------------------------------------------------------------
-
-// XJob
-
-uno::Any SAL_CALL 
-    LocalHierarchyBrowserService::execute( const uno::Sequence< beans::NamedValue >& Arguments ) 
-        throw (lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
-{
-    JobDesc const aJob(this,Arguments);
-
-    OSL_ASSERT(JobDesc::getUrls == aJob.result_type || JobDesc::getNames == aJob.result_type);
-
-    uno::Sequence< rtl::OUString > (LocalHierarchyBrowserService::* const find)( rtl::OUString const & _aBaseDirectory, rtl::OUString const & _aComponentFileExtension, uno::Sequence< rtl::OUString > const & aExcludeList) = (JobDesc::getUrls == aJob.result_type) ? 
-        &LocalHierarchyBrowserService::findLocalComponentUrls : 
-        &LocalHierarchyBrowserService::findLocalComponentNames;
-
-    uno::Sequence< rtl::OUString > aComponents = (this->*find)(aJob.aBaseDataUrl,getDataFileExtension(aJob.mode), aJob.aExcludeList);
-        
-    return uno::makeAny(aComponents);
-}
-// -----------------------------------------------------------------------------
-
-// XServiceInfo
-
-rtl::OUString SAL_CALL 
-    LocalHierarchyBrowserService::getImplementationName(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getImplementationName( );
-}
-// -----------------------------------------------------------------------------
-
-sal_Bool SAL_CALL 
-    LocalHierarchyBrowserService::supportsService( const rtl::OUString& ServiceName ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().supportsService( ServiceName );
-}
-// -----------------------------------------------------------------------------
-
-
-uno::Sequence< ::rtl::OUString > SAL_CALL 
-    LocalHierarchyBrowserService::getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getSupportedServiceNames( );
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-#include "filehelper.hxx"
-#include <osl/file.hxx>
-#include "tools/getprocessworkingdir.hxx"
-#include <vector>
-// -----------------------------------------------------------------------------
-
-    namespace uno = com::sun::star::uno;
-    // -----------------------------------------------------------------------------
-
-    #define OSL_VERIFY_RC( expr ) OSL_VERIFY( (expr) == osl::FileBase::E_None )
-    //------------------------------------------------------------------------------
-    static
-    inline
-    bool matchesExtension( rtl::OUString const & aFileName, rtl::OUString const & aExt )
-    {
-        sal_Int32 const nExtStart = aFileName.getLength() - aExt.getLength();
-        return nExtStart > 0 && !!aFileName.copy(nExtStart).equalsIgnoreAsciiCase(aExt);
-    }
-    //------------------------------------------------------------------------------
-    static
-    inline
-    rtl::OUString stripExtension( rtl::OUString const & aFileName, rtl::OUString const & aExt )
-    {
-        OSL_PRECOND( matchesExtension(aFileName,aExt), "File name doesn't have expected extension");
-
-        sal_Int32 const nExtStart = aFileName.getLength() - aExt.getLength();
-        return aFileName.copy(0,nExtStart);
-    }
-//------------------------------------------------------------------------------
-    static
-    inline
-    bool matchesExtension( osl::FileStatus const & aFileDescriptor, rtl::OUString const & aExt )
-    {
-        OSL_PRECOND( aFileDescriptor.isValid(FileStatusMask_Type | FileStatusMask_FileName), 
-                    "Not all required file-status fields available for filter" );
-
-        if (aFileDescriptor.getFileType() != osl::FileStatus::Regular)
-            return false;
-
-        return matchesExtension(aFileDescriptor.getFileName(),aExt);
-    }
-//------------------------------------------------------------------------------
-
-    static 
-    bool makeAbsoluteURL(rtl::OUString & rURL )
-    {
-        rtl::OUString aBaseDir; tools::getProcessWorkingDir(&aBaseDir);
-
-        osl::File::RC errcode = osl::File::getAbsoluteFileURL(aBaseDir,rURL,rURL);
-
-        return osl::File::E_None == errcode;
-    }
-//------------------------------------------------------------------------------
-    static 
-    inline 
-    bool getNextDirectoryItem(osl::Directory & aDirectory, osl::DirectoryItem & aItem, osl::Directory::RC & errcode)
-    {
-        switch (errcode = aDirectory.getNextItem(aItem))
-        {
-        case osl::Directory::E_None:     
-            return true;
-
-        case osl::Directory::E_NOENT: 
-            errcode = osl::Directory::E_None; 
-            return false;
-
-        default: 
-            return false;
-        }
-    }
-//------------------------------------------------------------------------------
-    static inline bool isExcluded(rtl::OUString const & aName, uno::Sequence< rtl::OUString > const & aExcludeList)
-    {
-        for (sal_Int32 i = 0; i<aExcludeList.getLength(); ++i)
-        {
-            if (aExcludeList[i].equals(aName)) return true;
-        }
-        return false;
-    }
-//------------------------------------------------------------------------------
-    static
-    osl::FileBase::RC findComponents( std::vector<rtl::OUString> * componentNames, std::vector<rtl::OUString> * componentUrls, 
-                                        rtl::OUString const& aDirectoryPath, rtl::OUString const& aComponentExtension, 
-                                        rtl::OUString const& aPackagePrefix, rtl::OUString const & aComponentSeparator,
-                                        uno::Sequence< rtl::OUString > const & aExcludeList)
-    {
-        static sal_Unicode const chDirSep = '/';
-        static rtl::OUString    const sDirectorySeparator(&chDirSep,1);
-
-        osl::Directory aDirectory(aDirectoryPath);	
-        
-        osl::Directory::RC errcode = aDirectory.open();
-
-        if (errcode == osl::Directory::E_None)
-        {        
-            sal_uInt32 n_STATUS_FIELDS =  FileStatusMask_Type | FileStatusMask_FileName; 
-            if (componentUrls) n_STATUS_FIELDS |= FileStatusMask_FileURL;
-
-            osl::DirectoryItem aItem;
-            while( getNextDirectoryItem(aDirectory,aItem,errcode) )
-            {
-
-                osl::FileStatus aItemDescriptor( n_STATUS_FIELDS );
-                errcode = aItem.getFileStatus(aItemDescriptor);
-
-                if ( errcode != osl::DirectoryItem::E_None )
-                {
-                    OSL_TRACE("Locating Configuration Components - Error (%u) getting status of directory item - skipping\n", unsigned(errcode));
-                    continue;
-                }
-                
-                OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_Type), "Could not get type of directory item");
-
-                if (aItemDescriptor.getFileType() == osl::FileStatus::Directory)
-                {
-                    OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_FileName), "Could not get name of subdirectory");
-
-                    rtl::OUString const aSubdirName = aItemDescriptor.getFileName();
-                    rtl::OUString const aSubdirPath = aDirectoryPath + sDirectorySeparator + aSubdirName;
-                    rtl::OUString const aSubpackagePrefix = aPackagePrefix + aSubdirName + aComponentSeparator;
-                    // recurse
-                    if (!isExcluded(aSubpackagePrefix,aExcludeList))
-                        OSL_VERIFY_RC( findComponents( componentNames,  componentUrls,
-                                                        aSubdirPath, aComponentExtension, 
-                                                        aSubpackagePrefix, aComponentSeparator,
-                                                        aExcludeList) );
-                }
-                else if (matchesExtension(aItemDescriptor,aComponentExtension))
-                {
-                    OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_FileName), "Could not get name of component found");
-
-                    rtl::OUString const aComponentName = stripExtension( aItemDescriptor.getFileName(), aComponentExtension );
-                    rtl::OUString const aFullComponentName = aPackagePrefix + aComponentName;
-                    
-                    if (!isExcluded(aFullComponentName,aExcludeList))
-                    {
-                        if (componentNames)
-                        {
-                            componentNames->push_back(aFullComponentName);
-                        }
-                    
-                        if (componentUrls)
-                        {
-                            OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_FileURL), "Could not get URL of component found");
-
-                            componentUrls->push_back(aItemDescriptor.getFileURL());
-                        }
-                    }
-                }
-            }
-            aDirectory.close();
-        }
-        return errcode;
-    }
-// -----------------------------------------------------------------------------
-
-    uno::Sequence< rtl::OUString > configmgr::localbe::LocalHierarchyBrowserService::findLocalComponentNames( rtl::OUString const & _aBaseDirectory, rtl::OUString const & _aComponentFileExtension, uno::Sequence< rtl::OUString > const & aExcludeList)
-    {
-        rtl::OUString aBaseDirectory(_aBaseDirectory);
-        OSL_VERIFY( makeAbsoluteURL(aBaseDirectory) );
-
-        static const sal_Unicode chPkgSep = '.';
-
-        std::vector< rtl::OUString > components;
-
-        osl::Directory::RC errcode = findComponents(&components, NULL,
-                                                    aBaseDirectory, _aComponentFileExtension, 
-                                                    rtl::OUString(), rtl::OUString(&chPkgSep,1),
-                                                    aExcludeList );
-        
-        if (errcode != osl::Directory::E_None)
-        {
-            OSL_TRACE("Locating Configuration Components failed - Error (%u) trying to locate files\n", unsigned(errcode));
-
-            if (errcode != osl::Directory::E_NOENT)
-            {
-                rtl::OUString sMsg = OUSTRING("LocalHierarchyBrowser - IO Error while scanning for components: ") + 
-                                FileHelper::createOSLErrorString(errcode);
-
-                throw com::sun::star::io::IOException(sMsg,*this);
-            }
-        }
-        
-        return uno::Sequence< rtl::OUString >(&components.front(),components.size());
-    }
-// -----------------------------------------------------------------------------
-
-    uno::Sequence< rtl::OUString > configmgr::localbe::LocalHierarchyBrowserService::findLocalComponentUrls( rtl::OUString const & _aBaseDirectory, rtl::OUString const & _aComponentFileExtension, uno::Sequence< rtl::OUString > const & aExcludeList)
-    {
-        rtl::OUString aBaseDirectory(_aBaseDirectory);
-        OSL_VERIFY( makeAbsoluteURL(aBaseDirectory) );
-
-        static const sal_Unicode chPkgSep = '.';
-
-        std::vector< rtl::OUString > components;
-
-        osl::Directory::RC errcode = findComponents(NULL, &components, 
-                                                    aBaseDirectory, _aComponentFileExtension, 
-                                                    rtl::OUString(), rtl::OUString(&chPkgSep,1), 
-                                                    aExcludeList );
-        
-        if (errcode != osl::Directory::E_None)
-        {
-            OSL_TRACE("Locating Configuration Components failed - Error (%u) trying to locate files\n", unsigned(errcode));
-
-            if (errcode != osl::Directory::E_NOENT)
-            {
-                rtl::OUString sMsg = OUSTRING("LocalHierarchyBrowser - IO Error while scanning for component files: ") + 
-                                FileHelper::createOSLErrorString(errcode);
-
-                throw com::sun::star::io::IOException(sMsg,*this);
-            }
-        }
-        
-        return uno::Sequence< rtl::OUString >(&components.front(),components.size());
-    }
-//------------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
diff --git a/configmgr/source/localbe/localhierarchybrowsersvc.hxx b/configmgr/source/localbe/localhierarchybrowsersvc.hxx
deleted file mode 100644
index 478dc6c635..0000000000
--- a/configmgr/source/localbe/localhierarchybrowsersvc.hxx
+++ /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: localhierarchybrowsersvc.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 CONFIGMGR_LOCALBE_BROWSERSVC_HXX
-#define CONFIGMGR_LOCALBE_BROWSERSVC_HXX
-
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/implbase2.hxx>
-#include <osl/mutex.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/XJob.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace localbe
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace task  = ::com::sun::star::task;
-        namespace beans = ::com::sun::star::beans;
-// -----------------------------------------------------------------------------
-
-        class LocalHierarchyBrowserService : public ::cppu::WeakImplHelper2< 
-                                            task::XJob,         
-                                            lang::XServiceInfo  
-                                        > 
-        {
-        public:
-            explicit
-            LocalHierarchyBrowserService(uno::Reference< uno::XComponentContext > const & _xContext);
-            ~LocalHierarchyBrowserService();
-
-            // XServiceInfo
-            virtual rtl::OUString SAL_CALL 
-                getImplementationName(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual sal_Bool SAL_CALL 
-                supportsService( const rtl::OUString& ServiceName ) 
-                    throw (uno::RuntimeException);
-
-            virtual uno::Sequence< rtl::OUString > SAL_CALL 
-                getSupportedServiceNames(  ) 
-                    throw (uno::RuntimeException);
-    
-            // XJob
-            virtual uno::Any SAL_CALL 
-                execute( const uno::Sequence< beans::NamedValue >& Arguments ) 
-                    throw (lang::IllegalArgumentException, uno::Exception, uno::RuntimeException);
-
-        private:
-            uno::Reference< lang::XMultiServiceFactory > getServiceFactory() const 
-            { return m_xServiceFactory; }
-
-            uno::Sequence< rtl::OUString > findLocalComponentNames( rtl::OUString const & _aBaseDirectory, rtl::OUString const & _aComponentFileExtension, uno::Sequence< rtl::OUString > const & aExcludeList);
-            uno::Sequence< rtl::OUString > findLocalComponentUrls( rtl::OUString const & _aBaseDirectory, rtl::OUString const & _aComponentFileExtension, uno::Sequence< rtl::OUString > const & aExcludeList);
-        private:
-            uno::Reference< lang::XMultiServiceFactory >  m_xServiceFactory;
-            
-            static ServiceInfoHelper getServiceInfo();
-        };
-// -----------------------------------------------------------------------------
-    } // namespace localbe
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/localbe/localmultistratum.cxx b/configmgr/source/localbe/localmultistratum.cxx
deleted file mode 100644
index 34700c0d40..0000000000
--- a/configmgr/source/localbe/localmultistratum.cxx
+++ /dev/null
@@ -1,250 +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: localmultistratum.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_configmgr.hxx"
-
-#include "localmultistratum.hxx"
-#include "localfilehelper.hxx"
-#include "filehelper.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif // CONFIGMGR_API_FACTORY_HXX_
-#include "serviceinfohelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-#include <osl/file.hxx>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-static inline
-rtl::OUString const & impl_getLayerDataDirectory(rtl::OUString const & aLayerBaseUrl)
-{ return aLayerBaseUrl; }
-//------------------------------------------------------------------------------
-static //inline
-rtl::OUString makeLayerId(rtl::OUString const & aComponent,rtl::OUString const & aParticleFile)
-{ 
-    OSL_ASSERT(aParticleFile.endsWithIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(kLocalDataSuffix)));
-    const sal_Int32 kExtLength = RTL_CONSTASCII_LENGTH(kLocalDataSuffix);
-    rtl::OUString const aParticleName = aParticleFile.copy(0,aParticleFile.getLength() - kExtLength);
-
-    rtl::OUStringBuffer aLayerId(aComponent);
-    aLayerId.append(k_cLayerIdSeparator);
-    aLayerId.append(aParticleName);
-
-    return aLayerId.makeStringAndClear();
-}
-
-LocalMultiStratum::LocalMultiStratum(const uno::Reference<uno::XComponentContext>& xContext) 
-: cppu::ImplInheritanceHelper1< LocalStratumBase, backend::XMultiLayerStratum >(xContext)
-{
-}
-//------------------------------------------------------------------------------
-
-LocalMultiStratum::~LocalMultiStratum() {}
-
-//------------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > SAL_CALL 
-    LocalMultiStratum::listLayerIds( const rtl::OUString& aComponent, 
-                                     const rtl::OUString& /*aEntity*/ ) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException)
-{
-    rtl::OUString const aLayerUrl   = impl_getLayerDataDirectory(getBaseUrl());
-    rtl::OUString const aComponentUrl = aLayerUrl + componentToPath(aComponent);
-    
-    const sal_uInt32 k_STATUS_FIELDS =  FileStatusMask_Type | FileStatusMask_FileName; 
-    osl::Directory aComponentDirectory(aComponentUrl);
-    osl::DirectoryItem aItem;
-    std::vector< rtl::OUString > aResult;
-
-    osl::Directory::RC errcode = aComponentDirectory.open();
-    switch (errcode)
-    {        
-    case osl::Directory::E_NOENT:
-        return uno::Sequence< rtl::OUString >();
-
-    case osl::Directory::E_None:
-        while (osl::Directory::E_None == (errcode=aComponentDirectory.getNextItem(aItem)))
-        {
-            osl::FileStatus aItemDescriptor( k_STATUS_FIELDS );
-            errcode = aItem.getFileStatus(aItemDescriptor);
-
-            if ( errcode != osl::DirectoryItem::E_None )
-            {
-                OSL_ASSERT(errcode != osl::Directory::E_NOENT); // unexpected failure for getFileStatus for existing file
-                if (errcode == osl::Directory::E_NOENT) continue;
-
-                OSL_TRACE("Reading Component Directory - Error (%u) getting status of directory item.\n", unsigned(errcode));
-                break;
-            }
-
-            OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_Type), "Could not get type of directory item");
-            if (aItemDescriptor.getFileType() != osl::FileStatus::Regular)
-                continue;
-                    
-            OSL_ENSURE( aItemDescriptor.isValid(FileStatusMask_FileName), "Could not get name of component found");
-            rtl::OUString const aFileName = aItemDescriptor.getFileName();
-            if (!aFileName.endsWithIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(kLocalDataSuffix)))
-                continue;
-
-            aResult.push_back( makeLayerId(aComponent,aFileName) );
-        }
-        OSL_ASSERT(errcode != osl::Directory::E_None); // Loop postcond
-
-        // joint error handling with open failure
-        if (errcode != osl::Directory::E_NOENT) // normal loop termination
-        {
-    default: // if open() truly failed we also go here
-            rtl::OUStringBuffer errbuf;
-            errbuf.appendAscii("LocalMultiStratum::listLayerIds: ");
-            errbuf.appendAscii("Error scanning directory ").append(aComponentUrl)
-                  .appendAscii(" for particle files. ");
-            errbuf.appendAscii("Error: ").append(FileHelper::createOSLErrorString(errcode));
-            rtl::OUString const errmsg = errbuf.makeStringAndClear();
-            throw backend::BackendAccessException(errmsg,*this,uno::Any());
-        }
-
-        return aResult.empty()
-            ? uno::Sequence< rtl::OUString >()
-            : uno::Sequence< rtl::OUString >(
-                &aResult.front(), static_cast<sal_Int32>(aResult.size()));
-    }
-}
-
-//------------------------------------------------------------------------------
-rtl::OUString SAL_CALL 
-    LocalMultiStratum::getUpdateLayerId( const rtl::OUString& aComponent, 
-                                         const rtl::OUString& /*aEntity*/ )
-        throw (backend::BackendAccessException, lang::NoSupportException, 
-                lang::IllegalArgumentException, uno::RuntimeException)
-{
-    failReadonly();
-    return aComponent;
-}
-
-//------------------------------------------------------------------------------
-uno::Reference< backend::XLayer > SAL_CALL
-    LocalMultiStratum::getLayer( const rtl::OUString& aLayerId, 
-                                 const rtl::OUString& aTimestamp ) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException, 
-                uno::RuntimeException)
-{
-    return LocalStratumBase::getLayer(aLayerId,aTimestamp);
-}
-//------------------------------------------------------------------------------
-uno::Sequence< uno::Reference< backend::XLayer > > SAL_CALL 
-    LocalMultiStratum::getLayers( const uno::Sequence< rtl::OUString >& aLayerIds, 
-                                  const rtl::OUString& aTimestamp )
-        throw (backend::BackendAccessException, lang::IllegalArgumentException, 
-                uno::RuntimeException)
-{
-    sal_Int32 const nLayers = aLayerIds.getLength();
-    uno::Sequence< uno::Reference< backend::XLayer > > aResult(nLayers);
-    for (sal_Int32 ix=0; ix<nLayers; ++ix)
-    {
-        aResult[ix] = LocalStratumBase::getLayer(aLayerIds[ix],aTimestamp);
-    }
-    return aResult;
-}
-
-//------------------------------------------------------------------------------
-uno::Sequence< uno::Reference< backend::XLayer > > SAL_CALL 
-    LocalMultiStratum::getMultipleLayers( const uno::Sequence< rtl::OUString >& aLayerIds, 
-                                          const uno::Sequence< rtl::OUString >& aTimestamps ) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException, 
-                uno::RuntimeException)
-{
-    if (aLayerIds.getLength() != aTimestamps.getLength()) {
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "LocalStratum::getMultipleLayers(): Timestamp count does not match layer count")),
-                *this, 0) ;
-    }
-    sal_Int32 const nLayers = aLayerIds.getLength();
-    uno::Sequence< uno::Reference< backend::XLayer > > aResult(nLayers);
-    for (sal_Int32 ix=0; ix<nLayers; ++ix)
-    {
-        aResult[ix] = LocalStratumBase::getLayer(aLayerIds[ix],aTimestamps[ix]);
-    }
-    return aResult;
-}
-
-//------------------------------------------------------------------------------
-uno::Reference< backend::XUpdatableLayer > SAL_CALL 
-    LocalMultiStratum::getUpdatableLayer( const rtl::OUString& /*aLayerId*/ )
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                lang::NoSupportException, uno::RuntimeException)
-{
-    failReadonly();
-    return 0;
-}
-//------------------------------------------------------------------------------
-
-void LocalMultiStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
-                                             rtl::OUString& aSubLayerUrl) const 
-{
-    aLayerUrl   = impl_getLayerDataDirectory(getBaseUrl());
-    aSubLayerUrl = rtl::OUString();
-}
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-static const sal_Char * const kMultiStratumImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalMultiStratum" ;
-static const sal_Char * const kBackendService = 
-                "com.sun.star.configuration.backend.MultiStratum" ;
-static const sal_Char * const kLocalService = 
-                "com.sun.star.configuration.backend.LocalMultiStratum" ;
-
-static sal_Char const * kServiceNames [] = { kLocalService, 0, kBackendService, 0 } ;
-static const ServiceImplementationInfo kMultiStratumServiceInfo   = { kMultiStratumImplementation  , kServiceNames, kServiceNames + 2 } ;
-
-const ServiceRegistrationInfo *getLocalMultiStratumServiceInfo() 
-{ return getRegistrationInfo(&kMultiStratumServiceInfo) ; }
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalMultiStratum(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalMultiStratum(xContext) ;
-}
-
-//------------------------------------------------------------------------------
-
-const ServiceImplementationInfo * LocalMultiStratum::getServiceInfoData() const
-{
-    return &kMultiStratumServiceInfo;
-}
-//------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
-
-} } // configmgr.localsinglestratum
diff --git a/configmgr/source/localbe/localmultistratum.hxx b/configmgr/source/localbe/localmultistratum.hxx
deleted file mode 100644
index 34c2235e12..0000000000
--- a/configmgr/source/localbe/localmultistratum.hxx
+++ /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: localmultistratum.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 CONFIGMGR_LOCALBE_LOCALMULTISTRATUM_HXX_
-#define CONFIGMGR_LOCALBE_LOCALMULTISTRATUM_HXX_
-
-#include "localstratumbase.hxx"
-#include <com/sun/star/configuration/backend/XMultiLayerStratum.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-namespace configmgr 
-{ 
-    namespace localbe 
-    {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-/**
-  Implements the MultiLayerStratum service for local file access.
-  */
-class LocalMultiStratum : public cppu::ImplInheritanceHelper1< LocalStratumBase, backend::XMultiLayerStratum > 
-{
-public :
-    /**
-      Service constructor from a service factory.
-
-      @param xContext   component context
-      */
-    LocalMultiStratum(const uno::Reference<uno::XComponentContext>& xContext) ;
-
-    /** Destructor */
-    ~LocalMultiStratum() ;
-
-
-    // XMultiLayerStratum
-    virtual uno::Sequence< rtl::OUString > SAL_CALL 
-        listLayerIds( const rtl::OUString& aComponent, const rtl::OUString& aEntity ) 
-            throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-
-    virtual rtl::OUString SAL_CALL 
-        getUpdateLayerId( const rtl::OUString& aComponent, const rtl::OUString& aEntity )
-            throw (backend::BackendAccessException, lang::NoSupportException, 
-                    lang::IllegalArgumentException, uno::RuntimeException);
-    
-    virtual uno::Reference< backend::XLayer > SAL_CALL
-        getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp ) 
-            throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-    
-    virtual uno::Sequence< uno::Reference< backend::XLayer > > SAL_CALL 
-        getLayers( const uno::Sequence< rtl::OUString >& aLayerIds, const rtl::OUString& aTimestamp )
-            throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-
-    virtual uno::Sequence< uno::Reference< backend::XLayer > > SAL_CALL 
-        getMultipleLayers( const uno::Sequence< rtl::OUString >& aLayerIds, const uno::Sequence< rtl::OUString >& aTimestamps ) 
-            throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-    
-    virtual uno::Reference< backend::XUpdatableLayer > SAL_CALL 
-        getUpdatableLayer( const rtl::OUString& aLayerId )
-            throw (backend::BackendAccessException, lang::NoSupportException, 
-                    lang::IllegalArgumentException, uno::RuntimeException);
-    
-private:
-    virtual void getLayerDirectories(rtl::OUString& aLayerUrl, rtl::OUString& aSubLayerUrl) const;
-    virtual const ServiceImplementationInfo * getServiceInfoData() const;
-} ;
-
-
-} } // configmgr.localbe
-
-#endif 
diff --git a/configmgr/source/localbe/localoutputstream.cxx b/configmgr/source/localbe/localoutputstream.cxx
deleted file mode 100644
index e0dabfa66b..0000000000
--- a/configmgr/source/localbe/localoutputstream.cxx
+++ /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: localoutputstream.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_configmgr.hxx"
-#include "localoutputstream.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-LocalOutputStream::LocalOutputStream(const rtl::OUString& aFileUrl) 
-    throw (backend::BackendAccessException, uno::RuntimeException)
-: mFileUrl(aFileUrl)
-, mTemporaryFileUrl(mFileUrl)
-, mWriteFile(NULL)
-{
-    // First, ensure the directory where the file is supposed to be 
-    // put exists.
-    mTemporaryFileUrl += rtl::OUString::createFromAscii("_tmp") ;
-    rtl::OUString parentDirectory = FileHelper::getParentDir(aFileUrl) ;
-
-    if (osl::File::RC errorCode = FileHelper::mkdirs(parentDirectory)) 
-    {
-        rtl::OUStringBuffer message ;
-        message.appendAscii("Cannot create directory \"") ;
-        message.append(parentDirectory).appendAscii("\". Error is ") ;
-        message.append(FileHelper::createOSLErrorString(errorCode));
-        message.appendAscii(" [").append(sal_Int32(errorCode)).appendAscii("].") ;
-
-        rtl::OUString const sIOMsg = message.makeStringAndClear();
-        uno::Any ioe = uno::makeAny(io::IOException(sIOMsg,0));
-
-        switch (errorCode)
-        {
-        case osl::File::E_ACCES: 
-        case osl::File::E_ROFS: 
-            message.appendAscii("Configuration LocalOutputStream - No Write Access: ");
-            message.append(sIOMsg);
-            throw backend::InsufficientAccessRightsException(message.makeStringAndClear(), NULL, ioe) ;
-
-        case osl::File::E_None: OSL_ASSERT(!"can't happen");
-        default:
-            message.appendAscii("Configuration LocalOutputStream - IO Error: ");
-            message.append(sIOMsg);
-            throw backend::BackendAccessException(message.makeStringAndClear(), NULL, ioe) ;
-        }
-    }
-
-    osl::File::remove(mTemporaryFileUrl) ;
-    mWriteFile = new osl::File(mTemporaryFileUrl) ;
-
-    if (osl::File::RC errorCode = mWriteFile->open(OpenFlag_Write |  OpenFlag_Create) )
-    {
-        delete mWriteFile, mWriteFile = NULL;
-
-        rtl::OUStringBuffer message ;
-        message.appendAscii("Cannot open file \"") ;
-        message.append(mTemporaryFileUrl).appendAscii("\" for writing. ");
-        message.appendAscii("Error is ").append(FileHelper::createOSLErrorString(errorCode));
-        message.appendAscii(" [").append(sal_Int32(errorCode)).appendAscii("].") ;
-
-        rtl::OUString const sIOMsg = message.makeStringAndClear();
-        uno::Any ioe = uno::makeAny(io::IOException(sIOMsg,0));
-
-        switch (errorCode)
-        {
-        case osl::File::E_EXIST: // take inability to remove as indicator of missing rights 
-        case osl::File::E_ACCES: 
-        case osl::File::E_ROFS: 
-            message.appendAscii("Configuration LocalOutputStream - No Write Access: ");
-            message.append(sIOMsg);
-            throw backend::InsufficientAccessRightsException(message.makeStringAndClear(), NULL, ioe) ;
-
-        case osl::File::E_None: OSL_ASSERT(!"can't happen");
-        default:
-            message.appendAscii("Configuration LocalOutputStream - IO Error: ");
-            message.append(sIOMsg);
-            throw backend::BackendAccessException(message.makeStringAndClear(), NULL, ioe) ;
-        }
-    }
-    mTemporaryFile = new OSLOutputStreamWrapper(*mWriteFile) ;
-}
-//------------------------------------------------------------------------------
-
-LocalOutputStream::~LocalOutputStream() 
-{
-    try 
-    { 
-        this->closeOutput();
-    }
-    catch (uno::Exception&) 
-    {
-        OSL_ENSURE(false,"Exception from closing LocalOutputStream ignored.");
-    }
-
-    delete mWriteFile;   
-}
-//------------------------------------------------------------------------------
-
-void LocalOutputStream::finishOutput()
-    throw (backend::BackendAccessException, uno::RuntimeException)
-{
-    if (mWriteFile)
-    try
-    {
-        this->closeOutput();
-        delete mWriteFile, mWriteFile = NULL;
-
-        FileHelper::replaceFile(mFileUrl, mTemporaryFileUrl) ;
-    }
-    catch (io::IOException& ioe) 
-    {
-        rtl::OUStringBuffer message ;
-        message.appendAscii("Configuration LocalOutputStream - IO Error: ");
-        message.appendAscii("Cannot finish output to \"").append(mTemporaryFileUrl) ;
-        message.appendAscii("\" or copy the result to \"").append(mFileUrl).appendAscii("\". ");
-        message.appendAscii("Error is \"").append(ioe.Message).appendAscii("\". ");
-        throw backend::BackendAccessException(message.makeStringAndClear(), *this, uno::makeAny(ioe));
-    }
-}
-//------------------------------------------------------------------------------
-
-inline
-uno::Reference<io::XOutputStream> LocalOutputStream::getOutputFile() 
-{
-    if (!mTemporaryFile.is())
-    {
-        throw io::NotConnectedException( 
-            rtl::OUString::createFromAscii("LocalOutputStream: no output file."),
-            *this);
-    }
-    return mTemporaryFile;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL LocalOutputStream::writeBytes(const uno::Sequence<sal_Int8>& aData)
-    throw (io::NotConnectedException, 
-            io::BufferSizeExceededException, 
-            io::IOException, uno::RuntimeException) 
-{
-    getOutputFile()->writeBytes(aData) ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL LocalOutputStream::flush() 
-    throw (io::NotConnectedException, 
-            io::BufferSizeExceededException,
-            io::IOException, uno::RuntimeException) 
-{
-    getOutputFile()->flush() ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL LocalOutputStream::closeOutput() 
-    throw (io::NotConnectedException, io::BufferSizeExceededException,
-            io::IOException, uno::RuntimeException) 
-{
-    if (mTemporaryFile.is())
-    {
-        mTemporaryFile->closeOutput() ;
-
-        mTemporaryFile.clear();
-    }
-}
-//------------------------------------------------------------------------------
-
-} } // configmgr.localbe
diff --git a/configmgr/source/localbe/localoutputstream.hxx b/configmgr/source/localbe/localoutputstream.hxx
deleted file mode 100644
index 911e339fbd..0000000000
--- a/configmgr/source/localbe/localoutputstream.hxx
+++ /dev/null
@@ -1,106 +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: localoutputstream.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 CONFIGMGR_LOCALBE_LOCALOUTPUTSTREAM_HXX_
-#define CONFIGMGR_LOCALBE_LOCALOUTPUTSTREAM_HXX_
-
-#include "oslstream.hxx"
-#include "filehelper.hxx"
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-
-namespace configmgr { namespace localbe {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace io = css::io ;
-namespace backend = css::configuration::backend ;
-
-/**
-  Class wrapping the use of the XOutputStream implementation on a file
-  to make it handle a temporary file and synch the contents to the
-  actual file being accessed only on successful completion of the output
-  process.
-  */
-class LocalOutputStream : public cppu::WeakImplHelper1<io::XOutputStream> 
-{
-    public :
-        /**
-          Constructor using the URL of the file to access.
-          The actual writing will occur in a temporary file
-          whose name is derived from the URL, and the file
-          specified by the parameter will be overwritten
-          on closing the stream.
-
-          @param aFileUrl   URL of the file to write
-          @throws   com::sun::star::io::IOException
-                    if access to the temporary file fails.
-          */
-        LocalOutputStream(const rtl::OUString& aFileUrl) 
-            throw (backend::BackendAccessException, uno::RuntimeException) ;
-        /** Destructor */
-        ~LocalOutputStream(void) ;
-
-        // closeOutput and mark as successful
-        void finishOutput()
-            throw (backend::BackendAccessException, uno::RuntimeException) ;
-    protected :
-        // XOutputStream
-        virtual void SAL_CALL writeBytes(const uno::Sequence<sal_Int8>& aData)
-            throw (io::NotConnectedException, 
-                    io::BufferSizeExceededException, 
-                    io::IOException, uno::RuntimeException);
-
-        virtual void SAL_CALL flush(void) 
-            throw (io::NotConnectedException, 
-                    io::BufferSizeExceededException,
-                    io::IOException, uno::RuntimeException);
-
-        virtual void SAL_CALL closeOutput(void) 
-            throw (io::NotConnectedException,
-                    io::BufferSizeExceededException,
-                    io::IOException, uno::RuntimeException) ;
-
-
-    private :
-        uno::Reference<io::XOutputStream> getOutputFile() ;
-
-        /** Temporary file used during access */
-        uno::Reference<io::XOutputStream> mTemporaryFile ;
-        /** URL of the target file */
-        rtl::OUString mFileUrl ;
-        /** URL of the temporary file */
-        rtl::OUString mTemporaryFileUrl ;
-        /** File being written */
-        osl::File *mWriteFile ;
-} ;
-
-} } // configmgr.localbe
-
-#endif // CONFIGMGR_LOCALBE_LOCALOUTPUTSTREAM_HXX_
diff --git a/configmgr/source/localbe/localschemasupplier.cxx b/configmgr/source/localbe/localschemasupplier.cxx
deleted file mode 100644
index 8dda0e0d99..0000000000
--- a/configmgr/source/localbe/localschemasupplier.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: localschemasupplier.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_configmgr.hxx"
-
-#include "localschemasupplier.hxx"
-#include "localfilehelper.hxx"
-#include "oslstream.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif // CONFIGMGR_API_FACTORY_HXX_
-#include "serviceinfohelper.hxx"
-#include "bootstrap.hxx"
-#include "filehelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <memory>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-LocalSchemaSupplier::LocalSchemaSupplier(
-        const uno::Reference<uno::XComponentContext>& xContext) 
-        : cppu::WeakComponentImplHelper3<backend::XVersionedSchemaSupplier, lang::XInitialization, lang::XServiceInfo>(mMutex), mFactory(xContext->getServiceManager(),uno::UNO_QUERY) {
-}
-//------------------------------------------------------------------------------
-
-LocalSchemaSupplier::~LocalSchemaSupplier(void) {}
-//------------------------------------------------------------------------------
-static const rtl::OUString kSchemaDataUrl(
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"SchemaDataUrl")) ;
-
-static const rtl::OUString kSchemaVersion(
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"SchemaVersion")) ;
-
-void SAL_CALL LocalSchemaSupplier::initialize(
-        const uno::Sequence<uno::Any>& aParameters) 
-    throw (uno::RuntimeException, uno::Exception,
-           css::configuration::InvalidBootstrapFileException,
-           backend::CannotConnectException,
-           backend::BackendSetupException)
-{
-    if (aParameters.getLength() == 0) {
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "No parameters provided to LocalSchemaSupplier")),
-                *this, 0) ;
-    }
-    uno::Reference<uno::XComponentContext> context ;
-
-    for (sal_Int32 i = 0 ; i < aParameters.getLength() ; ++ i) {
-        if (aParameters [i] >>= context) { break ; }
-    }
-
-    // Setting: schema version
-    // TODO: Add support for repository-specific versions
-    uno::Any const aSchemaVersionSetting = context->getValueByName(kSchemaVersion);
-    aSchemaVersionSetting >>= mSchemaVersion;
-
-    // Setting: schema diretory(ies)
-    uno::Any const aSchemaDataSetting = context->getValueByName(kSchemaDataUrl);
-    uno::Sequence< rtl::OUString > aSchemas;
-    rtl::OUString schemas;
-
-    if (aSchemaDataSetting >>= schemas) 
-    {
-        fillFromBlankSeparated(schemas, aSchemas) ;
-    }
-    else 
-    {
-        aSchemaDataSetting >>=  aSchemas;
-    }
-    //validate SchemaDataUrls
-    mSchemaDataUrls.realloc(aSchemas.getLength());
-    
-    sal_Int32 nSchemaLocations =0;
-    sal_Int32 nExistingSchemaLocations = 0;
-    for (sal_Int32 j = 0; j < aSchemas.getLength(); ++j)
-    {
-        bool bOptional = checkOptionalArg(aSchemas[j]);
-
-        if(!bOptional)
-            validateFileURL(aSchemas[j],*this);
-        else if (!isValidFileURL(aSchemas[j]))
-            continue;
-        
-        OSL_ASSERT(isValidFileURL(aSchemas[j]));
-        
-        //NormalizeURL
-        implEnsureAbsoluteURL(aSchemas[j]);
-        if(!normalizeURL(aSchemas[j],*this,bOptional))
-            continue;
-    
-        //now we have a correct file URL, which we will use
-        mSchemaDataUrls[nSchemaLocations++]= aSchemas[j];
-        if (!bOptional)
-            checkFileExists(aSchemas[j],*this);
-
-        else if(!FileHelper::fileExists(aSchemas[j]))
-            continue; // skip the directory check
-
-        checkIfDirectory(aSchemas[j],*this);
-        ++nExistingSchemaLocations;
-    }
-    if (0 == nExistingSchemaLocations)
-    {
-        rtl::OUString sMsg = rtl::OUString::createFromAscii("LocalBackend: No schema directories found");
-        throw backend::BackendSetupException(sMsg,*this, uno::Any()) ;
-    }
-    mSchemaDataUrls.realloc(nSchemaLocations);
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL 
-    LocalSchemaSupplier::getSchemaVersion(const rtl::OUString& /*aComponent*/) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                uno::RuntimeException)
-{
-    // TODO: Add support for repository-specific versions
-    return mSchemaVersion;
-}
-//------------------------------------------------------------------------------
-static const rtl::OUString kSchemaSuffix(RTL_CONSTASCII_USTRINGPARAM(".xcs")) ;
-static const rtl::OUString kXMLSchemaParser(RTL_CONSTASCII_USTRINGPARAM(
-            "com.sun.star.configuration.backend.xml.SchemaParser")) ;
-
-uno::Reference<backend::XSchema> SAL_CALL 
-    LocalSchemaSupplier::getComponentSchema(const rtl::OUString& aComponent) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                uno::RuntimeException)
-{
-    rtl::OUString subPath = componentToPath(aComponent) ;
-
-    osl::File * schemaFile = NULL;
-    rtl::OUString errorMessage;
-    bool bInsufficientAccess = false;
-    for (sal_Int32 ix = 0; ix < mSchemaDataUrls.getLength(); ++ix)
-    {
-        rtl::OUStringBuffer schemaUrl(mSchemaDataUrls[ix]) ;
-
-        schemaUrl.append(subPath).append(kSchemaSuffix) ;
-
-        rtl::OUString const aFileUrl = schemaUrl.makeStringAndClear();
-
-        std::auto_ptr<osl::File> checkFile( new osl::File(aFileUrl) );
-        osl::File::RC rc = checkFile->open(OpenFlag_Read) ;
-
-        if (rc == osl::File::E_None)
-        {
-            schemaFile = checkFile.release();
-            break;
-        }
-        else if (rc != osl::File::E_NOENT)
-        {
-            if (rc == osl::File::E_ACCES)
-                bInsufficientAccess =true;
-
-            // accumulate error messages
-            rtl::OUStringBuffer sMsg(errorMessage);
-            if (errorMessage.getLength())
-                sMsg.appendAscii("LocalFile SchemaSupplier - Error accessing schema: ");
-
-            sMsg.appendAscii("\n- Cannot open input file \"");
-            sMsg.append(aFileUrl);
-            sMsg.appendAscii("\" : ");
-            sMsg.append(FileHelper::createOSLErrorString(rc));
-            
-            errorMessage = sMsg.makeStringAndClear();
-        }
-    }
-
-    if (NULL == schemaFile)
-    {
-        if (errorMessage.getLength() != 0)
-        {
-            // a real error occured
-            io::IOException ioe(errorMessage,*this);
-
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii("LocalFileLayer - Cannot readData: ").append(errorMessage);
-        
-            if (bInsufficientAccess)
-                throw backend::InsufficientAccessRightsException(sMsg.makeStringAndClear(),*this,uno::makeAny(ioe));
-            else
-                throw backend::BackendAccessException(sMsg.makeStringAndClear(),*this,uno::makeAny(ioe));
-        }
-        // simply not found
-        return NULL;
-    }
-
-    uno::Sequence<uno::Any> arguments(1) ;
-    uno::Reference<io::XInputStream> stream( new OSLInputStreamWrapper(schemaFile, true) );
-
-    arguments [0] <<= stream ;
-    uno::Reference<backend::XSchema> schema(
-            mFactory->createInstanceWithArguments(kXMLSchemaParser, arguments),
-            uno::UNO_QUERY) ;
-
-    if (!schema.is()) 
-    {
-        throw uno::RuntimeException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "Cannot instantiate Schema Parser for ")) + aComponent, 
-                *this) ;
-    }
-    return schema ;
-}
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-
-static const sal_Char * const kImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalSchemaSupplier" ;
-static const sal_Char * const kSchemaService = 
-                "com.sun.star.configuration.backend.SchemaSupplier" ;
-static const sal_Char * const kLocalService = 
-                "com.sun.star.configuration.backend.LocalSchemaSupplier" ;
-
-static sal_Char const * kServiceNames [] = {kLocalService, 0, kSchemaService, 0 } ;
-static const ServiceImplementationInfo kServiceInfo = { kImplementation, kServiceNames,kServiceNames+2 } ;
-
-const ServiceRegistrationInfo *getLocalSchemaSupplierServiceInfo() 
-{ return getRegistrationInfo(&kServiceInfo) ; }
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalSchemaSupplier(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalSchemaSupplier(xContext) ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalSchemaSupplier::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&kServiceInfo).getImplementationName() ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalSchemaSupplier::supportsService(
-                                        const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException) 
-{
-    return  ServiceInfoHelper(&kServiceInfo).supportsService(aServiceName);
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> 
-SAL_CALL LocalSchemaSupplier::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&kServiceInfo).getSupportedServiceNames() ;
-}
-
-// ---------------------------------------------------------------------------------------
-
-} } // configmgr.localbe
diff --git a/configmgr/source/localbe/localschemasupplier.hxx b/configmgr/source/localbe/localschemasupplier.hxx
deleted file mode 100644
index 2025c1c3d6..0000000000
--- a/configmgr/source/localbe/localschemasupplier.hxx
+++ /dev/null
@@ -1,118 +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: localschemasupplier.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 CONFIGMGR_LOCALBE_LOCALSCHEMASUPPLIER_HXX_
-#define CONFIGMGR_LOCALBE_LOCALSCHEMASUPPLIER_HXX_
-
-#include <com/sun/star/configuration/backend/XVersionedSchemaSupplier.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <cppuhelper/compbase3.hxx>
-
-namespace configmgr { namespace localbe {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-/**
-  Implements the SchemaSupplier service for local schema file access.
-  */
-class LocalSchemaSupplier : public cppu::WeakComponentImplHelper3<backend::XVersionedSchemaSupplier, lang::XInitialization, lang::XServiceInfo> {
-    public :
-        /**
-          Service constructor from a service factory.
-
-          @param xConxtext   Component Context
-          */
-        LocalSchemaSupplier(const uno::Reference<uno::XComponentContext>& xContext) ;
-
-        /** Destructor */
-        ~LocalSchemaSupplier(void) ;
-
-
-        // XInitialize
-        virtual void SAL_CALL 
-            initialize( const uno::Sequence<uno::Any>& aParameters) 
-                throw (uno::RuntimeException, uno::Exception,
-                       css::configuration::InvalidBootstrapFileException,
-                       backend::CannotConnectException,
-                       backend::BackendSetupException);
-
-        // XVersionedSchemaSupplier
-        virtual rtl::OUString SAL_CALL 
-            getSchemaVersion( const rtl::OUString& aComponent )
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        // XSchemaSupplier
-        virtual uno::Reference<backend::XSchema> SAL_CALL 
-            getComponentSchema( const rtl::OUString& aComponent )
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-       // XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw (uno::RuntimeException) ;
-        
-        virtual sal_Bool SAL_CALL 
-            supportsService( const rtl::OUString& aServiceName ) 
-                throw (uno::RuntimeException) ;
-
-        virtual uno::Sequence<rtl::OUString> SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw (uno::RuntimeException) ;
-
-    private :
-        /** Service factory */
-        uno::Reference<lang::XMultiServiceFactory> mFactory ;
-        /** Mutex for resources protection */
-        osl::Mutex mMutex ;
-        /** 
-          Base of the schema data. Is a list to allow
-          for multiple schema directories.
-          */
-        uno::Sequence<rtl::OUString> mSchemaDataUrls ;
-        /** Version of the schema repository */
-        // TODO: Add support for repository-specific versions
-        rtl::OUString mSchemaVersion;  
-} ;
-
-} } // configmgr.localschemasupplirt
-
-#endif // CONFIGMGR_LOCALBE_LOCALSCHEMASUPPLIER_HXX_
diff --git a/configmgr/source/localbe/localsinglebackend.cxx b/configmgr/source/localbe/localsinglebackend.cxx
deleted file mode 100644
index ca424fce8d..0000000000
--- a/configmgr/source/localbe/localsinglebackend.cxx
+++ /dev/null
@@ -1,801 +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: localsinglebackend.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_configmgr.hxx"
-
-#include "localsinglebackend.hxx"
-#include "localfilehelper.hxx"
-#include "localfilelayer.hxx"
-#include "oslstream.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif // CONFIGMGR_API_FACTORY_HXX_
-#include "serviceinfohelper.hxx"
-#include "bootstrap.hxx"
-#include "filehelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <memory>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-LocalSingleBackend::LocalSingleBackend(
-        const uno::Reference<uno::XComponentContext>& xContext) 
-        : cppu::WeakComponentImplHelper5<backend::XSchemaSupplier, backend::XMultiLayerStratum, backend::XBackendEntities, lang::XInitialization, lang::XServiceInfo>(mMutex), mFactory(xContext->getServiceManager(),uno::UNO_QUERY) {
-}
-//------------------------------------------------------------------------------
-
-LocalSingleBackend::~LocalSingleBackend(void) {}
-//------------------------------------------------------------------------------
-static const rtl::OUString kSchemaDataUrl(
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"SchemaDataUrl")) ;
-static const rtl::OUString kDefaultDataUrl(
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"DefaultLayerUrls")) ;
-static const rtl::OUString kUserDataUrl( 
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"UserLayerUrl")) ;
-static const rtl::OUString kEntity(
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_PREFIX_"EntityLayer")) ;
-
-static const rtl::OUString kAdminModeFlag(
-        RTL_CONSTASCII_USTRINGPARAM(CONTEXT_ITEM_ADMINFLAG)) ;
-
-void SAL_CALL LocalSingleBackend::initialize(
-        const uno::Sequence<uno::Any>& aParameters) 
-    throw (uno::RuntimeException, uno::Exception,
-           css::configuration::InvalidBootstrapFileException,
-           backend::CannotConnectException,
-           backend::BackendSetupException)
-{
-    if (aParameters.getLength() == 0) {
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "No parameters provided to SingleBackend")),
-                *this, 0) ;
-    }
-    uno::Reference<uno::XComponentContext> context ;
-
-    for (sal_Int32 i = 0 ; i < aParameters.getLength() ; ++ i) {
-        if (aParameters [i] >>= context) { break ; }
-    }
-
-    // Setting: schema diretory(ies)
-    uno::Any const aSchemaDataSetting = context->getValueByName(kSchemaDataUrl);
-    uno::Sequence< rtl::OUString > aSchemas;
-    rtl::OUString schemas;
-
-    if (aSchemaDataSetting >>= schemas) 
-    {
-        fillFromBlankSeparated(schemas, aSchemas) ;
-    }
-    else 
-    {
-        aSchemaDataSetting >>=  aSchemas;
-    }
-    //validate SchemaDataUrls
-    mSchemaDataUrls.realloc(aSchemas.getLength());
-
-    sal_Int32 nSchemaLocations = 0;
-    sal_Int32 nExistingSchemaLocations = 0;
-    for (sal_Int32 j = 0; j < aSchemas.getLength(); ++j)
-    {
-        bool bOptional = checkOptionalArg(aSchemas[j]);
-
-        if (!bOptional)
-            validateFileURL(aSchemas[j],*this);
-
-        else if (!isValidFileURL(aSchemas[j]))
-            continue;
-        
-        OSL_ASSERT(isValidFileURL(aSchemas[j]));
-
-        //NormalizeURL
-        implEnsureAbsoluteURL(aSchemas[j]);
-        if (!normalizeURL(aSchemas[j],*this,bOptional))
-            continue;
-
-        // now we have a correct file URL, which we will use
-        mSchemaDataUrls[nSchemaLocations++] = aSchemas[j];
-        
-        // check existence
-        if (!bOptional)
-            checkFileExists(aSchemas[j], *this);
-
-        else if(!FileHelper::fileExists(aSchemas[j]))
-            continue; // skip the directory check
-
-
-        checkIfDirectory(aSchemas[j],*this);
-
-        ++nExistingSchemaLocations;
-    }
-    mSchemaDataUrls.realloc(nSchemaLocations);
-    
-    if (0 == nExistingSchemaLocations)
-    {
-        rtl::OUString sMsg = rtl::OUString::createFromAscii("LocalBackend: No schema directories found");
-        throw backend::BackendSetupException(sMsg,*this, uno::Any()) ;
-    }
-
-    // Setting: default layer(s)
-    uno::Any const aDefaultDataSetting = context->getValueByName(kDefaultDataUrl);
-    uno::Sequence< rtl::OUString > aDefaults;
-    rtl::OUString defaults;
-
-    if (aDefaultDataSetting >>= defaults) 
-    {
-        fillFromBlankSeparated(defaults, aDefaults) ;
-    }
-    else 
-    {
-        aDefaultDataSetting >>= aDefaults ;
-    }
-    
-    //validate DefaultDataUrls
-    mDefaultDataUrls.realloc(aDefaults.getLength());
-    sal_Int32 nDefaultLayers = 0;
-    
-    for (sal_Int32 ix = 0; ix < aDefaults.getLength(); ++ix)
-    {
-        // skip invalid URLs
-        if (!isValidFileURL(aDefaults[ix]))
-            continue;
-        
-        //NormalizeURL
-        implEnsureAbsoluteURL(aDefaults[ix]);
-        if (!normalizeURL(aDefaults[ix],*this,true))
-            continue;
-        
-        if(FileHelper::fileExists(aDefaults[ix]))
-        {
-            checkIfDirectory(aDefaults[ix],*this);   
-        }
-
-        // good URL -> use it
-        mDefaultDataUrls[nDefaultLayers++] = aDefaults[ix];
-    }
-    mDefaultDataUrls.realloc(nDefaultLayers);
-
-    // Setting: admin mode tag
-    sal_Bool bAdminMode = false;
-    context->getValueByName(kAdminModeFlag) >>= bAdminMode;
-
-    if (bAdminMode)
-    {
-        // find given entity
-        if ( (context->getValueByName(kEntity) >>= mUserDataUrl) && mUserDataUrl.getLength() )
-        {
-            //Validate UserDataUrl
-            validateFileURL(mUserDataUrl,*this);
-            //NormalizeURL
-            implEnsureAbsoluteURL(mUserDataUrl);
-            normalizeURL(mUserDataUrl,*this);
-            if(FileHelper::fileExists(mUserDataUrl))
-            {
-                checkIfDirectory(mUserDataUrl,*this);   
-            }
-
-            for (sal_Int32 ix = 0; ix < mDefaultDataUrls.getLength(); ++ix)
-            {
-                if (mDefaultDataUrls.getConstArray()[ix].equals(mUserDataUrl)) 
-                {
-                    mDefaultDataUrls.realloc(ix);
-                    // this is the last round through the loop
-                }
-            }
-        }
-        else if (aDefaults.getLength()) // administrate first default layer
-        {
-            mUserDataUrl = aDefaults[0];
-            mDefaultDataUrls.realloc(0);
-        }
-        else
-        {
-            OSL_ENSURE(false, "Cannot find target entity for admin mode - fallback to local mode");
-            bAdminMode = false;
-        }
-    }
-
-    if (!bAdminMode)
-    {
-        context->getValueByName(kUserDataUrl) >>= mUserDataUrl ;
-        //Validate UserDataUrl
-        if (isValidFileURL(mUserDataUrl))
-        {
-            implEnsureAbsoluteURL(mUserDataUrl);
-            normalizeURL(mUserDataUrl,*this);
-            if(FileHelper::fileExists(mUserDataUrl))
-            {
-                checkIfDirectory(mUserDataUrl,*this);   
-            }
-        }
-    } 
-
-    if (mUserDataUrl.getLength() == 0)
-    {
-        mUserDataUrl = rtl::OUString::createFromAscii("*");
-        OSL_ASSERT(!isValidFileURL(mUserDataUrl));
-    }
-}
-//------------------------------------------------------------------------------
-const sal_Int32 k_UserLayerEntity = 0;
-const sal_Int32 k_InvalidEntity         = k_UserLayerEntity - 1;
-const sal_Int32 k_DefaultEntityOffset   = k_UserLayerEntity + 1;
-//------------------------------------------------------------------------------
-static inline bool isValidEntity(sal_Int32 ent)
-{
-    return ent > k_InvalidEntity;
-}
-//------------------------------------------------------------------------------
-static inline sal_Int32 indexToEntity(sal_Int32 ix)
-{
-    OSL_ASSERT(0 <= ix);
-    return ix + k_DefaultEntityOffset;
-}
-static inline sal_Int32 entityToIndex(sal_Int32 ent)
-{
-    OSL_ASSERT(k_DefaultEntityOffset <= ent);
-    return ent - k_DefaultEntityOffset;
-}
-//------------------------------------------------------------------------------
-
-
-/**
-  Transforms a file url into a layer id. The layer id will
-  contain the URL passed plus an integer indicating which
-  layer the URL points to. If the integer is 0, the URL
-  is a user layer, otherwise it is one of the default layers.
-
-  @param aFileUrl   URL to encode
-  @param aIndex     index of the layer concerned (0 = user, other = default)
-  @return   layer id
-  */
-static 
-rtl::OUString urlToLayerId(const rtl::OUString& aFileUrl,sal_Int32 aIndex) 
-{
-    rtl::OUStringBuffer id ;
-
-    OSL_ASSERT(isValidEntity(aIndex));
-    if (aIndex)
-        id.append(aIndex).appendAscii(" ",1);     // non-user layers
-    else
-        id.appendAscii("U ",2); // user layer
-
-    id.append(aFileUrl) ;
-    return id.makeStringAndClear() ;
-}
-
-static 
-inline 
-bool layerIdToUrl( const rtl::OUString& aLayerId,
-                    rtl::OUString& aFileUrl,
-                    sal_Int32& aIndex) 
-{
-    sal_Int32 const sep = aLayerId.indexOf(sal_Unicode(' ')) ;
-
-    if (sep < 0) return false;
-
-    // detect user layer id
-    if (aLayerId[0] == sal_Unicode('U'))
-    {
-        if (sep != 1) return false; 
-        aIndex   = 0;
-    }
-    else
-    {
-        aIndex   = aLayerId.copy(0, sep).toInt32() ;
-        if (0 == aIndex || !isValidEntity(aIndex)) return false;
-
-        OSL_ENSURE( aLayerId.copy(0, sep).equals(rtl::OUString::valueOf(aIndex)),
-                    "Invalid layer id was not detected");
-    }
-    aFileUrl = aLayerId.copy(sep + 1);
-
-    return true;
-}
-//------------------------------------------------------------------------------
-sal_Int32 LocalSingleBackend::resolveLayerId(const rtl::OUString& aLayerId,
-                                                  rtl::OUString& aFileUrl) 
-{
-    sal_Int32 nIndex = k_InvalidEntity;
-    if (!layerIdToUrl(aLayerId,aFileUrl,nIndex))
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid layer id: "));
-
-        // layer id is always the second parameter
-        throw lang::IllegalArgumentException(sMsg.concat(aLayerId), *this, 2);
-    }
-    OSL_ASSERT(isValidEntity(nIndex));
-    return nIndex;
-}
-//------------------------------------------------------------------------------
-
-sal_Int32 LocalSingleBackend::findEntity(const rtl::OUString& aEntity) 
-{
-    if (aEntity.getLength() == 0) 
-    {
-        return k_InvalidEntity;
-    }
-
-    // quick check for OwnerEntity first
-    if (aEntity.equals(mUserDataUrl))
-    {
-        return k_UserLayerEntity;
-    }
-
-    rtl::OUString sNormalizedEntityUrl(aEntity);
-    normalizeURL(sNormalizedEntityUrl,*this);
-
-    for (sal_Int32 ix = 0; ix < mDefaultDataUrls.getLength(); ++ix)
-    {    
-        rtl::OUString sNormalizedDefaultUrl(mDefaultDataUrls[ix]);
-        OSL_VERIFY(normalizeURL(sNormalizedDefaultUrl,*this,true));
-
-        if (sNormalizedEntityUrl.equals(sNormalizedDefaultUrl))
-        {
-            // found it
-            return indexToEntity(ix);
-        }
-    }
-
-    //Try normalized version of mUserDataUrl
-    rtl::OUString sNormalizedUserUrl(mUserDataUrl);
-
-    if (normalizeURL(sNormalizedUserUrl,*this,true))
-    {
-        if (sNormalizedEntityUrl.equals(sNormalizedUserUrl))  
-        {
-            return k_UserLayerEntity;
-        }
-    }
-
-    // not found
-    return k_InvalidEntity;
-}
-//------------------------------------------------------------------------------
-
-static const rtl::OUString kDataSuffix(RTL_CONSTASCII_USTRINGPARAM(".xcu")) ;
-
-uno::Sequence<rtl::OUString> SAL_CALL LocalSingleBackend::listLayerIds(
-        const rtl::OUString& aComponent, const rtl::OUString& aEntity) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException,
-            uno::RuntimeException)
-{
-    sal_Int32 nEntity = findEntity(aEntity);
-    if ( !isValidEntity(nEntity) )
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Unknown entity: "));
-
-        throw lang::IllegalArgumentException(sMsg.concat(aEntity), *this, 2);
-    }
-
-    sal_Int32 nDefLayers = (k_UserLayerEntity == nEntity)
-                            ? mDefaultDataUrls.getLength()
-                            : entityToIndex(nEntity);
-
-    OSL_ASSERT(0 <= nDefLayers && nDefLayers <= mDefaultDataUrls.getLength());
-
-    rtl::OUString const componentSubPath = componentToPath(aComponent) + kDataSuffix ;
-
-    uno::Sequence<rtl::OUString> aLayerIds(nDefLayers + 1) ;
-    OSL_ASSERT(0 < aLayerIds.getLength());
-
-    // First, the defaults...
-    for (sal_Int32 ix = 0; ix < nDefLayers ; ++ ix) 
-    {
-        aLayerIds[ix] = urlToLayerId(componentSubPath, indexToEntity(ix)) ;
-    }
-    // Then the entity data.
-    aLayerIds [nDefLayers] = urlToLayerId(componentSubPath, nEntity) ;
-
-    return  aLayerIds;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalSingleBackend::getUpdateLayerId(
-        const rtl::OUString& aComponent, const rtl::OUString& aEntity) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException,
-            uno::RuntimeException)
-{
-    sal_Int32 nEntity = findEntity(aEntity);
-    if ( !isValidEntity(nEntity) )
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Unknown entity for update: "));
-
-        throw lang::IllegalArgumentException(sMsg.concat(aEntity), *this, 2);
-    }
- 
-    return urlToLayerId(componentToPath(aComponent) + kDataSuffix, nEntity) ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalSingleBackend::getOwnerEntity() 
-    throw (uno::RuntimeException) 
-{
-    return mUserDataUrl ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalSingleBackend::getAdminEntity() 
-    throw (uno::RuntimeException) 
-{
-    return mDefaultDataUrls.getLength() > 0 ? mDefaultDataUrls[0] : mUserDataUrl;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalSingleBackend::supportsEntity( const rtl::OUString& aEntity )
-    throw (backend::BackendAccessException, uno::RuntimeException) 
-{
-    return isValidEntity(findEntity(aEntity)) ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalSingleBackend::isEqualEntity(const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException)
-{
-    if (aEntity.getLength() == 0)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid empty entity."));
-
-        throw lang::IllegalArgumentException(sMsg, *this, 1);
-    }
-    if (aOtherEntity.getLength() == 0)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid empty entity."));
-
-        throw lang::IllegalArgumentException(sMsg, *this, 2);
-    }
-    rtl::OUString aNormalizedEntity(aEntity);
-    normalizeURL(aNormalizedEntity,*this);
-
-    rtl::OUString aNormalizedOther(aOtherEntity);
-    normalizeURL(aNormalizedOther,*this);
-
-    return aNormalizedEntity == aNormalizedOther;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool LocalSingleBackend::isMoreRecent(const rtl::OUString& aFileUrl, 
-                                          sal_Int32 aLayerIndex,
-                                          const rtl::OUString& aTimestamp) {
-    rtl::OUString layerUrl ;
-    rtl::OUString subLayerUrl ;
-
-    // if we don't find a layer, but have a non-empty timestamp -> modified
-    if (!getLayerDirectories(aLayerIndex,layerUrl, subLayerUrl))
-        return aTimestamp.getLength() != 0;
-
-    return layerUrl.getLength() == 0 ||
-        BasicLocalFileLayer::getTimestamp(layerUrl + aFileUrl).compareTo( aTimestamp) != 0;
-}
-//------------------------------------------------------------------------------
-
-static const rtl::OUString kDataSubPath(
-                                        RTL_CONSTASCII_USTRINGPARAM("/data")) ;
-static const rtl::OUString kLocalisedDataSubPath(
-                                        RTL_CONSTASCII_USTRINGPARAM("/res")) ;
-
-uno::Reference<backend::XLayer> SAL_CALL LocalSingleBackend::getLayer(
-        const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException,
-            uno::RuntimeException)
-{
-    rtl::OUString fileUrl ;
-
-    sal_Int32 defaultIndex = resolveLayerId(aLayerId, fileUrl) ;
-
-    if (!isMoreRecent(fileUrl, defaultIndex, aTimestamp)) { return NULL ; }
-
-    uno::Reference<backend::XUpdatableLayer> xLayer = getFileLayer(fileUrl,defaultIndex);
-    uno::Reference<backend::XLayer> xResult = xLayer.get();
-    return xResult;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backend::XLayer> > SAL_CALL
-LocalSingleBackend::getLayers(const uno::Sequence<rtl::OUString>& aLayerIds,
-                              const rtl::OUString& aTimestamp) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException,
-            uno::RuntimeException)
-{
-    uno::Sequence<uno::Reference<backend::XLayer> > 
-                                                retCode(aLayerIds.getLength()) ;
-
-    for (sal_Int32 i = 0 ; i < aLayerIds.getLength() ; ++ i) {
-        retCode [i] = getLayer(aLayerIds [i], aTimestamp) ;
-    }
-    return retCode ;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backend::XLayer> > SAL_CALL
-LocalSingleBackend::getMultipleLayers(
-                        const uno::Sequence<rtl::OUString>& aLayerIds,
-                        const uno::Sequence<rtl::OUString>& aTimestamps) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException,
-            uno::RuntimeException)
-{
-    if (aLayerIds.getLength() != aTimestamps.getLength()) {
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "Not enough or too many timestamps")),
-                *this, 0) ;
-    }
-    uno::Sequence<uno::Reference<backend::XLayer> > 
-                                                retCode(aLayerIds.getLength()) ;
-    
-    for (sal_Int32 i = 0 ; i < aLayerIds.getLength() ; ++ i) {
-        retCode [i] = getLayer(aLayerIds [i], aTimestamps [i]) ;
-    }
-    return retCode ;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-LocalSingleBackend::getUpdatableLayer(const rtl::OUString& aLayerId) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException,
-            uno::RuntimeException)
-{
-    return getFileLayer(aLayerId) ;
-}
-//------------------------------------------------------------------------------
-
-static const rtl::OUString kSchemaSuffix(RTL_CONSTASCII_USTRINGPARAM(".xcs")) ;
-static const rtl::OUString kXMLSchemaParser(RTL_CONSTASCII_USTRINGPARAM(
-            "com.sun.star.configuration.backend.xml.SchemaParser")) ;
-
-uno::Reference<backend::XSchema> SAL_CALL 
-    LocalSingleBackend::getComponentSchema(const rtl::OUString& aComponent) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                uno::RuntimeException)
-{
-    rtl::OUString subPath = componentToPath(aComponent) ;
-
-    osl::File * schemaFile = NULL;
-    rtl::OUString errorMessage;
-    bool bInsufficientAccess = false;
-    for (sal_Int32 ix = 0; ix < mSchemaDataUrls.getLength(); ++ix)
-    {
-        rtl::OUStringBuffer schemaUrl(mSchemaDataUrls[ix]) ;
-
-        schemaUrl.append(subPath).append(kSchemaSuffix) ;
-
-        rtl::OUString const aFileUrl = schemaUrl.makeStringAndClear();
-
-        std::auto_ptr<osl::File> checkFile( new osl::File(aFileUrl) );
-        osl::File::RC rc = checkFile->open(OpenFlag_Read) ;
-
-        if (rc == osl::File::E_None)
-        {
-            schemaFile = checkFile.release();
-            break;
-        }
-        else if (rc != osl::File::E_NOENT)
-        {
-            if (rc == osl::File::E_ACCES)
-                bInsufficientAccess =true;
-
-            // accumulate error messages
-            rtl::OUStringBuffer sMsg(errorMessage);
-            if (errorMessage.getLength())
-                sMsg.appendAscii("LocalFile SchemaSupplier - Error accessing schema: ");
-
-            sMsg.appendAscii("\n- Cannot open input file \"");
-            sMsg.append(aFileUrl);
-            sMsg.appendAscii("\" : ");
-            sMsg.append(FileHelper::createOSLErrorString(rc));
-            
-            errorMessage = sMsg.makeStringAndClear();
-        }
-    }
-
-    if (NULL == schemaFile)
-    {
-        if (errorMessage.getLength() != 0)
-        {
-            // a real error occured
-            io::IOException ioe(errorMessage,*this);
-
-            rtl::OUStringBuffer sMsg;
-            sMsg.appendAscii("LocalFileLayer - Cannot readData: ").append(errorMessage);
-        
-            if (bInsufficientAccess)
-                throw backend::InsufficientAccessRightsException(sMsg.makeStringAndClear(),*this,uno::makeAny(ioe));
-            else
-                throw backend::BackendAccessException(sMsg.makeStringAndClear(),*this,uno::makeAny(ioe));
-        }
-        // simply not found
-        return NULL;
-    }
-
-    uno::Sequence<uno::Any> arguments(1) ;
-    uno::Reference<io::XInputStream> stream( new OSLInputStreamWrapper(schemaFile, true) );
-
-    arguments [0] <<= stream ;
-    uno::Reference<backend::XSchema> schema(
-            mFactory->createInstanceWithArguments(kXMLSchemaParser, arguments),
-            uno::UNO_QUERY) ;
-
-    if (!schema.is()) 
-    {
-        throw uno::RuntimeException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "Cannot instantiate Schema Parser for ")) + aComponent, 
-                *this) ;
-    }
-    return schema ;
-}
-//------------------------------------------------------------------------------
-
-static
-inline
-bool impl_getLayerSubDirectories(rtl::OUString const & aLayerBaseUrl,
-                             rtl::OUString& aMainLayerUrl,
-                             rtl::OUString& aSubLayerUrl) 
-{
-    if (!isValidFileURL(aLayerBaseUrl)) return false;
-    
-    aMainLayerUrl   = aLayerBaseUrl + kDataSubPath ;
-    aSubLayerUrl    = aLayerBaseUrl + kLocalisedDataSubPath ;
-    return true;
-}
-//------------------------------------------------------------------------------
-
-bool LocalSingleBackend::getLayerSubDirectories(rtl::OUString const & aLayerBaseUrl,
-                             rtl::OUString& aMainLayerUrl,
-                             rtl::OUString& aSubLayerUrl) 
-{
-    return impl_getLayerSubDirectories(aLayerBaseUrl,aMainLayerUrl,aSubLayerUrl);
-}
-//------------------------------------------------------------------------------
-
-bool LocalSingleBackend::getLayerDirectories(sal_Int32 aLayerIndex,
-                                             rtl::OUString& aLayerUrl,
-                                             rtl::OUString& aSubLayerUrl) 
-{
-    OSL_ASSERT(isValidEntity(aLayerIndex));
-    rtl::OUString aLayerBaseUrl = (aLayerIndex == k_UserLayerEntity) ? mUserDataUrl : mDefaultDataUrls [entityToIndex(aLayerIndex)] ;
-
-    return impl_getLayerSubDirectories(aLayerBaseUrl,aLayerUrl,aSubLayerUrl);
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XLayer> LocalSingleBackend::createSimpleLayer(
-                                                  const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-                                                  rtl::OUString const & aComponentUrl)
-{
-    SimpleLocalFileLayer * pLayer = new SimpleLocalFileLayer(xFactory, aComponentUrl);
-    return pLayer;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XLayer> LocalSingleBackend::createSimpleLayer(
-                                                  const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-                                                  rtl::OUString const & aLayerBaseUrl,
-                                                  rtl::OUString const & aComponent)
-{
-    rtl::OUString aLayerUrl, aSubLayerUrl;
-    if (!impl_getLayerSubDirectories(aLayerBaseUrl,aLayerUrl,aSubLayerUrl))
-        return NULL;
-
-    SimpleLocalFileLayer * pLayer = new SimpleLocalFileLayer(xFactory, aLayerUrl, componentToPath(aComponent) + kDataSuffix);
-    return pLayer;
-}
-//------------------------------------------------------------------------------
-
-
-uno::Reference<backend::XUpdatableLayer> LocalSingleBackend::getFileLayer(const rtl::OUString& aLayerId)
-    throw (lang::IllegalArgumentException) 
-{
-    rtl::OUString fileUrl ;
-    sal_Int32 defaultIndex = resolveLayerId(aLayerId, fileUrl) ;
-
-    return getFileLayer(fileUrl, defaultIndex) ;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XUpdatableLayer> LocalSingleBackend::getFileLayer(
-                    const rtl::OUString& aComponent, sal_Int32 aLayerIndex) {
-    rtl::OUString layerPath ;
-    rtl::OUString subLayerPath ;
-
-    if (!getLayerDirectories(aLayerIndex, layerPath, subLayerPath))
-    {
-        OSL_ENSURE(aLayerIndex == k_UserLayerEntity, "Unexpected: Invalid non-user layer url");
-        
-        rtl::OUStringBuffer sMsg;
-        sMsg.appendAscii("LocalSingleBackend: Cannot create file layer - Layer URL '");
-        sMsg.append(mUserDataUrl).appendAscii("' is invalid.");
-        
-        throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),*this,1);
-    }
-
-    return createUpdatableLocalFileLayer(mFactory, layerPath, aComponent, subLayerPath) ;
-}
-//------------------------------------------------------------------------------
-
-static const sal_Char * const kImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalSingleBackend" ;
-static const sal_Char * const kBackendService = 
-                "com.sun.star.configuration.backend.SingleBackend" ;
-static const sal_Char * const kLocalService = 
-                "com.sun.star.configuration.backend.LocalSingleBackend" ;
-
-static sal_Char const * kServiceNames [] = { kLocalService, 0, kBackendService, 0 } ;
-static const ServiceImplementationInfo kServiceInfo = { kImplementation, kServiceNames, kServiceNames + 2 } ;
-
-const ServiceRegistrationInfo *getLocalBackendServiceInfo() 
-{ return getRegistrationInfo(&kServiceInfo) ; }
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalBackend(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalSingleBackend(xContext) ;
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalSingleBackend::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&kServiceInfo).getImplementationName() ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalSingleBackend::supportsService(
-                                        const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException) 
-{
-    return  ServiceInfoHelper(&kServiceInfo).supportsService(aServiceName);
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> 
-SAL_CALL LocalSingleBackend::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&kServiceInfo).getSupportedServiceNames() ;
-}
-
-// ---------------------------------------------------------------------------------------
-
-} } // configmgr.localbe
diff --git a/configmgr/source/localbe/localsinglebackend.hxx b/configmgr/source/localbe/localsinglebackend.hxx
deleted file mode 100644
index f85ccf6007..0000000000
--- a/configmgr/source/localbe/localsinglebackend.hxx
+++ /dev/null
@@ -1,248 +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: localsinglebackend.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_LOCALBE_LOCALSINGLEBACKEND_HXX_
-#define CONFIGMGR_LOCALBE_LOCALSINGLEBACKEND_HXX_
-
-#include <com/sun/star/configuration/backend/XSchemaSupplier.hpp>
-#include <com/sun/star/configuration/backend/XMultiLayerStratum.hpp>
-#include <com/sun/star/configuration/backend/XBackendEntities.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <cppuhelper/compbase5.hxx>
-
-namespace configmgr { namespace localbe {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-/**
-  Implements the SingleBackend service for local file access.
-  Layer identifiers in that backend are file URLs.
-  */
-class LocalSingleBackend : public cppu::WeakComponentImplHelper5<backend::XSchemaSupplier, backend::XMultiLayerStratum, backend::XBackendEntities, lang::XInitialization, lang::XServiceInfo> {
-    public :
-        /**
-          Service constructor from a service factory.
-
-          @param xFactory   service factory
-          */
-        LocalSingleBackend(const uno::Reference<uno::XComponentContext>& xContext) ;
-
-        /** Destructor */
-        ~LocalSingleBackend(void) ;
-
-
-        // XInitialize
-        virtual void SAL_CALL 
-            initialize( const uno::Sequence<uno::Any>& aParameters) 
-                throw (uno::RuntimeException, uno::Exception,
-                       css::configuration::InvalidBootstrapFileException,
-                       backend::CannotConnectException,
-                       backend::BackendSetupException);
-
-        // XSchemaSupplier
-        virtual uno::Reference<backend::XSchema> SAL_CALL 
-            getComponentSchema( const rtl::OUString& aComponent )
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        // XMultiLayerStratum
-        virtual uno::Sequence<rtl::OUString> SAL_CALL 
-            listLayerIds( const rtl::OUString& aComponent, const rtl::OUString& aEntity )
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        virtual rtl::OUString SAL_CALL 
-            getUpdateLayerId( const rtl::OUString& aComponent, const rtl::OUString& aEntity )
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        virtual uno::Reference<backend::XLayer> SAL_CALL 
-            getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        virtual uno::Sequence<uno::Reference<backend::XLayer> > SAL_CALL
-            getLayers(const uno::Sequence<rtl::OUString>& aLayerIds,
-                      const rtl::OUString& aTimestamp)
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        virtual uno::Sequence<uno::Reference<backend::XLayer> > SAL_CALL
-            getMultipleLayers(const uno::Sequence<rtl::OUString>& aLayerIds,
-                              const uno::Sequence<rtl::OUString>& aTimestamps)
-                throw (backend::BackendAccessException,
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-            getUpdatableLayer( const rtl::OUString& aLayerId ) 
-                throw (backend::BackendAccessException, 
-                        lang::IllegalArgumentException,
-                        uno::RuntimeException) ;
-
-        // XBackendEntities
-        virtual rtl::OUString SAL_CALL 
-            getOwnerEntity(  ) 
-                throw (uno::RuntimeException);
-
-        virtual rtl::OUString SAL_CALL 
-            getAdminEntity(  ) 
-                throw (uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL
-            supportsEntity( const rtl::OUString& aEntity ) 
-                throw (backend::BackendAccessException, uno::RuntimeException);
-        
-        virtual sal_Bool SAL_CALL 
-            isEqualEntity( const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity ) 
-                throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-        
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw (uno::RuntimeException) ;
-        
-        virtual sal_Bool SAL_CALL 
-            supportsService( const rtl::OUString& aServiceName ) 
-                throw (uno::RuntimeException) ;
-
-        virtual uno::Sequence<rtl::OUString> SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw (uno::RuntimeException) ;
-
-    public: // helpers for other implementation that need to use the same data
-        /**
-          Locates the main layer data and localized data directories in a layer directory hierarchy
-          */
-        static bool getLayerSubDirectories( rtl::OUString const & aLayerBaseUrl,
-                                             rtl::OUString& aMainLayerUrl,
-                                             rtl::OUString& aSubLayerUrl);
-        /**
-          Creates a simple readonly non-composite layer for a component in a base directory
-          */
-        static uno::Reference<backend::XLayer> 
-            createSimpleLayer(const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-                              rtl::OUString const & aLayerBaseUrl,
-                              rtl::OUString const & aComponent);
-
-        /**
-          Creates a simple readonly non-composite layer for a component in a given file
-          */
-        static uno::Reference<backend::XLayer> 
-            createSimpleLayer(const uno::Reference<lang::XMultiServiceFactory>& xFactory,
-                              rtl::OUString const & aComponentUrl);
-    private :
-        /** Service factory */
-        uno::Reference<lang::XMultiServiceFactory> mFactory ;
-        /** Mutex for resources protection */
-        osl::Mutex mMutex ;
-        /** 
-          Base of the schema data. Is a list to allow
-          for multiple schema directories.
-          */
-        uno::Sequence<rtl::OUString> mSchemaDataUrls ;
-        /** 
-          Base of the default data. Is a list to allow
-          for multiple layers of default data.
-          */
-        uno::Sequence<rtl::OUString> mDefaultDataUrls ;
-        /** Base of the user data */
-        rtl::OUString mUserDataUrl ;
-
-        /** special index for entity */
-        sal_Int32 findEntity(rtl::OUString const & _aEntity);
-        /** parse and translate layer-id */
-        sal_Int32 resolveLayerId(rtl::OUString const & _aLayerId, rtl::OUString & _aFile);
-
-        /**
-          Builds a LocalFileLayer object given a layer id.
-          Since the LocalFileLayer implements the various
-          interfaces a layer can be accessed as, a few methods 
-          need one. This method handles the layer id mapping
-          and the existence or not of sublayers.
-
-          @param aLayerId   layer id
-          @return   local file layer
-          @throws com::sun::star::lang::IllegalArgumentException
-                  if the layer id is invalid.
-          */
-        uno::Reference<backend::XUpdatableLayer> getFileLayer(const rtl::OUString& aLayerId) 
-            throw (lang::IllegalArgumentException) ;
-        /**
-          Same as above, but using a component URL and layer index
-          combination instead of a layer id (which encodes both).
-
-          @param aComponent     component URL
-          @param aLayerIndex    layer index
-          @return   local file layer
-          */
-        uno::Reference<backend::XUpdatableLayer> getFileLayer(const rtl::OUString& aComponent,
-                                                                sal_Int32 aLayerIndex) ;
-        /**
-          Maps a layer index (-1 for user layer, 0-x for defaults)
-          to the appropriate layer and sublayers base directories.
-
-          @param aLayerIndex    layer index
-          @param aLayerUrl      layer base URL, filled on return
-          @param aSubLayerUrl   sublayer base URL, filled on return
-          */
-        bool getLayerDirectories(sal_Int32 aLayerIndex, 
-                                 rtl::OUString& aLayerUrl,
-                                 rtl::OUString& aSubLayerUrl) ;
-        /**
-          Tells if a file is more recent than a given date.
-          The date is formatted YYYYMMDDhhmmssZ.
-
-          @param aComponent     URL of the component to check
-          @param aLayerIndex    index of the layer involved (-1 = user)
-          @param aTimestamp     timestamp to check against
-          @return   sal_True if the file is more recent, sal_False otherwise
-          */
-        sal_Bool isMoreRecent(const rtl::OUString& aComponent, 
-                              sal_Int32 aLayerId,
-                              const rtl::OUString& aTimestamp) ;
-    } ;
-
-} } // configmgr.localbe
-
-#endif // CONFIGMGR_LOCALBE_LOCALSINGLEBACKEND_HXX_
diff --git a/configmgr/source/localbe/localsinglestratum.cxx b/configmgr/source/localbe/localsinglestratum.cxx
deleted file mode 100644
index 08786e3391..0000000000
--- a/configmgr/source/localbe/localsinglestratum.cxx
+++ /dev/null
@@ -1,233 +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: localsinglestratum.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_configmgr.hxx"
-
-#include "localsinglestratum.hxx"
-#include "localfilehelper.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif // CONFIGMGR_API_FACTORY_HXX_
-#include "serviceinfohelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-static inline rtl::OUString getDataSubPath() 
-{ return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/data")); }
-
-static inline rtl::OUString getLocalisedDataSubPath() 
-{ return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/res")); }
-//------------------------------------------------------------------------------
-
-LocalSingleStratumBase::LocalSingleStratumBase(const uno::Reference<uno::XComponentContext>& xContext) 
-: cppu::ImplInheritanceHelper1< LocalStratumBase, backend::XSingleLayerStratum >(xContext)
-{
-}
-//------------------------------------------------------------------------------
-
-LocalSingleStratumBase::~LocalSingleStratumBase() {}
-
-//------------------------------------------------------------------------------
-uno::Reference<backend::XLayer> SAL_CALL 
-    LocalSingleStratumBase::getLayer( const rtl::OUString& aComponent, const rtl::OUString& aTimestamp )
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                uno::RuntimeException)
-{
-    return LocalStratumBase::getLayer(aComponent,aTimestamp);
-}
-//------------------------------------------------------------------------------
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-    LocalSingleStratumBase::getUpdatableLayer(const rtl::OUString& aComponent) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                lang::NoSupportException, uno::RuntimeException)
-{
-    if (aComponent.getLength() == 0){
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "LocalSingleStratum:getLayer - no component specified")),
-                *this, 0) ;
-    }
-    rtl::OUString const componentSubPath = componentToPath(aComponent) + getDataSuffix();
-    return createUpdatableFileLayer( componentSubPath) ;
-}
-//------------------------------------------------------------------------------
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-    LocalReadonlyStratum::getUpdatableLayer(const rtl::OUString& /*aComponent*/) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                lang::NoSupportException, uno::RuntimeException)
-{
-    failReadonly();
-    return 0;
-}
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-    LocalResourceStratum::getUpdatableLayer(const rtl::OUString& /*aComponent*/) 
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                lang::NoSupportException, uno::RuntimeException)
-{
-    failReadonly();
-    return 0;
-}
-//------------------------------------------------------------------------------
-static
-inline
-void impl_getLayerDataDirectory(rtl::OUString const & aLayerBaseUrl,
-                                 rtl::OUString& aMainLayerUrl)
-{
-    aMainLayerUrl   = aLayerBaseUrl + getDataSubPath() ;
-}
-//------------------------------------------------------------------------------
-static
-inline
-void impl_getLayerResDirectory(rtl::OUString const & aLayerBaseUrl,
-                                 rtl::OUString& aSubLayerUrl) 
-{
-    aSubLayerUrl    = aLayerBaseUrl + getLocalisedDataSubPath() ;
-}
-//------------------------------------------------------------------------------
-
-void LocalSingleStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
-                                             rtl::OUString& aSubLayerUrl) const 
-{
-    impl_getLayerDataDirectory(getBaseUrl(),aLayerUrl);
-    impl_getLayerResDirectory(getBaseUrl(),aSubLayerUrl);
-}
-//------------------------------------------------------------------------------
-
-void LocalDataStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
-                                             rtl::OUString& aSubLayerUrl) const 
-{
-    impl_getLayerDataDirectory(getBaseUrl(),aLayerUrl);
-    aSubLayerUrl = rtl::OUString();
-}
-//------------------------------------------------------------------------------
-
-void LocalReadonlyStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
-                                             rtl::OUString& aSubLayerUrl) const 
-{
-    impl_getLayerDataDirectory(getBaseUrl(),aLayerUrl);
-    aSubLayerUrl = rtl::OUString();
-}
-//------------------------------------------------------------------------------
-
-void LocalResourceStratum::adjustBaseURL(rtl::OUString& aBaseUrl)
-{
-    impl_getLayerResDirectory(aBaseUrl,aBaseUrl);
-}
-//------------------------------------------------------------------------------
-
-void LocalResourceStratum::getLayerDirectories(rtl::OUString& aLayerUrl,
-                                             rtl::OUString& aSubLayerUrl) const 
-{
-   aLayerUrl = rtl::OUString();
-   aSubLayerUrl = getBaseUrl();
-   // impl_getLayerResDirectory(getBaseUrl(),aSubLayerUrl);
-}
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-static const sal_Char * const kLegacyStratumImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalSingleStratum" ;
-static const sal_Char * const kDataStratumImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalStratum" ;
-static const sal_Char * const kReadonlyStratumImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalReadonlyStratum" ;
-static const sal_Char * const kResourceStratumImplementation = 
-                "com.sun.star.comp.configuration.backend.LocalResourceStratum" ;
-static const sal_Char * const kBackendService = 
-                "com.sun.star.configuration.backend.SingleStratum" ;
-static const sal_Char * const kLocalService = 
-                "com.sun.star.configuration.backend.LocalSingleStratum" ;
-
-static sal_Char const * kServiceNames [] = { kLocalService, 0, kBackendService, 0 } ;
-static const ServiceImplementationInfo kLegacyStratumServiceInfo   = { kLegacyStratumImplementation  , kServiceNames, kServiceNames + 2 } ;
-static const ServiceImplementationInfo kDataStratumServiceInfo     = { kDataStratumImplementation    , kServiceNames, kServiceNames + 2 } ;
-static const ServiceImplementationInfo kReadonlyStratumServiceInfo = { kReadonlyStratumImplementation, kServiceNames, kServiceNames + 2 } ;
-static const ServiceImplementationInfo kResourceStratumServiceInfo = { kResourceStratumImplementation, kServiceNames, kServiceNames + 2 } ;
-
-const ServiceRegistrationInfo *getLocalLegacyStratumServiceInfo() 
-{ return getRegistrationInfo(&kLegacyStratumServiceInfo) ; }
-
-const ServiceRegistrationInfo *getLocalDataStratumServiceInfo() 
-{ return getRegistrationInfo(&kDataStratumServiceInfo) ; }
-
-const ServiceRegistrationInfo *getLocalReadonlyStratumServiceInfo() 
-{ return getRegistrationInfo(&kReadonlyStratumServiceInfo) ; }
-
-const ServiceRegistrationInfo *getLocalResourceStratumServiceInfo() 
-{ return getRegistrationInfo(&kResourceStratumServiceInfo) ; }
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalLegacyStratum(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalSingleStratum(xContext) ;
-}
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalDataStratum(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalDataStratum(xContext) ;
-}
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalReadonlyStratum(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalReadonlyStratum(xContext) ;
-}
-
-uno::Reference<uno::XInterface> SAL_CALL 
-instantiateLocalResourceStratum(const uno::Reference< uno::XComponentContext >& xContext) {
-    return *new LocalResourceStratum(xContext) ;
-}
-//------------------------------------------------------------------------------
-
-const ServiceImplementationInfo * LocalSingleStratum::getServiceInfoData() const
-{
-    return &kLegacyStratumServiceInfo;
-}
-const ServiceImplementationInfo * LocalDataStratum::getServiceInfoData() const
-{
-    return &kDataStratumServiceInfo;
-}
-const ServiceImplementationInfo * LocalReadonlyStratum::getServiceInfoData() const
-{
-    return &kReadonlyStratumServiceInfo;
-}
-const ServiceImplementationInfo * LocalResourceStratum::getServiceInfoData() const
-{
-    return &kResourceStratumServiceInfo;
-}
-//------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
-
-} } // configmgr.localsinglestratum
diff --git a/configmgr/source/localbe/localsinglestratum.hxx b/configmgr/source/localbe/localsinglestratum.hxx
deleted file mode 100644
index 90285d42c5..0000000000
--- a/configmgr/source/localbe/localsinglestratum.hxx
+++ /dev/null
@@ -1,150 +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: localsinglestratum.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 CONFIGMGR_LOCALBE_LOCALSINGLESTRATUM_HXX_
-#define CONFIGMGR_LOCALBE_LOCALSINGLESTRATUM_HXX_
-
-#include "localstratumbase.hxx"
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-namespace configmgr 
-{ 
-    namespace localbe 
-    {
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-/**
-  Implements the SingleLayerStratum service for local file access.
-  */
-class LocalSingleStratumBase : public cppu::ImplInheritanceHelper1< LocalStratumBase, backend::XSingleLayerStratum > 
-{
-public :
-    /**
-      Service constructor from a service factory.
-
-      @param xContext   component context
-      */
-    LocalSingleStratumBase(const uno::Reference<uno::XComponentContext>& xContext) ;
-
-    /** Destructor */
-    ~LocalSingleStratumBase() ;
-
-
-    // XSingleLayerStratum
-    virtual uno::Reference<backend::XLayer> SAL_CALL 
-        getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-            throw (backend::BackendAccessException,
-                    lang::IllegalArgumentException,
-                    uno::RuntimeException) ;
-
-    virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-        getUpdatableLayer( const rtl::OUString& aLayerId ) 
-            throw (backend::BackendAccessException, 
-                    lang::IllegalArgumentException,
-                    lang::NoSupportException,
-                    uno::RuntimeException) ;
-
-} ;
-
-class LocalSingleStratum : public LocalSingleStratumBase
-{
-public:
-    LocalSingleStratum(const uno::Reference<uno::XComponentContext>& xContext) 
-        : LocalSingleStratumBase(xContext)
-        {};
-    
-private:
-    virtual void getLayerDirectories(rtl::OUString& aLayerUrl, rtl::OUString& aSubLayerUrl) const;
-    virtual const ServiceImplementationInfo * getServiceInfoData() const;
-};
-
-class LocalDataStratum : public LocalSingleStratumBase
-{
-public:
-    LocalDataStratum(const uno::Reference<uno::XComponentContext>& xContext) 
-        : LocalSingleStratumBase(xContext)
-        {};
-    
-private:
-    virtual void getLayerDirectories(rtl::OUString& aLayerUrl, rtl::OUString& aSubLayerUrl) const;
-    virtual const ServiceImplementationInfo * getServiceInfoData() const;
-};
-
-class LocalReadonlyStratum : public LocalSingleStratumBase
-{
-public:
-    LocalReadonlyStratum(const uno::Reference<uno::XComponentContext>& xContext) 
-        : LocalSingleStratumBase(xContext)
-        {};
-    
-    // XSingleLayerStratum - readonly implementation
-    virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-        getUpdatableLayer( const rtl::OUString& aLayerId ) 
-            throw (backend::BackendAccessException, 
-                    lang::IllegalArgumentException,
-                    lang::NoSupportException,
-                    uno::RuntimeException) ;
-
-private:
-    virtual void getLayerDirectories(rtl::OUString& aLayerUrl, rtl::OUString& aSubLayerUrl) const;
-    virtual const ServiceImplementationInfo * getServiceInfoData() const;
-};
-
-class LocalResourceStratum : public LocalSingleStratumBase
-{
-public:
-    LocalResourceStratum(const uno::Reference<uno::XComponentContext>& xContext) 
-        : LocalSingleStratumBase(xContext)
-        {};
-    
-    // XSingleLayerStratum - readonly implementation
-    virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-        getUpdatableLayer( const rtl::OUString& aLayerId ) 
-            throw (backend::BackendAccessException, 
-                    lang::IllegalArgumentException,
-                    lang::NoSupportException,
-                    uno::RuntimeException) ;
-
-private:
-    virtual void adjustBaseURL(rtl::OUString& aBaseURL);
-    virtual void getLayerDirectories(rtl::OUString& aLayerUrl, rtl::OUString& aSubLayerUrl) const;
-    virtual const ServiceImplementationInfo * getServiceInfoData() const;
-};
-
-
-
-} } // configmgr.localbe
-
-#endif 
diff --git a/configmgr/source/localbe/localstratumbase.cxx b/configmgr/source/localbe/localstratumbase.cxx
deleted file mode 100644
index c57af960da..0000000000
--- a/configmgr/source/localbe/localstratumbase.cxx
+++ /dev/null
@@ -1,256 +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: localstratumbase.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_configmgr.hxx"
-
-#include "localstratumbase.hxx"
-#include "localfilehelper.hxx"
-#include "localfilelayer.hxx"
-#include "oslstream.hxx"
-#include "serviceinfohelper.hxx"
-#include "bootstrap.hxx"
-#include "filehelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/configuration/backend/InsufficientAccessRightsException.hpp>
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <memory>
-
-namespace configmgr { namespace localbe {
-
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-LocalStratumBase::LocalStratumBase(const uno::Reference<uno::XComponentContext>& xContext) 
-: cppu::WeakComponentImplHelper3<lang::XInitialization, backend::XBackendEntities, lang::XServiceInfo>(mMutex)
-, mFactory(xContext->getServiceManager(),uno::UNO_QUERY) 
-{
-}
-//------------------------------------------------------------------------------
-
-LocalStratumBase::~LocalStratumBase()
-{}
-
-//------------------------------------------------------------------------------
-void SAL_CALL LocalStratumBase::initialize(const uno::Sequence<uno::Any>& aParameters) 
-    throw (uno::RuntimeException, uno::Exception,
-           css::configuration::InvalidBootstrapFileException,
-           backend::CannotConnectException,
-           backend::BackendSetupException)
-{
-    
-
-
-    if (aParameters.getLength() == 0) 
-    {
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "No parameters provided to local Stratum")),
-                *this, 0) ;
-    }
-    
-
-    for (sal_Int32 i = 0 ; i < aParameters.getLength() ; ++ i) 
-    {
-        if (aParameters [i] >>= mStrataDataUrl ) 
-        { break ; }
-    
-    }
-
-    // get modified base for special layer implementations (e.g. resources)
-    this->adjustBaseURL(mStrataDataUrl);
-
-    validateFileURL(mStrataDataUrl, *this);
-    implEnsureAbsoluteURL(mStrataDataUrl);
-    normalizeURL(mStrataDataUrl,*this, true);
-
-    if(FileHelper::fileExists(mStrataDataUrl))
-    {
-        checkIfDirectory(mStrataDataUrl, *this);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void LocalStratumBase::adjustBaseURL(rtl::OUString& )
-{
-}
-//------------------------------------------------------------------------------
-
-sal_Bool LocalStratumBase::isMoreRecent(const rtl::OUString& aFileUrl, 
-                                              const rtl::OUString& aTimestamp) {
-    rtl::OUString layerUrl ;
-    rtl::OUString subLayerUrl ;
-
-    getLayerDirectories(layerUrl, subLayerUrl) ;
-
-    return layerUrl.getLength() == 0 ||
-            !BasicLocalFileLayer::getTimestamp(layerUrl + aFileUrl).equals( aTimestamp);
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XLayer> SAL_CALL 
-    LocalStratumBase::getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-        throw (backend::BackendAccessException, lang::IllegalArgumentException,
-                uno::RuntimeException)
-{
-    
-    if (aLayerId.getLength() == 0){
-        throw lang::IllegalArgumentException(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "LocalStratum:getLayer - no LayerId specified")),
-                *this, 0) ;
-    }
-    rtl::OUString const componentSubPath = layeridToPath(aLayerId) + getDataSuffix();
-    if (!isMoreRecent(componentSubPath, aTimestamp)) { return NULL ; }
-
-    return createReadonlyFileLayer(componentSubPath);
-}
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalStratumBase::getOwnerEntity() 
-    throw (uno::RuntimeException) 
-{
-    return mStrataDataUrl ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalStratumBase::getAdminEntity() 
-    throw (uno::RuntimeException) 
-{
-    return rtl::OUString();
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalStratumBase::supportsEntity( const rtl::OUString& aEntity )
-    throw (backend::BackendAccessException, uno::RuntimeException) 
-{
-    if(mStrataDataUrl.getLength() == 0)
-    {
-        return false;
-    }
-    if (aEntity.getLength() == 0)
-    {
-        return false;
-    }
-    return isEqualEntity(mStrataDataUrl,aEntity); 
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalStratumBase::isEqualEntity(const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity) 
-    throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException)
-{
-    if (aEntity.getLength() == 0)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid empty entity."));
-
-        throw lang::IllegalArgumentException(sMsg, *this, 1);
-    }
-    if (aOtherEntity.getLength() == 0)
-    {
-        rtl::OUString const sMsg(RTL_CONSTASCII_USTRINGPARAM(
-                "LocalSingleBackend - Invalid empty entity."));
-
-        throw lang::IllegalArgumentException(sMsg, *this, 2);
-    }
-    rtl::OUString aNormalizedEntity(aEntity);
-    normalizeURL(aNormalizedEntity,*this);
-
-    rtl::OUString aNormalizedOther(aOtherEntity);
-    normalizeURL(aNormalizedOther,*this);
-
-    return aNormalizedEntity == aNormalizedOther;
-}
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-uno::Reference<backend::XLayer> 
-    LocalStratumBase::createReadonlyFileLayer(const rtl::OUString& aSubpath)
-         throw (lang::IllegalArgumentException)
-{
-    rtl::OUString layerPath ;
-    rtl::OUString subLayerPath ;
-
-    getLayerDirectories(layerPath, subLayerPath) ;
-    return createReadonlyLocalFileLayer(mFactory, layerPath, aSubpath, subLayerPath) ;
-}
-//------------------------------------------------------------------------------
-uno::Reference<backend::XUpdatableLayer> 
-    LocalStratumBase::createUpdatableFileLayer(const rtl::OUString& aSubpath)
-         throw (lang::IllegalArgumentException)
-{
-    rtl::OUString layerPath ;
-    rtl::OUString subLayerPath ;
-
-    getLayerDirectories(layerPath, subLayerPath) ;
-    return createUpdatableLocalFileLayer(mFactory, layerPath, aSubpath, subLayerPath) ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocalStratumBase::getImplementationName() 
-    throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(getServiceInfoData()).getImplementationName() ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL LocalStratumBase::supportsService(const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException) 
-{
-    return  ServiceInfoHelper(getServiceInfoData()).supportsService(aServiceName);
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL LocalStratumBase::getSupportedServiceNames() 
-    throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(getServiceInfoData()).getSupportedServiceNames() ;
-}
-
-// ---------------------------------------------------------------------------------------
-
-void LocalStratumBase::failReadonly() 
-{
-    rtl::OUStringBuffer aMessage;
-    aMessage.appendAscii("Configurations - ")
-            .appendAscii("Cannot get update access to layer: ")
-            .appendAscii("Local file-based stratum at ")
-            .append(this->getBaseUrl())
-            .appendAscii(" is readonly.");
-    throw lang::NoSupportException(aMessage.makeStringAndClear(),*this);
-}
-//------------------------------------------------------------------------------
-
-} } // configmgr.localsinglestratum
diff --git a/configmgr/source/localbe/localstratumbase.hxx b/configmgr/source/localbe/localstratumbase.hxx
deleted file mode 100644
index 8c5fb02fad..0000000000
--- a/configmgr/source/localbe/localstratumbase.hxx
+++ /dev/null
@@ -1,202 +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: localstratumbase.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 CONFIGMGR_LOCALBE_LOCALSTRATUMBASE_HXX_
-#define CONFIGMGR_LOCALBE_LOCALSTRATUMBASE_HXX_
-
-#include <com/sun/star/configuration/backend/XBackendEntities.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/configuration/backend/XUpdatableLayer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <cppuhelper/compbase3.hxx>
-
-namespace configmgr 
-{ 
-    struct ServiceImplementationInfo;
-
-    namespace localbe 
-    {
-//------------------------------------------------------------------------------
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-//------------------------------------------------------------------------------
-
-struct LocalStratumMutexHolder { osl::Mutex mMutex; };
-//------------------------------------------------------------------------------
-static const char kLocalDataSuffix[] = ".xcu";
-//------------------------------------------------------------------------------
-
-/**
-  Helper for implementing the [Single|Multi]LayerStratum service for local file access.
-  */
-class LocalStratumBase : protected LocalStratumMutexHolder, public cppu::WeakComponentImplHelper3<lang::XInitialization, backend::XBackendEntities, lang::XServiceInfo> 
-{
-protected :
-    /**
-      Service constructor from a service factory.
-
-      @param xContext   component context
-      */
-    LocalStratumBase(const uno::Reference<uno::XComponentContext>& xContext) ;
-
-    /** Destructor */
-    ~LocalStratumBase() ;
-
-
-public:
-    // XInitialize
-    virtual void SAL_CALL 
-        initialize( const uno::Sequence<uno::Any>& aParameters) 
-            throw (uno::RuntimeException, uno::Exception,
-                   css::configuration::InvalidBootstrapFileException,
-                   backend::CannotConnectException,
-                   backend::BackendSetupException);
-
-        
-    // XBackendEntities
-    virtual rtl::OUString SAL_CALL 
-        getOwnerEntity(  ) 
-            throw (uno::RuntimeException);
-
-    virtual rtl::OUString SAL_CALL 
-        getAdminEntity(  ) 
-            throw (uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL
-        supportsEntity( const rtl::OUString& aEntity ) 
-            throw (backend::BackendAccessException, uno::RuntimeException);
-    
-    virtual sal_Bool SAL_CALL 
-        isEqualEntity( const rtl::OUString& aEntity, const rtl::OUString& aOtherEntity ) 
-            throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-
-    // XServiceInfo
-    virtual rtl::OUString SAL_CALL 
-        getImplementationName(  ) 
-            throw (uno::RuntimeException);
-    
-    virtual sal_Bool SAL_CALL 
-        supportsService( const rtl::OUString& aServiceName ) 
-            throw (uno::RuntimeException) ;
-
-    virtual uno::Sequence<rtl::OUString> SAL_CALL 
-        getSupportedServiceNames(  ) 
-            throw (uno::RuntimeException) ;
-
-protected:
-    rtl::OUString const & getBaseUrl() const
-    { return mStrataDataUrl; }
-    
-    static rtl::OUString getDataSuffix()  
-    { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(kLocalDataSuffix)); }
-//------------------------------------------------------------------------------
-    /// raise a NoSupportException for an attempt to update this layer
-    void failReadonly();
-
-    // helper for implementing the stratum getLayer[s] function[s]
-    uno::Reference<backend::XLayer> SAL_CALL
-        getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-            throw (backend::BackendAccessException, lang::IllegalArgumentException, uno::RuntimeException);
-
-    /**
-      Builds a LocalFileLayer object given a subpath
-      Since the LocalFileLayer implements the various
-      interfaces a layer can be accessed as, a few methods 
-      need one. 
-
-      @param aSubpath   Subpath 
-      @return   local file layer
-      @throws com::sun::star::lang::IllegalArgumentException
-              if the subpath is invalid.
-      */
-    uno::Reference<backend::XLayer> createReadonlyFileLayer(const rtl::OUString& aSubpath) 
-        throw (lang::IllegalArgumentException) ;
-                                           
-    /**
-      Builds a LocalFileLayer object given a subpath.
-      Since the LocalFileLayer implements the various
-      interfaces a layer can be accessed as, a few methods 
-      need one.
-
-      @param aSubpath   subpath 
-      @return   local file layer
-      @throws com::sun::star::lang::IllegalArgumentException
-              if the subpath is invalid.
-      */
-    uno::Reference<backend::XUpdatableLayer> createUpdatableFileLayer(const rtl::OUString& aSubpath) 
-        throw (lang::IllegalArgumentException) ;
-                                           
-    /**
-      Tells if a file is more recent than a given date.
-      The date is formatted YYYYMMDDhhmmssZ.
-
-      @param aSubpath       relative URL of the component to check
-      @param aTimestamp     timestamp to check against
-      @return   sal_True if the file is more recent, sal_False otherwise
-      */
-    sal_Bool isMoreRecent(const rtl::OUString& aSubpath, 
-                          const rtl::OUString& aTimestamp) ;
-        
-protected:
-    /// Parses and adjusts the passed base URL 
-    virtual void adjustBaseURL(rtl::OUString& aBaseURL);
-        
-private:
-    /**
-      Retrieves the appropriate layer and sublayers base directories.
-
-      @param aLayerUrl      layer base URL, filled on return
-      @param aSubLayerUrl   sublayer base URL, filled on return
-      */
-    virtual void getLayerDirectories(rtl::OUString& aLayerUrl,
-                                     rtl::OUString& aSubLayerUrl) const = 0;
-    virtual const ServiceImplementationInfo * getServiceInfoData() const = 0;
-    
-private :
-    /** Service factory */
-    uno::Reference<lang::XMultiServiceFactory> mFactory ;
-    /** 
-      Base of the strata data.
-      */
-    rtl::OUString mStrataDataUrl ;
-     
-} ;
-
-
-} } // configmgr.localbe
-
-#endif
diff --git a/configmgr/source/localbe/makefile.mk b/configmgr/source/localbe/makefile.mk
deleted file mode 100644
index 5462836be4..0000000000
--- a/configmgr/source/localbe/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.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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source$/inc
-PRJNAME=configmgr
-TARGET=localbe
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-        $(SLO)$/localsinglebackend.obj \
-        $(SLO)$/localfilelayer.obj \
-        $(SLO)$/localoutputstream.obj \
-        $(SLO)$/localdataimportsvc.obj \
-        $(SLO)$/localhierarchybrowsersvc.obj \
-        $(SLO)$/localschemasupplier.obj	\
-        $(SLO)$/localstratumbase.obj	\
-        $(SLO)$/localsinglestratum.obj	\
-        $(SLO)$/localmultistratum.obj	\
-        $(SLO)$/localfilehelper.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx
new file mode 100644
index 0000000000..9c5fa3328a
--- /dev/null
+++ b/configmgr/source/localizedpropertynode.cxx
@@ -0,0 +1,87 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "localizedpropertynode.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "type.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+LocalizedPropertyNode::LocalizedPropertyNode(
+    int layer, Type staticType, bool nillable):
+    Node(layer), staticType_(staticType), nillable_(nillable)
+{}
+
+rtl::Reference< Node > LocalizedPropertyNode::clone() const {
+    return new LocalizedPropertyNode(*this);
+}
+
+NodeMap & LocalizedPropertyNode::getMembers() {
+    return members_;
+}
+
+Type LocalizedPropertyNode::getStaticType() const {
+    return staticType_;
+}
+
+bool LocalizedPropertyNode::isNillable() const {
+    return nillable_;
+}
+
+LocalizedPropertyNode::LocalizedPropertyNode(
+    LocalizedPropertyNode const & other):
+    Node(other), staticType_(other.staticType_), nillable_(other.nillable_)
+{
+    cloneNodeMap(other.members_, &members_);
+}
+
+LocalizedPropertyNode::~LocalizedPropertyNode() {}
+
+Node::Kind LocalizedPropertyNode::kind() const {
+    return KIND_LOCALIZED_PROPERTY;
+}
+
+void LocalizedPropertyNode::clear() {
+    members_.clear();
+}
+
+}
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
new file mode 100644
index 0000000000..d5a16af0e5
--- /dev/null
+++ b/configmgr/source/localizedpropertynode.hxx
@@ -0,0 +1,76 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_LOCALIZEDPROPERTYNODE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_LOCALIZEDPROPERTYNODE_HXX
+
+#include "sal/config.h"
+
+#include "rtl/ref.hxx"
+
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "type.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+} } } }
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class LocalizedPropertyNode: public Node {
+public:
+    LocalizedPropertyNode(int layer, Type staticType, bool nillable);
+
+    virtual rtl::Reference< Node > clone() const;
+
+    virtual NodeMap & getMembers();
+
+    Type getStaticType() const;
+
+    bool isNillable() const;
+
+private:
+    LocalizedPropertyNode(LocalizedPropertyNode const & other);
+
+    virtual ~LocalizedPropertyNode();
+
+    virtual Kind kind() const;
+
+    virtual void clear();
+
+    Type staticType_;
+        // as specified in the component-schema (TYPE_ANY, ...,
+        // TYPE_HEXBINARY_LIST; not TYPE_ERROR or TYPE_NIL)
+    bool nillable_;
+    NodeMap members_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
new file mode 100644
index 0000000000..f6246106c8
--- /dev/null
+++ b/configmgr/source/localizedvaluenode.cxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "localizedvaluenode.hxx"
+#include "node.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+LocalizedValueNode::LocalizedValueNode(int layer, css::uno::Any const & value):
+    Node(layer), value_(value)
+{}
+
+rtl::Reference< Node > LocalizedValueNode::clone() const {
+    return new LocalizedValueNode(*this);
+}
+
+rtl::OUString LocalizedValueNode::getTemplateName() const {
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
+}
+
+css::uno::Any LocalizedValueNode::getValue() const {
+    return value_;
+}
+
+void LocalizedValueNode::setValue(int layer, css::uno::Any const & value) {
+    setLayer(layer);
+    value_ = value;
+}
+
+LocalizedValueNode::LocalizedValueNode(LocalizedValueNode const & other):
+    Node(other), value_(other.value_)
+{}
+
+LocalizedValueNode::~LocalizedValueNode() {}
+
+Node::Kind LocalizedValueNode::kind() const {
+    return KIND_LOCALIZED_VALUE;
+}
+
+}
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
new file mode 100644
index 0000000000..7f8a5dd987
--- /dev/null
+++ b/configmgr/source/localizedvaluenode.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_LOCALIZEDVALUENODE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_LOCALIZEDVALUENODE_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "rtl/ref.hxx"
+
+#include "node.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class LocalizedValueNode: public Node {
+public:
+    LocalizedValueNode(int layer, com::sun::star::uno::Any const & value);
+
+    virtual rtl::Reference< Node > clone() const;
+
+    virtual rtl::OUString getTemplateName() const;
+
+    com::sun::star::uno::Any getValue() const;
+
+    void setValue(int layer, com::sun::star::uno::Any const & value);
+
+private:
+    LocalizedValueNode(LocalizedValueNode const & other);
+
+    virtual ~LocalizedValueNode();
+
+    virtual Kind kind() const;
+
+    com::sun::star::uno::Any value_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx
new file mode 100644
index 0000000000..dc7f26a34e
--- /dev/null
+++ b/configmgr/source/lock.cxx
@@ -0,0 +1,39 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "osl/mutex.hxx"
+
+#include "lock.hxx"
+
+namespace configmgr {
+
+osl::Mutex lock;
+
+}
diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx
new file mode 100644
index 0000000000..b541f48fbe
--- /dev/null
+++ b/configmgr/source/lock.hxx
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_LOCK_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_LOCK_HXX
+
+#include "sal/config.h"
+
+#include "osl/mutex.hxx"
+
+namespace configmgr {
+
+extern osl::Mutex lock;
+
+}
+
+#endif
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
new file mode 100644
index 0000000000..d6972e12b9
--- /dev/null
+++ b/configmgr/source/makefile.mk
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+PRJ = ..
+PRJNAME = configmgr
+TARGET = configmgr
+
+ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
+
+.INCLUDE: settings.mk
+
+CDEFS += -DOOO_DLLIMPLEMENTATION_CONFIGMGR
+
+SLOFILES = \
+    $(SLO)/access.obj \
+    $(SLO)/broadcaster.obj \
+    $(SLO)/childaccess.obj \
+    $(SLO)/components.obj \
+    $(SLO)/configurationprovider.obj \
+    $(SLO)/configurationregistry.obj \
+    $(SLO)/data.obj \
+    $(SLO)/defaultprovider.obj \
+    $(SLO)/groupnode.obj \
+    $(SLO)/localizedpropertynode.obj \
+    $(SLO)/localizedvaluenode.obj \
+    $(SLO)/lock.obj \
+    $(SLO)/modifications.obj \
+    $(SLO)/node.obj \
+    $(SLO)/nodemap.obj \
+    $(SLO)/pad.obj \
+    $(SLO)/parsemanager.obj \
+    $(SLO)/propertynode.obj \
+    $(SLO)/rootaccess.obj \
+    $(SLO)/services.obj \
+    $(SLO)/setnode.obj \
+    $(SLO)/type.obj \
+    $(SLO)/update.obj \
+    $(SLO)/valueparser.obj \
+    $(SLO)/writemodfile.obj \
+    $(SLO)/xcdparser.obj \
+    $(SLO)/xcsparser.obj \
+    $(SLO)/xcuparser.obj \
+    $(SLO)/xmldata.obj \
+    $(SLO)/xmlreader.obj
+
+SHL1IMPLIB = i$(SHL1TARGET)
+SHL1OBJS = $(SLOFILES)
+SHL1STDLIBS = \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(SALHELPERLIB) \
+    $(SALLIB)
+SHL1TARGET = configmgr
+SHL1USE_EXPORTS = name
+DEF1NAME = $(SHL1TARGET)
+
+.INCLUDE: target.mk
diff --git a/configmgr/source/misc/anypair.cxx b/configmgr/source/misc/anypair.cxx
deleted file mode 100644
index 9b763debbf..0000000000
--- a/configmgr/source/misc/anypair.cxx
+++ /dev/null
@@ -1,691 +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: anypair.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include <anypair.hxx>
-#include <uno/any2.h>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Type.hxx>
-
-#define CFG_PRECOND( expr )  OSL_PRECOND ( expr, "Violated Precondition:  " #expr)
-#define CFG_POSTCOND( expr ) OSL_POSTCOND( expr, "Violated Postcondition: " #expr)
-
-namespace configmgr
-{
-    namespace css = com::sun::star;
-    namespace uno = css::uno;
-
-// -----------------------------------------------------------------------------
-    static inline bool impl_Any_hasValue(uno_Any const * _pData) 
-    { return (typelib_TypeClass_VOID != _pData->pType->eTypeClass); }
-    
-// -----------------------------------------------------------------------------
-    static inline bool impl_Any_storesData(uno_Any const * _pData) 
-    { 
-        const void * pAnyData = _pData->pData;
-
-        const bool bSelfReferential = (pAnyData == &_pData->pReserved);
-        OSL_ENSURE( bSelfReferential == ( _pData <= pAnyData && pAnyData < _pData+1 ),
-                    "uno_Any layout changed: Unreckognized self-referentiality" );
-
-        return bSelfReferential; 
-    }
-    
-// -----------------------------------------------------------------------------
-    static inline void * impl_getDataPointer(const void * const * _pAnyPairData) 
-    { 
-        const void * const pResult = *_pAnyPairData;
-
-        return const_cast<void*>(pResult); 
-    }
-    
-// -----------------------------------------------------------------------------
-    static inline void * impl_getData(const void * const * _pAnyPairData, bool _bStoredData) 
-    { 
-        const void * const pResult = _bStoredData ? _pAnyPairData : *_pAnyPairData;
-
-        return const_cast<void*>(pResult); 
-    }
-    
-// -----------------------------------------------------------------------------
-    static inline void impl_setDataPointer(const void * * _pAnyPairData, void* _pData) 
-    { 
-        *_pAnyPairData = _pData;
-    }
-// -----------------------------------------------------------------------------
-    static const unsigned SHIFT_DATA_FLAG = 4;
-// -----------------------------------------------------------------------------
-    static 
-    inline void impl_state_setState(sal_uInt8* _pState, sal_uInt8 _nState, sal_uInt8  _nSelect) 
-    {
-        sal_uInt8 const nSelectMask = _nSelect | (_nSelect<<SHIFT_DATA_FLAG);
-        OSL_ENSURE( (_nState & nSelectMask) == _nState, "State specified does not belong to the selector");
-
-        *_pState &= ~nSelectMask;
-        *_pState |= _nState;
-    }
-    
-// -----------------------------------------------------------------------------
-    static 
-    inline void impl_state_setNull(sal_uInt8* _pState, sal_uInt8  _nSelect) 
-    {
-        sal_uInt8 const nSelectMask = _nSelect | (_nSelect<<SHIFT_DATA_FLAG);
-        *_pState &= ~nSelectMask;
-    }
-    
-// -----------------------------------------------------------------------------
-    static inline 
-    void impl_state_setData(sal_uInt8* _pState, sal_uInt8  _nSelect) 
-    {
-        sal_uInt8 const nSelectMask = _nSelect | (_nSelect<<SHIFT_DATA_FLAG);
-        *_pState |= nSelectMask;
-    }
-    
-// -----------------------------------------------------------------------------
-    static inline 
-    void impl_state_setValue(sal_uInt8* _pState, sal_uInt8  _nSelect, bool _bStoresData) 
-    {
-        *_pState |= _nSelect;
-
-        _nSelect <<= SHIFT_DATA_FLAG;
-        if (_bStoresData) 
-            *_pState |=  _nSelect;
-        else 
-            *_pState &= ~_nSelect;
-    }
-
-// -----------------------------------------------------------------------------
-    static 
-    inline bool impl_state_isNull(sal_uInt8 const _nState, sal_uInt8  _nSelect) 
-    {
-        return 0 == (_nState & _nSelect);
-    }
-    
-// -----------------------------------------------------------------------------
-    static
-    inline bool impl_state_isData(sal_uInt8 const _nState, sal_uInt8  _nSelect) 
-    {
-        return 0 != (_nState & (_nSelect<<SHIFT_DATA_FLAG));
-    }
-    
-    
-// -----------------------------------------------------------------------------
-    static
-    typelib_TypeDescriptionReference * impl_getVoidType() 
-    {
-        static const uno::Type aNullType;
-        return aNullType.getTypeLibType();
-    }
-    
-// -----------------------------------------------------------------------------
-    static inline
-    void anypair_type_construct_Desc(   cfgmgr_AnyPair_Desc* _pAnyPairDesc,
-                                        typelib_TypeDescriptionReference * _pType)
-    {
-        _pAnyPairDesc->nState = 0;  
-        _pAnyPairDesc->pType  = _pType;  
-        
-        typelib_typedescriptionreference_acquire( _pAnyPairDesc->pType );
-    }
-
-// -----------------------------------------------------------------------------
-    static inline
-    void anypair_default_construct_Desc( cfgmgr_AnyPair_Desc* _pAnyPairDesc )
-    {
-        anypair_type_construct_Desc(_pAnyPairDesc, impl_getVoidType());
-    }
-
-// -----------------------------------------------------------------------------
-    static inline
-    void anypair_empty_set_Data( const void ** _pAnyPairData )
-    {
-        impl_setDataPointer(_pAnyPairData, NULL);
-        OSL_DEBUG_ONLY( impl_setDataPointer(_pAnyPairData, reinterpret_cast<void*>(0xdeadbeef)) );
-    }
-
-// -----------------------------------------------------------------------------
-    // returns a state for the specified selector
-    static inline
-    sal_uInt8 anypair_any_set_Data( const void ** _pAnyPairData, 
-                                              sal_uInt8  _nSelect,
-                                              uno_Any const *_pUnoAny)
-    {
-        sal_uInt8 nState = 0;
-
-        bool bValue = impl_Any_hasValue(_pUnoAny);
-        if (bValue) 
-        {
-            uno_Any aTmpAny;
-            uno_type_any_construct(&aTmpAny, _pUnoAny->pData, _pUnoAny->pType, reinterpret_cast< uno_AcquireFunc >( uno::cpp_acquire ));
-
-            bool bData = impl_Any_storesData(&aTmpAny);
-
-            impl_setDataPointer(_pAnyPairData, bData ? aTmpAny.pReserved : aTmpAny.pData);
-            
-            impl_state_setValue(&nState, _nSelect, bData);
-        }
-        else
-            anypair_empty_set_Data(_pAnyPairData);
-
-        return nState;
-    }
-
-// -----------------------------------------------------------------------------
-    static inline
-    sal_uInt8 anypair_copy_Data( const void ** _pAnyPairData,
-                                           sal_uInt8  _nSelect,
-                                           cfgmgr_AnyPair_Desc const* _pAnyPairDescFrom, 
-                                           const void * const* _pAnyPairDataFrom )
-    {
-        sal_uInt8 nState = 0;
-
-        if (impl_state_isNull(_pAnyPairDescFrom->nState, _nSelect))
-        {
-            anypair_empty_set_Data(_pAnyPairData);
-        }
-
-        else 
-        {
-            bool bOldIsData = impl_state_isData(_pAnyPairDescFrom->nState, _nSelect);
-
-            void * pFromData = impl_getData(_pAnyPairDataFrom, bOldIsData);
-
-            uno_Any aTmpAny;
-            uno_type_any_construct(&aTmpAny, pFromData, _pAnyPairDescFrom->pType, reinterpret_cast< uno_AcquireFunc >( uno::cpp_acquire ));
-
-            bool bNewIsData = impl_Any_storesData(&aTmpAny);
-            OSL_ENSURE(bOldIsData == bNewIsData, "INFO [safe to ignore]: Copy of uno_Any changes directness !?");
-            
-            impl_setDataPointer(_pAnyPairData, bNewIsData ? aTmpAny.pReserved : aTmpAny.pData);
-            
-            impl_state_setValue(&nState, _nSelect, bNewIsData);
-        }
-
-        return nState;
-    }
-
-// -----------------------------------------------------------------------------
-    static inline
-    void anypair_destruct_Desc(cfgmgr_AnyPair_Desc* _pAnyPairDesc)
-    {
-        typelib_typedescriptionreference_release( _pAnyPairDesc->pType );
-        OSL_DEBUG_ONLY(_pAnyPairDesc->nState = 0xDD);
-        OSL_DEBUG_ONLY(_pAnyPairDesc->pType  = (typelib_TypeDescriptionReference*)0xdeadbeef);
-    }
-
-// -----------------------------------------------------------------------------
-    static
-    void anypair_clear_Data( const void ** _pAnyPairData, 
-                             sal_uInt8  _nSelect, 
-                             cfgmgr_AnyPair_Desc const* _pAnyPairDesc 
-                           )
-    {
-        if (!impl_state_isNull(_pAnyPairDesc->nState,_nSelect))
-        {
-            uno_Any aTmpAny;
-            aTmpAny.pType = _pAnyPairDesc->pType;
-
-            if (impl_state_isData(_pAnyPairDesc->nState,_nSelect))
-            {
-                aTmpAny.pReserved = impl_getDataPointer(_pAnyPairData);
-                aTmpAny.pData     = &aTmpAny.pReserved;
-            }
-            else
-            {
-                aTmpAny.pReserved   = NULL;
-                aTmpAny.pData       = impl_getDataPointer(_pAnyPairData);
-            }
-
-            typelib_typedescriptionreference_acquire( aTmpAny.pType );
-            uno_any_destruct(&aTmpAny, reinterpret_cast< uno_ReleaseFunc >( uno::cpp_release ));
-
-            impl_setDataPointer(_pAnyPairData, NULL);
-            OSL_DEBUG_ONLY(impl_setDataPointer(_pAnyPairData, reinterpret_cast<void*>(0xDeadBeef)));
-        }
-    }
-
-// -----------------------------------------------------------------------------
-    static
-    void anypair_Data_fill_Any( uno_Any* _pUnoAny,
-                                cfgmgr_AnyPair_Desc const* _pAnyPairDesc, 
-                                const void * const* _pAnyPairData, 
-                                sal_uInt8  _nSelect )
-    {
-        if (impl_state_isNull(_pAnyPairDesc->nState,_nSelect))
-        {
-            _pUnoAny->pType = impl_getVoidType();
-            _pUnoAny->pReserved = NULL;
-            _pUnoAny->pData = NULL;
-        }
-        else if (impl_state_isData(_pAnyPairDesc->nState,_nSelect))
-        {
-            _pUnoAny->pType     = _pAnyPairDesc->pType;
-            _pUnoAny->pReserved = impl_getDataPointer(_pAnyPairData);
-            _pUnoAny->pData     = &_pUnoAny->pReserved;
-        }
-        else
-        {
-            _pUnoAny->pType     = _pAnyPairDesc->pType;
-            _pUnoAny->pReserved = NULL;
-            _pUnoAny->pData     = impl_getDataPointer(_pAnyPairData);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-    static inline 
-    typelib_TypeDescriptionReference*
-        anypair_test_assigned_type( typelib_TypeDescriptionReference* _pOldType,
-                                    typelib_TypeDescriptionReference* _pNewType)
-    {
-        typelib_TypeDescriptionReference* pResult;
-        if ( _pNewType->eTypeClass == typelib_TypeClass_VOID)	
-            pResult = _pOldType;
-
-        else if	(_pOldType->eTypeClass == typelib_TypeClass_VOID || _pOldType->eTypeClass == typelib_TypeClass_ANY )
-            pResult = _pNewType;
-
-        else if ( typelib_typedescriptionreference_equals(_pOldType,_pNewType)  )
-            pResult = _pOldType;
-
-        else
-            pResult = NULL;
-
-        return pResult;
-    }
-
-// -----------------------------------------------------------------------------	
-    static
-    sal_Bool anypair_any_assign_Data(   cfgmgr_AnyPair_Desc* _pAnyPairDesc, 
-                                        const void ** _pAnyPairData,
-                                        sal_uInt8  _nSelect,
-                                        uno_Any const *_pUnoAny)
-    {
-        typelib_TypeDescriptionReference* pOldType = _pAnyPairDesc->pType;
-        typelib_TypeDescriptionReference* pNewType = anypair_test_assigned_type(pOldType,_pUnoAny->pType);
-
-        if (pNewType != NULL)
-        {
-            uno_Any aTmpAny;
-            anypair_Data_fill_Any(&aTmpAny,_pAnyPairDesc,_pAnyPairData,_nSelect);
-
-            typelib_typedescriptionreference_acquire(aTmpAny.pType);
-
-            uno_type_any_assign(&aTmpAny, 
-                                _pUnoAny->pData, 
-                                _pUnoAny->pType, 
-                                reinterpret_cast< uno_AcquireFunc >( uno::cpp_acquire ), 
-                                reinterpret_cast< uno_AcquireFunc >( uno::cpp_release ));
-
-            sal_uInt8 nNewState = anypair_any_set_Data(_pAnyPairData,_nSelect,&aTmpAny);
-            impl_state_setState(&_pAnyPairDesc->nState, nNewState, _nSelect);
-
-            uno_any_destruct(
-                &aTmpAny,
-                reinterpret_cast< uno_ReleaseFunc >(uno::cpp_release));
-
-            if (pNewType != pOldType)
-            {
-                typelib_typedescriptionreference_acquire(pNewType);
-                typelib_typedescriptionreference_release(pOldType);
-                _pAnyPairDesc->pType = pNewType; 
-            }
-
-            CFG_POSTCOND( cfgmgr_AnyPair_isNull(_pAnyPairDesc,_nSelect) == !impl_Any_hasValue(_pUnoAny) );
-            CFG_POSTCOND( typelib_typedescriptionreference_equals(_pAnyPairDesc->pType,pNewType) );
-        }
-        else
-            OSL_ENSURE(false, "anypair_assign_XXX(): Cannot assign - Type mismatch");
-
-        return (pNewType != NULL);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    void anypair_construct_default(cfgmgr_AnyPair * _pAnyPair)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-
-        anypair_default_construct_Desc(&_pAnyPair->desc);
-        anypair_empty_set_Data(&_pAnyPair->first);
-        anypair_empty_set_Data(&_pAnyPair->second);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_BOTH) );
-        CFG_POSTCOND( cfgmgr_AnyPair_isEmpty(&_pAnyPair->desc) );
-    }
-    
-// -----------------------------------------------------------------------------
-    void anypair_construct_type(cfgmgr_AnyPair * _pAnyPair, typelib_TypeDescriptionReference* _pType)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-        CFG_PRECOND( _pType != NULL );
-
-        anypair_type_construct_Desc(&_pAnyPair->desc, _pType);
-        anypair_empty_set_Data(&_pAnyPair->first);
-        anypair_empty_set_Data(&_pAnyPair->second);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_BOTH) );
-        CFG_POSTCOND( typelib_typedescriptionreference_equals(_pAnyPair->desc.pType,_pType) );
-    }
-
-// -----------------------------------------------------------------------------
-    void anypair_construct_first(cfgmgr_AnyPair * _pAnyPair, uno_Any const *_pUnoAny)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-        CFG_PRECOND( _pUnoAny != NULL );
-
-        anypair_type_construct_Desc(&_pAnyPair->desc, _pUnoAny->pType);
-
-        _pAnyPair->desc.nState = anypair_any_set_Data (&_pAnyPair->first, cfgmgr_SELECT_FIRST, _pUnoAny);
-
-        anypair_empty_set_Data(&_pAnyPair->second);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_FIRST) == !impl_Any_hasValue(_pUnoAny) );
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_SECOND) );
-        CFG_POSTCOND( typelib_typedescriptionreference_equals(_pAnyPair->desc.pType,_pUnoAny ->pType) );
-    }
-    
-// -----------------------------------------------------------------------------
-    void anypair_construct_second(cfgmgr_AnyPair * _pAnyPair, uno_Any const *_pUnoAny)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-        CFG_PRECOND( _pUnoAny != NULL );
-
-        anypair_type_construct_Desc(&_pAnyPair->desc, _pUnoAny->pType);
-
-        anypair_empty_set_Data(&_pAnyPair->first);
-
-        _pAnyPair->desc.nState = anypair_any_set_Data (&_pAnyPair->second, cfgmgr_SELECT_SECOND, _pUnoAny);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_FIRST) );
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_SECOND) == !impl_Any_hasValue(_pUnoAny) );
-        CFG_POSTCOND( typelib_typedescriptionreference_equals(_pAnyPair->desc.pType,_pUnoAny ->pType) );
-    }
-    
-// -----------------------------------------------------------------------------
-    // if type not equal, you got false and the struct contains undefined values
-    sal_Bool anypair_construct(cfgmgr_AnyPair * _pAnyPair, uno_Any const * _pFirstAny, uno_Any const *_pSecondAny)
-    {		
-        CFG_PRECOND( _pAnyPair != NULL );
-        CFG_PRECOND( _pFirstAny  != NULL );
-        CFG_PRECOND( _pSecondAny != NULL );
-
-        bool bHasFirst  = impl_Any_hasValue(_pFirstAny);
-        bool bHasSecond = impl_Any_hasValue(_pSecondAny);
-
-        if (bHasFirst && bHasSecond)
-        {
-            if ( ! typelib_typedescriptionreference_equals(_pFirstAny->pType,_pSecondAny->pType))
-            {
-                OSL_ENSURE(false, "anypair_construct(): Cannot construct - Different types");
-                return false;
-            }
-        }
-
-        anypair_type_construct_Desc(&_pAnyPair->desc, bHasFirst ? _pFirstAny->pType : _pSecondAny->pType);  
-
-        sal_uInt8 nState = 0; 
-        
-        nState |= anypair_any_set_Data (&_pAnyPair->first,  cfgmgr_SELECT_FIRST,  _pFirstAny);
-        nState |= anypair_any_set_Data (&_pAnyPair->second, cfgmgr_SELECT_SECOND, _pSecondAny);
-
-        _pAnyPair->desc.nState = nState;
-
-        CFG_POSTCOND((bHasFirst || bHasSecond) == !cfgmgr_AnyPair_isEmpty(&_pAnyPair->desc) );
-        CFG_POSTCOND( bHasFirst  == !cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_FIRST) );
-        CFG_POSTCOND( bHasSecond == !cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_SECOND) );
-        CFG_POSTCOND( !bHasFirst  || typelib_typedescriptionreference_equals(_pAnyPair->desc.pType,_pFirstAny ->pType) );
-        CFG_POSTCOND( !bHasSecond || typelib_typedescriptionreference_equals(_pAnyPair->desc.pType,_pSecondAny->pType) );
-
-        return true;
-    }
-
-// -----------------------------------------------------------------------------	
-    void anypair_copy_construct(cfgmgr_AnyPair* _pAnyPair, cfgmgr_AnyPair const * _pAnyPairFrom)
-    {
-        CFG_PRECOND( _pAnyPair     != NULL );
-        CFG_PRECOND( _pAnyPairFrom != NULL );
-
-        anypair_type_construct_Desc(&_pAnyPair->desc, _pAnyPairFrom->desc.pType); 
-        
-        sal_uInt8 nState = 0; 
-        
-        nState |= anypair_copy_Data(&_pAnyPair->first,  cfgmgr_SELECT_FIRST,  
-                                    &_pAnyPairFrom->desc, &_pAnyPairFrom->first );
-
-        nState |= anypair_copy_Data(&_pAnyPair->second,  cfgmgr_SELECT_SECOND,  
-                                    &_pAnyPairFrom->desc, &_pAnyPairFrom->second );
-
-        _pAnyPair->desc.nState = nState;
-
-        OSL_ENSURE(_pAnyPairFrom->desc.nState == nState, "Unexpected: Copy changes state");
-        CFG_POSTCOND( typelib_typedescriptionreference_equals(_pAnyPair->desc.pType,_pAnyPairFrom->desc.pType) );
-    }
-
-// -----------------------------------------------------------------------------
-    void anypair_destruct(cfgmgr_AnyPair* _pAnyPair)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-
-        anypair_clear_Data(&_pAnyPair->first,  cfgmgr_SELECT_FIRST,  &_pAnyPair->desc);
-        anypair_clear_Data(&_pAnyPair->second, cfgmgr_SELECT_SECOND, &_pAnyPair->desc);
-        anypair_destruct_Desc(&_pAnyPair->desc );
-    }
-
-// -----------------------------------------------------------------------------
-    sal_Bool anypair_assign_first(cfgmgr_AnyPair* _pAnyPair, uno_Any const * _pUnoAny)
-    {
-        CFG_PRECOND( _pAnyPair     != NULL );
-        CFG_PRECOND( _pUnoAny != NULL );
-
-        return anypair_any_assign_Data(&_pAnyPair->desc, &_pAnyPair->first, cfgmgr_SELECT_FIRST, _pUnoAny);
-    }
-
-// -----------------------------------------------------------------------------
-    sal_Bool anypair_assign_second(cfgmgr_AnyPair* _pAnyPair, uno_Any const * _pUnoAny)
-    {
-        CFG_PRECOND( _pAnyPair     != NULL );
-        CFG_PRECOND( _pUnoAny != NULL );
-
-        return anypair_any_assign_Data(&_pAnyPair->desc, &_pAnyPair->second, cfgmgr_SELECT_SECOND, _pUnoAny);
-    }
-
-// -----------------------------------------------------------------------------
-    void anypair_assign(cfgmgr_AnyPair* _pAnyPair, cfgmgr_AnyPair const * _pAnyPairFrom)
-    {
-        if (_pAnyPair != _pAnyPairFrom)
-        {
-            anypair_destruct(_pAnyPair);
-            anypair_copy_construct(_pAnyPair, _pAnyPairFrom);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-    void anypair_clear_first(cfgmgr_AnyPair* _pAnyPair)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-
-        anypair_clear_Data(&_pAnyPair->first, cfgmgr_SELECT_FIRST, &_pAnyPair->desc);
-        impl_state_setNull(&_pAnyPair->desc.nState, cfgmgr_SELECT_FIRST);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_FIRST) );
-    }
-    
-// -----------------------------------------------------------------------------
-    void anypair_clear_second(cfgmgr_AnyPair* _pAnyPair)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-
-        anypair_clear_Data(&_pAnyPair->second, cfgmgr_SELECT_SECOND, &_pAnyPair->desc );
-        impl_state_setNull(&_pAnyPair->desc.nState, cfgmgr_SELECT_SECOND);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_SECOND) );
-    }
-    
-// -----------------------------------------------------------------------------
-    void anypair_clear_values(cfgmgr_AnyPair* _pAnyPair)
-    {
-        CFG_PRECOND( _pAnyPair != NULL );
-
-        anypair_clear_Data(&_pAnyPair->first, cfgmgr_SELECT_FIRST, &_pAnyPair->desc);
-        anypair_clear_Data(&_pAnyPair->second, cfgmgr_SELECT_SECOND, &_pAnyPair->desc );
-        impl_state_setNull(&_pAnyPair->desc.nState, cfgmgr_SELECT_BOTH);
-
-        CFG_POSTCOND( cfgmgr_AnyPair_isNull(&_pAnyPair->desc,cfgmgr_SELECT_BOTH) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    static
-    inline
-    uno::Any anypair_Data_toAny(cfgmgr_AnyPair_Desc const* _pAnyPairDesc, 
-                                const void * const* _pAnyPairData, 
-                                sal_uInt8  _nSelect)
-    {
-        uno_Any aTmpAny;
-        anypair_Data_fill_Any(&aTmpAny,_pAnyPairDesc,_pAnyPairData,_nSelect);
-
-        return uno::Any( aTmpAny.pData, aTmpAny.pType );
-    }
-
-// -----------------------------------------------------------------------------
-    AnyPair::AnyPair(uno::Type const& _aType)				 // one Type, any's are null
-    {
-        anypair_construct_type(&m_aAnyPair, _aType.getTypeLibType());
-    }
-    
-// -----------------------------------------------------------------------------
-    AnyPair::AnyPair(uno::Any const& _aAny, SelectMember _select)
-    {
-        switch (_select)
-        {
-        case SELECT_FIRST:  anypair_construct_first(&m_aAnyPair,&_aAny);  break;
-        case SELECT_SECOND: anypair_construct_second(&m_aAnyPair,&_aAny); break;
-        case SELECT_BOTH:   OSL_VERIFY( anypair_construct(&m_aAnyPair,&_aAny,&_aAny) ); break;
-
-        default:            OSL_ENSURE(false, "AnyPair: Unknown member selector");
-                            anypair_construct_default(&m_aAnyPair); break;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-    AnyPair::AnyPair(uno::Any const& _aAny, uno::Any const& _aAny2) SAL_THROW((lang::IllegalArgumentException))
-    {
-        if (!anypair_construct(&m_aAnyPair,&_aAny, &_aAny2))
-        {
-            throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnyPair: Type mismatch in constructor.")),NULL,-1);
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-    // copy-ctor
-    AnyPair::AnyPair(AnyPair const& _aOther)
-    {
-        anypair_copy_construct(&m_aAnyPair, &_aOther.m_aAnyPair);
-    }
-    
-// -----------------------------------------------------------------------------
-    // assign operator
-    AnyPair& AnyPair::operator=(AnyPair const& _aOther)
-    {
-        anypair_assign(&m_aAnyPair, &_aOther.m_aAnyPair);
-        return *this;
-    }
-    
-// -----------------------------------------------------------------------------
-    // d-tor
-    AnyPair::~AnyPair()
-    {
-        anypair_destruct(&m_aAnyPair);
-    }
-    
-
-// -----------------------------------------------------------------------------
-    sal_Bool AnyPair::setFirst(uno::Any const& _aAny)
-    {
-        return anypair_assign_first(&m_aAnyPair,&_aAny);
-    }
-
-// -----------------------------------------------------------------------------
-    sal_Bool AnyPair::setSecond(uno::Any const& _aAny)
-    {
-        return anypair_assign_second(&m_aAnyPair,&_aAny);
-    }
-    
-// -----------------------------------------------------------------------------
-    void AnyPair::clear(SelectMember _select)
-    {
-        switch (_select)
-        {
-        case SELECT_FIRST:  anypair_clear_first(&m_aAnyPair);  break;
-        case SELECT_SECOND: anypair_clear_second(&m_aAnyPair); break;
-        case SELECT_BOTH:   anypair_clear_values(&m_aAnyPair); break;
-
-        default:            OSL_ENSURE(false, "AnyPair: Unknown member selector");
-                            break;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-    uno::Type AnyPair::getValueType() const 
-    {
-        return uno::Type(m_aAnyPair.desc.pType); 
-    }
-
-// -----------------------------------------------------------------------------
-    uno::Any AnyPair::getFirst() const
-    {
-        return anypair_Data_toAny( &m_aAnyPair.desc, &m_aAnyPair.first, cfgmgr_SELECT_FIRST );
-    }
-// -----------------------------------------------------------------------------
-    uno::Any AnyPair::getSecond() const
-    {
-        return anypair_Data_toAny( &m_aAnyPair.desc, &m_aAnyPair.second, cfgmgr_SELECT_SECOND );
-    }
-
-// -----------------------------------------------------------------------------
-    uno::Any AnyPair::getValue(SelectMember _select) const
-    {
-        switch (_select)
-        {
-        case SELECT_FIRST:  return getFirst();
-        case SELECT_SECOND: return getSecond();
-
-        default:            OSL_ENSURE(false, "AnyPair: Unknown member selector");
-        case SELECT_BOTH:   OSL_ENSURE(false, "AnyPair: Cannot get value - Invalid selector");
-                            return uno::Any();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-    
-} // namespace
- 
diff --git a/configmgr/source/misc/bootstrap.cxx b/configmgr/source/misc/bootstrap.cxx
deleted file mode 100644
index 714ed61ac2..0000000000
--- a/configmgr/source/misc/bootstrap.cxx
+++ /dev/null
@@ -1,704 +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: bootstrap.cxx,v $
- * $Revision: 1.35 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "bootstrap.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include "serviceinfohelper.hxx"
-#include "matchlocale.hxx"
-#include "tracer.hxx"
-#include <cppuhelper/component_context.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/file.hxx>
-#include <osl/process.h>
-#include <osl/diagnose.h>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/configuration/MissingBootstrapFileException.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/InstallationIncompleteException.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-// ---------------------------------------------------------------------------------------
-// legacy argument names
-#define ARGUMENT_LOCALE_COMPAT				"locale"
-#define ARGUMENT_ASYNC_COMPAT				"lazywrite"
-#define ARGUMENT_SERVERTYPE_COMPAT			"servertype"
-
-// legacy servertype setting
-#define SETTING_SERVERTYPE_COMPAT           "ServerType"
-#define BOOTSTRAP_SERVERTYPE_COMPAT         CONTEXT_ITEM_PREFIX_ SETTING_SERVERTYPE_COMPAT
-
-#define SERVERTYPE_UNO_COMPAT  			    "uno"
-#define SERVERTYPE_PLUGIN_COMPAT			"plugin"
-// ---------------------------------------------------------------------------------------
-
-#define NAME( N ) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(N))
-#define ITEM( N ) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(N))
-// ---------------------------------------------------------------------------------------
-// -------------------------------------------------------------------------
-
-// ---------------------------------------------------------------------------------------
-namespace configmgr
-{
-// ---------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
-    static void convertToBool(const uno::Any& aValue, sal_Bool& bValue)
-    {
-        rtl::OUString aStrValue;
-        if (aValue >>= aStrValue)
-        {
-            if (aStrValue.equalsIgnoreAsciiCaseAscii("true"))
-            {
-                bValue = sal_True;
-            }
-            else if (aStrValue.equalsIgnoreAsciiCaseAscii("false"))
-            {
-                bValue = sal_False;
-            }
-        }
-    }
-    // ----------------------------------------------------------------------------------
-    const sal_Char k_BootstrapContextImplName[]         = "com.sun.star.comp.configuration.bootstrap.BootstrapContext" ;
-    const sal_Char k_BootstrapContextServiceName[]      = "com.sun.star.configuration.bootstrap.BootstrapContext" ;
-
-    // -------------------------------------------------------------------------
-    static sal_Char const * const k_BootstrapContextServiceNames [] = 
-    {
-        k_BootstrapContextServiceName, 
-        0 
-    };
-    static const ServiceImplementationInfo k_BootstrapContextServiceInfo = 
-    { 
-        k_BootstrapContextImplName, 
-        k_BootstrapContextServiceNames,
-        0
-    };
-    static const SingletonRegistrationInfo k_BootstrapContextSingletonInfo = 
-    { 
-        A_BootstrapContextSingletonName,
-        k_BootstrapContextImplName, 
-        k_BootstrapContextServiceName, 
-        0
-    };
-// ---------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
-    uno::Reference<uno::XInterface> SAL_CALL 
-        instantiateBootstrapContext( uno::Reference< uno::XComponentContext > const& xTargetContext )
-    {
-        uno::Reference< uno::XComponentContext > xContext = UnoContextTunnel::recoverContext(xTargetContext);
-
-        BootstrapContext * pContext = new BootstrapContext(xContext);
-        uno::Reference< uno::XComponentContext > xResult(pContext);
-
-        pContext->initialize();
-
-        return uno::Reference< uno::XInterface >( xResult, uno::UNO_QUERY );
-    }
-
-    const SingletonRegistrationInfo * getBootstrapContextSingletonInfo()
-    {
-        return &k_BootstrapContextSingletonInfo;
-    }
-    const ServiceRegistrationInfo   * getBootstrapContextServiceInfo()
-    {
-        return getRegistrationInfo(&k_BootstrapContextServiceInfo);
-    }
-// ---------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-
-    static 
-    inline
-    cppu::ContextEntry_Init makeEntry(beans::NamedValue const & aOverride)
-    {
-        return cppu::ContextEntry_Init(aOverride.Name,aOverride.Value);
-    }
-// ---------------------------------------------------------------------------
-
-    static 
-    cppu::ContextEntry_Init makeSingleton(SingletonRegistrationInfo const * pSingletonInfo)
-    {
-        OSL_ASSERT( pSingletonInfo && 
-                    pSingletonInfo->singletonName && 
-                    pSingletonInfo->instantiatedServiceName );
-
-        rtl::OUStringBuffer aSingletonName;
-        aSingletonName.appendAscii( RTL_CONSTASCII_STRINGPARAM(SINGLETON_) );
-        aSingletonName.appendAscii(pSingletonInfo->singletonName);
-
-        rtl::OUString const aServiceName   = rtl::OUString::createFromAscii(pSingletonInfo->instantiatedServiceName);
-
-        return cppu::ContextEntry_Init(aSingletonName.makeStringAndClear(), uno::makeAny(aServiceName), true);
-    }
-// ---------------------------------------------------------------------------
-
-uno::Reference< uno::XComponentContext > BootstrapContext::createWrapper(uno::Reference< uno::XComponentContext > const & _xContext, uno::Sequence < beans::NamedValue > const & _aOverrides)
-{
-    std::vector< cppu::ContextEntry_Init > aContextEntries;
-    aContextEntries.reserve(_aOverrides.getLength() + 5);
-
-    // marker + bootstrap context
-    aContextEntries.push_back( cppu::ContextEntry_Init(NAME(CONTEXT_ITEM_IS_WRAPPER_CONTEXT), uno::makeAny(sal_True)) );
-    aContextEntries.push_back( cppu::ContextEntry_Init(NAME(CONTEXT_ITEM_IS_BOOTSTRAP_CONTEXT), uno::makeAny(sal_False)) );
-
-    aContextEntries.push_back( makeSingleton(getBootstrapContextSingletonInfo()) );
-
-    // singletons except for passthrough
-    if (!isPassthrough(_xContext))
-    {
-        aContextEntries.push_back( makeSingleton(getDefaultProviderSingletonInfo()) );
-        aContextEntries.push_back( makeSingleton(backend::getDefaultBackendSingletonInfo()) );
-    }
-
-    for (sal_Int32 i = 0; i<_aOverrides.getLength(); ++i)
-        aContextEntries.push_back( makeEntry(_aOverrides[i]) );
-
-    return cppu::createComponentContext(&aContextEntries.front(),aContextEntries.size(),_xContext);
-}
-// ---------------------------------------------------------------------------
-
-sal_Bool BootstrapContext::isWrapper(uno::Reference< uno::XComponentContext > const & _xContext)
-{
-    OSL_ASSERT(_xContext.is());
-    if (!_xContext.is()) return false;
-
-    uno::Any aSetting = _xContext->getValueByName( NAME(CONTEXT_ITEM_IS_WRAPPER_CONTEXT) );
-        
-    if (!aSetting.hasValue()) return false;
-
-    sal_Bool bValue = false;
-    OSL_VERIFY(aSetting >>= bValue);
-
-    return bValue;
-}
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-
-BootstrapContext::BootstrapContext(uno::Reference< uno::XComponentContext > const & _xContext)
-: ComponentContext(_xContext)
-{
-}
-// ---------------------------------------------------------------------------
-
-BootstrapContext::~BootstrapContext()
-{
-}
-// ---------------------------------------------------------------------------
-
-void BootstrapContext::initialize()
-{
-    // get default Bootstrap URL
-    rtl::OUString sURL;
-    uno::Any aExplicitURL;
-    if ( this->lookupInContext(aExplicitURL,NAME(CONTEXT_ITEM_PREFIX_ SETTING_INIFILE)) )
-    {
-        OSL_VERIFY(aExplicitURL >>= sURL);
-    }
-    else if (!rtl::Bootstrap::get(NAME(BOOTSTRAP_ITEM_INIFILE),sURL))
-    {
-        sURL = getDefaultConfigurationBootstrapURL();
-    }
-
-    ComponentContext::initialize(sURL);
-}
-// ---------------------------------------------------------------------------------------
-
-rtl::OUString BootstrapContext::getDefaultConfigurationBootstrapURL()
-{
-    rtl::OUString url(
-        RTL_CONSTASCII_USTRINGPARAM(
-            "$OOO_BASE_DIR/program/" SAL_CONFIGFILE("configmgr")));
-    rtl::Bootstrap::expandMacros(url); //TODO: detect failure
-    return url;
-}
-// ---------------------------------------------------------------------------------------
-
-rtl::OUString BootstrapContext::makeContextName(rtl::OUString const & _aName)
-{
-    // check that it isn't long already
-    OSL_ENSURE(!_aName.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_MODULE_PREFIX_) ),
-                "configmgr::BootstrapContext: passing argument in long context form won't work");
-
-    return NAME(CONTEXT_ITEM_PREFIX_).concat(_aName);
-}
-// ---------------------------------------------------------------------------
-
-rtl::OUString BootstrapContext::makeBootstrapName(rtl::OUString const & _aName)
-{
-    // check if already is short
-    if (!_aName.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_PREFIX_) ) )
-    {
-        OSL_TRACE( "configmgr: Cannot map name to bootstrap name: %s",
-                    rtl::OUStringToOString(_aName,RTL_TEXTENCODING_ASCII_US).getStr() );
-        return _aName;
-    }
-    return NAME(BOOTSTRAP_ITEM_PREFIX_).concat(_aName.copy(RTL_CONSTASCII_LENGTH(CONTEXT_ITEM_PREFIX_)));
-}
-// ---------------------------------------------------------------------------
-
-uno::Any SAL_CALL 
-    BootstrapContext::getValueByName( const rtl::OUString& aName )
-        throw (uno::RuntimeException)
-{
-    sal_Bool const bOurName = aName.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_MODULE_PREFIX_) );
-
-    if (bOurName)
-    {
-        if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_BOOTSTRAP_ERROR) ) )
-            return this->makeBootstrapException();
-
-        if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_PREFIX_ SETTING_INIFILE) ) )
-            return uno::makeAny( this->getBootstrapURL() );
-
-        if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_IS_BOOTSTRAP_CONTEXT) ) )
-            return uno::makeAny( sal_True );
-    }
-    else if (aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SINGLETON_ A_BootstrapContextSingletonName) ) )
-    {
-        return uno::makeAny( uno::Reference< uno::XComponentContext >(this) );
-    }
-
-    uno::Any aResult;
-
-    bool bFound = lookupInContext  ( aResult, aName );
-
-    if (!bFound && bOurName) // requires: CONTEXT_ITEM_PREFIX_ starts with CONTEXT_MODULE_PREFIX_
-    {
-        if ( aName.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_PREFIX_) ) )
-        {
-            bFound = lookupInBootstrap( aResult, makeBootstrapName(aName) );
-        }
-    }
-    return aResult;
-}
-
-// ---------------------------------------------------------------------------
-// class ContextReader
-// ---------------------------------------------------------------------------
-    
-    ContextReader::ContextReader(uno::Reference< uno::XComponentContext > const & context)
-    : m_basecontext(context)
-    , m_fullcontext()
-    {
-        OSL_ENSURE(context.is(), "ERROR: trying to create reader on NULL context\n");
-        if (context.is())
-        {
-            uno::Any aBootstrapContext = context->getValueByName( SINGLETON(A_BootstrapContextSingletonName) );
-            aBootstrapContext >>= m_fullcontext;
-        }
-    }
-// ---------------------------------------------------------------------------
-
-    uno::Reference< lang::XMultiComponentFactory > ContextReader::getServiceManager() const
-    {
-        OSL_ASSERT(m_basecontext.is());
-        return m_basecontext->getServiceManager();
-    }
-// ---------------------------------------------------------------------------
-    inline
-    uno::Any ContextReader::getSetting(rtl::OUString const & _aSetting) const
-    {
-        OSL_ASSERT(m_basecontext.is());
-        return getBestContext()->getValueByName(_aSetting);
-    }
-
-    inline
-    sal_Bool ContextReader::hasSetting(rtl::OUString const & _aSetting) const
-    {
-        return getSetting(_aSetting).hasValue();
-    }
-
-    inline
-    sal_Bool ContextReader::getBoolSetting(rtl::OUString const & _aSetting, sal_Bool bValue = false) const
-    {
-        uno::Any aValue = getSetting(_aSetting);
-        if (!(aValue >>= bValue))
-            convertToBool(aValue, bValue);
-        
-        return bValue;
-    }
-
-    inline
-    rtl::OUString ContextReader::getStringSetting(rtl::OUString const & _aSetting, rtl::OUString aValue = rtl::OUString()) const
-    {
-        getSetting(_aSetting) >>= aValue;
-        return aValue;
-    }
-// ---------------------------------------------------------------------------------------
-    
-    sal_Bool ContextReader::isUnoBackend() const
-    {
-        rtl::OUString aSettingName = NAME(BOOTSTRAP_SERVERTYPE_COMPAT);
-        
-        rtl::OUString aValue;
-        if (getSetting(aSettingName) >>= aValue)
-        {
-            return aValue.equalsAscii(SERVERTYPE_UNO_COMPAT);
-        }
-        else
-        {
-            return true;
-        }
-    }
-// ---------------------------------------------------------------------------------------
-
-    sal_Bool    ContextReader::hasUnoBackendService() const
-    {
-        return hasSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_UNOSERVICE) );
-    }
-    sal_Bool    ContextReader::hasUnoBackendWrapper() const
-    {
-        return hasSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_UNOWRAPPER) );
-    }
-
-    sal_Bool	ContextReader::hasLocale() const
-    {
-        return hasSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_LOCALE_NEW) );
-    }
-    sal_Bool	ContextReader::hasAsyncSetting() const
-    {
-        return hasSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_ASYNC_NEW) );
-    }
-    sal_Bool    ContextReader::hasOfflineSetting() const
-    {
-        return hasSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_OFFLINE) );
-    }
-// ---------------------------------------------------------------------------------------
-
-    rtl::OUString    ContextReader::getUnoBackendService() const
-    {
-        return getStringSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_UNOSERVICE) );
-    }
-    rtl::OUString    ContextReader::getUnoBackendWrapper() const
-    {
-        return getStringSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_UNOWRAPPER) );
-    }
-
-    rtl::OUString	ContextReader::getLocale() const
-    {
-        return getStringSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_LOCALE_NEW) );
-    }
-    sal_Bool	ContextReader::getAsyncSetting() const
-    {
-        return getBoolSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_ASYNC_NEW) );
-    }
-    sal_Bool	ContextReader::getOfflineSetting() const
-    {
-        return getBoolSetting( NAME(CONTEXT_ITEM_PREFIX_ SETTING_OFFLINE) );
-    }
-
-    // get a special setting
-    sal_Bool	ContextReader::isAdminService() const
-    {
-        return getBoolSetting( NAME(CONTEXT_ITEM_ADMINFLAG) );
-    }
-
-    sal_Bool    ContextReader::isBootstrapValid() const
-    {
-        return  this->isUnoBackend() &&
-                this->hasUnoBackendService() &&
-                (this->hasUnoBackendWrapper() || !this->getOfflineSetting()); 
-    }
-
-    uno::Any    ContextReader::getBootstrapError() const
-    {
-        return getSetting( NAME(CONTEXT_ITEM_BOOTSTRAP_ERROR) );
-    }
-// ---------------------------------------------------------------------------------------
-
-    bool ContextReader::testAdminService(uno::Reference< uno::XComponentContext > const & context, bool bAdmin)
-    {
-        OSL_ASSERT(context.is());
-        if (!context.is()) return false;
-
-        uno::Any aSetting = context->getValueByName( NAME(CONTEXT_ITEM_ADMINFLAG) );
-        
-        sal_Bool bValue = false;
-        bool bTest = (aSetting >>= bValue) && bValue;
-
-        return bTest == bAdmin;
-    }
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
-
-    bool ArgumentHelper::extractArgument(beans::NamedValue & rValue, const uno::Any & aOverride)
-    {
-        if ( ! (aOverride >>= rValue) )
-        {
-            // it must be a PropertyValue, if it isn't a NamedValue
-            beans::PropertyValue aPV;
-            if ( !(aOverride >>= aPV) )
-                return false;
-
-            rValue.Name  = aPV.Name;
-            rValue.Value = aPV.Value;
-        }
-
-        return true;
-    }
-
-// ---------------------------------------------------------------------------------------
-        
-    bool ArgumentHelper::checkBackendArgument(beans::NamedValue const & aAdjustedValue)
-    {
-        bool isWrappable =
-            aAdjustedValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_PREFIX_ SETTING_ASYNC_NEW)) ||
-            aAdjustedValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_PREFIX_ SETTING_LOCALE_NEW));
-
-        if (isWrappable) return false;
-
-        m_bHasBackendArguments = true;
-        return true;
-    }
-// ---------------------------------------------------------------------------------------
-
-    bool ArgumentHelper::filterAndAdjustArgument(beans::NamedValue & rValue)
-    {
-        // handle old servertype argument and filter the 'plugin' value
-        if (rValue.Name.equalsAscii(ARGUMENT_SERVERTYPE_COMPAT))
-        {
-            rtl::OUString aServertype;
-            if (! (rValue.Value >>= aServertype)) 
-                return false;
-
-            if (aServertype.equalsAscii(SERVERTYPE_PLUGIN_COMPAT)) 
-                return false; 
-
-            rValue.Name = NAME(BOOTSTRAP_SERVERTYPE_COMPAT);
-            // check, if it is already there
-            uno::Any const aExistingValue = m_context->getValueByName(rValue.Name);
-
-            if (aExistingValue.hasValue())
-                return !(aExistingValue == rValue.Value);
-
-            else
-                return !aServertype.equalsAscii(SERVERTYPE_UNO_COMPAT);
-        }
-
-        // map old argument names for comatibility
-        else if (rValue.Name.equalsAscii(ARGUMENT_LOCALE_COMPAT))
-            rValue.Name = NAME(SETTING_LOCALE_NEW);
-
-        else if (rValue.Name.equalsAscii(ARGUMENT_ASYNC_COMPAT))
-            rValue.Name = NAME(SETTING_ASYNC_NEW);
-
-        // give the item a long name
-        rValue.Name = BootstrapContext::makeContextName(rValue.Name);
-
-        // check, if it is already there
-        uno::Any const aExistingValue = m_context->getValueByName(rValue.Name);
-      
-        return ! (aExistingValue == rValue.Value);
-    }
-// ---------------------------------------------------------------------------------------
-
-    beans::NamedValue ArgumentHelper::makeAdminServiceOverride(sal_Bool bAdmin)
-    {
-        return beans::NamedValue( NAME(CONTEXT_ITEM_ADMINFLAG), uno::makeAny(bAdmin) );
-    }
-// ---------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
-// - bootstrapping error checking helper
-// ---------------------------------------------------------------------------------------
-namespace {
-// ---------------------------------------------------------------------------------------
-// error handling
-// ---------------------------------------------------------------------------------------
-    enum BootstrapResult
-    {
-        BOOTSTRAP_DATA_OK,
-        INCOMPLETE_BOOTSTRAP_DATA,
-        INCOMPLETE_BOOTSTRAP_FILE,
-        MISSING_BOOTSTRAP_FILE,
-        BOOTSTRAP_FAILURE
-    };
-// ---------------------------------------------------------------------------------------
-    static 
-    rtl::OUString getFallbackErrorMessage( BootstrapResult _rc )
-    {
-        rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("The program cannot start. "));
-
-        switch (_rc)
-        {
-        case MISSING_BOOTSTRAP_FILE:
-            sMessage = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A main configuration file is missing"));
-            break;
-
-        case INCOMPLETE_BOOTSTRAP_FILE:
-            sMessage = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A main configuration file is invalid"));
-            break;
-
-        case INCOMPLETE_BOOTSTRAP_DATA:
-            sMessage = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Required bootstrap data is not available"));
-            break;
-
-        default:
-            sMessage = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unexpected bootstrap failure"));
-            break;
-
-        case BOOTSTRAP_DATA_OK:
-            break;
-        }
-        sMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (No detailed error message available.)"));
-        
-        return sMessage;
-    }
-// ---------------------------------------------------------------------------------------
-
-    static
-    uno::Any impl_makeBootstrapException( BootstrapResult _rc, rtl::OUString const& _sMessage, rtl::OUString const& _sURL, uno::Reference< uno::XInterface > _xContext )
-    {
-        rtl::OUString sMessage(_sMessage);
-        // ensure a message
-        if (sMessage.getLength()== 0)
-        {
-            OSL_ENSURE(false, "Bootstrap error message missing");
-
-            sMessage = getFallbackErrorMessage(_rc);
-        }
-
-        // raise the error
-        switch (_rc)
-        {
-        case MISSING_BOOTSTRAP_FILE:
-            return uno::makeAny( com::sun::star::configuration::MissingBootstrapFileException(sMessage, _xContext, _sURL) );
-
-        case INCOMPLETE_BOOTSTRAP_FILE:
-            return uno::makeAny( com::sun::star::configuration::InvalidBootstrapFileException(sMessage, _xContext, _sURL) );
-
-        default: OSL_ENSURE(false, "Undefined BootstrapResult code");
-        case INCOMPLETE_BOOTSTRAP_DATA:
-        case BOOTSTRAP_FAILURE:
-            return uno::makeAny( com::sun::star::configuration::CannotLoadConfigurationException(sMessage, _xContext) );
-
-        case BOOTSTRAP_DATA_OK:		
-            break;
-        }
-        return uno::Any();
-    }
-// ---------------------------------------------------------------------------------------
-
-    static
-    inline
-    bool urlExists(rtl::OUString const& _sURL)
-    {
-        osl::DirectoryItem aCheck;
-        return (osl::DirectoryItem::get(_sURL,aCheck) == osl::DirectoryItem::E_None);
-    }
-// ---------------------------------------------------------------------------------------
-
-    static 
-    rtl::OUString buildBootstrapError( sal_Char const* _sWhat, rtl::OUString const& _sName, sal_Char const* _sHow)
-    {
-        rtl::OUStringBuffer sMessage;
-
-        sMessage.appendAscii(RTL_CONSTASCII_STRINGPARAM("The program cannot start. "));
-        sMessage.appendAscii(_sWhat);
-        sMessage.appendAscii(RTL_CONSTASCII_STRINGPARAM(" '")).append(_sName).appendAscii(RTL_CONSTASCII_STRINGPARAM("' "));
-        sMessage.appendAscii(_sHow).appendAscii(". ");
-
-        return sMessage.makeStringAndClear();
-    }
-// ---------------------------------------------------------------------------------------
-
-    BootstrapResult getBootstrapErrorMessage(BootstrapContext const & aContext, ContextReader const & aSettings, rtl::OUString& _rMessage, rtl::OUString& _rIniFile )
-    {
-        BootstrapResult eResult = BOOTSTRAP_DATA_OK;
-
-        _rIniFile = aContext.getBootstrapURL();
-
-        if ( !urlExists(_rIniFile) )
-        {
-            _rMessage = buildBootstrapError("The configuration file ",_rIniFile.copy(1+_rIniFile.lastIndexOf('/')),"is missing");
-            eResult = MISSING_BOOTSTRAP_FILE;
-        }
-        else if (!aSettings.isUnoBackend())
-        {
-            _rMessage = buildBootstrapError("The configuration file ",_rIniFile.copy(1+_rIniFile.lastIndexOf('/')),"is for an older version of the configuration database");
-            eResult = INCOMPLETE_BOOTSTRAP_FILE;
-        }
-        else if (!aSettings.isBootstrapValid() )
-        {
-             _rMessage = buildBootstrapError("Needed information to access",rtl::OUString::createFromAscii("application"), "configuration data is missing");
-            eResult = INCOMPLETE_BOOTSTRAP_DATA;
-        }
-        
-        return eResult;
-    }
-// ---------------------------------------------------------------------------------------
-} // anonymous namespace
-// ---------------------------------------------------------------------------------------
-uno::Any BootstrapContext::makeBootstrapException()
-{
-    ContextReader aReader(this);
-
-    if (aReader.isBootstrapValid()) return uno::Any();
-
-    rtl::OUString sMessage,sURL;
-
-    BootstrapResult rc = getBootstrapErrorMessage(*this,aReader,sMessage,sURL);
-
-    return impl_makeBootstrapException(rc,sMessage,sURL,*this);
-}
-// ---------------------------------------------------------------------------
-rtl::OUString SAL_CALL 
-    BootstrapContext::getImplementationName(void) 
-        throw (uno::RuntimeException) 
-{
-    return ServiceInfoHelper(&k_BootstrapContextServiceInfo).getImplementationName() ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL 
-    BootstrapContext::supportsService(const rtl::OUString& aServiceName) 
-        throw (uno::RuntimeException)
-{
-    return  ServiceInfoHelper(&k_BootstrapContextServiceInfo).supportsService(aServiceName) ;
-}
-//------------------------------------------------------------------------------
-uno::Sequence<rtl::OUString> SAL_CALL 
-    BootstrapContext::getSupportedServiceNames(void) 
-        throw (uno::RuntimeException)
-{
-    return ServiceInfoHelper(&k_BootstrapContextServiceInfo).getSupportedServiceNames() ;
-}
-// ---------------------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/misc/bootstrapcontext.cxx b/configmgr/source/misc/bootstrapcontext.cxx
deleted file mode 100644
index 5bd281f979..0000000000
--- a/configmgr/source/misc/bootstrapcontext.cxx
+++ /dev/null
@@ -1,417 +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: bootstrapcontext.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_configmgr.hxx"
-
-#include "bootstrapcontext.hxx"
-#include "datalock.hxx"
-#include <uno/current_context.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include "utility.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-#define IMPL_ITEM_PREFIX_     "/implementations/com.sun.star.com.configuration.bootstrap.ComponentContext/" 
-#define IMPL_ITEM_PASSTHRU    IMPL_ITEM_PREFIX_"isPassthrough" 
-#define IMPL_ITEM_BASECONTEXT IMPL_ITEM_PREFIX_"theBaseContext" 
-#define A_SERVICEMANAGER "com.sun.star.lang.theServiceManager"
-// ---------------------------------------------------------------------------
-
-#define OUSTR( text )     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( text ) )
-#define OU2ASCII( str ) ( rtl::OUStringToOString(str,RTL_TEXTENCODING_ASCII_US) .getStr() )
-// ---------------------------------------------------------------------------
-#if 0
-static void testComplete()
-{
-    uno::Reference< uno::XInterface > test = * new ComponentContext(uno::Reference< uno::XComponentContext >,uno::Sequence < beans::NamedValue >(),true);
-}
-#endif
-// ---------------------------------------------------------------------------
-
-ComponentContext::ComponentContext(uno::Reference< uno::XComponentContext > const & _xContext)
-: cppu::WeakComponentImplHelper3 < uno::XComponentContext, uno::XCurrentContext, lang::XServiceInfo >(UnoApiLock::getLock())
-, m_xContext(_xContext)
-, m_hBootstrapData(NULL)
-, m_xServiceManager()
-{
-}
-// ---------------------------------------------------------------------------
-
-ComponentContext::~ComponentContext()
-{
-    if (m_hBootstrapData) rtl_bootstrap_args_close(m_hBootstrapData);
-}
-// ---------------------------------------------------------------------------
-
-void ComponentContext::initialize( const rtl::OUString& _aURL )
-{
-    UnoApiLock aLock;
-
-    OSL_ASSERT(!m_hBootstrapData);
-    m_hBootstrapData = rtl_bootstrap_args_open(_aURL.pData);
-
-    uno::Reference< lang::XComponent > xOwner(m_xContext, uno::UNO_QUERY);
-
-    if (xOwner.is()) DisposingForwarder::forward(xOwner,this);
-
-    if (!m_xContext.is())
-    {
-        OSL_ENSURE(rBHelper.bDisposed,"ComponentContext::initialize - Context unexpectedly missing");
-        throw lang::DisposedException(OUSTR("Parent context has been disposed early"),*this);
-    }
-}
-// ---------------------------------------------------------------------------
-
-// ComponentHelper
-void SAL_CALL ComponentContext::disposing()
-{
-    UnoApiLock aLock;
-
-    m_xContext.clear();
-
-    if (m_hBootstrapData) 
-    {
-        rtl_bootstrap_args_close(m_hBootstrapData);
-        m_hBootstrapData = NULL;
-    }
-}
-// ---------------------------------------------------------------------------
-
-rtl::OUString ComponentContext::getBootstrapURL() const
-{
-    rtl::OUString aResult;
-
-    UnoApiLock aLock;
-
-    if (m_hBootstrapData)
-    {
-        rtl_bootstrap_get_iniName_from_handle(m_hBootstrapData,&aResult.pData);
-    }
-    else
-    {
-        OSL_TRACE( "configmgr: No bootstrap data URL set");
-    }
-
-    return aResult;
-}
-// ---------------------------------------------------------------------------
-
-uno::Reference< lang::XMultiComponentFactory > SAL_CALL 
-    ComponentContext::getServiceManager(  ) 
-        throw (uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    if (!m_xServiceManager.is())
-    {
-        uno::Reference< uno::XComponentContext > xBase = basecontext();
-        if (!xBase.is()) 
-            throw lang::DisposedException(OUSTR("Parent context has been disposed"),*this);
-
-        uno::Reference< lang::XMultiComponentFactory > xBaseServiceManager = xBase->getServiceManager();
-        OSL_ENSURE( xBaseServiceManager.is(), "Base context has no service manager");
-
-        if (xBaseServiceManager.is())
-        {
-            // create new smgr based on delegate's one
-            m_xServiceManager.set(
-                xBaseServiceManager->createInstanceWithContext( OUSTR("com.sun.star.comp.stoc.OServiceManagerWrapper"), xBase ),
-                uno::UNO_QUERY );
-            // patch DefaultContext property of new one
-            uno::Reference< beans::XPropertySet > xProps( m_xServiceManager, uno::UNO_QUERY );
-            OSL_ASSERT( xProps.is() );
-            if (xProps.is())
-            {
-                uno::Reference< XComponentContext > xThis( this );
-                xProps->setPropertyValue( OUSTR("DefaultContext"), uno::makeAny( xThis ) );
-            }
-            else 
-                OSL_ENSURE(!m_xServiceManager.is(), "Cannot set Default Context of Service Manager Wrapper: no property set");
-        }
-    }
-    return m_xServiceManager;
-}
-// ---------------------------------------------------------------------------
-
-
-// ---------------------------------------------------------------------------
-
-sal_Bool ComponentContext::isPassthrough(uno::Reference< uno::XComponentContext > const & _xContext)
-{
-    OSL_ENSURE(_xContext.is(),"Unexpected NULL context");
-    if (!_xContext.is()) return false;
-
-    sal_Bool bValue = false;
-    _xContext->getValueByName(OUSTR(IMPL_ITEM_PASSTHRU)) >>= bValue;
-    return bValue;
-}
-// ---------------------------------------------------------------------------
-        
-beans::NamedValue ComponentContext::makePassthroughMarker(sal_Bool bPassthrough)
-{
-    return beans::NamedValue(OUSTR(IMPL_ITEM_PASSTHRU),uno::makeAny(bPassthrough));
-}
-// ---------------------------------------------------------------------------
-
-bool ComponentContext::lookupInContext( uno::Any & _rValue, const rtl::OUString& _aName ) const
-{
-    uno::Reference< uno::XComponentContext > xBase = basecontext();
-    if (!xBase.is()) 
-        throw lang::DisposedException(OUSTR("Parent context has been disposed"),const_cast<ComponentContext&>(*this));
-
-    if (_aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( IMPL_ITEM_BASECONTEXT )))
-    {
-        _rValue = uno::makeAny(xBase);
-        return true;
-    }
-    
-    uno::Any aCtxValue = xBase->getValueByName( _aName );
-
-    if (aCtxValue.hasValue())
-    {
-        _rValue = aCtxValue;
-        return true;
-    }
-    else
-        return false;
-}
-// ---------------------------------------------------------------------------
-
-bool ComponentContext::lookupInBootstrap( uno::Any & _rValue, const rtl::OUString& _aName ) const
-{
-    UnoApiLock aLock;
-    rtl::OUString sResult;
-    if ( rtl_bootstrap_get_from_handle( m_hBootstrapData, _aName.pData, &sResult.pData, 0) )
-    {
-        _rValue <<= sResult;
-        return true;
-    }
-    else
-        return false;
-}
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-
-static const char k_TunneledContext[] = "/services/com.sun.star.configuration.bootstrap.Context";
-
-class UnoContextTunnel::Tunnel
-: public ::cppu::WeakImplHelper2< uno::XCurrentContext, lang::XUnoTunnel >
-{
-    uno::Reference< uno::XComponentContext >         m_xTunneledContext;
-    uno::Reference< uno::XCurrentContext >  m_xOldContext;
-    uno::Any        m_aFailure;
-public:
-    Tunnel(uno::Reference< uno::XComponentContext > const & xTunneledContext, uno::Reference< uno::XCurrentContext > const & xOldContext)
-    : m_xTunneledContext(xTunneledContext)
-    , m_xOldContext(xOldContext)
-    , m_aFailure()
-    {}
-
-    virtual uno::Any SAL_CALL 
-        getValueByName( const rtl::OUString& name )
-            throw (uno::RuntimeException)
-    {
-        if (name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(k_TunneledContext) ) )
-        {
-            return uno::makeAny(m_xTunneledContext);
-        }
-        else if (m_xOldContext.is())
-        {
-            return m_xOldContext->getValueByName(name);
-        }
-        else
-        {
-            return uno::Any();
-        }
-    }
-
-    virtual sal_Int64 SAL_CALL 
-        getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) 
-            throw (uno::RuntimeException) 
-    {
-        if (getTunnelId() == aIdentifier)
-            return reinterpret_cast<sal_Int64>(&m_aFailure);
-        else
-            return 0;
-    }
-
-    static uno::Any * getFailure(uno::Reference< lang::XUnoTunnel > const & xTunnel);
-
-    static uno::Sequence< sal_Int8 > getTunnelId();
-};
-// ---------------------------------------------------------------------------
-
-uno::Sequence< sal_Int8 > UnoContextTunnel::Tunnel::getTunnelId()
-{
-    static ::cppu::OImplementationId aTunnelId;
-    return aTunnelId.getImplementationId();
-}
-// ---------------------------------------------------------------------------
-
-uno::Any * UnoContextTunnel::Tunnel::getFailure(uno::Reference< lang::XUnoTunnel > const & xTunnel)
-{
-    if (xTunnel.is())
-    {
-    if (sal_Int64 nSomething = xTunnel->getSomething(getTunnelId()))
-    {
-        return reinterpret_cast<uno::Any *>(nSomething);
-    }
-    }
-    return NULL;
-}
-// ---------------------------------------------------------------------------
-
-UnoContextTunnel::UnoContextTunnel()
-: m_xOldContext( uno::getCurrentContext() )
-, m_xActiveTunnel()
-{
-}
-// ---------------------------------------------------------------------------
-
-UnoContextTunnel::~UnoContextTunnel()
-{
-    uno::setCurrentContext( m_xOldContext );
-}
-// ---------------------------------------------------------------------------
-
-void UnoContextTunnel::passthru(uno::Reference< uno::XComponentContext > const & xContext)
-{
-    OSL_ASSERT( xContext.is() );
-    if ( ComponentContext::isPassthrough(xContext) )
-    {
-        this ->tunnel(xContext);
-    }
-    else
-    {
-        this->tunnel(NULL);
-    }
-}
-// ---------------------------------------------------------------------------
-
-void UnoContextTunnel::tunnel(uno::Reference< uno::XComponentContext > const & xContext)
-{
-    Tunnel * pNewTunnel = new Tunnel(xContext,m_xOldContext);
-    m_xActiveTunnel = pNewTunnel;
-    uno::setCurrentContext( pNewTunnel );
-}
-// ---------------------------------------------------------------------------
-
-uno::Reference< uno::XComponentContext > UnoContextTunnel::recoverContext(uno::Reference< uno::XComponentContext > const & xFallback )
-{
-    try
-    {
-        uno::Reference< uno::XCurrentContext > const xCurrContext = uno::getCurrentContext();
-
-        if (xCurrContext.is())
-        {
-            rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(k_TunneledContext));
-            uno::Reference< uno::XComponentContext > xResult;
-            if (xCurrContext->getValueByName(aName) >>= xResult)
-            {
-                if (xResult.is())
-                    return xResult;
-            }
-            else
-            {
-                OSL_ASSERT( !xResult.is() );
-                OSL_ENSURE( !xCurrContext->getValueByName(aName).hasValue(),
-                            "Value in context has wrong type");
-            }
-        }
-    }
-    catch (uno::Exception &)
-    {
-        OSL_ENSURE(false, "Unexpected: Exception from accessing current context");
-    }
-
-    return xFallback;
-}
-// ---------------------------------------------------------------------------
-
-uno::Any UnoContextTunnel::recoverFailure(bool bRaise)
-{
-    if (uno::Any * pFail = UnoContextTunnel::Tunnel::getFailure(m_xActiveTunnel))
-    {
-        if (bRaise)
-        {
-            if (pFail->hasValue())
-                cppu::throwException(*pFail);
-            else
-                throw;
-        }
-        return *pFail;
-    }
-
-    return uno::Any();
-}
-// ---------------------------------------------------------------------------
-
-bool UnoContextTunnel::tunnelFailure(uno::Any const & aException, bool bRaise)
-{
-    OSL_ASSERT( !aException.hasValue() || aException.getValueTypeClass() == uno::TypeClass_EXCEPTION );
-
-    uno::Reference< lang::XUnoTunnel > xTunnel( uno::getCurrentContext(), uno::UNO_QUERY );
-
-    if (uno::Any * pFail = Tunnel::getFailure(xTunnel))
-    {
-        *pFail = aException;
-
-        if (bRaise && aException.hasValue())
-            cppu::throwException(aException);
-
-        if (bRaise) throw;
-        return true;
-    }
-    else
-    {
-        if (bRaise) throw;
-        return false;
-    }
-}
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-void DisposingForwarder::disposing( lang::EventObject const & /*rSource*/ )
-throw (uno::RuntimeException)
-{
-    m_xTarget->dispose();
-    m_xTarget.clear();
-}
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-} // namespace config
-
-
diff --git a/configmgr/source/misc/bufferedfile.cxx b/configmgr/source/misc/bufferedfile.cxx
deleted file mode 100644
index e81120667b..0000000000
--- a/configmgr/source/misc/bufferedfile.cxx
+++ /dev/null
@@ -1,133 +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: bufferedfile.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_configmgr.hxx"
-
-#include <string.h>
-#include "bufferedfile.hxx"
-
-#include "filehelper.hxx"
-
-#include <algorithm>
-
-
-namespace configmgr
-{
-
-BufferedOutputFile::BufferedOutputFile( rtl::OUString const& aFileURL, sal_uInt32 nBufferSizeHint )
-: m_pFile(new osl::File(aFileURL))    
-, m_buffer()    
-{
-    m_buffer.reserve( nBufferSizeHint ? nBufferSizeHint : 512 );
-}
-
-BufferedOutputFile::~BufferedOutputFile ()
-{
-    delete m_pFile;
-}
-
-
-BufferedOutputFile::RC BufferedOutputFile::open( sal_uInt32 uFlags )
-{
-    if (!m_pFile) return E_BADF;
-    
-    return m_pFile->open(uFlags);
-}
-
-BufferedOutputFile::RC BufferedOutputFile::close()
-{
-    if (!m_pFile) return E_BADF;
-
-    RC rc = this->sync();
-    RC rc2 = m_pFile->close();
-
-    delete m_pFile, m_pFile = 0;
-    if (rc == E_None)
-        rc = rc2;
-    return rc;
-}
-
-
-//BufferedOutputFile::RC BufferedOutputFile::getPos( sal_uInt64& uPos )
-
-BufferedOutputFile::RC BufferedOutputFile::write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
-{
-    if (!m_pFile) return E_BADF;
-
-    if (uBytesToWrite > m_buffer.max_size()-m_buffer.size())
-    {
-        // write big chunks natively
-        RC rc = this->sync();
-        if (rc == E_None)
-        {
-            OSL_ASSERT(m_buffer.empty());
-            rc = m_pFile->write(pBuffer, uBytesToWrite, rBytesWritten);
-        }
-        return rc;
-    }
-
-    // FIXME: handle out-out-memory here
-    const sal_uInt8 * data = static_cast<const sal_uInt8 *>(pBuffer);
-    m_buffer.insert(m_buffer.end(), data, data + uBytesToWrite);
-    rBytesWritten = uBytesToWrite;
-    
-    return E_None;
-}
-
-BufferedOutputFile::RC BufferedOutputFile::sync()
-{
-    if (!m_pFile) return E_BADF;
-
-    sal_uInt64 size = m_buffer.size();
-    sal_uInt64 written = 0;
-
-    RC rc = m_pFile->write(&m_buffer.front(),size,written);
-    
-    if (rc != E_None)
-        return rc;
-
-    // we don't support special files where multiple write passes are needed
-    if (written < size)
-    {
-        // but we try our best to stay consistent
-        m_buffer.erase(m_buffer.begin(),
-                       m_buffer.end() + sal::static_int_cast<sal_uInt32>( written ));
-
-        return E_IO;
-    }
-    
-    m_buffer.clear();
-
-    return E_None;
-}
-
-} // namespace configmgr
-
diff --git a/configmgr/source/misc/configinteractionhandler.cxx b/configmgr/source/misc/configinteractionhandler.cxx
deleted file mode 100644
index a1b48777e2..0000000000
--- a/configmgr/source/misc/configinteractionhandler.cxx
+++ /dev/null
@@ -1,115 +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: configinteractionhandler.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_configmgr.hxx"
-
-#include "sal/config.h"
-
-#include "configinteractionhandler.hxx"
-
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/XCurrentContext.hpp"
-#include "cppuhelper/implbase1.hxx"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "uno/current_context.hxx"
-
-namespace {
-
-namespace css = com::sun::star;
-
-static char const INTERACTION_HANDLER[] = "configuration.interaction-handler";
-
-}
-
-namespace configmgr { namespace apihelper {
-
-class ConfigurationInteractionHandler::Context:
-    public cppu::WeakImplHelper1< css::uno::XCurrentContext >
-{
-public:
-    explicit Context(ConfigurationInteractionHandler * parent):
-        m_parent(parent) {}
-
-    virtual css::uno::Any SAL_CALL getValueByName(rtl::OUString const & name)
-        throw (css::uno::RuntimeException)
-    {
-        return
-            name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(INTERACTION_HANDLER))
-            ? m_handler : m_parent->getPreviousContextValue(name);
-    }
-
-    void setInteractionHandler(
-        css::uno::Reference< css::task::XInteractionHandler > const & handler)
-    { m_handler <<= handler; }
-
-private:
-    Context(Context &); // not defined
-    void operator =(Context &); // not defined
-
-    virtual ~Context() {}
-
-    ConfigurationInteractionHandler * m_parent;
-    css::uno::Any m_handler;
-};
-
-ConfigurationInteractionHandler::ConfigurationInteractionHandler():
-    m_context(new Context(this)), m_layer(m_context.get()) {}
-
-ConfigurationInteractionHandler::~ConfigurationInteractionHandler() {}
-
-css::uno::Reference< css::task::XInteractionHandler >
-ConfigurationInteractionHandler::get() const {
-    return css::uno::Reference< css::task::XInteractionHandler >(
-        getPreviousContextValue(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(INTERACTION_HANDLER))),
-        css::uno::UNO_QUERY);
-}
-
-void ConfigurationInteractionHandler::setRecursive(
-    css::uno::Reference< css::task::XInteractionHandler > const & handler)
-{
-    m_context->setInteractionHandler(handler);
-}
-
-css::uno::Any ConfigurationInteractionHandler::getPreviousContextValue(
-    rtl::OUString const & name) const
-{
-    css::uno::Reference< css::uno::XCurrentContext > c(
-        m_layer.getPreviousContext());
-    return c.is() ? c->getValueByName(name) : css::uno::Any();
-}
-
-} }
diff --git a/configmgr/source/misc/configunoreg.cxx b/configmgr/source/misc/configunoreg.cxx
deleted file mode 100644
index e8aed48f5d..0000000000
--- a/configmgr/source/misc/configunoreg.cxx
+++ /dev/null
@@ -1,389 +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: configunoreg.cxx,v $
- * $Revision: 1.33 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-
-#include "confapifactory.hxx"
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/factory.hxx>
-#include <rtl/ustrbuf.hxx>
-
-// ***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void RegisterService(
-        const configmgr::ServiceRegistrationInfo* pInfo, 
-        const com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > & xKey)
-{
-    if (pInfo == 0 || pInfo->registeredServiceNames==0 || pInfo->implementationName==0)
-        return;
-
-    rtl::OUStringBuffer aMainKeyName;
-    aMainKeyName.appendAscii("/");
-    aMainKeyName.appendAscii(pInfo->implementationName);
-    aMainKeyName.appendAscii("/UNO/SERVICES");
-
-    com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName.makeStringAndClear()) );
-    OSL_ENSURE(xNewKey.is(), "CONFMGR::component_writeInfo : could not create a registry key !");
-
-    for(sal_Char const * const* p = pInfo->registeredServiceNames ; *p; ++p)
-    {
-        xNewKey->createKey(rtl::OUString::createFromAscii(*p));
-    }
-}
-
-//---------------------------------------------------------------------------------------
-    
-void RegisterSingleton(
-        const configmgr::SingletonRegistrationInfo* pInfo, 
-        const com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > & xKey)
-{
-    if (pInfo == 0 ||   pInfo->singletonName            ==0 || 
-                        pInfo->implementationName       ==0 ||
-                        pInfo->instantiatedServiceName  ==0 ) 
-        return;
-
-    rtl::OUStringBuffer aSingletonKeyName;
-    aSingletonKeyName.appendAscii("/");
-    aSingletonKeyName.appendAscii(pInfo->implementationName);
-    aSingletonKeyName.appendAscii("/UNO/SINGLETONS/");
-    aSingletonKeyName.appendAscii(pInfo->singletonName);
-
-    com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aSingletonKeyName.makeStringAndClear()) );
-    OSL_ENSURE(xNewKey.is(), "CONFMGR::component_writeInfo : could not create a registry key !");
-
-    xNewKey->setStringValue(rtl::OUString::createFromAscii(pInfo->instantiatedServiceName));
-
-    if (pInfo->mappedImplementation != 0)
-        RegisterService(pInfo->mappedImplementation,xKey);
-}
-
-
-//-----------------------------------------------------------------------------
-struct ServiceImplementationRequest
-{
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRet;
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > const m_xServiceManager;
-    rtl::OUString const sImplementationName;
-
-    //-------------------------------------------------------------------------
-    ServiceImplementationRequest(
-        void* pServiceManager,
-        sal_Char const* pImplementationName
-    )
-    : m_xServiceManager(reinterpret_cast<com::sun::star::lang::XMultiServiceFactory*>(pServiceManager))
-    , sImplementationName(rtl::OUString::createFromAscii(pImplementationName))
-    {
-    }
-    //-------------------------------------------------------------------------
-    inline
-    sal_Bool shouldCreate(const configmgr::ServiceRegistrationInfo* pInfo) const
-    {
-        OSL_ENSURE(!xRet.is(), "CreateProvider : invalid creation request: we already have a return value !");
-        return !xRet.is()	&& 
-                pInfo != 0	&& 
-                0 == sImplementationName.compareToAscii(pInfo->implementationName);
-    }
-
-    //-------------------------------------------------------------------------
-
-    sal_Bool CreateProviderFactory(
-                const configmgr::ServiceRegistrationInfo* pInfo,
-                bool bAdmin
-            )
-    {
-        if (this->shouldCreate(pInfo))
-        try																							
-        {	
-            configmgr::ServiceRegistrationHelper aInfo(pInfo);
-
-            const com::sun::star::uno::Sequence< rtl::OUString > Services=  aInfo.getRegisteredServiceNames(); 
-            
-            xRet = configmgr::createProviderFactory( aInfo.getImplementationName(), bAdmin);
-
-            OSL_ENSURE(xRet.is(), "CreateProvider : WHERE IS THE return value !");
-        }
-        catch(com::sun::star::uno::Exception&)
-        {
-        }
-        return xRet.is();
-    }
-
-    //-------------------------------------------------------------------------
-
-    sal_Bool CreateServiceFactory(
-                const configmgr::ServiceRegistrationInfo* pInfo,
-                ::cppu::ComponentFactoryFunc Factory
-            )
-    {
-        if (this->shouldCreate(pInfo))
-        try																							
-        {	
-            configmgr::ServiceRegistrationHelper aInfo(pInfo);
-
-            const com::sun::star::uno::Sequence< rtl::OUString > Services=  aInfo.getRegisteredServiceNames(); 
-            
-            xRet = cppu::createSingleComponentFactory( Factory, aInfo.getImplementationName(), Services, 0);
-
-            OSL_ENSURE(xRet.is(), "CreateProvider : WHERE IS THE return value !");
-        }
-        catch(com::sun::star::uno::Exception&)
-        {
-        }
-        return xRet.is();
-    }
-
-    //-------------------------------------------------------------------------
-
-    sal_Bool CreateSingletonMapperFactory(
-                const configmgr::SingletonRegistrationInfo* pInfo,
-                ::cppu::ComponentFactoryFunc Mapper
-            )
-    {
-        OSL_ENSURE(pInfo && pInfo->mappedImplementation, "CreateProvider : Cannot map unmapped singleton !");
-        
-        return pInfo && pInfo->mappedImplementation &&
-                CreateServiceFactory(pInfo->mappedImplementation,Mapper);
-    }
-
-    //-------------------------------------------------------------------------
-    void* getService() const 
-    { 
-        // we want to transport the interface pointer as flat C void pointer, so this prevents deletion
-        if (xRet.is())
-            xRet->acquire();
-
-        return xRet.get(); 
-    }
-};
-
-//---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT
-void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /* ppEnv */
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                            void* /* pServiceManager */,
-                            void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast<com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        // configuration access entry points: configuration provider
-        RegisterSingleton(configmgr::getDefaultProviderSingletonInfo(), xKey) ;
-
-        RegisterService(configmgr::getConfigurationProviderServiceInfo(), xKey);		
-        RegisterService(configmgr::getDefaultProviderServiceInfo(), xKey);		
-        RegisterService(configmgr::getAdminProviderServiceInfo(), xKey);		
-
-        // registry wrapper (deprecated)
-        RegisterService(configmgr::getConfigurationRegistryServiceInfo(), xKey);		
-
-        // updating
-        RegisterService(configmgr::backend::getUpdateMergerServiceInfo(), xKey);		
-
-        // xml handling
-        RegisterService(configmgr::xml::getSchemaParserServiceInfo(), xKey);		
-        RegisterService(configmgr::xml::getLayerParserServiceInfo(), xKey);		
-        RegisterService(configmgr::xml::getLayerWriterServiceInfo(), xKey);	
-        
-        // bootstrap handling
-        RegisterSingleton(configmgr::getBootstrapContextSingletonInfo(), xKey) ;
-        RegisterService(configmgr::getBootstrapContextServiceInfo(), xKey) ;
-
-        // backend singletons
-        RegisterSingleton(configmgr::backend::getDefaultBackendSingletonInfo(), xKey) ;
-
-        // backends
-        RegisterService(configmgr::backend::getDefaultBackendServiceInfo(), xKey) ;
-        RegisterService(configmgr::backend::getSingleBackendAdapterServiceInfo(), xKey) ;
-        RegisterService(configmgr::backend::getMultiStratumBackendServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalBackendServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalDataImportServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalHierarchyBrowserServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalSchemaSupplierServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalLegacyStratumServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalDataStratumServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalReadonlyStratumServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalResourceStratumServiceInfo(), xKey) ;
-        RegisterService(configmgr::localbe::getLocalMultiStratumServiceInfo(), xKey) ;
-        
-        // im/export
-        RegisterService(configmgr::backend::getMergeImportServiceInfo(), xKey);		
-        RegisterService(configmgr::backend::getCopyImportServiceInfo(), xKey);		
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "configmgr: component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
-                    const sal_Char* pImplementationName,
-                    void* pServiceManager,
-                    void* /*pRegistryKey*/)
-{
-    void* pRet = 0;
-    if (pServiceManager)
-    {
-        ServiceImplementationRequest aReq(pServiceManager,pImplementationName);
-
-        // configuration access entry points: configuration provider
-        aReq.CreateProviderFactory(
-            configmgr::getConfigurationProviderServiceInfo(),
-            false) 
-        ||		
-        aReq.CreateProviderFactory(
-            configmgr::getAdminProviderServiceInfo(),
-            true) 
-        ||		
-        aReq.CreateServiceFactory(
-            configmgr::getDefaultProviderServiceInfo(),
-            &configmgr::instantiateDefaultProvider) 
-        ||		
-        // registry wrapper (deprecated)
-        aReq.CreateServiceFactory(
-            configmgr::getConfigurationRegistryServiceInfo(),
-            &configmgr::instantiateConfigRegistry) 
-        ||
-        // updating
-        aReq.CreateServiceFactory(
-            configmgr::backend::getUpdateMergerServiceInfo(),
-            &configmgr::backend::instantiateUpdateMerger) 
-        ||
-        // xml handling
-        aReq.CreateServiceFactory(
-            configmgr::xml::getSchemaParserServiceInfo(),
-            &configmgr::xml::instantiateSchemaParser) 
-        ||
-        aReq.CreateServiceFactory(
-            configmgr::xml::getLayerParserServiceInfo(),
-            &configmgr::xml::instantiateLayerParser) 
-        ||
-        aReq.CreateServiceFactory(
-            configmgr::xml::getLayerWriterServiceInfo(),
-            &configmgr::xml::instantiateLayerWriter) 
-        ||
-        // bootstrap handling
-        aReq.CreateServiceFactory(
-            configmgr::getBootstrapContextServiceInfo(),
-            &configmgr::instantiateBootstrapContext) 
-        ||
-        // backend singletons
-        aReq.CreateSingletonMapperFactory(
-                configmgr::backend::getDefaultBackendSingletonInfo(),
-                configmgr::backend::getDefaultBackendSingleton)
-        ||
-        // backends
-        aReq.CreateServiceFactory(
-                configmgr::backend::getDefaultBackendServiceInfo(),
-                configmgr::backend::instantiateDefaultBackend)
-        ||
-        aReq.CreateServiceFactory(
-                configmgr::backend::getSingleBackendAdapterServiceInfo(),
-                configmgr::backend::instantiateSingleBackendAdapter)
-        ||
-        aReq.CreateServiceFactory(
-                configmgr::backend::getMultiStratumBackendServiceInfo(),
-                configmgr::backend::instantiateMultiStratumBackend)
-        ||
-        aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalBackendServiceInfo(),
-                configmgr::localbe::instantiateLocalBackend)
-        ||
-        aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalDataImportServiceInfo(),
-                configmgr::localbe::instantiateLocalDataImporter)
-        ||
-        aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalHierarchyBrowserServiceInfo(),
-                configmgr::localbe::instantiateLocalHierarchyBrowser)
-        ||
-         aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalSchemaSupplierServiceInfo(),
-                configmgr::localbe::instantiateLocalSchemaSupplier)
-        ||
-         aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalLegacyStratumServiceInfo(),
-                configmgr::localbe::instantiateLocalLegacyStratum)
-        ||
-         aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalDataStratumServiceInfo(),
-                configmgr::localbe::instantiateLocalDataStratum)
-        ||
-         aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalReadonlyStratumServiceInfo(),
-                configmgr::localbe::instantiateLocalReadonlyStratum)
-        ||
-         aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalResourceStratumServiceInfo(),
-                configmgr::localbe::instantiateLocalResourceStratum)
-        ||
-         aReq.CreateServiceFactory(
-                configmgr::localbe::getLocalMultiStratumServiceInfo(),
-                configmgr::localbe::instantiateLocalMultiStratum)
-        ||
-        // im/export
-        aReq.CreateServiceFactory(
-            configmgr::backend::getMergeImportServiceInfo(),
-            &configmgr::backend::instantiateMergeImporter) 
-        ||
-        aReq.CreateServiceFactory(
-            configmgr::backend::getCopyImportServiceInfo(),
-            &configmgr::backend::instantiateCopyImporter);
-
-        pRet = aReq.getService();
-    }
-
-    return pRet;
-}
-//---------------------------------------------------------------------------------------
-
diff --git a/configmgr/source/misc/filehelper.cxx b/configmgr/source/misc/filehelper.cxx
deleted file mode 100644
index a0e8a5ffa1..0000000000
--- a/configmgr/source/misc/filehelper.cxx
+++ /dev/null
@@ -1,390 +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: filehelper.cxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-
-#ifndef _RTL_USTRING_H_
-#include <rtl/ustring.hxx>
-#endif
-#include <osl/file.hxx>
-#include "filehelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-
-#define ASCII(x) rtl::OUString::createFromAscii(x)		
-
-namespace configmgr 
-{
-    //==========================================================================
-    //= FileHelper
-    //==========================================================================	
-
-    // -----------------------------------------------------------------------------
-    bool FileHelper::tryToRemoveFile(const rtl::OUString& _aURL, bool tryBackupFirst)
-    {	
-        if (tryBackupFirst)
-        {	
-            rtl::OUString aBakURL = _aURL.concat( ASCII(".bak") );
-            osl::File::RC eBakError = osl::File::move(_aURL,aBakURL);
-            if (eBakError == osl::File::E_None)
-                return true;
-        }
-        osl::File::RC eError = osl::File::remove(_aURL);
-        return eError == osl::File::E_None || eError == osl::File::E_NOENT;
-    }
-    // -----------------------------------------------------------------------------
-    void FileHelper::replaceFile(
-        const rtl::OUString& _aToURL, const rtl::OUString &_aFromURL) SAL_THROW((io::IOException))
-    {		
-        osl::File::remove(_aToURL);		
-        osl::File::RC eError = osl::File::move(_aFromURL, _aToURL);
-        if (eError != osl::File::E_None &&
-            eError != osl::File::E_NOENT)
-        {
-            rtl::OUStringBuffer sErrorBuf;
-            sErrorBuf.appendAscii("Configmgr: replaceFile failed ");
-            sErrorBuf.appendAscii("for replacing file \"").append(_aFromURL).appendAscii("\". ");
-            sErrorBuf.appendAscii("by file \"").append(_aToURL).appendAscii("\". ");
-            sErrorBuf.appendAscii("Error = \"").append(FileHelper::createOSLErrorString(eError)).appendAscii("\" ");
-            sErrorBuf.appendAscii("[").append(sal_Int32(eError)).appendAscii("] ");
-
-            rtl::OUString const sError = sErrorBuf.makeStringAndClear();
-            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
-            throw io::IOException(sError, NULL);			
-        }
-    }
-
-    // -----------------------------------------------------------------------------
-    bool FileHelper::fileExists(rtl::OUString const& _sFileURL)
-    {
-        osl::DirectoryItem aItem;
-        return osl::DirectoryItem::get(_sFileURL, aItem) == osl::Directory::E_None;		
-    }
-
-    // -----------------------------------------------------------------------------
-    bool FileHelper::dirExists(rtl::OUString const& _sDirURL)
-    {
-        return osl::Directory(_sDirURL).open() == osl::Directory::E_None;		
-    }		
-
-    // -----------------------------------------------------------------------------
-    sal_uInt64 FileHelper::getModifyStatus(rtl::OUString const& _sURL, TimeValue & rModifyTime)
-    {
-        static const TimeValue k_NullTime = {0,0};		
-        sal_uInt64 aSize = 0;
-        rModifyTime = k_NullTime;
-
-        osl::DirectoryItem aItem;		
-        if (osl::FileBase::E_None == osl::DirectoryItem::get(_sURL, aItem))
-        {
-            osl::FileStatus aStatus(osl_FileStatus_Mask_ModifyTime|osl_FileStatus_Mask_Type|osl_FileStatus_Mask_FileSize);			
-            if (osl::FileBase::E_None == aItem.getFileStatus(aStatus))
-            {
-                if (aStatus.isValid(osl_FileStatus_Mask_ModifyTime))
-                    rModifyTime = aStatus.getModifyTime();
-            
-                if (aStatus.isValid(osl_FileStatus_Mask_FileSize))
-                    aSize = aStatus.getFileSize();
-            }
-        }
-        return aSize;
-    }
-    
-    // -----------------------------------------------------------------------------
-    rtl::OUString FileHelper::createOSLErrorString(osl::FileBase::RC eError)
-    {
-        rtl::OUString aRet;
-        switch(eError)
-        {
-        case osl::FileBase::E_None:			
-            break;
-
-        case osl::FileBase::E_PERM:
-            aRet = ASCII("Operation not permitted");
-            break;
-
-        case osl::FileBase::E_NOENT:
-            aRet = ASCII("No such file or directory");
-            break;
-
-        case osl::FileBase::E_SRCH:
-            aRet = ASCII("unknown error: osl_File_E_SRCH");
-            break;
-
-        case osl::FileBase::E_INTR:
-            aRet = ASCII("function call was interrupted");
-            break;
-
-        case osl::FileBase::E_IO:
-            aRet = ASCII("I/O error");
-            break;
-
-        case osl::FileBase::E_NXIO:
-            aRet = ASCII("No such device or address");
-            break;
-
-        case osl::FileBase::E_2BIG:
-            aRet = ASCII("unknown error: osl_File_E_2BIG");
-            break;
-
-        case osl::FileBase::E_NOEXEC:
-            aRet = ASCII("unknown error: osl_File_E_NOEXEC");
-            break;
-
-        case osl::FileBase::E_BADF:
-            aRet = ASCII("Bad file");
-            break;
-
-        case osl::FileBase::E_CHILD:
-            aRet = ASCII("unknown error: osl_File_E_CHILD");
-            break;
-
-        case osl::FileBase::E_AGAIN:
-            aRet = ASCII("Operation would block");
-            break;
-
-        case osl::FileBase::E_NOMEM:
-            aRet = ASCII("not enough memory for allocating structures");
-            break;
-
-        case osl::FileBase::E_ACCES:
-            aRet = ASCII("Permission denied");
-            break;
-
-        case osl::FileBase::E_FAULT:
-            aRet = ASCII("Bad address");
-            break;
-
-        case osl::FileBase::E_BUSY:
-            aRet = ASCII("Text file busy");
-            break;
-
-        case osl::FileBase::E_EXIST:
-            aRet = ASCII("File exists");
-            break;
-
-        case osl::FileBase::E_XDEV:
-            aRet = ASCII("unknown error: osl_File_E_XDEV");
-            break;
-
-        case osl::FileBase::E_NODEV:
-            aRet = ASCII("No such device");
-            break;
-
-        case osl::FileBase::E_NOTDIR:
-            aRet = ASCII("Not a directory");
-            break;
-
-        case osl::FileBase::E_ISDIR:
-            aRet = ASCII("Is a director");
-            break;
-
-        case osl::FileBase::E_INVAL:
-            aRet = ASCII("the format of the parameters was not valid");
-            break;
-
-        case osl::FileBase::E_NFILE:
-            aRet = ASCII("too many open files in the system");
-            break;
-
-        case osl::FileBase::E_MFILE:
-            aRet = ASCII("too many open files used by the process");
-            break;
-
-        case osl::FileBase::E_NOTTY:
-            aRet = ASCII("unknown error: osl_File_E_NOTTY");
-            break;
-
-        case osl::FileBase::E_FBIG:
-            aRet = ASCII("File too large");
-            break;
-
-        case osl::FileBase::E_NOSPC:
-            aRet = ASCII("No space left on device");
-            break;
-
-        case osl::FileBase::E_SPIPE:
-            aRet = ASCII("unknown error: osl_File_E_SPIPE");
-            break;
-
-        case osl::FileBase::E_ROFS:
-            aRet = ASCII("Read-only file system");
-            break;
-
-        case osl::FileBase::E_MLINK:
-            aRet = ASCII("Too many links");
-            break;
-
-        case osl::FileBase::E_PIPE:
-            aRet = ASCII("unknown error: osl_File_E_PIPE");
-            break;
-
-        case osl::FileBase::E_DOM:
-            aRet = ASCII("unknown error: osl_File_E_DOM");
-            break;
-
-        case osl::FileBase::E_RANGE:
-            aRet = ASCII("unknown error: osl_File_E_RANGE");
-            break;
-
-        case osl::FileBase::E_DEADLK:
-            aRet = ASCII("unknown error: osl_File_E_DEADLK");
-            break;
-
-        case osl::FileBase::E_NAMETOOLONG:
-            aRet = ASCII("File name too long");
-            break;
-
-        case osl::FileBase::E_NOLCK:
-            aRet = ASCII("No record locks available");
-            break;
-
-        case osl::FileBase::E_NOSYS:
-            aRet = ASCII("Function not implemente");
-            break;
-
-        case osl::FileBase::E_NOTEMPTY:
-            aRet = ASCII("Directory not empt");
-            break;
-
-        case osl::FileBase::E_LOOP:
-            aRet = ASCII("Too many symbolic links encountered");
-            break;
-
-        case osl::FileBase::E_ILSEQ:
-            aRet = ASCII("unknown error: osl_File_E_ILSEQ");
-            break;
-
-        case osl::FileBase::E_NOLINK:
-            aRet = ASCII("Link has been severed");
-            break;
-
-        case osl::FileBase::E_MULTIHOP:
-            aRet = ASCII("Multihop attempted");
-            break;
-
-        case osl::FileBase::E_USERS:
-            aRet = ASCII("unknown error: osl_File_E_USERS");
-            break;
-
-        case osl::FileBase::E_OVERFLOW:
-            aRet = ASCII("Value too large for defined data type");
-            break;
-
-            /* unmapped error: always last entry in enum! */
-        default: OSL_ENSURE(false, "Found unknown OSL File Error");
-        case osl::FileBase::E_invalidError:
-            aRet = ASCII("unmapped Error");
-            break;
-        }
-        return aRet;
-    }
-
-    // -----------------------------------------------------------------------------
-    rtl::OUString FileHelper::getParentDir(rtl::OUString const& _sURL)
-    {
-        rtl::OUString parentDirectory ;
-        rtl::OUString fileName ;
-
-        splitFileUrl(_sURL, parentDirectory, fileName) ;
-        return parentDirectory ;
-    }
-
-    // -----------------------------------------------------------------------------
-    void FileHelper::splitFileUrl(const rtl::OUString& aFileUrl,
-                                  rtl::OUString& aParentDirectory,
-                                  rtl::OUString& aFileName) {
-        // goto last '/' and cut the rest.
-        sal_Int32 nIdx = aFileUrl.lastIndexOf(delimiter, aFileUrl.getLength());
-        if (nIdx > 0) {
-            aParentDirectory = aFileUrl.copy(0, nIdx);	
-            aFileName = aFileUrl.copy(nIdx + 1) ;
-        }
-        else {
-            aParentDirectory = rtl::OUString() ;
-            aFileName = aFileUrl ;
-        }
-    }
-
-    // -----------------------------------------------------------------------------
-    rtl::OUString FileHelper::getFileName(const rtl::OUString& aFileUrl) {
-        rtl::OUString parentDirectory ;
-        rtl::OUString fileName ;
-
-        splitFileUrl(aFileUrl, parentDirectory, fileName) ;
-        return fileName ;
-    }
-    // -----------------------------------------------------------------------------
-    osl::FileBase::RC FileHelper::mkdir(rtl::OUString const& _sDirURL) 
-    {
-        // direct create a directory 
-        osl::FileBase::RC eError = osl::Directory::create(_sDirURL); // try to create the directory
-        if (eError == osl::FileBase::E_EXIST || 
-            eError == osl::FileBase::E_None ||
-            FileHelper::dirExists(_sDirURL)) 
-        {
-            eError = osl::FileBase::E_None; // Exists or created
-        }
-        return eError;
-    }
-
-    // -----------------------------------------------------------------------------
-    osl::FileBase::RC FileHelper::mkdirs(rtl::OUString const& _sDirURL) 
-    {	
-        osl::FileBase::RC eError = mkdir(_sDirURL);
-        switch (eError)
-        {
-        case osl::FileBase::E_EXIST: OSL_ASSERT(false);
-        case osl::FileBase::E_None:
-            break;
-
-        case osl::FileBase::E_NOENT:
-            {
-                rtl::OUString sParentDir = FileHelper::getParentDir(_sDirURL);				
-                if (sParentDir.getLength() == 0)
-                    break;
-
-                eError = mkdirs(sParentDir);
-                if (eError != osl::FileBase::E_None)
-                    break;
-
-                eError = mkdir(_sDirURL);
-            }
-            break;
-
-        default: OSL_TRACE("configmgr: Could not create directory (%d).", int(eError));
-            break;
-        }
-        return eError;
-    }		    	
-    
-} // namespace configmgr
diff --git a/configmgr/source/misc/interactionrequest.cxx b/configmgr/source/misc/interactionrequest.cxx
deleted file mode 100644
index 315a94b396..0000000000
--- a/configmgr/source/misc/interactionrequest.cxx
+++ /dev/null
@@ -1,118 +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: interactionrequest.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_configmgr.hxx"
-
-#include "interactionrequest.hxx"
-
-namespace configmgr {
-namespace apihelper {
-    namespace uno  = com::sun::star::uno;
-    namespace task = com::sun::star::task;
-//=========================================================================
-//=========================================================================
-//
-// InteractionRequest Implementation.
-//
-//=========================================================================
-//=========================================================================
-
-struct InteractionRequest::Impl
-{
-    uno::Reference< task::XInteractionContinuation > m_xSelection;
-    uno::Any m_aRequest;
-    uno::Sequence< uno::Reference< task::XInteractionContinuation > > m_aContinuations;
-
-    Impl() {}
-    Impl( const uno::Any & rRequest )
-    : m_aRequest( rRequest ) 
-    {}
-};
-
-//=========================================================================
-InteractionRequest::InteractionRequest( const uno::Any & rRequest )
-: m_pImpl( new Impl( rRequest ) )
-{
-}
-
-//=========================================================================
-// virtual
-InteractionRequest::~InteractionRequest()
-{
-    delete m_pImpl;
-}
-
-//=========================================================================
-void InteractionRequest::setContinuations(
-                const uno::Sequence< uno::Reference<
-                    task::XInteractionContinuation > > & rContinuations )
-{
-    m_pImpl->m_aContinuations = rContinuations;
-}
-
-//=========================================================================
-uno::Reference< task::XInteractionContinuation > InteractionRequest::getSelection() const
-{
-    return m_pImpl->m_xSelection;
-}
-
-//=========================================================================
-void InteractionRequest::setSelection( const uno::Reference< task::XInteractionContinuation > & rxSelection )
-{
-    m_pImpl->m_xSelection = rxSelection;
-}
-
-//=========================================================================
-//
-// XInteractionRequest methods.
-//
-//=========================================================================
-
-// virtual
-uno::Any SAL_CALL InteractionRequest::getRequest()
-    throw( uno::RuntimeException )
-{
-    return m_pImpl->m_aRequest;
-}
-
-//=========================================================================
-// virtual
-uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL
-    InteractionRequest::getContinuations()
-    throw( uno::RuntimeException )
-{
-    return m_pImpl->m_aContinuations;
-}
-
-//=========================================================================
-
-} // namespace apihelper
-} // namespace configmgr
diff --git a/configmgr/source/misc/logger.cxx b/configmgr/source/misc/logger.cxx
deleted file mode 100644
index 3b35c39f27..0000000000
--- a/configmgr/source/misc/logger.cxx
+++ /dev/null
@@ -1,96 +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: logger.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_configmgr.hxx"
-
-#include "logger.hxx"
-
-#define CONFIG_LOGGER_SINGLETON "/singletons/com.sun.star.configuration.theLogger"
-#define OUSTR( lit ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( lit ) )
-#define OU2A( ustr ) rtl::OUStringToOString( ustr, RTL_TEXTENCODING_UTF8 ).getStr()
-#define A2OU( astr ) rtl::OUString::createFromAscii( astr )
-
-static const sal_Char k_unspecifiedClass[] = "configmgr";
-static const sal_Char k_unspecifiedMethod[] = "log-message";
-
-namespace configmgr
-{
-
-//--------------------------------------------------------------------------
-void Logger::log(sal_Int32 nLevel, const char * msg, const char * sourceMethod, const char * sourceClass) const
-{
-    OSL_ASSERT(msg);
-    if (!msg) msg = "";
-
-    this->log(nLevel,A2OU(msg),sourceMethod,sourceClass);
-}
-
-//--------------------------------------------------------------------------
-void Logger::log(sal_Int32 nLevel, const rtl::OUString & msg, const char * sourceMethod, const char * sourceClass) const
-{
-    if (!sourceClass) sourceClass = k_unspecifiedClass;
-    if (!sourceMethod) sourceMethod = k_unspecifiedMethod;
-    
-    // this place can be used to further enrich or instrument log output
-    if (m_xLogger.is())
-        try
-        {
-            m_xLogger->logp(nLevel,A2OU(sourceClass),A2OU(sourceMethod),msg);
-        }
-        catch (uno::Exception & e)
-        {
-            OSL_TRACE("Configuration Log failure: %s\n"
-                      "Log message was [Level=%04d] %s::%s : %s\n",
-                      OU2A(e.Message),int(nLevel),sourceClass,sourceMethod,OU2A(msg));
-        }
-    else if (nLevel >= (LogLevel::SEVERE - OSL_DEBUG_LEVEL*(LogLevel::SEVERE-LogLevel::WARNING)))
-        OSL_TRACE("Configuration Log [%04d] %s::%s : %s\n", int(nLevel),sourceClass,sourceMethod,OU2A(msg));
-
-}
-
-//--------------------------------------------------------------------------
-uno::Reference< logging::XLogger > 
-    Logger::getUnoLoggerFromContext(uno::Reference< uno::XComponentContext > const & xContext)
-{
-    uno::Reference< logging::XLogger > xLogger;
-
-    if (xContext.is())
-        try { xContext->getValueByName( OUSTR(CONFIG_LOGGER_SINGLETON) ) >>= xLogger; }
-        catch (uno::Exception & ) {}
-
-    return xLogger;
-}
-
-//--------------------------------------------------------------------------
-
-}	// namespace configmgr
-
-
diff --git a/configmgr/source/misc/makefile.mk b/configmgr/source/misc/makefile.mk
deleted file mode 100644
index 8fc6389dc9..0000000000
--- a/configmgr/source/misc/makefile.mk
+++ /dev/null
@@ -1,77 +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.28 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=misc
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-        $(SLO)$/bootstrap.obj	\
-        $(SLO)$/providerfactory.obj	\
-        $(SLO)$/providerwrapper.obj	\
-        $(SLO)$/logger.obj	\
-        $(SLO)$/tracer.obj	\
-        $(SLO)$/configunoreg.obj	\
-        $(SLO)$/serviceinfohelper.obj \
-        $(SLO)$/bootstrapcontext.obj	\
-        $(SLO)$/anypair.obj	\
-        $(SLO)$/strimpl.obj	\
-        $(SLO)$/mergechange.obj \
-        $(SLO)$/oslstream.obj	\
-        $(SLO)$/filehelper.obj	\
-        $(SLO)$/bufferedfile.obj \
-        $(SLO)$/requestoptions.obj	\
-        $(SLO)$/interactionrequest.obj	\
-        $(SLO)$/configinteractionhandler.obj	\
-        $(SLO)$/simpleinteractionrequest.obj	\
-        $(SLO)$/propertysethelper.obj	\
-        
-OBJFILES=	\
-        $(OBJ)$/oslstream.obj	\
-        $(OBJ)$/filehelper.obj	\
-        $(OBJ)$/bufferedfile.obj \
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/misc/mergechange.cxx b/configmgr/source/misc/mergechange.cxx
deleted file mode 100644
index 53ff14512d..0000000000
--- a/configmgr/source/misc/mergechange.cxx
+++ /dev/null
@@ -1,831 +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: mergechange.cxx,v $
- * $Revision: 1.27 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include "builddata.hxx"
-#include "mergechange.hxx"
-#include "updatehelper.hxx"
-#include "treeactions.hxx"
-#include "treefragment.hxx"
-#include "change.hxx"
-#include "treechangefactory.hxx"
-#include "treechangelist.hxx"
-#include "configexcept.hxx"
-#include "tracer.hxx"
-
-#define ASCII(x) rtl::OUString::createFromAscii(x)
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-    // -----------------------------------------------------------------------------
-    class OMergeChanges : private ChangeTreeAction, private OPathCreator<configuration::RelativePath>
-    {
-        SubtreeChange &m_rSubtreeChange;          // ChangeList, which will be grown
-        SubtreeChange *m_pCurrentParent;		  // our current position
-
-        // ------- Helper for Path stack -------
-        SubtreeChange* pushTree(SubtreeChange& _rTree);
-        void popTree(SubtreeChange* _pSaveTree);
-
-    public:
-        // CTor
-        OMergeChanges(SubtreeChange& _rTree);
-
-        // start function, with the Change we want to do.
-        // WARNING this could be a big tree, because a change can contain subtreechanges!
-        void mergeChanges(const SubtreeChange &_rChange, const configuration::RelativePath& _aPathToChange);
-        void mergeChanges(const SubtreeChange &_rChange);
-
-    private:
-        void initRoot(const SubtreeChange &_rRootChange, const configuration::RelativePath& _aPathToChange);
-    private:
-        virtual void handle(ValueChange const& _rValueNode);
-        virtual void handle(AddNode const& _rAddNode);
-        virtual void handle(RemoveNode const& _rRemoveNode);
-        virtual void handle(SubtreeChange const& _rSubtree);
-
-    };
-    // -----------------------------------------------------------------------------
-    void combineUpdates(SubtreeChange  const& _anUpdate, SubtreeChange& _aCombinedUpdate)
-    {
-        OMergeChanges aCombined(_aCombinedUpdate);
-        aCombined.mergeChanges(_anUpdate);
-    }
-    // -----------------------------------------------------------------------------
-
-    configuration::Path::Component ONameCreator::createName(Change const& _rChange, SubtreeChange const* _pParent)
-    {
-        OSL_ENSURE(_pParent, "ONameCreator: Cannot create proper name without a parent");
-        if (_pParent && _pParent->isSetNodeChange())
-        {
-            rtl::OUString sElementName = _rChange.getNodeName();
-            rtl::OUString sTypeName = _pParent->getElementTemplateName();
-
-            return configuration::Path::makeCompositeName(sElementName, sTypeName);
-        }
-        else
-        {
-            rtl::OUString sElementName = _rChange.getNodeName();
-
-        //    OSL_ENSURE(isSimpleName(sElementName),"Unexpected: Non-simple name in non-set node");
-
-            return configuration::Path::wrapSafeName(sElementName);
-        }
-    }
-
-
-    // -----------------------------------------------------------------------------
-    class OMergeValueChange : private ChangeTreeModification
-    {
-        SubtreeChange&		m_rTargetParent;
-        const ValueChange&	m_aValueChange;
-    public:
-        OMergeValueChange(SubtreeChange& _rTargetParent, const ValueChange& _aValueChange)
-                :m_rTargetParent(_rTargetParent)
-                ,m_aValueChange(_aValueChange)
-        {
-
-        }
-        void handleChange(Change &_rNode)
-        {
-            this->applyToChange(_rNode);
-        }
-    private:
-        virtual void handle(ValueChange& _rValueChange)
-        {
-            // POST: Handle ValueChange
-            _rValueChange.setNewValue(m_aValueChange.getNewValue(), m_aValueChange.getMode());
-        }
-              virtual void handle(RemoveNode& /*_rRemoveNode*/)
-        {
-            OSL_ENSURE(false, "OMergeValueChange::handle(ValueChange): have a ValueChange for a removed node!");
-            // should never happen. How did the user change a value for a node which is obviously flagged as removed?
-        }
-        virtual void handle(AddNode& _rAddNode);
-        virtual void handle(SubtreeChange& _rSubtree)
-        {
-            if ( isLocalizedValueSet(_rSubtree) )
-            {
-                std::auto_ptr<ValueChange> pNewValueChange( new ValueChange(m_aValueChange) );
-                OSL_ENSURE(pNewValueChange->isLocalizedValue(), "OMergeValueChange:handle(SubtreeChange): have a non-localized ValueChange a for a localized node!");
-
-                std::auto_ptr<Change> pNewChange( pNewValueChange.release() );
-
-                replaceExistingEntry(pNewChange);
-            }
-            else
-                OSL_ENSURE(false, "OMergeValueChange:handle(SubtreeChange): have a ValueChange for a sub tree!");
-        }
-
-        void replaceExistingEntry(std::auto_ptr<Change> pNewChange)
-        {
-            m_rTargetParent.removeChange(pNewChange->getNodeName());
-            m_rTargetParent.addChange(pNewChange);
-        }
-        static std::auto_ptr<ValueNode> createNodeFromChange(ValueChange const& rChange)
-        {
-            std::auto_ptr<ValueNode> aRet;
-
-            uno::Any aNewValue = rChange.getNewValue();
-
-            // currently not supporting change modes !
-            if (aNewValue.hasValue())
-                aRet.reset( new ValueNode(rChange.getNodeName(), aNewValue, rChange.getAttributes()) );
-
-            else  // NULL
-            {
-                aRet.reset( new ValueNode(rChange.getNodeName(), rChange.getValueType(), rChange.getAttributes()) );
-
-                OSL_ENSURE(aRet->isValid(), "Cannot recover type for change to NULL");
-            }
-            return aRet;
-        }
-
-    };
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    // TODO: operate directly on new data structures
-
-    void OMergeValueChange::handle(AddNode& _rAddNode)
-    {
-        if (m_aValueChange.isToDefault())
-        {
-            std::auto_ptr<Change> aChangeToDefault(m_aValueChange.clone());
-            m_rTargetParent.removeChange(_rAddNode.getNodeName());
-            m_rTargetParent.addChange( aChangeToDefault );
-        }
-        else
-        {
-            // POST: Handle ValueChange in AddNode
-            rtl::Reference< data::TreeSegment > seg(_rAddNode.getNewTree());
-            std::auto_ptr<INode> pAddedNode = data::convertTree(seg.is() ? seg->fragment : 0, false);
-
-            if (ValueNode *pValueNode = pAddedNode->asValueNode())
-            {
-                m_aValueChange.applyChangeNoRecover(*pValueNode);
-            }
-
-            else if (ISubtree* pValueSetNode = pAddedNode->asISubtree() )
-            {
-                if ( isLocalizedValueSet(*pValueSetNode) )
-                {
-                    std::auto_ptr<ValueNode> pNewValueNode = createNodeFromChange(m_aValueChange);
-                    if (pNewValueNode.get())
-                    {
-                        OSL_ENSURE(pNewValueNode->isLocalized(), "OMergeValueChange:handle(AddNode): have a non-localized ValueChange a for a localized node!");
-                        pNewValueNode->setName(pAddedNode->getName());
-                    }
-                    else
-                        OSL_ENSURE(false, "OMergeValueChange:handle(SubtreeChange): Creating a NULL node to replace a localized value set not yet supported");
-
-
-                    pAddedNode.reset(pNewValueNode.release());
-                }
-                else
-                {
-                    OSL_ENSURE(sal_False, "OMergeValueChange:handle(AddNode): have a ValueChange a for non-value node!");
-                    pAddedNode.reset(); // leave unchanged
-                }
-
-            }
-            else
-            {
-                OSL_ENSURE(sal_False, "OMergeValueChange:handle(AddNode): Found unknown node type!");
-                pAddedNode.reset(); // leave unchanged
-            }
-
-            if (pAddedNode.get() != NULL)
-            {
-                rtl::Reference< data::TreeSegment > aNewTree = data::TreeSegment::create(_rAddNode.getNodeName(),pAddedNode);
-
-                std::auto_ptr<AddNode> pNewAdd( new AddNode(aNewTree,m_aValueChange.getNodeName(), m_aValueChange.isToDefault()) );
-                if (_rAddNode.isReplacing())
-                    pNewAdd->setReplacing();
-
-                std::auto_ptr<Change> pNewChange( pNewAdd.release() );
-                replaceExistingEntry(pNewChange);
-            }
-        }
-    }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
-    class OMergeRemoveNode : private ChangeTreeModification
-    {
-    public:
-        // actions to take with the remove node change
-        enum Action
-        {
-            RemoveCompletely,
-            FlagDeleted,
-            Undetermined
-        };
-
-    protected:
-        Action	m_eAction;
-
-    public:
-        OMergeRemoveNode() : m_eAction(Undetermined) {  }
-
-        Action getAction() const { return m_eAction; }
-
-        void handleChange(Change* _pChange)
-            {
-                if (_pChange)
-                    applyToChange(*_pChange);
-                else
-                    // no change -> flag as deleted
-                    m_eAction = FlagDeleted;
-            }
-
-    private:
-        virtual void handle(ValueChange& aValueChange)
-            {
-                if (aValueChange.getAttributes().existsInDefault())
-                    m_eAction = FlagDeleted;
-                else
-                    m_eAction = RemoveCompletely;
-            }
-
-              virtual void handle(RemoveNode& /*_rRemoveNode*/)
-            {
-                OSL_ENSURE(false, "OMergeRemoveNode::handle(RemoveNode): should never happen!");
-                // how can a RemoveNode change exist if in the file we're merging it into
-                // there already is such a RemoveNode change (_rRemoveNode)?
-            }
-
-        virtual void handle(AddNode& _rAddNode)
-            {
-                if (_rAddNode.isReplacing())
-                    m_eAction = FlagDeleted;
-                else
-                    m_eAction = RemoveCompletely;
-            }
-
-        virtual void handle(SubtreeChange& _rSubtree)
-            {
-                if (_rSubtree.getAttributes().existsInDefault())
-                    m_eAction = FlagDeleted;
-                else
-                    m_eAction = RemoveCompletely;
-            }
-    };
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
-
-    static
-    inline
-    Change* findExistingChange(SubtreeChange* pCurrentParent, configuration::Path::Component const & _aName)
-    {
-        OSL_ASSERT(pCurrentParent);
-
-        Change *pChange = pCurrentParent->getChange(_aName.getName());
-
-        if (!pChange && !_aName.isSimpleName())
-        {
-            pChange = pCurrentParent->getChange(_aName.toPathString());
-            OSL_ENSURE(!pChange, "Update trouble: Existing node found only by composite name while merging");
-        }
-
-        return pChange;
-    }
-
-    static
-    inline
-    Change* findExistingChange(SubtreeChange* pCurrentParent, rtl::OUString const & _aName)
-    {
-        OSL_ASSERT(pCurrentParent);
-
-        Change *pChange = pCurrentParent->getChange(_aName);
-
-        return pChange;
-    }
-    // -----------------------------------------------------------------------------
-
-    void adjustElementTemplate(SubtreeChange& _rChange, const rtl::OUString& _rName, const rtl::OUString& _rModule)
-    {
-        if (!_rChange.isSetNodeChange() || isGenericSetElementType(_rChange.getElementTemplateName()))
-        {
-            _rChange.setElementTemplate(_rName,_rModule);
-        }
-        else if ( isDummySetElementModule(_rChange.getElementTemplateModule()) &&
-                 !isGenericSetElementType(_rName) && !isDummySetElementModule(_rModule))
-        {
-            OSL_ENSURE(_rChange.getElementTemplateName() == _rName,   "Adjusting: Template modules do not match");
-
-            _rChange.setElementTemplate(_rName,_rModule);
-        }
-        OSL_POSTCOND(_rChange.getElementTemplateName()   == _rName   || isGenericSetElementType(_rName),
-                     "Adjusting: Template modules do not match");
-        OSL_POSTCOND(_rChange.getElementTemplateModule() == _rModule || isDummySetElementModule(_rModule),
-                     "Adjusting: Template modules do not match");
-    }
-    // -----------------------------------------------------------------------------
-
-    inline void adjustElementTemplate(SubtreeChange& _rChange, SubtreeChange const& _rSource)
-    {
-        if (_rSource.isSetNodeChange())
-            adjustElementTemplate(_rChange, _rSource.getElementTemplateName(), _rSource.getElementTemplateModule());
-    }
-
-    // -----------------------------------------------------------------------------
-
-    // CTor
-    OMergeChanges::OMergeChanges(SubtreeChange& _rTree)
-    : m_rSubtreeChange(_rTree), m_pCurrentParent(NULL)
-    {
-    }
-    // -----------------------------------------------------------------------------
-
-    void OMergeChanges::initRoot(const SubtreeChange &_rRootChange, const configuration::RelativePath& _aPathToChange)
-    {
-        SubtreeChange* pCurrentParent = &m_rSubtreeChange;
-
-        if (!_aPathToChange.isEmpty())
-        {
-            OSL_PRECOND(_aPathToChange.getLocalName().getName() == _rRootChange.getNodeName(),
-                            "Path to change root does not match change being merged" );
-
-            std::vector<configuration::Path::Component>::const_reverse_iterator const firstEnsure = _aPathToChange.begin();
-            std::vector<configuration::Path::Component>::const_reverse_iterator lastEnsure = _aPathToChange.end();
-            std::vector<configuration::Path::Component>::const_reverse_iterator it;
-
-            OSL_ASSERT( firstEnsure != lastEnsure );
-            --lastEnsure; // last to ensure is the actual root
-
-            for( it = firstEnsure; it != lastEnsure; ++it)
-            {
-                OSL_ASSERT( it != _aPathToChange.end() );
-
-                Change *pChange = findExistingChange(pCurrentParent,*it);
-
-                if (!pChange)
-                {
-                    OSL_ASSERT( it+1 != _aPathToChange.end());
-                    rtl::OUString const aElementTypeName = (it+1)->getTypeName();
-
-                    // create a correspondens for the name, we did not find.
-                    std::auto_ptr<SubtreeChange> pNewChange =
-                        OTreeChangeFactory::createDummyChange(it->getName(), aElementTypeName);
-
-                    pChange = pNewChange.get();
-
-                    pCurrentParent->addChange(base_ptr(pNewChange));
-
-                    OSL_ENSURE(pChange == findExistingChange(pCurrentParent,*it),
-                                "ERROR: Newly added change cannot be found in parent change");
-                }
-
-                pCurrentParent = dynamic_cast<SubtreeChange*>( pChange);
-                if (pCurrentParent == 0)
-                {
-                    OSL_ENSURE(false, "Change to merge does not point to a Subtree Change");
-                    throw configuration::InvalidName(_aPathToChange.toString(), "points to a non- subtree change in this changes list, but a subtree change is required as root.");
-                }
-            }
-
-            Change *pRootChange = findExistingChange(pCurrentParent,*lastEnsure);
-
-            if (!pRootChange)
-            {
-                // create a correspondens for the name, we did not find.
-                std::auto_ptr<SubtreeChange> pNewChange(
-                        new SubtreeChange(_rRootChange, treeop::NoChildCopy()) );
-
-                pRootChange = pNewChange.get();
-
-                pCurrentParent->addChange(base_ptr(pNewChange));
-
-                OSL_ENSURE(pRootChange == findExistingChange(pCurrentParent,*it),
-                            "ERROR: Newly added change cannot be found in parent change");
-            }
-
-            pCurrentParent = dynamic_cast<SubtreeChange*>( pRootChange);
-            if (pCurrentParent == 0)
-            {
-                OSL_ENSURE(false, "Change to merge does not point to a Subtree Change");
-                throw configuration::InvalidName(_aPathToChange.toString(), "points to a non-subtree change in this changes list, but a subtree change is required as root.");
-            }
-        }
-
-        OSL_ENSURE(pCurrentParent->getNodeName() == _rRootChange.getNodeName(),
-                        "Change being merged has a different name");
-
-        adjustElementTemplate(*pCurrentParent,_rRootChange);
-
-        this->init(_aPathToChange);
-
-        m_pCurrentParent = pCurrentParent;
-    }
-    // -----------------------------------------------------------------------------
-
-    // ------- Helper for Path stack -------
-    SubtreeChange* OMergeChanges::pushTree(SubtreeChange& _rTree)
-    {
-        pushName( ONameCreator::createName(_rTree,m_pCurrentParent) );
-
-        SubtreeChange* pSave = m_pCurrentParent;
-        m_pCurrentParent = &_rTree;
-        return pSave;
-    }
-    void OMergeChanges::popTree(SubtreeChange* _pSaveTree)
-    {
-        m_pCurrentParent = _pSaveTree;
-
-        popName();
-    }
-    // -----------------------------------------------------------------------------
-
-    // start function, with the Change we want to do.
-    // WARNING this could be a big tree, because a change can contain subtreechanges!
-    void OMergeChanges::mergeChanges(const SubtreeChange &_rChange)
-    {
-        mergeChanges(_rChange, configuration::RelativePath());
-    }
-    // -----------------------------------------------------------------------------
-
-    // start function, with the Change we want to do.
-    // WARNING this could be a big tree, because a change can contain subtreechanges!
-    void OMergeChanges::mergeChanges(const SubtreeChange &_rChange, const configuration::RelativePath& _aPathToChange)
-    {
-        initRoot(_rChange, _aPathToChange); // path location being merged must exist
-
-        this->applyToChildren(_rChange); //- semantics ?
-    }
-    // -----------------------------------------------------------------------------
-
-    // Algorithm: search the actual path in the out m_aSubtreeChange
-    // if we found something, we must merge/convert the Node with our Node
-    // if we found nothing, we must create a new Node with our change
-    // thats it.
-
-    // the merge is contructed with helper classes because, it's possible that we
-    // are a ValueChange but in the TreeChangeList this change is an AddNode, so
-    // we have something to do.
-
-    void OMergeChanges::handle(ValueChange const& _rValueNode)
-    {
-        // Handle a ValueChange,
-        rtl::OUString aNodeName = _rValueNode.getNodeName();
-
-        if (Change *pChange = findExistingChange(m_pCurrentParent,aNodeName))
-        {
-            // Value found, merge content
-            OMergeValueChange aMergeValue(*m_pCurrentParent,_rValueNode);
-            aMergeValue.handleChange(*pChange);
-        }
-        else
-        {
-            // there is no ValueChange in the List, insert new one
-            std::auto_ptr<Change> pNewChange(new ValueChange(_rValueNode));
-            m_pCurrentParent->addChange(pNewChange);
-        }
-    }
-    // -----------------------------------------------------------------------------
-
-    void OMergeChanges::handle(AddNode const& _rAddNode)
-    {
-        // Handle an AddNode
-        bool bReplacing = _rAddNode.isReplacing();
-
-        rtl::OUString aNodeName = _rAddNode.getNodeName();
-
-        if (Change *pChange = findExistingChange(m_pCurrentParent,aNodeName))
-        {
-            OSL_ENSURE(dynamic_cast< RemoveNode * >(pChange) != 0 || bReplacing, "OMergeChanges::handle(AddNode): the changes tree given already contains a change for this!");
-
-            m_pCurrentParent->removeChange(pChange->getNodeName());
-
-            bReplacing = true;
-        }
-
-        // insert manually
-        rtl::Reference< data::TreeSegment > aAddedTree = data::TreeSegment::create(_rAddNode.getNewTree());
-
-        std::auto_ptr<AddNode> pNewAdd(new AddNode(aAddedTree, _rAddNode.getNodeName(), _rAddNode.isToDefault()));
-        if (bReplacing)
-            pNewAdd->setReplacing();
-
-        std::auto_ptr<Change> pNewChange( pNewAdd.release() );
-        m_pCurrentParent->addChange(pNewChange);
-    }
-    // -----------------------------------------------------------------------------
-
-    void OMergeChanges::handle(RemoveNode const& _rRemoveNode)
-    {
-        // Handle a RemoveNode
-        rtl::OUString aNodeName = _rRemoveNode.getNodeName();
-
-        Change *pChange = findExistingChange(m_pCurrentParent,aNodeName);
-
-        // examine what to do with this change
-        OMergeRemoveNode aExaminer;
-        aExaminer.handleChange(pChange);
-
-                // remove the change from it's parent (may it's re-inserted in another form below)
-        if (pChange)
-            m_pCurrentParent->removeChange(pChange->getNodeName());
-
-        // insert a new change if necessary
-        switch (aExaminer.getAction())
-        {
-        case OMergeRemoveNode::RemoveCompletely:
-            // nothing to do, we already removed it
-            break;
-        default:
-            OSL_ENSURE(sal_False, "OMergeChanges::handle(RemoveNode): don't know what to do with this!");
-            // NO BREAK.
-            // defaulting this so that the node will be marked as deleted
-        case OMergeRemoveNode::FlagDeleted:
-        {
-            std::auto_ptr<Change> pNewChange(new RemoveNode(_rRemoveNode.getNodeName(),_rRemoveNode.isToDefault()));
-            m_pCurrentParent->addChange(pNewChange);
-        }
-        break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-    inline
-    void OStripDefaults::stripOne(Change& _rChange)
-    {
-        m_rParent.removeChange(_rChange.getNodeName());
-    }
-
-    void OStripDefaults::handle(ValueChange& _rValueNode)
-    {
-        if (_rValueNode.isToDefault())
-            stripOne(_rValueNode);
-    }
-    void OStripDefaults::handle(AddNode& _rAddNode)
-    {
-        if (_rAddNode.isToDefault())
-        {
-            sharable::TreeFragment const * pAdded = _rAddNode.getNewTreeData();
-            OSL_ENSURE(pAdded,"No Data in AddNode");
-            if (pAdded == NULL || pAdded->getAttributes().isDefault())
-                stripOne(_rAddNode);
-
-            // else we should strip the defaults from the added node
-        }
-    }
-    void OStripDefaults::handle(RemoveNode& _rRemoveNode)
-    {
-        if (_rRemoveNode.isToDefault())
-            stripOne(_rRemoveNode);
-    }
-    void OStripDefaults::handle(SubtreeChange& _rSubtree)
-    {
-        if ( strip(_rSubtree) )
-            if (_rSubtree.isToDefault() || !_rSubtree.isSetNodeChange())
-                stripOne(_rSubtree);
-    }
-
-    OStripDefaults& OStripDefaults::strip()
-    {
-        SubtreeChange::MutatingChildIterator it = m_rParent.begin_changes(), stop = m_rParent.end_changes();
-
-        while (it != stop)
-        {
-            this->applyToChange(*it++);
-        }
-
-        return *this;
-    }
-
-
-// -----------------------------------------------------------------------------
-    class TreeUpdater : public ChangeTreeAction
-    {
-        ISubtree* m_pCurrentSubtree;
-#if OSL_DEBUG_LEVEL > 1
-        std::vector<rtl::OString> aLog;
-#endif
-
-    public:
-        TreeUpdater(ISubtree* pSubtree):m_pCurrentSubtree(pSubtree){}
-
-        void handle(ValueChange const& aValueNode);
-        void handle(AddNode const& aAddNode);
-        void handle(RemoveNode const& aRemoveNode);
-        void handle(SubtreeChange const& aSubtree);
-    };
-
-// -----------------------------------------------------------------------------
-
-
-    void OMergeChanges::handle(SubtreeChange const& _rSubtree)
-    {
-        // Handle a SubtreeChange
-        // we must check if exact this SubtreeChange is in the TreeChangeList, if not,
-        // we must add this SubtreeChange to the TreeChangeList
-        // with the pointer m_pCurrentParent we remember our SubtreeChange in witch we
-        // add all other Changes.
-
-        rtl::OUString aNodeName = _rSubtree.getNodeName();
-
-        Change *pChange = findExistingChange(m_pCurrentParent,aNodeName);
-
-        // const sal_Char* pType = pChange ? pChange->getType() : NULL;
-        SubtreeChange* pSubtreeChange = NULL;
-        if (pChange == NULL || dynamic_cast< SubtreeChange * >(pChange) != 0)
-        {
-            // need to create a new Subtreechange
-            if (!pChange)
-            {
-                // create a new SubtreeChange
-                std::auto_ptr<SubtreeChange> pNewChange(new SubtreeChange(_rSubtree, treeop::NoChildCopy()));
-                pSubtreeChange = pNewChange.get();
-
-                // add the new SubtreeChange in m_aTreeChangeList
-                m_pCurrentParent->addChange(std::auto_ptr<Change>(pNewChange.release()));
-                // check list for this new SubtreeChange
-                OSL_ASSERT(pSubtreeChange == findExistingChange(m_pCurrentParent,aNodeName));
-            }
-            else
-            {
-                pSubtreeChange = dynamic_cast<SubtreeChange*>(pChange);
-                OSL_ASSERT(pSubtreeChange != 0);
-                adjustElementTemplate(*pSubtreeChange,_rSubtree);
-            }
-
-            // save this SubtreeChange so we allways have the last Subtree
-            SubtreeChange* pSaveParent = pushTree(*pSubtreeChange);
-            this->applyToChildren(_rSubtree);
-            popTree( pSaveParent );
-        }
-        else if (AddNode* pAddNode = dynamic_cast<AddNode*>(pChange))
-        {
-            rtl::Reference< data::TreeSegment > seg(pAddNode->getNewTree());
-            std::auto_ptr<INode> pAddedNode = data::convertTree(seg.is() ? seg->fragment : 0, false);
-            ISubtree* pSubtree = pAddedNode.get() ? pAddedNode->asISubtree() : 0;
-            if (pSubtree)
-            {
-                pSubtree->markAsDefault( _rSubtree.isToDefault() );
-
-                // Now apply _rSubtree to the subtree
-                TreeUpdater aTreeUpdate(pSubtree);
-                aTreeUpdate.applyToChildren(_rSubtree);
-
-                // make a new subtree with the changed data
-                rtl::Reference< data::TreeSegment > aNewTree = data::TreeSegment::create(pAddNode->getNodeName(), pAddedNode);
-
-                std::auto_ptr<AddNode> pNewAdd( new AddNode(aNewTree, pAddNode->getNodeName(), pAddNode->isToDefault()) );
-                if (pAddNode->isReplacing())
-                    pNewAdd->setReplacing();
-
-                std::auto_ptr<Change> pNewChange( pNewAdd.release() );
-
-                m_pCurrentParent->removeChange(pAddNode->getNodeName());
-                m_pCurrentParent->addChange( pNewChange );
-            }
-            else
-            {
-                OSL_ENSURE(false, "OMergeChanges: Unexpected node type found in an AddNode.");
-                /* wrong type of node found: böse ASSERTEN/WERFEN */;
-            }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-        }
-        else
-        {
-            OSL_ENSURE(false, "OMergeChanges: Unexpected change type found for a subtree.");
-            /* wrong type of node found: böse ASSERTEN/WERFEN */;
-        }
-    }
-
-    // --------------------------------- updateTree ---------------------------------
-    void TreeUpdater::handle(ValueChange const& aValueNode)
-    {
-        // Change a Value
-        OSL_ENSURE(m_pCurrentSubtree,"Cannot apply ValueChange without subtree");
-
-        INode* pBaseNode = m_pCurrentSubtree ? m_pCurrentSubtree->getChild(aValueNode.getNodeName()) : 0;
-        OSL_ENSURE(pBaseNode,"Cannot apply Change: No node to change");
-
-        ValueNode* pValue = pBaseNode ? pBaseNode->asValueNode() : 0;
-        OSL_ENSURE(pValue,"Cannot apply ValueChange: Node is not a value");
-
-        if (pValue)
-            aValueNode.applyChangeNoRecover(*pValue);
-#if OSL_DEBUG_LEVEL > 1
-        else
-        {
-            ::rtl::OString aStr("TreeUpdater: Can't find value with name:=");
-            aStr += rtl::OUStringToOString(aValueNode.getNodeName(),RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSURE(pValue, aStr.getStr());
-            aLog.push_back(aStr);
-        }
-#endif
-    }
-
-    void TreeUpdater::handle(AddNode const& aAddNode)
-    {
-        // Add a new Value
-        if (m_pCurrentSubtree)
-        {
-            if (aAddNode.isReplacing())
-            {
-                std::auto_ptr<INode> aOldNode = m_pCurrentSubtree->removeChild(aAddNode.getNodeName());
-
-#if OSL_DEBUG_LEVEL > 1
-                OSL_ENSURE(aOldNode.get(), "TreeUpdater:AddNode: can't recover node being replaced");
-                if (aOldNode.get() == NULL)
-                    aLog.push_back(rtl::OString("TreeUpdater: can't recover node being replaced (for AddNode)"));
-#endif
-            }
-
-            rtl::Reference< data::TreeSegment > seg(aAddNode.getNewTree());
-            std::auto_ptr<INode> pNode(data::convertTree(seg.is() ? seg->fragment : 0, true));
-
-            m_pCurrentSubtree->addChild(pNode);
-        }
-#if OSL_DEBUG_LEVEL > 1
-        else
-            aLog.push_back(rtl::OString("TreeUpdater: no CurrentSubtree for AddNode"));
-#endif
-
-    }
-
-    void TreeUpdater::handle(RemoveNode const& aRemoveNode)
-    {
-        // remove a Value
-        if (m_pCurrentSubtree)
-        {
-            std::auto_ptr<INode> aOldNode = m_pCurrentSubtree->removeChild(aRemoveNode.getNodeName());
-
-#if OSL_DEBUG_LEVEL > 1
-            if (NULL == aOldNode.get())
-            {
-                ::rtl::OString aStr("TreeUpdater: Can't remove child with name:=");
-                aStr += rtl::OUStringToOString(aRemoveNode.getNodeName(),RTL_TEXTENCODING_ASCII_US);
-                OSL_ENSURE(false, aStr.getStr());
-                aLog.push_back(aStr);
-            }
-#endif
-        }
-    }
-
-    void TreeUpdater::handle(SubtreeChange const& _aSubtree)
-    {
-        // handle traversion
-        ISubtree *pOldSubtree = m_pCurrentSubtree;
-        rtl::OUString aNodeName = _aSubtree.getNodeName();
-
-        INode* pChild = m_pCurrentSubtree->getChild(aNodeName);
-        OSL_ENSURE(pChild, "TreeUpdater::handle : invalid subtree change ... no child for change !");
-        m_pCurrentSubtree = pChild ? pChild->asISubtree() : NULL;
-
-#if OSL_DEBUG_LEVEL > 1
-        if (!m_pCurrentSubtree)
-        {
-            ::rtl::OString aStr("TreeUpdater: there is no Subtree for name:=");
-            aStr += rtl::OUStringToOString(_aSubtree.getNodeName(),RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSURE(false, aStr.getStr());
-            aLog.push_back(aStr);
-        }
-#endif
-        // recurse
-        if (m_pCurrentSubtree)
-        {
-            m_pCurrentSubtree->markAsDefault( _aSubtree.isToDefault() );
-            _aSubtree.forEachChange(*this);
-        }
-
-        m_pCurrentSubtree = pOldSubtree;
-    }
-
-} // namespace configmgr
diff --git a/configmgr/source/misc/oslstream.cxx b/configmgr/source/misc/oslstream.cxx
deleted file mode 100644
index ed4c7056c1..0000000000
--- a/configmgr/source/misc/oslstream.cxx
+++ /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: oslstream.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_configmgr.hxx"
-#include "oslstream.hxx"
-
-#include "filehelper.hxx"
-
-namespace configmgr
-{
-    static void raiseIOException(osl::File::RC error, staruno::Reference<staruno::XInterface> const & context)
-    {
-        const rtl::OUString message = FileHelper::createOSLErrorString(error);
-        switch (error)
-        {
-        case osl::File::E_NOMEM:
-            throw stario::BufferSizeExceededException(message, context);
-
-        case osl::File::E_BADF:
-            throw stario::NotConnectedException(message, context);
-
-        default:
-            throw stario::IOException(message, context);
-        }
-    }
-//------------------------------------------------------------------
-OSLInputStreamWrapper::OSLInputStreamWrapper( osl::File& _rFile )
-                 :m_pFile(&_rFile)
-                 ,m_bFileOwner(sal_False)
-{
-}
-
-//------------------------------------------------------------------
-OSLInputStreamWrapper::OSLInputStreamWrapper( osl::File* pStream, sal_Bool bOwner )
-                 :m_pFile( pStream )
-                 ,m_bFileOwner( bOwner )
-{
-}
-
-//------------------------------------------------------------------
-OSLInputStreamWrapper::~OSLInputStreamWrapper()
-{
-    if( m_bFileOwner )
-        delete m_pFile;
-}
-
-//------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
-{
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    if (nBytesToRead < 0)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    osl::MutexGuard aGuard( m_aMutex );
-
-    aData.realloc(nBytesToRead);
-
-    sal_uInt64 nRead = 0;
-    osl::File::RC eError = m_pFile->read(aData.getArray(), nBytesToRead, nRead);
-    if (eError != osl::File::E_None)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen
-    if (nRead < (sal_uInt64)nBytesToRead)
-        aData.realloc( sal::static_int_cast<sal_Int32>( nRead ));
-
-    return sal::static_int_cast<sal_Int32>( nRead );
-}
-
-//------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
-{
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    if (nMaxBytesToRead < 0)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    /*
-      if (m_pFile->IsEof())
-      {
-      aData.realloc(0);
-      return 0;
-      }
-      else
-    */
-    return readBytes(aData, nMaxBytesToRead);
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
-{
-    osl::MutexGuard aGuard( m_aMutex );
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    sal_uInt64 nCurrentPos;
-    m_pFile->getPos(nCurrentPos);
-
-    sal_uInt64 nNewPos = nCurrentPos + nBytesToSkip;
-    osl::File::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos);
-    if (eError != osl::File::E_None)
-    {
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-    }
-}
-
-//------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException )
-{
-    ::osl::MutexGuard aGuard( m_aMutex );
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    sal_uInt64 nPos;
-    osl::File::RC eError = m_pFile->getPos(nPos);
-    if (eError != osl::File::E_None)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    sal_uInt64 nDummy = 0;
-    eError = m_pFile->setPos(Pos_End, nDummy);
-    if (eError != osl::File::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    sal_uInt64 nAvailable;
-    eError = m_pFile->getPos(nAvailable);
-    if (eError != osl::File::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    nAvailable = nAvailable - nPos;
-    eError = m_pFile->setPos(Pos_Absolut, nPos);
-    if (eError != osl::File::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-    return sal::static_int_cast<sal_Int32>( nAvailable );
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException )
-{
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    m_pFile->close();
-    if (m_bFileOwner)
-        delete m_pFile;
-
-    m_pFile = NULL;
-}
-
-/*************************************************************************/
-// stario::XOutputStream
-//------------------------------------------------------------------------------
-void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
-{
-    sal_uInt32 const nLength = sal_uInt32(aData.getLength());
-    if (nLength != 0)
-    {
-        sal_uInt64 nWritten;
-        osl::File::RC eError = rFile.write(aData.getConstArray(),nLength, nWritten);
-        if (eError != osl::File::E_None || nWritten != nLength)
-        {
-            throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-        }
-    }
-}
-
-
-//------------------------------------------------------------------
-void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
-{
-}
-
-//------------------------------------------------------------------
-void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
-{
-    rFile.close();
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-BufferedFileOutputStream::BufferedFileOutputStream( rtl::OUString const & aFileURL, bool bCreate, sal_uInt32 nBufferSizeHint)
-: m_aFile( aFileURL, nBufferSizeHint )
-{
-    sal_Int32 flags = bCreate ? OpenFlag_Write|OpenFlag_Create : OpenFlag_Write;
-
-    osl::File::RC rc = m_aFile.open(flags);
-    if (rc != osl::File::E_None)
-        raiseIOException(rc,NULL);
-}
-
-//------------------------------------------------------------------
-BufferedFileOutputStream::~BufferedFileOutputStream()
-{
-}
-
-//------------------------------------------------------------------------------
-void SAL_CALL BufferedFileOutputStream::writeBytes(const staruno::Sequence< sal_Int8 >& aData) 
-    throw( stario::NotConnectedException, stario::BufferSizeExceededException, 
-            stario::IOException, staruno::RuntimeException )
-{
-    const sal_uInt64 size = sal_uInt64(aData.getLength());
-    sal_uInt64 written = 0;
-
-    osl::File::RC rc = m_aFile.write(aData.getConstArray(), size, written);
-    if (rc != osl::File::E_None)
-        raiseIOException(rc,*this);
-
-    // we don't support special files where multiple write passes are needed
-    if (written < size)
-        raiseIOException(osl::File::E_IO,*this);
-}
-
-void SAL_CALL BufferedFileOutputStream::flush() 
-    throw( stario::NotConnectedException, stario::BufferSizeExceededException, 
-            stario::IOException, staruno::RuntimeException )
-{
-    osl::File::RC rc = m_aFile.sync();
-    if (rc != osl::File::E_None)
-        raiseIOException(rc,*this);
-}
-
-void SAL_CALL BufferedFileOutputStream::closeOutput() 
-    throw( stario::NotConnectedException, stario::BufferSizeExceededException, 
-            stario::IOException, staruno::RuntimeException )
-{
-    osl::File::RC rc = m_aFile.close();
-    if (rc != osl::File::E_None)
-        raiseIOException(rc,*this);
-}
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/misc/propertysethelper.cxx b/configmgr/source/misc/propertysethelper.cxx
deleted file mode 100644
index 1d68423605..0000000000
--- a/configmgr/source/misc/propertysethelper.cxx
+++ /dev/null
@@ -1,134 +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: 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
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include "propertysethelper.hxx"
-#include <com/sun/star/lang/XTypeProvider.hpp>
-
-#include <cppuhelper/typeprovider.hxx>
-
-//..........................................................................
-namespace configmgr {
-    namespace apihelper {
-//..........................................................................
-        namespace uno   = com::sun::star::uno;
-        namespace lang  = com::sun::star::lang;
-        namespace beans = com::sun::star::beans;
-//..........................................................................
-PropertySetHelper::PropertySetHelper()
-: BroadcasterBase()
-, cppu::OWeakObject()
-, cppu::OPropertySetHelper( BroadcasterBase::getBroadcastHelper() )
-, m_pHelper(0)
-{
-}
-
-//..........................................................................
-PropertySetHelper::~PropertySetHelper()
-{
-    delete m_pHelper;
-}
-
-//..........................................................................
-// XInterface
-uno::Any SAL_CALL PropertySetHelper::queryInterface( uno::Type const & rType ) throw (uno::RuntimeException)
-{
-    uno::Any aResult = cppu::OPropertySetHelper::queryInterface(rType);
-    if (!aResult.hasValue())
-        aResult = OWeakObject::queryInterface(rType);
-    return aResult;
-}
-
-void SAL_CALL PropertySetHelper::acquire() throw ()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL PropertySetHelper::release() throw ()
-{
-    if (m_refCount == 1)
-        this->disposing();
-
-    OWeakObject::release();
-}
-
-//..........................................................................
-// XTypeProvider
-uno::Sequence< uno::Type > SAL_CALL PropertySetHelper::getTypes() throw (uno::RuntimeException)
-{
-    // could be static instance
-    cppu::OTypeCollection aTypes(
-        ::getCppuType( static_cast< uno::Reference< beans::XPropertySet > const * >(0) ),
-        ::getCppuType( static_cast< uno::Reference< beans::XMultiPropertySet > const * >(0) ),
-        ::getCppuType( static_cast< uno::Reference< beans::XFastPropertySet > const * >(0) ),
-        ::getCppuType( static_cast< uno::Reference< lang::XTypeProvider > const * >(0) ) );
-
-    return aTypes.getTypes();
-}
-
-//..........................................................................
-// cppu::OPropertySetHelper
-uno::Reference< beans::XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo(  ) 
-    throw (uno::RuntimeException)
-{
-    return createPropertySetInfo(getInfoHelper());
-}
-    
-//..........................................................................
-cppu::IPropertyArrayHelper & SAL_CALL PropertySetHelper::getInfoHelper()
-{
-    osl::MutexGuard aGuard( getBroadcastMutex() );
-    if (!m_pHelper)
-        m_pHelper = newInfoHelper();
-
-    OSL_ENSURE(m_pHelper,"Derived class did not create new PropertyInfoHelper");
-    if (!m_pHelper)
-        throw uno::RuntimeException(rtl::OUString::createFromAscii("No PropertyArrayHelper available"),*this);
-
-    return *m_pHelper;
-}
-
-//..........................................................................
-sal_Bool SAL_CALL PropertySetHelper::convertFastPropertyValue(
-    uno::Any & rConvertedValue, uno::Any & rOldValue, sal_Int32 nHandle, const uno::Any& rValue )
-        throw (lang::IllegalArgumentException)
-{
-    this->getFastPropertyValue(rOldValue, nHandle);
-    rConvertedValue = rValue;
-    return rValue.isExtractableTo( rOldValue.getValueType() );   
-}
-//..........................................................................
-    }	// namespace apihelper
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/misc/providerfactory.cxx b/configmgr/source/misc/providerfactory.cxx
deleted file mode 100644
index 77f7432257..0000000000
--- a/configmgr/source/misc/providerfactory.cxx
+++ /dev/null
@@ -1,244 +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: providerfactory.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-
-#include "providerfactory.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include "bootstrap.hxx"
-#include "providerwrapper.hxx"
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/configuration/CannotLoadConfigurationException.hpp>
-#include <cppuhelper/exc_hlp.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
-#include <rtl/logfile.hxx>
-
-//---------------------------------------------------------------------------------------
-namespace configmgr
-{
-    //---------------------------------------------------------------------------------------
-    //= OProviderFactory
-    //---------------------------------------------------------------------------------------
-
-    //---------------------------------------------------------------------------------------
-
-    ProviderFactory::ProviderFactory(rtl::OUString const & aImplementationName, bool bAdmin)
-    : m_aImplementationName(aImplementationName)
-    , m_bAdmin(bAdmin)
-    {
-    }
-    //---------------------------------------------------------------------------------------
-
-    ProviderFactory::~ProviderFactory()
-    {
-    }
-    //---------------------------------------------------------------------------------------
-
-    uno::Reference< uno::XInterface > ProviderFactory::getProviderAlways(uno::Reference< uno::XComponentContext > const & xContext)
-    {
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::ProviderFactory", "jb99855", "configmgr::ProviderFactory::getProviderAlways()");
-        uno::Reference< uno::XInterface > xResult = getDefaultConfigProviderSingleton(xContext);
-
-        // check for success
-        OSL_ENSURE(xResult.is(), "Context could not create provider, but returned NULL instead of throwing an exception");
-        if (!xResult.is())
-        {
-            static sal_Char const sCannotCreate[] = "Cannot create ConfigurationProvider. Unknown backend or factory error.";
-
-            throw com::sun::star::configuration::CannotLoadConfigurationException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sCannotCreate)), *this );
-        }
-
-        return xResult;
-    }
-    //---------------------------------------------------------------------------------------
-    uno::Reference< uno::XInterface > ProviderFactory::getProviderFromContext(uno::Reference< uno::XComponentContext > const & xContext)
-    {
-        OSL_ENSURE(ContextReader::testAdminService(xContext, this->m_bAdmin),
-                    "Creation context admin flag does not match service being created");
-
-        try
-        {
-            return getProviderAlways(xContext);
-        }
-        catch(uno::Exception& e)
-        {
-            ContextReader aContext(xContext);
-
-            uno::Any aError = aContext.getBootstrapError();
-            if (aError.hasValue())
-            {
-                OSL_ASSERT(aError.getValueTypeClass() == uno::TypeClass_EXCEPTION);
-                cppu::throwException(aError);
-            }
-
-            OSL_ASSERT(aContext.isBootstrapValid());
-
-            static const sal_Char sErrContext[] = "Cannot open Configuration: ";
-            rtl::OUString const sContext(RTL_CONSTASCII_USTRINGPARAM(sErrContext));
-            e.Message = sContext.concat(e.Message);
-            throw;
-        }
-    }
-    //---------------------------------------------------------------------------------------
-    uno::Reference< uno::XInterface > ProviderFactory::createProviderWithArguments(uno::Reference< uno::XComponentContext > const & xContext, uno::Sequence < uno::Any > const & _aArguments)
-    {
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::ProviderFactory", "jb99855", "configmgr::ProviderFactory::createProviderWithArguments()");
-        
-        ContextReader aContext(xContext);
-        ArgumentHelper aParser(aContext.getBootstrapContext()); 
-
-        uno::Sequence < beans::NamedValue > aValues(_aArguments.getLength() + 2);
-        sal_Int32 nCount = parseArguments(aParser,aValues,_aArguments);
-        
-        bool bNeedNewBackend = aParser.hasBackendArguments();
-
-        if (!aContext.testAdminService(aContext.getBaseContext(),m_bAdmin))
-        {
-            bNeedNewBackend = true;
-            OSL_ASSERT( nCount+2  <= aValues.getLength());
-            aValues[nCount++] = ArgumentHelper::makeAdminServiceOverride(m_bAdmin);
-            aValues[nCount++] = BootstrapContext::makePassthroughMarker(sal_False);
-        }
-
-        OSL_ASSERT(nCount <= aValues.getLength());
-        aValues.realloc(nCount);
-
-        if (bNeedNewBackend)
-        {
-            uno::Reference< uno::XComponentContext > xMergedContext = BootstrapContext::createWrapper(xContext,aValues);
-            uno::Reference< uno::XInterface > xResult = getProviderFromContext(xMergedContext);
-
-            return xResult;
-        }
-        else
-        {
-            uno::Reference< uno::XInterface > xBaseProvider = getProviderFromContext(xContext);
-            uno::Reference< uno::XInterface > xResult = ProviderWrapper::create(xBaseProvider,aValues);
-
-            return xResult;
-        }
-    }
-    //---------------------------------------------------------------------------------------
-    uno::Reference< uno::XInterface > ProviderFactory::createProvider(uno::Reference< uno::XComponentContext > const & xContext, bool bAdmin)
-    {
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::ProviderFactory", "jb99855", "configmgr::ProviderFactory::createProvider(bAdmin)");
-        
-        uno::Sequence < beans::NamedValue > aValues(2);     
-        aValues[0] = ArgumentHelper::makeAdminServiceOverride(bAdmin);
-        aValues[1] = BootstrapContext::makePassthroughMarker(sal_False);
-
-        uno::Reference< uno::XComponentContext > xMergedContext = BootstrapContext::createWrapper(xContext,aValues);
-        uno::Reference< uno::XInterface > xResult = getProviderFromContext(xMergedContext);
-
-        return xResult;
-    }
-    //---------------------------------------------------------------------------------------
-    uno::Reference< uno::XInterface > ProviderFactory::createProvider(uno::Reference< uno::XComponentContext > const & xContext)
-    {
-        RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::ProviderFactory", "jb99855", "configmgr::ProviderFactory::createProvider()");
-        
-        if (BootstrapContext::isPassthrough(xContext))
-        {
-            // make sure this uses a new BootstrapContext !
-            uno::Reference< uno::XComponentContext > xPatchedContext = BootstrapContext::createWrapper(xContext,uno::Sequence < beans::NamedValue >());
-            return getProviderFromContext(xPatchedContext);
-        }
-        else
-            return getProviderFromContext(xContext);
-    }
-    //---------------------------------------------------------------------------------------
-
-    sal_Int32 ProviderFactory::parseArguments(ArgumentHelper & aParser, uno::Sequence < beans::NamedValue > & rValues, uno::Sequence < uno::Any > const & _aArguments)
-    {
-        OSL_ASSERT(rValues.getLength() >= _aArguments.getLength());
-
-        sal_Int32 nCount = 0;
-        for (sal_Int32 i = 0; i < _aArguments.getLength(); ++i)
-        {
-            if (!aParser.extractArgument(rValues[nCount],_aArguments[i]))
-            {
-                rtl::OUStringBuffer sMsg;
-                sMsg.appendAscii("ProviderFactory: Unexpected Argument Type. ");
-                sMsg.appendAscii("Expected NamedValue or PropertyValue,  ");
-                sMsg.appendAscii("found ").append(_aArguments[i].getValueTypeName()).appendAscii(". ");
-                throw lang::IllegalArgumentException(sMsg.makeStringAndClear(),*this,static_cast<sal_Int16>(i));
-            }
-
-            if (aParser.filterAndAdjustArgument(rValues[nCount]))
-            {
-                aParser.checkBackendArgument(rValues[nCount]);
-                ++nCount;
-            }
-        }
-        return nCount;
-    }
-    //---------------------------------------------------------------------------------------
-
-    uno::Reference< uno::XInterface > 
-        SAL_CALL ProviderFactory::createInstanceWithContext( const uno::Reference< uno::XComponentContext >& xContext ) 
-            throw (uno::Exception, ::com::sun::star::uno::RuntimeException)
-    {
-        // default provider ?
-        if (ContextReader::testAdminService(xContext,m_bAdmin))
-            return createProvider( xContext );
-
-        else
-            return createProvider(xContext,m_bAdmin);
-    }
-    //---------------------------------------------------------------------------------------
-
-    uno::Reference< uno::XInterface > SAL_CALL 
-        ProviderFactory::createInstanceWithArgumentsAndContext( const uno::Sequence< uno::Any >& aArguments, const uno::Reference< uno::XComponentContext >& xContext ) 
-            throw (uno::Exception, uno::RuntimeException)
-    {
-        // default request
-        return createProviderWithArguments(xContext, aArguments);
-    }
-
-    //---------------------------------------------------------------------------------------
-    //---------------------------------------------------------------------------------------
-
-    uno::Reference< lang::XSingleComponentFactory > SAL_CALL createProviderFactory(
-            rtl::OUString const & aImplementationName,
-            bool bAdmin
-        )
-    {
-        return new ProviderFactory(aImplementationName, bAdmin);
-    }
-    //---------------------------------------------------------------------------------------
-}	// namespace configmgr
-//........................................................................
-
diff --git a/configmgr/source/misc/providerfactory.hxx b/configmgr/source/misc/providerfactory.hxx
deleted file mode 100644
index 5703b06738..0000000000
--- a/configmgr/source/misc/providerfactory.hxx
+++ /dev/null
@@ -1,91 +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: providerfactory.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CONFIGMGR_PROVIDER_FACTORY_HXX_
-#define _CONFIGMGR_PROVIDER_FACTORY_HXX_
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-/*
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/stl_types.hxx>
-*/
-//------------------------------------------------------------------------
-namespace configmgr
-{
-    //------------------------------------------------------------------------
-    namespace uno   = ::com::sun::star::uno;
-    namespace lang  = ::com::sun::star::lang;
-    namespace beans = ::com::sun::star::beans;
-    //------------------------------------------------------------------------
-    class ContextReader;
-    class ArgumentHelper;
-    //------------------------------------------------------------------------
-    //= OProviderFactory
-    //------------------------------------------------------------------------
-    /** a special factory for the configuration provider, 
-        which maps creation arguments into a context.
-    */
-    class ProviderFactory : public cppu::WeakImplHelper1< lang::XSingleComponentFactory >
-    {
-        rtl::OUString const m_aImplementationName;
-        bool m_bAdmin;
-
-    public:
-        explicit
-        ProviderFactory(rtl::OUString const & aImplementationName, bool bAdmin);
-        ~ProviderFactory();
-
-        virtual uno::Reference< uno::XInterface > 
-            SAL_CALL createInstanceWithContext(uno::Reference< uno::XComponentContext > const & xContext ) 
-                throw (uno::Exception, uno::RuntimeException);
-
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstanceWithArgumentsAndContext( uno::Sequence < uno::Any > const & aArguments, uno::Reference< uno::XComponentContext > const & xContext ) 
-                throw (uno::Exception, uno::RuntimeException);
-
-    private:
-        uno::Reference< uno::XInterface > getProviderFromContext(uno::Reference< uno::XComponentContext > const & aContext);
-        uno::Reference< uno::XInterface > getProviderAlways(uno::Reference< uno::XComponentContext > const & xContext);
-        uno::Reference< uno::XInterface > createProviderWithArguments(uno::Reference< uno::XComponentContext > const & xContext, uno::Sequence < uno::Any > const & _aArguments);
-        uno::Reference< uno::XInterface > createProvider(uno::Reference< uno::XComponentContext > const & xContext,bool bAdmin);
-        uno::Reference< uno::XInterface > createProvider(uno::Reference< uno::XComponentContext > const & xContext);
-        sal_Int32 parseArguments(ArgumentHelper & aParser, uno::Sequence < beans::NamedValue > & rValues, uno::Sequence < uno::Any > const & _aArguments);
-    };
-//------------------------------------------------------------------------
-}	// namespace configmgr
-//------------------------------------------------------------------------
-
-#endif // _CONFIGMGR_PROVIDER_FACTORY_HXX_
-
diff --git a/configmgr/source/misc/providerwrapper.cxx b/configmgr/source/misc/providerwrapper.cxx
deleted file mode 100644
index 5fdf876745..0000000000
--- a/configmgr/source/misc/providerwrapper.cxx
+++ /dev/null
@@ -1,196 +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: providerwrapper.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_configmgr.hxx"
-
-#include "providerwrapper.hxx"
-#include "bootstrap.hxx"
-#include "bootstrapcontext.hxx"
-
-
-#include <com/sun/star/lang/NullPointerException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-
-#include <algorithm>
-
-
-namespace configmgr
-{
-    //==========================================================================
-    namespace uno = com::sun::star::uno;
-    namespace lang = com::sun::star::lang;
-    //==========================================================================
-    //= ProviderWrapper
-    //==========================================================================
-           
-    uno::Reference< uno::XInterface > ProviderWrapper::create( uno::Reference< uno::XInterface > xDelegate, uno::Sequence< com::sun::star::beans::NamedValue > const & aPresets)
-    {
-        uno::Reference< lang::XMultiServiceFactory > xProvDelegate(xDelegate, uno::UNO_QUERY);
-        if (!xProvDelegate.is())
-        {
-            rtl::OUString sMsg(RTL_CONSTASCII_USTRINGPARAM("ProviderWrapper: Cannot wrap a NULL provider"));
-            throw lang::NullPointerException(sMsg,NULL);
-        }
-        //Strip prefixes
-        uno::Sequence< com::sun::star::beans::NamedValue > aStrippedPresets = aPresets;
-
-        for (sal_Int32 i = 0; i < aPresets.getLength(); ++i)
-        {
-            if(aPresets[i].Name.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CONTEXT_ITEM_PREFIX_ )))
-            {
-                aStrippedPresets[i].Name = aPresets[i].Name.copy(RTL_CONSTASCII_LENGTH(CONTEXT_ITEM_PREFIX_ ));		
-            }
-        }
-
-        uno::Reference< lang::XMultiServiceFactory > xResult( new ProviderWrapper(xProvDelegate,aStrippedPresets) );
-
-        DisposingForwarder::forward( uno::Reference< lang::XComponent >::query(xProvDelegate),uno::Reference< lang::XComponent >::query(xResult) );
-        return uno::Reference< uno::XInterface >( xResult, uno::UNO_QUERY );
-    }
-
-           
-    ProviderWrapper::ProviderWrapper(uno::Reference< lang::XMultiServiceFactory > const & xDelegate, uno::Sequence< com::sun::star::beans::NamedValue > const & aPresets)
-    : cppu::WeakComponentImplHelper2< lang::XMultiServiceFactory, lang::XServiceInfo >( PWMutexHolder::mutex )
-    , m_xDelegate(xDelegate)
-    , m_aDefaults(aPresets.getLength())
-    {
-        OSL_ASSERT(m_xDelegate.is());
-
-        for (sal_Int32 i = 0; i<aPresets.getLength(); ++i)
-        {
-            m_aDefaults[i] <<= aPresets[i];
-        }
-    }
-
-    ProviderWrapper::~ProviderWrapper() {}
-        
-    void SAL_CALL ProviderWrapper::disposing()
-    {
-        osl::MutexGuard lock(mutex);
-        m_xDelegate.clear();
-    }
-
-    uno::Reference< lang::XMultiServiceFactory > ProviderWrapper::getDelegate()
-    {
-        osl::MutexGuard lock(mutex);
-        if (!m_xDelegate.is())
-        {
-            rtl::OUString sMsg(RTL_CONSTASCII_USTRINGPARAM("ProviderWrapper: Delegate Provider has been disposed"));
-            throw lang::DisposedException(sMsg,*this);
-        }
-        return m_xDelegate;
-    }
-
-            
-    uno::Reference<lang::XServiceInfo> ProviderWrapper::getDelegateInfo()
-    {
-        uno::Reference<lang::XServiceInfo> xDelegate( this->getDelegate(), uno::UNO_QUERY );
-        if (!xDelegate.is())
-        {
-            rtl::OUString sMsg(RTL_CONSTASCII_USTRINGPARAM("ProviderWrapper: Delegate Provider has no service info"));
-            throw uno::RuntimeException(sMsg,*this);
-        }
-        return xDelegate;
-    }
-
-    /// XMultiServiceFactory
-    static inline uno::Any const * begin(uno::Sequence< uno::Any > const & aArgs)
-    { return aArgs.getConstArray(); }
-    static inline uno::Any const * end(uno::Sequence< uno::Any > const & aArgs)
-    { return aArgs.getConstArray() + aArgs.getLength(); }
-    static inline uno::Any * begin(uno::Sequence< uno::Any > & aArgs)
-    { return aArgs.getArray(); }
-    static inline uno::Any * end(uno::Sequence< uno::Any > & aArgs)
-    { return aArgs.getArray() + aArgs.getLength(); }
-
-    uno::Sequence< uno::Any > ProviderWrapper::patchArguments(uno::Sequence< uno::Any > const & aArgs) const
-    {
-        // rely on evaluation order front to back
-        if (m_aDefaults.getLength() == 0) return aArgs;
-        
-        uno::Sequence< uno::Any > aResult(m_aDefaults.getLength() + aArgs.getLength());
-
-        uno::Any * pNext = std::copy(begin(m_aDefaults),end(m_aDefaults),begin(aResult));
-        pNext = std::copy(begin(aArgs),end(aArgs),pNext);
-
-        OSL_ASSERT(end(aResult) == pNext);
-
-        return aResult;
-    }
-
-    uno::Reference< uno::XInterface > SAL_CALL 
-        ProviderWrapper::createInstance( const rtl::OUString& aServiceSpecifier ) 
-            throw(uno::Exception, uno::RuntimeException)
-    {
-        return getDelegate()->createInstanceWithArguments(aServiceSpecifier,m_aDefaults);
-    }
-
-    uno::Reference< uno::XInterface > SAL_CALL 
-        ProviderWrapper::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& rArguments ) 
-            throw(uno::Exception, uno::RuntimeException)
-    {
-        return getDelegate()->createInstanceWithArguments(ServiceSpecifier,patchArguments(rArguments));
-    }
-
-    uno::Sequence< rtl::OUString > SAL_CALL 
-        ProviderWrapper::getAvailableServiceNames(  ) 
-            throw(uno::RuntimeException)
-    {
-        return getDelegate()->getAvailableServiceNames(  );
-    }
-
-    /// XServiceInfo
-    rtl::OUString SAL_CALL 
-        ProviderWrapper::getImplementationName(  ) 
-            throw(uno::RuntimeException)
-    {
-        return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.ConfigurationProviderWrapper");
-    }
-
-    sal_Bool SAL_CALL 
-        ProviderWrapper::supportsService( const ::rtl::OUString& ServiceName ) 
-            throw(uno::RuntimeException)
-    {
-        return getDelegateInfo()->supportsService( ServiceName );
-    }
-
-    uno::Sequence< rtl::OUString > SAL_CALL 
-        ProviderWrapper::getSupportedServiceNames(  ) 
-            throw(uno::RuntimeException)
-    {
-        return getDelegateInfo()->getSupportedServiceNames(  );
-    }
-
-
-} // namespace configmgr
-
-
-
diff --git a/configmgr/source/misc/providerwrapper.hxx b/configmgr/source/misc/providerwrapper.hxx
deleted file mode 100644
index f402552a09..0000000000
--- a/configmgr/source/misc/providerwrapper.hxx
+++ /dev/null
@@ -1,101 +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: providerwrapper.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 CONFIGMGR_API_PROVIDERWRAPPER_HXX_
-#define CONFIGMGR_API_PROVIDERWRAPPER_HXX_
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <osl/mutex.hxx>
-
-namespace configmgr
-{
-    //==========================================================================
-    namespace uno = com::sun::star::uno;
-    namespace lang = com::sun::star::lang;
-    //==========================================================================
-    //= ProviderWrapper
-    //==========================================================================
-    struct PWMutexHolder { osl::Mutex mutex; }; // ad hoc ...
-
-    class ProviderWrapper : private PWMutexHolder, public cppu::WeakComponentImplHelper2< lang::XMultiServiceFactory, lang::XServiceInfo >
-    {
-    private:
-        uno::Reference< lang::XMultiServiceFactory >    m_xDelegate;
-        uno::Sequence< uno::Any >   m_aDefaults;
-    private:
-        ProviderWrapper(uno::Reference< lang::XMultiServiceFactory > const & xDelegate, uno::Sequence< com::sun::star::beans::NamedValue > const & aPresets);
-
-    public:
-        static uno::Reference< uno::XInterface > create( uno::Reference< uno::XInterface > xDelegate, uno::Sequence< com::sun::star::beans::NamedValue > const & aPresets);
-        ~ProviderWrapper();
-
-        /// XMultiServiceFactory
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstance( const rtl::OUString& aServiceSpecifier ) 
-                throw(uno::Exception, uno::RuntimeException);
-
-        virtual uno::Reference< uno::XInterface > SAL_CALL 
-            createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) 
-                throw(uno::Exception, uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getAvailableServiceNames(  ) 
-                throw(uno::RuntimeException);
-
-        /// XServiceInfo
-        virtual rtl::OUString SAL_CALL 
-            getImplementationName(  ) 
-                throw(uno::RuntimeException);
-
-        virtual sal_Bool SAL_CALL 
-            supportsService( const ::rtl::OUString& ServiceName ) 
-                throw(uno::RuntimeException);
-
-        virtual uno::Sequence< rtl::OUString > SAL_CALL 
-            getSupportedServiceNames(  ) 
-                throw(uno::RuntimeException);
-
-    protected:
-        virtual void SAL_CALL disposing();
-    private:
-        uno::Reference< lang::XMultiServiceFactory > getDelegate();
-        uno::Reference<lang::XServiceInfo> getDelegateInfo();
-        uno::Sequence< uno::Any > patchArguments(uno::Sequence< uno::Any > const & aArgs) const;
-    };
-
-
-} // namespace configmgr
-
-#endif // CONFIGMGR_API_CONFPROVIDER2_HXX_
-
-
diff --git a/configmgr/source/misc/requestoptions.cxx b/configmgr/source/misc/requestoptions.cxx
deleted file mode 100644
index 6302e943c5..0000000000
--- a/configmgr/source/misc/requestoptions.cxx
+++ /dev/null
@@ -1,107 +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: requestoptions.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_configmgr.hxx"
-
-#include "requestoptions.hxx"
-#include "matchlocale.hxx"
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-
-    rtl::OUString RequestOptions::getIsoLocale() const
-    {
-        return localehelper::makeIsoLocale( m_sLocale );
-    }
-// ---------------------------------------------------------------------------
-
-    bool RequestOptions::isForAllLocales() const
-    {
-        return localehelper::designatesAllLocales( m_sLocale );
-    }
-// ---------------------------------------------------------------------------
-        
-    void RequestOptions::setIsoLocale(rtl::OUString const & _sLocale)
-    {
-        setLocale( localehelper::makeLocale( _sLocale ) );
-    }
-// ---------------------------------------------------------------------------
-
-    void RequestOptions::setAllLocales() 
-    {
-        m_sLocale = localehelper::getAnyLocale();
-    }
-// ---------------------------------------------------------------------------
-
-    void RequestOptions::ensureLocaleSet() 
-    {
-        if (!hasLocale())
-            m_sLocale = localehelper::getDefaultLocale();
-    }
-// ---------------------------------------------------------------------------
-
-    static inline
-    sal_Int32 hashRequestLocale(com::sun::star::lang::Locale const & aLocale)
-    { 
-        return aLocale.Language.hashCode() ^ aLocale.Country.hashCode(); 
-    } 
-// ---------------------------------------------------------------------------
-
-    static inline 
-    sal_Int32 compareRequestLocale(com::sun::star::lang::Locale const& lhs, com::sun::star::lang::Locale const& rhs)
-    {
-        sal_Int32 nDiff = lhs.Language.compareTo(rhs.Language);
-        if (nDiff == 0)
-        {
-            nDiff = lhs.Country.compareTo(rhs.Country);
-        }
-
-        return nDiff;
-    }	
-// ---------------------------------------------------------------------------
-
-    sal_Int32 compareRequestOptions(RequestOptions const& lhs, RequestOptions const& rhs)
-    {
-        sal_Int32 nDiff = lhs.getEntity().compareTo(rhs.getEntity());
-        if (nDiff == 0)
-        {
-            nDiff = compareRequestLocale(lhs.getUnoLocale(),rhs.getUnoLocale());
-        }
-
-        return nDiff;
-    }	
-// ---------------------------------------------------------------------------
-} // namespace config
-
-
diff --git a/configmgr/source/misc/serviceinfohelper.cxx b/configmgr/source/misc/serviceinfohelper.cxx
deleted file mode 100644
index 8a379b01f4..0000000000
--- a/configmgr/source/misc/serviceinfohelper.cxx
+++ /dev/null
@@ -1,192 +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: serviceinfohelper.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_configmgr.hxx"
-
-#include "serviceinfohelper.hxx"
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-
-    sal_Int32 ServiceInfoHelper::countServices( ) const 
-    {
-        if (m_info == 0)
-            return 0;
-
-        sal_Int32 nCount = 0;
-        if (sal_Char const * const* p= m_info->registeredServiceNames)
-        {
-            while (*p != 0)
-            {
-                ++nCount;
-                ++p;
-            }
-        }
-        if (sal_Char const * const* p= m_info->additionalServiceNames)
-        {
-            while (*p != 0)
-            {
-                ++nCount;
-                ++p;
-            }
-        }
-
-        return nCount;
-    }
-// ---------------------------------------------------------------------------
-
-    rtl::OUString ServiceInfoHelper::getImplementationName( ) const 
-        throw(uno::RuntimeException)
-    {
-        sal_Char const * p= m_info ? m_info->implementationName : 0;
-
-        return p ? rtl::OUString::createFromAscii(p) : rtl::OUString();
-    }
-// ---------------------------------------------------------------------------
-
-    sal_Bool ServiceInfoHelper::supportsService( rtl::OUString const & ServiceName ) const 
-        throw(uno::RuntimeException)
-    {
-        if (m_info == 0)
-            return false;
-
-        if (sal_Char const * const* p= m_info->registeredServiceNames)
-        {
-            while (*p != 0)
-            {
-                if (ServiceName.equalsAscii(*p))
-                    return true;
-                ++p;
-            }
-        }
-        if (sal_Char const * const* p= m_info->additionalServiceNames)
-        {
-            while (*p != 0)
-            {
-                if (ServiceName.equalsAscii(*p))
-                    return true;
-                ++p;
-            }
-        }
-        
-        return false;
-    }
-// ---------------------------------------------------------------------------
-
-    uno::Sequence< rtl::OUString > ServiceInfoHelper::getSupportedServiceNames( ) const 
-        throw(uno::RuntimeException)
-    {
-        sal_Int32 const nCount = countServices();
-
-        uno::Sequence< rtl::OUString > aServices( nCount );
-
-        if (nCount)
-        {
-            OSL_ASSERT(m_info);
-            sal_Int32 i = 0;
-            if (sal_Char const * const* p= m_info->registeredServiceNames)
-            {
-                while (*p != 0)
-                {
-                    aServices[i++] = rtl::OUString::createFromAscii(*p++);
-                }
-            }
-            if (sal_Char const * const* p= m_info->additionalServiceNames)
-            {
-                while (*p != 0)
-                {
-                    aServices[i++] = rtl::OUString::createFromAscii(*p++);
-                }
-            }
-            OSL_ASSERT( i == nCount );
-        }
-
-        return aServices;
-    }
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-
-    sal_Int32 ServiceRegistrationHelper::countServices( ) const 
-    {
-        if (m_info == 0)
-            return 0;
-
-        sal_Int32 nCount = 0;
-        if (sal_Char const * const* p= m_info->registeredServiceNames)
-        {
-            while (*p != 0)
-            {
-                ++nCount;
-                ++p;
-            }
-        }
-
-        return nCount;
-    }
-// ---------------------------------------------------------------------------
-
-    rtl::OUString ServiceRegistrationHelper::getImplementationName( ) const 
-        throw(uno::RuntimeException)
-    {
-        sal_Char const * p= m_info ? m_info->implementationName : 0;
-
-        return p ? rtl::OUString::createFromAscii(p) : rtl::OUString();
-    }
-// ---------------------------------------------------------------------------
-
-    uno::Sequence< rtl::OUString > ServiceRegistrationHelper::getRegisteredServiceNames( ) const 
-        throw(uno::RuntimeException)
-    {
-        sal_Int32 const nCount = countServices();
-
-        uno::Sequence< rtl::OUString > aServices( nCount );
-
-        if (nCount)
-        {
-            OSL_ASSERT(m_info);
-            sal_Int32 i = 0;
-            if (sal_Char const * const* p= m_info->registeredServiceNames)
-            {
-                while (*p != 0)
-                {
-                    aServices[i++] = rtl::OUString::createFromAscii(*p++);
-                }
-            }
-            OSL_ASSERT( i == nCount );
-        }
-
-        return aServices;
-    }
-// ---------------------------------------------------------------------------
-} // namespace config
-
-
diff --git a/configmgr/source/misc/simpleinteractionrequest.cxx b/configmgr/source/misc/simpleinteractionrequest.cxx
deleted file mode 100644
index 67deee34b1..0000000000
--- a/configmgr/source/misc/simpleinteractionrequest.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: simpleinteractionrequest.cxx,v $
- * $Revision: 1.5.18.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_configmgr.hxx"
-
-#include "simpleinteractionrequest.hxx"
-
-namespace configmgr { namespace apihelper {
-
-namespace uno = com::sun::star::uno;
-namespace task = com::sun::star::task;
-//=========================================================================
-SimpleInteractionRequest::SimpleInteractionRequest(
-                                    const uno::Any & rRequest,
-                                    const sal_uInt32 nContinuations )
-: InteractionRequest( rRequest )
-{
-    // Set continuations.
-    OSL_ENSURE( nContinuations != CONTINUATION_UNKNOWN,
-                "SimpleInteractionRequest - No continuation!" );
-
-    sal_Int32 nLength = 0;
-
-    const sal_uInt32 k_NumContinuationTypes = 4;
-    uno::Reference< task::XInteractionContinuation > xContinuations[ k_NumContinuationTypes ];
-
-    if ( nContinuations & CONTINUATION_ABORT )
-        xContinuations[nLength++] = new InteractionContinuation< task::XInteractionAbort >( this );
-
-    if ( nContinuations & CONTINUATION_RETRY )
-        xContinuations[nLength++] = new InteractionContinuation< task::XInteractionRetry >( this );
-
-    if ( nContinuations & CONTINUATION_APPROVE )
-        xContinuations[nLength++] = new InteractionContinuation< task::XInteractionApprove >( this );
-
-    if (  nContinuations & CONTINUATION_DISAPPROVE )
-        xContinuations[nLength++] = new InteractionContinuation< task::XInteractionDisapprove >( this );
-
-    OSL_ENSURE( nLength > 0,
-                "SimpleInteractionRequest - No continuation!" );
-
-    uno::Sequence< uno::Reference< task::XInteractionContinuation > >
-        aContinuations( xContinuations, nLength );
-
-    this->setContinuations( aContinuations );
-}
-
-//=========================================================================
-sal_uInt32 SimpleInteractionRequest::getResponse() const
-{
-    uno::Reference< task::XInteractionContinuation > xSelection = this->getSelection();
-    if ( xSelection.is() )
-    {
-        if ( uno::Reference< task::XInteractionApprove >::query(xSelection).is() )
-            return CONTINUATION_APPROVE;
-
-        if ( uno::Reference< task::XInteractionDisapprove >::query(xSelection).is() )
-            return CONTINUATION_DISAPPROVE;
-
-        if ( uno::Reference< task::XInteractionRetry >::query(xSelection).is() )
-            return CONTINUATION_RETRY;
-
-        if ( uno::Reference< task::XInteractionAbort >::query(xSelection).is() )
-            return CONTINUATION_ABORT;
-
-        OSL_ENSURE( sal_False,
-            "SimpleInteractionRequest::getResponse - Unknown continuation!" );
-    }
-    return CONTINUATION_UNKNOWN;
-}
-
-} }
diff --git a/configmgr/source/misc/strimpl.cxx b/configmgr/source/misc/strimpl.cxx
deleted file mode 100644
index acd4f3a10d..0000000000
--- a/configmgr/source/misc/strimpl.cxx
+++ /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: strimpl.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_configmgr.hxx"
-#include "strdecl.hxx"
-
-namespace configmgr
-{
-    // simple types names
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_BOOLEAN,	"boolean");
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_SHORT,	"short");
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_INT,		"int");
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_LONG,		"long");
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_DOUBLE,	"double");
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_STRING,	"string");
-    // Type: Sequence<bytes>
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_BINARY,	"binary");
-    // Universal type: Any
-    IMPLEMENT_CONSTASCII_USTRING(TYPE_ANY,		"any");
-
-    // special template names for native/localized value types
-    IMPLEMENT_CONSTASCII_USTRING(TEMPLATE_MODULE_NATIVE_PREFIX,		"cfg:");
-    IMPLEMENT_CONSTASCII_USTRING(TEMPLATE_MODULE_NATIVE_VALUE,		"cfg:value");
-    IMPLEMENT_CONSTASCII_USTRING(TEMPLATE_MODULE_LOCALIZED_VALUE,	"cfg:localized");
-
-    IMPLEMENT_CONSTASCII_USTRING(TEMPLATE_LIST_SUFFIX, "-list");
-
-
-
-// emacs:
-// create the declare from the implement
-// (fset 'create-declare-from-implement
-//   [home M-right ?\C-  ?\C-s ?, left right left ?\M-w f12 return up tab ?D ?E ?C ?L ?A ?R ?E ?\C-y ?) ?; home down f12 home down])
-
-} // namespace configmgr
diff --git a/configmgr/source/misc/tracer.cxx b/configmgr/source/misc/tracer.cxx
deleted file mode 100644
index 0632ce0887..0000000000
--- a/configmgr/source/misc/tracer.cxx
+++ /dev/null
@@ -1,474 +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: tracer.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_configmgr.hxx"
-
-// SUNPRO5 does not like the following to be done after including stdio.h, that's why it's here at the very
-// beginning of the file
-#undef _TIME_T_DEFINED
-#include <time.h>
-#include <rtl/string.hxx>
-#include <map>
-
-#include "tracer.hxx"
-
-#ifdef CFG_ENABLE_TRACING
-
-#include <cstdarg>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <osl/process.h>
-#include <osl/thread.h>
-#include <osl/diagnose.h>
-#include <rtl/ustring.hxx>
-#include <rtl/instance.hxx>
-
-namespace configmgr
-{
-
-extern "C"
-{
-    static void call_freeThreadData(void*);
-}
-
-struct OTracerSetup
-{
-    enum {
-        INFO	= 0x01,
-        WARNING = 0x02,
-        ERROR	= 0x04,
-        LEVEL_MASK = 0x0f,
-
-        TIME	= 0x10,
-        THREAD	= 0x20,
-        DATA_MASK = 0xf0
-    };
-
-    sal_uInt32		m_nTraceMask;
-    FILE*			m_pOutputMedium;
-    sal_Bool		m_bInitialized;
-    oslThreadKey	m_nThreadKey;
-
-    ::std::map< ::rtl::OString, void*, ::std::less< ::rtl::OString > >	m_aDevices;
-
-    OTracerSetup()
-        :m_nTraceMask(WARNING | ERROR)
-        ,m_pOutputMedium(NULL)
-        ,m_bInitialized(sal_False)
-    {
-        m_nThreadKey = ::osl_createThreadKey(call_freeThreadData);
-    }
-    ~OTracerSetup()
-    {
-        ::osl_destroyThreadKey(m_nThreadKey);
-    }
-
-    bool isTracing(sal_uInt32 nTraceValue) const
-    { return (nTraceValue & this->m_nTraceMask) == nTraceValue; }
-
-    void setTracing(sal_uInt32 nTraceValue)
-    { this->m_nTraceMask |= nTraceValue; }
-
-    void setTracing(sal_uInt32 nTraceValue, sal_uInt32 nMask)
-    {
-        OSL_ENSURE( (nTraceValue&nMask) == nTraceValue, "Flags being set must be part of mask");
-        this->m_nTraceMask &= ~nMask;
-        this->m_nTraceMask |= nTraceValue;
-    }
-
-    sal_Int32& indentDepth();
-
-    struct ThreadData
-    {
-        ThreadData() : m_nIndentDepth(0) {}
-        sal_Int32  m_nIndentDepth;
-    };
-
-    ThreadData& ensureThreadData();
-    static void freeThreadData(void*p);
-};
-
-//==========================================================================
-//= OConfigTracer
-//==========================================================================
-OTracerSetup*	OConfigTracer::s_pImpl = NULL;
-#ifdef WNT
-timeb			OConfigTracer::s_aStartTime;
-#else
-timeval			OConfigTracer::s_aStartTime;
-#endif
-
-::osl::Mutex &	OConfigTracer::getMutex()
-{
-    return rtl::Static<osl::Mutex,OConfigTracer>::get();
-}
-//--------------------------------------------------------------------------
-void OConfigTracer::startGlobalTimer()
-{
-#ifdef WNT
-    ftime( &s_aStartTime );
-#else
-    gettimeofday( &s_aStartTime, NULL );
-#endif
-}
-
-//--------------------------------------------------------------------------
-sal_uInt32 OConfigTracer::getGlobalTimer()
-{
-#ifdef WNT
-    struct timeb currentTime;
-    sal_uInt32 nSeconds;
-    ftime( &currentTime );
-    nSeconds = (sal_uInt32)( currentTime.time - s_aStartTime.time );
-    return ( nSeconds * 1000 ) + (long)( currentTime.millitm - s_aStartTime.millitm );
-#else
-    struct timeval currentTime;
-    sal_uInt32 nSeconds;
-    gettimeofday( &currentTime, NULL );
-    nSeconds = (sal_uInt32)( currentTime.tv_sec - s_aStartTime.tv_sec );
-    return ( nSeconds * 1000 ) + (long)( currentTime.tv_usec - s_aStartTime.tv_usec )/1000;
-#endif
-}
-
-//--------------------------------------------------------------------------
-sal_Int32& OTracerSetup::indentDepth()
-{
-    return ensureThreadData().m_nIndentDepth;
-}
-
-//--------------------------------------------------------------------------
-OTracerSetup::ThreadData& OTracerSetup::ensureThreadData()
-{
-    void * pThreadData = ::osl_getThreadKeyData(m_nThreadKey);
-
-    OTracerSetup::ThreadData* pRet
-        = static_cast< OTracerSetup::ThreadData * >(pThreadData);
-
-    if (pRet == NULL)
-    {
-        pThreadData = pRet = new ThreadData();
-
-        if (!::osl_setThreadKeyData(m_nThreadKey,pThreadData))
-        {
-            OSL_ENSURE(false, "Cannot create per-thread data for tracing");
-            freeThreadData(pThreadData);
-
-            static ThreadData sharedThreadData;
-            pRet = &sharedThreadData;
-        }
-        else
-            OSL_ASSERT( pThreadData == ::osl_getThreadKeyData(m_nThreadKey) );
-
-        OSL_ASSERT( pRet != NULL );
-    }
-
-    return *pRet;
-}
-
-static void call_freeThreadData( void* p )
-{
-    OTracerSetup::freeThreadData( p );
-}
-
-//--------------------------------------------------------------------------
-void OTracerSetup::freeThreadData(void* p)
-{
-    delete static_cast< OTracerSetup::ThreadData * > (p);
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::ensureData()
-{
-    if (s_pImpl)
-        return;
-    s_pImpl = new OTracerSetup;
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::inc()
-{
-    ::osl::MutexGuard aGuard(getMutex());
-    ensureData();
-    ++s_pImpl->indentDepth();
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::dec()
-{
-    ::osl::MutexGuard aGuard(getMutex());
-    ensureData();
-    --s_pImpl->indentDepth();
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::traceInfo(const sal_Char* _pFormat, ...)
-{
-    ::osl::MutexGuard aGuard(getMutex());
-    ensureData();
-    ensureInitalized();
-    if (s_pImpl->isTracing(OTracerSetup::INFO) )
-    {
-
-
-        va_list args;
-        va_start(args, _pFormat);
-        implTrace("info", _pFormat, args);
-        va_end(args);
-    }
-}
-#if OSL_DEBUG_LEVEL > 0
-//--------------------------------------------------------------------------
-void OConfigTracer::traceWarning(const sal_Char* _pFormat, ...)
-{
-    ::osl::MutexGuard aGuard(getMutex());
-    ensureData();
-    ensureInitalized();
-    if (s_pImpl->isTracing(OTracerSetup::WARNING))
-    {
-        va_list args;
-        va_start(args, _pFormat);
-        implTrace("warning", _pFormat, args);
-        va_end(args);
-    }
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::traceError(const sal_Char* _pFormat, ...)
-{
-    ::osl::MutexGuard aGuard(getMutex());
-    ensureData();
-    ensureInitalized();
-    if (s_pImpl->isTracing(OTracerSetup::ERROR))
-    {
-        va_list args;
-        va_start(args, _pFormat);
-        implTrace("error", _pFormat, args);
-        va_end(args);
-    }
-}
-#endif
-//--------------------------------------------------------------------------
-void OConfigTracer::indent()
-{
-    sal_Int32 nIndent = s_pImpl->indentDepth();
-    for (sal_Int32 i=0; i<nIndent; ++i)
-        fprintf(s_pImpl->m_pOutputMedium, " ");
-}
-
-//--------------------------------------------------------------------------
-FILE* disambiguate(const ::rtl::OString& _rFileName)
-{
-    FILE* pExistenceCheck = NULL;
-    sal_Int32 i = 1;
-    ::rtl::OString sLoop;
-    while (i <= 256)
-    {
-        sLoop = _rFileName;
-        sLoop += ".";
-        sLoop += ::rtl::OString::valueOf(i);
-
-        pExistenceCheck = fopen(sLoop.getStr(), "r");
-        if (!pExistenceCheck)
-            // does not exist
-            return fopen(sLoop.getStr(), "w+");
-
-        // already exists, try the next name
-        fclose(pExistenceCheck);
-        ++i;
-    }
-
-    // could not open such a file
-    return NULL;
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::ensureInitalized()
-{
-    if (s_pImpl->m_bInitialized)
-        return;
-
-    s_pImpl->m_bInitialized = sal_True;
-
-    char* pSettings = getenv("ENVCFGFLAGS");
-    if (!pSettings)
-        return;
-
-    /*	currently recognized structure :
-        + switches have to be separated by whitespaces
-        + valid switches are:
-            -m[e|o|f<file>]	-	output to stderr (e), stdout (o) or a file (f). In the latter case the whole rest
-                                of the param ('til the next one, means 'til the next whitespace) is the filename
-            -t{i,w,e,p,d}*	-	type of output : i includes infos, w includes warnings, e includes errors
-                                content : p includes timestamp, d includes thread-id
-    */
-
-    s_pImpl->m_pOutputMedium = stderr;
-    s_pImpl->setTracing(0, OTracerSetup::LEVEL_MASK);
-    s_pImpl->setTracing(0, OTracerSetup::DATA_MASK);
-
-    char* pParamLoop = pSettings;
-    while (*pParamLoop)
-    {
-        while (!isspace(*pParamLoop) && *pParamLoop)
-            ++pParamLoop;
-
-        sal_Int32 nLen = pParamLoop - pSettings;
-        if ((nLen > 1) && (*pSettings == '-'))
-        {
-            ++pSettings;
-            switch (*pSettings)
-            {
-                case 'm':
-                case 'w':
-                    if (nLen > 2)
-                    {
-                        ++pSettings;
-                        switch (*pSettings)
-                        {
-                            case 'e':
-                                s_pImpl->m_pOutputMedium = stderr;
-                                break;
-                            case 'o':
-                                s_pImpl->m_pOutputMedium = stdout;
-                                break;
-                            case 'f':
-                            {
-                                ++pSettings;
-                                // copy the filename into an own buffer
-                                ::rtl::OString sFileName(pSettings, pParamLoop - pSettings);
-
-                                // open the file
-                                s_pImpl->m_pOutputMedium = disambiguate(sFileName);
-
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                case 'd':
-                {	// assign a virtual device
-                    // copy the device assingment description
-                    ::rtl::OString sDescription(pSettings + 1, pParamLoop - pSettings - 1);
-                    sal_Int32 nSep = sDescription.indexOf(':');
-                    if (-1 == nSep)
-                        break;	// invalid format
-
-                    ::rtl::OString sVirtualDeviceName, sFileName;
-                    sVirtualDeviceName = sDescription.copy(0, nSep);
-                    sFileName = sDescription.copy(nSep + 1);
-
-                    FILE* pVirtualDevice = disambiguate(sFileName);
-                    if (pVirtualDevice)
-                        s_pImpl->m_aDevices[sVirtualDeviceName] = pVirtualDevice;
-                }
-                case 't':
-                {
-                    ++pSettings;
-                    while (pSettings != pParamLoop)
-                    {
-                        switch (*pSettings)
-                        {
-                            case 'i':	s_pImpl->setTracing( OTracerSetup::INFO ); break;
-                            case 'w':	s_pImpl->setTracing( OTracerSetup::WARNING ); break;
-                            case 'e':	s_pImpl->setTracing(  OTracerSetup::ERROR ); break;
-                            case 'p':	s_pImpl->setTracing(  OTracerSetup::TIME );
-                                        startGlobalTimer();
-                                        break;
-                            case 'd':	s_pImpl->setTracing(  OTracerSetup::THREAD ); break;
-                        }
-                        ++pSettings;
-                    }
-                }
-            }
-        }
-
-        if (!*pParamLoop)
-            break;
-
-        ++pParamLoop;
-        pSettings = pParamLoop;
-    }
-
-    // trace some initial information
-    CFG_TRACE_INFO_NI("initialization: process id: 0x%08X", osl_getProcess(0));
-    ::rtl::OUString sExecutable;
-    osl_getExecutableFile(&sExecutable.pData);
-    CFG_TRACE_INFO_NI("initialization: executable file name: %s", OUSTRING2ASCII(sExecutable));
-}
-
-//--------------------------------------------------------------------------
-//-----------------------------------------------------------
-// need raw unsigned int to safely printf a value
-static inline
-unsigned int getThreadID()
-{
-    oslThreadIdentifier nRealThreadID = ::osl_getThreadIdentifier(NULL);
-
-    return nRealThreadID; // if this loses data, we can still hope that lsb is changing between thraeds
-}
-
-//--------------------------------------------------------------------------
-void OConfigTracer::implTrace(const sal_Char* _pType, const sal_Char* _pFormat, va_list args)
-{
-    ensureInitalized();
-    if (!s_pImpl->m_pOutputMedium)
-        // no tracing enabled
-        return;
-
-    if (_pType && strlen(_pType))
-    {
-        if (s_pImpl->isTracing(OTracerSetup::THREAD))
-        {
-            fprintf(s_pImpl->m_pOutputMedium, "[%04x] ", getThreadID());
-        }
-
-        fprintf(s_pImpl->m_pOutputMedium, "%s ", _pType);
-
-        if (s_pImpl->isTracing(OTracerSetup::TIME))
-        {
-            fprintf(s_pImpl->m_pOutputMedium, "(%06" SAL_PRIuUINT32 ")", getGlobalTimer());
-        }
-    }
-    fprintf(s_pImpl->m_pOutputMedium, ": ");
-
-    indent();
-
-    vfprintf(s_pImpl->m_pOutputMedium, _pFormat, args);
-    fprintf(s_pImpl->m_pOutputMedium,"\n");
-    fflush(s_pImpl->m_pOutputMedium);
-}
-
-}	// namespace configmgr
-
-#endif // CFG_ENABLE_TRACING
-
diff --git a/configmgr/source/modifications.cxx b/configmgr/source/modifications.cxx
new file mode 100644
index 0000000000..2ad3b5ef8b
--- /dev/null
+++ b/configmgr/source/modifications.cxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "rtl/ustring.hxx"
+
+#include "modifications.hxx"
+#include "path.hxx"
+
+namespace configmgr {
+
+Modifications::Modifications() {}
+
+Modifications::~Modifications() {}
+
+void Modifications::add(Path const & path) {
+    Node * p = &root_;
+    bool wasPresent = false;
+    for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
+        Node::Children::iterator j(p->children.find(*i));
+        if (j == p->children.end()) {
+            if (wasPresent && p->children.empty()) {
+                return;
+            }
+            j = p->children.insert(Node::Children::value_type(*i, Node())).
+                first;
+            wasPresent = false;
+        } else {
+            wasPresent = true;
+        }
+        p = &j->second;
+    }
+    p->children.clear();
+}
+
+Modifications::Node const & Modifications::getRoot() const {
+    return root_;
+}
+
+}
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
new file mode 100644
index 0000000000..e29a101501
--- /dev/null
+++ b/configmgr/source/modifications.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_MODIFICATIONS_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_MODIFICATIONS_HXX
+
+#include "sal/config.h"
+
+#include <map>
+
+#include "boost/noncopyable.hpp"
+
+#include "path.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Modifications: private boost::noncopyable {
+public:
+    struct Node {
+        typedef std::map< rtl::OUString, Node > Children;
+
+        Children children;
+    };
+
+    Modifications();
+
+    ~Modifications();
+
+    void add(Path const & path);
+
+    Node const & getRoot() const;
+
+private:
+    Node root_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
new file mode 100644
index 0000000000..a5a089106b
--- /dev/null
+++ b/configmgr/source/node.cxx
@@ -0,0 +1,108 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "data.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+NodeMap & Node::getMembers() {
+    OSL_ASSERT(false);
+    throw css::uno::RuntimeException(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+rtl::OUString Node::getTemplateName() const {
+    return rtl::OUString();
+}
+
+void Node::setMandatory(int layer) {
+    (void) layer; // avoid warnings
+    OSL_ASSERT(layer == Data::NO_LAYER);
+}
+
+int Node::getMandatory() const {
+    return Data::NO_LAYER;
+}
+
+void Node::setLayer(int layer) {
+    OSL_ASSERT(layer >= layer_);
+    layer_ = layer;
+}
+
+int Node::getLayer() const {
+    return layer_;
+}
+
+void Node::setFinalized(int layer) {
+    finalized_ = layer;
+}
+
+int Node::getFinalized() const {
+    return finalized_;
+}
+
+rtl::Reference< Node > Node::getMember(rtl::OUString const & name) {
+    NodeMap & members = getMembers();
+    NodeMap::iterator i(members.find(name));
+    return i == members.end() ? rtl::Reference< Node >() : i->second;
+}
+
+Node::Node(int layer): layer_(layer), finalized_(Data::NO_LAYER) {}
+
+Node::Node(const Node & other):
+    SimpleReferenceObject(), layer_(other.layer_), finalized_(other.finalized_)
+{}
+
+Node::~Node() {}
+
+void Node::clear() {}
+
+rtl::Reference< Node > Node::findMember(rtl::OUString const &) {
+    return rtl::Reference< Node >();
+}
+
+}
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
new file mode 100644
index 0000000000..10f1685205
--- /dev/null
+++ b/configmgr/source/node.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_NODE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_NODE_HXX
+
+#include "sal/config.h"
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+#include "salhelper/simplereferenceobject.hxx"
+
+#include "nodemap.hxx"
+
+namespace configmgr {
+
+class Node: public salhelper::SimpleReferenceObject {
+public:
+    enum Kind {
+        KIND_PROPERTY, KIND_LOCALIZED_PROPERTY, KIND_LOCALIZED_VALUE,
+        KIND_GROUP, KIND_SET };
+
+    virtual Kind kind() const = 0;
+
+    virtual rtl::Reference< Node > clone() const = 0;
+
+    virtual NodeMap & getMembers();
+
+    virtual rtl::OUString getTemplateName() const;
+
+    virtual void setMandatory(int layer);
+
+    virtual int getMandatory() const;
+
+    void setLayer(int layer);
+
+    int getLayer() const;
+
+    void setFinalized(int layer);
+
+    int getFinalized() const;
+
+    rtl::Reference< Node > getMember(rtl::OUString const & name);
+
+protected:
+    explicit Node(int layer);
+
+    Node(const Node & other);
+
+    virtual ~Node();
+
+    virtual void clear();
+
+    virtual rtl::Reference< Node > findMember(rtl::OUString const & name);
+
+    int layer_;
+    int finalized_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
new file mode 100644
index 0000000000..6b22863b56
--- /dev/null
+++ b/configmgr/source/nodemap.cxx
@@ -0,0 +1,50 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <algorithm>
+
+#include "osl/diagnose.h"
+#include "rtl/ustring.hxx"
+
+#include "node.hxx"
+#include "nodemap.hxx"
+
+namespace configmgr {
+
+void cloneNodeMap(NodeMap const & source, NodeMap * target) {
+    OSL_ASSERT(target != 0 && target->empty());
+    NodeMap clone(source);
+    for (NodeMap::iterator i(clone.begin()); i != clone.end(); ++i) {
+        i->second = i->second->clone();
+    }
+    std::swap(clone, *target);
+}
+
+}
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
new file mode 100644
index 0000000000..92ea324091
--- /dev/null
+++ b/configmgr/source/nodemap.hxx
@@ -0,0 +1,49 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_NODEMAP_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_NODEMAP_HXX
+
+#include "sal/config.h"
+
+#include <map>
+
+#include "rtl/ref.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Node;
+
+typedef std::map< rtl::OUString, rtl::Reference< Node > > NodeMap;
+
+void cloneNodeMap(NodeMap const & source, NodeMap * target);
+
+}
+
+#endif
diff --git a/configmgr/source/pad.cxx b/configmgr/source/pad.cxx
new file mode 100644
index 0000000000..c8c7218b6d
--- /dev/null
+++ b/configmgr/source/pad.cxx
@@ -0,0 +1,91 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "osl/diagnose.h"
+#include "rtl/string.h"
+#include "sal/types.h"
+
+#include "pad.hxx"
+#include "span.hxx"
+
+namespace configmgr {
+
+void Pad::add(char const * begin, sal_Int32 length) {
+    OSL_ASSERT(
+        begin != 0 && length >= 0 && !(span_.is() && buffer_.getLength() != 0));
+    if (length != 0) {
+        flushSpan();
+        if (buffer_.getLength() == 0) {
+            span_ = Span(begin, length);
+        } else {
+            buffer_.append(begin, length);
+        }
+    }
+}
+
+void Pad::addEphemeral(char const * begin, sal_Int32 length) {
+    OSL_ASSERT(
+        begin != 0 && length >= 0 && !(span_.is() && buffer_.getLength() != 0));
+    if (length != 0) {
+        flushSpan();
+        buffer_.append(begin, length);
+    }
+}
+
+void Pad::clear() {
+    OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0));
+    span_.clear();
+    buffer_.setLength(0);
+}
+
+bool Pad::is() const {
+    OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0));
+    return span_.is() || buffer_.getLength() != 0;
+}
+
+Span Pad::get() const {
+    OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0));
+    if (span_.is()) {
+        return span_;
+    } else if (buffer_.getLength() == 0) {
+        return Span(RTL_CONSTASCII_STRINGPARAM(""));
+    } else {
+        return Span(buffer_.getStr(), buffer_.getLength());
+    }
+}
+
+void Pad::flushSpan() {
+    if (span_.is()) {
+        buffer_.append(span_.begin, span_.length);
+        span_.clear();
+    }
+}
+
+}
diff --git a/configmgr/source/pad.hxx b/configmgr/source/pad.hxx
new file mode 100644
index 0000000000..66a51f4800
--- /dev/null
+++ b/configmgr/source/pad.hxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_PAD_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_PAD_HXX
+
+#include "sal/config.h"
+
+#include "rtl/strbuf.hxx"
+#include "sal/types.h"
+
+#include "span.hxx"
+
+namespace configmgr {
+
+class Pad {
+public:
+    void add(char const * begin, sal_Int32 length);
+
+    void addEphemeral(char const * begin, sal_Int32 length);
+
+    void clear();
+
+    bool is() const;
+
+    Span get() const;
+
+private:
+    void flushSpan();
+
+    Span span_;
+    rtl::OStringBuffer buffer_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
new file mode 100644
index 0000000000..69a5515b97
--- /dev/null
+++ b/configmgr/source/parsemanager.cxx
@@ -0,0 +1,85 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "osl/diagnose.h"
+#include "sal/types.h"
+
+#include "parsemanager.hxx"
+#include "parser.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+ParseManager::ParseManager(
+    rtl::OUString const & url, rtl::Reference< Parser > const & parser)
+    SAL_THROW((
+        css::container::NoSuchElementException, css::uno::RuntimeException)):
+    reader_(url), parser_(parser)
+{
+    OSL_ASSERT(parser.is());
+}
+
+bool ParseManager::parse() {
+    for (;;) {
+        switch (itemData_.is()
+                ? XmlReader::RESULT_BEGIN
+                : reader_.nextItem(
+                    parser_->getTextMode(), &itemData_, &itemNamespace_))
+        {
+        case XmlReader::RESULT_BEGIN:
+            if (!parser_->startElement(reader_, itemNamespace_, itemData_))
+            {
+                return false;
+            }
+            break;
+        case XmlReader::RESULT_END:
+            parser_->endElement(reader_);
+            break;
+        case XmlReader::RESULT_TEXT:
+            parser_->characters(itemData_);
+            break;
+        case XmlReader::RESULT_DONE:
+            return true;
+        }
+        itemData_.clear();
+    }
+}
+
+ParseManager::~ParseManager() {}
+
+}
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
new file mode 100644
index 0000000000..18292859ab
--- /dev/null
+++ b/configmgr/source/parsemanager.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 INCLUDED_CONFIGMGR_SOURCE_PARSEMANAGER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_PARSEMANAGER_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "rtl/ref.hxx"
+#include "sal/types.h"
+#include "salhelper/simplereferenceobject.hxx"
+
+#include "span.hxx"
+#include "xmlreader.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Parser;
+
+class ParseManager: public salhelper::SimpleReferenceObject {
+public:
+    ParseManager(
+        rtl::OUString const & url, rtl::Reference< Parser > const & parser)
+        SAL_THROW((
+            com::sun::star::container::NoSuchElementException,
+            com::sun::star::uno::RuntimeException));
+
+    bool parse();
+
+private:
+    virtual ~ParseManager();
+
+    XmlReader reader_;
+    rtl::Reference< Parser > parser_;
+    Span itemData_;
+    XmlReader::Namespace itemNamespace_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/parser.hxx b/configmgr/source/parser.hxx
new file mode 100644
index 0000000000..da29941953
--- /dev/null
+++ b/configmgr/source/parser.hxx
@@ -0,0 +1,62 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_PARSER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_PARSER_HXX
+
+#include "sal/config.h"
+
+#include <memory>
+
+#include "salhelper/simplereferenceobject.hxx"
+
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+struct Span;
+
+class Parser: public salhelper::SimpleReferenceObject {
+public:
+    virtual XmlReader::Text getTextMode() = 0;
+
+    virtual bool startElement(
+        XmlReader & reader, XmlReader::Namespace ns, Span const & name) = 0;
+
+    virtual void endElement(XmlReader const & reader) = 0;
+
+    virtual void characters(Span const & text) = 0;
+
+protected:
+    Parser() {}
+
+    virtual ~Parser() {}
+};
+
+}
+
+#endif
diff --git a/configmgr/source/path.hxx b/configmgr/source/path.hxx
new file mode 100644
index 0000000000..fc70287dfe
--- /dev/null
+++ b/configmgr/source/path.hxx
@@ -0,0 +1,43 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_PATH_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_PATH_HXX
+
+#include "sal/config.h"
+
+#include <vector>
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+typedef std::vector< rtl::OUString > Path;
+
+}
+
+#endif
diff --git a/configmgr/source/platformbe/componentdefn.cxx b/configmgr/source/platformbe/componentdefn.cxx
deleted file mode 100644
index b2a44f8605..0000000000
--- a/configmgr/source/platformbe/componentdefn.cxx
+++ /dev/null
@@ -1,93 +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: componentdefn.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_configmgr.hxx"
-#include "systemintegrationmanager.hxx"
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <cppuhelper/implementationentry.hxx>
-#endif // _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-
-//==============================================================================
-
-static com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL createSystemIntegrationManager(
-                   const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& aContext) {
-    return * new configmgr::backend::SystemIntegrationManager(aContext) ;
-}
-//==============================================================================
-
-//------------------------------------------------------------------------------
-
-static const cppu::ImplementationEntry kImplementations_entries[] = 
-{
-    {
-        createSystemIntegrationManager,
-        configmgr::backend::SystemIntegrationManager::getSystemIntegrationManagerName,
-        configmgr::backend::SystemIntegrationManager::getServiceNames,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL, NULL, NULL, NULL, NULL, 0 }
-} ;
-//------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /* ppEnv */
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void *aServiceManager, void *aRegistryKey)
-{
-    return cppu::component_writeInfoHelper(aServiceManager, 
-                                           aRegistryKey,
-                                           kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void *component_getFactory(
-    const sal_Char *aImplementationName, void *aServiceManager,
-    void *aRegistryKey)
-{
-    return cppu::component_getFactoryHelper(aImplementationName,
-                                            aServiceManager,
-                                            aRegistryKey,
-                                            kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
-
diff --git a/configmgr/source/platformbe/exports.dxp b/configmgr/source/platformbe/exports.dxp
deleted file mode 100644
index 9630d7e067..0000000000
--- a/configmgr/source/platformbe/exports.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getImplementationEnvironment
-component_writeInfo
-component_getFactory
diff --git a/configmgr/source/platformbe/makefile.mk b/configmgr/source/platformbe/makefile.mk
deleted file mode 100644
index 9cbe53f5cf..0000000000
--- a/configmgr/source/platformbe/makefile.mk
+++ /dev/null
@@ -1,76 +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=..$/..
-
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=sysmgr
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-SYSMGR_MAJOR=1
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-.INCLUDE : $(PRJ)$/makefile.pmk
-DLLPRE =
-
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/systemintegrationmanager.obj \
-    $(SLO)$/componentdefn.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib        
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(SYSMGR_MAJOR).uno   
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp    
-DEF1DES=Configuration: System Integration Manager
-
-# --- Targets ---
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/platformbe/sysmgr1.uno.xml b/configmgr/source/platformbe/sysmgr1.uno.xml
deleted file mode 100644
index e20c85347d..0000000000
--- a/configmgr/source/platformbe/sysmgr1.uno.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-c<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice/DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>sysmgr1</module-name>
-    <component-description>
-        <author>Sarah Smith</author>
-        <name>com.sun.star.comp.configuration.backend.SystemIntegration</name>
-        <description>The SystemIntegration backend co-ordinates access to a number of configured backends.Each Backend access configuration data from a configured data source</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.configuration.backend.SystemIntegration</supported-service>
-        <type>com.sun.star.configuration.CannotLoadConfigurationException</type>
-        <type>com.sun.star.configuration.backend.BackendAccessException</type>
-        <type>com.sun.star.configuration.backend.BackendSetupException</type>
-        <type>com.sun.star.configuration.backend.XBackend</type>
-        <type>com.sun.star.configuration.backend.XLayer</type>
-        <type>com.sun.star.configuration.backend.XUpdateHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.container.XContentEnumerationAccess</type>
-        <type>com.sun.star.container.XEnumeration</type>
-        <type>com.sun.star.beans.XPropertySet</type>
-        <type>com.sun.star.lang.IllegalArgumentException</type>
-        <type>com.sun.star.lang.XInitialization</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.uno.Any</type>
-        <type>com.sun.star.uno.Sequence</type>
-       </component-description>
-       <project-build-dependency>	comphelper	</project-build-dependency>
-       <project-build-dependency>	vos			</project-build-dependency>
-       <project-build-dependency>	cppuhelper	</project-build-dependency>
-       <project-build-dependency>	salhelper	</project-build-dependency>
-       <project-build-dependency>	cppu		</project-build-dependency>
-       <project-build-dependency>	sal			</project-build-dependency>
-       <runtime-module-dependency>	comphelp2$(COM)		</runtime-module-dependency>
-       <runtime-module-dependency>	vos2$(COM)			</runtime-module-dependency>
-       <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
-       <runtime-module-dependency>	salhelper3$(COM)	</runtime-module-dependency>
-       <runtime-module-dependency>	cppu3		</runtime-module-dependency>
-       <runtime-module-dependency>	sal3		</runtime-module-dependency>
-</module-description>
diff --git a/configmgr/source/platformbe/systemintegrationmanager.cxx b/configmgr/source/platformbe/systemintegrationmanager.cxx
deleted file mode 100644
index 0fee745f4e..0000000000
--- a/configmgr/source/platformbe/systemintegrationmanager.cxx
+++ /dev/null
@@ -1,369 +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: systemintegrationmanager.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_configmgr.hxx"
-#include "systemintegrationmanager.hxx"
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-
-namespace configmgr { namespace backend { 
-
-
-//==============================================================================
-#define OU2A( oustr ) (rtl::OUStringToOString( oustr, RTL_TEXTENCODING_ASCII_US ).getStr())
-//==============================================================================
-uno::Reference<backenduno::XSingleLayerStratum> BackendRef::getBackend(uno::Reference<uno::XComponentContext> const & xContext)
-{
-    if (!mBackend.is() && mFactory.is())
-    try
-    {
-        mBackend.set( mFactory->createInstanceWithContext(xContext), uno::UNO_QUERY_THROW );
-    }
-    catch(uno::Exception& e)
-    {
-        OSL_TRACE("SystemIntegration::getSupportingBackend - could not create platform Backend: %s",
-                    OU2A(e.Message) );
-    }
-    return mBackend;
-}
-//------------------------------------------------------------------------------
-void BackendRef::disposeBackend()
-{
-    uno::Reference< lang::XComponent> xComp( mBackend, uno::UNO_QUERY );
-    if (xComp.is())
-    try
-    {
-        xComp->dispose();
-    }
-    catch(uno::Exception &)
-    {}
-    mBackend.clear();
-}
-//==============================================================================
-SystemIntegrationManager::SystemIntegrationManager(const uno::Reference<uno::XComponentContext>& xContext) 
-: cppu::WeakComponentImplHelper4< backenduno::XBackend, backenduno::XBackendChangesNotifier, lang::XInitialization, lang::XServiceInfo>(mMutex)
-, mMutex()
-, mContext(xContext)
-, mPlatformBackends()
-{
-}
-//------------------------------------------------------------------------------
-SystemIntegrationManager::~SystemIntegrationManager()
-{   
-}
-//------------------------------------------------------------------------------
-void SAL_CALL SystemIntegrationManager::initialize(
-    const uno::Sequence<uno::Any>& /*aParameters*/) 
-    throw (uno::RuntimeException, uno::Exception,
-           lang::IllegalArgumentException,
-           backenduno::BackendSetupException) 
-{
-    buildLookupTable();
-}
-//------------------------------------------------------------------------------
-static const rtl::OUString getAllComponentsName()
-{ 
-    sal_Unicode const kStar = '*';
-    return rtl::OUString(&kStar,1);
-}
-
-//------------------------------------------------------------------------------
-
-void SystemIntegrationManager::buildLookupTable()
-{
-    static const rtl::OUString kPlatformServiceName(
-            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.PlatformBackend")) ;
-
-    //Build platform backend map componentName -> servicefactory
-    uno::Reference<css::container::XContentEnumerationAccess> xEnumAccess 
-        (mContext->getServiceManager(),uno::UNO_QUERY_THROW);
-    
-    uno::Reference<css::container::XEnumeration> xEnum = 
-        xEnumAccess->createContentEnumeration(kPlatformServiceName); 
-    if (xEnum.is())
-    {
-        osl::MutexGuard lock(mMutex);
-        while (xEnum->hasMoreElements())
-        {
-            uno::Reference<lang::XSingleComponentFactory> xServiceFactory( xEnum->nextElement(),uno::UNO_QUERY); 
-            if (xServiceFactory.is())
-            {
-                uno::Sequence<rtl::OUString> aKeys = getSupportedComponents(xServiceFactory);
-                
-                for (sal_Int32 i = 0 ; i < aKeys.getLength() ; ++i)
-                {
-                    BackendRef aBackendRef(xServiceFactory); 
-                    //OSL_TRACE("SystemInteg -Adding Factory Backend to map for key %s",
-                    //rtl::OUStringToOString(aKeys[i], RTL_TEXTENCODING_ASCII_US).getStr() );
-                    mPlatformBackends.insert( std::multimap<rtl::OUString, BackendRef>::value_type(aKeys[i],aBackendRef));
-                }
-            }
-        }
-    }
-}
-//---------------------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString>
-SystemIntegrationManager::getSupportedComponents(const uno::Reference<lang::XSingleComponentFactory>& xFactory)
-{
-    static const rtl::OUString kProperSubkeyName( RTL_CONSTASCII_USTRINGPARAM("/DATA/SupportedComponents")) ;
-    static const rtl::OUString kImplKeyPropertyName( RTL_CONSTASCII_USTRINGPARAM("ImplementationKey")) ;
-
-    uno::Reference<css::beans::XPropertySet> xSMProp(xFactory,uno::UNO_QUERY); 
-    if (xSMProp.is())
-    {
-        try
-        {
-            uno::Reference< css::registry::XRegistryKey > xImplKey(
-                xSMProp->getPropertyValue(kImplKeyPropertyName), uno::UNO_QUERY);
-            
-            if (xImplKey.is())
-            {
-                uno::Reference< css::registry::XRegistryKey > xKey(
-                    xImplKey->openKey(kProperSubkeyName));
-                if(xKey.is())
-                    return xKey->getAsciiListValue();
-            }
-        }
-        catch(css::beans::UnknownPropertyException&){}
-        catch(css::registry::InvalidValueException&){}
-        catch(css::registry::InvalidRegistryException&){}
-    }	
-    static const rtl::OUString kAllComponentsName = getAllComponentsName();
-    return uno::Sequence<rtl::OUString>(&kAllComponentsName, 1);
-}
-//---------------------------------------------------------------------------------------------
-
-uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL 
-    SystemIntegrationManager::listOwnLayers(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-               lang::IllegalArgumentException,
-               uno::RuntimeException) 
-{
-    return listLayers(aComponent, rtl::OUString() ) ;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XUpdateHandler> SAL_CALL
-    SystemIntegrationManager::getOwnUpdateHandler(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::NoSupportException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-   
-    return getUpdateHandler(aComponent, rtl::OUString()) ;
-}
-//------------------------------------------------------------------------------
-
-std::vector< uno::Reference<backenduno::XSingleLayerStratum> > SystemIntegrationManager::getSupportingBackends(const rtl::OUString& aComponent)
-{
-    std::vector< uno::Reference<backenduno::XSingleLayerStratum> > backends;
-    
-    osl::MutexGuard lock(mMutex); 
-    std::pair<std::multimap<rtl::OUString, BackendRef>::iterator, std::multimap<rtl::OUString, BackendRef>::iterator> aRange = mPlatformBackends.equal_range(aComponent);
-    for (std::multimap<rtl::OUString, BackendRef>::iterator it=aRange.first; it != aRange.second; )
-    {
-        std::multimap<rtl::OUString, BackendRef>::iterator cur = it++;  // increment here, as erase() may invalidate cur
-        uno::Reference<backenduno::XSingleLayerStratum> xBackend = cur->second.getBackend(mContext);
-        if (xBackend.is())
-            backends.push_back(xBackend);
-
-        else  // prevent repeated attempts to create 
-            mPlatformBackends.erase(cur);
-    }
-    return backends;
-}
-//------------------------------------------------------------------------------
-uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL
-    SystemIntegrationManager::listLayers(const rtl::OUString& aComponent,
-                                         const rtl::OUString& /*aEntity*/) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    std::vector< uno::Reference<backenduno::XSingleLayerStratum> > const aUniversalBackends = getSupportingBackends(getAllComponentsName());
-    std::vector< uno::Reference<backenduno::XSingleLayerStratum> > const aSpecialBackends  = getSupportingBackends(aComponent);
-
-    uno::Sequence< uno::Reference<backenduno::XLayer> > aLayers(aUniversalBackends.size() + aSpecialBackends.size());
-
-    uno::Reference<backenduno::XLayer> * pLayer = aLayers.getArray();
-    
-    for (std::vector< uno::Reference<backenduno::XSingleLayerStratum> >::size_type i=0 ; i< aUniversalBackends.size(); ++i, ++pLayer)
-        *pLayer = aUniversalBackends[i]->getLayer(aComponent, rtl::OUString());
-        
-    for (std::vector< uno::Reference<backenduno::XSingleLayerStratum> >::size_type j=0 ; j< aSpecialBackends.size(); ++j, ++pLayer)
-        *pLayer = aSpecialBackends[j]->getLayer(aComponent, rtl::OUString());
-
-    OSL_ASSERT( aLayers.getConstArray()+aLayers.getLength() == pLayer );
-    return aLayers;
-}
-//------------------------------------------------------------------------------
-
-uno::Reference<backenduno::XUpdateHandler> SAL_CALL
-    SystemIntegrationManager::getUpdateHandler(const rtl::OUString& /*aComponent*/,
-                                               const rtl::OUString& /*aEntity*/) 
-        throw (backenduno::BackendAccessException,
-                lang::NoSupportException,
-                lang::IllegalArgumentException,
-                uno::RuntimeException) 
-{
-    
-    throw lang::NoSupportException(
-                rtl::OUString::createFromAscii(
-                "SystemIntegrationManager: No Update Operation allowed, Read Only access"),
-                *this) ;
-}
-// ---------------------------------------------------------------------------
-// ComponentHelper
-void SAL_CALL SystemIntegrationManager::disposing()
-{
-    osl::MutexGuard lock(mMutex);
-    for (std::multimap<rtl::OUString, BackendRef>::iterator it =  mPlatformBackends.begin(); it != mPlatformBackends.end(); ++it)
-        it->second.disposeBackend();
-    
-    mPlatformBackends.clear();
-    mContext.clear();
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL SystemIntegrationManager::
-    getSystemIntegrationManagerName(void) 
-{
-    static const rtl::OUString kImplementationName(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.comp.configuration.backend.SystemIntegration")) ;
-
-    return kImplementationName ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL SystemIntegrationManager::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return getSystemIntegrationManagerName() ;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL SystemIntegrationManager::
-    getServiceNames(void) 
-{
-    uno::Sequence<rtl::OUString> aServices(2) ;
-    aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.SystemIntegration")) ;
-    aServices[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.Backend")) ;
-            
-    return aServices ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL SystemIntegrationManager::supportsService(
-    const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException)
-{
-    uno::Sequence< rtl::OUString > const svc = getServiceNames();
-
-    for(sal_Int32 i = 0; i < svc.getLength(); ++i )
-        if(svc[i] == aServiceName)
-            return true;
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> 
-SAL_CALL SystemIntegrationManager::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException)
-{
-    return getServiceNames() ;
-}
-//------------------------------------------------------------------------------
-
-void SAL_CALL SystemIntegrationManager::addChangesListener( 
-    const uno::Reference<backenduno::XBackendChangesListener>& xListener,
-    const rtl::OUString& aComponent)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    osl::MutexGuard aGuard(mMutex);
-
-    // FIXME: we really need our own InterfaceContainer plus a helper object 
-    // that listens on the backends and forwards notifications
-    
-    //Simply forward listener to platform backend that support listening
-    {
-        std::vector< uno::Reference<backenduno::XSingleLayerStratum> > aUniversalBackends = getSupportingBackends(getAllComponentsName());
-        for (sal_uInt32 i=0; i< aUniversalBackends.size(); i++)
-        {
-            uno::Reference<backenduno::XBackendChangesNotifier> xBackend( aUniversalBackends[i], uno::UNO_QUERY) ;
-            if (xBackend.is())
-                xBackend->addChangesListener(xListener, aComponent);
-        }
-    }
-    {
-        std::vector< uno::Reference<backenduno::XSingleLayerStratum> > aSpecialBackends   = getSupportingBackends(aComponent);
-        for (sal_uInt32 i=0; i< aSpecialBackends.size(); i++)
-        {
-            uno::Reference<backenduno::XBackendChangesNotifier> xBackend( aSpecialBackends[i], uno::UNO_QUERY) ;
-            if (xBackend.is())
-                xBackend->addChangesListener(xListener, aComponent);
-        }
-    }
-}
-//------------------------------------------------------------------------------
-void SAL_CALL SystemIntegrationManager::removeChangesListener( 
-    const uno::Reference<backenduno::XBackendChangesListener>& xListener,
-    const rtl::OUString& aComponent)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-    osl::MutexGuard aGuard(mMutex);
-    {
-        std::vector< uno::Reference<backenduno::XSingleLayerStratum> > aUniversalBackends = getSupportingBackends(getAllComponentsName());
-        for (sal_uInt32 i=0; i< aUniversalBackends.size(); i++)
-        {
-            uno::Reference<backenduno::XBackendChangesNotifier> xBackend( aUniversalBackends[i], uno::UNO_QUERY) ;
-            if (xBackend.is())
-                xBackend->removeChangesListener(xListener, aComponent);
-        }
-    }
-    {
-        std::vector< uno::Reference<backenduno::XSingleLayerStratum> > aSpecialBackends   = getSupportingBackends(aComponent);
-        for (sal_uInt32 i=0; i< aSpecialBackends.size(); i++)
-        {
-            uno::Reference<backenduno::XBackendChangesNotifier> xBackend( aSpecialBackends[i], uno::UNO_QUERY) ;
-            if (xBackend.is())
-                xBackend->removeChangesListener(xListener, aComponent);
-        }
-    }
-}
-//------------------------------------------------------------------------------
-
-
-} } // configmgr.backend
diff --git a/configmgr/source/platformbe/systemintegrationmanager.hxx b/configmgr/source/platformbe/systemintegrationmanager.hxx
deleted file mode 100644
index b2c62b7d29..0000000000
--- a/configmgr/source/platformbe/systemintegrationmanager.hxx
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef CONFIGMGR_BACKEND_SYSTEMINTEGRATIONMANAGER_HXX_
-#define CONFIGMGR_BACKEND_SYSTEMINTEGRATIONMANAGER_HXX_
-
-#include <com/sun/star/configuration/backend/XBackend.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/configuration/backend/BackendSetupException.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/compbase4.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace configmgr { namespace backend { 
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backenduno = css::configuration::backend ;
-
-/* Class containing a reference to a service factory(XSingleComponentFactory) 
-   object and a platform backend (XSingleLayerStratum).
-   The reference to the platform backend will be NULL until the platform backend
-   is initialised 
- */
-class BackendRef
-{
-    uno::Reference<lang::XSingleComponentFactory>  mFactory;
-    uno::Reference<backenduno::XSingleLayerStratum> mBackend;
-public:
-    explicit
-    BackendRef(const uno::Reference<lang::XSingleComponentFactory>& aFactory)
-    :mFactory(aFactory)
-    ,mBackend()
-    {}
-
-    uno::Reference<backenduno::XSingleLayerStratum> getBackend(uno::Reference<uno::XComponentContext> const & xContext);
-    void disposeBackend();
-};
-
-/** 
-  Class implementing the Backend service for system integration backend access.
-  It creates the required backends and coordinates access to them.
-  */
-class SystemIntegrationManager : public cppu::WeakComponentImplHelper4< backenduno::XBackend, backenduno::XBackendChangesNotifier, lang::XInitialization, lang::XServiceInfo> 
-{
-public:
-   /**
-     Service constructor from a service factory.
-
-     @param xContext   component context
-     */
-    explicit 
-    SystemIntegrationManager( const uno::Reference<uno::XComponentContext>& xContext) ;
-
-    /** Destructor  */
-    ~SystemIntegrationManager() ;
-
-    // XBackend
-    virtual uno::Sequence<uno::Reference<backenduno::XLayer> > 
-        SAL_CALL listOwnLayers(const rtl::OUString& aComponent) 
-            throw (backenduno::BackendAccessException,
-                    lang::IllegalArgumentException, 
-                    uno::RuntimeException) ;
-
-    virtual uno::Reference<backenduno::XUpdateHandler> 
-        SAL_CALL getOwnUpdateHandler(const rtl::OUString& aComponent) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException, 
-                lang::NoSupportException, 
-                uno::RuntimeException) ;
-    
-    virtual uno::Sequence<uno::Reference<backenduno::XLayer> > SAL_CALL 
-        listLayers(const rtl::OUString& aComponent,
-                   const rtl::OUString& aEntity) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException, 
-                uno::RuntimeException) ;
-    
-    virtual uno::Reference<backenduno::XUpdateHandler> SAL_CALL 
-        getUpdateHandler(const rtl::OUString& aComponent,
-                         const rtl::OUString& aEntity) 
-        throw (backenduno::BackendAccessException,
-                lang::IllegalArgumentException, 
-                lang::NoSupportException, 
-                uno::RuntimeException) ;
-    
-    // XInitialize
-    virtual void SAL_CALL initialize(const uno::Sequence<uno::Any>& aParameters) 
-        throw (uno::RuntimeException, uno::Exception,
-               lang::IllegalArgumentException,
-               backenduno::BackendSetupException) ;
-
-   // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() 
-        throw (uno::RuntimeException) ;
-    
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& aServiceName) 
-        throw (uno::RuntimeException) ;
-    
-    virtual uno::Sequence<rtl::OUString> SAL_CALL 
-        getSupportedServiceNames(void) throw (uno::RuntimeException) ;
-    
-    // XBackendChangesNotifier
-    virtual void SAL_CALL addChangesListener( const uno::Reference<backenduno::XBackendChangesListener>& xListner,
-                                              const rtl::OUString& aComponent)
-        throw (uno::RuntimeException);
-
-
-    virtual void SAL_CALL removeChangesListener( const uno::Reference<backenduno::XBackendChangesListener>& xListner,
-                                                 const rtl::OUString& aComponent)
-        throw (uno::RuntimeException);
-
-     /**
-      Provides the implementation name.
-
-      @return   implementation name
-      */
-    static rtl::OUString SAL_CALL getSystemIntegrationManagerName(void) ;
-    /**
-      Provides the list of supported services.
-
-      @return   list of service names
-      */
-    static uno::Sequence<rtl::OUString> SAL_CALL getServiceNames(void) ;
-protected:
-// ComponentHelper
-    virtual void SAL_CALL disposing(); 
-private :
-    /** build lookup up table
-    */
-    void buildLookupTable();
-
-    /** get list of supported components
-    */
-    uno::Sequence<rtl::OUString> getSupportedComponents(const uno::Reference<lang::XSingleComponentFactory>& xFactory);
-
-    /**
-        get supporting backends from lookup table
-    */
-    std::vector< uno::Reference<backenduno::XSingleLayerStratum> > getSupportingBackends(const rtl::OUString& aComponent);
-    
-private :
-    /** Mutex for resource protection */
-    osl::Mutex mMutex ;
-    /** Component Context */
-    uno::Reference<uno::XComponentContext> mContext ;
-    
-    std::multimap<rtl::OUString, BackendRef> mPlatformBackends;
-} ;
-
-} }  // configmgr.backend
-
-#endif // CONFIGMGR_BACKEND_SYSTEMINTEGRATIONMANAGER_HXX_
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
new file mode 100644
index 0000000000..070b56d9be
--- /dev/null
+++ b/configmgr/source/propertynode.cxx
@@ -0,0 +1,110 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "osl/diagnose.h"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "components.hxx"
+#include "node.hxx"
+#include "propertynode.hxx"
+#include "type.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+PropertyNode::PropertyNode(
+    int layer, Type staticType, bool nillable, css::uno::Any const & value,
+    bool extension):
+    Node(layer), staticType_(staticType), nillable_(nillable), value_(value),
+    extension_(extension)
+{}
+
+rtl::Reference< Node > PropertyNode::clone() const {
+    return new PropertyNode(*this);
+}
+
+Type PropertyNode::getStaticType() const {
+    return staticType_;
+}
+
+bool PropertyNode::isNillable() const {
+    return nillable_;
+}
+
+css::uno::Any PropertyNode::getValue(Components & components) {
+    if (externalDescriptor_.getLength() != 0) {
+        css::beans::Optional< css::uno::Any > val(
+            components.getExternalValue(externalDescriptor_));
+        if (val.IsPresent) {
+            value_ = val.Value; //TODO: check value type
+        }
+        externalDescriptor_ = rtl::OUString(); // must not throw
+    }
+    return value_;
+}
+
+void PropertyNode::setValue(int layer, css::uno::Any const & value) {
+    setLayer(layer);
+    value_ = value;
+    externalDescriptor_ = rtl::OUString();
+}
+
+void PropertyNode::setExternal(int layer, rtl::OUString const & descriptor) {
+    OSL_ASSERT(descriptor.getLength() != 0);
+    setLayer(layer);
+    externalDescriptor_ = descriptor;
+}
+
+bool PropertyNode::isExtension() const {
+    return extension_;
+}
+
+PropertyNode::PropertyNode(PropertyNode const & other):
+    Node(other), staticType_(other.staticType_), nillable_(other.nillable_),
+    value_(other.value_), externalDescriptor_(other.externalDescriptor_),
+    extension_(other.extension_)
+{}
+
+PropertyNode::~PropertyNode() {}
+
+Node::Kind PropertyNode::kind() const {
+    return KIND_PROPERTY;
+}
+
+}
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
new file mode 100644
index 0000000000..1566cbf72d
--- /dev/null
+++ b/configmgr/source/propertynode.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_PROPERTYNODE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_PROPERTYNODE_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "rtl/ref.hxx"
+
+#include "node.hxx"
+#include "type.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Components;
+
+class PropertyNode: public Node {
+public:
+    PropertyNode(
+        int layer, Type staticType, bool nillable,
+        com::sun::star::uno::Any const & value, bool extension);
+
+    virtual rtl::Reference< Node > clone() const;
+
+    Type getStaticType() const;
+
+    bool isNillable() const;
+
+    com::sun::star::uno::Any getValue(Components & components);
+
+    void setValue(int layer, com::sun::star::uno::Any const & value);
+
+    void setExternal(int layer, rtl::OUString const & descriptor);
+
+    bool isExtension() const;
+
+private:
+    PropertyNode(PropertyNode const & other);
+
+    virtual ~PropertyNode();
+
+    virtual Kind kind() const;
+
+    Type staticType_;
+        // as specified in the component-schema (TYPE_ANY, ...,
+        // TYPE_HEXBINARY_LIST; not TYPE_ERROR or TYPE_NIL)
+    bool nillable_;
+    com::sun::star::uno::Any value_;
+    rtl::OUString externalDescriptor_;
+    bool extension_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/registry/cfgregistrykey.cxx b/configmgr/source/registry/cfgregistrykey.cxx
deleted file mode 100644
index 6b2f6e566c..0000000000
--- a/configmgr/source/registry/cfgregistrykey.cxx
+++ /dev/null
@@ -1,1482 +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: cfgregistrykey.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_configmgr.hxx"
-#include "cfgregistrykey.hxx"
-#include "datalock.hxx"
-#include "typeconverter.hxx"
-#include <osl/diagnose.h>
-#include <cppuhelper/extract.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XProperty.hpp>
-#include <com/sun/star/util/XStringEscape.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <typelib/typedescription.hxx>
-
-#include <limits>
-
-#define THISREF()		static_cast< ::cppu::OWeakObject* >(this)
-#define UNISTRING(c)	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(c) )
-
-//..........................................................................
-namespace configmgr
-{
-//..........................................................................
-
-//--------------------------------------------------------------------------
-namespace {
-    inline
-    com::sun::star::uno::Type getBinaryDataType()
-    {
-        com::sun::star::uno::Sequence<sal_Int8> const * const p= 0;
-        return ::getCppuType(p);
-    }
-    inline
-    bool isAscii(sal_Unicode ch)
-    {
-        return 0 < ch && ch < 128;
-    }
-    inline
-    bool isAscii(sal_Unicode const * ps, sal_Int32 nLen )
-    {
-        for (int i= 0; i< nLen; ++i)
-            if ( !isAscii( ps[i] ) )
-                return false;
-        return true;
-    }
-    inline
-    bool isAscii(rtl::OUString const& str)
-    {
-        return isAscii(str.getStr(),str.getLength());
-    }
-    inline
-    bool isAscii(com::sun::star::uno::Sequence< rtl::OUString > const& strList)
-    {
-        for (int i= 0; i< strList.getLength(); ++i)
-            if ( !isAscii( strList[i] ) )
-                return false;
-        return true;
-    }
-}
-// temporary helper
-inline static void checkNullable() {}
-
-//==========================================================================
-//= OConfigurationRegistryKey
-//==========================================================================
-
-static
-rtl::OUString getNodeName(const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& _xNode)
-{
-    com::sun::star::uno::Reference< com::sun::star::container::XNamed > xName( _xNode, com::sun::star::uno::UNO_QUERY );
-    if (xName.is())
-        return xName->getName();
-
-    OSL_ENSURE( !_xNode.is(), "Cannot get name of node");
-    return rtl::OUString();
-}
-//--------------------------------------------------------------------------
-
-static bool splitPath(const rtl::OUString& _sPath, rtl::OUString& _rsParentPath, rtl::OUString& _rsLocalName);
-//--------------------------------------------------------------------------
-
-OConfigurationRegistryKey::OConfigurationRegistryKey
-            (const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& _rxRootNode
-            ,sal_Bool _bWriteable
-            ,SubtreeRoot
-            )
-    :m_bReadOnly(!_bWriteable)
-    ,m_xNode(_rxRootNode)
-    ,m_xParentNode()
-    ,m_sLocalName() // this will be treated as root - maybe use hierarchical name (ß)
-{
-    OSL_ENSURE(m_xNode.is(), "OConfigurationRegistryKey::OConfigurationRegistryKey : invalid config node param !");
-}
-
-//--------------------------------------------------------------------------
-OConfigurationRegistryKey::OConfigurationRegistryKey
-            (const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& _rxNode
-            ,sal_Bool _bWriteable
-            )
-    :m_bReadOnly(!_bWriteable)
-    ,m_xNode(_rxNode)
-    ,m_xParentNode()
-    ,m_sLocalName( getNodeName(_rxNode) ) // this will not be treated as root
-{
-    OSL_ENSURE(m_xNode.is(), "OConfigurationRegistryKey::OConfigurationRegistryKey : invalid config node param !");
-}
-
-//--------------------------------------------------------------------------
-OConfigurationRegistryKey::OConfigurationRegistryKey(
-                com::sun::star::uno::Any _rCurrentValue,
-                const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& _rxParentNode,
-                const ::rtl::OUString& _rLocalName,
-                sal_Bool _bWriteable)
-    :m_bReadOnly(!_bWriteable)
-    ,m_xNode()
-    ,m_xParentNode(_rxParentNode)
-    ,m_sLocalName(_rLocalName)
-{
-    OSL_ENSURE(m_xParentNode.is(), "OConfigurationRegistryKey::OConfigurationRegistryKey : invalid parent node param !");
-    OSL_ENSURE(m_sLocalName.getLength(), "OConfigurationRegistryKey::OConfigurationRegistryKey : invalid relative name !");
-    OSL_ENSURE(m_xParentNode->hasByName( m_sLocalName ), "OConfigurationRegistryKey::OConfigurationRegistryKey : key not found in parent node !" ); //
-    OSL_ENSURE(m_xParentNode->getByName( m_sLocalName ) == _rCurrentValue, "OConfigurationRegistryKey::OConfigurationRegistryKey : wrong value parameter !" ); //
-
-    _rCurrentValue >>= m_xNode; // we don't care if that fails
-}
-//--------------------------------------------------------------------------
-
-com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> OConfigurationRegistryKey::implGetParentPropertyInfo() throw(com::sun::star::uno::RuntimeException)
-{
-    if (!m_xParentNode.is())
-    {
-        com::sun::star::uno::Reference< com::sun::star::container::XChild > xChild(m_xNode, com::sun::star::uno::UNO_QUERY);
-        if (xChild.is())
-            m_xParentNode = m_xParentNode.query(xChild->getParent());
-    }
-
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xParentInfo; // the result
-
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xParentProperties(m_xParentNode, com::sun::star::uno::UNO_QUERY);
-    if (xParentProperties.is())
-    {
-        xParentInfo = xParentProperties->getPropertySetInfo();
-        if (xParentInfo.is() && !xParentInfo->hasPropertyByName(m_sLocalName))
-        {
-            OSL_ENSURE(false, "OConfigurationRegistryKey: This key is unknown in the parent node's PropertySetInfo !");
-            xParentInfo.clear(); // this key is unknow, so don't return the info
-        }
-    }
-
-    return xParentInfo;
-}
-//--------------------------------------------------------------------------
-
-static
-sal_Bool isNodeReadOnly(com::sun::star::uno::Reference< com::sun::star::uno::XInterface > const& _xNode) throw(com::sun::star::uno::RuntimeException)
-{
-    OSL_ASSERT( _xNode.is() );
-
-    com::sun::star::uno::Reference< com::sun::star::beans::XProperty > xProperty(_xNode, com::sun::star::uno::UNO_QUERY);
-    if (xProperty.is())
-    {
-        com::sun::star::beans::Property aProperty = xProperty->getAsProperty();
-
-        return (aProperty.Attributes & com::sun::star::beans::PropertyAttribute::READONLY) != 0;
-    }
-
-    com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( _xNode, com::sun::star::uno::UNO_QUERY );
-    if (xServiceInfo.is())
-    {
-        // does it announce update capability ?
-        if (xServiceInfo->supportsService(UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess")))
-            return false;
-
-        // else does it announce the expected service at all ?
-        else if (xServiceInfo->supportsService(UNISTRING("com.sun.star.configuration.ConfigurationAccess")))
-            return true;
-    }
-
-    // no XProperty, no (meaningful) ServiceInfo - what can we do
-    return false;
-}
-
-//--------------------------------------------------------------------------
-
-sal_Bool OConfigurationRegistryKey::implIsReadOnly() throw (com::sun::star::uno::RuntimeException)
-{
-    sal_Bool bResult = m_bReadOnly;;
-
-    // do checks only if this was requested to be writable
-    if (m_bReadOnly)
-    {
-        // nothing to check
-    }
-
-    // try to ask the node itself
-    else if (m_xNode.is())
-    {
-        bResult = m_bReadOnly = isNodeReadOnly( m_xNode );
-    }
-
-    // else use the parent
-    else  if (m_xParentNode.is())
-    {
-        com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xParentInfo = implGetParentPropertyInfo();
-
-        if (xParentInfo.is())
-        {
-            com::sun::star::beans::Property aProperty = xParentInfo->getPropertyByName(m_sLocalName);
-
-            bResult = m_bReadOnly = ((aProperty.Attributes & com::sun::star::beans::PropertyAttribute::READONLY) != 0);
-        }
-        else
-        {
-            // no property info about this key ? - check if the parent itself is writable
-
-            // NOTE: do not set m_bReadOnly here, as we haven't really found out about this object
-            bResult = isNodeReadOnly( m_xParentNode );
-        }
-    }
-    else
-    {
-        // no data at all
-        OSL_ENSURE(false, "implIsReadOnly called for invalid object");
-        bResult = true; // no object is certainly not writable ;-)
-    }
-
-    return bResult;
-}
-//--------------------------------------------------------------------------
-
-sal_Bool OConfigurationRegistryKey::implEnsureNode() throw (com::sun::star::registry::InvalidRegistryException,com::sun::star::uno::RuntimeException)
-{
-    if (!m_xNode.is())
-    {
-        OSL_ENSURE( m_xParentNode.is(), "implEnsureNode called for invalid registry key");
-        if (m_xParentNode.is())
-        {
-            try
-            {
-                com::sun::star::uno::Any aNode = m_xParentNode->getByName( m_sLocalName );
-
-                if ( !(aNode >>= m_xNode) )
-                    OSL_ENSURE( ! (aNode.hasValue() && aNode.getValueTypeClass() == com::sun::star::uno::TypeClass_INTERFACE),
-                                "OConfigurationRegistryKey: Node object does not implement expected interface");
-            }
-            catch (com::sun::star::container::NoSuchElementException& e)
-            {
-                m_xParentNode.clear();
-
-                rtl::OUString sMessage = UNISTRING("Invalid OConfigurationRegistryKey. The node \"");
-                sMessage += m_sLocalName;
-                sMessage += UNISTRING("\" was not found in the parent. Parent error message: \n");
-                sMessage += e.Message;
-
-                throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-            }
-        }
-    }
-    return m_xNode.is();
-}
-//--------------------------------------------------------------------------
-
-com::sun::star::uno::Type OConfigurationRegistryKey::implGetUnoType() throw (com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Type aType;
-    if (m_xNode.is())
-    {
-        aType = getCppuType(&m_xNode); // Its just an interface type
-    }
-    else if (m_xParentNode.is())
-    {
-
-        com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xParentInfo = implGetParentPropertyInfo();
-        if (xParentInfo.is())
-        {
-            aType = xParentInfo->getPropertyByName( m_sLocalName ).Type;
-        }
-        else
-        {
-            aType = m_xParentNode->getElementType();
-        }
-    }
-    else
-    {
-        OSL_ASSERT( aType.getTypeClass() == com::sun::star::uno::TypeClass_VOID );
-        OSL_ENSURE( false, "implGetUnoType called for invalid registry key");
-    }
-    return aType;
-}
-//--------------------------------------------------------------------------
-
-sal_Bool OConfigurationRegistryKey::implEnsureValue() throw (com::sun::star::uno::RuntimeException)
-{
-    if (m_xNode.is())
-        return false;
-
-    OSL_ENSURE( m_xParentNode.is(), "implEnsureValue called for invalid registry key");
-    if (!m_xParentNode.is())
-        return false;
-
-    switch (implGetUnoType().getTypeClass())
-    {
-    case com::sun::star::uno::TypeClass_INTERFACE:
-        return false;
-
-    case com::sun::star::uno::TypeClass_BYTE:
-    case com::sun::star::uno::TypeClass_UNSIGNED_SHORT:
-    case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-    case com::sun::star::uno::TypeClass_UNSIGNED_HYPER:
-    case com::sun::star::uno::TypeClass_FLOAT:
-        OSL_ENSURE(false, "Unexpected (UNSIGNED INTERGRAL or FLOAT) type found for configuration node");
-
-    case com::sun::star::uno::TypeClass_STRING:
-    case com::sun::star::uno::TypeClass_BOOLEAN:
-    case com::sun::star::uno::TypeClass_SHORT:
-    case com::sun::star::uno::TypeClass_LONG:
-    case com::sun::star::uno::TypeClass_HYPER:
-    case com::sun::star::uno::TypeClass_DOUBLE:
-    case com::sun::star::uno::TypeClass_SEQUENCE:
-        return true;
-
-    case com::sun::star::uno::TypeClass_ANY:
-        return true;
-
-    case com::sun::star::uno::TypeClass_VOID:
-        OSL_ENSURE(false, "OConfigurationRegistryKey: Key does not exist or has VOID type");
-        return false;
-
-    default:
-        OSL_ENSURE(false, "OConfigurationRegistryKey: Key has unexpected UNO type (class)");
-        return false;
-    }
-}
-//--------------------------------------------------------------------------
-
-sal_Bool OConfigurationRegistryKey::implIsValid() throw ()
-{
-    return m_xNode.is() || (m_xParentNode.is() && m_xParentNode->hasByName( m_sLocalName ) );
-}
-//--------------------------------------------------------------------------
-
-void OConfigurationRegistryKey::checkValid(KEY_ACCESS_TYPE _eIntentedAccess) throw (com::sun::star::registry::InvalidRegistryException,com::sun::star::uno::RuntimeException)
-{
-    if (!implIsValid())
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The registry is not bound to a configuration node anymore."), THISREF());
-        // "anymore", because at the moment the ctor was called it probably was bound ....
-
-    switch (_eIntentedAccess)
-    {
-        case KAT_VALUE_WRITE:
-            if (implIsReadOnly())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This configuration node is not writeable."), THISREF());
-
-            // !!! NO !!! BREAK !!!
-        case KAT_VALUE:
-            if (m_xNode.is())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This configuration node is not a value, but an internal container."), THISREF());
-
-            if (!m_xParentNode.is())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This configuration node is invalid. It has no parent."), THISREF());
-
-            if (!implEnsureValue())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This configuration does not have a legal value type."), THISREF());
-            break;
-
-        case KAT_CHILD:
-            if (!implEnsureNode())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This configuration node does not have children, it is a value node."), THISREF());
-            break;
-
-        case KAT_META:
-            break;
-    }
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Any	OConfigurationRegistryKey::implCreateDefaultElement(com::sun::star::uno::Type const& _aValueType) throw (com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aReturn;
-
-    switch (_aValueType.getTypeClass())
-    {
-    case com::sun::star::uno::TypeClass_STRING:
-        aReturn <<= rtl::OUString();
-        break;
-
-    // we don't distinguish between the different integer types or boolean
-    // (the RegistryKeyType is not granular enough),
-    // but we can't handle them all the same way here
-    case com::sun::star::uno::TypeClass_BYTE:
-    case com::sun::star::uno::TypeClass_UNSIGNED_SHORT:
-    case com::sun::star::uno::TypeClass_SHORT:
-        aReturn <<= (sal_Int16)0;
-        break;
-
-    case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-    case com::sun::star::uno::TypeClass_LONG:
-        aReturn <<= (sal_Int32)0;
-        break;
-
-    case com::sun::star::uno::TypeClass_BOOLEAN:
-        aReturn <<= sal_Bool(false);
-        break;
-
-    // we cannot really handle 64-bit ints in the registry (but here we can)
-    case com::sun::star::uno::TypeClass_UNSIGNED_HYPER:
-    case com::sun::star::uno::TypeClass_HYPER:
-        OSL_ENSURE(false, "Warning: cannot handle 64-bit values correctly in registry");
-        aReturn <<= (sal_Int64)0;
-        break;
-
-    // we cannot really handle doubles in the registry (but here we can)
-    case com::sun::star::uno::TypeClass_FLOAT:
-    case com::sun::star::uno::TypeClass_DOUBLE:
-        OSL_ENSURE(false, "Warning: cannot handle DOUBLE correctly in registry");
-        aReturn <<= (double)0;
-        break;
-
-    // we really want to leave an Any as NULL - hopefully this is acceptable to the set
-    case com::sun::star::uno::TypeClass_ANY:
-        break;
-
-    case com::sun::star::uno::TypeClass_SEQUENCE:
-        if (_aValueType == getBinaryDataType())
-            aReturn <<= com::sun::star::uno::Sequence< sal_Int8 >();
-
-        else
-        {
-            com::sun::star::uno::Type aElementType = getSequenceElementType(_aValueType);
-            switch (aElementType.getTypeClass())
-            {
-            case com::sun::star::uno::TypeClass_STRING:
-                aReturn <<= com::sun::star::uno::Sequence< rtl::OUString >();
-                break;
-
-            case com::sun::star::uno::TypeClass_BYTE:
-            case com::sun::star::uno::TypeClass_UNSIGNED_SHORT:
-            case com::sun::star::uno::TypeClass_SHORT:
-                aReturn <<= com::sun::star::uno::Sequence< sal_Int16 >();
-                break;
-
-            case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-            case com::sun::star::uno::TypeClass_LONG:
-                aReturn <<= com::sun::star::uno::Sequence< sal_Int32 >();
-                break;
-
-            case com::sun::star::uno::TypeClass_BOOLEAN:
-                aReturn <<= com::sun::star::uno::Sequence< sal_Bool >();
-                break;
-
-            case com::sun::star::uno::TypeClass_UNSIGNED_HYPER:
-            case com::sun::star::uno::TypeClass_HYPER:
-                aReturn <<= com::sun::star::uno::Sequence< sal_Int64 >();
-                break;
-
-            case com::sun::star::uno::TypeClass_FLOAT:
-            case com::sun::star::uno::TypeClass_DOUBLE:
-                aReturn <<= com::sun::star::uno::Sequence< double >();
-                break;
-
-            case com::sun::star::uno::TypeClass_SEQUENCE:
-                OSL_ENSURE(false, "Warning: cannot handle Sequence< BINARY > correctly in registry");
-                if (aElementType == getBinaryDataType())
-                {
-                    OSL_ENSURE(false, "Warning: cannot handle Sequence< BINARY > correctly in registry");
-                    aReturn <<= com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< sal_Int8 > >();
-                    break;
-                }
-
-                // else FALL THRU to default
-            default:
-                OSL_ENSURE(false, "Unexpected sequence element type for configuration node - returning NULL");
-                // throw here ??
-                break;
-            }
-        }
-        break;
-
-    case com::sun::star::uno::TypeClass_INTERFACE:
-        OSL_ENSURE(false, "Invalid call to OConfigurationRegistryKey::implCreateDefaultElement. Inner nodes must be created by a factory");
-        break;
-
-    default:
-        OSL_ENSURE(false, "Unexpected value type for configuration node - returning NULL");
-        // throw here ??
-        break;
-    }
-
-    OSL_ENSURE( aReturn.getValueType() == _aValueType || (_aValueType.getTypeClass() == com::sun::star::uno::TypeClass_ANY && !aReturn.hasValue()),
-                "Warning: Unexpected data type found in Registry - returning similar value or NULL");
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Any OConfigurationRegistryKey::implGetDescendant(const rtl::OUString& _rDescendantName) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aElementReturn;
-
-    try
-    {
-        if (!m_xNode.is())
-        {
-            // implEnsureNode should have been called before this method
-            OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getDescendant : invalid call !");
-
-            // this method should not be called if the object does not represent a container node ...
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("invalid object."), THISREF());
-        }
-
-        try
-        {
-            // look for a local member first
-            aElementReturn = m_xNode->getByName(_rDescendantName);
-        }
-        catch(com::sun::star::container::NoSuchElementException&)
-        {
-            // is it a (possibly) hierarchical name ?
-            if ( _rDescendantName.indexOf('/') <0 ) throw;
-
-            // Yes, so try deep access
-            com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xDeepAccess( m_xNode, com::sun::star::uno::UNO_QUERY );
-            if (!xDeepAccess.is())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("Nested element access not supported by this node."), THISREF());
-
-            aElementReturn = xDeepAccess->getByHierarchicalName(_rDescendantName);
-        }
-    }
-    catch(com::sun::star::container::NoSuchElementException&)
-    {	// not allowed to leave the method, wrap it
-        rtl::OUString sMessage(UNISTRING("There is no element named "));
-        sMessage += _rDescendantName;
-        sMessage += UNISTRING(".");
-        throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-    }
-    catch(com::sun::star::lang::WrappedTargetException& wte)
-    {	// allowed to be thrown by XNameAccess::getByName, but not allowed to leave this method
-        rtl::OUString sMessage(UNISTRING("The configuration node could not provide an element for "));
-        sMessage += _rDescendantName;
-        sMessage += UNISTRING(". Original Error: ");
-        sMessage += wte.Message;
-        throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-    }
-
-    return aElementReturn;
-}
-
-//--------------------------------------------------------------------------
-void OConfigurationRegistryKey::implSetValue(const com::sun::star::uno::Any& _rValue) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_VALUE_WRITE);
-
-    // one possible interface
-    com::sun::star::uno::Reference< com::sun::star::container::XNameReplace > xParentValueAccess(m_xParentNode, com::sun::star::uno::UNO_QUERY);
-    if (xParentValueAccess.is())
-    {
-        try
-        {
-            xParentValueAccess->replaceByName(m_sLocalName, _rValue);
-        }
-        catch(com::sun::star::lang::IllegalArgumentException& iae)
-        {
-            rtl::OUString sMessage = UNISTRING("Unable to replace the old value. The configuration node threw an ");
-            sMessage += UNISTRING("IllegalArgumentException: ");
-            sMessage += iae.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        catch(com::sun::star::container::NoSuchElementException& nse)
-        {
-            OSL_ENSURE(false, "OConfigurationRegistryKey::writeValueNode : a NoSuchElementException should be impossible !");
-
-            rtl::OUString sMessage = UNISTRING("Unable to replace the old value. The configuration node threw an ");
-            sMessage += UNISTRING("NoSuchElementException: ");
-            sMessage += nse.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        catch(com::sun::star::lang::WrappedTargetException& wte)
-        {
-            rtl::OUString sMessage = UNISTRING("Unable to replace the old value. The configuration node threw an ");
-            sMessage += UNISTRING("WrappedTargetException: ");
-            sMessage += wte.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        return;
-    }
-
-    // not found - try other interface
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xParentPropertySet(m_xParentNode, com::sun::star::uno::UNO_QUERY);
-    if (xParentPropertySet.is())
-    {
-        try
-        {
-            xParentPropertySet->setPropertyValue(m_sLocalName, _rValue);
-        }
-        catch(com::sun::star::lang::IllegalArgumentException& iae)
-        {
-            rtl::OUString sMessage = UNISTRING("Unable to set a new value. The configuration node threw an ");
-            sMessage += UNISTRING("IllegalArgumentException: ");
-            sMessage += iae.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        catch(com::sun::star::beans::UnknownPropertyException& upe)
-        {
-            OSL_ENSURE(false, "OConfigurationRegistryKey::writeValueNode : a UnknownPropertyException should be impossible !");
-
-            rtl::OUString sMessage = UNISTRING("Unable to set a new value. The configuration node threw an ");
-            sMessage += UNISTRING("UnknownPropertyException: ");
-            sMessage += upe.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        catch(com::sun::star::beans::PropertyVetoException& pve)
-        {
-            rtl::OUString sMessage = UNISTRING("Unable to set a new value. The configuration node threw an ");
-            sMessage += UNISTRING("PropertyVetoException: ");
-            sMessage += pve.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        catch(com::sun::star::lang::WrappedTargetException& wte)
-        {
-            rtl::OUString sMessage = UNISTRING("Unable to set a new value. The configuration node threw an ");
-            sMessage += UNISTRING("WrappedTargetException: ");
-            sMessage += wte.Message;
-            throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-        }
-        return;
-    }
-
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("No interface found on parent node for writing to configuration value node."), THISREF());
-}
-
-//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConfigurationRegistryKey::getKeyName() throw(com::sun::star::uno::RuntimeException)
-{
-    return m_sLocalName;
-}
-
-//--------------------------------------------------------------------------
-sal_Bool SAL_CALL OConfigurationRegistryKey::isReadOnly() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    OSL_ASSERT(UnoApiLock::isHeld());
-    checkValid(KAT_META);
-    return m_bReadOnly;
-}
-
-//--------------------------------------------------------------------------
-sal_Bool SAL_CALL OConfigurationRegistryKey::isValid() throw(com::sun::star::uno::RuntimeException)
-{
-    OSL_ASSERT(UnoApiLock::isHeld());
-    // TODO : perhaps if the registry we're a part of is closed ....
-    return implIsValid();
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::registry::RegistryKeyType SAL_CALL OConfigurationRegistryKey::getKeyType( const ::rtl::OUString& /*_rKeyName*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    OSL_ASSERT(UnoApiLock::isHeld());
-
-    // no further checks are made (for performance reasons) ...
-    // Maybe we should check only KAT_META for consistency ?
-    checkValid(KAT_CHILD);
-
-    return com::sun::star::registry::RegistryKeyType_KEY;
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::registry::RegistryValueType SAL_CALL OConfigurationRegistryKey::getValueType() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_META);
-
-    const com::sun::star::uno::Type aUnoType = implGetUnoType();
-
-    switch (aUnoType.getTypeClass())
-    {
-    case com::sun::star::uno::TypeClass_INTERFACE:	// this is really a case of 'no value type'
-        return com::sun::star::registry::RegistryValueType_NOT_DEFINED;
-
-    case com::sun::star::uno::TypeClass_ANY:	// this is really a case of 'all value types allowed'
-        return com::sun::star::registry::RegistryValueType_NOT_DEFINED;
-
-    case com::sun::star::uno::TypeClass_STRING:
-        return com::sun::star::registry::RegistryValueType_STRING;
-
-    case com::sun::star::uno::TypeClass_BYTE:
-    case com::sun::star::uno::TypeClass_UNSIGNED_SHORT:
-    case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-        OSL_ENSURE(false, "Unexpected UNSIGNED type found for configuration node");
-        // FALL THRU
-
-    case com::sun::star::uno::TypeClass_BOOLEAN:
-    case com::sun::star::uno::TypeClass_SHORT:
-    case com::sun::star::uno::TypeClass_LONG:
-        return com::sun::star::registry::RegistryValueType_LONG;
-
-    case com::sun::star::uno::TypeClass_FLOAT:
-    case com::sun::star::uno::TypeClass_DOUBLE:
-        OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : registry does not support floating point numbers !");
-        return com::sun::star::registry::RegistryValueType_LONG;
-
-    case com::sun::star::uno::TypeClass_UNSIGNED_HYPER:
-    case com::sun::star::uno::TypeClass_HYPER:
-        OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : registry does not support 64-bit integer numbers !");
-        return com::sun::star::registry::RegistryValueType_LONG;
-
-    case com::sun::star::uno::TypeClass_SEQUENCE:
-        if ( aUnoType.equals( getBinaryDataType() ) )
-            return com::sun::star::registry::RegistryValueType_BINARY;
-
-        else
-        {
-            com::sun::star::uno::Type aElementType = getSequenceElementType(aUnoType);
-
-            switch (aElementType.getTypeClass())
-            {
-            case com::sun::star::uno::TypeClass_STRING:
-                return com::sun::star::registry::RegistryValueType_STRINGLIST;
-
-            case com::sun::star::uno::TypeClass_BYTE:
-                OSL_ASSERT(false); // this is caught by the 'binary' case
-
-            case com::sun::star::uno::TypeClass_UNSIGNED_SHORT:
-            case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-                OSL_ENSURE(false, "Unexpected UNSIGNED-List type found for configuration node");
-                // FALL THRU
-
-            case com::sun::star::uno::TypeClass_BOOLEAN:
-            case com::sun::star::uno::TypeClass_SHORT:
-            case com::sun::star::uno::TypeClass_LONG:
-                return com::sun::star::registry::RegistryValueType_LONGLIST;
-
-            case com::sun::star::uno::TypeClass_FLOAT:
-            case com::sun::star::uno::TypeClass_DOUBLE:
-                OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : registry does not support floating point number lists !");
-                return com::sun::star::registry::RegistryValueType_LONGLIST;
-
-            case com::sun::star::uno::TypeClass_UNSIGNED_HYPER:
-            case com::sun::star::uno::TypeClass_HYPER:
-                OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : registry does not support 64-bit integer number lists !");
-                return com::sun::star::registry::RegistryValueType_LONGLIST;
-
-            case com::sun::star::uno::TypeClass_ANY:
-                OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : Unexpected: Any as sequence element type !");
-                return com::sun::star::registry::RegistryValueType_NOT_DEFINED;
-
-            default:
-                if (aElementType.equals(getBinaryDataType()))
-                    OSL_ENSURE(sal_False,"OConfigurationRegistryKey::getValueType : Registry cannot support LIST of BINARY");
-                else
-                    OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : unknown sequence element type !");
-
-                return com::sun::star::registry::RegistryValueType_NOT_DEFINED;
-            }
-        }
-
-    default:
-        OSL_ENSURE(sal_False, "OConfigurationRegistryKey::getValueType : unknown entry type !");
-        return com::sun::star::registry::RegistryValueType_NOT_DEFINED;
-    }
-}
-
-//--------------------------------------------------------------------------
-
-com::sun::star::uno::Any OConfigurationRegistryKey::implGetValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_VALUE);
-
-    return m_xParentNode->getByName( m_sLocalName );
-}
-
-//--------------------------------------------------------------------------
-sal_Int32 SAL_CALL OConfigurationRegistryKey::getLongValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aValue = implGetValue();
-
-    sal_Int32 nLongValue(0);
-    switch (aValue.getValueTypeClass())
-    {
-    // integral types that are small enough are straightforward
-    case com::sun::star::uno::TypeClass_BYTE				: { sal_Int8   nNativeValue = 0; aValue >>= nNativeValue; nLongValue = nNativeValue; } break;
-    case com::sun::star::uno::TypeClass_BOOLEAN			: { sal_Bool   nNativeValue = false; aValue >>= nNativeValue; nLongValue = nNativeValue; } break;
-    case com::sun::star::uno::TypeClass_SHORT			: { sal_Int16  nNativeValue; aValue >>= nNativeValue; nLongValue = nNativeValue; } break;
-    case com::sun::star::uno::TypeClass_UNSIGNED_SHORT	: { sal_uInt16 nNativeValue; aValue >>= nNativeValue; nLongValue = nNativeValue; } break;
-    case com::sun::star::uno::TypeClass_LONG				: { sal_Int32  nNativeValue; aValue >>= nNativeValue; nLongValue = nNativeValue; } break;
-
-    // this is lossless, but not value-preserving - use cast to avoid warnings
-    case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-        {
-            sal_uInt32 nNativeValue;
-            aValue >>= nNativeValue;
-            nLongValue = sal_Int32(nNativeValue);
-        }
-        break;
-
-    // the following are larger than Long - check for loss and throw if applicable
-    case com::sun::star::uno::TypeClass_HYPER:
-        {
-            sal_Int64 nNativeValue;
-            aValue >>= nNativeValue;
-            nLongValue = sal_Int32(nNativeValue);
-
-            // check for data loss
-            if (sal_Int64(nLongValue) != nNativeValue)
-                throw com::sun::star::registry::InvalidValueException(UNISTRING("Unsigned Hyper value too large for long; Value cannot be retrieved using registry."), THISREF());
-        }
-        break;
-
-    case com::sun::star::uno::TypeClass_UNSIGNED_HYPER:
-        {
-            sal_uInt64 nNativeValue;
-            aValue >>= nNativeValue;
-            nLongValue = sal_Int32(nNativeValue);
-
-            // check for data loss
-            if (sal_uInt64(sal_uInt32(nLongValue)) != nNativeValue)
-                throw com::sun::star::registry::InvalidValueException(UNISTRING("Unsigned Hyper value too large for long; Value cannot be retrieved using registry."), THISREF());
-        }
-        break;
-
-    // for floating point types we need a limit for loss checking
-    case com::sun::star::uno::TypeClass_FLOAT:
-        OSL_ENSURE(false, "Unexpected type FLOAT in configuration node");
-        {
-            // treat as double
-            float fNativeValue = 0;
-            if (aValue >>= fNativeValue)
-                aValue <<= double(fNativeValue);
-        }
-        // fall thru
-
-    case com::sun::star::uno::TypeClass_DOUBLE:
-        {
-            double fNativeValue = 0;
-            aValue >>= fNativeValue;
-
-            // find a reasonable allowed imprecision
-            const double fEps = (2.*fNativeValue + 5.) * std::numeric_limits<double>::epsilon();
-
-            // should be rounding here
-            nLongValue = sal_Int32(fNativeValue);
-
-            // check for data loss
-            bool bRecheck = false;
-
-            double diff = fNativeValue-double(nLongValue);
-            if ( diff > fEps)
-            {
-                // substitute for rounding here
-                if (diff > .5)
-                {
-                    ++nLongValue;
-                    diff = fNativeValue-double(nLongValue);
-                }
-                bRecheck = true;
-            }
-            else if ( diff < -fEps)
-            {
-                // substitute for rounding here
-                if (diff < -.5)
-                {
-                    --nLongValue;
-                    diff = fNativeValue-double(nLongValue);
-                }
-                bRecheck = true;
-            }
-
-            if (bRecheck)
-            {
-                if (diff > fEps || diff < -fEps)
-                    throw com::sun::star::registry::InvalidValueException(UNISTRING("Double value cannot fit in Long; Value cannot be retrieved using registry."), THISREF());
-            }
-        }
-        break;
-
-    case com::sun::star::uno::TypeClass_VOID:
-        // allow NULL values, if we maybe advertise this node as long
-        if (this->getValueType() == com::sun::star::registry::RegistryValueType_LONG)
-            break;
-        // else FALL THRU to exception
-
-    default:
-        throw com::sun::star::registry::InvalidValueException(UNISTRING("This node does not contain a long (or a compatible) value."), THISREF());
-    }
-    return nLongValue;
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setLongValue( sal_Int32 _nValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    implSetValue(com::sun::star::uno::makeAny(_nValue));
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL OConfigurationRegistryKey::getLongListValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aValue = implGetValue();
-
-    com::sun::star::uno::Sequence< sal_Int32 > aReturn;
-    if (!aValue.hasValue())
-        checkNullable();// let NULL values pass
-
-    else if (!(aValue >>= aReturn))
-    {
-        // TODO : maybe it's a sequence of sal_Int8 or anything like that which we're able to convert ....
-
-        throw com::sun::star::registry::InvalidValueException(UNISTRING("This configuration node does not contain a list of longs !"), THISREF());
-    }
-
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setLongListValue( const com::sun::star::uno::Sequence< sal_Int32 >& _seqValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    implSetValue(com::sun::star::uno::makeAny(_seqValue));
-}
-
-//--------------------------------------------------------------------------
-rtl::OUString SAL_CALL OConfigurationRegistryKey::getAsciiValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    rtl::OUString sReturn = getStringValue();
-
-    if (!isAscii(sReturn))
-        throw com::sun::star::registry::InvalidValueException(UNISTRING("This configuration node value (a string) is not pure ASCII !"), THISREF());
-
-    return sReturn;
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setAsciiValue( const ::rtl::OUString& _rValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    OSL_ENSURE( isAscii(_rValue), "The string passesd to OConfigurationRegistryKey::setAsciiValue is not pure ASCII");
-
-    setStringValue(_rValue);
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL OConfigurationRegistryKey::getAsciiListValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Sequence<rtl::OUString> aReturn = getStringListValue();
-
-    if (!isAscii(aReturn))
-        throw com::sun::star::registry::InvalidValueException(UNISTRING("This configuration node value (a string list) is not pure ASCII !"), THISREF());
-
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setAsciiListValue( const com::sun::star::uno::Sequence< ::rtl::OUString >& _seqValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    OSL_ENSURE( isAscii(_seqValue), "The string passesd to OConfigurationRegistryKey::setAsciiValue is not pure ASCII");
-
-    setStringListValue(_seqValue);
-}
-
-//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConfigurationRegistryKey::getStringValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aValue = implGetValue();
-
-    rtl::OUString sReturn;
-    if (!aValue.hasValue())
-        checkNullable();// let NULL values pass
-
-    else if (!(aValue >>= sReturn))
-        throw com::sun::star::registry::InvalidValueException(UNISTRING("This node does not contain a string value."), THISREF());
-
-    return sReturn;
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setStringValue( const ::rtl::OUString& _rValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    implSetValue(com::sun::star::uno::makeAny(_rValue));
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OConfigurationRegistryKey::getStringListValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aValue = implGetValue();
-
-    com::sun::star::uno::Sequence< rtl::OUString > aReturn;
-    if (!aValue.hasValue())
-        checkNullable();// let NULL values pass
-
-    else if (!(aValue >>= aReturn))
-        throw com::sun::star::registry::InvalidValueException(UNISTRING("This configuration node does not contain a list of strings !"), THISREF());
-
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setStringListValue( const com::sun::star::uno::Sequence< ::rtl::OUString >& _seqValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    implSetValue(com::sun::star::uno::makeAny(_seqValue));
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OConfigurationRegistryKey::getBinaryValue() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::InvalidValueException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aValue = implGetValue();
-
-    com::sun::star::uno::Sequence< sal_Int8 > aReturn;
-    if (!aValue.hasValue())
-        checkNullable();// let NULL values pass
-
-    else if (!(aValue >>= aReturn))
-        return aReturn;
-
-    throw com::sun::star::registry::InvalidValueException(UNISTRING("This configuration node does not contain a list of strings !"), THISREF());
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::setBinaryValue( const com::sun::star::uno::Sequence< sal_Int8 >& _rValue ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    implSetValue(com::sun::star::uno::makeAny(_rValue));
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > OConfigurationRegistryKey::implGetKey( const ::rtl::OUString& _rKeyName )
-    throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aDescendant = implGetDescendant(_rKeyName);
-    if (aDescendant.getValueType().getTypeClass() == com::sun::star::uno::TypeClass_INTERFACE)
-    {
-        com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xNode;
-        ::cppu::extractInterface(xNode, aDescendant);
-        if (!xNode.is())
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("invalid descendant node. No XNameAccess found."), THISREF());
-        return new OConfigurationRegistryKey(xNode, !m_bReadOnly);
-    }
-    else
-    {
-#if OSL_DEBUG_LEVEL > 1
-        switch (aDescendant.getValueType().getTypeClass())
-        {
-            case com::sun::star::uno::TypeClass_STRING:
-            case com::sun::star::uno::TypeClass_SHORT:
-            case com::sun::star::uno::TypeClass_UNSIGNED_SHORT:
-            case com::sun::star::uno::TypeClass_BYTE:
-            case com::sun::star::uno::TypeClass_LONG:
-            case com::sun::star::uno::TypeClass_UNSIGNED_LONG:
-            case com::sun::star::uno::TypeClass_BOOLEAN:
-            case com::sun::star::uno::TypeClass_SEQUENCE:
-                break;
-            case com::sun::star::uno::TypeClass_VOID: // NULL value found
-                break;
-            default:
-                OSL_ENSURE(sal_False, "OConfigurationRegistryKey::openKey : unknown, invalid or unhandled descendant value type !");
-        }
-#endif
-
-        OSL_ASSERT(m_xNode.is());
-
-        com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xDescParent(m_xNode);	// the parent config node of the descandent
-        rtl::OUString sDescRelativeName( _rKeyName );        // local name of the descendant within xDescParent
-
-        if (!m_xNode->hasByName(_rKeyName)) // it is a hierarchical Path -> more work
-        {
-            rtl::OUString sParentLocation;
-
-            if ( !splitPath(_rKeyName, sParentLocation, sDescRelativeName) )
-            {
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("Cannot split path for value. The internal registry structure seems to be corrupt."), THISREF());
-            }
-
-            if (sParentLocation.getLength())
-            {
-                com::sun::star::uno::Any aDescParent = implGetDescendant(sParentLocation);
-                ::cppu::extractInterface(xDescParent, aDescParent);
-                if (!xDescParent.is())
-                    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The internal registry structure seems to be corrupt."), THISREF());
-            }
-        }
-
-        OSL_ENSURE(xDescParent.is(), "No Parent Node found for value ?");
-        OSL_ENSURE(xDescParent->hasByName(sDescRelativeName), "Parent Node does not contain found value ?");
-
-        return new OConfigurationRegistryKey(aDescendant, xDescParent, sDescRelativeName, !m_bReadOnly);
-    }
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > SAL_CALL OConfigurationRegistryKey::openKey( const ::rtl::OUString& _rKeyName ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_CHILD);
-
-    return implGetKey(_rKeyName);
-}
-//--------------------------------------------------------------------------
-bool OConfigurationRegistryKey::checkRelativeKeyName(rtl::OUString& _rKeyName) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    // no empty names allowed
-    if (!_rKeyName.getLength())
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key name is invalid."), THISREF());
-
-    bool bCleanPath = true;
-
-    // cut trailing slashes
-    sal_Int32 nCleanEnd = _rKeyName.getLength();
-    while (nCleanEnd > 0 && _rKeyName[nCleanEnd - 1] == '/' )
-        --nCleanEnd;
-
-    if (m_xNode.is())
-    {
-        if (m_xNode-> hasByName(_rKeyName))
-        {
-            bCleanPath = false;
-        }
-
-        else
-        {
-            com::sun::star::uno::Reference< com::sun::star::util::XStringEscape > xSE(m_xNode, com::sun::star::uno::UNO_QUERY);
-
-            sal_Bool bPreferLocal = xSE.is();
-
-            if (!bPreferLocal)
-            {
-                com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xSI(m_xNode, com::sun::star::uno::UNO_QUERY);
-                if (xSI.is() && xSI->supportsService(rtl::OUString::createFromAscii("com.sun.star.configuration.SetAccess")))
-                    bPreferLocal = true;
-            }
-
-            if (bPreferLocal)
-            {
-                com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xHA(m_xNode, com::sun::star::uno::UNO_QUERY);
-                rtl::OUString sCleanName = _rKeyName.copy(0, nCleanEnd);
-
-                if (xHA.is() && xHA->hasByHierarchicalName(sCleanName))
-                    bPreferLocal = false;
-            }
-
-            if (bPreferLocal && xSE.is())
-            {
-                _rKeyName = xSE->escapeString(_rKeyName);
-            }
-            bCleanPath = !bPreferLocal;
-        }
-    }
-
-    if (bCleanPath)
-    {
-        // no absolute names ("/...") allowed
-        if (_rKeyName.getStr()[0] == '/')
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key name is invalid. It must be a relative, not an absolute name."), THISREF());
-
-        if (nCleanEnd <= 0)
-            // the original name consists of slashes only
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key name is invalid."), THISREF());
-
-
-        _rKeyName = _rKeyName.copy(0, nCleanEnd);
-    }
-    return bCleanPath;
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > SAL_CALL OConfigurationRegistryKey::createKey( const ::rtl::OUString& _rKeyName ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_CHILD);
-
-    if (m_bReadOnly)
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key is read only."), THISREF());
-
-    OSL_ENSURE(m_xNode.is(), "OConfigurationRegistryKey::createKey : somebody changed the checkValid(KAT_CHILD) behaviour !");
-
-    rtl::OUString sKeyName(_rKeyName);
-    if (checkRelativeKeyName(sKeyName))
-    {
-        rtl::OUString sParentName, sLocalName;
-
-        if (!splitPath(sKeyName,sParentName, sLocalName))
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key name is invalid."), THISREF());
-
-        if (sParentName.getLength()) // it's a nested key name
-        {
-            // check if we have the key already
-            com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xDeepAccess(m_xNode, com::sun::star::uno::UNO_QUERY);
-            if (xDeepAccess.is() && xDeepAccess->hasByHierarchicalName(sKeyName))
-            {
-                // already there - just open it
-                return implGetKey(sKeyName);
-            }
-
-            // deep access, but not found. delegate it to a registry key which is one level above the to-be-created one
-            com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > xSetNode = implGetKey(sParentName);
-            if (!xSetNode.is())
-            {
-                OSL_ENSURE(sal_False, "OConfigurationRegistryKey::createKey : somebody changed the implGetKey behaviour !");
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("An internal error occured."), THISREF());
-            }
-            return xSetNode->createKey(sLocalName); // problem: request for a/['b/c'] might find a/b/c
-        }
-        else
-            sKeyName = sLocalName;
-    }
-
-    // The requested new key is one level below ourself. Can't delegate the creation.
-    if (m_xNode->hasByName(sKeyName) )
-    {
-        // already there - just open it
-        return implGetKey(sKeyName);
-    }
-
-    com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xContainer(m_xNode, com::sun::star::uno::UNO_QUERY);
-    if (!xContainer.is())
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The configuration node represented by this key is not a set node, you can't insert keys."), THISREF());
-
-    com::sun::star::uno::Any aValueToInsert;
-
-    com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xChildFactory(xContainer, com::sun::star::uno::UNO_QUERY);
-    if (xChildFactory.is())
-    {
-        // In the configuration API, the creation of a new child is two-stage process : first you create a child which
-        // is "floating", i.e. does not belong to the configuration tree, yet. After filling it with values, you insert
-        // it into the container node which was used for the creation.
-        // We can't map this behaviour with the registry API, so we have to combine both steps
-
-        // create a new floating child for the container node
-        try
-        {
-            com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xFloatingChild = xChildFactory->createInstance();
-            OSL_ENSURE( xFloatingChild.is(), "The newly created element is NULL !");
-
-            com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xInsertedChild(xFloatingChild, com::sun::star::uno::UNO_QUERY);
-            OSL_ENSURE( xInsertedChild.is(), "The newly created element does not provide the required interface");
-
-            if (!xInsertedChild.is())
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("An internal error occured. The objects provided by the configuration API are invalid."), THISREF());
-
-            aValueToInsert <<= xInsertedChild; // xFloatingChild;
-        }
-        catch (com::sun::star::uno::RuntimeException&)
-        {	// allowed to leave this method
-            throw;
-        }
-        catch (com::sun::star::uno::Exception& e)
-        {	// not allowed to leave this method
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("Unable to create a new child for the configuration node. Original error message as provided by the configuration API : ") += e.Message,
-                THISREF());
-        }
-        OSL_ENSURE(aValueToInsert.hasValue(), "New Child node did not get into the Any ?");
-    }
-    else
-    {
-        // If the elements of the set are simple values, we need to create a matching value
-        com::sun::star::uno::Type aElementType = xContainer->getElementType();
-        aValueToInsert = implCreateDefaultElement(aElementType);
-
-        OSL_ENSURE(aValueToInsert.hasValue() || aElementType.getTypeClass() == com::sun::star::uno::TypeClass_ANY, "Internal error: NULL value created for new value element ?");
-    }
-
-    // and immediately insert it into the container
-    try
-    {
-        xContainer->insertByName(sKeyName, aValueToInsert);
-    }
-    catch (com::sun::star::lang::IllegalArgumentException& e)
-    {
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("illegal argument to InsertByName: ") += e.Message, THISREF());
-    }
-    catch (com::sun::star::container::ElementExistException& e)
-    {
-        OSL_ENSURE(false, "There was an element of the same name inserted just now");
-
-        // try to return that one
-        try { return implGetKey(sKeyName); }
-        catch (com::sun::star::uno::Exception&) { OSL_ENSURE(false, "But the other element cannot be retrieved"); }
-
-
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("Inserting raised a NoSuchElementException for an unavailable element ! Original error message : ") += e.Message, THISREF());
-    }
-    catch (com::sun::star::lang::WrappedTargetException& e)
-    {
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("Inserting raised a WrappedTargetException. Original error message : ") += e.Message, THISREF());
-    }
-
-    return new OConfigurationRegistryKey(aValueToInsert, m_xNode, sKeyName, !m_bReadOnly);
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::closeKey() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    OSL_ASSERT(UnoApiLock::isHeld());
-    checkValid(KAT_META);
-
-    bool bRoot = (m_sLocalName.getLength() == 0);
-
-    if (!bRoot) // don't close, if this is the root key ..
-    {
-        m_xNode.clear();
-        m_xParentNode.clear();
-//	    m_sLocalName = rtl::OUString(); - local name is const ...
-    }
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::deleteKey( const rtl::OUString& _rKeyName ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_CHILD);
-    if (m_bReadOnly)
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key is read only."), THISREF());
-
-    rtl::OUString sKeyName(_rKeyName);
-    if (checkRelativeKeyName(sKeyName))
-    {
-        rtl::OUString sParentName, sLocalName;
-
-        if (!splitPath(sKeyName,sParentName, sLocalName))
-            throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The key name is invalid."), THISREF());
-
-        if (sParentName.getLength()) // it's a nested key name
-        {
-            com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > xSetNode = implGetKey(sParentName);
-            if (!xSetNode.is())
-            {
-                OSL_ENSURE(sal_False, "OConfigurationRegistryKey::createKey : somebody changed the implGetKey behaviour !");
-                throw com::sun::star::registry::InvalidRegistryException(UNISTRING("An internal error occured."), THISREF());
-            }
-            xSetNode->deleteKey(sLocalName);
-            return;
-        }
-        else
-            sKeyName = sLocalName;
-    }
-
-    // The requested new key is one level below ourself. Can't delegate the creation.
-    com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xContainer(m_xNode, com::sun::star::uno::UNO_QUERY);
-    if (!xContainer.is())
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The configuration node represented by this key is not a set node, you can't remove keys."), THISREF());
-
-    // and immediately remove it from the container
-    try
-    {
-        xContainer->removeByName(sKeyName);
-    }
-    catch (com::sun::star::container::NoSuchElementException& e)
-    {
-        if (e.Message.getLength())
-            throw com::sun::star::registry::InvalidRegistryException(e.Message, THISREF());
-        else
-            throw com::sun::star::registry::InvalidRegistryException((UNISTRING("There is no element named ") += sKeyName) += UNISTRING(" to remove."), THISREF());
-    }
-    catch (com::sun::star::lang::WrappedTargetException& e)
-    {
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("Removing a node caused a WrappedTargetException. Original error message : ") += e.Message, THISREF());
-    }
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > > SAL_CALL OConfigurationRegistryKey::openKeys() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_CHILD);
-
-    com::sun::star::uno::Sequence< ::rtl::OUString > aNames(m_xNode->getElementNames());
-
-    sal_Int32 const nCount = aNames.getLength();
-
-    com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > > aReturn(nCount);
-
-    for (sal_Int32 i=0; i<nCount; ++i)
-        aReturn[i] = implGetKey(aNames[i]);
-
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OConfigurationRegistryKey::getKeyNames() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    checkValid(KAT_CHILD);
-    return m_xNode->getElementNames();
-}
-
-//--------------------------------------------------------------------------
-sal_Bool SAL_CALL OConfigurationRegistryKey::createLink( const ::rtl::OUString& /*aLinkName*/, const ::rtl::OUString& /*aLinkTarget*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This registry, which is base on a configuration tree, does not support links."), THISREF());
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistryKey::deleteLink( const ::rtl::OUString& /*rLinkName*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This registry, which is base on a configuration tree, does not support links."), THISREF());
-}
-
-//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConfigurationRegistryKey::getLinkTarget( const ::rtl::OUString& /*rLinkName*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This registry, which is base on a configuration tree, does not support links."), THISREF());
-}
-
-//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConfigurationRegistryKey::getResolvedName( const ::rtl::OUString& /*aKeyName*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This registry, which is base on a configuration tree, does not support links."), THISREF());
-}
-//--------------------------------------------------------------------------
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-// split path
-#include "configpath.hxx"
-#include "configexcept.hxx"
-
-bool configmgr::splitPath(const rtl::OUString& _sPath, rtl::OUString& _rsParentPath, rtl::OUString& _rsLocalName)
-{
-    bool bResult = false;
-    try
-    {
-        bool bAbsolute = configmgr::configuration::Path::isAbsolutePath(_sPath);
-        configmgr::configuration::Path::Rep aPath ;
-
-        if (bAbsolute)
-        {
-            configmgr::configuration::AbsolutePath parsedPath = configmgr::configuration::AbsolutePath::parse(_sPath) ;
-
-            aPath = parsedPath.rep() ;
-        }
-        else
-        {
-            configmgr::configuration::RelativePath parsedPath = configmgr::configuration::RelativePath::parse(_sPath) ;
-
-            aPath = parsedPath.rep() ;
-        }
-        //configmgr::configuration::Path::Rep aPath = bAbsolute ? configmgr::configuration::AbsolutePath::parse(_sPath).rep() : configmgr::configuration::RelativePath::parse(_sPath).rep();
-
-        OSL_ENSURE(!aPath.isEmpty(), "Trying to split an empty or root path");
-        std::vector<configuration::Path::Component>::const_reverse_iterator aFirst = aPath.begin(), aLast = aPath.end();
-
-        if (aFirst != aLast)
-        {
-            --aLast;
-
-            _rsLocalName = aLast->getName();
-            _rsParentPath = configmgr::configuration::Path::Rep(aFirst,aLast).toString(bAbsolute);
-
-            bResult = true;
-        }
-        //  else go on to fail
-    }
-    catch (configuration::Exception&)
-    {
-    }
-    return bResult;
-}
-//..........................................................................
-
-
diff --git a/configmgr/source/registry/cfgregistrykey.hxx b/configmgr/source/registry/cfgregistrykey.hxx
deleted file mode 100644
index 52c7d0a4be..0000000000
--- a/configmgr/source/registry/cfgregistrykey.hxx
+++ /dev/null
@@ -1,247 +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: cfgregistrykey.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CONFIGMGR_REGISTRY_CFGREGISTRYKEY_HXX_
-#define _CONFIGMGR_REGISTRY_CFGREGISTRYKEY_HXX_
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-
-//..........................................................................
-namespace configmgr
-{
-//..........................................................................
-
-//==========================================================================
-//= OConfigurationRegistryKey
-//==========================================================================
-/** wraps the registry-like access to a single node of a configuration sub tree
-*/
-class OConfigurationRegistryKey
-        :public cppu::WeakImplHelper1< com::sun::star::registry::XRegistryKey >
-{
-    sal_Bool		m_bReadOnly;		/// is the key readonly ?
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-                    m_xNode;		/// the config node object, if it is a container
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-                    m_xParentNode;		/// if the key is not the root, this is it's parent.
-
-    const ::rtl::OUString	m_sLocalName; /** the name of the element relative to the parent, which is
-                                            m_xParentNode if that is present
-                                        */
-
-    // TODO : the current concept does not recognize when config keys are disposed (e.g. when the registry is closed)
-    // 
-    // Possible solutions:
-    // 1. each registry key is a listener on the component containing its node
-    //		may be is expensive ?.
-    //
-    // At the moment we ignore this restriction, but perhaps we can't do that forever ....
-
-public:
-    /// when used as ctor parameter, this indicates that the key wraps a config tree subtree root
-    struct SubtreeRoot { };
-
-    /** builds an registry key which wraps the root of a configuration registry
-    */
-    OConfigurationRegistryKey(
-             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxRootNode
-            ,sal_Bool _bWriteable
-            ,SubtreeRoot
-        );
-
-    /** builds an registry key for a configuration node
-        @param		_rxContainerNode	the node the key should represent
-        @param		_bWriteable			should the key be writeable ?
-    */
-    OConfigurationRegistryKey(
-             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxNode
-            ,sal_Bool _bWriteable
-        );
-
-    /** builds an registry key for a configuration value container node.
-        @param		_rCurrentValue	the current value of the node. Must be the same as _rxParentNode->getByName(_rRelativeName) would provide
-        @param		_rxParentNode	the parent of the value node. Used for update access and for obtaining the initial value.
-        @param		_rRelativeName	te relative name within the parent
-        @param		_bWriteable		should the key be writeable ?
-    */
-    OConfigurationRegistryKey(
-             ::com::sun::star::uno::Any _rCurrentValue
-            ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentNode
-            ,const ::rtl::OUString& _rRelativeName
-            ,sal_Bool _bWriteable
-        );
-
-    // XRegistryKey
-    virtual ::rtl::OUString SAL_CALL getKeyName() throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isValid(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::registry::RegistryKeyType SAL_CALL getKeyType( const ::rtl::OUString& rKeyName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::registry::RegistryValueType SAL_CALL getValueType(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getLongValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setLongListValue( const ::com::sun::star::uno::Sequence< sal_Int32 >& seqValue ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAsciiValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setAsciiValue( const ::rtl::OUString& value ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAsciiListValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setAsciiListValue( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqValue ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getStringValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setStringValue( const ::rtl::OUString& value ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getStringListValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setStringListValue( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqValue ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::InvalidValueException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setBinaryValue( const ::com::sun::star::uno::Sequence< sal_Int8 >& value ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > SAL_CALL openKey( const ::rtl::OUString& aKeyName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > SAL_CALL createKey( const ::rtl::OUString& aKeyName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL closeKey(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL deleteKey( const ::rtl::OUString& rKeyName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > > SAL_CALL openKeys(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getKeyNames(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL createLink( const ::rtl::OUString& aLinkName, const ::rtl::OUString& aLinkTarget ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL deleteLink( const ::rtl::OUString& rLinkName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getLinkTarget( const ::rtl::OUString& rLinkName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getResolvedName( const ::rtl::OUString& aKeyName ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-protected:
-    /** specifies the kind of access to the key.
-    */
-    enum KEY_ACCESS_TYPE
-    {
-        KAT_META,			/// access on a meta level, e.g. asking for the read-onyl flag
-        KAT_VALUE,			/// read access to the value the node represents
-        KAT_VALUE_WRITE,	/// write access to the value the node represents
-        KAT_CHILD			/// access to one of the (grand-)children of the node
-    };
-    
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > 
-        implGetParentPropertyInfo()
-            throw(::com::sun::star::uno::RuntimeException);
-
-    sal_Bool implIsReadOnly()
-            throw(::com::sun::star::uno::RuntimeException);
-
-    sal_Bool implEnsureNode()
-            throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    ::com::sun::star::uno::Type implGetUnoType()
-            throw(::com::sun::star::uno::RuntimeException);
-
-    sal_Bool implEnsureValue() 
-            throw(::com::sun::star::uno::RuntimeException);
-
-    sal_Bool implIsValid() throw ();
-
-    /** check if the registry key is valid
-        @param		_eIntentedAccess	type of access which the caller wants to perform on the object
-        @throws				<type scope="com.sun.star.registry">InvalidRegistryException</type> if the key is invalid
-    */
-    void checkValid(KEY_ACCESS_TYPE _eIntentedAccess) 
-        throw (::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    /** return an child element.
-        @param		_rDescendantName	the name of the descendant to open. May have a depth of more than 1, if
-                                        the node container support XHierarchicalNameAccess
-        @return				the requested element. The caller can assume that the returned
-                            <type scope="com.sun.star.uno">Any</type> always contains an object, all other cases are
-                            handled with exceptions
-        @throws				<type scope="com.sun.star.registry">InvalidRegistryException</type> if the key is invalid,
-                            the element refered by _rName does not exist, the configuration node threw an exception, or
-                            the name has a depth of more than one and the config node does not support this.
-    */
-    ::com::sun::star::uno::Any 
-        implGetDescendant(const ::rtl::OUString& _rDescendantName) 
-            throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    /** write the given value into the configuration node the object represents.
-        @throws				<type scope="com.sun.star.registry">InvalidRegistryException</type> if the key is invalid,
-                            not opened for write access or the configurations parent is not able to provide a value access
-        @throws				<type scope="com.sun.star.uno">RuntimeException</type> if a fatal runtime error occurs
-    */
-    void implSetValue(const ::com::sun::star::uno::Any& _rValue) 
-            throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    ::com::sun::star::uno::Any implGetValue()
-            throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    /** open the sub key (depth 1 or more) determined by the given name
-        @param		_rKeyName		the name of the descendant node
-        @return				a XRegistryKey wrapper for the requested configuration node
-        @throws				<type scope="com.sun.star.registry">InvalidRegistryException</type> if the key is invalid,
-                            the element refered by _rName does not exist, the configuration node threw an exception, or
-                            the name has a depth of more than one and the config node does not support this.
-    */
-    ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > 
-        implGetKey( const ::rtl::OUString& _rKeyName ) 
-            throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    /** check the given (relative) key name syntactically.
-
-        <p>In particular, this means that no checks are made if a node with the given name exists or something like
-        that ...<br/>
-        In addition, the given name will be normalized. Basically, this means that it does not contain trailing slashes.
-        </p>
-        @returns 
-            <TRUE/>     if the name is a valid relative path
-            <FALSE/>    if the name is a local name only
-        @throws InvalidRegistryException
-            if the name is invalid or not relative (i.e. if it starts with an slash)
-    */
-    bool checkRelativeKeyName(::rtl::OUString& _rKeyName) 
-            throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    /** get a default value for a value of a given type
-
-        <p>Creates an Any with an empty or zero value of the given type.</p>
-
-        @param	_rType			the type of the element to create
-        @return
-            an <type scope="com::sun::star::uno">Any</type> representing a default for the node value type. If the
-            return value is still VOID, the node has a nullable type (e.g. any) or is of unsupported type
-
-    */
-    ::com::sun::star::uno::Any	
-        implCreateDefaultElement(::com::sun::star::uno::Type const& _rType)
-            throw(::com::sun::star::uno::RuntimeException);
-};
-
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-#endif // _CONFIGMGR_REGISTRY_CFGREGISTRYKEY_HXX_
-
-
diff --git a/configmgr/source/registry/configregistry.cxx b/configmgr/source/registry/configregistry.cxx
deleted file mode 100644
index 636d1fd9db..0000000000
--- a/configmgr/source/registry/configregistry.cxx
+++ /dev/null
@@ -1,379 +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: configregistry.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-
-#include "configregistry.hxx"
-#include "cfgregistrykey.hxx"
-#include "confapifactory.hxx"
-#include "datalock.hxx"
-#include "utility.hxx"
-#include <comphelper/sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <osl/diagnose.h>
-#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#define THISREF()		static_cast< ::cppu::OWeakObject* >(this)
-#define UNISTRING(c)	makeUniString(c)
-
-//..........................................................................
-namespace configmgr
-{
-//..........................................................................
-
-namespace beans = ::com::sun::star::beans;
-
-//==========================================================================
-//= OConfigurationRegistry
-//==========================================================================
-    inline 
-    static
-    rtl::OUString makeUniString(char const* c) 
-    { 
-        return rtl::OUString::createFromAscii(c); 
-    }
-
-
-    // #99130# Don't export SimpleRegistry service
-    static sal_Char const * const aExportedConfigRegistryServices[] = 
-    {
-        "com.sun.star.configuration.ConfigurationRegistry", 
-        NULL
-    };
-    static sal_Char const * const aAdditionalConfigRegistryServices[] = 
-    {
-        "com.sun.star.registry.SimpleRegistry", 
-        NULL
-    };
-
-    sal_Char const * const aConfigRegistryImplementationName = "com.sun.star.comp.configuration.OConfigurationRegistry";
-
-    const ServiceImplementationInfo OConfigurationRegistry::s_aServiceInfo =
-    { 
-        aConfigRegistryImplementationName, 
-        aExportedConfigRegistryServices,
-        aAdditionalConfigRegistryServices
-    };
-
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL instantiateConfigRegistry(uno::Reference< uno::XComponentContext > const& xContext )
-    {
-        OSL_ASSERT( xContext.is() );
-        com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), com::sun::star::uno::UNO_QUERY );
-        ::cppu::OWeakObject * pNewInstance = new OConfigurationRegistry(xServiceManager);
-        return pNewInstance;
-    }
-
-    const ServiceRegistrationInfo* getConfigurationRegistryServiceInfo()
-    {
-        return getRegistrationInfo(& OConfigurationRegistry::s_aServiceInfo);
-    }
-
-//--------------------------------------------------------------------------
-OConfigurationRegistry::OConfigurationRegistry(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rORB) throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
-    :ServiceComponentImpl(&s_aServiceInfo)
-    ,m_xORB(_rORB)
-{
-    // create the configuration provider used for accessing the configuration
-    OSL_ENSURE(m_xORB.is(), "OConfigurationRegistry::OConfigurationRegistry : invalid service factory !");
-    if (m_xORB.is())
-    {
-        m_xConfigurationProvider = 
-            m_xConfigurationProvider.query(
-                m_xORB->createInstance(UNISTRING("com.sun.star.configuration.ConfigurationProvider"))
-            );
-    }
-
-    if (!m_xConfigurationProvider.is())
-    {
-        // it's heavily needed ...
-        throw com::sun::star::lang::ServiceNotRegisteredException(UNISTRING("Failed to instantiate the mandatory service com.sun.star.configuration.ConfigurationProvider."),
-            THISREF());
-    }
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Any SAL_CALL OConfigurationRegistry::queryInterface( const com::sun::star::uno::Type& _rType ) throw(com::sun::star::uno::RuntimeException)
-{
-    com::sun::star::uno::Any aReturn = ServiceComponentImpl::queryInterface(_rType);
-    if (!aReturn.hasValue())
-        aReturn = cppu::ImplHelper2< com::sun::star::registry::XSimpleRegistry,	com::sun::star::util::XFlushable >::queryInterface(_rType);
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL OConfigurationRegistry::getTypes(  ) throw(com::sun::star::uno::RuntimeException)
-{
-    return ::comphelper::concatSequences(
-        ServiceComponentImpl::getTypes(),
-        cppu::ImplHelper2< com::sun::star::registry::XSimpleRegistry,	com::sun::star::util::XFlushable >::getTypes());
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OConfigurationRegistry::getImplementationId(  ) throw(com::sun::star::uno::RuntimeException)
-{
-    static cppu::OImplementationId aId;
-    return aId.getImplementationId();
-}
-
-//--------------------------------------------------------------------------
-::rtl::OUString	OConfigurationRegistry::getNodePathFromURL(const ::rtl::OUString& _rURL)
-{
-    // TODO
-    return _rURL;
-}
-
-//--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConfigurationRegistry::getURL() throw(com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    return m_sLocation;
-}
-
-//--------------------------------------------------------------------------
-
-// Not guarded !
-void OConfigurationRegistry::implCheckOpen() throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    if (!implIsOpen())
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The registry is not bound to a configuration node."), THISREF());
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::open( const ::rtl::OUString& _rURL, sal_Bool _bReadOnly, sal_Bool /*_bCreate*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    if (implIsOpen())
-        close();
-
-    ::rtl::OUString sNodePath = getNodePathFromURL(_rURL);
-
-    if (!m_xConfigurationProvider.is())
-        throw com::sun::star::lang::DisposedException(UNISTRING("invalid object. configuration provider is already disposed."), THISREF());
-
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xNodeAccess;
-    try
-    {
-        char const * const sAccessType = _bReadOnly ?
-            "com.sun.star.configuration.ConfigurationAccess" :
-            "com.sun.star.configuration.ConfigurationUpdateAccess";
-
-        // prepare parameters for creating the config access : the node path
-        beans::PropertyValue aArgValue;
-        aArgValue.Handle = -1;
-        
-        // currently theres is one parameter: the node path
-        com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArguments(1);
-
-        aArgValue.Name = UNISTRING("nodepath");
-        aArgValue.Value <<= sNodePath;
-
-        aArguments[0] <<= aArgValue;
-
-
-        xNodeAccess = m_xConfigurationProvider->createInstanceWithArguments(UNISTRING(sAccessType), aArguments);
-    }
-    catch (com::sun::star::uno::RuntimeException&)
-    {	// allowed to leave this method
-        throw;
-    }
-    catch (com::sun::star::uno::Exception& e)
-    {	// not allowed to leave this method
-        ::rtl::OUString sMessage = UNISTRING("The configuration provider does not supply a registry access for the requested Node.");
-        sMessage += UNISTRING(" original error message of the provider : ");
-        sMessage += e.Message;
-        throw com::sun::star::registry::InvalidRegistryException(sMessage, THISREF());
-    }
-
-    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xReadRoot(xNodeAccess, com::sun::star::uno::UNO_QUERY);
-    if (!_bReadOnly)
-        m_xUpdateRoot = m_xUpdateRoot.query(xReadRoot);
-
-    if (!xReadRoot.is() || (!_bReadOnly && !m_xUpdateRoot.is()))
-        throw com::sun::star::registry::InvalidRegistryException(UNISTRING("The object supplied the by configuration provider is invalid."), THISREF());
-
-    m_xRootKey = new OConfigurationRegistryKey(xReadRoot, !_bReadOnly, OConfigurationRegistryKey::SubtreeRoot());
-    m_xSubtreeRoot = xNodeAccess;
-}
-
-//--------------------------------------------------------------------------
-sal_Bool SAL_CALL OConfigurationRegistry::isValid(  ) throw(com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    return implIsOpen();
-}
-
-//--------------------------------------------------------------------------
-sal_Bool OConfigurationRegistry::implIsOpen(  ) throw(com::sun::star::uno::RuntimeException)
-{
-    return m_xRootKey.is();
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL  OConfigurationRegistry::close(  ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-
-    com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > xRootKey(m_xRootKey);
-    m_xRootKey = NULL;
-
-    com::sun::star::uno::Reference< XComponent > xRootComponent(m_xSubtreeRoot, com::sun::star::uno::UNO_QUERY);
-    m_xSubtreeRoot = NULL;
-    m_xUpdateRoot = NULL;
-
-    m_sLocation = ::rtl::OUString();
-
-    if (xRootKey.is())
-        xRootKey->closeKey();
-
-    if (xRootComponent.is())
-        xRootComponent->dispose();
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::disposing() 
-{
-    close();
-
-    {
-        UnoApiLock aLock;
-
-        m_xConfigurationProvider.clear();
-        m_xORB.clear();
-    }
-
-    ServiceComponentImpl::disposing();
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::destroy(  ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    implCheckOpen();
-
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("This registry is a wrapper for a configuration access. It can not be destroyed."), THISREF());
-}
-
-//--------------------------------------------------------------------------
-com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > SAL_CALL OConfigurationRegistry::getRootKey(  ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    implCheckOpen();
-
-    return m_xRootKey;
-}
-
-//--------------------------------------------------------------------------
-sal_Bool SAL_CALL OConfigurationRegistry::isReadOnly(  ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    implCheckOpen();
-
-    return !m_xUpdateRoot.is();
-        // if we don't have the update root, we're readonly
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::mergeKey( const ::rtl::OUString& /*aKeyName*/, const ::rtl::OUString& /*aUrl*/ ) throw(com::sun::star::registry::InvalidRegistryException, com::sun::star::registry::MergeConflictException, com::sun::star::uno::RuntimeException)
-{
-    UnoApiLock aLock;
-    implCheckOpen();
-
-    // not supported. but we can't throw an NoSupportException here ...
-    throw com::sun::star::registry::InvalidRegistryException(UNISTRING("You can't merge into this registry. It's just a wrapper for a configuration node, which has a fixed structure which can not be modified"), THISREF());
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::flush(  ) throw(com::sun::star::uno::RuntimeException)
-{
-    {
-        UnoApiLock aLock;
-        if (m_xUpdateRoot.is())
-        {
-            try
-            {
-                m_xUpdateRoot->commitChanges();
-            }
-            catch (com::sun::star::lang::WrappedTargetException& e)
-            {	// not allowed to leave this method
-
-                ::rtl::OUString sMessage;
-                sMessage = UNISTRING("The changes made could not be committed. Orginal exception message : ");
-                sMessage += e.Message;
-
-                // TODO : the specification of XFlushable has to be changed !!!!!
-                OSL_ENSURE(sal_False, "OConfigurationRegistry::flush : caught an exception, could not flush the data !");
-    //			return;
-
-                throw com::sun::star::lang::WrappedTargetRuntimeException(sMessage, THISREF(), e.TargetException);
-            }
-        }
-    }
-
-    com::sun::star::uno::Reference< com::sun::star::util::XFlushListener > const * const pSelector = 0;
-    if (cppu::OInterfaceContainerHelper* pContainer = this->rBHelper.getContainer(::getCppuType(pSelector)) )
-    {
-        ::cppu::OInterfaceIteratorHelper aIter( *pContainer );
-
-        com::sun::star::lang::EventObject aFlushed(THISREF());
-        while (aIter.hasMoreElements())
-        try
-        {
-            static_cast< com::sun::star::util::XFlushListener* >(aIter.next())->flushed(aFlushed);
-        }
-        catch (uno::Exception & )
-        {}
-    }
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::addFlushListener( const com::sun::star::uno::Reference< com::sun::star::util::XFlushListener >& _rxListener ) throw(com::sun::star::uno::RuntimeException)
-{
-    this->rBHelper.addListener(::getCppuType(&_rxListener),_rxListener);
-}
-
-//--------------------------------------------------------------------------
-void SAL_CALL OConfigurationRegistry::removeFlushListener( const com::sun::star::uno::Reference< com::sun::star::util::XFlushListener >& _rxListener ) throw(com::sun::star::uno::RuntimeException)
-{
-    this->rBHelper.removeListener(::getCppuType(&_rxListener),_rxListener);
-}
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/registry/configregistry.hxx b/configmgr/source/registry/configregistry.hxx
deleted file mode 100644
index a682c30787..0000000000
--- a/configmgr/source/registry/configregistry.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: configregistry.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 _CONFIGMGR_REGISTRY_CONFIGREGISTRY_HXX_
-#define _CONFIGMGR_REGISTRY_CONFIGREGISTRY_HXX_
-
-#include <cppuhelper/implbase2.hxx>
-#include "confsvccomponent.hxx"
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-
-//..........................................................................
-namespace configmgr
-{
-//..........................................................................
-
-//==========================================================================
-//= OConfigurationRegistry
-//==========================================================================
-/** an object implmenting the <service scope="com.sun.star.configuration">ConfigurationRegistry</service>
-    service.
-*/
-class OConfigurationRegistry
-        :public ServiceComponentImpl
-        ,public cppu::ImplHelper2< com::sun::star::registry::XSimpleRegistry,	com::sun::star::util::XFlushable >
-{
-public:
-    static const ServiceImplementationInfo s_aServiceInfo;
-
-protected:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        m_xORB;			/// the service provider used for creating the instance
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        m_xConfigurationProvider;	/// the configuration provider used for creating configuration accesses
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > 
-                        m_xRootKey;		/// the root key for the registry-like configuration access
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-                        m_xSubtreeRoot;	/// the root of the sub tree the object wraps
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch >
-                        m_xUpdateRoot;	/// the update access to the root of the sub tree, valid if opened for writing
-    ::rtl::OUString		m_sLocation;	/// URL of the configuration node we're representing, if any
-
-
-public:
-    OConfigurationRegistry(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rORB)
-        throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
-    // XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw() { ServiceComponentImpl::acquire(); }
-    virtual void SAL_CALL release(  ) throw() { ServiceComponentImpl::release(); }
-
-    // XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    // XSimpleRegistry
-    virtual ::rtl::OUString SAL_CALL getURL() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL open( const ::rtl::OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isValid(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL close(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL destroy(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > SAL_CALL getRootKey(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL mergeKey( const ::rtl::OUString& aKeyName, const ::rtl::OUString& aUrl ) throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::MergeConflictException, ::com::sun::star::uno::RuntimeException);
-
-    // XFlushable
-    virtual void SAL_CALL flush(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw(::com::sun::star::uno::RuntimeException);
-
-protected:
-    virtual void SAL_CALL disposing();
-    /// translates the given URL into a nodepath which may be used with the configuration provider
-    ::rtl::OUString	getNodePathFromURL(const ::rtl::OUString& _rURL);
-
-    void implCheckOpen() throw(::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::uno::RuntimeException);
-
-    sal_Bool implIsOpen()
-        throw (::com::sun::star::uno::RuntimeException);
-};
-
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-#endif // _CONFIGMGR_REGISTRY_CONFIGREGISTRY_HXX_
-
-
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
new file mode 100644
index 0000000000..f8ccc6a315
--- /dev/null
+++ b/configmgr/source/rootaccess.cxx
@@ -0,0 +1,319 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <vector>
+
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/ChangesEvent.hpp"
+#include "com/sun/star/util/ChangesSet.hpp"
+#include "com/sun/star/util/ElementChange.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XChangesListener.hpp"
+#include "com/sun/star/util/XChangesNotifier.hpp"
+#include "comphelper/sequenceasvector.hxx"
+#include "cppu/unotype.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "osl/mutex.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "broadcaster.hxx"
+#include "childaccess.hxx"
+#include "components.hxx"
+#include "data.hxx"
+#include "lock.hxx"
+#include "modifications.hxx"
+#include "node.hxx"
+#include "path.hxx"
+#include "rootaccess.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+RootAccess::RootAccess(
+    Components & components, rtl::OUString const & pathRepresentation,
+    rtl::OUString const & locale, bool update):
+    Access(components), pathRepresentation_(pathRepresentation),
+    locale_(locale), update_(update)
+{}
+
+Path RootAccess::getAbsolutePath() {
+    getNode();
+    return path_;
+}
+
+void RootAccess::initBroadcaster(
+    Modifications::Node const & modifications, Broadcaster * broadcaster)
+{
+    OSL_ASSERT(broadcaster != 0);
+    comphelper::SequenceAsVector< css::util::ElementChange > changes;
+    initBroadcasterAndChanges(
+        modifications, broadcaster, changesListeners_.empty() ? 0 : &changes);
+    if (!changes.empty()) {
+        css::util::ChangesSet set(changes.getAsConstList());
+        for (ChangesListeners::iterator i(changesListeners_.begin());
+             i != changesListeners_.end(); ++i)
+        {
+            broadcaster->addChangesNotification(
+                *i,
+                css::util::ChangesEvent(
+                    static_cast< cppu::OWeakObject * >(this),
+                    css::uno::makeAny(pathRepresentation_), set));
+        }
+    }
+}
+
+void RootAccess::acquire() throw () {
+    Access::acquire();
+}
+
+void RootAccess::release() throw () {
+    Access::release();
+}
+
+rtl::OUString RootAccess::getLocale() const {
+    return locale_;
+}
+
+bool RootAccess::isUpdate() const {
+    return update_;
+}
+
+RootAccess::~RootAccess() {
+    osl::MutexGuard g(lock);
+    getComponents().removeRootAccess(this);
+}
+
+Path RootAccess::getRelativePath() {
+    return Path();
+}
+
+rtl::OUString RootAccess::getRelativePathRepresentation() {
+    return rtl::OUString();
+}
+
+rtl::Reference< Node > RootAccess::getNode() {
+    if (!node_.is()) {
+        int finalizedLayer;
+        node_ = getComponents().resolvePathRepresentation(
+            pathRepresentation_, &path_, &finalizedLayer);
+        if (!node_.is()) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot find ")) +
+                 pathRepresentation_),
+                0);
+                // RootAccess::queryInterface indirectly calls
+                // RootAccess::getNode, so if this RootAccess were passed out in
+                // RuntimeException.Context, client code that called
+                // queryInterface on it would cause trouble; therefore,
+                // RuntimeException.Context is left null here
+        }
+        OSL_ASSERT(!path_.empty());
+        name_ = path_.back();
+        finalized_ = finalizedLayer != Data::NO_LAYER;
+    }
+    return node_;
+}
+
+bool RootAccess::isFinalized() {
+    getNode();
+    return finalized_;
+}
+
+rtl::OUString RootAccess::getNameInternal() {
+    getNode();
+    return name_;
+}
+
+rtl::Reference< RootAccess > RootAccess::getRootAccess() {
+    return this;
+}
+
+rtl::Reference< Access > RootAccess::getParentAccess() {
+    return rtl::Reference< Access >();
+}
+
+void RootAccess::addTypes(std::vector< css::uno::Type > * types) const {
+    OSL_ASSERT(types != 0);
+    types->push_back(cppu::UnoType< css::util::XChangesNotifier >::get());
+    types->push_back(cppu::UnoType< css::util::XChangesBatch >::get());
+}
+
+void RootAccess::addSupportedServiceNames(
+    std::vector< rtl::OUString > * services)
+{
+    OSL_ASSERT(services != 0);
+    services->push_back(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.AccessRootElement")));
+    if (update_) {
+        services->push_back(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.UpdateRootElement")));
+    }
+}
+
+void RootAccess::initDisposeBroadcaster(Broadcaster * broadcaster) {
+    OSL_ASSERT(broadcaster != 0);
+    for (ChangesListeners::iterator i(changesListeners_.begin());
+         i != changesListeners_.end(); ++i)
+    {
+        broadcaster->addDisposeNotification(
+            i->get(),
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    }
+    Access::initDisposeBroadcaster(broadcaster);
+}
+
+void RootAccess::clearListeners() throw() {
+    changesListeners_.clear();
+    Access::clearListeners();
+}
+
+css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    css::uno::Any res(Access::queryInterface(aType));
+    if (res.hasValue()) {
+        return res;
+    }
+    res = cppu::queryInterface(
+        aType, static_cast< css::util::XChangesNotifier * >(this));
+    if (res.hasValue()) {
+        return res;
+    }
+    if (!res.hasValue() && update_) {
+        res = cppu::queryInterface(
+            aType, static_cast< css::util::XChangesBatch * >(this));
+    }
+    return res;
+}
+
+void RootAccess::addChangesListener(
+    css::uno::Reference< css::util::XChangesListener > const & aListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        if (!aListener.is()) {
+            throw css::uno::RuntimeException(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+                static_cast< cppu::OWeakObject * >(this));
+        }
+        if (!isDisposed()) {
+            changesListeners_.insert(aListener);
+            return;
+        }
+    }
+    try {
+        aListener->disposing(
+            css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
+    } catch (css::lang::DisposedException &) {}
+}
+
+void RootAccess::removeChangesListener(
+    css::uno::Reference< css::util::XChangesListener > const & aListener)
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_ANY));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    ChangesListeners::iterator i(changesListeners_.find(aListener));
+    if (i != changesListeners_.end()) {
+        changesListeners_.erase(i);
+    }
+}
+
+void RootAccess::commitChanges()
+    throw (css::lang::WrappedTargetException, css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_UPDATE));
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        checkLocalizedPropertyAccess();
+        int finalizedLayer;
+        Modifications globalMods;
+        commitChildChanges(
+            ((getComponents().resolvePathRepresentation(
+                  pathRepresentation_, 0, &finalizedLayer)
+              == node_) &&
+             finalizedLayer == Data::NO_LAYER),
+            &globalMods);
+        getComponents().writeModifications();
+        getComponents().initGlobalBroadcaster(globalMods, this, &bc);
+    }
+    bc.send();
+}
+
+sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
+    OSL_ASSERT(thisIs(IS_UPDATE));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    //TODO: Optimize:
+    std::vector< css::util::ElementChange > changes;
+    reportChildChanges(&changes);
+    return !changes.empty();
+}
+
+css::util::ChangesSet RootAccess::getPendingChanges()
+    throw (css::uno::RuntimeException)
+{
+    OSL_ASSERT(thisIs(IS_UPDATE));
+    osl::MutexGuard g(lock);
+    checkLocalizedPropertyAccess();
+    comphelper::SequenceAsVector< css::util::ElementChange > changes;
+    reportChildChanges(&changes);
+    return changes.getAsConstList();
+}
+
+}
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
new file mode 100644
index 0000000000..45d4193d70
--- /dev/null
+++ b/configmgr/source/rootaccess.hxx
@@ -0,0 +1,155 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_ROOTACCESS_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_ROOTACCESS_HXX
+
+#include "sal/config.h"
+
+#include <set>
+#include <vector>
+
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/util/ChangesSet.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XChangesNotifier.hpp"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "access.hxx"
+#include "modifications.hxx"
+#include "path.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class Any;
+        class Type;
+    }
+    namespace util { class XChangesListener; }
+} } }
+
+namespace configmgr {
+
+class Broadcaster;
+class Components;
+class Node;
+
+class RootAccess:
+    public Access, public com::sun::star::util::XChangesNotifier,
+    public com::sun::star::util::XChangesBatch
+{
+public:
+    RootAccess(
+        Components & components, rtl::OUString const & pathRepresenation,
+        rtl::OUString const & locale, bool update);
+
+    virtual Path getAbsolutePath();
+
+    virtual void initBroadcaster(
+        Modifications::Node const & modifications, Broadcaster * broadcaster);
+
+    virtual void SAL_CALL acquire() throw ();
+
+    virtual void SAL_CALL release() throw ();
+
+    rtl::OUString getLocale() const;
+
+    bool isUpdate() const;
+
+private:
+    virtual ~RootAccess();
+
+    virtual Path getRelativePath();
+
+    virtual rtl::OUString getRelativePathRepresentation();
+
+    virtual rtl::Reference< Node > getNode();
+
+    virtual bool isFinalized();
+
+    virtual rtl::OUString getNameInternal();
+
+    virtual rtl::Reference< RootAccess > getRootAccess();
+
+    virtual rtl::Reference< Access > getParentAccess();
+
+    virtual void addTypes(std::vector< com::sun::star::uno::Type > * types)
+        const;
+
+    virtual void addSupportedServiceNames(
+        std::vector< rtl::OUString > * services);
+
+    virtual void initDisposeBroadcaster(Broadcaster * broadcaster);
+
+    virtual void clearListeners() throw ();
+
+    virtual com::sun::star::uno::Any SAL_CALL queryInterface(
+        com::sun::star::uno::Type const & aType)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addChangesListener(
+        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
+            const & aListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL removeChangesListener(
+        com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
+            const & aListener)
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL commitChanges()
+        throw (
+            com::sun::star::lang::WrappedTargetException,
+            com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL hasPendingChanges()
+        throw (com::sun::star::uno::RuntimeException);
+
+    virtual com::sun::star::util::ChangesSet SAL_CALL getPendingChanges()
+        throw (com::sun::star::uno::RuntimeException);
+
+    typedef
+        std::multiset<
+            com::sun::star::uno::Reference<
+                com::sun::star::util::XChangesListener > >
+        ChangesListeners;
+
+    rtl::OUString pathRepresentation_;
+    rtl::OUString locale_;
+    bool update_;
+    Path path_;
+    rtl::Reference< Node > node_;
+    rtl::OUString name_;
+    bool finalized_;
+    ChangesListeners changesListeners_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
new file mode 100644
index 0000000000..3a009b3cee
--- /dev/null
+++ b/configmgr/source/services.cxx
@@ -0,0 +1,118 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/implementationentry.hxx"
+#include "osl/diagnose.h"
+#include "uno/lbnames.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "configurationprovider.hxx"
+#include "configurationregistry.hxx"
+#include "defaultprovider.hxx"
+
+namespace {
+
+namespace css = com::sun::star;
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
+    css::uno::Reference< css::uno::XComponentContext > const &)
+    SAL_THROW((css::uno::Exception))
+{
+    OSL_ASSERT(false);
+    return css::uno::Reference< css::uno::XInterface >();
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &dummy, &configmgr::configuration_provider::getImplementationName,
+      &configmgr::configuration_provider::getSupportedServiceNames,
+      &configmgr::configuration_provider::createFactory, 0, 0 },
+    { &dummy, &configmgr::default_provider::getImplementationName,
+      &configmgr::default_provider::getSupportedServiceNames,
+      &configmgr::default_provider::createFactory, 0, 0 },
+    { &dummy, &configmgr::configuration_registry::getImplementationName,
+      &configmgr::configuration_registry::getSupportedServiceNames,
+      &configmgr::configuration_registry::createFactory, 0, 0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) {
+        return false;
+    }
+    try {
+        css::uno::Reference< css::registry::XRegistryKey >(
+            (css::uno::Reference< css::registry::XRegistryKey >(
+                static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
+             createKey(
+                 rtl::OUString(
+                     RTL_CONSTASCII_USTRINGPARAM(
+                         "/com.sun.star.comp.configuration.DefaultProvider/UNO/"
+                         "SINGLETONS/"
+                         "com.sun.star.configuration.theDefaultProvider")))),
+            css::uno::UNO_SET_THROW)->
+            setStringValue(
+                rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.DefaultProvider")));
+    } catch (css::uno::Exception & e) {
+        (void) e;
+        OSL_TRACE(
+            "configmgr component_writeInfo exception: %s",
+            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        return false;
+    }
+    return true;
+}
diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx
new file mode 100644
index 0000000000..f19c36c0bb
--- /dev/null
+++ b/configmgr/source/setnode.cxx
@@ -0,0 +1,126 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "data.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "setnode.hxx"
+
+namespace configmgr {
+
+namespace {
+
+// Work around some compilers' failure to accept
+// std::binder1st(std::ptr_fun(&Data::equalTemplateNames), ...):
+class EqualTemplateNames:
+    public std::unary_function< rtl::OUString const &, bool >
+{
+public:
+    inline explicit EqualTemplateNames(rtl::OUString const & shortName):
+        shortName_(shortName) {}
+
+    inline bool operator ()(rtl::OUString const & longName) const
+    { return Data::equalTemplateNames(shortName_, longName); }
+
+private:
+    rtl::OUString const & shortName_;
+};
+
+}
+
+SetNode::SetNode(
+    int layer, rtl::OUString const & defaultTemplateName,
+    rtl::OUString const & templateName):
+    Node(layer), defaultTemplateName_(defaultTemplateName),
+    templateName_(templateName), mandatory_(Data::NO_LAYER)
+{}
+
+rtl::Reference< Node > SetNode::clone() const {
+    return new SetNode(*this);
+}
+
+NodeMap & SetNode::getMembers() {
+    return members_;
+}
+
+rtl::OUString SetNode::getTemplateName() const {
+    return templateName_;
+}
+
+void SetNode::setMandatory(int layer) {
+    mandatory_ = layer;
+}
+
+int SetNode::getMandatory() const {
+    return mandatory_;
+}
+
+rtl::OUString const & SetNode::getDefaultTemplateName() const {
+    return defaultTemplateName_;
+}
+
+std::vector< rtl::OUString > & SetNode::getAdditionalTemplateNames() {
+    return additionalTemplateNames_;
+}
+
+bool SetNode::isValidTemplate(rtl::OUString const & templateName) const {
+    return Data::equalTemplateNames(templateName, defaultTemplateName_) ||
+        (std::find_if(
+            additionalTemplateNames_.begin(),
+            additionalTemplateNames_.end(), EqualTemplateNames(templateName)) !=
+         additionalTemplateNames_.end());
+}
+
+SetNode::SetNode(SetNode const & other):
+    Node(other), defaultTemplateName_(other.defaultTemplateName_),
+    additionalTemplateNames_(other.additionalTemplateNames_),
+    templateName_(other.templateName_), mandatory_(other.mandatory_)
+{
+    cloneNodeMap(other.members_, &members_);
+}
+
+SetNode::~SetNode() {}
+
+Node::Kind SetNode::kind() const {
+    return KIND_SET;
+}
+
+void SetNode::clear() {
+    members_.clear();
+}
+
+}
diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx
new file mode 100644
index 0000000000..7bf1ab0a19
--- /dev/null
+++ b/configmgr/source/setnode.hxx
@@ -0,0 +1,84 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_SETNODE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_SETNODE_HXX
+
+#include "sal/config.h"
+
+#include <vector>
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "node.hxx"
+#include "nodemap.hxx"
+
+namespace configmgr {
+
+class SetNode: public Node {
+public:
+    SetNode(
+        int layer, rtl::OUString const & defaultTemplateName,
+        rtl::OUString const & templateName);
+
+    virtual rtl::Reference< Node > clone() const;
+
+    virtual NodeMap & getMembers();
+
+    virtual rtl::OUString getTemplateName() const;
+
+    virtual void setMandatory(int layer);
+
+    virtual int getMandatory() const;
+
+    rtl::OUString const & getDefaultTemplateName() const;
+
+    std::vector< rtl::OUString > & getAdditionalTemplateNames();
+
+    bool isValidTemplate(rtl::OUString const & templateName) const;
+
+private:
+    SetNode(SetNode const & other);
+
+    virtual ~SetNode();
+
+    virtual Kind kind() const;
+
+    virtual void clear();
+
+    rtl::OUString defaultTemplateName_;
+    std::vector< rtl::OUString > additionalTemplateNames_;
+    NodeMap members_;
+    rtl::OUString templateName_;
+        // non-empty iff this node is a template, free node, or set member
+    int mandatory_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/span.hxx b/configmgr/source/span.hxx
new file mode 100644
index 0000000000..6896186137
--- /dev/null
+++ b/configmgr/source/span.hxx
@@ -0,0 +1,64 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_SPAN_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_SPAN_HXX
+
+#include "sal/config.h"
+
+#include "rtl/string.h"
+#include "sal/types.h"
+
+namespace configmgr {
+
+struct Span {
+    char const * begin;
+    sal_Int32 length;
+
+    inline Span(): begin(0), length(0) {}
+        // init length to avoid compiler warnings
+
+    inline Span(char const * theBegin, sal_Int32 theLength):
+        begin(theBegin), length(theLength) {}
+
+    inline void clear() throw() { begin = 0; }
+
+    inline bool is() const { return begin != 0; }
+
+    inline bool equals(Span const & text) const {
+        return rtl_str_compare_WithLength(
+            begin, length, text.begin, text.length) == 0;
+    }
+
+    inline bool equals(char const * textBegin, sal_Int32 textLength) const {
+        return equals(Span(textBegin, textLength));
+    }
+};
+
+}
+
+#endif
diff --git a/configmgr/source/tree/builddata.cxx b/configmgr/source/tree/builddata.cxx
deleted file mode 100644
index 46c8ac3883..0000000000
--- a/configmgr/source/tree/builddata.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: builddata.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_configmgr.hxx"
-
-#include "sal/types.h"
-
-#include "builddata.hxx"
-#include "nodevisitor.hxx"
-#include "node.hxx"
-#include "treefragment.hxx"
-#include "valuenode.hxx"
-#include "treenodefactory.hxx"
-#include "utility.hxx"
-
-#ifndef INCLUDED_CSTDDEF
-#include <cstddef>
-#define INCLUDED_CSTDDEF
-#endif
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#include <vector>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace data
-    {
-//-----------------------------------------------------------------------------
-
-    static 
-    inline
-    sharable::Node * offsetNodeBy(sharable::Node * _aNode, sal_uInt16 _nOffset)
-    {
-        sharable::Node *pNode = _aNode;
-        pNode += _nOffset;
-        return (sharable::Node *)(pNode);
-    }
-
-    static 
-    inline
-    sharable::Node * addressOfNodeAt(sharable::TreeFragment * _aTree, sal_uInt16 _nOffset)
-    {
-        sharable::TreeFragment *pRaw = _aTree;
-        return &pRaw->nodes[_nOffset];
-    }
-
-//-----------------------------------------------------------------------------
-
-    class TreeNodeBuilder
-    {
-        sharable::TreeFragmentHeader  m_header;
-        std::vector< sharable::Node > m_nodes;
-        sal_uInt16              m_parent;
-    public:
-        TreeNodeBuilder() : m_header(), m_nodes(), m_parent() {}
-
-        sharable::TreeFragmentHeader & header() { return m_header; }
-
-        sharable::Node &      nodeAt(sal_uInt16 _pos)     { checkOffset(_pos); return m_nodes[_pos]; }
-        sharable::NodeInfo &  nodeInfoAt(sal_uInt16 _pos) { checkOffset(_pos); return m_nodes[_pos].info; }
-
-        sharable::Node &      lastNode()     { checkOffset(0); return m_nodes.back(); }
-        sharable::NodeInfo &  lastNodeInfo() { checkOffset(0); return m_nodes.back().info; }
-
-        void resetTreeFragment(rtl_uString * _treeName, sal_uInt8 _state);
-
-        sharable::TreeFragment * createTreeFragment();
-
-        sal_uInt16  startGroup( rtl_uString * _aName, sal_uInt8 _aFlags ); 
-        void    endGroup( sal_uInt16 _nPos ); 
-
-        void    addSet( rtl_uString * _aName, sal_uInt8 _aFlags, sal_uInt8 * _aElementType ); 
-
-        void    addValue( rtl_uString * _aName, sal_uInt8 _aFlags, 
-                            sal_uInt8 _aValueType, 
-                            sharable::AnyData _aUserValue, 
-                            sharable::AnyData _aDefaultName ); 
-    public: 
-        class CollectSetElements;
-        class LinkSetNodes;
-
-    private: 
-    sharable::TreeFragment * allocTreeFragment();
-        void linkTreeFragment(sharable::TreeFragment * _aTreeAddr);
-
-        sal_uInt16 addNode(rtl_uString * _aName, sal_uInt8 _aFlags, sal_uInt8 _aType);
-        void checkOffset(sal_uInt16 _pos);
-    };
-//-----------------------------------------------------------------------------
-
-    class TreeNodeBuilder::CollectSetElements
-    {
-        sharable::TreeFragment *         m_head;
-    public:
-        explicit
-        CollectSetElements() : m_head(NULL) {}
-
-        void resetElementList();
-        void addElement(sharable::TreeFragment * _aNewElement);
-        sharable::TreeFragment * getElementListAndClear();
-    };
-//-----------------------------------------------------------------------------
-
-    class TreeNodeBuilder::LinkSetNodes: private SetVisitor {
-        sharable::Node * m_parent;
-    public:
-        LinkSetNodes(): m_parent(0) {}
-
-        void linkTree(sharable::TreeFragment * tree);
-
-    private:
-        using SetVisitor::handle;
-
-        virtual bool handle(sharable::SetNode * node);
-
-        virtual bool handle(sharable::TreeFragment * tree);
-    };
-//-----------------------------------------------------------------------------
-
-    class BasicDataTreeBuilder
-    {
-    public:
-        explicit
-        BasicDataTreeBuilder() {}
-
-        sharable::TreeFragment * createTree() { return m_builder.createTreeFragment(); }
-
-    protected:
-        TreeNodeBuilder&    builder()         { return m_builder; }
-    private:
-        TreeNodeBuilder     m_builder;
-    };
-//-----------------------------------------------------------------------------
-
-    class ConvertingDataTreeBuilder : private NodeAction, public BasicDataTreeBuilder
-    {
-        rtl::OUString m_sRootName;
-        bool m_bWithDefaults;
-    public:
-        explicit
-        ConvertingDataTreeBuilder() : BasicDataTreeBuilder() {}
-        
-        sharable::TreeFragment * buildTree(rtl::OUString const & _aTreeName, INode const& _aNode, bool _bWithDefault);
-        sharable::TreeFragment * buildElement(INode const& _aNode, rtl::OUString const & _aTypeName, bool _bWithDefault);
-    private:
-        class ElementListBuilder;
-
-        virtual void handle(ISubtree  const & _aNode);
-        virtual void handle(ValueNode const & _aNode);
-
-        sal_uInt8 * makeTemplateData(rtl::OUString const & _aTemplateName, rtl::OUString const & _aTemplateModule);
-
-        rtl_uString * allocName(INode const & _aNode);
-        sal_uInt8 makeState(node::Attributes const & _aAttributes);
-        sal_uInt8 makeFlags(node::Attributes const & _aAttributes);
-    };
-//-----------------------------------------------------------------------------
-
-    class ConvertingDataTreeBuilder::ElementListBuilder : private NodeAction
-    {
-        TreeNodeBuilder::CollectSetElements m_aCollector;
-
-        rtl::OUString   m_sTypeName;
-        bool            m_bWithDefaults;
-    public:
-        explicit
-        ElementListBuilder()
-        : m_aCollector()
-        , m_sTypeName()
-        , m_bWithDefaults()
-        {}
-
-        sharable::TreeFragment *buildElementList(ISubtree const & _aSet, bool _bWithDefaults);
-    private:
-        void handleNode(INode const & _aSourceNode);
-
-        void handle(ValueNode const & _aSourceNode);
-        void handle(ISubtree  const & _aSourceNode);
-    };
-//-----------------------------------------------------------------------------
-
-    class CopyingDataTreeBuilder : private NodeVisitor, public BasicDataTreeBuilder
-    {
-    public:
-        explicit
-        CopyingDataTreeBuilder() : BasicDataTreeBuilder() {}
-        
-        sharable::TreeFragment * buildTree(sharable::TreeFragment * sourceTree);
-
-    private:
-        class ElementListBuilder;
-
-        using NodeVisitor::handle;
-        virtual bool handle(sharable::ValueNode * node);
-        virtual bool handle(sharable::GroupNode * node);
-        virtual bool handle(sharable::SetNode * node);
-
-        sal_uInt8 * makeTemplateData(sal_uInt8 * _aSourceTemplate);
-    };
-//-----------------------------------------------------------------------------
-
-    class CopyingDataTreeBuilder::ElementListBuilder : private SetVisitor
-    {
-        TreeNodeBuilder::CollectSetElements m_aCollector;
-    public:
-        explicit
-        ElementListBuilder() : m_aCollector() {}
-
-        sharable::TreeFragment * buildElementList(sharable::SetNode * set);
-
-    private:
-        using SetVisitor::handle;
-        virtual bool handle(sharable::TreeFragment * tree);
-    };
-//-----------------------------------------------------------------------------
-
-    class ConvertingNodeBuilder : private NodeVisitor
-    {
-        OTreeNodeFactory &  m_rNodeFactory;
-
-        std::auto_ptr<INode> m_pNode;
-    public:
-        ConvertingNodeBuilder(OTreeNodeFactory & _rNodeFactory)
-        : m_rNodeFactory(_rNodeFactory)
-        , m_pNode()
-        {
-        }
-
-        std::auto_ptr<INode>        buildNode(sharable::TreeFragment * tree, bool _bUseTreeName);
-        std::auto_ptr<INode>        buildNode(sharable::Node * tree);
-
-        std::auto_ptr<ISubtree>     buildNodeTree(sharable::GroupNode * groupNode) const;
-        std::auto_ptr<ISubtree>     buildNodeTree(sharable::SetNode * setNode) const;
-        std::auto_ptr<ValueNode>   buildNodeTree(sharable::ValueNode * valueNode) const
-        { return convertNode(valueNode); }
-
-        static node::Attributes convertAttributes(sharable::Node * node)
-        { return node->getAttributes(); }
-
-    private:
-        std::auto_ptr<ISubtree>     convertNode(sharable::GroupNode * groupNode) const;
-        std::auto_ptr<ISubtree>     convertNode(sharable::SetNode * setNode) const;
-        std::auto_ptr<ValueNode>   convertNode(sharable::ValueNode * valueNode) const;
-
-        using NodeVisitor::handle;
-        virtual bool handle(sharable::ValueNode * node);
-        virtual bool handle(sharable::GroupNode * node);
-        virtual bool handle(sharable::SetNode * node);
-    };
-//-----------------------------------------------------------------------------
-
-    class ConvertingSubnodeBuilder : private SetVisitor
-    {
-        ConvertingNodeBuilder   m_aSubnodeBuilder;
-        ISubtree &              m_rParentNode;
-    public:
-        ConvertingSubnodeBuilder(OTreeNodeFactory & _rNodeFactory, ISubtree & _rParentNode)
-        : m_aSubnodeBuilder(_rNodeFactory)
-        , m_rParentNode(_rParentNode)
-        {
-        }
-
-        void addElements(sharable::SetNode * set) { visitElements(set); }
-        void addChildren(sharable::GroupNode * group) { visitChildren(group); }
-
-    private:
-        using SetVisitor::handle;
-        virtual bool handle(sharable::Node * node);
-        virtual bool handle(sharable::TreeFragment * tree);
-    };
-//-----------------------------------------------------------------------------
-
-    class DataTreeDefaultMerger : private NodeAction
-    {
-    public:
-        explicit
-        DataTreeDefaultMerger() {}
-
-        void mergeDefaults(sharable::TreeFragment * _aBaseAddress, INode const& _aDefaultNode);
-    private:
-        void handle(ValueNode const & _aNode);
-        void handle(ISubtree  const & _aNode);
-    };
-
-//-----------------------------------------------------------------------------
-
-    class DataTreeCleanup
-    {
-    public:
-        explicit
-        DataTreeCleanup() {}
-
-        sharable::TreeFragment * destroyTree(sharable::TreeFragment * _aBaseAddress);
-    private:
-        void destroyNode(sharable::Node * _aNodeAddress);
-
-        void destroyData(sharable::TreeFragmentHeader * _pHeader);
-        void destroyData(sharable::NodeInfo  * _pNodeInfo);
-
-        void destroyData(sharable::GroupNode * _pNode);
-        void destroyData(sharable::ValueNode * _pNode);
-        void destroyData(sharable::SetNode   * _pNode);
-    };
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * buildTree(sharable::TreeFragment * tree)
-{
-    return CopyingDataTreeBuilder().buildTree(tree);
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * buildTree(rtl::OUString const & _aTreeName, INode const& _aNode, bool _bWithDefaults)
-{
-    ConvertingDataTreeBuilder aBuilder;
-
-    sharable::TreeFragment * aResult = aBuilder.buildTree(_aTreeName, _aNode,_bWithDefaults);
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * buildElementTree(INode const& _aNode, rtl::OUString const & _aTypeName, bool _bWithDefaults)
-{
-    ConvertingDataTreeBuilder aBuilder;
-
-    sharable::TreeFragment * aResult = aBuilder.buildElement(_aNode, _aTypeName, _bWithDefaults);
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
- 
-void mergeDefaults(sharable::TreeFragment * _aBaseAddress, INode const& _aDefaultNode)
-{
-    DataTreeDefaultMerger aMergeHelper;
-
-    aMergeHelper.mergeDefaults(_aBaseAddress, _aDefaultNode);
-}
-//-----------------------------------------------------------------------------
-
-void destroyTree(sharable::TreeFragment * _aBaseAddress)
-{
-    DataTreeCleanup aCleaner;
-
-    aCleaner.destroyTree(_aBaseAddress);
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<INode> convertTree(sharable::TreeFragment * tree, bool _bUseTreeName)
-{
-    ConvertingNodeBuilder aBuilder( configmgr::getDefaultTreeNodeFactory() );
-
-    return aBuilder.buildNode(tree, _bUseTreeName);
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-inline 
-void TreeNodeBuilder::CollectSetElements::resetElementList()
-{
-    OSL_ENSURE(m_head == NULL, "Joining to a element list that was forgotten");
-}
-//-----------------------------------------------------------------------------
-
-inline 
-sharable::TreeFragment * TreeNodeBuilder::CollectSetElements::getElementListAndClear()
-{
-    sharable::TreeFragment * aResult = m_head;
-    m_head = NULL;
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::CollectSetElements::addElement(sharable::TreeFragment * _aNewElement)
-{
-    if (sharable::TreeFragment * pNewFragment = _aNewElement)
-    {
-        pNewFragment->header.parent = 0; // data not available here
-        pNewFragment->header.next   = m_head;
-
-        m_head = _aNewElement;
-    }
-    else
-        OSL_ENSURE(false, "Cannot add NULL element");
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::LinkSetNodes::linkTree(sharable::TreeFragment * tree) {
-    sharable::Node * old = m_parent;
-    m_parent = 0;
-    sal_uInt16 n = tree->header.count;
-    for (sal_uInt16 i = 0; i < n; ++i) {
-        if (visitNode(tree->nodes + i)) {
-            break;
-        }
-    }
-    m_parent = old;
-}
-
-bool TreeNodeBuilder::LinkSetNodes::handle(sharable::SetNode * node)
-{
-    OSL_ASSERT(m_parent == 0);
-    m_parent = sharable::node(node);
-    bool done = visitElements(node);
-    m_parent = 0;
-    return done;
-}
-
-bool TreeNodeBuilder::LinkSetNodes::handle(sharable::TreeFragment * tree)
-{
-    OSL_ASSERT(m_parent != 0);
-    tree->header.parent = m_parent;
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-
-inline void TreeNodeBuilder::checkOffset(sal_uInt16 _pos)
-{
-    { (void)_pos; }
-    OSL_ENSURE(_pos < m_nodes.size(), "TreeNodeBuilder: Node access past end.");
-}
-//-----------------------------------------------------------------------------
-       
-sal_uInt16 TreeNodeBuilder::addNode(rtl_uString * _aName, sal_uInt8 _aFlags, sal_uInt8 _aType)
-{
-    OSL_PRECOND(_aName, "TreeNodeBuilder: Unexpected NULL name");
-
-    // TODO: consistencý checks for flags
-    OSL_ENSURE(m_nodes.size() == m_header.count, "TreeNodeBuilder: node count mismatch");
-
-    sal_uInt16 nNewOffset = m_header.count++;
-
-    m_nodes.push_back( sharable::Node() );
-
-    OSL_ASSERT( &lastNode() == &nodeAt(nNewOffset) );
-
-    sharable::NodeInfo & rInfo = lastNode().info;
-
-    rInfo.name  = _aName;
-    rInfo.flags = _aFlags;
-    rInfo.type  = _aType;
-
-    OSL_ENSURE( m_parent <= nNewOffset, "ERROR - TreeNodeBuilder: invalid parent");
-    OSL_ENSURE( (nNewOffset == 0) == (nNewOffset == m_parent), "ERROR - TreeNodeBuilder: node is own parent");
-
-    rInfo.parent = nNewOffset - m_parent;
-
-    return nNewOffset;
-}
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::resetTreeFragment(rtl_uString * _name, sal_uInt8 _state)
-{
-    m_header.next = 0;
-    m_header.name  = _name;
-
-    m_header.parent = 0;
-
-    m_header.count = 0;
-    m_header.state = _state;
-    
-    m_nodes.clear();
-    m_parent = 0;
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * TreeNodeBuilder::allocTreeFragment()
-{
-    OSL_ENSURE(m_nodes.size() == m_header.count, "TreeNodeBuilder: node count mismatch");
-
-    sharable::TreeFragment *pFragment = sharable::TreeFragment::allocate(m_header.count);
-    pFragment->header = m_header;
-    std::copy(m_nodes.begin(),m_nodes.end(),pFragment->nodes);
-
-    return (sharable::TreeFragment *)( pFragment );
-}
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::linkTreeFragment(sharable::TreeFragment * _aTreeFragment)
-{
-    LinkSetNodes().linkTree(_aTreeFragment);
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * TreeNodeBuilder::createTreeFragment()
-{
-    sharable::TreeFragment * aResult = allocTreeFragment();
-
-    if (aResult != NULL)
-    {
-        linkTreeFragment(aResult);
-
-        m_nodes.clear(); // ownership of indirect data has gone ...
-    }
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-sal_uInt16  TreeNodeBuilder::startGroup( rtl_uString * _aName, sal_uInt8 _aFlags )
-{
-    sal_uInt16 nNewIndex = addNode(_aName,_aFlags,Type::nodetype_group);
-
-    lastNode().group.numDescendants = 0;
-
-    m_parent = nNewIndex;
-
-    return nNewIndex;
-}
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::endGroup( sal_uInt16 _nPos )
-{
-    // while (_nPos < m_parent) endGroup(m_parent);
-    OSL_PRECOND(_nPos == m_parent, "TreeNodeBuilder: Group being closed is not the current parent");
-
-    OSL_ENSURE(nodeAt(_nPos).isGroup(), "TreeNodeBuilder: Group being closed is not a group");
-
-    OSL_ENSURE(m_nodes.size() == m_header.count, "TreeNodeBuilder: node count mismatch");
-
-    sharable::GroupNode & rGroup = nodeAt(_nPos).group;
-
-    rGroup.numDescendants = sal_uInt16( m_nodes.size() - static_cast< ::std::size_t >(_nPos) - 1 );
-    m_parent = m_parent - rGroup.info.parent;
-}
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::addSet( rtl_uString * _aName, sal_uInt8 _aFlags, sal_uInt8 * _aElementType ) 
-{
-    addNode(_aName,_aFlags,Type::nodetype_set);
-
-    lastNode().set.elementType  = _aElementType;
-    lastNode().set.elements     = 0;
-}    
-
-//-----------------------------------------------------------------------------
-
-void TreeNodeBuilder::addValue( rtl_uString * _aName, sal_uInt8 _aFlags, 
-                                sal_uInt8 _aValueType, 
-                                sharable::AnyData _aUserValue, 
-                                sharable::AnyData _aDefaultValue )
-{
-    OSL_PRECOND(_aValueType == (_aValueType & Type::mask_valuetype), "TreeNodeBuilder: invalid value type");
-
-    addNode(_aName,_aFlags,sal_uInt8(Type::nodetype_value | _aValueType));
-
-    lastNode().value.value          = _aUserValue;
-    lastNode().value.defaultValue   = _aDefaultValue;
-}
-//-----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * CopyingDataTreeBuilder::buildTree(sharable::TreeFragment * sourceTree)
-{
-    OSL_ENSURE(sourceTree != 0, "Trying to build a tree from  NULL data");
-
-    rtl_uString * aTreeName = acquireString( sourceTree->getName());
-    this->builder().resetTreeFragment(aTreeName, sourceTree->header.state);
-    
-    this->visitNode(sourceTree->getRootNode());
-
-    return this->createTree();
-}
-//-----------------------------------------------------------------------------
-    
-bool CopyingDataTreeBuilder::handle(sharable::ValueNode * node)
-{
-    rtl_uString * aNodeName = acquireString( node->info.getName());
-    sal_uInt8 aFlags = node->info.flags;
-
-    sal_uInt8 aType = sal_uInt8( node->info.type & Type::mask_valuetype );
-
-    sharable::AnyData aNewValue, aNewDefault;
-    if (aFlags & Flags::valueAvailable)   
-        aNewValue = sharable::allocData(aType, node->getUserValue());
-    else
-        aNewValue.data = 0;
-
-    if (aFlags & Flags::defaultAvailable)   
-        aNewDefault = sharable::allocData(aType, node->getDefaultValue());
-    else
-        aNewDefault.data = 0;
-    
-    this->builder().addValue(aNodeName,aFlags,aType,aNewValue,aNewDefault);
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-    
-bool CopyingDataTreeBuilder::handle(sharable::GroupNode * node)
-{
-    rtl_uString * aNodeName = acquireString( node->info.getName());
-    sal_uInt8 aFlags = node->info.flags;
-
-    sal_uInt16 nGroupOffset = this->builder().startGroup(aNodeName,aFlags);
-    this->visitChildren(node);
-    this->builder().endGroup(nGroupOffset);
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-    
-bool CopyingDataTreeBuilder::handle(sharable::SetNode * node)
-{
-    rtl_uString * aNodeName = acquireString( node->info.getName());
-    sal_uInt8 aFlags = node->info.flags;
-    sal_uInt8 * aTemplate = this->makeTemplateData(node->elementType);
-    
-    this->builder().addSet(aNodeName,aFlags,aTemplate);
-
-    OSL_ASSERT( this->builder().lastNode().isSet() );
-    sharable::SetNode& _aNewSet = this->builder().lastNode().set;
-
-    _aNewSet.elements = ElementListBuilder().buildElementList(node);
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-        
-sal_uInt8 * CopyingDataTreeBuilder::makeTemplateData(sal_uInt8 * _aSourceTemplate)
-{
-    return sharable::SetNode::copyTemplateData(_aSourceTemplate);
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * CopyingDataTreeBuilder::ElementListBuilder::buildElementList(sharable::SetNode * set)
-{
-    OSL_ASSERT(set != 0);
-
-    m_aCollector.resetElementList();
-    
-    this->visitElements(set);
-    
-    return m_aCollector.getElementListAndClear();
-}
-//-----------------------------------------------------------------------------
-
-bool CopyingDataTreeBuilder::ElementListBuilder::handle(sharable::TreeFragment * tree)
-{
-    sharable::TreeFragment * aNewElement = CopyingDataTreeBuilder().buildTree(tree);
-
-    m_aCollector.addElement(aNewElement);
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-rtl_uString * ConvertingDataTreeBuilder::allocName(INode const & _aNode)
-{
-    rtl::OUString sNextName = _aNode.getName();
-
-    if (m_sRootName.getLength())
-    {
-        sNextName = m_sRootName;
-        m_sRootName = rtl::OUString();
-    }
-
-    return acquireString( sNextName);
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * ConvertingDataTreeBuilder::buildElement(INode const& _aNode, rtl::OUString const & _aTypeName, bool _bWithDefaults)
-{
-    m_sRootName = _aTypeName;
-    m_bWithDefaults = _bWithDefaults;
-
-    rtl_uString * aTreeName = acquireString( _aNode.getName());
-    this->builder().resetTreeFragment(aTreeName, makeState(_aNode.getAttributes()));
-    
-
-    this->applyToNode(_aNode);
-
-    return this->createTree();
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * ConvertingDataTreeBuilder::buildTree(rtl::OUString const & _aTreeName, INode const& _aNode, bool _bWithDefaults)
-{
-    m_sRootName = rtl::OUString();
-    m_bWithDefaults = _bWithDefaults;
-
-    rtl_uString * aTreeName = acquireString( _aTreeName );
-    this->builder().resetTreeFragment(aTreeName, makeState(_aNode.getAttributes()));
-    
-
-    this->applyToNode(_aNode);
-
-    return this->createTree();
-}
-//-----------------------------------------------------------------------------
-
-void ConvertingDataTreeBuilder::handle(ISubtree const & _aNode)
-{
-    rtl_uString * aNodeName = allocName( _aNode );
-    sal_uInt8 aFlags = makeFlags(_aNode.getAttributes());
-
-    if (_aNode.isSetNode())
-    {
-        sal_uInt8 * aTemplate = this->makeTemplateData(_aNode.getElementTemplateName(),
-                                 _aNode.getElementTemplateModule());
-    
-        this->builder().addSet(aNodeName,aFlags,aTemplate);
-
-        OSL_ASSERT( this->builder().lastNode().isSet() );
-        sharable::SetNode& _aNewSet = this->builder().lastNode().set;
-
-        _aNewSet.elements = ElementListBuilder().buildElementList(_aNode, m_bWithDefaults);
-    }
-    else
-    {
-        sal_uInt16 nGroupOffset = this->builder().startGroup(aNodeName,aFlags);
-        this->applyToChildren(_aNode);
-        this->builder().endGroup(nGroupOffset);
-    }
-}
-//-----------------------------------------------------------------------------
-    
-void ConvertingDataTreeBuilder::handle(ValueNode const & _aNode)
-{
-    rtl_uString * aNodeName = allocName( _aNode );
-    sal_uInt8 aFlags = makeFlags(_aNode.getAttributes());
-
-    sal_uInt8 aType = sharable::getTypeCode(_aNode.getValueType());
-
-    sharable::AnyData aNewValue;   aNewValue.data = 0;
-    sharable::AnyData aNewDefault; aNewDefault.data = 0;
-
-    OSL_ASSERT( !(aFlags & (Flags::valueAvailable | Flags::defaultAvailable)) );
-
-    if (!_aNode.isDefault())  
-    {
-        uno::Any aValue = _aNode.getValue();
-        if (aValue.hasValue())
-        {
-            aNewValue = sharable::allocData(aType, aValue);
-            aFlags |= Flags::valueAvailable;
-        }
-    }
-
-    if (_aNode.hasUsableDefault())  
-    {
-        uno::Any aDefault = _aNode.getDefault();
-        if (aDefault.hasValue())
-        {
-            aNewDefault = sharable::allocData(aType, aDefault);
-            aFlags |= Flags::defaultAvailable;
-        }
-    }
-     
-    this->builder().addValue(aNodeName,aFlags,aType,aNewValue,aNewDefault);
-}
-//-----------------------------------------------------------------------------
-
-sal_uInt8 ConvertingDataTreeBuilder::makeState(node::Attributes const & _aAttributes)
-{
-    sal_uInt8 state;
-
-    switch (_aAttributes.state())
-    {
-    case node::isDefault:   state = State::defaulted; m_bWithDefaults = true;  break;
-    case node::isMerged:    state = State::merged;     break;
-    case node::isReplaced:  state = State::replaced;  m_bWithDefaults = false; break;
-    case node::isAdded:     state = State::added;     m_bWithDefaults = false; break;
-
-    default: OSL_ASSERT(false); state = 0; break;
-    }
-
-    if (_aAttributes.isReadonly()) 
-        state |= State::flag_readonly;
-    //Map mandatory and Removable
-    if (_aAttributes.isMandatory()) 
-        state |= State::flag_mandatory;
-    
-    if (_aAttributes.isRemovable()) 
-        state |= State::flag_removable;
-
-    if ( m_bWithDefaults ) 
-        state |= State::flag_default_avail;
-
-    return state;
-}
-//-----------------------------------------------------------------------------
-
-sal_uInt8 ConvertingDataTreeBuilder::makeFlags(node::Attributes const & _aAttributes)
-{
-    sal_uInt8 flags = 0;
-
-    if ( _aAttributes.isReadonly())
-        flags |= Flags::readonly;
-
-    if ( _aAttributes.isFinalized())
-        flags |= Flags::finalized;
-
-    if ( _aAttributes.isNullable())
-        flags |= Flags::nullable;
-
-    if ( _aAttributes.isLocalized())
-        flags |= Flags::localized;
-
-    if (_aAttributes.isDefault())
-        flags |= Flags::defaulted; // somewhat redundant with State
-
-    if (!_aAttributes.isReplacedForUser())
-        flags |= Flags::defaultable;  // redundant with State (merged || defaulted)
-
-    return flags;
-}
-//-----------------------------------------------------------------------------
-
-sal_uInt8 * ConvertingDataTreeBuilder::makeTemplateData(rtl::OUString const & _aTemplateName, rtl::OUString const & _aTemplateModule)
-{
-    return sharable::SetNode::allocTemplateData(_aTemplateName, _aTemplateModule );
-}
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * ConvertingDataTreeBuilder::ElementListBuilder::buildElementList(ISubtree const & _aSet, bool _bWithDefaults)
-{
-    OSL_PRECOND(_aSet.isSetNode(), "Node must be a set");
-
-    m_aCollector.resetElementList();
-
-    m_sTypeName = _aSet.getElementTemplateName();
-    m_bWithDefaults = _bWithDefaults;
-
-    this->applyToChildren(_aSet);
-    
-    return m_aCollector.getElementListAndClear();
-}
-//-----------------------------------------------------------------------------
-
-void ConvertingDataTreeBuilder::ElementListBuilder::handleNode(INode const & _aSourceNode)
-{
-    sharable::TreeFragment * aNewElement = ConvertingDataTreeBuilder()
-                                 .buildElement(_aSourceNode,m_sTypeName,m_bWithDefaults);
-
-    m_aCollector.addElement(aNewElement);
-}
-//-----------------------------------------------------------------------------
-
-void ConvertingDataTreeBuilder::ElementListBuilder::handle(ValueNode const & _aSourceNode)
-{
-    handleNode(_aSourceNode);
-}
-//-----------------------------------------------------------------------------
-
-void ConvertingDataTreeBuilder::ElementListBuilder::handle(ISubtree  const & _aSourceNode)
-{
-    handleNode(_aSourceNode);
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<INode> ConvertingNodeBuilder::buildNode(sharable::TreeFragment * sourceTree, bool _bUseTreeName)
-{
-    std::auto_ptr<INode> pResult = this->buildNode(sourceTree == 0 ? 0 : sourceTree->getRootNode());
-    if (pResult.get() != NULL)
-    {
-        // use the element name !
-        if (_bUseTreeName) pResult->setName( sourceTree->getName() );
-
-        // do something about attributes here ?
-    }
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<INode> ConvertingNodeBuilder::buildNode(sharable::Node * sourceNode)
-{
-    OSL_ENSURE( !m_pNode.get(), "Old node tree will be dropped");
-    visitNode(sourceNode);
-    return m_pNode;
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ConvertingNodeBuilder::buildNodeTree(sharable::GroupNode * groupNode) const
-{
-    std::auto_ptr<ISubtree> pResult = convertNode(groupNode);
-
-    if (pResult.get() != NULL)
-    {
-        ConvertingSubnodeBuilder aCollector(m_rNodeFactory, *pResult);
-        aCollector.addChildren(groupNode);
-    }
-
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ConvertingNodeBuilder::buildNodeTree(sharable::SetNode * setNode) const
-{
-    std::auto_ptr<ISubtree> pResult = convertNode(setNode);
-
-    if (pResult.get() != NULL)
-    {
-        ConvertingSubnodeBuilder aCollector(m_rNodeFactory, *pResult);
-        aCollector.addElements(setNode);
-    }
-
-    return pResult;
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ConvertingNodeBuilder::convertNode(sharable::GroupNode * groupNode) const
-{
-    return m_rNodeFactory.createGroupNode( groupNode->info.getName(),
-                                           convertAttributes(sharable::node(groupNode)));
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree> ConvertingNodeBuilder::convertNode(sharable::SetNode * setNode) const
-{
-    return m_rNodeFactory.createSetNode(setNode->info.getName(),
-                                        setNode->getElementTemplateName(),
-                                        setNode->getElementTemplateModule(),
-                                        convertAttributes(sharable::node(setNode)));
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<ValueNode> ConvertingNodeBuilder::convertNode(sharable::ValueNode * valueNode) const
-{
-    uno::Any aUserValue = valueNode->getUserValue();
-    uno::Any aDefValue  = valueNode->getDefaultValue();
-
-    if (aUserValue.hasValue() || aDefValue.hasValue())
-    {
-        return m_rNodeFactory.createValueNode(valueNode->info.getName(),
-                                              aUserValue, aDefValue,
-                                              convertAttributes(sharable::node(valueNode)));
-    }
-    else
-    {
-        return m_rNodeFactory.createNullValueNode(valueNode->info.getName(),
-                                                  valueNode->getValueType(),
-                                                  convertAttributes(sharable::node(valueNode)));
-    }
-}
-//-----------------------------------------------------------------------------
-    
-bool ConvertingNodeBuilder::handle(sharable::ValueNode * node)
-{
-    m_pNode = base_ptr(buildNodeTree(node));
-    return true;
-}
-//-----------------------------------------------------------------------------
-    
-bool ConvertingNodeBuilder::handle(sharable::GroupNode * node)
-{
-    m_pNode = base_ptr(buildNodeTree(node));
-    return true;
-}
-//-----------------------------------------------------------------------------
-    
-bool ConvertingNodeBuilder::handle(sharable::SetNode * node)
-{
-    m_pNode = base_ptr(buildNodeTree(node));
-    return true;
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-bool ConvertingSubnodeBuilder::handle(sharable::TreeFragment * tree)
-{
-    OSL_ASSERT(m_rParentNode.isSetNode());
-    m_rParentNode.addChild(m_aSubnodeBuilder.buildNode(tree, true));
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-bool ConvertingSubnodeBuilder::handle(sharable::Node * node)
-{
-    OSL_ASSERT(!m_rParentNode.isSetNode());
-    m_rParentNode.addChild(m_aSubnodeBuilder.buildNode(node));
-    return false;
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-void DataTreeDefaultMerger::mergeDefaults(sharable::TreeFragment * /*_aBaseAddress*/, INode const& /*_aDefaultNode*/)
-{
-}
-//-----------------------------------------------------------------------------
-
-void DataTreeDefaultMerger::handle(ISubtree const & /*_aNode*/)
-{
-}
-//-----------------------------------------------------------------------------
-    
-void DataTreeDefaultMerger::handle(ValueNode const & /*_aNode*/)
-{
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-sharable::TreeFragment * DataTreeCleanup::destroyTree(sharable::TreeFragment * _aBaseAddress)
-{
-    sharable::TreeFragment *pData = _aBaseAddress;
-
-    sharable::TreeFragment *pNext = pData->header.next;
-
-    sal_uInt16 const nCount = pData->header.count;
-
-    destroyData( & pData->header );
-
-    for (sal_uInt16 i = 0; i< nCount; ++i)
-    {
-        destroyNode( addressOfNodeAt(_aBaseAddress,i) );
-    }
-
-    sharable::TreeFragment::free_shallow( pData );
-
-    return (sharable::TreeFragment *)( pNext );
-}
-//-----------------------------------------------------------------------------
-
-void DataTreeCleanup::destroyNode(sharable::Node * _aNodeAddress)
-{
-    sharable::Node * pNode = _aNodeAddress;
-
-    sal_uInt8 aTypeTag = pNode->info.type;
-    switch ( aTypeTag & Type::mask_nodetype )
-    {
-    case Type::nodetype_group:
-        destroyData( &pNode->group );
-        break;
-    case Type::nodetype_value:
-        destroyData( &pNode->value );
-        break;
-    case Type::nodetype_set:
-        destroyData( &pNode->set );
-        break;
-    default:
-        OSL_ENSURE(false, "Cannot destroy node: Invalid type tag in node");
-        break;
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DataTreeCleanup::destroyData(sharable::TreeFragmentHeader * _pHeader)
-{
-    // 'component' is owned elsewhere -> leave alone
-
-    rtl_uString * aName = _pHeader->name;
-
-    rtl_uString_release( aName );
-}
-//-----------------------------------------------------------------------------
-
-void DataTreeCleanup::destroyData(sharable::NodeInfo * _pNodeInfo)
-{
-    rtl_uString * aName = _pNodeInfo->name;
-
-    if (aName) rtl_uString_release( aName );
-}
-//-----------------------------------------------------------------------------
-
-void DataTreeCleanup::destroyData(sharable::SetNode * _pNode)
-{
-    sharable::TreeFragment * aElement( _pNode->elements );
-
-    sal_uInt8 * aTemplate = _pNode->elementType;;
-
-    destroyData(&_pNode->info);
-
-    while (aElement != NULL)
-        aElement = destroyTree(aElement);
-
-    sharable::SetNode::releaseTemplateData( aTemplate );
-}
-//-----------------------------------------------------------------------------
-    
-void DataTreeCleanup::destroyData(sharable::GroupNode * _pNode)
-{
-    destroyData(&_pNode->info);
-    // nothing more to do
-}
-//-----------------------------------------------------------------------------
-    
-void DataTreeCleanup::destroyData(sharable::ValueNode * _pNode)
-{
-    sal_uInt8 aValueType = sal_uInt8( _pNode->info.type & Type::mask_valuetype );
-    sal_uInt8 aFlags          = _pNode->info.flags;
-
-    destroyData(&_pNode->info);
-
-    if (aFlags & Flags::valueAvailable) 
-        freeData( aValueType, _pNode->value );
-
-    if (aFlags & Flags::defaultAvailable) 
-        freeData( aValueType, _pNode->defaultValue );
-    
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-    
-    //-------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------	
-} // namespace configmgr
-
-
diff --git a/configmgr/source/tree/changes.cxx b/configmgr/source/tree/changes.cxx
deleted file mode 100644
index 862809ad97..0000000000
--- a/configmgr/source/tree/changes.cxx
+++ /dev/null
@@ -1,247 +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: changes.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-
-#include <stdio.h>
-
-#include "change.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-
-//==========================================================================
-//= ValueChange
-//==========================================================================
-
-// works reliably only if old value is set and the value really changes
-uno::Type implGetValueType(uno::Any const & _aValue, uno::Any const & _aOldValue)  
-{
-    if (_aValue.hasValue())
-    {
-        OSL_ENSURE(!_aOldValue.hasValue() || _aOldValue.getValueType() == _aValue.getValueType(),
-                    "ERROR: Type mismatch in value change");
-
-        return _aValue.getValueType();
-    }
-    else
-    {
-        OSL_ENSURE(_aOldValue.hasValue(),"WARNING: Cannot determine value type of change");
-        return _aOldValue.getValueType();
-    }
-}
-// -------------------------------------------------------------------------
-static inline bool isDefaultMode(ValueChange::Mode _eMode)
-{ return (_eMode == ValueChange::setToDefault) || (_eMode == ValueChange::changeDefault); }
-// -------------------------------------------------------------------------
-static inline bool isLayerChangeMode(ValueChange::Mode _eMode)
-{ return (_eMode == ValueChange::setToDefault) || (_eMode == ValueChange::wasDefault); }
-// -----------------------------------------------------------------------------
-ValueChange::ValueChange(rtl::OUString const& _rName,                    
-                         const node::Attributes& _rAttributes, 
-                         Mode _eMode, 
-                         uno::Any const & aNewValue, uno::Any const & aOldValue)
-    : Change(_rName, isDefaultMode(_eMode))
-     ,m_aValueType( implGetValueType(aNewValue,aOldValue) )
-     ,m_aValue(aNewValue)
-     ,m_aOldValue(aOldValue)
-     ,m_aAttributes(_rAttributes)
-     ,m_eMode(_eMode)
-{
-    m_aAttributes.markAsDefault(Change::isToDefault());
-}
-        
-// -----------------------------------------------------------------------------
-void ValueChange::setNewValue(const uno::Any& _rNewVal) 
-{ 
-    OSL_ENSURE(_rNewVal.getValueType() == m_aValueType || !_rNewVal.hasValue(),
-                "ValueChange: Type mismatch in setNewValue" );
-
-    m_aValue = _rNewVal;
-}
-
-// -----------------------------------------------------------------------------
-std::auto_ptr<Change> ValueChange::clone() const 
-{
-    return std::auto_ptr<Change>(new ValueChange(*this));
-}
-
-// -----------------------------------------------------------------------------
-bool ValueChange::isChange() const // makes sense only if old value is set
-{
-    return isLayerChangeMode(m_eMode) || (m_aOldValue != m_aValue);
-}
-// -------------------------------------------------------------------------
-namespace tree_changes_internal {
-    inline void doAdjust(uno::Any& aActual, uno::Any const& aTarget)
-    {
-        // If set - it should already match
-        OSL_ASSERT(!aActual.hasValue() || aTarget == aActual);
-        aActual = aTarget;
-    }
-}
-
-// -------------------------------------------------------------------------
-void ValueChange::applyChangeNoRecover(ValueNode& aValue) const
-{
-    switch (getMode())
-    {
-    case wasDefault:
-        OSL_ASSERT(aValue.isDefault());
-    case changeValue:
-        aValue.setValue(getNewValue());
-        break;
-
-    case setToDefault:
-        aValue.setDefault();
-        break;
-
-    case changeDefault:
-        aValue.changeDefault(getNewValue());
-        break;
-
-    default:
-        OSL_ENSURE(0, "Unknown mode found for ValueChange");
-        break;
-    }
-}
-
-//==========================================================================
-//= AddNode
-//==========================================================================
-AddNode::AddNode(rtl::Reference< data::TreeSegment > const & _aAddedTree, rtl::OUString const& _rName, bool _bToDefault)
-    :Change(_rName,_bToDefault)
-    ,m_aOwnNewNode(_aAddedTree)
-    ,m_aOwnOldNode()
-    ,m_aInsertedTree(NULL)
-    ,m_bReplacing(false)
-{
-}
-
-//--------------------------------------------------------------------------
-AddNode::~AddNode()
-{
-}
-
-// -----------------------------------------------------------------------------
-AddNode::AddNode(const AddNode& _aObj)
-: Change(_aObj)
-, m_aOwnNewNode(data::TreeSegment::create(_aObj.m_aOwnNewNode))
-, m_aOwnOldNode(data::TreeSegment::create(_aObj.m_aOwnOldNode))
-, m_aInsertedTree(_aObj.m_aInsertedTree)
-, m_bReplacing(_aObj.m_bReplacing)
-{
-}
-
-// -----------------------------------------------------------------------------
-std::auto_ptr<Change> AddNode::clone() const 
-{
-    return std::auto_ptr<Change>(new AddNode(*this));
-}
-
-//--------------------------------------------------------------------------
-void AddNode::setInsertedAddress(sharable::TreeFragment * const & _aInsertedTree)	
-{  
-    OSL_ENSURE( m_aInsertedTree == NULL, "AddNode already was applied - inserted a second time ?");
-    m_aInsertedTree = _aInsertedTree;
-}
-//--------------------------------------------------------------------------
-
-#if 0
-void AddNode::expectReplacedNode(INode const* pOldNode)	
-{  
-    if (pOldNode != m_aOwnOldNode.getRoot())
-    {
-        OSL_ENSURE(!m_aOwnOldNode.is(), "This AddNode already owns a replaced Node - throwing that away");
-        m_aOwnOldNode.clear(); 
-    }
-    m_pOldNode = pOldNode; 
-}
-#endif
-//--------------------------------------------------------------------------
-
-void AddNode::takeReplacedTree(rtl::Reference< data::TreeSegment > const & _aReplacedTree)	
-{  
-    m_aOwnOldNode   = _aReplacedTree;
-
-    if (m_aOwnOldNode.is()) m_bReplacing = true;
-}
-
-
-//==========================================================================
-//= RemoveNode
-//==========================================================================
-RemoveNode::RemoveNode(rtl::OUString const& _rName, bool _bToDefault)
-    :Change(_rName,_bToDefault)
-    ,m_aOwnOldNode()
-{
-}
-
-//--------------------------------------------------------------------------
-RemoveNode::~RemoveNode()
-{
-}
-// -----------------------------------------------------------------------------
-RemoveNode::RemoveNode(const RemoveNode& _aObj)
-: Change(_aObj)
-, m_aOwnOldNode(data::TreeSegment::create(_aObj.m_aOwnOldNode))
-{
-}
-
-// -----------------------------------------------------------------------------
-std::auto_ptr<Change> RemoveNode::clone() const 
-{
-    return std::auto_ptr<Change>(new RemoveNode(*this));
-}
-//--------------------------------------------------------------------------
-#if 0
-void RemoveNode::expectRemovedNode(INode const* pOldNode)	
-{  
-    if (pOldNode != m_aOwnOldNode.getRoot())
-    {
-        OSL_ENSURE(!m_aOwnOldNode.is(), "This RemoveNode already owns a Node - throwing that away");
-        m_aOwnOldNode.clear(); 
-    }
-    m_pOldNode = pOldNode; 
-}
-#endif
-//--------------------------------------------------------------------------
-
-void RemoveNode::takeRemovedTree(rtl::Reference< data::TreeSegment > const & _aRemovedTree)	
-{  
-    m_aOwnOldNode   = _aRemovedTree; 
-}
-
-//--------------------------------------------------------------------------
-}  // namespace configmgr
-
diff --git a/configmgr/source/tree/cmtree.cxx b/configmgr/source/tree/cmtree.cxx
deleted file mode 100644
index 71d7733005..0000000000
--- a/configmgr/source/tree/cmtree.cxx
+++ /dev/null
@@ -1,381 +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: cmtree.cxx,v $
- * $Revision: 1.41 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "subtree.hxx"
-#include "change.hxx"
-#include "treechangelist.hxx"
-
-//#include "treeactions.hxx"
-#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
-
-#ifndef INCLUDED_DEQUE
-#include <deque>
-#define INCLUDED_DEQUE
-#endif
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-#ifndef INCLUDED_EXCEPTION
-#include <exception>
-#define INCLUDED_EXCEPTION
-#endif
-#ifndef INCLUDED_SET
-#include <set>
-#define INCLUDED_SET
-#endif
-#include <algorithm>
-
-namespace configmgr
-{
-
-// ------------------------ ChildListSet implementations ------------------------
-    ChildListSet::ChildListSet(ChildListSet const& aSet, treeop::DeepChildCopy)
-        : m_aChildList(aSet.m_aChildList.size())
-    {
-        for (size_t i = 0; i < aSet.m_aChildList.size(); i++)
-        {
-            m_aChildList[i] = aSet.m_aChildList[i]->clone().release();
-        }
-    }
-    ChildListSet::~ChildListSet()
-    {
-        for (size_t i = 0; i < m_aChildList.size(); i++)
-            delete m_aChildList[i];
-    }
-
-    struct ltNode
-    {
-        ltNode() {}
-
-        bool operator()(const configmgr::INode* n1, const configmgr::INode* n2) const
-        {
-            return n1->getName().compareTo(n2->getName()) < 0;
-        }
-    };
-
-    std::vector< INode* >::iterator ChildListSet::find(INode *pNode) const
-    {
-        std::vector< INode* > &rList = const_cast<std::vector< INode* > &>(m_aChildList);
-        std::pair<std::vector< INode* >::iterator, std::vector< INode* >::iterator> aRange;
-        ltNode aCompare;
-        aRange = std::equal_range(rList.begin(), rList.end(), pNode, aCompare);
-        if (aRange.second - aRange.first == 0)
-            return rList.end();
-        else
-            return aRange.first;
-    }
-    
-    // Keep the list sorted ...
-    std::pair<std::vector< INode* >::iterator, bool> ChildListSet::insert(INode *pNode)
-    {
-        // Inserted records are (mostly) already in order
-        if (m_aChildList.size() > 0)
-        {
-            sal_Int32 nCmp = pNode->getName().compareTo(
-                m_aChildList.back()->getName());
-            if (nCmp == 0)
-            {
-                return std::pair<std::vector< INode* >::iterator, bool>(m_aChildList.end(), false);
-            }
-            else if (nCmp < 0)
-            { 
-                std::vector< INode* >::iterator aIns;
-                ltNode aCompare;
-                aIns = std::lower_bound(m_aChildList.begin(), m_aChildList.end(), pNode, aCompare);
-                if (aIns != m_aChildList.end() && pNode->getName().compareTo((*aIns)->getName()) == 0)
-                    return std::pair<std::vector< INode* >::iterator, bool>(m_aChildList.end(), false);
-                return std::pair<std::vector< INode* >::iterator, bool>(m_aChildList.insert(aIns, pNode), true);
-            }
-        }
-        // simple append - the common case.
-        return std::pair<std::vector< INode* >::iterator, bool>(m_aChildList.insert(m_aChildList.end(), pNode), true);
-    }
-
-    INode *ChildListSet::erase(INode *pNode)
-    {
-        std::vector< INode* >::iterator aIter = find(pNode);
-        
-        if (aIter != m_aChildList.end())
-        {
-            INode *pCopy = *aIter;
-            m_aChildList.erase(aIter);
-            return pCopy;
-        }
-        else
-            return NULL;
-    }
-
-// ---------------------------- Node implementation ----------------------------
-
-    INode::INode(rtl::OUString const& aName, node::Attributes _aAttr)
-          :m_aName(aName)
-          ,m_aAttributes(_aAttr){}
-    // CopyCTor will be create automatically
-
-    INode::~INode() {}
-
-    ISubtree*         INode::asISubtree(){return NULL;}
-    ISubtree const*   INode::asISubtree() const {return NULL;}
-    ValueNode*       INode::asValueNode() {return NULL;}
-    ValueNode const* INode::asValueNode() const {return NULL;}
-
-    void INode::modifyState(node::State _eNewState)
-    {
-        m_aAttributes.setState(_eNewState);
-    }
-
-    void INode::modifyAccess(node::Access _aAccessLevel)
-    {
-        OSL_ENSURE( node::accessWritable <= _aAccessLevel && _aAccessLevel <= node::accessReadonly,"Invalid access level for Node");
-
-        m_aAttributes.setAccess(_aAccessLevel);
-    }
-    
-    void INode::markMandatory()
-    {
-        m_aAttributes.markMandatory();
-    }
-    
-    void INode::markRemovable()
-    {
-        m_aAttributes.markRemovable();
-    }
-    
-    void INode::promoteAccessToDefault()
-      {
-        if (m_aAttributes.isFinalized())
-            m_aAttributes.setAccess(node::accessReadonly);
-
-        if ( m_aAttributes.isMandatory())
-            m_aAttributes.setRemovability(false,false);
-    }
-
-// ------------------------- SearchNode implementation -------------------------
-    SearchNode::SearchNode(rtl::OUString const& aName)
-        :INode(aName, node::Attributes()){}
-
-    std::auto_ptr<INode> SearchNode::clone() const {return std::auto_ptr<INode>(new SearchNode(*this));}
-
-    SearchNode::~SearchNode(){}
-
-    //==========================================================================
-    //= OPropagateLevels
-    //==========================================================================
-    /** fills a subtree with the correct level informations
-    */
-    struct OPropagateLevels : public NodeModification
-    {
-    public:
-        OPropagateLevels(sal_Int16 _nParentLevel, sal_Int16 _nParentDefaultLevel)
-        : m_nLevel          ( childLevel(_nParentLevel) )
-        , m_nDefaultLevel   ( childLevel(_nParentDefaultLevel) )
-        {
-        }
-        virtual void handle(ValueNode&) { /* not interested in value nodes */ }
-        virtual void handle(ISubtree& _rSubtree)
-        {
-            _rSubtree.setLevels(m_nLevel, m_nDefaultLevel);
-        }
-
-        static sal_Int16 childLevel(sal_Int16 _nLevel)
-        {
-            OSL_ASSERT(0 > treeop::ALL_LEVELS);
-            return (_nLevel > 0) ? _nLevel-1 : _nLevel;
-        }
-    protected:
-        sal_Int16	m_nLevel;
-        sal_Int16	m_nDefaultLevel;
-    };
-
-
-// -------------------------- ISubtree implementation --------------------------
-    ISubtree* ISubtree::asISubtree() {return this;}
-    ISubtree const* ISubtree::asISubtree() const {return this;}
-
-    //--------------------------------------------------------------------------
-    static inline bool adjustLevel(sal_Int16& _rLevel, sal_Int16 _nNewLevel)
-    {
-        if (_rLevel == treeop::ALL_LEVELS)   return false;
-        if (_nNewLevel <= _rLevel &&
-            _nNewLevel != treeop::ALL_LEVELS) return false;
-
-        _rLevel = _nNewLevel;
-        return true;
-    }
-
-    //--------------------------------------------------------------------------
-    void ISubtree::setLevels(sal_Int16 _nLevel, sal_Int16 _nDefaultLevels)
-    {
-        bool bActive = false;
-
-        if (_nLevel && adjustLevel(m_nLevel, _nLevel))
-            bActive = true;
-
-        if (_nDefaultLevels && adjustLevel(m_nDefaultLevels, _nDefaultLevels))
-            bActive = true;
-
-        // forward the level numbers to any child subtrees we have
-        if (bActive)
-        {
-            OPropagateLevels aPropagate(_nLevel,_nDefaultLevels);
-            aPropagate.applyToChildren(*this);
-        }
-    }
-
-// --------------------------- Subtree implementation ---------------------------
-    std::auto_ptr<INode> Subtree::clone() const
-    {
-        return std::auto_ptr<INode>(new Subtree(*this, treeop::DeepChildCopy()));
-    }
-
-    INode* Subtree::doGetChild(rtl::OUString const& aName) const
-    {
-        SearchNode searchObj(aName);
-
-        std::vector< INode* >::iterator aIter = m_aChildren.find(&searchObj);
-        return aIter != m_aChildren.end() ? *aIter : NULL;
-    }
-
-    INode* Subtree::addChild(std::auto_ptr<INode> aNode)	// takes ownership
-    {
-        rtl::OUString aName = aNode->getName();
-        std::pair<std::vector< INode* >::iterator, bool> aInserted =
-            m_aChildren.insert(aNode.get());
-        if (aInserted.second)
-            aNode.release();
-        return *aInserted.first;
-    }
-
-    ::std::auto_ptr<INode> Subtree::removeChild(rtl::OUString const& aName)
-    {
-        SearchNode searchObj(aName);
-        return ::std::auto_ptr<INode>(m_aChildren.erase(&searchObj));
-    }
-//  // -------------------------- ValueNode implementation --------------------------
-
-    void Subtree::forEachChild(NodeAction& anAction) const
-    {
-        for(std::vector< INode* >::const_iterator it = m_aChildren.begin();
-            it != m_aChildren.end();
-            ++it)
-            (**it).dispatch(anAction);
-    }
-
-    void Subtree::forEachChild(NodeModification& anAction)
-    {
-        std::vector< INode* >::iterator it = m_aChildren.begin();
-        while( it != m_aChildren.end() )
-        {
-            // modification-safe iteration
-            (**it++).dispatch(anAction);
-        }
-      }
-
-//  // -------------------------- ValueNode implementation --------------------------
-    bool ValueNode::setValueType(uno::Type const& _aType)
-    {
-        if (_aType == this->getValueType()) return true;
-
-        if (!this->isNull()) return false;
-
-        uno::TypeClass eTC = this->getValueType().getTypeClass();
-        if (eTC != uno::TypeClass_VOID && eTC != uno::TypeClass_ANY)
-            return false;
-
-        m_aValuePair = AnyPair(_aType);
-
-        OSL_ASSERT(_aType == this->getValueType());
-
-        return true;
-    }
-    bool ValueNode::setValue(com::sun::star::uno::Any const& _aValue)
-    {
-        sal_Bool bRet = m_aValuePair.setFirst(_aValue);
-        if (bRet) this->markAsDefault(false);
-        return !! bRet;
-    }
-
-    bool ValueNode::changeDefault(com::sun::star::uno::Any const& _aValue)
-    {
-        return !! m_aValuePair.setSecond(_aValue);
-    }
-
-    void ValueNode::setDefault()
-    {
-        OSL_PRECOND( hasUsableDefault(), "No default value to set for value node");
-        m_aValuePair.clear( selectValue() );
-        this->markAsDefault();
-        OSL_POSTCOND( isDefault(), "Could not set value node to default");
-    }
-
-    void ValueNode::promoteToDefault()
-    {
-        if (!isDefault())
-        {
-            if (m_aValuePair.hasFirst())
-            {
-                OSL_VERIFY( m_aValuePair.setSecond(m_aValuePair.getFirst()) );
-                m_aValuePair.clear( selectValue() );
-            }
-            else
-            {
-                m_aValuePair.clear( selectDeflt() );
-                OSL_ASSERT( m_aValuePair.isNull() );
-            }
-
-            this->markAsDefault();
-
-            OSL_ENSURE( !m_aValuePair.hasFirst(), "Leaving orphaned value in after promoting to default");
-        }
-        else
-            OSL_ENSURE( !m_aValuePair.hasFirst(), "Orphaned value in default node won't be promoted");
-
-        OSL_POSTCOND( isDefault(), "Could not promote value node to default");
-    }
-
-    std::auto_ptr<INode> ValueNode::clone() const
-    {
-        return std::auto_ptr<INode>(new ValueNode(*this));
-    }
-
-    ValueNode* ValueNode::asValueNode() {return this;}
-    ValueNode const* ValueNode::asValueNode() const {return this;}
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/tree/cmtreemodel.cxx b/configmgr/source/tree/cmtreemodel.cxx
deleted file mode 100644
index c9b9116936..0000000000
--- a/configmgr/source/tree/cmtreemodel.cxx
+++ /dev/null
@@ -1,374 +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: cmtreemodel.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "valuenode.hxx"
-#include "change.hxx"
-#include "configexcept.hxx"
-#include "strdecl.hxx"
-#include <osl/diagnose.h>
-
-#ifndef INCLUDED_ALGORITHM
-#define INCLUDED_ALGORITHM
-#include <algorithm>
-#endif
-
-//..........................................................................
-namespace configmgr
-{
-//==========================================================================
-
-bool isLocalizedValueSet(ISubtree const& _aSubtree)
-{
-    if ( !_aSubtree.isSetNode())	return false;
-    if ( !_aSubtree.isLocalized())	return false;
-    if ( !_aSubtree.getElementTemplateModule().equals(TEMPLATE_MODULE_LOCALIZED_VALUE) )	return false;
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool isLocalizedValueSet(SubtreeChange const& _aSubtree)
-{
-    if ( !_aSubtree.isSetNodeChange())	return false;
-    if ( !_aSubtree.isLocalizedContainer())	return false;
-    if ( !_aSubtree.getElementTemplateModule().equals(TEMPLATE_MODULE_LOCALIZED_VALUE) )	return false;
-    return true;
-}
-
-// -----------------------------------------------------------------------------
-
-bool isValueSet(SubtreeChange const& _aSubtree)
-{
-    if ( !_aSubtree.isSetNodeChange())	return false;
-    if ( !_aSubtree.getElementTemplateModule().equals(TEMPLATE_MODULE_NATIVE_VALUE) )	return false;
-    return true;
-}
-//==========================================================================
-
-//==========================================================================
-//= Change
-//==========================================================================
-void Change::swap(Change& aOther)
-{
-    std::swap(m_aName, aOther.m_aName);
-    std::swap(m_bIsToDefault, aOther.m_bIsToDefault);
-}
-
-//==========================================================================
-//= SubtreeChange
-//==========================================================================
-//--------------------------------------------------------------------------		
-void SubtreeChange::swap(SubtreeChange& aOther)
-{
-    Change::swap(aOther);
-    m_aChanges.swap(aOther.m_aChanges);
-    std::swap(m_sTemplateName, aOther.m_sTemplateName);
-    std::swap(m_sTemplateModule, aOther.m_sTemplateModule);
-    std::swap(m_aAttributes, aOther.m_aAttributes);
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::~SubtreeChange()
-{
-    for(Children::iterator aIter = m_aChanges.begin();
-        aIter != m_aChanges.end();
-        ++aIter)
-    {
-        // Change* pChange = aIter->second;
-        delete aIter->second;
-    }
-}
-
-// -----------------------------------------------------------------------------
-SubtreeChange::SubtreeChange(const SubtreeChange& _aObj, treeop::DeepChildCopy)
-        :Change(_aObj),
-         m_sTemplateName(_aObj.m_sTemplateName),
-         m_sTemplateModule(_aObj.m_sTemplateModule),
-         m_aAttributes(_aObj.m_aAttributes)
-{
-    for(Children::const_iterator aIter = _aObj.m_aChanges.begin();
-        aIter != _aObj.m_aChanges.end();
-        ++aIter)
-    {
-        OSL_ASSERT(aIter->second);
-        Children::value_type aCopy(aIter->first, aIter->second->clone().release());
-        m_aChanges.insert(m_aChanges.end(), aCopy);
-    }
-}
-
-// -----------------------------------------------------------------------------
-std::auto_ptr<Change> SubtreeChange::clone() const 
-{
-    return std::auto_ptr<Change>(new SubtreeChange(*this, treeop::DeepChildCopy()));
-}
-//--------------------------------------------------------------------------
-void SubtreeChange::addChange(std::auto_ptr<Change> aChange)
-{
-    rtl::OUString aNodeName(aChange->getNodeName());
-    m_aChanges.find(aNodeName);
-    OSL_ENSURE(m_aChanges.end() == m_aChanges.find(aNodeName),
-        "SubtreeChange::addChange : overwriting an existent change !");
-    delete m_aChanges[aNodeName];
-    m_aChanges[aNodeName] = aChange.release();
-}
-
-//--------------------------------------------------------------------------
-::std::auto_ptr<Change> SubtreeChange::removeChange(rtl::OUString const& _rName)
-{
-    Children::iterator aIter = m_aChanges.find(_rName);
-
-    ::std::auto_ptr<Change> aReturn;
-    if (m_aChanges.end() != aIter)
-    {
-        aReturn = ::std::auto_ptr<Change>(aIter->second);
-        m_aChanges.erase(aIter);
-    }
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-Change* SubtreeChange::getChange(rtl::OUString const& _rName)
-{
-    return doGetChild(_rName);
-}
-
-//--------------------------------------------------------------------------
-Change const* SubtreeChange::getChange(rtl::OUString const& _rName) const
-{
-    return doGetChild(_rName);
-}
-
-//--------------------------------------------------------------------------
-void SubtreeChange::dispatch(ChangeTreeAction& _anAction) const
-{
-    _anAction.handle(*this);
-}
-
-//--------------------------------------------------------------------------
-void SubtreeChange::dispatch(ChangeTreeModification& _anAction)
-{
-    _anAction.handle(*this);
-}
-
-//--------------------------------------------------------------------------
-void SubtreeChange::forEachChange(ChangeTreeAction& _anAction) const
-{
-    ::std::map< ::rtl::OUString,Change* >::const_iterator aIter = m_aChanges.begin();
-    while (aIter != m_aChanges.end())
-    {
-        (aIter++)->second->dispatch(_anAction);
-    }
-}
-
-//--------------------------------------------------------------------------
-void SubtreeChange::forEachChange(ChangeTreeModification& _anAction)
-{
-    ::std::map< ::rtl::OUString,Change* >::const_iterator aIter = m_aChanges.begin();
-    while (aIter != m_aChanges.end())
-    {
-        (aIter++)->second->dispatch(_anAction);
-    }
-}
-
-//--------------------------------------------------------------------------
-Change* SubtreeChange::doGetChild(rtl::OUString const& _rName) const
-{
-    Children::const_iterator aIter = m_aChanges.find(_rName);
-    return (aIter != m_aChanges.end()) ? aIter->second : NULL;
-}
-
-//--------------------------------------------------------------------------
-uno::Sequence< rtl::OUString > SubtreeChange::elementNames() const
-{
-    uno::Sequence< rtl::OUString > aReturn(size());
-    rtl::OUString* pReturn = aReturn.getArray();
-
-    for	(	Children::const_iterator aCollector = m_aChanges.begin();
-            aCollector != m_aChanges.end();
-            ++aCollector, ++pReturn
-        )
-    {
-        *pReturn = aCollector->first;
-    }
-
-    return aReturn;
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::MutatingChildIterator SubtreeChange::begin_changes() throw()
-{
-    return MutatingChildIterator(m_aChanges.begin());
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::MutatingChildIterator SubtreeChange::end_changes() throw()
-{
-    return MutatingChildIterator(m_aChanges.end());
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::ChildIterator SubtreeChange::begin() const throw()
-{
-    return ChildIterator(this);
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::ChildIterator SubtreeChange::end() const throw()
-{
-    return ChildIterator(this, ChildIterator::EndPos());
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::ChildIterator::ChildIterator(const SubtreeChange* _pTree)
-    :m_aNames(_pTree->elementNames())
-    ,m_pTree(_pTree)
-    ,m_nPos(0)
-{
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::ChildIterator::ChildIterator(const SubtreeChange* _pTree, struct EndPos)
-    :m_aNames(_pTree->elementNames())
-    ,m_pTree(_pTree)
-    ,m_nPos(_pTree->size())
-{
-}
-
-//--------------------------------------------------------------------------
-Change const & SubtreeChange::ChildIterator::operator*() const
-{
-    OSL_ENSURE(isValid(), "SubtreeChange::ChildIterator::operator* : invalid iterator !");
-
-    if (!isValid()) 
-        throw configuration::Exception("INTERNAL ERROR: Invalid SubtreeChange::ChildIterator dereferenced");
-        
-    return *m_pTree->getChange(m_aNames[m_nPos]);
-}
-
-//--------------------------------------------------------------------------
-Change const * SubtreeChange::ChildIterator::operator->() const
-{
-    if (isValid())
-        return m_pTree->getChange(m_aNames[m_nPos]);
-    OSL_ENSURE(sal_False, "SubtreeChange::ChildIterator::operator-> : invalid iterator !");
-    return NULL;
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::ChildIterator& SubtreeChange::ChildIterator::operator++()
-{
-    OSL_ENSURE(m_nPos < m_aNames.getLength(), "SubtreeChange::ChildIterator : can't increment the end iterator !");
-    if (m_nPos < m_aNames.getLength())
-        ++m_nPos;
-    return *this;
-}
-
-//--------------------------------------------------------------------------
-SubtreeChange::ChildIterator& SubtreeChange::ChildIterator::operator--()
-{
-    OSL_ENSURE(m_nPos > 0, "SubtreeChange::ChildIterator : can't decrement the begin iterator !");
-    if (m_nPos > 0)
-        --m_nPos;
-    return *this;
-}
-
-//--------------------------------------------------------------------------
-bool operator==(SubtreeChange::ChildIterator const& lhs, SubtreeChange::ChildIterator const& rhs)
-{
-    return (lhs.m_pTree == rhs.m_pTree) && (lhs.m_nPos == rhs.m_nPos);
-}
-
-//==========================================================================
-//= SubtreeChangeReferrer
-//==========================================================================
-//--------------------------------------------------------------------------
-SubtreeChangeReferrer::SubtreeChangeReferrer(const SubtreeChange& _rSource)
-    :SubtreeChange(_rSource, treeop::NoChildCopy())
-{
-    ChildIterator aSourceChildren = _rSource.begin();
-    while (aSourceChildren != _rSource.end())
-    {
-        const Change* pChange = &*aSourceChildren;
-        OSL_ENSURE(pChange, "SubtreeChangeReferrer::SubtreeChangeReferrer : invalid change !");
-        if	(dynamic_cast< ValueChange const * >(pChange) != 0 ||
-             dynamic_cast< RemoveNode const * >(pChange) != 0 ||
-             dynamic_cast< AddNode const * >(pChange) != 0)
-            SubtreeChange::addChange(::std::auto_ptr<Change>(const_cast<Change*>(pChange)));
-        else if	(dynamic_cast< SubtreeChange const * >(pChange) != 0 ||
-                 dynamic_cast< SubtreeChangeReferrer const * >(pChange) != 0)
-        {
-            SubtreeChange::addChange(::std::auto_ptr<Change>(new SubtreeChangeReferrer(*static_cast<const SubtreeChange*>(pChange))));
-        }
-        else
-            OSL_ENSURE(sal_False, "SubtreeChangeReferrer::SubtreeChangeReferrer : unknown changes type !");
-
-        ++aSourceChildren;
-    }
-}
-
-//--------------------------------------------------------------------------
-SubtreeChangeReferrer::~SubtreeChangeReferrer()
-{
-    for	(	Children::iterator aChildren = m_aChanges.begin();
-            aChildren != m_aChanges.end();
-            
-        )
-    {
-        const Change* pChange = aChildren->second;
-        Children::iterator aCurrent = aChildren++;
-
-        if	(dynamic_cast< ValueChange const * >(pChange) != 0 ||
-             dynamic_cast< RemoveNode const * >(pChange) != 0 ||
-             dynamic_cast< AddNode const * >(pChange) != 0)
-        {
-            // we just hold references to the non-SubtreeChange-objects, so don't delete them
-            m_aChanges.erase(aCurrent);
-        }
-        else if	(dynamic_cast< SubtreeChange const * >(pChange) != 0 ||
-                 dynamic_cast< SubtreeChangeReferrer const * >(pChange) != 0)
-        {
-            // nothing to do
-        }
-        else
-            OSL_ENSURE(sal_False, "SubtreeChangeReferrer::~SubtreeChangeReferrer : unknown changes type !");
-    }
-
-    // the base class will remove the remaining SubtreeChanges, which are SubtreeChangeReferrer's in real
-}
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/tree/localizedtreeactions.cxx b/configmgr/source/tree/localizedtreeactions.cxx
deleted file mode 100644
index 24c7fb88b9..0000000000
--- a/configmgr/source/tree/localizedtreeactions.cxx
+++ /dev/null
@@ -1,546 +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: localizedtreeactions.cxx,v $
- * $Revision: 1.19 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "localizedtreeactions.hxx"
-#include "treeactions.hxx"
-#include "builddata.hxx"
-#include "subtree.hxx"
-#include "matchlocale.hxx"
-#include "typeconverter.hxx"
-#include "change.hxx"
-#include "treechangefactory.hxx"
-#include "treenodefactory.hxx"
-#include "strdecl.hxx"
-#include <osl/diagnose.h>
-
-
-//..........................................................................
-namespace configmgr
-{
-
-//--------------------------------------------------------------------------
-namespace 
-{
-//--------------------------------------------------------------------------
-    //==========================================================================
-    //= OCloneForLocale
-    //==========================================================================
-    //= clones a subtree , in the process selecting only the best match locale 
-    //= from the set representation of localized values
-    //==========================================================================
-    class OCloneForLocale : public NodeAction
-    {
-        rtl::OUString			m_sTargetLocale;
-        std::auto_ptr<INode>	m_pClone;	
-    public:
-        OCloneForLocale(rtl::OUString const& aLocale) : m_sTargetLocale(aLocale) {}
-        std::auto_ptr<INode> getResult() { return m_pClone; }
-
-    private:
-        void handle(ValueNode const& _aValue);
-        void handle(ISubtree const&  _aSubtree);
-    };
-//--------------------------------------------------------------------------
-    struct OCloneChildrenForLocale : NodeAction
-    {
-        ISubtree&				m_rParent;	
-        localehelper::FindBestLocale&			m_rLocaleMatcher;
-    public:
-        OCloneChildrenForLocale(ISubtree& _rParent, localehelper::FindBestLocale& _rLocaleMatcher) 
-            : m_rParent(_rParent)
-            , m_rLocaleMatcher(_rLocaleMatcher) 
-        {}
-
-        virtual void handle(ValueNode const& _aValue);
-        virtual void handle(ISubtree const&  _aSubtree);
-    };
-
-//--------------------------------------------------------------------------
-    struct OSelectForLocale : NodeAction
-    {
-        ValueNode const*	m_pFound;	
-        localehelper::FindBestLocale&		m_rLocaleMatcher;
-    public:
-        OSelectForLocale(localehelper::FindBestLocale& _rLocaleMatcher) 
-            : m_pFound(NULL)
-            , m_rLocaleMatcher(_rLocaleMatcher) 
-        {}
-
-
-        bool hasResult() const
-        { return m_pFound != NULL; }
-
-        ValueNode const* getResult() const
-        { return m_pFound; }
-
-    private:
-        virtual void handle(ValueNode const& _aValue);
-        virtual void handle(ISubtree const&  _aSubtree);
-
-        void maybeSelect(ValueNode const& _aNode);
-    };
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-    void OSelectForLocale::handle(ValueNode const& _aValue)
-    {
-        maybeSelect(_aValue);
-    }
-//--------------------------------------------------------------------------
-       void OSelectForLocale::handle(ISubtree const&  /*_aSubtree*/)
-    {
-        OSL_ENSURE(false, "INTERNAL ERROR: Inconsistent data: Found a Subtree in a set of localized values");
-    }
-//--------------------------------------------------------------------------
-    void OSelectForLocale::maybeSelect(ValueNode const& _aNode)
-    {
-        if (m_rLocaleMatcher.accept( localehelper::makeLocale(_aNode.getName()) ) )
-            m_pFound = &_aNode;
-
-        else
-            OSL_ENSURE(m_pFound, "WARNING: Node Locale wasn't accepted, but no node had been found before");
-    }
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-    std::auto_ptr< INode > implReduceLocalizedSet(ISubtree const&  _aSubtree, localehelper::FindBestLocale& _rLocaleMatcher)
-    {
-    // -- find the best-match locale -----------------------------
-        _rLocaleMatcher.reset();
-
-        OSelectForLocale aSelector(_rLocaleMatcher);
-
-        aSelector.applyToChildren(_aSubtree);
-
-        std::auto_ptr< INode > pResult;
-
-    // -- look for a non-NULL value -----------------------------
-        uno::Type aValueType;
-        if (aSelector.hasResult())
-        {
-            ValueNode const& rSelected = *aSelector.getResult();
-
-            aValueType = rSelected.getValueType();
-
-            if (!rSelected.isNull()) // values are present - clone it from the values
-            {
-                pResult.reset ( new ValueNode(  _aSubtree.getName(),
-                                                rSelected.getValue(), rSelected.getDefault(),
-                                                _aSubtree.getAttributes() 
-                              ) );
-
-            }
-        }
-        else // no entry - exract the type to be used from the template name
-            aValueType = parseTemplateName(_aSubtree.getElementTemplateName());
-        
-    // --  create NULL value, if none was found -----------------------------
-        // create a NULL of the found type
-        if (pResult.get() == NULL)
-        {
-            pResult.reset( new ValueNode(  _aSubtree.getName(),
-                                            aValueType,
-                                            _aSubtree.getAttributes() 
-                         ) );
-        }
-
-    // -- -----------------------------
-        OSL_ENSURE( aValueType != uno::Type(), "VOID result type found");
-#if OSL_DEBUG_LEVEL > 0
-        uno::Type aTemplateType = parseTemplateName( _aSubtree.getElementTemplateName() );
-        OSL_ENSURE( ( aValueType == aTemplateType ) || ( aTemplateType.getTypeClass() == uno::TypeClass_ANY ),
-                    "ERROR: Found Value Type doesn't match encoded value type in pseudo template name");
-#endif
-        OSL_POSTCOND( static_cast<ValueNode&>(*pResult).getValueType() == aValueType,
-                      "ERROR: Resulting Value Type doesn't match original value type" );
-
-        return pResult;
-    }
-//--------------------------------------------------------------------------
-    std::auto_ptr< INode > implCloneForLocale(ISubtree const&  _aSubtree, localehelper::FindBestLocale& _rLocaleMatcher)
-    {
-        std::auto_ptr< INode > pClone;
-
-        if (isLocalizedValueSet(_aSubtree))
-        {
-            pClone = implReduceLocalizedSet(_aSubtree, _rLocaleMatcher);
-        }
-        else
-        {
-            // ISubtree should get a clone(NoChildCopy) member ...
-            std::auto_ptr< Subtree > pCloneTree( new Subtree(_aSubtree, treeop::NoChildCopy()) );
-
-            OCloneChildrenForLocale aSubCloner(*pCloneTree,_rLocaleMatcher);
-
-            aSubCloner.applyToChildren(_aSubtree);
-            
-            pClone.reset( pCloneTree.release() );
-        }
-
-        return pClone;
-    }
-//--------------------------------------------------------------------------
-//--- OCloneChildrenForLocale:-----------------------------------------------------------------------
-
-    void OCloneChildrenForLocale::handle(ValueNode const& _aValue)
-    {
-        // just a single value - nothing to do
-        std::auto_ptr< INode > pClone( _aValue.clone() );
-
-        m_rParent.addChild(pClone);
-
-    }
-//--------------------------------------------------------------------------
-    void OCloneChildrenForLocale::handle(ISubtree const&  _aSubtree)
-    {
-        std::auto_ptr< INode > pClone = implCloneForLocale(_aSubtree,m_rLocaleMatcher);
-
-        m_rParent.addChild(pClone);
-    }
-
-    //--------------------------------------------------------------------------
-    //= OCloneForLocale
-
-    //		rtl::OUString			m_sTargetLocale;
-    //		std::auto_ptr<INode>	m_pClone;	
-
-    void OCloneForLocale::handle(ValueNode const& _aValue)
-    {
-        // just a single value - nothing to do
-        std::auto_ptr< INode > pClone( _aValue.clone() );
-
-        m_pClone = pClone; 
-    }
-    //--------------------------------------------------------------------------
-    void OCloneForLocale::handle(ISubtree const&  _aSubtree)
-    {
-        localehelper::FindBestLocale aLocaleMatcher( localehelper::makeLocale(m_sTargetLocale) );
-
-        m_pClone = implCloneForLocale(_aSubtree,aLocaleMatcher);
-    }
-    //--------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------
-} // anonymous namespace
-
-//==========================================================================
-// Helper function to invoke the previous ones properly
-
-// convert to the given locale format, assuming the original representation was expanded
-static std::auto_ptr<INode> impl_cloneExpandedForLocale(INode const* _pNode, rtl::OUString const& _sLocale)
-{
-    OSL_ASSERT(_pNode != NULL);
-
-    if ( localehelper::designatesAllLocales(localehelper::makeLocale(_sLocale)) ) // from expanded to expanded
-    {
-        return _pNode->clone();
-    }
-
-    else // needs reduction
-    {
-        OCloneForLocale aCloner(_sLocale);
-        aCloner.applyToNode(*_pNode);
-        return aCloner.getResult();
-    }
-}
-//--------------------------------------------------------------------------
-
-// convert to the given locale format, assuming the original representation was expanded
-static rtl::Reference< data::TreeSegment > old_cloneExpandedForLocale(rtl::OUString const& _sName, INode const* _pNode, rtl::OUString const& _sLocale)
-{
-    if (_pNode == NULL)
-        return rtl::Reference< data::TreeSegment >();
-
-    std::auto_ptr<INode> aResult;
-    if (dynamic_cast< ISubtree const * >(_pNode) == 0) // simple value - nothing to reduce
-        aResult = _pNode->clone();
-
-    else
-        aResult = impl_cloneExpandedForLocale(_pNode,_sLocale);
-
-    return data::TreeSegment::create(_sName,aResult);
-}
-//--------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------	
-//--------------------------------------------------------------------------
-rtl::Reference< data::TreeSegment > cloneExpandedForLocale(sharable::TreeFragment * tree, rtl::OUString const& _sLocale)
-{
-    std::auto_ptr<INode> aOldTree = data::convertTree(tree, true);
-
-    return old_cloneExpandedForLocale(tree->getName(), aOldTree.get(), _sLocale);
-}
-//--------------------------------------------------------------------------
-// convert to the given locale format, assuming the original representation was expanded
-std::auto_ptr<INode> reduceExpandedForLocale(std::auto_ptr<ISubtree> _pNode, rtl::OUString const& _sLocale)
-{
-    std::auto_ptr<INode> aResult;
-
-    if ( _pNode.get() == NULL ||                           // nothing to reduce
-         localehelper::designatesAllLocales(localehelper::makeLocale(_sLocale)) ) // from expanded to expanded                   
-    {
-        aResult.reset( _pNode.release() );
-    }
-
-    else // needs reduction
-    {			
-        OCloneForLocale aCloner(_sLocale);
-        aCloner.applyToNode(*_pNode);
-        aResult = aCloner.getResult();
-
-        OSL_ENSURE(aResult.get(),"Cloning a tree for a locale unexpectedly produced NOTHING");
-    }
-    return aResult;
-}
-//--------------------------------------------------------------------------
-namespace 
-{
-//--------------------------------------------------------------------------
-    class ExpandTreeForLocale : NodeModification
-    {
-        ISubtree & m_rParent;
-        rtl::OUString const & m_aSourceLocale;
-
-        ExpandTreeForLocale(ISubtree & _rParent,rtl::OUString const & _aSourceLocale)
-        : m_rParent(_rParent)
-        , m_aSourceLocale(_aSourceLocale)
-        {}
-
-        void handle(ISubtree& _rNode);
-        void handle(ValueNode& _rNode);
-
-        void substitute(std::auto_ptr<INode> _aExpanded);
-    public:
-        static void expand(ISubtree& _rTree, rtl::OUString const & _aSourceLocale)
-        {
-            ExpandTreeForLocale(_rTree,_aSourceLocale).applyToChildren(_rTree);
-        }
-
-        // returns NULL, if not a localized value
-        static std::auto_ptr<ISubtree> expanded(ValueNode const& _aNode, rtl::OUString const & _aSourceLocale);
-    };
-
-//--------------------------------------------------------------------------
-    class ExpandChangesForLocale : ChangeTreeModification
-    {
-        SubtreeChange & m_rParent;
-        rtl::OUString const & m_aSourceLocale;
-
-        ExpandChangesForLocale(SubtreeChange & _rParent,rtl::OUString const & _aSourceLocale)
-        : m_rParent(_rParent)
-        , m_aSourceLocale(_aSourceLocale)
-        {}
-
-        void handle(SubtreeChange& _rNode);
-        void handle(ValueChange& _rNode);
-
-        void handle(AddNode& _rNode);
-        void handle(RemoveNode& _rNode);
-
-        void substitute(std::auto_ptr<Change> _aExpanded);
-    public:
-        static void expand(SubtreeChange& _rTree, rtl::OUString const & _aSourceLocale)
-        {
-            ExpandChangesForLocale(_rTree,_aSourceLocale).applyToChildren(_rTree);
-        }
-
-        // returns NULL, if not a localized value
-        static std::auto_ptr<SubtreeChange> expanded(ValueChange const& _aNode, rtl::OUString const & _aSourceLocale);
-    };
-//--------------------------------------------------------------------------
-inline
-void ExpandTreeForLocale::substitute(std::auto_ptr<INode> _aExpanded)
-{
-    m_rParent.removeChild(_aExpanded->getName());
-    m_rParent.addChild(_aExpanded);
-}
-
-//--------------------------------------------------------------------------
-void ExpandTreeForLocale::handle(ISubtree& _rNode)
-{
-    expand(_rNode,m_aSourceLocale);
-}
-
-//--------------------------------------------------------------------------
-void ExpandTreeForLocale::handle(ValueNode& _rNode)
-{
-    std::auto_ptr<ISubtree>  aExpanded = expanded(_rNode,m_aSourceLocale);
-
-    if (aExpanded.get())
-        substitute( base_ptr(aExpanded) );
-}
-
-//--------------------------------------------------------------------------
-
-std::auto_ptr<ISubtree>  ExpandTreeForLocale::expanded(ValueNode const& _aNode, rtl::OUString const & _aSourceLocale)
-{
-    if (!_aNode.isLocalized()) return std::auto_ptr<ISubtree>();
-
-    OTreeNodeFactory & rFactory = getDefaultTreeNodeFactory();
-
-    node::Attributes aValueAttributes = _aNode.getAttributes();
-
-    aValueAttributes.setLocalized(false);
-    if (aValueAttributes.state() == node::isMerged) 
-        aValueAttributes.setState( node::isReplaced );
-
-
-    std::auto_ptr<ValueNode> aValue = _aNode.isNull()
-                ? rFactory.createNullValueNode(_aSourceLocale,_aNode.getValueType(),aValueAttributes)
-                : rFactory.createValueNode(_aSourceLocale,_aNode.getValue(),aValueAttributes);
-
-    std::auto_ptr<ISubtree> aRet = rFactory.createSetNode(  _aNode.getName(), 
-                                                            toTemplateName(_aNode.getValueType()), 
-                                                            TEMPLATE_MODULE_LOCALIZED_VALUE, 
-                                                            _aNode.getAttributes() );
-
-    aRet->addChild(base_ptr(aValue));
-
-    return aRet;
-}
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-inline
-void ExpandChangesForLocale::substitute(std::auto_ptr<Change> _aExpanded)
-{
-    m_rParent.removeChange(_aExpanded->getNodeName());
-    m_rParent.addChange(_aExpanded);
-}
-
-//--------------------------------------------------------------------------
-
-void ExpandChangesForLocale::handle(SubtreeChange& _rNode)
-{
-    expand(_rNode,m_aSourceLocale);
-}
-
-//--------------------------------------------------------------------------
-void ExpandChangesForLocale::handle(ValueChange& _rNode)
-{
-    std::auto_ptr<SubtreeChange> aExpanded = expanded(_rNode,m_aSourceLocale);
-
-    if (aExpanded.get())
-        substitute( base_ptr( aExpanded ) );
-}
-
-//--------------------------------------------------------------------------
-void ExpandChangesForLocale::handle(AddNode& _rNode)
-{
-    rtl::Reference< data::TreeSegment > seg(_rNode.getNewTree());
-    std::auto_ptr<INode> pAdded(data::convertTree(seg.is() ? seg->fragment : 0, false));
-    if (pAdded.get() != NULL)
-    {
-        std::auto_ptr<INode> pExpanded; 
-        if (ISubtree * pAddedTree = pAdded->asISubtree())
-        {
-            ExpandTreeForLocale::expand(*pAddedTree,m_aSourceLocale);
-            pExpanded = pAdded;
-        }
-        else if(ValueNode * pAddedValue = pAdded->asValueNode())
-        {
-            pExpanded = base_ptr(ExpandTreeForLocale::expanded(*pAddedValue,m_aSourceLocale));
-        }
-        else
-            OSL_ENSURE(false, "Cannot expand unknown Node type (found in AddNode)");
-            
-
-        if (pExpanded.get())
-        {
-            rtl::Reference< data::TreeSegment > aExpanded = data::TreeSegment::create( _rNode.getNodeName(),pExpanded);
-            std::auto_ptr<AddNode> aExpandedAdd( new AddNode( aExpanded, _rNode.getNodeName(), _rNode.isToDefault() ) );
-        
-            if (_rNode.isReplacing()) aExpandedAdd->setReplacing();
-
-            substitute( base_ptr( aExpandedAdd ) );
-        }
-    }
-    else
-        OSL_ENSURE(false, "Cannot expand AddNode without content");
-}
-
-//--------------------------------------------------------------------------
-void ExpandChangesForLocale::handle(RemoveNode& )
-{
-    // nothing to do
-}
-
-//--------------------------------------------------------------------------
-std::auto_ptr<SubtreeChange> ExpandChangesForLocale::expanded(ValueChange const& _aNode, rtl::OUString const & _aSourceLocale)
-{
-    std::auto_ptr<SubtreeChange> aRet;
-    if (_aNode.isLocalizedValue())
-    {
-        OTreeNodeFactory & rNodeFactory = getDefaultTreeNodeFactory();
-        OTreeChangeFactory & rFactory = getDefaultTreeChangeFactory();
-
-        node::Attributes aValueAttributes = _aNode.getAttributes();
-
-        aValueAttributes.setLocalized(false);
-        if (aValueAttributes.state() == node::isMerged) 
-            aValueAttributes.setState( node::isReplaced );
-
-
-        rtl::OUString const sTemplateName = toTemplateName(_aNode.getValueType());
-
-        std::auto_ptr<ValueNode> aValue = _aNode.getNewValue().hasValue()
-                    ? rNodeFactory.createValueNode(sTemplateName,_aNode.getNewValue(),aValueAttributes)
-                    : rNodeFactory.createNullValueNode(sTemplateName,_aNode.getValueType(),aValueAttributes);
-
-        rtl::Reference< data::TreeSegment > aValueSegment = data::TreeSegment::create(_aSourceLocale, base_ptr(aValue));
-
-        std::auto_ptr<AddNode> aAddValue = rFactory.createAddNodeChange(aValueSegment,_aSourceLocale,_aNode.isToDefault());
-        aAddValue->setReplacing();
-
-        aRet = rFactory.createSetNodeChange( _aNode.getNodeName(), 
-                                            sTemplateName, 
-                                            TEMPLATE_MODULE_LOCALIZED_VALUE, 
-                                            _aNode.getAttributes() );
-
-        aRet->addChange(base_ptr(aAddValue));
-    }
-    return aRet;
-}
-
-//--------------------------------------------------------------------------
-} // anonymous namespace
-//--------------------------------------------------------------------------
-
-//--------------------------------------------------------------------------
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/tree/makefile.mk b/configmgr/source/tree/makefile.mk
deleted file mode 100644
index 41cf2e0c5f..0000000000
--- a/configmgr/source/tree/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=..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=configmgr
-TARGET=cm
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings ---
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-# --- Files ---
-
-SLOFILES=\
-    $(SLO)$/builddata.obj		\
-    $(SLO)$/node.obj			\
-    $(SLO)$/treefragment.obj	\
-    $(SLO)$/treesegment.obj		\
-    $(SLO)$/nodevisitor.obj		\
-    $(SLO)$/changes.obj			\
-    $(SLO)$/treenodefactory.obj			\
-    $(SLO)$/treechangefactory.obj		\
-    $(SLO)$/localizedtreeactions.obj	\
-    $(SLO)$/treeactions.obj		\
-    $(SLO)$/cmtreemodel.obj		\
-    $(SLO)$/cmtree.obj			\
-    $(SLO)$/nodeconverter.obj	\
-    $(SLO)$/updatehelper.obj	\
-    $(SLO)$/mergehelper.obj		\
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/tree/mergehelper.cxx b/configmgr/source/tree/mergehelper.cxx
deleted file mode 100644
index d137032a43..0000000000
--- a/configmgr/source/tree/mergehelper.cxx
+++ /dev/null
@@ -1,459 +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: mergehelper.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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "builddata.hxx"
-#include "nodeconverter.hxx"
-#include "treefragment.hxx"
-#include "treenodefactory.hxx"
-#include "treechangefactory.hxx"
-#include "configpath.hxx"
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-
-
-//..........................................................................
-namespace configmgr
-{
-
-namespace
-{
-//==========================================================================
-//= OCleanupLayerAction
-//==========================================================================
-//= This class cleans up a layer to be merged into an existing tree
-//==========================================================================
-class OCleanupLayerAction : ChangeTreeModification
-{
-    SubtreeChange&      m_rResultTree;	// list which containes changes merged with the existing nodes
-    ISubtree const &    m_rTargetTree;		// reference node needed for merging
-    OTreeNodeConverter  m_aNodeConverter;
-public:
-    static bool adjust(SubtreeChange& _rResultTree, SubtreeChange& _aLayerTree, ISubtree const& _aTargetTree)
-    {
-        return OCleanupLayerAction(_rResultTree,_aTargetTree).impl_cleanup(_aLayerTree);
-    }
-    static bool adjust(SubtreeChange& _rResultTree, SubtreeChange& _aLayerTree, ISubtree const& _aTargetTree, OTreeNodeFactory& _rNodeFactory)
-    {
-        return OCleanupLayerAction(_rResultTree,_aTargetTree,_rNodeFactory).impl_cleanup(_aLayerTree);
-    }
-
-private:
-    OCleanupLayerAction(SubtreeChange& _rResult, ISubtree const& _rTree)
-        :m_rResultTree(_rResult)
-        ,m_rTargetTree(_rTree)
-        ,m_aNodeConverter() 
-    {}
-    
-    OCleanupLayerAction(SubtreeChange& _rResult, ISubtree const& _rTree, OTreeNodeFactory& _rNodeFactory)
-        :m_rResultTree(_rResult)
-        ,m_rTargetTree(_rTree)
-        ,m_aNodeConverter(_rNodeFactory) 
-    {}
-    
-    void handle(ValueChange& aValueNode);
-    void handle(AddNode& aAddNode);
-    void handle(RemoveNode& aRemoveNode);
-    void handle(SubtreeChange& aSubtree);
-
-    bool impl_cleanup(SubtreeChange& _aUpdateTree);
-
-    void add(std::auto_ptr<Change> _pChange);
-    void addReplacedNode(rtl::Reference< data::TreeSegment > const & _aReplacedTree);
-    void addReplacedNode(std::auto_ptr<INode> _aReplacedNode);
-};
-
-// --------------------------------- MergeLayerToTree ---------------------------------
-
-class MergeLayerToTree : ChangeTreeModification
-{
-    ISubtree& m_rTree;
-    
-public:
-    explicit
-    MergeLayerToTree(ISubtree& _rTree):m_rTree(_rTree) {}
-    
-    MergeLayerToTree& merge(SubtreeChange & _rLayerTree);
-private:
-    void handle(ValueChange& aValueNode);
-    void handle(AddNode& aAddNode);
-    void handle(RemoveNode& aRemoveNode);
-    void handle(SubtreeChange& aSubtree);
-
-    static void mergeAttributes(INode& _rNode, node::Attributes const& _aChangeAttributes);
-};
-// --------------------------------- AttributeSetter ---------------------------------
-
-class AttributeSetter : NodeModification
-{
-    node::State m_state;
-    bool        m_bPromoteFinalized;
-public:
-    explicit
-    AttributeSetter(node::State _state, bool _bPromoteFinalized) 
-    : m_state(_state)
-    , m_bPromoteFinalized(_bPromoteFinalized) 
-    {}
-    
-    void setNodeAttributes(INode& _rNode);
-
-    using NodeModification::applyToNode;
-private:
-    void handle(ValueNode& _rValueNode);
-    void handle(ISubtree& _rSubtree);
-};
-// -----------------------------------------------------------------------------	
-
-} // anon namepsace
-// -----------------------------------------------------------------------------	
-// this is our 'exported' function
-
-// -----------------------------------------------------------------------------	
-namespace 
-{
-//==========================================================================
-//= OCleanupLayerAction
-//==========================================================================
-static inline bool isFinal(node::Attributes const& _aAttributes)
-{
-    return _aAttributes.isFinalized() || _aAttributes.isReadonly();
-}
-//==========================================================================
-bool OCleanupLayerAction::impl_cleanup(SubtreeChange& _aUpdateTree)
-{
-    OSL_ENSURE(!_aUpdateTree.isReplacedNode(), "Layer cleanup: A replaced tree should not be merged");
-
-    if (isFinal(m_rTargetTree.getAttributes())) 
-    {
-        CFG_TRACE_WARNING("Layer cleanup : Ignoring change to write-protected tree '%s'",OUSTRING2ASCII(m_rTargetTree.getName()));
-        return false;
-    }
-
-    // first check the changes
-    this->applyToChildren(_aUpdateTree);				
-
-    return m_rResultTree.size() != 0;
-}
-//--------------------------------------------------------------------------
-inline void OCleanupLayerAction::add(std::auto_ptr<Change> _aChange)
-{
-    m_rResultTree.addChange(_aChange);
-}
-//--------------------------------------------------------------------------
-void OCleanupLayerAction::handle(ValueChange& _rChange)
-{
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    OSL_ENSURE(!_rChange.isToDefault(),"Found change to default in layer being merged");
-
-    // replaced state -> should be a full (added/replaced) node
-    //if (_rChange.isReplacedNode() && m_rTargetTree.isSetNodeChange())
-    if ( _rChange.isReplacedValue() )
-    {        
-        std::auto_ptr<ValueNode> pNode( m_aNodeConverter.createCorrespondingNode(_rChange) );
-
-        this->addReplacedNode( base_ptr(pNode) );
-
-    }
-    else if (INode const * const pTargetNode = m_rTargetTree.getChild(sNodeName))
-    {
-        // this mismatch is not discarded here (should be ignored while merging though)
-        OSL_ENSURE(pTargetNode->asValueNode(), "Layer cleanup : Node type mismatch: Value change applied to non-value node !");
-
-        if (!isFinal(pTargetNode->getAttributes()))
-        {
-            std::auto_ptr<Change> pResult( new ValueChange(_rChange) );
-            this->add(pResult);
-        }
-        else 
-        {
-            CFG_TRACE_WARNING("Layer cleanup : Ignoring change to write-protected value '%s'",OUSTRING2ASCII(sNodeName));
-        }
-    }
-    else
-    {
-        OSL_TRACE("Layer cleanup : Found orphaned node (value) '%s'",OUSTRING2ASCII(sNodeName));
-        CFG_TRACE_INFO("Layer cleanup : Found orphaned node (value) '%s'",OUSTRING2ASCII(sNodeName));
-        OSL_ENSURE(false, "Layer cleanup : Found orphaned Value");
-    }
-}
-
-//--------------------------------------------------------------------------
-void OCleanupLayerAction::handle(SubtreeChange& _rChange)
-{
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    OSL_ENSURE(!_rChange.isToDefault(),"Found change to default in layer being merged");
-
-    // replaced state -> should be a full (added/replaced) node
-    if (_rChange.isReplacedNode())
-    {
-        std::auto_ptr<ISubtree> pNode = m_aNodeConverter.createCorrespondingTree(_rChange);
-
-        // mark as complete with defaults)
-        pNode->setLevels(treeop::ALL_LEVELS,treeop::ALL_LEVELS);	
-
-        this->addReplacedNode( base_ptr(pNode) );
-    }
-    else if ( INode const * const pTargetNode = m_rTargetTree.getChild(sNodeName) )
-    {
-        ISubtree const * pTargetTree = pTargetNode->asISubtree();
-
-        if (pTargetTree)
-        {		
-            // generate a new change
-            std::auto_ptr<SubtreeChange> pResult( new SubtreeChange(_rChange, treeop::NoChildCopy()) );			
-
-            // recurse
-            if ( adjust(*pResult,_rChange,*pTargetTree,m_aNodeConverter.nodeFactory()) )
-                this->add(base_ptr(pResult));
-
-            else
-                CFG_TRACE_INFO("Layer cleanup : Found void modification tree '%s'",OUSTRING2ASCII(sNodeName));
-        }
-        else 
-        {
-            OSL_ENSURE(false, "Layer cleanup : Node type mismatch: Tree change applied to non-tree node !");
-            CFG_TRACE_ERROR("Layer cleanup : Discarding schema violation for node '%s'",OUSTRING2ASCII(sNodeName));
-            //throw Whatever();
-        }
-    }
-    else
-    {
-        OSL_TRACE("Layer cleanup : Found orphaned node (subtree) '%s'",OUSTRING2ASCII(sNodeName));
-        CFG_TRACE_INFO("Layer cleanup : Found orphaned node (subtree) '%s'",OUSTRING2ASCII(sNodeName));
-    }
-}
-
-//--------------------------------------------------------------------------
-void OCleanupLayerAction::handle(RemoveNode& _rChange)
-{
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    OSL_ENSURE(!_rChange.isToDefault(),"Found change to default in layer being merged");
-
-    OSL_ENSURE(m_rTargetTree.isSetNode(),"Found RemoveNode for non-set-element in layer being merged");
-    
-    // look up the corresponding node
-    INode const * const pTargetNode = m_rTargetTree.getChild(sNodeName);
-
-    if (pTargetNode)
-    {
-        // generate the same change
-        std::auto_ptr<Change> pResult( new RemoveNode(sNodeName,false) );
-        this->add(pResult);
-    }
-    else
-    {
-        OSL_TRACE("Layer cleanup : Found orphaned node (removal) '%s'",OUSTRING2ASCII(sNodeName));
-        CFG_TRACE_INFO("Layer cleanup : Found orphaned node (removal) '%s'",OUSTRING2ASCII(sNodeName));
-    }
-}
-
-//--------------------------------------------------------------------------
-void OCleanupLayerAction::handle(AddNode& _rChange)
-{
-    OSL_ENSURE(!_rChange.isToDefault(),"Found change to default in layer being merged");
-
-// generate the same change
-    this->addReplacedNode( _rChange.getNewTree() );
-}
-
-//--------------------------------------------------------------------------
-void OCleanupLayerAction::addReplacedNode(std::auto_ptr<INode> _aReplacedNode)
-{
-    OSL_ENSURE(m_rTargetTree.isSetNode(),"Found replaced node for non-set-element in layer being merged");
-
-    OSL_ASSERT(_aReplacedNode.get());
-
-    rtl::OUString sTypeName = m_rTargetTree.getElementTemplateName();
-
-    this->addReplacedNode( data::TreeSegment::create(_aReplacedNode,sTypeName) );	
-}
-
-//--------------------------------------------------------------------------
-void OCleanupLayerAction::addReplacedNode(rtl::Reference< data::TreeSegment > const & _aReplacedTree)
-{
-    OSL_ENSURE(m_rTargetTree.isSetNode(),"Found replaced node for non-set-element in layer being merged");
-
-    OSL_ASSERT(_aReplacedTree.is());
-
-    rtl::OUString sNodeName = _aReplacedTree->fragment->getName();
-
-    // add the tree to the change list
-    std::auto_ptr<AddNode> pResult( new AddNode(_aReplacedTree,sNodeName, false) );
-
-    // look up the corresponding existing node
-    INode const * const pTargetNode = m_rTargetTree.getChild(sNodeName);
-
-    if (pTargetNode) pResult->setReplacing();
-
-    this->add( base_ptr(pResult) );	
-}
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
-void MergeLayerToTree::mergeAttributes(INode& _rNode, node::Attributes const& _aChangeAttributes)
-{
-    OSL_ENSURE(!isFinal(_rNode.getAttributes()),"Layer merge: Node being merged is READONLY - cleanup broken");
-    OSL_ENSURE(_aChangeAttributes.state() == node::isMerged,"Layer merge: Found unexpected state for change being merged");
-
-    _rNode.modifyState(node::isMerged);
-    _rNode.modifyAccess(_aChangeAttributes.getAccess());
-}
-//--------------------------------------------------------------------------
-
-MergeLayerToTree& MergeLayerToTree::merge(SubtreeChange & _rLayerTree)
-{
-    OSL_ENSURE(_rLayerTree.getNodeName() == m_rTree.getName(),"Layer merge: change does not match tree");
-
-    this->applyToChildren(_rLayerTree);
-    mergeAttributes(m_rTree,_rLayerTree.getAttributes());
-
-    return *this;
-}
-//--------------------------------------------------------------------------
-
-void MergeLayerToTree::handle(ValueChange& _rChange)
-{
-    OSL_ENSURE(!_rChange.isToDefault(),"Layer merge: Found change to default - cleanup broken");
-
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    INode * const pTargetNode = m_rTree.getChild(sNodeName);
-
-    OSL_ENSURE(pTargetNode,"Layer merge: Found NULL value - cleanup broken");
-    OSL_ENSURE(!isFinal(pTargetNode->getAttributes()),"Layer merge: Found READONLY value - cleanup broken");
-
-    if (ValueNode* pTargetValue = pTargetNode->asValueNode() )
-    {
-        _rChange.applyChangeNoRecover(*pTargetValue);
-        mergeAttributes(*pTargetValue,_rChange.getAttributes());
-    }
-    else
-    {
-        OSL_ENSURE(false, "Layer merge : Node type mismatch: Value change applied to non-value node !");
-        CFG_TRACE_ERROR("Layer merge : Discarding schema violation for value '%s'",OUSTRING2ASCII(sNodeName));
-        //throw Whatever();
-    }
-}
-//--------------------------------------------------------------------------
-    
-void MergeLayerToTree::handle(AddNode& _rChange)
-{
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    node::State eNodeState = node::isAdded;
-
-    if (_rChange.isReplacing()) 
-    {
-        OSL_VERIFY( m_rTree.removeChild(sNodeName).get() );
-        eNodeState = node::isReplaced;
-    }
-
-    OSL_ENSURE( !m_rTree.getChild(sNodeName),"Layer merge: Found conflicting data on insert - cleanup broken");
-
-    rtl::Reference< data::TreeSegment > aAddedTree = _rChange.getNewTree();
-
-    OSL_ENSURE(aAddedTree.is(), "Layer merge: Found empty data on insert - cleanup broken");
-
-    // clean up the attributes of the added node
-    std::auto_ptr<INode> aAddedData(data::convertTree(aAddedTree->fragment, true));
-
-    AttributeSetter(eNodeState,false).applyToNode(*aAddedData);
-
-    m_rTree.addChild(aAddedData);
-}
-//--------------------------------------------------------------------------
-    
-void MergeLayerToTree::handle(RemoveNode& _rChange)
-{
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    // should have such a node when removing
-    OSL_VERIFY( m_rTree.removeChild(sNodeName).get() );
-}
-//--------------------------------------------------------------------------
-
-    
-void MergeLayerToTree::handle(SubtreeChange& _rChange)
-{
-    OSL_ENSURE(!_rChange.isToDefault(),"Layer merge: Found change to default - cleanup broken");
-
-    rtl::OUString const sNodeName = _rChange.getNodeName();
-
-    INode * const pTargetNode = m_rTree.getChild(sNodeName);
-
-    OSL_ENSURE(pTargetNode,"Layer merge: Found NULL subtree - cleanup broken");
-    OSL_ENSURE(!isFinal(pTargetNode->getAttributes()),"Layer merge: Found READONLY subtree - cleanup broken");
-
-    ISubtree * const pTargetTree = pTargetNode->asISubtree();
-    OSL_ENSURE(pTargetTree,"Layer merge: Found non-tree for SubtreeChange - cleanup broken");
-
-    // recurse
-    MergeLayerToTree(*pTargetTree).merge(_rChange);
-}
-//--------------------------------------------------------------------------
-
-void AttributeSetter::setNodeAttributes(INode& _rNode)
-{
-    node::Attributes const aOldAttributes = _rNode.getAttributes();
-        
-    _rNode.modifyState(m_state);
-    if (m_bPromoteFinalized && isFinal(aOldAttributes))
-        _rNode.modifyAccess(node::accessReadonly);
-}
-// -----------------------------------------------------------------------------	
-
-void AttributeSetter::handle(ValueNode& _rValueNode)
-{
-    setNodeAttributes(_rValueNode);
-}
-// -----------------------------------------------------------------------------	
-
-void AttributeSetter::handle(ISubtree& _rSubtree)
-{
-    setNodeAttributes(_rSubtree);
-    
-    this->applyToChildren(_rSubtree);
-}
-//--------------------------------------------------------------------------
-
-} // anonymous namespace
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/tree/node.cxx b/configmgr/source/tree/node.cxx
deleted file mode 100644
index 3ba3a0b9a6..0000000000
--- a/configmgr/source/tree/node.cxx
+++ /dev/null
@@ -1,538 +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: node.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "node.hxx"
-#include "anydata.hxx"
-#include "treefragment.hxx"
-#include "attributes.hxx"
-#include "utility.hxx"
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Any.hxx>
-
-#ifndef INCLUDED_CSTDDEF
-#include <cstddef>
-#define INCLUDED_CSTDDEF
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace sharable
-    {
-//-----------------------------------------------------------------------------
-
-rtl::OUString NodeInfo::getName() const
-{
-    return rtl::OUString(this->name);
-}
-//-----------------------------------------------------------------------------
-
-configmgr::node::Attributes NodeInfo::getNodeInfoAttributes() const
-{
-    configmgr::node::Attributes aResult;
-
-    bool help = !!(flags & data::Flags::readonly);
-    aResult.setAccess( help,!!(flags & data::Flags::finalized) );
-//    aResult.setAccess( !!(flags & data::Flags::readonly),!!(flags & data::Flags::finalized) );
-
-    aResult.setNullable(!!(flags & data::Flags::nullable));
-    aResult.setLocalized(!!(flags & data::Flags::localized));
-
-    configmgr::node::State state = (flags & data::Flags::defaulted)   ? configmgr::node::isDefault :
-                        (flags & data::Flags::defaultable) ? configmgr::node::isMerged  :
-                                                       configmgr::node::isReplaced;
-    aResult.setState(state);
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-bool NodeInfo::isDefault() const
-{
-    return !!(this->flags & data::Flags::defaulted);
-}
-//-----------------------------------------------------------------------------
-
-bool NodeInfo::isLocalized() const
-{
-    return !!(this->flags & data::Flags::localized);
-}
-//-----------------------------------------------------------------------------
-
-void NodeInfo::markAsDefault(bool bDefault)
-{
-    if (bDefault)
-    {
-        OSL_ENSURE(flags & data::Flags::defaultable,"Marking a non-defaultable node as default");
-        this->flags |= data::Flags::defaulted;
-    }
-    else
-        this->flags &= ~data::Flags::defaulted;
-}
-//-----------------------------------------------------------------------------
-
-bool GroupNode::hasDefaultsAvailable() const
-{
-    if (this->info.isDefault())
-        return true;
-
-    if (node(this)->getTreeFragment()->hasDefaultsAvailable())
-        return true;
-
-#if 0 // extended check for default state
-    for (Node const * pChild = getFirstChild(); pChild != NULL; pChild = getNextChild(pChild))
-        if (! pChild->isDefault() )
-            return false;
-
-    return true;
-#endif
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-Node * GroupNode::getFirstChild()  const
-{
-    OSL_ENSURE(numDescendants, "Groups MUST have at least one child");
-    return const_cast< Node * >(node(this) + 1);
-}
-//-----------------------------------------------------------------------------
-
-static
-sal_uInt16 implGetNextChildOffset(GroupNode const * _pParent, Node const * _pChild)
-{
-    OSL_PRECOND(_pChild, "getNextChild: previous child must not be NULL");
-    OSL_PRECOND(_pChild->getParentNode() == node(_pParent), "getNextChild: not a child of this node");
-
-
-    OSL_ENSURE( node(_pParent) < _pChild && _pChild <= node(_pParent) + _pParent->numDescendants,
-                "getNextChild: child out of descendants range");
-
-    // offset to child's next sibling
-    sal_uInt16 next = 1;
-    if ( _pChild->isGroup())
-    {
-        next = next + _pChild->group.numDescendants;
-    }
-
-    if (_pChild->info.parent + next > _pParent->numDescendants)
-    {
-        OSL_ENSURE(_pChild->info.parent + next == _pParent->numDescendants+1, "Next child candidate should match next sibling here");
-        return 0;
-    }
-    
-    OSL_POSTCOND( (_pChild+next)->getParentNode() == node(_pParent), "getNextChild: not a child of this node");
-    return next;
-}
-//-----------------------------------------------------------------------------
-
-Node * GroupNode::getNextChild(Node * _pChild) const
-{
-    if (sal_uInt16 next = implGetNextChildOffset(this, _pChild))
-        return _pChild + next;
-
-    else
-        return NULL;
-}
-
-Node * GroupNode::getChild(rtl::OUString const & name) const {
-    for (Node * child = getFirstChild(); child != 0;
-         child = getNextChild(child))
-    {
-        if (child->isNamed(name)) {
-            return child;
-        }
-    }
-    return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-// TODO: optimize this - keep a list of such structs ....
-struct SetNodeTemplateData 
-{
-    rtl_uString * name;
-    rtl_uString * module;
-};
-//-----------------------------------------------------------------------------
-static inline
-SetNodeTemplateData * readTemplateData(sal_uInt8 * _aTemplateData)
-{
-    return reinterpret_cast<SetNodeTemplateData *>( _aTemplateData );
-}
-//-----------------------------------------------------------------------------
-
-sal_uInt8 * SetNode::allocTemplateData(const rtl::OUString &rName,
-                                   const rtl::OUString &rModule)
-{
-    SetNodeTemplateData * pData = new SetNodeTemplateData();
-
-    OSL_ENSURE(pData, "Creating template data: unexpected NULL data");
-    
-    pData->name   = acquireString(rName);
-    pData->module = acquireString(rModule);
-
-    return reinterpret_cast<sal_uInt8 *>( pData );
-}
-
-sal_uInt8 * SetNode::copyTemplateData(sal_uInt8 * _aTemplateData)
-{
-    SetNodeTemplateData const * pData = readTemplateData(_aTemplateData);
-
-    OSL_ENSURE(pData, "Copying template data: unexpected NULL data");
-
-    return allocTemplateData(rtl::OUString(pData->name), rtl::OUString(pData->module));
-}
-
-//-----------------------------------------------------------------------------
-
-void SetNode::releaseTemplateData(sal_uInt8 * _aTemplateData)
-{
-    if (!_aTemplateData) return;
-
-    SetNodeTemplateData const * pData = readTemplateData(_aTemplateData);
-
-    OSL_ENSURE(pData, "Freeing template data: unexpected NULL data");
-    
-    rtl_uString_release(pData->name);
-    rtl_uString_release(pData->module);
-
-    delete pData;
-}
-
-//-----------------------------------------------------------------------------
-
-rtl::OUString SetNode::getElementTemplateName() const
-{
-    SetNodeTemplateData const * pData = readTemplateData(this->elementType);
-
-    OSL_ENSURE(pData, "ERROR: No template data found for set");
-    
-    return rtl::OUString(pData->name);
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString SetNode::getElementTemplateModule() const
-{
-    SetNodeTemplateData const * pData = readTemplateData(this->elementType);
-
-    OSL_ENSURE(pData, "ERROR: No template data found for set");
-    
-    return rtl::OUString(pData->module);
-}
-//-----------------------------------------------------------------------------
-
-static inline
-TreeFragment * implGetFragmentFromList(TreeFragment * _aListEntry)
-{
-    return reinterpret_cast<TreeFragment *>(_aListEntry);
-}
-//-----------------------------------------------------------------------------
-
-TreeFragment * SetNode::getFirstElement() const
-{
-    return implGetFragmentFromList(this->elements);
-}
-//-----------------------------------------------------------------------------
-
-TreeFragment * SetNode::getNextElement(TreeFragment * _pElement) const
-{
-    OSL_PRECOND(_pElement, "getNextElement: previous element must not be NULL");
-    OSL_PRECOND(_pElement->header.parent == (Node *)this, 
-                "getNextElement: not an element of this node");
-
-    return implGetFragmentFromList(_pElement->header.next);
-}
-
-TreeFragment * SetNode::getElement(rtl::OUString const & name) const {
-    for (TreeFragment * element = getFirstElement(); element != 0;
-         element = getNextElement(element))
-    {
-        if (element->isNamed(name)) {
-            return element;
-        }
-    }
-    return 0;
-}
-
-void SetNode::addElement(TreeFragment * newElement) {
-    OSL_ASSERT(newElement != 0);
-    newElement->header.next = elements;
-    newElement->header.parent = node(this);
-    elements = newElement;
-}
-
-TreeFragment * SetNode::removeElement(rtl::OUString const & name) {
-    for (TreeFragment ** link = &elements; *link != 0;
-         link = &(*link)->header.next)
-    {
-        if ((*link)->isNamed(name)) {
-            TreeFragment * removed = *link;
-            *link = removed->header.next;
-            removed->header.next = 0;
-            removed->header.parent = 0;
-            return removed;
-        }
-    }
-    return 0;
-}
-
-//-----------------------------------------------------------------------------
-
-bool ValueNode::isNull() const
-{
-    data::Flags::Type availmask = (info.flags & data::Flags::defaulted) ? 
-                                data::Flags::defaultAvailable :
-                                data::Flags::valueAvailable;
-
-    return !(info.flags & availmask);
-}
-//-----------------------------------------------------------------------------
-
-bool ValueNode::hasUsableDefault() const
-{
-    return (info.flags & data::Flags::defaultable) && 
-           (info.flags & (data::Flags::defaultAvailable| data::Flags::nullable));
-}
-//-----------------------------------------------------------------------------
-    
-com::sun::star::uno::Type ValueNode::getValueType() const
-{
-    sal_uInt8 aType = sal_uInt8( info.type & data::Type::mask_valuetype );
-
-    return getUnoType(aType);
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any ValueNode::getValue() const
-{
-    if (info.flags & data::Flags::defaulted) 
-        return getDefaultValue();
-
-    else
-        return getUserValue();
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any ValueNode::getUserValue() const
-{
-    if (info.flags & data::Flags::valueAvailable)
-    {
-        sal_uInt8 aType = sal_uInt8( info.type & data::Type::mask_valuetype );
-
-        return readData(aType,this->value);
-    }
-    else
-        return com::sun::star::uno::Any();
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any ValueNode::getDefaultValue() const
-{
-    if (info.flags & data::Flags::defaultAvailable)
-    {
-        sal_uInt8 aType = sal_uInt8( info.type & data::Type::mask_valuetype );
-
-        return readData(aType,this->defaultValue);
-    }
-    else
-        return com::sun::star::uno::Any();
-}
-
-void ValueNode::setValue(com::sun::star::uno::Any const & newValue) {
-    releaseValue();
-    if (newValue.hasValue()) {
-        sal_uInt8 type = adaptType(newValue);
-        value = allocData(type, newValue);
-        info.flags |= data::Flags::valueAvailable;
-    }
-    info.flags &= ~data::Flags::defaulted;
-}
-
-void ValueNode::setToDefault() {
-    OSL_ASSERT(hasUsableDefault());
-    releaseValue();
-    info.flags |= data::Flags::defaulted;
-}
-
-void ValueNode::changeDefault(com::sun::star::uno::Any const & newDefault) {
-    sal_uInt8 type = static_cast< sal_uInt8 >(
-        info.type & data::Type::mask_valuetype);
-    if (info.flags & data::Flags::defaultAvailable) {
-        OSL_ASSERT(type != data::Type::value_any);
-        freeData(type, defaultValue);
-        defaultValue.data = 0;
-        info.flags &= ~data::Flags::defaultAvailable;
-    }
-    if (newDefault.hasValue()) {
-        type = adaptType(newDefault);
-        defaultValue = allocData(type, newDefault);
-        info.flags |= data::Flags::defaultAvailable;
-    }
-}
-
-void ValueNode::releaseValue() {
-    if ((info.flags & data::Flags::valueAvailable) != 0) {
-        sal_uInt8 type = static_cast< sal_uInt8 >(
-            info.type & data::Type::mask_valuetype);
-        OSL_ASSERT(type != data::Type::value_any);
-        freeData(type, value);
-        value.data = 0;
-        info.flags &= ~data::Flags::valueAvailable;
-    }
-}
-
-sal_uInt8 ValueNode::adaptType(com::sun::star::uno::Any const & newValue) {
-    sal_uInt8 newType = getTypeCode(newValue.getValueType());
-    OSL_ASSERT(newType != data::Type::value_any);
-    sal_uInt8 type = static_cast< sal_uInt8 >(
-        info.type & data::Type::mask_valuetype);
-    if (type == data::Type::value_any) {
-        type = static_cast< sal_uInt8 >(newType & data::Type::mask_valuetype);
-        info.type = (info.type & ~data::Type::mask_valuetype) | type;
-    }
-    OSL_ASSERT(newType == type);
-    return type;
-}
-
-//-----------------------------------------------------------------------------
-
-bool Node::isNamed(rtl::OUString const & _aName) const
-{
-    rtl_uString *pCmpData = _aName.pData;
-    rtl_uString *pNodeData = info.name;
-
-    // Creating an OUString does rather expensive interlocking here.
-    if (pCmpData == pNodeData)
-        return true;
-    if (pCmpData->length != pNodeData->length)
-        return false;
-    return !rtl_ustr_compare_WithLength( pCmpData->buffer,
-                                         pCmpData->length,
-                                         pNodeData->buffer,
-                                         pNodeData->length);
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString Node::getName() const
-{
-    return info.getName();
-}
-//-----------------------------------------------------------------------------
-
-configmgr::node::Attributes Node::getAttributes() const
-{
-    if(this->isFragmentRoot())
-    {
-        return this->getTreeFragment()->getAttributes();
-    }
-    else
-    {
-        return info.getNodeInfoAttributes();
-    }
-}
-//-----------------------------------------------------------------------------
-
-bool Node::isDefault() const
-{
-    return info.isDefault();
-}
-//-----------------------------------------------------------------------------
-
-bool Node::isFragmentRoot() const
-{
-    return !info.parent;
-}
-#if OSL_DEBUG_LEVEL > 0
-//-----------------------------------------------------------------------------
-Node * Node::getParentNode()
-{
-    return info.parent ? this - info.parent : NULL;
-}
-//-----------------------------------------------------------------------------
-
-Node const * Node::getParentNode() const
-{
-    return info.parent ? this - info.parent : NULL;
-}
-#endif
-//-----------------------------------------------------------------------------
-static sal_uInt16 getFragmentIndex(Node const * pNode)
-{
-    sal_uInt16 result = 0;
-    while (sal_uInt16 step = pNode->info.parent)
-    {
-        result = result + step;
-        pNode  -= step;
-    }
-    return result;
-}
-//-----------------------------------------------------------------------------
-
-TreeFragment * Node::getTreeFragment()
-{
-    void * pRoot = this - getFragmentIndex(this);
-
-    void * pFrag = static_cast<char*>(pRoot) - offsetof(TreeFragment,nodes);
-
-    return static_cast<TreeFragment *>(pFrag);
-}
-//-----------------------------------------------------------------------------
-
-TreeFragment const * Node::getTreeFragment() const
-{
-    void const * pRoot = this - getFragmentIndex(this);
-
-    void const * pFrag = static_cast<char const*>(pRoot) - offsetof(TreeFragment,nodes);
-
-    return static_cast<TreeFragment const *>(pFrag);
-}
-
-Node * Node::getSubnode(rtl::OUString const & name) {
-    if (isGroup()) {
-        return group.getChild(name);
-    } else if (isSet()) {
-        TreeFragment * element = set.getElement(name);
-        return element == 0 ? 0 : element->getRootNode();
-    } else {
-        OSL_ASSERT(false);
-        return 0;
-    }
-}
-
-//-----------------------------------------------------------------------------
-    } // namespace sharable
-//-----------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/tree/nodeconverter.cxx b/configmgr/source/tree/nodeconverter.cxx
deleted file mode 100644
index 0048263401..0000000000
--- a/configmgr/source/tree/nodeconverter.cxx
+++ /dev/null
@@ -1,213 +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: nodeconverter.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_configmgr.hxx"
-
-#include "builddata.hxx"
-#include "nodeconverter.hxx"
-#include "treenodefactory.hxx"
-#include <osl/diagnose.h>
-
-
-//..........................................................................
-namespace configmgr
-{
-
-//==========================================================================
-//= OTreeNodeConverter
-//==========================================================================
-OTreeNodeConverter::OTreeNodeConverter()
-: m_rFactory( getDefaultTreeNodeFactory() )
-{
-}
-
-std::auto_ptr<ISubtree>  OTreeNodeConverter::createCorrespondingNode(SubtreeChange const& _rChange)
-{
-    std::auto_ptr<ISubtree> aRet;
-
-    //if ( isLocalizedValueSet(aSubtree) ) { ... } else - no special case yet
-    if (_rChange.isSetNodeChange())
-    {
-        aRet = nodeFactory().createSetNode(_rChange.getNodeName(), 
-                                       _rChange.getElementTemplateName(),
-                                       _rChange.getElementTemplateModule(),
-                                       _rChange.getAttributes());
-    }
-    else 
-    {
-        aRet = nodeFactory().createGroupNode(_rChange.getNodeName(), 
-                                           _rChange.getAttributes());
-    }
-    return aRet;
-}
-
-//--------------------------------------------------------------------------
-std::auto_ptr<ValueNode> OTreeNodeConverter::createCorrespondingNode(ValueChange const&  _rChange)
-{
-   // DEFAULT-TODO
-    OSL_ENSURE(_rChange.getValueType().getTypeClass() != uno::TypeClass_VOID, "Losing type information converting change to value");
-
-    std::auto_ptr<ValueNode> aRet;
-    if (_rChange.getNewValue().hasValue()) 
-       aRet = nodeFactory().createValueNode(_rChange.getNodeName(), _rChange.getNewValue(), _rChange.getAttributes()); 
-
-    else
-       aRet = nodeFactory().createNullValueNode(_rChange.getNodeName(), _rChange.getValueType(), _rChange.getAttributes());
-
-    OSL_ENSURE(aRet.get() && aRet->isValid(), "Could not create corresponding value node");
-
-    return aRet;
-}
-
-//==========================================================================
-//= ONodeConverter
-//==========================================================================
-class ONodeConverter : public ChangeTreeModification
-{
-    OTreeNodeConverter&     m_rFactory;
-    std::auto_ptr<INode>    m_pNode;
-
-public:
-    explicit
-    ONodeConverter(OTreeNodeConverter& rFactory)
-        : m_rFactory(rFactory)
-    {
-    }
-
-    virtual void handle(ValueChange& aValueNode);
-    virtual void handle(AddNode& aAddNode);
-    virtual void handle(RemoveNode& aRemoveNode);
-    virtual void handle(SubtreeChange& aSubtree);
-
-    std::auto_ptr<INode> result() { return m_pNode; }
-
-};
-//==========================================================================
-//= OCreateSubtreeAction
-//==========================================================================
-//= creates a subtree out of a changes list
-//==========================================================================
-struct OCreateSubtreeAction : public ChangeTreeModification
-{
-    ISubtree&	        m_rTree;	
-    OTreeNodeConverter& m_rNodeFactory;
-    
-public:
-    OCreateSubtreeAction(ISubtree& _rTree, OTreeNodeConverter& rFactory)
-        :m_rTree(_rTree)
-        ,m_rNodeFactory(rFactory) {}
-    
-    void handle(ValueChange& aValueNode);
-    void handle(AddNode& aAddNode);
-    void handle(RemoveNode& aRemoveNode);
-    void handle(SubtreeChange& aSubtree);
-};
-
-
-//--------------------------------------------------------------------------
-std::auto_ptr<ISubtree> OTreeNodeConverter::createCorrespondingTree(SubtreeChange& _rChange)
-{
-    std::auto_ptr<ISubtree> pBaseTree = this->createCorrespondingNode(_rChange);
-
-    OCreateSubtreeAction aNextLevel(*pBaseTree,*this);
-    _rChange.forEachChange(aNextLevel);
-
-    return pBaseTree;
-}
-
-//--------------------------------------------------------------------------
-void ONodeConverter::handle(ValueChange& aValueNode)
-{
-    m_pNode = base_ptr(m_rFactory.createCorrespondingNode(aValueNode));
-}
-
-//--------------------------------------------------------------------------
-void ONodeConverter::handle(AddNode& aAddNode)
-{
-    rtl::Reference< data::TreeSegment > seg(aAddNode.getNewTree());
-    m_pNode = data::convertTree(seg.is() ? seg->fragment : 0, true);
-}
-
-//--------------------------------------------------------------------------
-void ONodeConverter::handle(RemoveNode& /*aRemoveNode*/)
-{
-    m_pNode.reset();
-}
-
-//--------------------------------------------------------------------------
-void ONodeConverter::handle(SubtreeChange& aSubtree)
-{
-    m_pNode = base_ptr(m_rFactory.createCorrespondingNode(aSubtree));
-}
-
-//--------------------------------------------------------------------------
-void OCreateSubtreeAction::handle(ValueChange& _rChange)
-{
-    // create a node by a ValueChange
-    std::auto_ptr<ValueNode> pNode = m_rNodeFactory.createCorrespondingNode(_rChange); 
-
-    m_rTree.addChild(base_ptr(pNode));	
-}
-
-//--------------------------------------------------------------------------
-void OCreateSubtreeAction::handle(SubtreeChange& _rChange)
-{
-    // create a node from a SubtreeChange (recursively)
-    std::auto_ptr<ISubtree> pNode = m_rNodeFactory.createCorrespondingTree(_rChange);
-
-    // add it to the tree
-    m_rTree.addChild(base_ptr(pNode));	
-}
-
-//--------------------------------------------------------------------------
-void OCreateSubtreeAction::handle(RemoveNode& _rChange)
-{
-    { (void)_rChange; }
-    // we have nothing to do
-    OSL_ENSURE(!m_rTree.getChild(_rChange.getNodeName()), "Removed node found in tree being built");
-}
-
-//--------------------------------------------------------------------------
-void OCreateSubtreeAction::handle(AddNode& _rChange)
-{
-    // free the node and add it to the subtree
-    rtl::Reference< data::TreeSegment > aNewNode = _rChange.getNewTree();
-    m_rTree.addChild(data::convertTree(aNewNode.is() ? aNewNode->fragment : 0, true));
-}
-
-
-//--------------------------------------------------------------------------
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/tree/nodevisitor.cxx b/configmgr/source/tree/nodevisitor.cxx
deleted file mode 100644
index 1cda707125..0000000000
--- a/configmgr/source/tree/nodevisitor.cxx
+++ /dev/null
@@ -1,107 +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: nodevisitor.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include "sal/config.h"
-
-#include "osl/diagnose.h"
-
-#include "flags.hxx"
-#include "nodevisitor.hxx"
-#include "node.hxx"
-#include "treefragment.hxx"
-
-namespace configmgr { namespace data {
-
-NodeVisitor::~NodeVisitor() {}
-
-bool NodeVisitor::visitNode(sharable::Node * node) {
-    switch (node->info.type & data::Type::mask_nodetype) {
-    case data::Type::nodetype_value:
-        return handle(&node->value);
-    case data::Type::nodetype_group:
-        return handle(&node->group);
-    case data::Type::nodetype_set:
-        return handle(&node->set);
-    default:
-        OSL_ASSERT(false);
-        return false;
-    }
-}
-
-bool NodeVisitor::visitChildren(sharable::GroupNode * node) {
-    for (sharable::Node * child = node->getFirstChild(); child != 0;
-         child = node->getNextChild(child))
-    {
-        if (visitNode(child)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool NodeVisitor::handle(sharable::Node *) {
-    return false;
-}
-
-bool NodeVisitor::handle(sharable::ValueNode * node) {
-    return handle(sharable::node(node));
-}
-
-bool NodeVisitor::handle(sharable::GroupNode * node) {
-    return handle(sharable::node(node));
-}
-
-bool NodeVisitor::handle(sharable::SetNode * node) {
-    return handle(sharable::node(node));
-}
-
-SetVisitor::~SetVisitor() {}
-
-bool SetVisitor::visitTree(sharable::TreeFragment * tree) {
-    return handle(tree);
-}
-
-bool SetVisitor::visitElements(sharable::SetNode * node) {
-    for (sharable::TreeFragment * element = node->getFirstElement();
-         element != 0; element = node->getNextElement(element))
-    {
-        if (handle(element)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool SetVisitor::handle(sharable::TreeFragment * tree) {
-    return visitNode(tree->getRootNode());
-}
-
-} }
diff --git a/configmgr/source/tree/subtree.hxx b/configmgr/source/tree/subtree.hxx
deleted file mode 100644
index 2c9e0b4af7..0000000000
--- a/configmgr/source/tree/subtree.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: subtree.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_SUBTREE_HXX
-#define CONFIGMGR_SUBTREE_HXX
-
-#include "valuenode.hxx"
-#include <rtl/ustring.hxx>
-
-#include <memory>
-#include <set>
-#include <vector>
-
-namespace configmgr
-{
-    // List sorted by name for binary search
-    class ChildListSet {
-        std::vector< INode* > m_aChildList;
-        
-        ChildListSet(ChildListSet const&);
-        ChildListSet& operator=(ChildListSet const& aSet);
-    public:
-        std::vector< INode* >::iterator begin() const { return const_cast<std::vector< INode* >*>(&m_aChildList)->begin(); }
-        std::vector< INode* >::iterator end()   const { return const_cast<std::vector< INode* >*>(&m_aChildList)->end(); }
-        INode *erase(INode *pNode);
-        std::vector< INode* >::iterator find(INode *pNode) const;
-        std::pair<std::vector< INode* >::iterator, bool> insert(INode *aInsert);
-
-        ChildListSet() : m_aChildList(0) {}
-        ChildListSet(ChildListSet const&, treeop::DeepChildCopy);
-        ~ChildListSet();
-    };	
-    
-// Inner Node
-    class Subtree : public ISubtree
-    {
-        ChildListSet   m_aChildren;		
-        virtual INode* doGetChild(rtl::OUString const& name) const;
-
-    public:		
-        Subtree(){}
-        Subtree(const rtl::OUString& _rName,
-                const node::Attributes& _rAttrs)
-                :ISubtree(_rName, _rAttrs){};				
-
-        Subtree(const ISubtree& _rOther, treeop::NoChildCopy)
-            : ISubtree(_rOther), m_aChildren(){};				
-
-        Subtree(const rtl::OUString& _rName, 
-                const rtl::OUString& _rTemplateName, const rtl::OUString& _rTemplateModule,
-                const node::Attributes& _rAttrs)
-                :ISubtree(_rName, _rTemplateName, _rTemplateModule, _rAttrs){};				
-
-        Subtree(const Subtree& _rOther, treeop::DeepChildCopy _dc)
-            : ISubtree(_rOther), m_aChildren(_rOther.m_aChildren,_dc){}
-        
-        virtual INode* addChild(std::auto_ptr<INode> node);	// takes ownership
-        virtual ::std::auto_ptr<INode> removeChild(rtl::OUString const& name);
-
-        virtual std::auto_ptr<INode> clone() const;
-
-// Iteration support
-        virtual void forEachChild(NodeAction& anAction) const;
-        virtual void forEachChild(NodeModification& anAction);		
-    };
-    
-
-
-    // to search in ChildListSet a value
-    class SearchNode : public INode
-    {
-    public:
-        SearchNode(rtl::OUString const& aName);
-        virtual ~SearchNode();
-        virtual std::auto_ptr<INode> clone() const;
-        
-// double dispatch support
-            virtual void dispatch(NodeAction& /*anAction*/) const { }
-            virtual void dispatch(NodeModification& /*anAction*/) { } 
-    };
-
-// -----------------------------------------------------------------------------	
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/tree/treeactions.cxx b/configmgr/source/tree/treeactions.cxx
deleted file mode 100644
index 4b782df956..0000000000
--- a/configmgr/source/tree/treeactions.cxx
+++ /dev/null
@@ -1,67 +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: treeactions.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "treeactions.hxx"
-#include <osl/diagnose.h>
-
-
-//..........................................................................
-namespace configmgr
-{
-
-//==========================================================================
-//= OChangeActionCounter
-//==========================================================================
-
-//--------------------------------------------------------------------------
-void OChangeActionCounter::handle(ValueChange const& /*aValueNode*/){ ++nValues; }
-
-//--------------------------------------------------------------------------
-void OChangeActionCounter::handle(AddNode const& /*aAddNode*/){	++nAdds; }
-
-//--------------------------------------------------------------------------
-void OChangeActionCounter::handle(RemoveNode const& /*aRemoveNode*/){ ++nRemoves; }
-
-//--------------------------------------------------------------------------
-void OChangeActionCounter::handle(SubtreeChange const& aSubtree)
-{		
-    applyToChildren(aSubtree);		
-}
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/tree/treechangefactory.cxx b/configmgr/source/tree/treechangefactory.cxx
deleted file mode 100644
index 5c7333eba0..0000000000
--- a/configmgr/source/tree/treechangefactory.cxx
+++ /dev/null
@@ -1,126 +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: treechangefactory.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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "treechangefactory.hxx"
-#include "change.hxx"
-#include "configpath.hxx"
-
-namespace configmgr
-{
-//= dummy helpe ============================================================
-bool isGenericSetElementType(rtl::OUString const& _aElementType)
-{
-    return !! _aElementType.equals( getGenericSetElementType() );
-}
-
-bool isDummySetElementModule(rtl::OUString const& _aElementModule)
-{
-    return !! _aElementModule.equals( getDummySetElementModule() );
-}
-
-rtl::OUString getGenericSetElementType()
-{
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
-}
-
-rtl::OUString getDummySetElementModule()
-{
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cfg:dummy-change"));
-}
-    
-//= static default ============================================================
-OTreeChangeFactory& getDefaultTreeChangeFactory()
-{
-    static OTreeChangeFactory aDefaultFactory;
-    return aDefaultFactory;
-}
-
-//= SubtreeChanges ============================================================
-std::auto_ptr<SubtreeChange> OTreeChangeFactory::createDummyChange(
-    rtl::OUString const& _aName, rtl::OUString const& _aElementTypeName)
-{
-    std::auto_ptr<SubtreeChange> pResult;
-
-    if (_aElementTypeName.getLength() == 0)
-    {
-        pResult.reset( new SubtreeChange(_aName, node::Attributes()) );
-    }
-    else
-    {
-        pResult.reset( new SubtreeChange(_aName,
-                                         _aElementTypeName,
-                                         getDummySetElementModule(),
-                                         node::Attributes()) );
-    }
-    return pResult;
-}
-
-//-----------------------------------------------
-std::auto_ptr<SubtreeChange> OTreeChangeFactory::createSetNodeChange(
-                                rtl::OUString const& _aName,
-                                rtl::OUString const& _aTemplateName, 
-                                rtl::OUString const& _aTemplateModule,
-                                node::Attributes _aAttrs,
-                                bool _bToDefault)
-{
-    return std::auto_ptr<SubtreeChange>(new SubtreeChange(_aName,
-                                                        _aTemplateName,
-                                                        _aTemplateModule,
-                                                        _aAttrs,_bToDefault));
-}
-//-----------------------------------------------
-
-//= Set Changes ============================================================
-std::auto_ptr<AddNode> OTreeChangeFactory::createAddNodeChange(
-    rtl::Reference< data::TreeSegment > const & _aNewTree,
-                                rtl::OUString const& _aName,
-                                bool _bToDefault)
-{
-    return std::auto_ptr<AddNode>(new AddNode(_aNewTree,_aName,_bToDefault));
-}
-
-//-----------------------------------------------
-std::auto_ptr<RemoveNode> OTreeChangeFactory::createRemoveNodeChange(
-                                rtl::OUString const& _aName,
-                                bool _bToDefault)
-{
-    return std::auto_ptr<RemoveNode>(new RemoveNode(_aName,_bToDefault));
-}
-
-//-----------------------------------------------
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/tree/treefragment.cxx b/configmgr/source/tree/treefragment.cxx
deleted file mode 100644
index 0ee33b9485..0000000000
--- a/configmgr/source/tree/treefragment.cxx
+++ /dev/null
@@ -1,133 +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: treefragment.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_configmgr.hxx"
-
-#include "treefragment.hxx"
-#include "utility.hxx"
-#include "attributes.hxx"
-#include <rtl/ustring.hxx>
-
-// memset
-#include <string.h>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace sharable
-    {
-//-----------------------------------------------------------------------------
-rtl::OUString TreeFragment::getName() const
-{
-    return rtl::OUString(this->header.name);
-}
-
-void TreeFragment::setName(rtl::OUString const & name) {
-    rtl_uString * old = header.name;
-    header.name = acquireString(name);
-    rtl_uString_release(old);
-}
-
-//-----------------------------------------------------------------------------
-
-bool TreeFragment::isNamed(rtl::OUString const & _aName) const
-{
-    // TODO: optimize comparison
-    return !!(this->getName() == _aName);
-}
-//-----------------------------------------------------------------------------
-            
-bool TreeFragment::hasDefaultsAvailable() const
-{
-    return (this->header.state & data::State::flag_default_avail) || isDefault();
-}
-//-----------------------------------------------------------------------------
-
-
-bool TreeFragment::isDefault() const
-{
-    return (this->header.state & data::State::mask_state) == data::State::defaulted;
-}
-//-----------------------------------------------------------------------------
-
-bool TreeFragment::isNew() const
-{
-    return (this->header.state & data::State::mask_state) == data::State::added;
-}
-//-----------------------------------------------------------------------------
-
-configmgr::node::Attributes TreeFragment::getAttributes() const
-{
-    configmgr::node::Attributes aResult;
-
-    switch (this->header.state & data::State::mask_state)
-    {
-    case data::State::merged:     aResult.setState(configmgr::node::isMerged);   break;
-    case data::State::defaulted:  aResult.setState(configmgr::node::isDefault);  break;
-    case data::State::replaced:   aResult.setState(configmgr::node::isReplaced); break;
-    case data::State::added:      aResult.setState(configmgr::node::isAdded);    break;
-    default: OSL_ASSERT(false); break; // not reachable
-    }    
-
-    aResult.setRemovability(!!(this->header.state & data::State::flag_removable),
-                            !!(this->header.state & data::State::flag_mandatory));
-
-    
-    OSL_ASSERT( header.count != 0 );
-    NodeInfo const & aRootNodeInfo = this->nodes[0].info;
-
-    aResult.setAccess(  !!(this->header.state & data::State::flag_readonly), 
-                        !!(aRootNodeInfo.flags & data::Flags::finalized)  ); 
-
-    aResult.setLocalized ( !!(aRootNodeInfo.flags & data::Flags::localized));
-
-    return aResult;
-}
-
-TreeFragment *TreeFragment::allocate(sal_uInt32 nFragments)
-{
-    sal_uInt32 nSize = sizeof(TreeFragment) + sizeof(Node) * (nFragments-1);
-    sal_uInt8 *pMem = new sal_uInt8 [nSize];
-    memset (pMem, 0, nSize);
-    return reinterpret_cast<TreeFragment *>(pMem);
-}
-
-void TreeFragment::free_shallow(TreeFragment *pFragment )
-{
-    delete[] (sal_uInt8 *) pFragment;
-}
-
-//-----------------------------------------------------------------------------
-    } // namespace sharable
-//-----------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/tree/treenodefactory.cxx b/configmgr/source/tree/treenodefactory.cxx
deleted file mode 100644
index 1c34e2f899..0000000000
--- a/configmgr/source/tree/treenodefactory.cxx
+++ /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: treenodefactory.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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "treenodefactory.hxx"
-#include "valuenode.hxx"
-#include "subtree.hxx"
-#include "treechangefactory.hxx"
-#include "configpath.hxx"
-
-namespace configmgr
-{
-    
-//= static default ============================================================
-OTreeNodeFactory& getDefaultTreeNodeFactory()
-{
-    static OTreeNodeFactory aDefaultFactory;
-    return aDefaultFactory;
-}
-
-//= ValueNodes ============================================================
-
-std::auto_ptr<ValueNode> OTreeNodeFactory::createValueNode(
-                            rtl::OUString const& aName,
-                            uno::Any const& aValue, 
-                            node::Attributes _aAttrs)
-{
-    OSL_ENSURE(aValue.hasValue(), "OTreeNodeFactory: Creating a value node having no type");
-    return std::auto_ptr<ValueNode>( new ValueNode(aName, aValue, _aAttrs) );
-}
-
-//-----------------------------------------------
-
-std::auto_ptr<ValueNode> OTreeNodeFactory::createValueNode(
-                            rtl::OUString const& aName,
-                            uno::Any const& aValue, 
-                            uno::Any const& aDefault, 
-                            node::Attributes _aAttrs)
-{
-    OSL_ENSURE(aValue.hasValue() || aDefault.hasValue(), "OTreeNodeFactory: Creating a value node having no type");
-    return std::auto_ptr<ValueNode>( new ValueNode(aName, aValue, aDefault, _aAttrs) );
-}
-
-
-//-----------------------------------------------
-
-std::auto_ptr<ValueNode>  OTreeNodeFactory::createNullValueNode(
-                            rtl::OUString const& aName,
-                            uno::Type const& aType, 
-                            node::Attributes _aAttrs)
-{
-    OSL_ENSURE(aType.getTypeClass() != uno::TypeClass_VOID, "OTreeNodeFactory: Creating a value node having VOID type");
-    return std::auto_ptr<ValueNode>( new ValueNode(aName, aType, _aAttrs) );
-}
-
-
-//-----------------------------------------------
-
-std::auto_ptr<ISubtree> OTreeNodeFactory::createGroupNode(
-                            rtl::OUString const& aName,
-                            node::Attributes _aAttrs)
-{
-    return std::auto_ptr<ISubtree>( new Subtree(aName, _aAttrs) );
-}
-
-
-//-----------------------------------------------
-
-std::auto_ptr<ISubtree> OTreeNodeFactory::createSetNode(
-                            rtl::OUString const& aName,
-                            rtl::OUString const& _rTemplateName, 
-                            rtl::OUString const& _rTemplateModule,
-                            node::Attributes _aAttrs)
-{
-    return std::auto_ptr<ISubtree>( new Subtree(aName, _rTemplateName, _rTemplateModule, _aAttrs) );
-}
-
-//-----------------------------------------------
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/tree/treesegment.cxx b/configmgr/source/tree/treesegment.cxx
deleted file mode 100644
index 5abbc20dc7..0000000000
--- a/configmgr/source/tree/treesegment.cxx
+++ /dev/null
@@ -1,91 +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: treesegment.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include "sal/config.h"
-
-#include <memory>
-
-#include "osl/diagnose.h"
-#include "rtl/ref.hxx"
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "builddata.hxx"
-#include "treesegment.hxx"
-
-namespace configmgr { namespace data {
-
-rtl::Reference< TreeSegment > TreeSegment::create(
-    std::auto_ptr< INode > tree, rtl::OUString const & type)
-{
-    rtl::Reference< TreeSegment > r;
-    if (tree.get() != 0) {
-        std::auto_ptr< sharable::TreeFragment > p(
-            buildElementTree(*tree, type, false));
-        r = new TreeSegment(p.get());
-        p.release();
-    }
-    return r;
-}
-
-rtl::Reference< TreeSegment > TreeSegment::create(
-    rtl::OUString const & name, std::auto_ptr< INode > tree)
-{
-    rtl::Reference< TreeSegment > r;
-    if (tree.get() != 0) {
-        std::auto_ptr< sharable::TreeFragment > p(
-            buildTree(name, *tree, false));
-        r = new TreeSegment(p.get());
-        p.release();
-    }
-    return r;
-}
-
-rtl::Reference< TreeSegment > TreeSegment::create(
-    sharable::TreeFragment * tree)
-{
-    rtl::Reference< TreeSegment > r;
-    if (tree != 0) {
-        std::auto_ptr< sharable::TreeFragment > p(data::buildTree(tree));
-        r = new TreeSegment(p.get());
-        p.release();
-    }
-    return r;
-}
-
-TreeSegment::TreeSegment(sharable::TreeFragment * tree): fragment(tree) {
-    OSL_ASSERT(tree != 0);
-}
-
-TreeSegment::~TreeSegment() {
-    destroyTree(fragment);
-}
-
-} }
diff --git a/configmgr/source/tree/updatehelper.cxx b/configmgr/source/tree/updatehelper.cxx
deleted file mode 100644
index 17a60be4e2..0000000000
--- a/configmgr/source/tree/updatehelper.cxx
+++ /dev/null
@@ -1,625 +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: updatehelper.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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "updatehelper.hxx"
-#include "change.hxx"
-#include "nodeconverter.hxx"
-#include "treeactions.hxx"
-#include "treechangefactory.hxx"
-#include "treenodefactory.hxx"
-
-// -----------------------------------------------------------------------------	
-#include "node.hxx"
-#include "treefragment.hxx"
-#include "builddata.hxx"
-#include "nodevisitor.hxx"
-// -----------------------------------------------------------------------------	
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-
-
-//..........................................................................
-namespace configmgr
-{
-// -----------------------------------------------------------------------------	
-//==========================================================================
-//= AdjustUpdate
-//==========================================================================
-//= This class tests changes on an existing tree and drops them if they 
-//= are not need anymore or alters add nodes in node changes and vice versa
-//==========================================================================
-class AdjustUpdate : ChangeTreeModification
-{
-    SubtreeChange&      m_rChangeList;	// list which containes changes merged with the existing nodes
-    sharable::Node * m_refNode; // reference node needed for merging
-    OTreeNodeConverter  m_aNodeConverter;
-public:
-    static bool adjust(SubtreeChange& _rResultTree, SubtreeChange& _aUpdateTree, 
-                       sharable::Node * targetNode)
-    {
-        return AdjustUpdate(_rResultTree, targetNode).impl_adjust(_aUpdateTree);
-    }
-    static bool adjust(SubtreeChange& _rResultTree, SubtreeChange& _aUpdateTree, 
-                       sharable::Node * targetNode, 
-                        OTreeNodeFactory& _rNodeFactory)
-    {
-        return AdjustUpdate(_rResultTree, targetNode, _rNodeFactory).impl_adjust(_aUpdateTree);
-    }
-private:
-    AdjustUpdate(SubtreeChange& rList, sharable::Node * node)
-        :m_rChangeList(rList)
-        ,m_refNode(node)
-        ,m_aNodeConverter()
-    {}
-    
-    AdjustUpdate(SubtreeChange& rList, sharable::Node * node, OTreeNodeFactory& _rNodeFactory)
-        :m_rChangeList(rList)
-        ,m_refNode(node)
-        ,m_aNodeConverter(_rNodeFactory)
-    {}
-    
-    void handle(ValueChange& aValueNode);
-    void handle(AddNode& aAddNode);
-    void handle(RemoveNode& aRemoveNode);
-    void handle(SubtreeChange& aSubtree);
-
-    bool impl_adjust(SubtreeChange& _aUpdateTree);
-private:
-    // ensuring the correct state
-    bool checkNode() const;
-};
-
-// --------------------------------- ApplyUpdate ---------------------------------
-
-class ApplyUpdate : public ChangeTreeModification
-{
-    sharable::Node *           m_aCurrentNode;
-public:
-    ApplyUpdate(sharable::Node * _aNode) 
-    : m_aCurrentNode(_aNode) 
-    {}
-    
-    void handle(ValueChange& aValueNode);
-    void handle(AddNode& aAddNode);
-    void handle(RemoveNode& aRemoveNode);
-    void handle(SubtreeChange& aSubtree);
-};
-//--------------------------------------------------------------------------
-class ApplyValueChange
-{
-    static 
-    void adjust(uno::Any& aActual, uno::Any const& aTarget);
-
-public:
-    static 
-    void apply(ValueChange& _rValueChange, sharable::ValueNode * valueNode);
-};
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
-// apply a already matching set of changes to the target tree
-    void applyUpdateToTree(SubtreeChange& _anUpdateTree, sharable::Node * _aRootNode)
-    {
-        ApplyUpdate aUpdater(_aRootNode);
-        _anUpdateTree.forEachChange(aUpdater);
-    }
-//--------------------------------------------------------------------------
-// apply a set of changes to the target tree
-    void applyUpdateWithAdjustmentToTree(SubtreeChange& _anUpdateTree, sharable::Node * _aRootNode)
-    {
-    // POST: pSubtree = pSubtree + aChangeList
-    SubtreeChange aActualChanges(_anUpdateTree, treeop::NoChildCopy());
-        
-        if ( AdjustUpdate::adjust(aActualChanges,_anUpdateTree, _aRootNode) )
-        {
-        applyUpdateToTree(aActualChanges, _aRootNode);
-        }    
-        _anUpdateTree.swap(aActualChanges);
-        
-    }
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
-static inline
-rtl::OUString getNodeName(INode const & _aNode)
-{
-    return _aNode.getName();
-}
-//--------------------------------------------------------------------------
-
-static inline
-rtl::OUString getChangeNodeName(Change const & _aChange)
-{
-    return _aChange.getNodeName();
-}
-//--------------------------------------------------------------------------
-
-bool AdjustUpdate::impl_adjust(SubtreeChange& _aUpdateTree)
-{
-    // first check the changes
-    this->applyToChildren(_aUpdateTree);				
-
-    // now check whether there are real modifications
-    OChangeActionCounter aChangeCounter;
-    aChangeCounter.handle(m_rChangeList);
-    CFG_TRACE_INFO_NI("cache manager: counted changes : additions: %i , removes: %i, value changes: %i", aChangeCounter.nAdds, aChangeCounter.nRemoves, aChangeCounter.nValues);
-    
-    return !! aChangeCounter.hasChanges();
-}
-// -----------------------------------------------------------------------------
-
-inline bool AdjustUpdate::checkNode() const
-{
-    // Change a Value
-    OSL_ENSURE(m_refNode != 0, "AdjustUpdate: no data");
-
-    return m_refNode != 0;
-}
-//--------------------------------------------------------------------------
-
-void AdjustUpdate::handle(ValueChange& _rChange)
-{
-    if (checkNode())
-    {
-        // We need to find the element in the tree
-        sharable::Node * childNode = m_refNode->getSubnode(getChangeNodeName(_rChange));		
-        
-        // We have a node so we can keep the Change and the values do not differ
-        if (childNode != 0)
-        {
-            bool bIsValue = childNode->isValue();
-            OSL_ENSURE(bIsValue, "AdjustUpdate : node must be a value node!");
-
-            if (bIsValue && _rChange.isChange())
-            {
-                std::auto_ptr<Change> pChange( new ValueChange(_rChange) );
-                m_rChangeList.addChange(pChange);
-            }
-        }
-        else
-        {
-            std::auto_ptr<ValueNode> pNode = m_aNodeConverter.createCorrespondingNode(_rChange);
-
-            OSL_ENSURE(m_rChangeList.isSetNodeChange(), "Adding a new value to a non-set node");
-            rtl::OUString sTypeName = m_rChangeList.getElementTemplateName();
-
-            rtl::Reference< data::TreeSegment > aNewTree = data::TreeSegment::create(base_ptr(pNode),sTypeName);
-            // add the tree to the change list
-            std::auto_ptr<Change> pChange( new AddNode( aNewTree,_rChange.getNodeName(), _rChange.isToDefault()) );
-            m_rChangeList.addChange(pChange);		
-        }
-    }
-}
-//--------------------------------------------------------------------------
-
-void AdjustUpdate::handle(SubtreeChange& _rChange)
-{
-    if (checkNode())
-    {
-        // We need to find the element in the tree
-        sharable::Node * childNode = m_refNode->getSubnode(getChangeNodeName(_rChange));
-        
-        // if there is a node we continue
-        if (childNode != 0) 
-        {
-            bool bIsSubtree = childNode->isGroup() || childNode->isSet();
-            OSL_ENSURE(bIsSubtree, "AdjustUpdate : node must be a inner node!");
-
-            if (bIsSubtree)
-            {		
-                // generate a new change
-                std::auto_ptr<SubtreeChange> pChange( new SubtreeChange(_rChange, treeop::NoChildCopy()) );			
-
-                // recurse
-                if ( adjust(*pChange,_rChange,childNode,m_aNodeConverter.nodeFactory()) )
-                    m_rChangeList.addChange(base_ptr(pChange));
-            }
-            else
-                OSL_ENSURE(false, "Inconsistent data: Subtree Change is merged into non-subtree node.");
-        }
-        // otherwise we have to create the node
-        else 
-        {
-            std::auto_ptr<ISubtree> pNode = m_aNodeConverter.createCorrespondingTree(_rChange);
-            OSL_ASSERT(pNode.get() != NULL);
-
-            // set the level
-            pNode->setLevels(treeop::ALL_LEVELS,treeop::ALL_LEVELS);	
-
-            OSL_ENSURE(m_rChangeList.isSetNodeChange(), "Adding a new value to a non-set node");
-            rtl::OUString sTypeName = m_rChangeList.getElementTemplateName();
-
-            rtl::Reference< data::TreeSegment > aNewTree = data::TreeSegment::create(base_ptr(pNode), sTypeName);
-
-            // add the tree to the change list
-            std::auto_ptr<Change> pChange( new AddNode(aNewTree,_rChange.getNodeName(), _rChange.isToDefault()) );
-            m_rChangeList.addChange( pChange );		
-        }
-    }
-}
-//--------------------------------------------------------------------------
-
-void AdjustUpdate::handle(RemoveNode& _rChange)
-{
-    if (checkNode())
-    {
-        // We need to find the element in the tree
-        sharable::Node * childNode = m_refNode->getSubnode(getChangeNodeName(_rChange));		
-        
-        // only if there is a node, we will keep the change
-        if (childNode != 0) 
-        {
-            // generate a new change
-            std::auto_ptr<Change> pChange( new RemoveNode(_rChange.getNodeName(),_rChange.isToDefault()) );
-            m_rChangeList.addChange(pChange);
-        }
-    }
-}
-//--------------------------------------------------------------------------
-
-void AdjustUpdate::handle(AddNode& _rChange)
-{
-    if (checkNode())
-    {
-        // We need to find the element in the tree
-        sharable::Node * childNode = m_refNode->getSubnode(getChangeNodeName(_rChange));
-        
-        rtl::Reference< data::TreeSegment > aNewNode = _rChange.getNewTree();
-        std::auto_ptr<AddNode> pChange( new AddNode(aNewNode,_rChange.getNodeName(),_rChange.isToDefault()) );
-        if (childNode != 0)
-        {
-            pChange->setReplacing();
-        }
-        m_rChangeList.addChange(base_ptr(pChange));
-    }
-}
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
-inline 
-void ApplyValueChange::adjust(uno::Any& aActual, uno::Any const& aTarget)
-{
-    // If set - it should already match
-    OSL_ASSERT(!aActual.hasValue() || aTarget == aActual);
-    aActual = aTarget;
-}
-
-//--------------------------------------------------------------------------
-// _rValueChange.applyTo(_aValueNode)
-void ApplyValueChange::apply(ValueChange& _rValueChange, sharable::ValueNode * valueNode)
-{
-    switch (_rValueChange.getMode())
-    {
-    case ValueChange::wasDefault:
-        OSL_ASSERT(valueNode->info.isDefault());
-
-    case ValueChange::changeValue:
-        adjust( _rValueChange.m_aOldValue, valueNode->getValue());
-        valueNode->setValue(_rValueChange.getNewValue());
-        break;
-
-    case ValueChange::setToDefault:
-        adjust(_rValueChange.m_aOldValue, valueNode->getValue());
-        adjust(_rValueChange.m_aValue, valueNode->getDefaultValue());
-        valueNode->setToDefault();
-        break;
-
-    case ValueChange::changeDefault:
-        adjust(_rValueChange.m_aOldValue, valueNode->getDefaultValue());
-        valueNode->changeDefault(_rValueChange.getNewValue());
-        break;
-
-    default:
-        OSL_ENSURE(0, "Unknown mode found for ValueChange");
-        break;
-    }
-}
-//--------------------------------------------------------------------------
-
-void ApplyUpdate::handle(ValueChange& _rChange)
-{
-    // Change a Value
-    OSL_ENSURE(m_aCurrentNode != NULL,"Cannot apply ValueChange without node");
-
-    sharable::Node * childNode = m_aCurrentNode->getSubnode(getChangeNodeName(_rChange));		
-    OSL_ENSURE(childNode != 0, "Cannot apply Change: No node to change");
-
-    sharable::ValueNode * aValueAddr = childNode->valueData();
-    OSL_ENSURE(aValueAddr != NULL,"Cannot apply ValueChange: Node is not a value");
-
-    if (aValueAddr != NULL)
-    ApplyValueChange::apply(_rChange,aValueAddr);
-}
-//--------------------------------------------------------------------------
-    
-void ApplyUpdate::handle(SubtreeChange& _rChange)
-{
-    // handle traversion
-    OSL_ENSURE(m_aCurrentNode != NULL,"Cannot apply SubtreeChange without node");
-
-    sharable::Node * childNode = m_aCurrentNode->getSubnode(getChangeNodeName(_rChange));		
-    OSL_ENSURE(childNode != 0, "Cannot apply Change: No node to change");
-
-    OSL_ENSURE( childNode->isGroup() || childNode->isSet(),
-                "Cannot Apply SubtreeChange: Node is not an inner node");
-
-    if (childNode != 0)
-    {
-        childNode->info.markAsDefault( _rChange.isToDefault() );
-
-        sharable::Node * aOldNode = m_aCurrentNode;
-        m_aCurrentNode = childNode;
-
-        _rChange.forEachChange(*this);
-
-        m_aCurrentNode = aOldNode;
-    }
-}
-//--------------------------------------------------------------------------
-
-void ApplyUpdate::handle(AddNode& _rChange)
-{
-    OSL_ENSURE(m_aCurrentNode != NULL,"Cannot apply AddNode without node");
-
-    sharable::SetNode * aSetNodeAddr = sharable::SetNode::from(m_aCurrentNode);
-    OSL_ENSURE(aSetNodeAddr != NULL,"Cannot apply AddNode: Node is not a set node");
-
-    // Add a new element
-    if (aSetNodeAddr != NULL)
-    {
-    if (_rChange.isReplacing())
-    {
-        sharable::TreeFragment * old = aSetNodeAddr->removeElement(getChangeNodeName(_rChange));
-        OSL_ASSERT(old != 0);
-        _rChange.takeReplacedTree(data::TreeSegment::create(old));
-    }
-
-    sharable::TreeFragment * aNewAddress = data::buildTree(_rChange.getNewTree()->fragment);
-        OSL_ENSURE(aNewAddress != NULL, "ApplyUpdate: AddNode: could not create new element");
-
-        aSetNodeAddr->addElement(aNewAddress);
-
-        _rChange.setInsertedAddress( aNewAddress );
-    }	
-}
-//--------------------------------------------------------------------------
-    
-void ApplyUpdate::handle(RemoveNode& _rChange)
-{
-    OSL_ENSURE(m_aCurrentNode != NULL,"Cannot apply RemoveNode without node");
-
-    sharable::SetNode * aSetNodeAddr = sharable::SetNode::from(m_aCurrentNode);
-    OSL_ENSURE(aSetNodeAddr != NULL,"Cannot apply RemoveNode: Node is not a set node");
-
-    // Remove an element
-    if (aSetNodeAddr != NULL)
-    {
-        sharable::TreeFragment * old = aSetNodeAddr->removeElement(getChangeNodeName(_rChange));
-        OSL_ASSERT(old != 0);
-        _rChange.takeRemovedTree(data::TreeSegment::create(old));
-    }
-}
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    struct ForwardTreeDifferenceBuilder : NodeAction
-    {
-    protected:
-        SubtreeChange&      m_rChangeList;
-        sharable::Node * m_cacheNode;
-
-    public:
-        ForwardTreeDifferenceBuilder(SubtreeChange& rList, sharable::Node * cacheNode)
-        : m_rChangeList(rList)
-        , m_cacheNode(cacheNode)
-        {
-        }
-        
-        virtual void handle(ValueNode const& _aNewNode) 
-        {
-            sharable::Node * childNode = m_cacheNode->getSubnode(getNodeName(_aNewNode));
-            if (childNode != 0)
-            {
-                sharable::ValueNode * valueNode = childNode->valueData();
-
-                OSL_ENSURE(valueNode != 0, "TreeDifferenceBuilder: node must be a value node!");
-
-                // if the values differ add a new change
-                if (_aNewNode.getValue() != valueNode->getValue())
-                {
-                    bool bNewDefault = _aNewNode.isDefault();
-                    bool bOldDefault = valueNode->info.isDefault();
-
-                    ValueChange::Mode eMode;
-                    if (bNewDefault)
-                        if (bOldDefault)
-                            eMode =  ValueChange::changeDefault;
-                        else
-                            eMode =  ValueChange::setToDefault;
-                    else
-                        if (bOldDefault)
-                            eMode =  ValueChange::wasDefault;
-                        else
-                            eMode =  ValueChange::changeValue;
-
-                    std::auto_ptr<Change> pChange(
-                        new ValueChange(_aNewNode.getName(), _aNewNode.getAttributes(), eMode,
-                                        _aNewNode.getValue(), valueNode->getValue()) );
-
-                    m_rChangeList.addChange(pChange);
-                }
-            }
-        }
-        virtual void handle(ISubtree const& _aNewNode)
-        {
-            sharable::Node * childNode = m_cacheNode->getSubnode(getNodeName(_aNewNode));
-
-            if (childNode != 0)
-            {
-                OSL_ENSURE( childNode->isGroup() || childNode->isSet(),
-                            "ForwardTreeDifferenceBuilder: Node must be an inner node");
-
-                // generate a new change		
-                std::auto_ptr<SubtreeChange> pNewChange( new SubtreeChange(_aNewNode) );
-
-                // .. and recurse
-                ForwardTreeDifferenceBuilder aNextLevel(*pNewChange, childNode);
-                aNextLevel.applyToChildren(_aNewNode);
-                
-                // now count if there are any changes
-                OChangeActionCounter aCounter;
-                aCounter.applyToChange(*pNewChange);
-                
-                if (aCounter.hasChanges())
-                    m_rChangeList.addChange(base_ptr(pNewChange));
-            }
-            else if (m_cacheNode != 0 && m_cacheNode->isSet())
-            {
-                // Subtree not in Cache, add in TreeChangeList
-                // SubtreeChange* pChange = new SubtreeChange(_rSubtree);
-                OSL_ENSURE(m_rChangeList.isSetNodeChange(), "Found newly added node in non-set node");
-                rtl::OUString sTypeName = m_rChangeList.getElementTemplateName();
-
-                std::auto_ptr<INode> pSubtree( _aNewNode.clone() );
-                rtl::Reference< data::TreeSegment > aNewTree = data::TreeSegment::create(pSubtree,sTypeName);
-
-                std::auto_ptr<Change> pAdd(new AddNode(aNewTree, _aNewNode.getName(), _aNewNode.isDefault()));
-                
-                m_rChangeList.addChange(pAdd);
-            }
-            else
-                OSL_ENSURE(false, "Found newly added node in group");
-
-        }
-    };
-// -----------------------------------------------------------------------------
-    
-class BackwardTreeDifferenceBuilder: public data::SetVisitor {
-public:
-    BackwardTreeDifferenceBuilder(SubtreeChange & list, ISubtree const * node):
-        m_changeList(list), m_newNode(node) {}
-        
-    void applyToChildren(sharable::Node * cacheNode) {
-        OSL_ASSERT(cacheNode != 0);
-        if (cacheNode->isGroup()) {
-            OSL_ASSERT(!m_changeList.isSetNodeChange());
-            visitChildren(&cacheNode->group);
-        } else if (cacheNode->isSet()) {
-            OSL_ASSERT(m_changeList.isSetNodeChange());
-            visitElements(&cacheNode->set);
-        } else {
-            OSL_ASSERT(false);
-        }
-    }
-
-private:
-    using NodeVisitor::handle;
-
-    virtual bool handle(sharable::Node * node) {
-        OSL_ASSERT(!node->isValue());
-        INode const * newChild = m_newNode->getChild(node->getName());
-        ISubtree const * newTree = newChild == 0 ? 0 : newChild->asISubtree();
-        if (newTree != 0) {
-            // Traverse down to next change:
-            Change * change = m_changeList.getChange(node->getName());
-            std::auto_ptr< Change > newChange;
-            SubtreeChange * groupChange = 0;
-            if (change == 0) { 
-                groupChange = new SubtreeChange(*newTree);
-                newChange.reset(groupChange);
-            } else {
-                groupChange = dynamic_cast< SubtreeChange * >(change);
-                OSL_ASSERT(groupChange != 0);
-            }
-            if (groupChange != 0) {
-                BackwardTreeDifferenceBuilder(*groupChange, newTree).
-                    applyToChildren(node);
-                if (newChange.get() != 0) {
-                    // Now count if there are any real changes:
-                    OChangeActionCounter counter;
-                    counter.applyToChange(*newChange);
-                    if (counter.hasChanges()) {
-                        m_changeList.addChange(newChange);
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    virtual bool handle(sharable::ValueNode *) {
-        return false;
-    }
-
-    virtual bool handle(sharable::TreeFragment * tree) {
-        INode const * newElement = m_newNode->getChild(tree->getName());
-        if (newElement == 0) {
-            // Remove node:
-            std::auto_ptr< Change > remove(
-                new RemoveNode(tree->getName(), tree->isNew()));
-            m_changeList.addChange(remove);
-            return false;
-        } else {
-            // Handle the root node:
-            return SetVisitor::handle(tree);
-        }
-    }
-
-    SubtreeChange & m_changeList;
-    ISubtree const * m_newNode;
-};
-
-//--------------------------------------------------------------------------
-
-// apply a set of changes to the target tree, return true, if there are changes found
-    bool createUpdateFromDifference(SubtreeChange& _rResultingUpdateTree, sharable::Node * existingData, ISubtree const & _aNewData)
-    {
-        OSL_ENSURE(existingData != 0, "Trying to create diffrence for empty data");
-    // create the differences
-        ForwardTreeDifferenceBuilder aForwardTreeDifference(_rResultingUpdateTree, existingData);
-        aForwardTreeDifference.applyToChildren(_aNewData);
-
-        BackwardTreeDifferenceBuilder aBackwardTreeDifference(_rResultingUpdateTree, & _aNewData);
-        aBackwardTreeDifference.applyToChildren(existingData);
-
-        return true;
-    }
-//--------------------------------------------------------------------------
-
-//..........................................................................
-}	// namespace configmgr
-//..........................................................................
-
-
diff --git a/configmgr/source/treecache/cacheaccess.cxx b/configmgr/source/treecache/cacheaccess.cxx
deleted file mode 100644
index 831cd0f2f4..0000000000
--- a/configmgr/source/treecache/cacheaccess.cxx
+++ /dev/null
@@ -1,355 +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: cacheaccess.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_configmgr.hxx"
-
-#include "cacheaccess.hxx"
-#include "tracer.hxx"
-#include "configpath.hxx"
-
-namespace configmgr
-{
-// -------------------------------------------------------------------------
-
-CacheClientAccess::CacheClientAccess(ConfigChangeBroadcastHelper *  _pBroadcastHelper)
-: m_pBroadcastHelper( _pBroadcastHelper )
-{
-}
-// -------------------------------------------------------------------------
-
-CacheClientAccess::~CacheClientAccess()
-{
-    OSL_ENSURE(!m_pBroadcastHelper, "Forgot to dispose broadcast helper");
-}
-// -------------------------------------------------------------------------
-
-ConfigChangeBroadcastHelper *  CacheClientAccess::releaseBroadcaster()
-{
-    ConfigChangeBroadcastHelper * pRet = m_pBroadcastHelper;
-    m_pBroadcastHelper = NULL;
-    return pRet;
-}
-
-// -------------------------------------------------------------------------
-
-bool CacheClientAccess::hasModule(const configuration::AbsolutePath& _aLocation)
-{
-    return this->m_aData.hasModule(_aLocation.getModuleName());
-}
-// -------------------------------------------------------------------------
-
-bool CacheClientAccess::hasModuleDefaults(configuration::AbsolutePath const& _aLocation)
-{
-    return this->m_aData.hasModuleDefaults(_aLocation.getModuleName());
-}
-// -------------------------------------------------------------------------
-void CacheClientAccess::attachModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aModule)
-{
-    this->m_aData.attachModule(_aLocation, _aModule);
-}
-// -------------------------------------------------------------------------
-
-sharable::Node * CacheClientAccess::acquireNode(configuration::AbsolutePath const& rLocation )
-{
-    CFG_TRACE_INFO("CacheClientAccess: Requesting data for path '%s'", OUSTRING2ASCII(rLocation.toString()) );
-
-    sharable::Node * aResult = this->m_aData.acquireNode(rLocation);
-
-    if (aResult != NULL)
-    {
-        CFG_TRACE_INFO_NI("- Data is available - returning Subtree");
-    }
-    else
-        CFG_TRACE_INFO_NI("- Data is not available - returning NULL");
-
-    return aResult;
-}
-// -------------------------------------------------------------------------
-
-oslInterlockedCount CacheClientAccess::releaseNode( configuration::AbsolutePath const& rLocation )
-{
-    CFG_TRACE_INFO("Tree Info: Releasing subtree data for path '%s'", OUSTRING2ASCII(rLocation.toString()) );
-
-    oslInterlockedCount nRet = this->m_aData.releaseModule(rLocation.getModuleName(),false);
-
-    return nRet;
-}
-// -----------------------------------------------------------------------------
-
-void CacheClientAccess::applyUpdate(backend::UpdateInstance & _aUpdate) SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    CFG_TRACE_INFO("CacheClientAccess: Merging changes into subtree '%s'", OUSTRING2ASCII(_aUpdate.root().toString()) );
-
-    this->m_aData.applyUpdate(_aUpdate );
-}
-
-// -----------------------------------------------------------------------------
-sharable::Node * CacheClientAccess::findInnerNode( configuration::AbsolutePath const& aComponentName )
-{
-    sharable::Node * node = m_aData.getNode(aComponentName);
-    return node == 0 || node->isValue() ? 0 : node;
-}
-
-// -------------------------------------------------------------------------
-
-bool CacheClientAccess::insertDefaults( backend::NodeInstance const & _aDefaultData ) SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    CFG_TRACE_INFO("Tree Info: Adding default data for path '%s'", OUSTRING2ASCII(_aDefaultData.root().toString()) );
-
-    return this->m_aData.insertDefaults(_aDefaultData);
-}
-// -------------------------------------------------------------------------
-
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
-
-CacheLoadingAccess::CacheLoadingAccess()
-: m_aDeadModules()
-{
-}
-// -------------------------------------------------------------------------
-
-CacheLoadingAccess::~CacheLoadingAccess()
-{
-}
-
-// -------------------------------------------------------------------------
-
-/// gets a tree reference for the given path if exists
-sharable::TreeFragment * CacheLoadingAccess::getTreeAddress(rtl::OUString const & _aModule)
-{
-    return this->m_aData.getTreeAddress(_aModule);
-}
-// -------------------------------------------------------------------------
-void CacheLoadingAccess::createModule(rtl::OUString const & _aModule)
-{
-    this->m_aData.createModule(_aModule);
-}
-// -------------------------------------------------------------------------
-bool CacheLoadingAccess::hasModule(rtl::OUString const & _aModule)
-{
-    return this->m_aData.hasModule(_aModule);
-}
-// -------------------------------------------------------------------------
-
-bool CacheLoadingAccess::acquireModule(rtl::OUString const & _aModule)
-{
-    CFG_TRACE_INFO("Tree Info: Requesting data for module '%s'", OUSTRING2ASCII(_aModule));
-
-    if (this->m_aData.acquireModule(_aModule))
-    {
-    m_aDeadModules.erase( _aModule );
-    CFG_TRACE_INFO_NI("- Data is available - returning Subtree");
-    return true;
-    }
-    else
-    {
-    CFG_TRACE_INFO_NI("- Data is not available - returning NULL");
-    return false;
-    }
-}
-// -------------------------------------------------------------------------
-
-oslInterlockedCount CacheLoadingAccess::releaseModule( rtl::OUString const & _aModule )
-{
-    CFG_TRACE_INFO("Tree Info: Releasing data for module '%s'", OUSTRING2ASCII(_aModule) );
-
-    oslInterlockedCount nRet = this->m_aData.releaseModule(_aModule,true); // keep
-    if (nRet == 0)
-    {
-        m_aDeadModules[ _aModule ] = TimeStamp::getCurrentTime();
-        CFG_TRACE_INFO_NI("- Last reference released - marking data for cleanup");
-    }
-
-    return nRet;
-}
-// -----------------------------------------------------------------------------
-
-bool CacheLoadingAccess::isEmpty()
-{
-    ExtendedCacheData::ModuleList& rModules = this->m_aData.accessModuleList();
-
-    bool bRet = rModules.empty();
-
-    if (bRet) // while we are at it - clean up
-        m_aDeadModules.clear();
-
-    return bRet;
-}
-// -------------------------------------------------------------------------
-
-sharable::TreeFragment * CacheLoadingAccess::addComponentData( backend::ComponentInstance const & _aComponentInstance,
-                                                        bool _bIncludesDefaults
-                                                       ) SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    CFG_TRACE_INFO("CacheLoadingAccess: Adding component data for module '%s' : %s",
-                    OUSTRING2ASCII(_aComponentInstance.component()),
-                    _bIncludesDefaults ? "Data includes defaults." : "Data does not include defaults." );
-
-    sharable::TreeFragment * aResult = this->m_aData.addComponentData(_aComponentInstance, _bIncludesDefaults);
-    if (aResult != NULL)
-    {
-        m_aDeadModules.erase( _aComponentInstance.component() );
-        CFG_TRACE_INFO_NI("- Data added successfully - returning Subtree");
-    }
-    else
-        CFG_TRACE_INFO_NI("- Data not added - returning NULL");
-
-    return aResult;
-}
-// -------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-void CacheLoadingAccess::addChangesToPending( backend::ConstUpdateInstance const& _anUpdate ) SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    // NICE: m_pPending[_rLocation] += pSubtreeChange;
-    CFG_TRACE_INFO("CacheLoadingAccess: Adding pending changes for subtree '%s'", OUSTRING2ASCII(_anUpdate.root().toString()) );
-
-    this->m_aData.addPending(_anUpdate);
-}
-
-// -----------------------------------------------------------------------------
-std::auto_ptr<SubtreeChange> CacheLoadingAccess::releasePendingChanges(rtl::OUString const& _aComponentName)
-{
-    CFG_TRACE_INFO("Tree Info: extract pending changes from subtree '%s'", OUSTRING2ASCII(_aComponentName) );
-    return this->m_aData.releasePending(_aComponentName);
-}
-
-// -----------------------------------------------------------------------------
-bool CacheLoadingAccess::findPendingChangedModules( std::vector< rtl::OUString > & _rPendingList )
-{
-    this->m_aData.findPendingModules(_rPendingList);
-    return !_rPendingList.empty();
-}
-
-// -------------------------------------------------------------------------
-
-TimeStamp CacheLoadingAccess::collectDisposeList(std::vector< rtl::Reference<CacheLine> > & _rList, TimeStamp const & _aLimitTime, TimeInterval const & _aDelay)
-{
-    TimeStamp aRetTime = TimeStamp::never();
-
-    CFG_TRACE_INFO("Tree Info: Collecting disposable module trees for cleanup" );
-
-    ExtendedCacheData::ModuleList& rActiveModules = this->m_aData.accessModuleList();
-
-    std::map< rtl::OUString, TimeStamp >::iterator it = m_aDeadModules.begin();
-
-    while (it != m_aDeadModules.end())
-    {
-        std::map< rtl::OUString, TimeStamp >::iterator current = it;
-        // increment here, as we may later erase(current)
-        ++it;
-
-#if (OSL_DEBUG_LEVEL > 0) || defined _DBG_UTIL || defined CFG_TRACE_ENABLE
-        rtl::OUString sCurrentName( current->first );
-#endif
-        TimeStamp aExpireTime = current->second + _aDelay;
-        if (aExpireTime <= _aLimitTime)
-        {
-            ExtendedCacheData::ModuleList::iterator itModule = rActiveModules.find( current->first );
-
-            if (itModule != rActiveModules.end())
-            {
-                rtl::Reference<CacheLine> xModule = itModule->second;
-
-                bool bHandled = false;
-
-                if (!xModule.is())
-                {
-                    CFG_TRACE_ERROR_NI("- Unexpected: Module '%s' is NULL in active module list", OUSTRING2ASCII(sCurrentName) );
-                    bHandled = true;
-                }
-                else if (xModule->clientReferences() != 0)// at least in temporary use
-                {
-                    OSL_ENSURE( false, "Referenced entry in dead module list");
-
-                    CFG_TRACE_WARNING_NI("- Module '%s' in (temporary ?) use - rescheduling", OUSTRING2ASCII(sCurrentName) );
-                    bHandled = false; // still remove from the lists
-                }
-                else if (m_aData.hasPending(current->first))
-                {
-                    CFG_TRACE_WARNING_NI("- Module '%s' has pending changes - rescheduling disposal", OUSTRING2ASCII(sCurrentName) );
-                    bHandled = false;
-                }
-                else // now this really can be disposed
-                {
-                    CFG_TRACE_INFO_NI("- Removing module '%s' for disposal", OUSTRING2ASCII(sCurrentName) );
-
-                    // It really is ok to dispose this entry
-                    _rList.push_back(xModule);
-
-                    bHandled = true;
-                }
-
-
-                if (bHandled)
-                {
-                    // really remove
-                    rActiveModules.erase(itModule);
-                    m_aDeadModules.erase(current);
-                }
-                else
-                {
-                    // reschedule
-                    TimeStamp aRetryTime = _aLimitTime + _aDelay;
-                    OSL_ASSERT(aRetryTime > _aLimitTime);
-
-                    current->second = _aLimitTime; // ?
-                    if (aRetryTime < aRetTime)
-                        aRetTime = aRetryTime;
-                }
-            }
-            else
-            {
-                // obsolete dispose list entry - discard
-                OSL_ENSURE( false, "Obsolete entry in dead module list");
-
-                CFG_TRACE_WARNING_NI("- Module '%s' not found any more - obsolete entry in dead module list", OUSTRING2ASCII(sCurrentName) );
-
-                m_aDeadModules.erase(current);
-            }
-        }
-        else // consider for restart time
-        {
-            CFG_TRACE_INFO_NI("- Module '%s' has not expired yet - rescheduling", OUSTRING2ASCII(sCurrentName) );
-
-            if (aExpireTime < aRetTime)
-                aRetTime = aExpireTime;
-        }
-    }
-
-    OSL_ASSERT(aRetTime > _aLimitTime);
-    return aRetTime;
-}
-// -------------------------------------------------------------------------
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/treecache/cacheaccess.hxx b/configmgr/source/treecache/cacheaccess.hxx
deleted file mode 100644
index 3956e7861c..0000000000
--- a/configmgr/source/treecache/cacheaccess.hxx
+++ /dev/null
@@ -1,160 +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: cacheaccess.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CACHEACCESS_HXX
-#define CONFIGMGR_CACHEACCESS_HXX
-
-#include "cachedata.hxx"
-#include "timestamp.hxx"
-#include "utility.hxx"
-#include <boost/utility.hpp>
-#include <osl/mutex.hxx>
-#ifndef _CONFIGMGR_UTILITY_HXX_
-#include <utility.hxx>
-#endif
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-
-namespace configmgr
-{
-////////////////////////////////////////////////////////////////////////////////
-    class ConfigChangeBroadcastHelper;
-    namespace backend
-    {
-        class CacheController;
-    }
-//-----------------------------------------------------------------------------
-
-    class CacheClientAccess: private boost::noncopyable, public salhelper::SimpleReferenceObject
-    {
-    private:
-        CacheData   m_aData;
-
-        ConfigChangeBroadcastHelper* m_pBroadcastHelper;
-    public:
-        explicit
-        CacheClientAccess(ConfigChangeBroadcastHelper* _pBroadcastHelper);
-
-        ~CacheClientAccess();
-        
-        /// gets a helper to broadcast changes for 
-        ConfigChangeBroadcastHelper * getBroadcaster() const
-        { return m_pBroadcastHelper; }
-        
-        /// removes an existing broadcast helper 
-        ConfigChangeBroadcastHelper * releaseBroadcaster();
-
-        // attach a module with a given name
-        void attachModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aModule);
-        /// check if the given module exists already (and is not empty)
-        bool hasModule(const configuration::AbsolutePath& _aLocation);
-        /// checks if the given module exists and has defaults available
-        bool hasModuleDefaults(configuration::AbsolutePath const & _aLocation);
-
-        /// retrieve the subtree at _aPath (maybe if it has the requested defaults) and clientAcquire() it
-        sharable::Node * acquireNode(configuration::AbsolutePath const& _aPath); 
-
-        /** add or merge the given subtree at the given location,
-            return <TRUE/> if the tree has defaults then
-        */
-        bool insertDefaults( backend::NodeInstance const & _aDefaultData ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        /// clientRelease() the tree at aComponentName, and return the resulting reference count
-        oslInterlockedCount releaseNode( configuration::AbsolutePath const& _aPath ); 
-
-        /// retrieve the given subtree without changing its ref count
-        sharable::Node *	findInnerNode(configuration::AbsolutePath const& _aPath );
-
-        /// merge the given change list into this tree - reflects old data to _aUpdate
-        void applyUpdate(backend::UpdateInstance & _aUpdate) SAL_THROW((com::sun::star::uno::RuntimeException));	
-    };
-
-
-////////////////////////////////////////////////////////////////////////////////
-    
-    class CacheLoadingAccess: private boost::noncopyable, public salhelper::SimpleReferenceObject
-    {
-    public:
-        friend class backend::CacheController;
-    private:
-        friend class CacheDisposeScheduler;
-
-        ExtendedCacheData   m_aData;		
-        std::map< rtl::OUString, TimeStamp >		m_aDeadModules;			/// list of nodes which are registered for throwing away
-    public:
-        explicit
-        CacheLoadingAccess();
-        ~CacheLoadingAccess();
-        
-        /// gets a tree address for the given module if it exists
-        sharable::TreeFragment * getTreeAddress(rtl::OUString const & _aModule);
-
-        /// return TRUE if there is no data (left) in this object's cache data 
-        bool isEmpty();
-
-        // create a module with a given name
-        void createModule(rtl::OUString const & _aModule);
-        /// check if the given module exists already (and is not empty)
-        bool hasModule(rtl::OUString const & _aLocation);
-        /// retrieve the subtree at aComponentName and clientAcquire() it, true if succeeded
-        bool acquireModule(rtl::OUString const & _aModule); 
-
-        /// clientRelease() the tree at aComponentName, and return the resulting reference count
-        oslInterlockedCount releaseModule( rtl::OUString const & _aModule ); 
-
-        /// collect the modules that can be disposed now (i.e. released after _rLimitReleaseTime)
-        TimeStamp collectDisposeList(std::vector< rtl::Reference<CacheLine> > & _rList, 
-                                        TimeStamp const & _aLimitTime,			
-                                        TimeInterval const & _aDelay);			
-
-    // stuff that is particular for CacheLoadingAccess
-        /** add the given subtree at the given location,
-            return the tree that is then pertinent and clientAcquire() it once
-        */
-        sharable::TreeFragment * addComponentData( backend::ComponentInstance const & _aComponentInstance, 
-                                            bool _bIncludesDefaults
-                                           ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        /// merge the given change list into the pending change list of this tree
-        void addChangesToPending( backend::ConstUpdateInstance const& _anUpdate ) SAL_THROW((com::sun::star::uno::RuntimeException));
-        /// retrieve accumulated pending changes
-        std::auto_ptr<SubtreeChange> releasePendingChanges(rtl::OUString const& _aModule);
-
-        /// find the modules having pending changes
-        bool findPendingChangedModules( std::vector< rtl::OUString > & _rPendingList );
-    };
-
-
-////////////////////////////////////////////////////////////////////////////////
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/treecache/cachecontroller.cxx b/configmgr/source/treecache/cachecontroller.cxx
deleted file mode 100644
index 513e134e5a..0000000000
--- a/configmgr/source/treecache/cachecontroller.cxx
+++ /dev/null
@@ -1,719 +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: cachecontroller.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_configmgr.hxx"
-
-#include "cachecontroller.hxx"
-#include "disposetimer.hxx"
-#include "cachewritescheduler.hxx"
-#include "builddata.hxx"
-#include "localizedtreeactions.hxx"
-#include "configexcept.hxx"
-#include "tracer.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <osl/diagnose.h>
-#include <rtl/logfile.hxx>
-
-#ifndef _CONFIGMGR_BOOTSTRAP_HXX
-#include "bootstrap.hxx"
-#endif
-
-
-#define RTL_LOGFILE_OU2A(rtlOUString)	(::rtl::OUStringToOString((rtlOUString), RTL_TEXTENCODING_ASCII_US).getStr())
-
-namespace configmgr
-{
-// -------------------------------------------------------------------------
-    namespace backend
-    {
-
-static const rtl::OUString kCacheDisposeDelay(
-    RTL_CONSTASCII_USTRINGPARAM( CONTEXT_ITEM_PREFIX_ "CacheDisposeDelay"));
-static const rtl::OUString kCacheDisposeInterval(
-    RTL_CONSTASCII_USTRINGPARAM( CONTEXT_ITEM_PREFIX_ "CacheDisposeInterval"));
-static const rtl::OUString kCacheWriteInterval(
-    RTL_CONSTASCII_USTRINGPARAM( CONTEXT_ITEM_PREFIX_ "CacheWriteInterval"));
-// -------------------------------------------------------------------------
-
-OTreeDisposeScheduler* CacheController::createDisposer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext)
-{
-    ContextReader aReader(_xContext);
-    sal_uInt32 c_nDefaultDelay = 0;
-    rtl::OUString sDefaultDelay;
-    aReader.getBestContext()->getValueByName(kCacheDisposeDelay) >>= sDefaultDelay;
-    c_nDefaultDelay = sDefaultDelay.toInt32()==0?900:sDefaultDelay.toInt32() ;	
-    
-    sal_uInt32 c_nDefaultInterval = 0;
-    rtl::OUString sDefaultInterval;
-    aReader.getBestContext()->getValueByName(kCacheDisposeInterval) >>= sDefaultInterval;
-    c_nDefaultInterval = sDefaultInterval.toInt32()==0?60:sDefaultInterval.toInt32(); 
-    
-    TimeInterval aDelay(c_nDefaultDelay);
-    TimeInterval aInterval(c_nDefaultInterval);
-
-    return new OTreeDisposeScheduler(*this, aDelay, aInterval);
-}
-
-// -----------------------------------------------------------------------------
-
-OCacheWriteScheduler* CacheController::createCacheWriter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext)
-{
-    ContextReader aReader(_xContext);
-    sal_uInt32 c_nDefaultInterval=0;
-    rtl::OUString sDefaultInterval;
-    aReader.getBestContext()->getValueByName(kCacheWriteInterval) >>= sDefaultInterval;
-    c_nDefaultInterval = sDefaultInterval.toInt32()==0?2:sDefaultInterval.toInt32();
-    
-    TimeInterval aInterval(c_nDefaultInterval);
-    return new OCacheWriteScheduler(*this, aInterval);
-}
-// ----------------------------------------------------------------------------
-
-rtl::Reference<CacheLoadingAccess> CacheController::getCacheAlways(RequestOptions const & _aOptions)
-{
-    rtl::Reference<CacheLoadingAccess> aResult = m_aCacheMap.get(_aOptions);
-    if (!aResult.is())
-    {
-        rtl::Reference<CacheLoadingAccess> aNewCache( new CacheLoadingAccess() );
-        aResult = m_aCacheMap.insert(_aOptions,aNewCache);
-    }
-    return aResult;
-}
-
-// -------------------------------------------------------------------------
-
-// disposing
-// -------------------------------------------------------------------------
-void CacheController::disposeAll(bool _bFlushRemainingUpdates)
-{
-    CFG_TRACE_INFO("CacheController: Disposing all data" );
-    CacheMap::Map aReleaseList;
-
-    if (m_pDisposer)
-    {
-        m_pDisposer->stopAndClearTasks();
-        m_aCacheMap.swap(aReleaseList); // move data out of m_aCacheMap and empty m_aCacheMap
-    }
-
-    if (_bFlushRemainingUpdates)
-    {
-        for (CacheMap::Map::iterator it = aReleaseList.begin(); it != aReleaseList.end(); ++it)
-            saveAllPendingChanges(it->second,it->first);
-    }
-    // free all the trees
-    aReleaseList.clear();
-}
-
-// -------------------------------------------------------------------------
-void CacheController::dispose() SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    UnoApiLock aLock;
-
-    CFG_TRACE_INFO("CacheController: dispose()" );
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::dispose(), disable lazy write cache.");
-    m_bDisposing = true;						 // we are in dispose, handling of errors must be something different.
-
-    // writing of pending updates
-    this->flushCacheWriter();
-
-    // cleaning the cache
-    this->disposeAll(true);
-}
-
-// -------------------------------------------------------------------------
-CacheController::CacheController(rtl::Reference< backend::IMergedDataProvider > const & _xBackend, 
-                                 const uno::Reference<uno::XComponentContext>& xContext)
-: m_aNotifier()
-, m_xBackend(_xBackend)
-, m_aCacheMap()
-, m_aTemplates()
-, m_pDisposer()
-, m_pCacheWriter()
-, m_bDisposing(false)
-{
-    m_pDisposer = this->createDisposer(xContext);
-    m_pCacheWriter = this->createCacheWriter(xContext);
-}
-
-// -------------------------------------------------------------------------
-CacheController::~CacheController()
-{
-    OSL_ENSURE(m_bDisposing == true, "CacheController::dispose() wasn't called, something went wrong.");
-
-    delete m_pDisposer;
-    delete m_pCacheWriter;
-}
-
-// -------------------------------------------------------------------------
-void CacheController::closeModules(std::vector< rtl::Reference<CacheLine> > & _aList, RequestOptions const & _aOptions)
-{
-    //Remove listeners from Backend as module no longer in cache
-    for (sal_uInt32 i =0; i < _aList.size(); ++i)
-    {
-        rtl::OUString aModuleName = _aList[i]->getModuleName();
-        ComponentRequest aRequest(aModuleName, _aOptions);
-        m_xBackend->removeRequestListener(this, aRequest);
-    }
-}
-// -------------------------------------------------------------------------
-#if 0
-static
-std::auto_ptr<ISubtree> reduceSubtreeForLocale(std::auto_ptr<ISubtree> _pSubtree, RequestOptions const & _aOptions)
-{
-    OSL_ENSURE(!_pSubtree.get() || !isLocalizedValueSet(*_pSubtree), "Unexpected node. Expecting a subtree, Found a single localized value.");
-
-    std::auto_ptr<ISubtree> aRet;
-
-    std::auto_ptr<INode> aReduced = reduceExpandedForLocale(_pSubtree, _aOptions.getLocale());
-
-    if (aReduced.get())
-    {
-        if (ISubtree* pReduced =aReduced->asISubtree())
-        {
-            aRet.reset(pReduced);
-            aReduced.release();
-        }
-        else
-        {
-            OSL_ENSURE(false, "Tree unexpectedly reduced to non-tree");
-        }
-    }
-    else
-        OSL_ENSURE(!_pSubtree.get(), "Tree unexpectedly reduced to nothing");
-
-    return aRet;
-}
-#endif
-
-// -------------------------------------------------------------------------
-sharable::TreeFragment * CacheController::loadComponent(ComponentRequest const & _aRequest)
-{
-    CFG_TRACE_INFO("CacheController: loading component '%s'", OUSTRING2ASCII(_aRequest.getComponentName()));
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::loadComponent()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "component: %s", RTL_LOGFILE_OU2A(_aRequest.getComponentName().toString()) );
-
-    rtl::Reference<CacheLoadingAccess> aCache = this->getCacheAlways(_aRequest.getOptions());
-
-    OSL_ENSURE(aCache.is(), "Could not create CacheAccess");
-
-    sharable::TreeFragment * aTemplateResultAdddress;
-
-    OSL_ENSURE(!_aRequest.isForcingReload(),"CacheController: No support for forced requests");
-    if (aCache->hasModule(_aRequest.getComponentName()))
-    {
-        CFG_TRACE_INFO_NI("CacheController: found node in cache");
-        if (_aRequest.getOptions().isRefreshEnabled())
-        {
-            refreshComponent(_aRequest);
-        }
-        aCache->acquireModule(_aRequest.getComponentName());
-    }
-    else
-    {
-        ResultHolder< ComponentInstance > aData = this->loadDirectly(_aRequest,true);
-
-        CFG_TRACE_INFO_NI("CacheController: adding loaded data to the cache");
-
-        aCache->createModule(_aRequest.getComponentName());
-
-        aCache->addComponentData(aData.instance(), true);
-        if (aData.instance().templateData().get()!=NULL)
-            aTemplateResultAdddress = addTemplates(aData.mutableInstance().componentTemplateData() );
-
-        // notify the new data to all clients
-        m_aNotifier.notifyCreated(_aRequest);
-    }
-
-    return aCache->getTreeAddress(_aRequest.getComponentName());
-}
-// -------------------------------------------------------------------------
-
-ResultHolder< ComponentInstance > CacheController::getComponentData(ComponentRequest const & _aRequest,
-                                                  bool _bAddListenter ) SAL_THROW((com::sun::star::uno::Exception))
-{
-    // TODO: Insert check here, if the data is in the cache already - and then clone
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::getComponentData()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "component: %s", RTL_LOGFILE_OU2A(_aRequest.getComponentName().toString()) );
-
-    ResultHolder< ComponentInstance > aRet = this->loadDirectly(_aRequest, _bAddListenter);
-
-    return aRet;
-}
-// -------------------------------------------------------------------------
-
-ResultHolder< NodeInstance > CacheController::getDefaultData(NodeRequest const & _aRequest) SAL_THROW((com::sun::star::uno::Exception))
-{
-    // TODO: Insert check here, if the data is in the cache already - and then clone
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::getDefaultData()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "path: %s", RTL_LOGFILE_OU2A(_aRequest.getPath().toString()) );
-
-    ResultHolder< NodeInstance > aRet = this->loadDefaultsDirectly(_aRequest);
-
-    return aRet;
-}
-// -------------------------------------------------------------------------
-
-configuration::AbsolutePath CacheController::encodeTemplateLocation(const rtl::OUString& _rName, const rtl::OUString &_rModule) const
-{
-    namespace Path = configuration::Path;
-
-//	static const
-//  Component aTemplateRoot = wrapSimpleName(rtl::OUString::createFromAscii("org.openoffice.Templates"));
-
-    Path::Component aTemplateModule = Path::wrapSimpleName(_rModule);
-    Path::Component aTemplateName   = Path::wrapSimpleName(_rName);
-
-    Path::Rep aResult(aTemplateName);
-    aResult.prepend(aTemplateModule);
-//    aResult.prepend(aTemplateRoot);
-
-    return configuration::AbsolutePath(aResult);
-}
-// -------------------------------------------------------------------------
-#if 0
-static
-configuration::AbsolutePath templateLoadLocation(const configuration::AbsolutePath &_rTemplateLocation)
-{
-    namespace Path = configuration::Path;
-
-    static const
-    Path::Component aTemplateRoot = Path::wrapSimpleName(rtl::OUString::createFromAscii("org.openoffice.Templates"));
-
-    Path::Rep aResult(_rTemplateLocation.rep());
-    aResult.prepend(aTemplateRoot);
-
-    return configuration::AbsolutePath(aResult);
-}
-#endif
-// -------------------------------------------------------------------------
-std::auto_ptr<ISubtree> CacheController::loadTemplateData(TemplateRequest const & _aTemplateRequest) SAL_THROW((com::sun::star::uno::Exception))
-{
-    std::auto_ptr<ISubtree> aMultiTemplates;
-    ResultHolder< TemplateInstance > aTemplateInstance = m_xBackend->getTemplateData(_aTemplateRequest);
-    if (aTemplateInstance.is())
-    {
-        OSL_ASSERT(aTemplateInstance->name().getLength() == 0);
-        if (ISubtree * pMulti = aTemplateInstance->data()->asISubtree())
-        {
-            aTemplateInstance.releaseAndClear();
-            aMultiTemplates.reset(pMulti);
-        }
-        else
-            OSL_ENSURE(false,"Requested multiple templates, got non-subtree node");
-    }
-    else
-        OSL_ENSURE(false,"Requested configuration template does not exist");
-
-    if (aMultiTemplates.get() == NULL)
-    {
-        CFG_TRACE_ERROR_NI("CacheController: could not load the templates");
-        throw uno::Exception(::rtl::OUString::createFromAscii("The template description could not be loaded. The template does not exist."), NULL);
-    }
-
-    return  aMultiTemplates;
-}
-// -------------------------------------------------------------------------
-sharable::TreeFragment * CacheController::addTemplates ( backend::ComponentDataStruct const & _aComponentInstance )
-{
-    OSL_PRECOND(_aComponentInstance.data.get(), "addTemplates: Data must not be NULL");
-    rtl::OUString aModuleName = _aComponentInstance.name;
-    m_aTemplates.createModule(aModuleName);
-    configuration::AbsolutePath aTemplateLocation = configuration::AbsolutePath::makeModulePath(_aComponentInstance.name);
-    sharable::TreeFragment * aTemplateAddr = NULL;
-
-    if (!m_aTemplates.hasNode(aTemplateLocation ))
-    {
-        CFG_TRACE_INFO_NI("CacheController: cache miss for that template - loading from backend");
-        aTemplateAddr = m_aTemplates.addTemplates(_aComponentInstance );
-    }
-    OSL_ASSERT (aTemplateAddr != NULL);
-    return aTemplateAddr;
- }
-// -------------------------------------------------------------------------
-
-sharable::TreeFragment * CacheController::loadTemplate(TemplateRequest const & _aRequest) SAL_THROW((com::sun::star::uno::Exception))
-{
-
-    OSL_ENSURE(_aRequest.getTemplateName().getLength() != 0, "CacheController::loadTemplate : invalid template name !");
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::loadTemplate()");
-    RTL_LOGFILE_CONTEXT_TRACE2(aLog, "requested template: %s/%s",
-                                    RTL_LOGFILE_OU2A(_aRequest.getComponentName().toString()) ,
-                                    _aRequest.isComponentRequest() ?
-                                        "*" : RTL_LOGFILE_OU2A(_aRequest.getComponentName().toString()) );
-
-
-    configuration::AbsolutePath aTemplateLocation = encodeTemplateLocation(_aRequest.getTemplateName(), _aRequest.getComponentName());
-
-    rtl::OUString aModuleName =  aTemplateLocation.getModuleName();
-
-    configuration::AbsolutePath aTemplateParent (aTemplateLocation.getParentPath());
-
-    //Load-if-not-there (componentwise)
-    if (!m_aTemplates.hasNode(aTemplateParent))
-    {
-        OSL_ENSURE(aTemplateLocation.getDepth() > 1, "CacheController::ensureTemplate : invalid template location !");
-        TemplateRequest aTemplateRequest = TemplateRequest::forComponent(_aRequest.getComponentName());
-
-        std::auto_ptr<ISubtree> aMultiTemplates = loadTemplateData(aTemplateRequest);
-        //add-if-not-loaded
-        addTemplates(backend::ComponentDataStruct(aMultiTemplates, aModuleName));
-
-    }
-    sharable::TreeFragment * aTemplateAddr = m_aTemplates.getTemplateTree(aTemplateLocation);
-    if (aTemplateAddr == NULL)
-        throw uno::Exception(::rtl::OUString::createFromAscii("Unknown template. Type description could not be found in the given module."), NULL);
-
-    return m_aTemplates.getTreeAddress(aTemplateLocation.getModuleName());
-}
-// -----------------------------------------------------------------------------
-
-ResultHolder< TemplateInstance > CacheController::getTemplateData(TemplateRequest const & _aRequest)
-    SAL_THROW((com::sun::star::uno::Exception))
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::getTemplateData()");
-    RTL_LOGFILE_CONTEXT_TRACE2(aLog, "requested template: %s/%s",
-                   RTL_LOGFILE_OU2A(_aRequest.getComponentName().toString()) ,
-                   _aRequest.isComponentRequest() ?
-                   "*" : RTL_LOGFILE_OU2A(_aRequest.getComponentName().toString()) );
-
-    configuration::AbsolutePath aTemplateLocation = encodeTemplateLocation(_aRequest.getTemplateName(), _aRequest.getComponentName());
-
-    loadTemplate(_aRequest);
-    //configuration::AbsolutePath aTemplateLocation = ensureTemplate(_aRequest.getTemplateName(), _aRequest.getComponentName());
-
-    sharable::TreeFragment * aTemplateAddr = m_aTemplates.getTemplateTree(aTemplateLocation);
-    if (aTemplateAddr == NULL)
-    throw uno::Exception(::rtl::OUString::createFromAscii("Unknown template. Type description could not be found in the given module."), NULL);
-
-    std::auto_ptr<INode> aResultTree = data::convertTree(aTemplateAddr, true);
-
-    TemplateInstance aResult(aResultTree,_aRequest.getTemplateName(), _aRequest.getComponentName());
-
-    return ResultHolder< TemplateInstance >(aResult);
-}
-// -----------------------------------------------------------------------------
-
-void CacheController::saveAndNotify(UpdateRequest const & _anUpdate) SAL_THROW((com::sun::star::uno::Exception))
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::backend::CacheController", "jb99855", "configmgr: CacheController::saveAndNotify()");
-    RTL_LOGFILE_CONTEXT_TRACE1(aLog, "location: %s", RTL_LOGFILE_OU2A(_anUpdate.getUpdateRoot().toString()) );
-    try
-    {
-        // ---------- preworking on the changes ----------
-        // caller must own a read lock on this cache line
-        CFG_TRACE_INFO("CacheController: saving an update for '%s'",OUSTRING2ASCII(_anUpdate.getUpdateRoot().toString()));
-
-        rtl::Reference<CacheLoadingAccess> aCache = m_aCacheMap.get(_anUpdate.getOptions());
-
-        OSL_ENSURE(aCache.is(), "No cache data to update in saveAndNotify");
-
-        if (!aCache.is()) throw lang::DisposedException(rtl::OUString::createFromAscii("Tree to be updated was already disposed"), NULL);
-
-        aCache->addChangesToPending(_anUpdate.getUpdate());
-
-        if ( _anUpdate.isSyncRequired()||  m_bDisposing ) // cannot do it asynchronously
-        {
-            CFG_TRACE_INFO_NI("Running synchronous write");
-            savePendingChanges( aCache, getComponentRequest(_anUpdate) );
-        }
-
-        else
-        {
-            CFG_TRACE_INFO_NI("Posting asynchronous write");
-            m_pCacheWriter->scheduleWrite( getComponentRequest(_anUpdate) );
-        }
-
-        CFG_TRACE_INFO_NI("Notifying the changes");
-        // notify the changes to all clients
-        m_aNotifier.notifyChanged(_anUpdate);
-    }
-    catch(configuration::Exception& ex)
-    {
-        CFG_TRACE_ERROR_NI("Got unexpected exception: %s", ex.what());
-        configapi::ExceptionMapper e(ex);
-        e.unhandled();
-    }
-
-}
-// -----------------------------------------------------------------------------
-
-void CacheController::flushPendingUpdates()SAL_THROW((com::sun::star::uno::Exception))
-{
-    CacheMap::Map aFlushList = m_aCacheMap.copy();
-
-    for (CacheMap::Map::iterator it = aFlushList.begin(); it != aFlushList.end(); ++it)
-        saveAllPendingChanges(it->second,it->first);
-}
-
-void CacheController::flushCacheWriter()SAL_THROW(())
-{
-    //OSL_ASSERT(m_bDisposing);
-
-    if (m_pCacheWriter)
-    {
-        CFG_TRACE_INFO("CacheController: flushing all pending updates");
-
-        m_pCacheWriter->stopAndWriteCache();
-    }
-}
-// -----------------------------------------------------------------------------
-
-bool CacheController::normalizeResult(std::auto_ptr<ISubtree> &  _aResult, RequestOptions const & _aOptions)
-{
-
-    if (_aResult.get()==NULL) return false;
-
-    if (_aOptions.isForAllLocales()) return true;
-
-    std::auto_ptr<INode> aReduced = reduceExpandedForLocale(_aResult, _aOptions.getLocale());
-
-    std::auto_ptr<ISubtree> aReducedTree;
-    if (aReduced.get())
-    {
-        if (ISubtree* pReducedTree =aReduced->asISubtree())
-        {
-            aReduced.release();
-            aReducedTree.reset(pReducedTree);
-        }
-        else
-        {
-            OSL_ENSURE(false, "Tree unexpectedly reduced to non-tree");
-        }
-    }
-    else
-        OSL_ENSURE(false, "Tree unexpectedly reduced to nothing");
-
-
-    _aResult = aReducedTree;
-    bool retCode = _aResult.get()!=NULL ? true : false;
-    return retCode;
-}
-// -----------------------------------------------------------------------------
-
-ResultHolder< ComponentInstance > CacheController::loadDirectly(ComponentRequest const & _aRequest, bool _bAddListenter) SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("CacheController: loading data for component '%s' from the backend", OUSTRING2ASCII(_aRequest.getComponentName()));
-
-    configuration::AbsolutePath aRequestPath = configuration::AbsolutePath::makeModulePath(_aRequest.getComponentName());
-
-    NodeRequest aNodeRequest(aRequestPath, _aRequest.getOptions());
-
-    ResultHolder< ComponentInstance > aResult = m_xBackend->getNodeData(_aRequest, this, _bAddListenter?this:NULL);
-
-    OSL_PRECOND(aResult.mutableInstance().mutableData().get(), "loadDirectly: Data must not be NULL");
-
-    CFG_TRACE_INFO_NI("- loading data completed - normalizing result");
-
-    if (!normalizeResult( aResult.mutableInstance().mutableData(),_aRequest.getOptions()))
-    {
-    CFG_TRACE_ERROR_NI(" - cannot normalized result: failing");
-
-        rtl::OUString sMsg(RTL_CONSTASCII_USTRINGPARAM("Requested data at '"));
-        sMsg += aRequestPath.toString();
-        sMsg += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'is not available: "));
-
-        throw com::sun::star::container::NoSuchElementException(sMsg,NULL);
-    }
-
-    CFG_TRACE_INFO_NI(" - returning normalized defaults");
-
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-ResultHolder< NodeInstance > CacheController::loadDefaultsDirectly(NodeRequest const & _aRequest) SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("CacheController: loading defaults for '%s' from the backend", OUSTRING2ASCII(_aRequest.getPath().toString()));
-
-    ResultHolder< NodeInstance > aResult = m_xBackend->getDefaultData(_aRequest);
-
-    CFG_TRACE_INFO_NI("- loading defaultscompleted - normalizing result");
-
-    normalizeResult(aResult.mutableInstance().mutableData(),_aRequest.getOptions());
-
-    CFG_TRACE_INFO_NI(" - returning normalized defaults");
-
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-void CacheController::saveDirectly(UpdateRequest const & _anUpdate) SAL_THROW((com::sun::star::uno::Exception))
-{
-    m_xBackend->updateNodeData(_anUpdate);
-}
-// -----------------------------------------------------------------------------
-
-void CacheController::savePendingChanges(rtl::Reference<CacheLoadingAccess> const & _aCache, ComponentRequest const & _aComponent) SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("CacheController: saving updates for tree: '%s'", OUSTRING2ASCII(_aComponent.getComponentName()));
-
-    try
-    {
-    CFG_TRACE_INFO2("CacheController: saving updates for tree: '%s'", OUSTRING2ASCII(_aComponent.getComponentName()));
-
-    std::auto_ptr<SubtreeChange> aChangeData = _aCache->releasePendingChanges(_aComponent.getComponentName());
-
-        if (aChangeData.get())
-        {
-        CFG_TRACE_INFO_NI("- found changes - sending to backend");
-
-        configuration::AbsolutePath aRootPath = configuration::AbsolutePath::makeModulePath(_aComponent.getComponentName());
-
-            backend::UpdateRequest anUpdateSpec(aChangeData.get(),aRootPath,_aComponent.getOptions());
-
-            // anUpdateSpec.setRequestId(pInfo->getRequestId(_aRootPath));
-
-            this->saveDirectly(anUpdateSpec);
-
-        CFG_TRACE_INFO_NI("- saving changes completed successfully");
-        }
-        else
-        CFG_TRACE_WARNING_NI("- no changes found - cannot save");
-    }
-    catch(uno::Exception& e)
-    {
-    (void)e;
-    CFG_TRACE_ERROR_NI("CacheController: saving tree '%s' failed: %s",
-               OUSTRING2ASCII(_aComponent.getComponentName()),
-               OUSTRING2ASCII(e.Message) );
-
-    refreshComponent(_aComponent);
-    CFG_TRACE_INFO_NI("- component data invalidated");
-
-    throw;
-    }
-}
-// -----------------------------------------------------------------------------
-
-bool CacheController::saveAllPendingChanges(rtl::Reference<CacheLoadingAccess> const & _aCache, RequestOptions const & _aOptions)
-    SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    CFG_TRACE_INFO("CacheController: Saving all pending changes for cache line");
-    OSL_ASSERT(_aCache.is());
-
-    std::vector< rtl::OUString > aPendingModules;
-    _aCache->findPendingChangedModules(aPendingModules);
-
-    CFG_TRACE_INFO_NI("Found %d changed modules",int(aPendingModules.size()));
-
-    bool bSuccess = true;
-    for (std::vector< rtl::OUString >::iterator it = aPendingModules.begin();
-            it != aPendingModules.end();
-            ++it )
-    {
-        try
-        {
-            this->savePendingChanges(_aCache, ComponentRequest(*it,_aOptions) );
-        }
-        catch (uno::Exception & )
-        {
-            CFG_TRACE_ERROR_NI("CacheController: Exception while saving one module - ignoring");
-            bSuccess = false;
-        }
-    }
-    CFG_TRACE_INFO_NI("Done saving pending changes for cache line");
-
-    return bSuccess;
-}
-// -----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-void CacheController::freeComponent(ComponentRequest const & _aRequest) SAL_THROW(())
-{
-    CFG_TRACE_INFO("CacheController: releasing module '%s' for user '%s' with locale '%s'",
-                    OUSTRING2ASCII(_aRequest.getComponentName()),
-                    OUSTRING2ASCII(_aRequest.getOptions().getEntity()),
-                    OUSTRING2ASCII(_aRequest.getOptions().getLocale()) );
-
-    rtl::Reference<CacheLoadingAccess> aCache = m_aCacheMap.get(_aRequest.getOptions());
-
-    OSL_ENSURE(aCache.is(), "Releasing a nonexisting module");
-
-    if (aCache.is())
-    {
-        if (aCache->releaseModule(_aRequest.getComponentName()) == 0)
-        {
-            // start the cleanup
-            m_pDisposer->scheduleCleanup(_aRequest.getOptions());
-        }
-    }
-} 
-// -----------------------------------------------------------------------------
-void CacheController::dataChanged(const ComponentRequest& _aRequest) SAL_THROW(())
-{
-    refreshComponent(_aRequest);
-}
-// -----------------------------------------------------------------------------
-void CacheController::refreshAllComponents() SAL_THROW((com::sun::star::uno::Exception))
-{
-    CacheMap::Map aRefreshList = m_aCacheMap.copy();
-
-    for (CacheMap::Map::iterator i = aRefreshList.begin(); 
-        i != aRefreshList.end(); ++i)
-    {
-        if (!i->second->isEmpty())
-        {
-            ExtendedCacheData aCacheData = i->second->m_aData;
-            RequestOptions aOption = i->first;
-            CacheData::ModuleList aModuleList = aCacheData.accessModuleList();
-            for (CacheData::ModuleList::iterator itr = aModuleList.begin();
-                itr != aModuleList.end(); ++itr)
-            {
-                //Check the cacheline has atleast one client reference
-
-
-                if (itr->second->clientReferences() > 0)
-                {
-                    ComponentRequest aRequest(itr->first,i->first); 
-                    refreshComponent(aRequest);
-                } else 
-                {
-                    // FIXME: otherwise dispose now
-                    // XXX: (lo) refresh all, preventing cache corruption.
-                    // An unused component should be purged from the cache
-                    // instead of being refreshed
-                    ComponentRequest aRequest(itr->first,i->first); 
-                    refreshComponent(aRequest);
-                }
-            }
-        }
-    }
-}
-
-// -------------------------------------------------------------------------
-    } // namespace
-
-// -------------------------------------------------------------------------
-} // namespace
diff --git a/configmgr/source/treecache/cachecontroller.hxx b/configmgr/source/treecache/cachecontroller.hxx
deleted file mode 100644
index bf6ca4b85e..0000000000
--- a/configmgr/source/treecache/cachecontroller.hxx
+++ /dev/null
@@ -1,341 +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: cachecontroller.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_BACKEND_CACHECONTROLLER_HXX
-#define CONFIGMGR_BACKEND_CACHECONTROLLER_HXX
-
-#include "sal/config.h"
-
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "utility.hxx"
-#include "mergeddataprovider.hxx"
-#include "cacheaccess.hxx"
-#include "cachemulticaster.hxx"
-#include "requestoptions.hxx"
-#include "autoreferencemap.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    class OTreeDisposeScheduler;
-    class OCacheWriteScheduler;
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-// ---------------------------------------------------------------------------
-
-    /** manages a shared data cache for configuration data
-        trying to ensure consistency with a backend
-        and provides access to the data for clients
-    */
-    class CacheController:
-            public salhelper::SimpleReferenceObject,
-            public ITemplateDataProvider, public INodeDataListener
-    {
-    public:
-        /** ctor
-        */
-        explicit
-        CacheController(rtl::Reference< backend::IMergedDataProvider > const & _xBackend, 
-                        const uno::Reference<uno::XComponentContext>& xContext);
-
-        // disposing the cache before destroying
-        void dispose() SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        /** locates data of a component in the cache.
-
-            <p> If the data isn't in the cache it is loaded from the backend. </p>
-
-            @param _aRequest
-                identifies the component to be loaded.
-
-            @returns
-                data that can be used to locate the loaded data in the cache.
-
-            @throws com::sun::star::uno::Exception
-                if loading the data fails.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        sharable::TreeFragment * loadComponent(ComponentRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception));
-
-        /** releases data of a component from the cache.
-
-            <p> Should be called when a client is done with a component.
-                Each calls to <method>loadComponent</method> should
-                be balanced by exactly one call to <method>freeComponent</method>.
-            </p>
-
-            @param _aRequest
-                identifies a component previously loaded via <method>loadComponent</method>.
-
-            @returns
-                data that can be used to locate the loaded data in the cache.
-        */
-        void freeComponent(ComponentRequest const & _aRequest)
-            SAL_THROW(());
-
-        /** refreshes data of an existing component from the backend
-
-            <p> If the data is in the cache already, it is refreshed from the
-                backend and the change are notified to all registered listeners.
-            </p>
-            <p> If the data isn't in the cache nothing is done and
-                a NULL location is returned.
-            </p>
-
-            <p>Note: the caller <strong>must not</strong> hold any lock on the cache line affected.</p>
-
-            @param _aRequest
-                identifies the component to be refreshed.
-
-            @returns
-                data that can be used to locate the refreshed data in the cache.
-
-                <p>If there is no data to refresh a NULL location is returned.</p>
-
-            @throws com::sun::star::uno::Exception
-                if loading the data fails.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        sharable::TreeFragment * refreshComponent(ComponentRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception));
-         /** refreshes data of all existing components from the backend
-
-            <p> If the data is in the cache already, it is refreshed from the
-                backend and the change are notified to all registered listeners.
-            </p>
-            <p> If the data isn't in the cache nothing is done and
-                a NULL location is returned.
-            </p>
-
-            <p>Note: the caller <strong>must not</strong> hold any lock on the cache line affected.</p>
-
-             @throws com::sun::star::uno::Exception
-                if loading the data fails.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        void refreshAllComponents()
-            SAL_THROW((com::sun::star::uno::Exception));
-
-        /** flushes data of all pending updates from cache to the backend(s)
-                @throws com::sun::star::uno::Exception
-                if flushing the data fails.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        void flushPendingUpdates() SAL_THROW((com::sun::star::uno::Exception));
-
-        /** locates a template in the cache.
-
-            <p> If the data isn't in the cache it is loaded from the backend. </p>
-
-            <p>Note: the caller <strong>must not</strong> hold any lock on the cache line affected.</p>
-
-            @param _aRequest
-                identifies the template to be loaded.
-
-            @returns
-                data that can be used to locate the template data in the cache.
-
-            @throws com::sun::star::uno::Exception
-                if loading the template data fails.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        sharable::TreeFragment * loadTemplate(TemplateRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception));
-
-        /** saves changes to the backend and notifies them to registered listeners.
-
-            <p> Must be called after the changes have been applied to the cache
-                and before any subsequent changes to the same component.
-            </p>
-
-            <p> Notifications are guaranteed to be delivered
-                before any subsequent changes to the same component are possible.
-            </p>
-
-            <p> Note: the caller <strong>must</strong> hold a read lock (but no write lock)
-                on the cache line affected during the call.</p>
-
-            @param _anUpdate
-                identifies the node that changed and describes the changes.
-
-            @throws com::sun::star::uno::Exception
-                if saving the changes to the backend fails.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        void saveAndNotify(UpdateRequest const & _anUpdate)
-            SAL_THROW((com::sun::star::uno::Exception));
-
-       /** @returns
-                an object that can used to broadcast changes done through this object.
-                <p> The object returned is guaranteed to live as long
-                    as this object lives.
-                </p>
-        */
-        CacheChangeMulticaster & getNotifier() SAL_THROW(())
-        { return m_aNotifier; }
-
-        /** loads merged data for a (complete) tree and returns it as return value.
-        
-            @param _aRequest
-                identifies the component to be loaded
-
-            @param __bAddListenter
-                identifies is listener is to be registered to backend
-            
-            @returns
-                A valid component instance for the given component.
-
-            @throws com::sun::star::uno::Exception
-                if the node cannot be retrieved.
-                The exact exception being thrown may depend on the underlying backend.
-                
-        */
-        ResultHolder< ComponentInstance > getComponentData(ComponentRequest const & _aRequest,
-                                                 bool _bAddListenter) 
-            SAL_THROW((com::sun::star::uno::Exception));
-
-        /** loads default data for a (partial) tree and returns it as return value
-
-            @param _aRequest
-                identifies the node to be loaded
-
-            @returns
-                A valid node instance for the default state of the given node.
-
-                <p>May be NULL, if the node exists but has no default equivalent.</p>
-
-            @throws com::sun::star::uno::Exception
-                if the default cannot be retrieved.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        ResultHolder< NodeInstance > getDefaultData(NodeRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception));
-
-        /** loads a given template and returns it as return value
-
-            @param _aRequest
-                identifies the template to be loaded
-
-            @returns
-                A valid instance of the given template.
-
-                <p> Currently a request with empty template name 
-                    will retrieve a group node holding all templates 
-                    of a component.
-                </p>
-
-            @throws com::sun::star::uno::Exception
-                if the template cannot be retrieved.
-                The exact exception being thrown may depend on the underlying backend.
-        */
-        virtual ResultHolder< TemplateInstance > getTemplateData(TemplateRequest const & _aRequest)
-            SAL_THROW((com::sun::star::uno::Exception));
-        //INodeDataListener Implementation
-        /** Triggered when component data is changed
-            
-            @param _aRequest
-                identifies the data that changed
-        */
-        virtual void dataChanged(const ComponentRequest& _aRequest) SAL_THROW(());
-    protected:
-        // ref counted, that's why no public dtor
-        ~CacheController();
-    // implementation 
-    private:
-        configuration::AbsolutePath encodeTemplateLocation(rtl::OUString const & _rName, rtl::OUString const & _rModule) const;
-
-        configuration::AbsolutePath ensureTemplate(rtl::OUString const& _rName, rtl::OUString const& _rModule) SAL_THROW((com::sun::star::uno::Exception));
-
-        // adjust a node result for locale, ...
-        bool normalizeResult(std::auto_ptr<ISubtree> &  _aResult, RequestOptions const & _aOptions);
-
-        // reads data from the backend directly 
-        ResultHolder< ComponentInstance > loadDirectly(ComponentRequest const & _aRequest, bool _bAddListenter ) 
-            SAL_THROW((com::sun::star::uno::Exception));
-        // reads default data from the backend directly 
-        ResultHolder< NodeInstance > loadDefaultsDirectly(NodeRequest const & _aRequest) SAL_THROW((com::sun::star::uno::Exception));
-        // writes an update  to the backend directly 
-        void saveDirectly(UpdateRequest const & _anUpdate) SAL_THROW((com::sun::star::uno::Exception));
-    
-        // writes updates for a component to the backend directly 
-        void savePendingChanges(rtl::Reference<CacheLoadingAccess> const & _aCache, ComponentRequest const & _aComponent) 
-            SAL_THROW((com::sun::star::uno::Exception));
-        // saves all pending changes from a cache access to the backend
-        bool saveAllPendingChanges(rtl::Reference<CacheLoadingAccess> const & _aCache, RequestOptions const & _aOptions) 
-            SAL_THROW((com::sun::star::uno::RuntimeException));
-        // load templates componentwise from backend
-        std::auto_ptr<ISubtree> loadTemplateData(TemplateRequest const & _aRequest) 
-            SAL_THROW((com::sun::star::uno::Exception));
-        
-
-        void flushCacheWriter() SAL_THROW(());
-        // add templates componentwise to cache
-        sharable::TreeFragment * addTemplates ( backend::ComponentDataStruct const & _aComponentInstance );
-        rtl::Reference<CacheLoadingAccess> getCacheAlways(RequestOptions const & _aOptions);
-
-        OTreeDisposeScheduler   * createDisposer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
-        OCacheWriteScheduler    * createCacheWriter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
-
-                         
-
-        // disposing
-        void disposeAll(bool _bFlushRemainingUpdates);
- 
-        void closeModules(std::vector< rtl::Reference<CacheLine> > & _aList, RequestOptions const & _aOptions);
-    private:
-        typedef AutoReferenceMap<RequestOptions,CacheLoadingAccess,lessRequestOptions>   CacheMap;
-
-        CacheChangeMulticaster  m_aNotifier;
-        rtl::Reference< backend::IMergedDataProvider >		m_xBackend;  
-        CacheMap		m_aCacheMap;
-        TemplateCacheData	m_aTemplates;
-
-        OTreeDisposeScheduler*	m_pDisposer;
-        OCacheWriteScheduler *  m_pCacheWriter;
-                
-        bool m_bDisposing; // disables async writing and automatic refresh
-
-        friend class configmgr::OTreeDisposeScheduler;
-        friend class configmgr::OCacheWriteScheduler;
-        friend class OInvalidateTreeThread;
-        
-    };
-// ---------------------------------------------------------------------------
-    } // namespace backend
-
-// ---------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/treecache/cachedata.cxx b/configmgr/source/treecache/cachedata.cxx
deleted file mode 100644
index 244614426d..0000000000
--- a/configmgr/source/treecache/cachedata.cxx
+++ /dev/null
@@ -1,498 +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: cachedata.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_configmgr.hxx"
-
-#include "cachedata.hxx"
-#include "node.hxx"
-#include "updatehelper.hxx"
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-#include "configpath.hxx"
-
-namespace configmgr
-{
-    // ---------------------------- Client Acquire helper ----------------------------
-
-    struct CacheLineClientRef
-    {
-        rtl::Reference<CacheLine> xModule;
-
-        CacheLineClientRef(rtl::Reference<CacheLine> const& _xModule) 
-        : xModule(_xModule) 
-        {
-            if (xModule.is()) 
-                xModule->clientAcquire();
-        }
-
-        ~CacheLineClientRef() // release the client reference unless it was 'kept'
-        {
-            if (xModule.is()) 
-                xModule->clientRelease();
-        }
-
-        void rebind(rtl::Reference<CacheLine> const& _xModule) 
-        {
-            if (_xModule.is()) 
-                _xModule->clientAcquire();
-            if (xModule.is()) 
-                xModule->clientRelease();
-            xModule = _xModule;
-        }
-
-        /// release the contained module so that the client reference will be kept active
-        void keep() 
-        {
-            xModule.clear();
-            OSL_ASSERT(!xModule.is());
-        }
-
-        /// return the contained module so that the client reference will be kept active
-        rtl::Reference<CacheLine> keepModule() 
-        {
-            rtl::Reference<CacheLine> xRet = xModule;
-            this->keep();
-            return xRet;
-        }
-    private:
-        CacheLineClientRef(CacheLineClientRef const& );
-        CacheLineClientRef& operator=(CacheLineClientRef const& );
-
-    };
-
-// -----------------------------------------------------------------------------
-    static inline rtl::OUString implExtractModuleName(configuration::AbsolutePath const& aConfigPath)
-    {
-        return aConfigPath.getModuleName();
-    }
-
-// -----------------------------------------------------------------------------
-    
-    CacheData::CacheData()
-    {
-    }
-// -----------------------------------------------------------------------------
-    
-    CacheData::~CacheData()
-    {
-        CFG_TRACE_INFO("Discarding CacheData (Still holding %d module trees)", int (m_aModules.size()) );
-    }
-// -----------------------------------------------------------------------------
-    inline
-    rtl::Reference<CacheLine> CacheData::internalGetModule(rtl::OUString const & _aModuleName ) const
-    {
-        OSL_ASSERT(_aModuleName.getLength() != 0);
-
-        ModuleList::const_iterator it = m_aModules.find(_aModuleName);
-
-        return it!=m_aModules.end() ? it->second : rtl::Reference<CacheLine>();
-    }
-// -----------------------------------------------------------------------------
-    inline
-    rtl::Reference<CacheLine> CacheData::internalGetModule(const configuration::AbsolutePath&  _aPath) const
-    {
-        return internalGetModule( implExtractModuleName(_aPath) );
-    }
-// -----------------------------------------------------------------------------
-
-    inline
-    void CacheData::internalAddModule(rtl::OUString const & _aName, const rtl::Reference<CacheLine> & _aModule)
-    {
-        //OSL_PRECOND(m_aModules.find(_aName) == m_aModules.end(), "ERROR: Module already present in CacheData");
-
-          m_aModules[_aName] = _aModule;
-        
-        CFG_TRACE_INFO("CacheData Data: Added new module tree for module %s", OUSTRING2ASCII(_aName) );
-    }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-    rtl::Reference<CacheLine> CacheData::internalAttachModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        rtl::Reference<CacheLine> aNewModule = doCreateAttachedModule(_aLocation,_aName);
-
-        internalAddModule( _aName, aNewModule );
-        
-        return aNewModule;
-    }
-
-// -------------------------------------------------------------------------
-
-    void CacheData::attachModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aModule)
-    {
-        this->internalAttachModule(_aLocation,_aModule);
-    }
-// -------------------------------------------------------------------------
-
-    rtl::Reference<CacheLine> CacheData::doCreateAttachedModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        return CacheLine::createAttached( _aName, _aLocation ); 
-    }
-// -----------------------------------------------------------------------------
-
-    /// gets a data segment reference for the given path if exists
-    sharable::TreeFragment * CacheData::getTreeAddress(rtl::OUString const & _aModule) const
-    {
-        rtl::Reference<CacheLine> aModule = internalGetModule(_aModule);
-
-        return aModule.is() ? aModule->getTreeAddress() : NULL;
-    }
-// -------------------------------------------------------------------------
-        
-    bool CacheData::hasModule(rtl::OUString const & _aModule) const
-    {
-        rtl::Reference<CacheLine> aModule = internalGetModule(_aModule);
-
-        return aModule.is() && !aModule->isEmpty();
-    }
-// -------------------------------------------------------------------------
-        
-    bool CacheData::hasModuleDefaults(rtl::OUString const & _aModule) const
-    {
-        rtl::Reference<CacheLine> aModule = internalGetModule(_aModule);
-
-        return aModule.is() && !aModule->hasDefaults();
-    }
-// -------------------------------------------------------------------------
-
-    sharable::TreeFragment * CacheData::internalGetPartialTree(const configuration::AbsolutePath& aComponentName ) const
-    {
-    rtl::Reference<CacheLine> xModule = internalGetModule(aComponentName);
-        
-    if ( !xModule.is() )
-            return NULL;
-
-        sharable::TreeFragment * pSubtree = xModule->getPartialTree(aComponentName);
-
-        OSL_ENSURE( pSubtree == NULL || xModule->clientReferences() != 0 , 
-                    "WARNING: returning subtree from module without clients\n" );
-#ifdef CFG_ENABLE_TRACING
-        if( pSubtree != NULL && xModule->clientReferences() == 0) 
-        {
-            CFG_TRACE_WARNING("CacheData data: returning subtree %s from module without clients", OUSTRING2ASCII( aComponentName.toString() ) );
-        }
-#endif // CFG_ENABLE_TRACING
-
-        return pSubtree;	
-    }
-// -----------------------------------------------------------------------------
-    sharable::Node * CacheData::internalGetNode(const configuration::AbsolutePath& aComponentName ) const
-    {
-        rtl::Reference<CacheLine> xModule = internalGetModule(aComponentName);
-        
-        if ( !xModule.is() )
-            return 0;
-
-        if ( xModule->isEmpty() )
-            return 0;
-
-        sharable::Node * pNode = xModule->getNode(aComponentName);
-
-        OSL_ENSURE( pNode == NULL || xModule->clientReferences() != 0, 
-                    "WARNING: returning node from module without clients\n" );
-    #ifdef CFG_ENABLE_TRACING
-        if( pNode != NULL && xModule->clientReferences() == 0) 
-        {
-            CFG_TRACE_WARNING("CacheData data: returning node %s from module without clients", OUSTRING2ASCII( aComponentName.toString() ) );
-        }
-#endif // CFG_ENABLE_TRACING
-
-        return pNode;	
-    }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------	
-    bool CacheData::acquireModule(rtl::OUString const & _aModule)
-    {
-        rtl::Reference<CacheLine> xModule = internalGetModule(_aModule);
-
-        if (xModule.is())
-        {
-            CacheLineClientRef aClientRef(xModule);
-            aClientRef.keep();
-        }
-        
-        return xModule.is();
-    }
-// -----------------------------------------------------------------------------	
-    sharable::Node * CacheData::acquireNode(configuration::AbsolutePath const& _aPath)
-    {
-    CacheLineClientRef aClientRef(internalGetModule(_aPath));
-
-        sharable::Node * aNodeAddr = internalGetNode(_aPath);
-
-        if (sharable::Node const * pNode = aNodeAddr)
-    {
-            if (pNode->isValue())
-                aNodeAddr = 0; // invalid: cannot acquire single value
-    }
-        else
-            OSL_ASSERT( aNodeAddr == NULL );
-
-        if (aNodeAddr != NULL) 
-            aClientRef.keep();
-
-        return aNodeAddr;
-    }
-// -----------------------------------------------------------------------------	
-
-    bool CacheData::insertDefaults( backend::NodeInstance const & _aDefaultInstance) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        OSL_PRECOND(_aDefaultInstance.data().get(), "insertDefaults: Data must not be NULL");
-        OSL_PRECOND(_aDefaultInstance.root().getDepth() == 1, "insertDefaults: Default tree being added must be for module");
-        
-        // we should already have the module in cache !
-        rtl::Reference<CacheLine> xModule = internalGetModule(_aDefaultInstance.root());
-
-        OSL_ENSURE( xModule.is(), "CacheData::insertDefaults: No module to insert the defaults to - where did the data segment come from ?");
-        
-        if (!xModule.is()) return false;
-
-        // make sure to keep the module alive
-    CacheLineClientRef( xModule ).keep();
-
-    sharable::TreeFragment * aResultTree = xModule->insertDefaults(_aDefaultInstance);
-
-    return aResultTree != NULL;
-    }
-// -----------------------------------------------------------------------------
-
-    void CacheData::applyUpdate( backend::UpdateInstance & _anUpdate ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        // request the subtree, atleast one level must exist!
-        sharable::Node * aNodeAddr = internalGetNode(_anUpdate.root());
-
-        if (aNodeAddr != NULL)
-        {
-            applyUpdateToTree(*_anUpdate.data(),aNodeAddr);
-        }
-        else
-        {
-            OSL_ENSURE(false, "CacheData::applyUpdate called for non-existing tree");
-            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("CacheData: update to non-existing node: "));
-
-            aStr += _anUpdate.root().toString();
-
-            throw uno::RuntimeException(aStr,0);
-        }
-    }
-// -----------------------------------------------------------------------------	
-    oslInterlockedCount CacheData::releaseModule( rtl::OUString const & _aModule, bool _bKeepDeadModule )
-    {
-        rtl::Reference<CacheLine> xModule = internalGetModule(_aModule);
-
-        const oslInterlockedCount c_nErrorCount = -1;
-        
-        OSL_ENSURE( xModule.is(), "ERROR: Releasing non-existent subtree");
-        if ( !xModule.is()) return c_nErrorCount;
-        
-        OSL_ENSURE( xModule->clientReferences() > 0, "ERROR: Releasing non-referenced subtree");
-
-        oslInterlockedCount nResult = xModule->clientRelease();
-
-        if (nResult == 0 && !_bKeepDeadModule)
-        {
-              m_aModules.erase( _aModule );           
-        }
-        return nResult;
-    }
-
-// -----------------------------------------------------------------------------
-    sharable::TreeFragment * CacheData::getTemplateTree(configuration::AbsolutePath const& aTemplateName ) const
-    {
-        return internalGetPartialTree(aTemplateName);
-    }
-// -----------------------------------------------------------------------------
-    sharable::Node * CacheData::getNode(const configuration::AbsolutePath& _rPath)
-    {
-        return internalGetNode(_rPath);
-    }
-// -----------------------------------------------------------------------------
-    bool CacheData::hasNode(const configuration::AbsolutePath& _rPath) const
-    {
-        return internalGetNode(_rPath) != NULL;
-    }
-// -----------------------------------------------------------------------------
-
-    sharable::TreeFragment * TemplateCacheData::addTemplates( backend::ComponentDataStruct const & _aComponentInstance) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        OSL_PRECOND(_aComponentInstance.data.get(), "addTemplates: Data must not be NULL");
-        // we should already have the module in cache !
-        rtl::OUString aModuleName ( _aComponentInstance.name); 
-        rtl::Reference<CacheLine> xModule = internalGetModule(aModuleName);
-
-        OSL_ENSURE( xModule.is(), "ExtendedCacheData::addTemplates: No module to add the templates to - where did the data segment come from ?");
-        
-        if (!xModule.is()) return NULL;
-
-        // make sure to keep the module alive
-        CacheLineClientRef( xModule ).keep();
-
-        static const rtl::OUString aDummyTemplateName(RTL_CONSTASCII_USTRINGPARAM("cfg:Template"));
-        static const rtl::OUString aDummyTemplateModule(RTL_CONSTASCII_USTRINGPARAM("cfg:Templates"));
-        _aComponentInstance.data->makeSetNode(aDummyTemplateName,aDummyTemplateModule);
-
-        sharable::TreeFragment * aResult = xModule->setComponentData(_aComponentInstance, true);
-        
-        OSL_ASSERT(aResult != NULL);
-
-    return aResult;
-    }
-// -----------------------------------------------------------------------------
-
-    rtl::Reference<CacheLine> TemplateCacheData::doCreateAttachedModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        rtl::Reference<CacheLine> aNewModule =  CacheLine::createAttached(_aName, _aLocation);
-
-        return aNewModule.get();
-    }
-// -----------------------------------------------------------------------------
-
-    void TemplateCacheData::createModule(rtl::OUString const & _aModule) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        rtl::Reference<CacheLine> aNewModule = CacheLine::createNew(_aModule);
-
-        internalAddModule( _aModule, aNewModule.get() );
-    }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    inline
-    rtl::Reference<ExtendedCacheLine> ExtendedCacheData::implExtended(const rtl::Reference<CacheLine>& _aSimpleRef) const
-    {
-        CacheLine *         pBasic    = _aSimpleRef.get();
-        ExtendedCacheLine * pExtended = static_cast<ExtendedCacheLine *>(pBasic);
-        return rtl::Reference<ExtendedCacheLine>(pExtended);
-    }
-
-// -----------------------------------------------------------------------------
-
-    rtl::Reference<CacheLine> ExtendedCacheData::doCreateAttachedModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        rtl::Reference<ExtendedCacheLine> aNewModule = 
-            ExtendedCacheLine::createAttached(_aName, _aLocation);
-
-        return rtl::Reference<CacheLine>( aNewModule.get() );
-    }
-// -----------------------------------------------------------------------------
-
-    void ExtendedCacheData::createModule(rtl::OUString const & _aModule) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        rtl::Reference<ExtendedCacheLine> aNewModule = ExtendedCacheLine::createNew(_aModule);
-
-        internalAddModule( _aModule, aNewModule.get() );
-    }
-// -----------------------------------------------------------------------------
-
-    sharable::TreeFragment * ExtendedCacheData::addComponentData(backend::ComponentInstance const & _aComponentInstance, 
-                              bool _bWithDefaults) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        OSL_PRECOND(_aComponentInstance.data().get(), "addComponentData: Data must not be NULL");
-        // we should already have the module in cache !
-        //rtl::Reference<CacheLine> xModule = internalGetModule(_aNodeInstance.root().location());
-        rtl::Reference<CacheLine> xModule = internalGetModule(_aComponentInstance.component() );
-        
-        OSL_ENSURE( xModule.is(), "ExtendedCacheData::addComponentData: No module to add the subtree to - where did the data segment come from ?");
-        
-        if (!xModule.is()) return NULL;
-
-        CacheLineClientRef aClientRef( xModule );
-
-        sharable::TreeFragment * aResult = xModule->setComponentData(_aComponentInstance.componentNodeData(), _bWithDefaults);
-
-        OSL_ASSERT(aResult != NULL);
-
-    if (aResult != NULL) aClientRef.keep();
-
-    return aResult;
-    }
-// -----------------------------------------------------------------------------
-
-    void ExtendedCacheData::addPending(backend::ConstUpdateInstance const & _anUpdate) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        // do we already have the module in cache ?
-        rtl::Reference<CacheLine> xModule = internalGetModule(_anUpdate.root());
-
-        if (xModule.is())
-        {
-            implExtended(xModule)->addPending(_anUpdate);
-        }
-        else
-        {
-            OSL_ENSURE(false, "We can only change Nodes if we already know something about it. So this must be a big bug.");
-        }
-    }
-// -----------------------------------------------------------------------------
-    
-    std::auto_ptr<SubtreeChange> ExtendedCacheData::releasePending(rtl::OUString const& _aModule)
-    {
-        rtl::Reference<ExtendedCacheLine> xModule = implExtended(internalGetModule(_aModule));
-
-        if (xModule.is())
-        {
-            if (xModule->hasPending())
-                return xModule->releasePending();
-            else
-                return std::auto_ptr<SubtreeChange>();
-        }
-        else
-        {
-            OSL_ENSURE(false, "We can only get Nodes if we already know something about it.");
-        }
-        return std::auto_ptr<SubtreeChange>();
-    }
-// -----------------------------------------------------------------------------	
-        
-    bool ExtendedCacheData::hasPending(rtl::OUString const & _aModule)
-    {		
-        rtl::Reference<ExtendedCacheLine> xModule = implExtended(internalGetModule(_aModule));
-
-    return xModule.is() && xModule->hasPending();
-    }
-
-// -----------------------------------------------------------------------------	
-        
-    void ExtendedCacheData::findPendingModules( std::vector< rtl::OUString > & _rPendingList )
-    {		
-        ModuleList& rModules = CacheData::accessModuleList();
-        for (ModuleList::iterator it = rModules.begin();
-                it != rModules.end();
-                ++it)
-        {
-            OSL_ASSERT( it->second.is() );
-            if ( implExtended(it->second)->hasPending() )
-                _rPendingList.push_back( it->first );
-        }
-    }
-// -----------------------------------------------------------------------------	
-
-// -----------------------------------------------------------------------------	
-} // namespace configmgr
-
-
diff --git a/configmgr/source/treecache/cachedata.hxx b/configmgr/source/treecache/cachedata.hxx
deleted file mode 100644
index b2231f59e9..0000000000
--- a/configmgr/source/treecache/cachedata.hxx
+++ /dev/null
@@ -1,179 +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: cachedata.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CACHEDATA_HXX
-#define CONFIGMGR_CACHEDATA_HXX
-
-#include "cacheline.hxx"
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-////////////////////////////////////////////////////////////////////////////////
-    namespace backend
-    {
-        struct NodeInstance;
-        struct TemplateInstance;
-        struct UpdateInstance;
-        struct ConstUpdateInstance;
-    }
-
-////////////////////////////////////////////////////////////////////////////////
-    /** A collection of CacheLines
-    */
-
-    class CacheData			
-    {
-    public:
-        CacheData();
-        virtual ~CacheData();
-
-        // attach a module with a given name
-        void attachModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aModule);
-        /// check if the given module exists already (and is not empty)
-        bool hasModule(rtl::OUString const & _aModule) const;
-        /// checks if the given module exists and has defaults available
-        bool hasModuleDefaults(rtl::OUString const & _aModule) const;
-
-        /// gets a tree address for the given module if it exists
-        sharable::TreeFragment * getTreeAddress(rtl::OUString const & _aModule) const;
-
-        /// checks whether a certain node exists in the tree
-        bool  hasNode(configuration::AbsolutePath const & _aLocation) const;
-
-        /// retrieve the given node without changing its ref count
-        sharable::Node *   getNode(configuration::AbsolutePath const & _rPath);
-        /// retrieve the given template tree without changing its ref count
-        sharable::TreeFragment *	getTemplateTree( configuration::AbsolutePath const & aTemplateName ) const;
-
-        /// retrieve the subtree at _aPath and clientAcquire() it
-        sharable::Node * acquireNode(configuration::AbsolutePath const & _aPath ); 
-        /// retrieve the subtree at _aPath and clientAcquire() it, return true on success
-        bool acquireModule( rtl::OUString const & _aModule ); 
-        /// clientRelease() the tree at aComponentName, and return the resulting reference count
-        oslInterlockedCount releaseModule( rtl::OUString const & _aModule, bool _bKeepDeadModule = false ); 
-
-        bool insertDefaults( backend::NodeInstance const & _aDefaultInstance
-                           ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        /// merge the given changes into this tree - reflects old values to _anUpdate
-        void applyUpdate( backend::UpdateInstance & _anUpdate) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        // low-level interface for cache management
-        typedef std::map<rtl::OUString, rtl::Reference<CacheLine> > ModuleList;
-        ModuleList& accessModuleList() { return m_aModules; }
-
-    protected:
-        virtual rtl::Reference<CacheLine> doCreateAttachedModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        sharable::TreeFragment * internalGetPartialTree(configuration::AbsolutePath const & _aPath ) const;
-        sharable::Node * internalGetNode(const configuration::AbsolutePath& _rPath) const;
-
-        rtl::Reference<CacheLine> internalAttachModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException));
-        void internalAddModule(rtl::OUString const & _aName, rtl::Reference<CacheLine> const & _aModule);
-
-        rtl::Reference<CacheLine> internalGetModule(rtl::OUString const & _aName) const;
-        rtl::Reference<CacheLine> internalGetModule(const configuration::AbsolutePath& _aLocation) const;
-
-    private:
-        ModuleList m_aModules;
-    };
-////////////////////////////////////////////////////////////////////////////////
-    /** A collection of CacheLines for templates
-    */
-
-    class TemplateCacheData : public CacheData	
-    {
-    public:
-        TemplateCacheData() : CacheData()
-        {
-        }
-
-        /** add the given template tree at the given location,
-            return the tree that is now pertinent and clientAcquire() it once
-        */
-        sharable::TreeFragment * addTemplates( backend::ComponentDataStruct const & _aComponentInstance  
-                                       ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        // create a new module with the given name
-        void createModule(rtl::OUString const & _aModule) SAL_THROW((com::sun::star::uno::RuntimeException));
-    private:
-        virtual rtl::Reference<CacheLine> doCreateAttachedModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException));
-    };
-//-----------------------------------------------------------------------------
-    /** A collection of CacheLines
-    */
-
-    class ExtendedCacheData : public CacheData	
-    {
-    public:
-        ExtendedCacheData() : CacheData()
-        {
-        }
-
-        /** add the given subtree at the given location,
-            return the tree that is now pertinent and clientAcquire() it once
-        */
-        sharable::TreeFragment * addComponentData( backend::ComponentInstance const & _aComponentInstance, 
-                                            bool _bWithDefaults
-                                           ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        /// find the modules having pending changes
-        bool hasPending(rtl::OUString const & _aModule);
-        /// find the modules having pending changes
-        void findPendingModules( std::vector< rtl::OUString > & _rPendingList );
-
-        /// add or merge the given subtreechange at the given location
-        void addPending(backend::ConstUpdateInstance const & _anUpdate) SAL_THROW((com::sun::star::uno::RuntimeException));
-        /// remove and return pending changes for the given component
-        std::auto_ptr<SubtreeChange> releasePending(rtl::OUString const & _aModule) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        // create a new module with the given name
-        void createModule(rtl::OUString const & _aModule) SAL_THROW((com::sun::star::uno::RuntimeException));
-    private:
-        virtual rtl::Reference<CacheLine> doCreateAttachedModule(sharable::TreeFragment * _aLocation, rtl::OUString const & _aName) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        rtl::Reference<ExtendedCacheLine> implExtended(rtl::Reference<CacheLine> const & _aSimpleRef) const;
-    };
-//-----------------------------------------------------------------------------
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/treecache/cachefactory.cxx b/configmgr/source/treecache/cachefactory.cxx
deleted file mode 100644
index 1cc33f2b4f..0000000000
--- a/configmgr/source/treecache/cachefactory.cxx
+++ /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: cachefactory.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_configmgr.hxx"
-
-#include "cachefactory.hxx"
-#include "treemanager.hxx"
-#include "cachecontroller.hxx"
-#include "backendfactory.hxx"
-
-namespace configmgr
-{
-// -------------------------------------------------------------------------
-
-    static
-    rtl::Reference<TreeManager> buildCacheManager(rtl::Reference< backend::IMergedDataProvider > const & _xBackend,
-                                                  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext)
-    {
-        rtl::Reference< TreeManager > xCache;
-
-        if (_xBackend.is())
-        {
-            rtl::Reference< backend::CacheController > xLoader
-                = new backend::CacheController(_xBackend.get(), _xContext);
-
-            xCache.set( new TreeManager(xLoader.get()) );
-        }
-
-        return xCache;
-    }
-// -------------------------------------------------------------------------
-
-    rtl::Reference<TreeManager> 
-        CacheFactory::createCacheManager(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext)
-    {
-        rtl::Reference< backend::IMergedDataProvider > xBackend = backend::BackendFactory::instance(_xContext).createBackend();
-
-        return buildCacheManager(xBackend, _xContext);
-    }
-
-// -------------------------------------------------------------------------
-
-    CacheFactory & CacheFactory::instance()
-    {
-        static CacheFactory aStaticFactory;
-        return aStaticFactory;
-    }
-
-//-----------------------------------------------------------------------------
-} // namespace
diff --git a/configmgr/source/treecache/cacheline.cxx b/configmgr/source/treecache/cacheline.cxx
deleted file mode 100644
index 6125401aaf..0000000000
--- a/configmgr/source/treecache/cacheline.cxx
+++ /dev/null
@@ -1,356 +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: cacheline.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_configmgr.hxx"
-
-#include "cacheline.hxx"
-#include "builddata.hxx"
-#include "treechangefactory.hxx"
-#include "mergechange.hxx"
-#include "configexcept.hxx"
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    static inline rtl::OUString implExtractModuleName(configuration::AbsolutePath const& _aConfigPath)
-    {
-        return _aConfigPath.getModuleName();
-    }
-
-
-// -----------------------------------------------------------------------------
-// class CacheLine
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------	
-
-    CacheLine::CacheLine(rtl::OUString const & _aModuleName)
-    : m_base(NULL)
-    , m_name(_aModuleName)
-    , m_nDataRefs(0)
-    {
-    }
-// -----------------------------------------------------------------------------	
-
-    CacheLine::CacheLine(rtl::OUString const & _aModuleName, sharable::TreeFragment * _pSegment)
-    : m_base(_pSegment)
-    , m_name(_aModuleName)
-    , m_nDataRefs(0)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-
-    void CacheLine::setBase(sharable::TreeFragment * _base)
-    {
-        OSL_PRECOND(m_base == NULL, "CacheLine: Data base address was already set");
-        OSL_PRECOND( _base != NULL, "CacheLine: Cannot set NULL base address");
-        m_base = _base;
-    }
-// -----------------------------------------------------------------------------
-   
-    rtl::Reference<CacheLine> CacheLine::createAttached( rtl::OUString const & _aModuleName, 
-                                            sharable::TreeFragment * _aSegment
-                                          ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        if (_aModuleName.getLength() == 0)
-        {
-            OSL_ENSURE(false, "Cannot make a cache line without a name");
-            return NULL;
-        }
-        if (_aSegment == NULL)
-        {
-            OSL_ENSURE(false, "Cannot attach a cache line to a NULL segment");
-            return NULL;
-        }
-
-        rtl::Reference<CacheLine> xResult = new CacheLine(_aModuleName,_aSegment);
-
-        return xResult;
-    }
-// -----------------------------------------------------------------------------
- 
-    rtl::Reference<CacheLine> CacheLine::createNew( rtl::OUString const & _aModuleName
-                                      ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        if (_aModuleName.getLength() == 0)
-        {
-            OSL_ENSURE(false, "Cannot make a cache line without a name");
-            return NULL;
-        }
-
-        rtl::Reference<CacheLine> xResult = new CacheLine(_aModuleName);
-
-        return xResult;
-    }
-// -------------------------------------------------------------------------
-
-    rtl::OUString CacheLine::getModuleName() const
-    {
-        return m_name;
-    }
-// -----------------------------------------------------------------------------
-   
-    sharable::TreeFragment * CacheLine::getPartialTree(configuration::AbsolutePath const& aConfigName) const
-    {
-        sharable::Node * parent = internalGetNode(aConfigName.getParentPath());
-
-        if (parent != 0 && parent->isSet())
-            return parent->set.getElement(aConfigName.getLocalName().getName());
-        else
-            return NULL;
-    }
-// -----------------------------------------------------------------------------
-  
-    bool CacheLine::hasDefaults() const
-    {
-        return m_base != 0 && m_base->hasDefaultsAvailable();
-    }
-// -----------------------------------------------------------------------------
-    sharable::Node * CacheLine::internalGetNode(configuration::AbsolutePath const& aConfigName) const
-    {
-        OSL_ASSERT(m_base != 0);
-        sharable::Node * node = m_base->getRootNode();
-        OSL_ASSERT(node != 0);
-        std::vector< configuration::Path::Component >::const_reverse_iterator i(
-            aConfigName.begin());
-        OSL_ASSERT(
-            i != aConfigName.end() && node->getName() == i->getInternalName());
-        while (node != 0 && ++i != aConfigName.end()) {
-            node = node->getSubnode(i->getName());
-        }
-        return node;
-    }
-// -----------------------------------------------------------------------------
-   
-    sharable::Node * CacheLine::getNode(configuration::AbsolutePath const& aConfigName) const
-    {
-        return internalGetNode(aConfigName);
-    }
-// -------------------------------------------------------------------------
-
-    sharable::TreeFragment * CacheLine::setComponentData( backend::ComponentDataStruct const & _aComponentInstance, 
-                                                   bool _bWithDefaults
-                                                   ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        OSL_PRECOND(_aComponentInstance.data.get(), "CacheLine::insertDefaults: inserting NULL defaults !");
-        OSL_PRECOND(_aComponentInstance.name == this->getModuleName(),"Data location does not match module");
-    
-        OSL_PRECOND(base() == NULL, "Data is already loaded");
-
-        if (base() == NULL) // no data yet
-        {
-            this->setBase( data::buildTree(_aComponentInstance.data->getName(), *_aComponentInstance.data, _bWithDefaults) );
-        }
-
-        return this->base();
-    }
-// -----------------------------------------------------------------------------
-
-    sharable::TreeFragment * CacheLine::insertDefaults( backend::NodeInstance const & _aDefaultInstance
-                                               ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        OSL_PRECOND(_aDefaultInstance.data().get(), "CacheLine::insertDefaults: inserting NULL defaults !");
-        OSL_PRECOND(_aDefaultInstance.root().getDepth() == 1, "Should have complete component to fill tree with defaults");
-        OSL_PRECOND(_aDefaultInstance.root().getModuleName() == this->getModuleName(),"Data location does not match module");
-
-        OSL_PRECOND(m_base != NULL, "Data must already be loaded to insert defaults");
-
-        if (m_base != NULL) 
-        {
-            data::mergeDefaults(m_base,*_aDefaultInstance.data());
-        }
-
-        return m_base;
-    }
-// -----------------------------------------------------------------------------	
-// -----------------------------------------------------------------------------	
-
-    ExtendedCacheLine::ExtendedCacheLine(rtl::OUString const & _aModuleName)
-    : CacheLine(_aModuleName)
-    , m_pPending()
-    {
-    }
-
-// -----------------------------------------------------------------------------	
-
-    ExtendedCacheLine::ExtendedCacheLine(rtl::OUString const & _aModuleName,
-                                         sharable::TreeFragment * _aSegment)
-    : CacheLine(_aModuleName,_aSegment)
-    , m_pPending()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-  
-    rtl::Reference<ExtendedCacheLine> ExtendedCacheLine::createAttached( rtl::OUString const & _aModuleName, 
-                                                            sharable::TreeFragment * _aSegment
-                                                          ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        if (_aModuleName.getLength() == 0)
-        {
-            OSL_ENSURE(false, "Cannot make a cache line without a name");
-            return NULL;
-        }
-        if (_aSegment == NULL)
-        {
-            OSL_ENSURE(false, "Cannot attach a cache line to a NULL segment");
-            return NULL;
-        }
-
-        rtl::Reference<ExtendedCacheLine> xResult = new ExtendedCacheLine(_aModuleName,_aSegment);
-
-        return xResult;
-    }
-// -----------------------------------------------------------------------------
- 
-    rtl::Reference<ExtendedCacheLine> ExtendedCacheLine::createNew( rtl::OUString const & _aModuleName
-                                                      ) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        if (_aModuleName.getLength() == 0)
-        {
-            OSL_ENSURE(false, "Cannot make a cache line without a name");
-            return NULL;
-        }
-
-        rtl::Reference<ExtendedCacheLine> xResult = new ExtendedCacheLine(_aModuleName);
-
-        return xResult;
-    }
-// -------------------------------------------------------------------------
-
-    void ExtendedCacheLine::addPending(backend::ConstUpdateInstance const & _anUpdate) SAL_THROW((com::sun::star::uno::RuntimeException))
-    {
-        configuration::AbsolutePath aRootLocation = _anUpdate.root();
-
-        OSL_PRECOND(!aRootLocation.isRoot(),"Pending change cannot be located at root");
-        OSL_PRECOND(aRootLocation.getModuleName() == this->getModuleName(),"Pending change location does not match module");
-
-        OSL_PRECOND(_anUpdate.data() != NULL,"Adding NULL 'pending' change");
-        OSL_PRECOND(_anUpdate.data()->getNodeName() == aRootLocation.getLocalName().getName(),
-                    "Path to pending change does not match change name");
-
-        using std::auto_ptr;
-
-        // first make the _pSubtreeChange a full tree starting at the module root
-        auto_ptr<SubtreeChange> pRootChange;
-        SubtreeChange *pExistingEntry = NULL;
-
-        std::vector<configuration::Path::Component>::const_reverse_iterator last = aRootLocation.end();
-
-        OSL_ASSERT(last != aRootLocation.begin());
-        --last;
-
-        for (std::vector<configuration::Path::Component>::const_reverse_iterator it = aRootLocation.begin();
-             it != last;
-             ++it)
-        {
-            OSL_ASSERT( it   != aRootLocation.end());
-            OSL_ASSERT( it+1 != aRootLocation.end());
-            // We need to create a new SubtreeChange
-            rtl::OUString const aChangeName      = it->getName();
-            rtl::OUString const aElementTypeName = (it+1)->getTypeName();
-
-            auto_ptr<SubtreeChange> pNewChange =
-                        OTreeChangeFactory::createDummyChange(aChangeName, aElementTypeName);
-
-            if (pExistingEntry == NULL)
-            {
-                OSL_ASSERT(pRootChange.get() == NULL); 
-
-                pRootChange     = pNewChange;
-                pExistingEntry  = pRootChange.get();
-            }
-            else
-            {
-                OSL_ASSERT(pRootChange.get() != NULL); 
-
-                pExistingEntry->addChange(base_ptr(pNewChange));
-
-                Change* pChange = pExistingEntry->getChange(aChangeName);
-                pExistingEntry = static_cast<SubtreeChange*>(pChange);
-
-                OSL_ENSURE(dynamic_cast< SubtreeChange * >(pChange) != 0, "ERROR: Cannot recover change just added");
-            }
-        }
-        
-        auto_ptr<SubtreeChange> pAddedChange( new SubtreeChange(*_anUpdate.data(), treeop::DeepChildCopy()) );
-        
-        if (aRootLocation.getDepth() > 1)
-        {
-            OSL_ASSERT(pRootChange.get() != NULL && pExistingEntry != NULL); 
-
-            // the _pSubtreeChange did not start at root, so add its clone to the built dummies
-            pExistingEntry->addChange(base_ptr(pAddedChange));
-        }
-        else
-        {
-            OSL_ASSERT(pRootChange.get() == NULL && pExistingEntry == NULL); 
-
-            // the _pSubtreeChange starts at root, so just reset pRootChange
-            pRootChange = pAddedChange;
-        }
-        OSL_ASSERT(pRootChange.get() != NULL); 
-
-        if (m_pPending.get() == NULL)
-        {
-            // no merge is need, because the existing pending changes are empty
-            m_pPending = pRootChange;
-        }
-        else
-        {
-            try
-            {
-                // We need to merge the new rebased changes into the m_pPending 
-                combineUpdates(*pRootChange,*m_pPending);
-            }
-            catch (configuration::Exception& e)
-            {
-                rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Update cache for module: Could not add pending changes at"));
-
-                sMessage += aRootLocation.toString();
-
-                sMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(". Internal Exception:")) + e.message();
-
-                throw uno::RuntimeException(sMessage,0);
-            }
-        }
-
-        OSL_POSTCOND(m_pPending.get() != NULL, "Could not insert new pending changes");
-    }
-// -----------------------------------------------------------------------------
-    
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/treecache/cacheline.hxx b/configmgr/source/treecache/cacheline.hxx
deleted file mode 100644
index 5035dac3e9..0000000000
--- a/configmgr/source/treecache/cacheline.hxx
+++ /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: cacheline.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 CONFIGMGR_CACHELINE_HXX
-#define CONFIGMGR_CACHELINE_HXX
-
-#include "configpath.hxx"
-#include "requesttypes.hxx"
-#include "utility.hxx"
-#include "treefragment.hxx"
-#include <osl/interlck.h>
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-
-namespace configmgr
-{
-    /** This object represents a cache line for a single configuration tree
-    */
-    class CacheLine: public salhelper::SimpleReferenceObject
-    {
-    public:
-        // create a new CacheLine for the given component name
-        static rtl::Reference<CacheLine> 
-        createNew( rtl::OUString const & _aModuleName ); 
-       
-        // create a new CacheLine attached to the given memory location
-        static rtl::Reference<CacheLine> 
-        createAttached( rtl::OUString const & _aModuleName, sharable::TreeFragment * _aLocation );
-
-        bool hasDefaults() const;
-
-        bool isEmpty() const { return m_base == NULL; }
-        sharable::TreeFragment *   getTreeAddress() const { return m_base; }
-        sharable::TreeFragment *	getPartialTree(configuration::AbsolutePath const & _aTemplatePath ) const;
-        sharable::Node *	getNode(configuration::AbsolutePath const & _aPath) const;
-
-        sharable::TreeFragment *   setComponentData( backend::ComponentDataStruct const & _aComponentInstance, 
-                                              bool _bWithDefaults
-                                           ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        sharable::TreeFragment *   insertDefaults(   backend::NodeInstance const & _aDefaultInstance
-                                           ) SAL_THROW((com::sun::star::uno::RuntimeException));
-
-        // get the module name for this component
-        rtl::OUString getModuleName() const;
-
-        /// add a client for this module's data
-        oslInterlockedCount clientReferences() const { return m_nDataRefs; }
-        /// add a client for this modules data
-        oslInterlockedCount clientAcquire() { return osl_incrementInterlockedCount(&m_nDataRefs); }			
-        /// subtract a client for this modules data
-        oslInterlockedCount clientRelease() { return osl_decrementInterlockedCount(&m_nDataRefs); }		
-
-    protected:
-        // create a new CacheLine attached to the given memory location
-        explicit 
-        CacheLine( rtl::OUString const & _aModuleName, sharable::TreeFragment * _pLocation );
-       
-        // create a new empty CacheLine for the given component name
-        explicit 
-        CacheLine( rtl::OUString const & _aModuleName );
-
-        sharable::Node * internalGetNode(configuration::AbsolutePath const & _rPath) const;
-
-        sharable::TreeFragment * base() const { return m_base; }
-        void setBase(sharable::TreeFragment * _base); 
-
-    private:
-        sharable::TreeFragment *   m_base;
-        rtl::OUString m_name;
-
-        oslInterlockedCount m_nDataRefs;			/// the number of clients on this modules data
-    };
-
-////////////////////////////////////////////////////////////////////////////////
-    /** This object represents a cache line and associated data for a single configuration tree
-    */
-    class ExtendedCacheLine : public CacheLine
-    {
-    public:
-        // create a new CacheLine for the given component name
-        static rtl::Reference<ExtendedCacheLine> 
-        createNew( rtl::OUString const & _aModuleName ); 
-       
-        // create a new CacheLine attached to the given memory location
-        static rtl::Reference<ExtendedCacheLine> 
-        createAttached( rtl::OUString const & _aModuleName,
-                            sharable::TreeFragment * _aLocation );
-       
-    // management of pending changes
-        bool hasPending() const {return m_pPending.get() != NULL;}
-        
-        void addPending(backend::ConstUpdateInstance const & _anUpdate) SAL_THROW((com::sun::star::uno::RuntimeException));
-        std::auto_ptr<SubtreeChange> releasePending() {return m_pPending;}
-        
-    private:
-        // create a new empty CacheLine for the given component name
-        explicit 
-        ExtendedCacheLine( rtl::OUString const & _aModuleName );
-        
-        // create a new CacheLine attached to the given memory location
-        explicit 
-        ExtendedCacheLine( rtl::OUString const & _aModuleName, 
-                           sharable::TreeFragment * _aLocation );
-
-    private:
-        std::auto_ptr<SubtreeChange> m_pPending;
-    };
-    
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/treecache/cachemulticaster.cxx b/configmgr/source/treecache/cachemulticaster.cxx
deleted file mode 100644
index 12e900fe76..0000000000
--- a/configmgr/source/treecache/cachemulticaster.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: cachemulticaster.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_configmgr.hxx"
-
-#include "cachemulticaster.hxx"
-#include "treemanager.hxx"
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-#ifndef INCLUDED_FUNCTIONAL
-#include <functional>
-#define INCLUDED_FUNCTIONAL
-#endif
-
-namespace configmgr
-{
-// ---------------------------------------------------------------------------
-    namespace backend
-    {
-// ---------------------------------------------------------------------------
-namespace
-{
-// manually implemented helpers, as rtl::References don't work well with std binders
-
-// ---------------------------------------------------------------------------
-
-    // replacing  std::bind2nd( std::mem_fun(&TreeManager::componentCreated), _aComponentName )
-    struct NotifyCreated : std::unary_function<rtl::Reference<TreeManager>,void>
-    {
-        ComponentRequest const & m_arg;
-
-        NotifyCreated(ComponentRequest const * _pComponent) SAL_THROW(())
-        : m_arg(*_pComponent)
-        {}
-
-        void operator()(rtl::Reference<TreeManager> const & _xListener) const SAL_THROW(())
-        { _xListener->componentCreated(m_arg); }
-    };
-// ---------------------------------------------------------------------------
-
-    // replacing  std::bind2nd( std::mem_fun(&TreeManager::componentChanged), _aComponentName )
-    struct NotifyChanged : std::unary_function<rtl::Reference<TreeManager>,void>
-    {
-        UpdateRequest const & m_arg;
-
-        NotifyChanged(UpdateRequest const * _pUpdate) SAL_THROW(())
-        : m_arg(*_pUpdate)
-        {}
-
-        void operator()(rtl::Reference<TreeManager> const & _xListener) const SAL_THROW(())
-        { _xListener->componentChanged(m_arg); }
-    };
-// ---------------------------------------------------------------------------
-} // anonymous namespace
-//----------------------------------------------------------------------------
-
-CacheChangeMulticaster::CacheChangeMulticaster()    
-: m_aMutex()
-, m_aListeners()
-{
-}
-// ---------------------------------------------------------------------------
-
-CacheChangeMulticaster::~CacheChangeMulticaster()   
-{ 
-    OSL_ENSURE( m_aListeners.empty(), "Forgot to dispose multicaster" );
-}
-// ---------------------------------------------------------------------------
-        
-inline std::list< rtl::Reference<TreeManager> > CacheChangeMulticaster::copyListenerList()
-{
-    osl::MutexGuard aListGuard(m_aMutex);
-    return m_aListeners;
-}
-// ---------------------------------------------------------------------------
-
-void CacheChangeMulticaster::notifyCreated(ComponentRequest const & _aComponent) SAL_THROW(())
-{
-    std::list< rtl::Reference<TreeManager> > aNotifyListeners( this->copyListenerList() );
-
-    std::for_each( aNotifyListeners.begin(), aNotifyListeners.end(), NotifyCreated(&_aComponent) );
-}
-// ---------------------------------------------------------------------------
-
-void CacheChangeMulticaster::notifyChanged(UpdateRequest const & _anUpdate) SAL_THROW(())
-{
-    std::list< rtl::Reference<TreeManager> > aNotifyListeners( this->copyListenerList() );
-
-    std::for_each( aNotifyListeners.begin(), aNotifyListeners.end(), NotifyChanged(&_anUpdate) );
-}
-// ---------------------------------------------------------------------------
-
-void CacheChangeMulticaster::addListener(rtl::Reference<TreeManager> _xListener) SAL_THROW(())
-{
-    osl::MutexGuard aListGuard(m_aMutex);
-
-    OSL_PRECOND(std::find(m_aListeners.begin(),m_aListeners.end(),_xListener) == m_aListeners.end(),
-                "WARNING: Cache Change Listener was already registered - will be notified multiply.");
-
-    OSL_PRECOND(_xListener.is(), "ERROR: trying to register a NULL listener");
-
-    if (_xListener.is())
-        m_aListeners.push_front(_xListener);
-}
-// ---------------------------------------------------------------------------
-
-void CacheChangeMulticaster::removeListener(rtl::Reference<TreeManager> _xListener) SAL_THROW(())
-{
-    osl::MutexGuard aListGuard(m_aMutex);
-    m_aListeners.remove(_xListener);
-}
-// ---------------------------------------------------------------------------
-    } // namespace backend
-
-// ---------------------------------------------------------------------------
-} // namespace configmgr
diff --git a/configmgr/source/treecache/cachemulticaster.hxx b/configmgr/source/treecache/cachemulticaster.hxx
deleted file mode 100644
index 6fcb7fc13b..0000000000
--- a/configmgr/source/treecache/cachemulticaster.hxx
+++ /dev/null
@@ -1,91 +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: cachemulticaster.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 CONFIGMGR_BACKEND_CACHEMULTICASTER_HXX
-#define CONFIGMGR_BACKEND_CACHEMULTICASTER_HXX
-
-#include "sal/config.h"
-
-#include <list>
-
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-
-#include "utility.hxx"
-
-namespace configmgr
-{
-    class TreeManager;
-
-    namespace backend
-    {
-        class ComponentRequest;
-        class UpdateRequest;
-// ---------------------------------------------------------------------------
-
-    /** Interface providing a multicasting service for changes to the cache 
-        managed by a <type>CacheController</type>
-    */
-    class CacheChangeMulticaster
-    {
-    public:      
-        CacheChangeMulticaster();
-        virtual ~CacheChangeMulticaster();
-
-        /** notify a new component to all registered listeners.
-            <p> Must be called after the component has been created in the cache.</p>
-        */
-        void notifyCreated(ComponentRequest const & _aComponentName) SAL_THROW(());
-
-        /** notify changed data to all registered listeners.
-            <p> Must be called after the change has been applied to the cache
-                and before any subsequent changes to the same component.</p>
-        */
-        void notifyChanged(UpdateRequest const & _anUpdate) SAL_THROW(());
-
-    // notification support. 
-        /// register a listener for observing changes to the cached data
-        void addListener(rtl::Reference<TreeManager> _xListener) SAL_THROW(());
-        /// unregister a listener previously registered
-        void removeListener(rtl::Reference<TreeManager> _xListener) SAL_THROW(());
-    private:
-        std::list< rtl::Reference<TreeManager> > copyListenerList();
-
-        osl::Mutex   m_aMutex;
-        std::list< rtl::Reference<TreeManager> > m_aListeners;
-    };
-// ---------------------------------------------------------------------------
-    } // namespace backend
-
-// ---------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/treecache/cachewritescheduler.cxx b/configmgr/source/treecache/cachewritescheduler.cxx
deleted file mode 100644
index 0303a771ab..0000000000
--- a/configmgr/source/treecache/cachewritescheduler.cxx
+++ /dev/null
@@ -1,216 +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: cachewritescheduler.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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "cachewritescheduler.hxx"
-#include "cachecontroller.hxx"
-#include "tracer.hxx"
-
-
-namespace configmgr
-{
-// =========================================================================
-OCacheWriteScheduler::~OCacheWriteScheduler()
-{
-    stopAndWriteCache();// last chance - violates precond
-}
-
-void OCacheWriteScheduler::stopAndWriteCache()
-{
-    OSL_ASSERT(UnoApiLock::isHeld());
-    CFG_TRACE_INFO("Cancelling all cache writings, Stopping timer");
-    
-    if (m_xTimer.isValid())
-        m_xTimer->dispose(); // just to be sure	
-
-    runWriter();
-
-    m_aWriteList.clear();
-}
-
-// -------------------------------------------------------------------------
-void OCacheWriteScheduler::Timer::onShot()
-{
-    UnoApiLock aLock;
-
-    if (pParent)
-        pParent->onTimerShot();
-    else
-        CFG_TRACE_WARNING("Timer shot for disposed cache writer");
-}
-
-// -----------------------------------------------------------------------------
-void OCacheWriteScheduler::onTimerShot()
-{
-    //m_aTimer.stop();
-
-    CFG_TRACE_INFO("Write Timer invoked - executing write task");
-
-    try
-    {
-        runWriter();
-        CFG_TRACE_INFO_NI("Write timer: writing ended");
-    }
-    catch (...)
-    {
-        CFG_TRACE_ERROR_NI("Write timer: writing failed with an unknown exception");
-        OSL_ENSURE(false, "ERROR: Unknown Exception left a writer");
-    }
-
-    TimeStamp aNewTime = implGetScheduleTime(TimeStamp::getCurrentTime(), m_aWriteInterval);
-
-    implStartBefore(aNewTime);
-}
-// -------------------------------------------------------------------------
-void OCacheWriteScheduler::runWriter()
-{
-    // Write Cache
-    OSL_ASSERT(UnoApiLock::isHeld());
-    CFG_TRACE_INFO("Running write operations");
-    
-    CacheWriteList aPendingWrites;
-    m_aWriteList.swap(aPendingWrites);
-
-    CFG_TRACE_INFO_NI("Found %d sections to write", int(aPendingWrites.size()));
-    for (CacheWriteList::iterator it = aPendingWrites.begin();
-         it != aPendingWrites.end();
-         ++it)
-    {
-        RequestOptions aTaskOption = *it;
-        try
-        {
-            writeOneTreeFoundByOption(aTaskOption);
-        }
-        catch (uno::Exception& e)
-        {
-                    (void)e;
-            CFG_TRACE_ERROR_NI("TreeCacheWriteScheduler: Attempt to write data failed - error is '%s' (currently ignored)",OUSTRING2ASCII(e.Message));
-        }
-    }
-    // m_aWriteList.clear();
-    CFG_TRACE_INFO_NI("DONE: Running write operations");
-}
-
-// -----------------------------------------------------------------------------
-void OCacheWriteScheduler::writeOneTreeFoundByOption(RequestOptions const& _aOptions) SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("Writeing one cache tree for user '%s' with locale '%s'", 
-           OUSTRING2ASCII(_aOptions.getEntity()), 
-                   OUSTRING2ASCII(_aOptions.getLocale()));
-
-    rtl::Reference<CacheLoadingAccess> aCache;
-    aCache = m_rTreeManager.m_aCacheMap.get(_aOptions);
-
-    if (aCache.is())
-    {
-        CFG_TRACE_INFO_NI("- Found matching data container  - starting write task");		
-        if (!m_rTreeManager.saveAllPendingChanges(aCache,_aOptions))
-        {
-            m_aWriteList.insert(_aOptions);
-
-            CFG_TRACE_INFO_NI("- Write task incomplete -reregistering");		
-        }
-        // we got a pending list with pointers from TreeInfo.
-    }
-    else
-    {
-        CFG_TRACE_WARNING_NI("- Data container (TreeInfo) to write not found: Ignoring task");		
-    }
-
-    CFG_TRACE_INFO_NI("Removing written cache tree (for user '%s' with locale '%s')", 
-                    OUSTRING2ASCII(_aOptions.getEntity()), 
-                    OUSTRING2ASCII(_aOptions.getLocale()));
-}
-
-// -----------------------------------------------------------------------------
-bool OCacheWriteScheduler::clearTasks(RequestOptions const& _aOptions)
-{
-    // sadly list::remove doesn't return an indication of what it did
-    bool bFound = m_aWriteList.erase(_aOptions) !=0;	
-    if (bFound)
-    {
-        CFG_TRACE_INFO("Write Scheduler: Dropped cache tree (for user '%s' with locale '%s') from task list", 
-                            OUSTRING2ASCII(_aOptions.getEntity()), 
-                            OUSTRING2ASCII(_aOptions.getLocale()));
-    }
-    
-    return bFound;
-}
-
-// -----------------------------------------------------------------------------
-// should be called guarded only
-void OCacheWriteScheduler::implStartBefore(TimeStamp const& _aTime)
-{
-    CFG_TRACE_INFO("Triggering write timer");		
-    // check if we were cleared
-    if (!m_aWriteList.empty())
-    {		
-        if (!m_xTimer->isTicking())
-        {
-            m_xTimer->setAbsoluteTime(_aTime.getTimeValue());
-
-            if (!m_xTimer->isTicking())
-                m_xTimer->start();
-        
-            OSL_ASSERT( m_xTimer->isTicking() );
-        }
-        CFG_TRACE_INFO_NI("- Write timer running - next execution in %d seconds", int (m_xTimer->getRemainingTime().Seconds) );
-        CFG_TRACE_INFO_NI("- %d write tasks are pending", int(m_aWriteList.size()) );
-    }
-    else
-    {
-        m_xTimer->stop();
-        CFG_TRACE_INFO_NI("- Stopped timer - no more open write tasks");		
-    }
-}
-
-// -----------------------------------------------------------------------------
-void OCacheWriteScheduler::scheduleWrite(backend::ComponentRequest _aComponent)  SAL_THROW((com::sun::star::uno::Exception))
-{
-    OSL_ENSURE(_aComponent.getOptions().hasLocale(), "ERROR: OTreeDisposeScheduler: cannot handle complete user scheduling");
-
-    CFG_TRACE_INFO("Scheduling cache write for user '%s' with locale '%s'", 
-                    OUSTRING2ASCII(_aComponent.getOptions().getEntity()), 
-                    OUSTRING2ASCII(_aComponent.getOptions().getLocale()));
-
-    // lasy writing
-    m_aWriteList.insert(_aComponent.getOptions());
-
-    TimeStamp aNewTime = implGetScheduleTime(TimeStamp::getCurrentTime(), m_aWriteInterval);
-    implStartBefore(aNewTime);
-}
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/treecache/cachewritescheduler.hxx b/configmgr/source/treecache/cachewritescheduler.hxx
deleted file mode 100644
index 853802b38f..0000000000
--- a/configmgr/source/treecache/cachewritescheduler.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: cachewritescheduler.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 CONFIGMGR_CACHEWRITESCHEDULER_HXX
-#define CONFIGMGR_CACHEWRITESCHEDULER_HXX
-
-#include "datalock.hxx"
-#include "requestoptions.hxx"
-#include "timestamp.hxx"
-#include "utility.hxx"
-
-#ifndef INCLUDED_SET
-#include <set>
-#define INCLUDED_SET
-#endif
-#include <vos/timer.hxx>
-#ifndef _VOS_REF_HXX_
-#include <vos/ref.hxx>
-
-#endif
-#include <osl/mutex.hxx>
-
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-    class RequestOptions;
-    namespace backend { class ComponentRequest; class CacheController; }
-
-    // Write down the Cache, much less complex than caching Nodes
-    // (better control)
-    class OCacheWriteScheduler
-    {
-        typedef std::set< RequestOptions, lessRequestOptions > CacheWriteList; // fire and forget!
-
-        class Timer : public vos::OTimer
-        {
-        public:
-            OCacheWriteScheduler* pParent;
-
-            Timer(OCacheWriteScheduler& _rParent) : pParent(&_rParent) {};
-
-            // vos::OTimer
-            virtual void SAL_CALL onShot();
-
-            // stop the scheduling
-            void dispose() {
-                stop();
-                pParent = NULL;
-            }
-
-        };
-        friend void Timer::onShot();
-    private:
-        vos::ORef<Timer>	      m_xTimer;
-        backend::CacheController &m_rTreeManager;
-        CacheWriteList	      m_aWriteList;
-        TimeInterval	      m_aWriteInterval;
-        
-    public:
-    //-------- Construction and destruction -----------------------------------
-        explicit
-        OCacheWriteScheduler(backend::CacheController& _rTreeManager, TimeInterval const& _aWriteInterval) 
-            : m_rTreeManager(_rTreeManager)
-            , m_aWriteInterval(_aWriteInterval)			
-        {
-            m_xTimer = new Timer(*this);
-        }
-        ~OCacheWriteScheduler();
-
-    //-------- Delay and Interval ---------------------------------------------
-        /// retrieves the recurrance interval used for cleanup
-        TimeInterval const& getWriteInterval() const 
-        { 
-            UnoApiLock aLock;
-            return m_aWriteInterval; 
-        }
-
-        static TimeStamp implGetScheduleTime(TimeStamp const& aBaseTime, TimeInterval const& aDelay)
-        {
-            return aBaseTime + aDelay;
-        }
-    //-------- Control of execution  ------------------------------------------		
-        void scheduleWrite(backend::ComponentRequest _aComponent) SAL_THROW((com::sun::star::uno::Exception));
-
-        /// stop pending activities for one set of options (do not discard them)
-        bool clearTasks(RequestOptions const& _xOptions);
-
-        /// stop and discard pending activities
-        void stopAndWriteCache();
-    private:
-        // vos::OTimer
-        void onTimerShot();
-
-        void runWriter();
-        void implStartBefore(TimeStamp const& _aTime);
-        void writeOneTreeFoundByOption(RequestOptions const& _aOption) SAL_THROW((com::sun::star::uno::Exception));
-    };
-} // namespace configmgr
-
-#endif // CONFIGMGR_DISPOSETIMER_HXX
-
diff --git a/configmgr/source/treecache/disposetimer.cxx b/configmgr/source/treecache/disposetimer.cxx
deleted file mode 100644
index c8afe1270a..0000000000
--- a/configmgr/source/treecache/disposetimer.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: disposetimer.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include "datalock.hxx"
-#include "disposetimer.hxx"
-#include "cachecontroller.hxx"
-#include "configexcept.hxx"
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-
-
-namespace configmgr
-{
-//==========================================================================
-//=
-//==========================================================================
-
-
-void OTreeDisposeScheduler::scheduleCleanup(RequestOptions const& _aOptions)
-{
-    OSL_ENSURE(_aOptions.hasLocale(), "ERROR: OTreeDisposeScheduler: cannot handle complete user scheduling");
-
-    CFG_TRACE_INFO("Scheduling data cleanup for user '%s' with locale '%s'",
-                    OUSTRING2ASCII(_aOptions.getEntity()),
-                    OUSTRING2ASCII(_aOptions.getLocale()));
-
-    CFG_TRACE_INFO_NI("- Cleanup will be started in about %d seconds", int(m_aCleanupDelay.getTimeValue().Seconds));
-
-    TimeStamp aNewTime = implGetCleanupTime(TimeStamp::getCurrentTime(), m_aCleanupDelay);
-    OSL_ASSERT(!aNewTime.isNever());
-
-    TimeStamp aScheduleTime = implAddTask(_aOptions, aNewTime);
-
-    OSL_ASSERT(aScheduleTime <= aNewTime);
-    OSL_ASSERT(!aScheduleTime.isNever());
-
-    implStartBefore(aNewTime);
-}
-// -------------------------------------------------------------------------
-
-static
-inline
-bool equivalentOptions(RequestOptions const& lhs, RequestOptions const& rhs)
-{
-    lessRequestOptions lessThan;
-    return ! (lessThan(lhs,rhs) || lessThan(rhs,lhs));
-}
-// -------------------------------------------------------------------------
-
-void OTreeDisposeScheduler::stopAndClearTasks()
-{
-    CFG_TRACE_INFO("Cancelling all data cleanup tasks, Stopping Cleanup timer");
-    CFG_TRACE_INFO_NI("- %d cleanup tasks were pending", int(m_aAgenda.size()) );
-
-    if (m_xTimer.isValid())
-        m_xTimer->dispose(); // just to be sure
-
-    m_aAgenda.clear();
-}
-// -------------------------------------------------------------------------
-
-std::pair<bool,RequestOptions> OTreeDisposeScheduler::getTask(TimeStamp const& _aActualTime, TimeStamp& _rNextTime)
-{
-    OSL_ASSERT( _rNextTime.isNever() ); // internal contract, we set this only in the positive case
-
-    std::pair<bool,RequestOptions> aTask( false, RequestOptions() );
-
-    if (!m_aAgenda.empty())
-    {
-        Agenda::iterator const it = m_aAgenda.begin();
-
-        if (it->first <= _aActualTime)
-        {
-            aTask = std::make_pair(true,it->second);
-            m_aAgenda.erase(it);
-        }
-    }
-
-    if (!m_aAgenda.empty())
-    {
-        Agenda::iterator const it = m_aAgenda.begin();
-
-        _rNextTime = it->first;
-    }
-
-    return aTask;
-}
-// -------------------------------------------------------------------------
-
-void OTreeDisposeScheduler::Timer::onShot()
-{
-    UnoApiLock aLock;
-    if (pParent)
-        pParent->onTimerShot();
-}
-// -------------------------------------------------------------------------
-
-void OTreeDisposeScheduler::onTimerShot()
-{
-    CFG_TRACE_INFO("Cleanup Timer invoked - executing dispose task");
-
-    TimeStamp aActualTime = TimeStamp::getCurrentTime();
-    TimeStamp aNextTime = implGetCleanupTime(aActualTime, getCleanupInterval());
-
-    try
-    {
-        TimeStamp aNextDisposeTime = runDisposer(aActualTime);
-
-        if (aNextTime < aNextDisposeTime)
-            aNextTime = aNextDisposeTime;
-    }
-
-    catch (uno::Exception& )
-    {
-        OSL_ENSURE(false, "ERROR: UNO Exception left a disposer");
-    }
-    catch (configuration::Exception& )
-    {
-        OSL_ENSURE(false, "ERROR: configuration::Exception left a disposer");
-    }
-    catch (...)
-    {
-        OSL_ENSURE(false, "ERROR: Unknown Exception left a disposer");
-    }
-
-    OSL_ASSERT(UnoApiLock::isHeld());
-    implStartBefore(aNextTime);
-}
-// -------------------------------------------------------------------------
-
-// this really should be a member of the TreeManager (see TreeManager::disposeOne etc.)
-TimeStamp OTreeDisposeScheduler::runDisposer(TimeStamp const& _aActualTime)
-{
-    TimeStamp aNextTime = TimeStamp::never();
-    OSL_ASSERT(aNextTime.isNever());
-
-    OSL_ASSERT(UnoApiLock::isHeld());
-
-    std::pair<bool,RequestOptions> aTask = this->getTask( _aActualTime, aNextTime );
-    if (aTask.first)
-    {
-        RequestOptions & rTaskOptions = aTask.second;
-
-        CFG_TRACE_INFO("Found cleanup task for user %s and locale %s",
-                        OUSTRING2ASCII(rTaskOptions.getEntity()),
-                        OUSTRING2ASCII(rTaskOptions.getLocale()));
-
-        rtl::Reference<CacheLoadingAccess> aCache = m_rTreeManager.m_aCacheMap.get(rTaskOptions);
-        if (aCache.is())
-        {
-            CFG_TRACE_INFO_NI("- Found matching data container (TreeInfo) - collecting data");
-
-            std::vector< rtl::Reference<CacheLine> > aDisposeList;
-
-            TimeStamp aNextTaskTime = aCache->collectDisposeList(aDisposeList, _aActualTime, m_aCleanupDelay);
-
-            CFG_TRACE_INFO_NI("- Found %d module trees to dispose", int(aDisposeList.size()) );
-
-            if (!aNextTaskTime.isNever())
-            {
-                OSL_ENSURE( !aCache->isEmpty(), "ERROR: Empty TreeInfo returning finite dispose time");
-
-                // repost with new time
-                OSL_ASSERT(UnoApiLock::isHeld());
-
-                CFG_TRACE_INFO_NI("- Rescheduling current option set" );
-
-                aNextTime = this->implAddTask(rTaskOptions,aNextTaskTime);
-            }
-
-            else if (aCache->isEmpty())// may have been the last one - check that
-            {
-                // currently it is not possible to release options which are
-                // because it is not save to delete the info if another thread is running in
-                // a read request
-            }
-            else
-                CFG_TRACE_INFO_NI("- Currently no more cleanup tasks for this options set" );
-
-            if (!aDisposeList.empty())
-            {
-                CFG_TRACE_INFO_NI("- Closing %d modules", int(aDisposeList.size()) );
-                m_rTreeManager.closeModules(aDisposeList,rTaskOptions);
-            }
-            else
-                CFG_TRACE_INFO_NI("- No modules trees to dispose");
-        }
-        else
-            CFG_TRACE_INFO_NI("- No matching data container (TreeInfo) found - task is obsolete");
-    }
-    else
-        CFG_TRACE_INFO("No eligible task found - may reschedule");
-
-    return aNextTime;
-}
-// -------------------------------------------------------------------------
-
-static inline
-TimeStamp getExpirationTime( vos::OTimer const& aTimer )
-{
-    OSL_ENSURE(aTimer.isTicking(), "Timer is already expired !");
-
-    // note: order ensures that result time may be earlier, but not later
-    TimeStamp       const now ( TimeStamp::getCurrentTime() );
-    TimeInterval    const left( aTimer.getRemainingTime() );
-    TimeStamp       const expires = now + left;
-
-    return expires;
-}
-
-// -------------------------------------------------------------------------
-
-#if OSL_DEBUG_LEVEL > 0
-static
-void checkTimerStarted( vos::OTimer const& aTimer, TimeStamp const& _aLimit)
-{
-    const TimeInterval tolerance( vos::TTimeValue(1) ); // milliseconds
-    if (aTimer.isTicking())
-    {
-        TimeStamp   const    expires = getExpirationTime(aTimer);
-        TimeStamp   const    limit   = _aLimit + tolerance;
-
-        OSL_ENSURE(expires <= limit, "Timer does not expire within expected time (tolerance 1 ms) !");
-      //  OSL_ENSURE(expires <= _aLimit, "Timer does not expire within expected time !");
-        OSL_ENSURE(aTimer.isTicking(), "Timer just started already expired ?!");
-    }
-    else
-    {
-        OSL_ENSURE(false, "Timer just started is not ticking ?!");
-    }
-}
-#endif
-
-// -------------------------------------------------------------------------
-// should be called guarded only
-void OTreeDisposeScheduler::implStartBefore(TimeStamp const& _aTime)
-{
-    // check if we were cleared
-    if (!m_aAgenda.empty() && !_aTime.isNever())
-    {
-        if (!m_xTimer->isTicking() || _aTime < getExpirationTime(*m_xTimer))
-        {
-            m_xTimer->setAbsoluteTime(_aTime.getTimeValue());
-
-            if (!m_xTimer->isTicking()) m_xTimer->start();
-
-            OSL_DEBUG_ONLY( checkTimerStarted(*m_xTimer,_aTime) );
-        }
-        CFG_TRACE_INFO_NI("- Cleanup timer running - next execution in %d seconds", int (m_xTimer->getRemainingTime().Seconds) );
-        CFG_TRACE_INFO_NI("- %d cleanup tasks are pending", int(m_aAgenda.size()) );
-    }
-    else
-    {
-        m_xTimer->stop();
-        CFG_TRACE_INFO_NI("- Stopped timer - no more open cleanup tasks");
-    }
-}
-// -------------------------------------------------------------------------
-
-TimeStamp OTreeDisposeScheduler::implAddTask(RequestOptions const& _aOptions, TimeStamp const& _aTime)
-{
-    OSL_ASSERT(UnoApiLock::isHeld());
-
-    // try to insert after euivalent entries (but STL may ignore the hint)
-    Agenda::iterator where = m_aAgenda.upper_bound(_aTime);
-
-    m_aAgenda.insert(where, Agenda::value_type(_aTime,_aOptions));
-
-    OSL_ASSERT(!m_aAgenda.empty());
-
-    return m_aAgenda.begin()->first;
-}
-// -------------------------------------------------------------------------
-
-} // namespace
diff --git a/configmgr/source/treecache/disposetimer.hxx b/configmgr/source/treecache/disposetimer.hxx
deleted file mode 100644
index b9ee058321..0000000000
--- a/configmgr/source/treecache/disposetimer.hxx
+++ /dev/null
@@ -1,172 +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: disposetimer.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_DISPOSETIMER_HXX
-#define CONFIGMGR_DISPOSETIMER_HXX
-
-#include "timestamp.hxx"
-#include "requestoptions.hxx"
-#include <osl/mutex.hxx>
-#include <vos/timer.hxx>
-#include <vos/ref.hxx>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-
-#ifndef INCLUDED_UTILITY
-#include <utility>
-#define INCLUDED_UTILITY
-#endif
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace uno	= ::com::sun::star::uno;
-namespace lang	= ::com::sun::star::lang;
-
-namespace configmgr
-{
-    namespace backend { class CacheController; }
-////////////////////////////////////////////////////////////////////////////////
-/* OTreeDisposeScheduler:
-   does something special????
-*/
-
-    class OTreeDisposeScheduler
-    {
-        typedef std::multimap< TimeStamp, RequestOptions, ltTimeStamp > Agenda;
-
-        class Timer : public vos::OTimer
-        {
-        public:
-            OTreeDisposeScheduler* pParent;
-
-            Timer(OTreeDisposeScheduler& _rParent) : pParent(&_rParent) {};
-
-            // vos::OTimer
-            virtual void SAL_CALL onShot();
-
-            // stop the scheduling
-            void dispose() {stop(); pParent = NULL;}
-        };
-        friend void Timer::onShot();
-
-    private:
-        Agenda				m_aAgenda;
-        vos::ORef<Timer>	m_xTimer;
-        backend::CacheController&		m_rTreeManager;
-
-        TimeInterval m_aCleanupDelay;
-        TimeInterval m_aCleanupInterval;
-    public:
-    //-------- Construction and destruction -----------------------------------
-        explicit
-        OTreeDisposeScheduler(backend::CacheController& _rTreeManager, TimeInterval const& _aCleanupDelay) 
-            : m_rTreeManager(_rTreeManager)
-            , m_aCleanupDelay(_aCleanupDelay)
-            , m_aCleanupInterval(_aCleanupDelay)
-        {
-            m_xTimer = new Timer(*this);
-        }
-
-        explicit
-        OTreeDisposeScheduler(backend::CacheController& _rTreeManager, TimeInterval const& _aCleanupDelay, TimeInterval const& _aCleanupInterval) 
-            : m_rTreeManager(_rTreeManager)
-            , m_aCleanupDelay(_aCleanupDelay)
-            , m_aCleanupInterval(_aCleanupInterval)
-        {
-            m_xTimer = new Timer(*this);
-        }
-
-        ~OTreeDisposeScheduler() { stopAndClearTasks(); }
-        
-        //-------- Delay and Interval ---------------------------------------------
-        /// sets the initial delay to be used for cleanup in the future, does not affect an already started process
-        void setCleanupDelay(TimeInterval const& _aCleanupDelay)  
-        { 
-            m_aCleanupDelay = _aCleanupDelay; 
-        }
-
-        /// sets the initial delay and recurrance interval to be used for cleanup in the future, does not affect an already started process
-        void setCleanupDelay(TimeInterval const& _aCleanupDelay, TimeInterval const& _aCleanupInterval)  
-        { 
-            m_aCleanupDelay = _aCleanupDelay; 
-            m_aCleanupInterval = _aCleanupInterval; 
-        }
-
-        /// sets the recurrance interval to be used for cleanup in the future, does not affect an already started process
-        void setCleanupInterval(TimeInterval const& _aCleanupInterval)  
-        { 
-            m_aCleanupInterval = _aCleanupInterval; 
-        }
-
-        /// retrieves the initial delay used for cleanup
-        TimeInterval const& getCleanupDelay() const 
-        { 
-            return m_aCleanupDelay; 
-        }
-
-        /// retrieves the recurrance interval used for cleanup
-        TimeInterval const& getCleanupInterval() const 
-        { 
-            return m_aCleanupInterval; 
-        }
-
-    //-------- Control of execution  ------------------------------------------
-        /// ensure this will execute cleanup duties for _xOptions (no later than after getCleanupDelay() has elapsed)
-        void scheduleCleanup(RequestOptions const & _aOptions); 
-
-        /// stop and discard pending activities
-        void stopAndClearTasks();
-
-    private:
-        // vos::OTimer
-        void onTimerShot();
-
-        std::pair<bool,RequestOptions> getTask(TimeStamp const& _aActualTime, TimeStamp& _aNextTime);
-
-        /// ensure this will execute cleanup duties for _xOptions (no later than after getCleanupDelay() has elapsed)
-      //  TimeStamp fillDisposeList(CacheLoadingAccess & _aCache, DisposeList& _rList, TimeStamp const& aLimitTime)
-
-        TimeStamp runDisposer(TimeStamp const& _aActualTime);
-    private:
-        TimeStamp implAddTask(RequestOptions const& _xOptions, TimeStamp const& _aTime);
-        void implStartBefore(TimeStamp const& _aTime);
-
-        static TimeStamp implGetCleanupTime(TimeStamp const& aPostingTime, TimeInterval const& aDelay)
-        { return aPostingTime + aDelay; }
-    };
-
-
-////////////////////////////////////////////////////////////////////////////////	
-} // namespace configmgr
-
-#endif // CONFIGMGR_DISPOSETIMER_HXX
-
diff --git a/configmgr/source/treecache/invalidatetree.cxx b/configmgr/source/treecache/invalidatetree.cxx
deleted file mode 100644
index 9310716171..0000000000
--- a/configmgr/source/treecache/invalidatetree.cxx
+++ /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: invalidatetree.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-
-#include "cachecontroller.hxx"
-#include "change.hxx"
-#include "valuenode.hxx"
-#include "updatehelper.hxx"
-#include "treeactions.hxx"
-#include "tracer.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-
-namespace configmgr
-{
-
-    namespace container = com::sun::star::container;
-// -----------------------------------------------------------------------------
-// ------------------------------- invalidateTree -------------------------------
-// -----------------------------------------------------------------------------
-
-namespace backend
-{
-// -----------------------------------------------------------------------------	
-std::auto_ptr<SubtreeChange> createDiffs(sharable::Node * cachedNode, 
-                                            ISubtree const * _pLoadedSubtree,
-                                            configuration::AbsolutePath const& _aAbsoluteSubtreePath)
-{
-    OSL_PRECOND(cachedNode != 0, "Need an existing node to create a diff");
-    OSL_PRECOND(_pLoadedSubtree != 0, "Need a result node to create a diff");
-    // Create a TreeChangeList with the right name, parentname and ConfigurationProperties
-    std::auto_ptr<SubtreeChange> aNewChange(new SubtreeChange(_aAbsoluteSubtreePath.getLocalName().getName(),
-                                                                node::Attributes()) );
-    
-    if (!createUpdateFromDifference(*aNewChange, cachedNode, *_pLoadedSubtree))
-        aNewChange.reset();
-
-    return aNewChange;
-}
-// -----------------------------------------------------------------------------	
-#if 0
-std::auto_ptr<ISubtree> TreeManager::loadNodeFromSession( configuration::AbsolutePath const& _aAbsoluteSubtreePath, 
-                                                     const vos::ORef < OOptions >& _xOptions,
-                                                     sal_Int16 _nMinLevels)  SAL_THROW((com::sun::star::uno::Exception))
-{
-    TreeInfo* pInfo = this->requestTreeInfo(_xOptions,true /*create TreeInfo*/);
-
-    CFG_TRACE_INFO_NI("cache manager: cache miss. going to load the node");
-    rtl::Reference< OTreeLoader > xLoader = pInfo->getNewLoaderWithoutPending(_aAbsoluteSubtreePath, _nMinLevels, _xOptions, m_xBackend.get());
-
-    OSL_ENSURE(xLoader.is(), "Did not receive a loader for retrieving the node");
-    CFG_TRACE_INFO_NI("cache manager: cache miss. going to load the node");
-    if (!xLoader.is())
-        throw container::NoSuchElementException((::rtl::OUString::createFromAscii("Error while retrieving the node")), NULL);
-        
-    // now block for reading
-    std::auto_ptr<ISubtree> pResponse;
-    try
-    {
-        pResponse = xLoader->waitToResponse();
-    }
-    catch (uno::Exception& e)
-    {
-        pInfo->releaseLoader(xLoader);
-        throw;
-    }
-    
-    pInfo->releaseLoader(xLoader);
-
-    return pResponse;
-}
-#endif
-// -----------------------------------------------------------------------------
-
-sharable::TreeFragment * CacheController::refreshComponent(ComponentRequest const & _aRequest) SAL_THROW((com::sun::star::uno::Exception))
-{
-    if (m_bDisposing) return NULL;
-
-    rtl::Reference<CacheLoadingAccess> aCache = this->getCacheAlways(_aRequest.getOptions());
-
-    if (!aCache.is()) return NULL;
-    
-    // load the Node direct from the session, without using the cache
-    ComponentRequest aForcedRequest(_aRequest);
-    aForcedRequest.forceReload();
-
-    ResultHolder< ComponentInstance > aLoadedInstance = this->getComponentData(aForcedRequest,false);
-    configuration::AbsolutePath aRequestPath = configuration::AbsolutePath::makeModulePath(_aRequest.getComponentName());
-    NodeInstance aNodeInstance(aLoadedInstance.mutableInstance().mutableData(),aRequestPath) ;
-    ResultHolder< NodeInstance > aLoadedNodeInstance(aNodeInstance) ;
-    
-    sharable::TreeFragment * aResult = NULL;
-    if (aLoadedNodeInstance.is())
-    {
-        rtl::OUString aModuleName = aLoadedNodeInstance->root().getModuleName();
-
-        bool bAcquired = aCache->acquireModule(aModuleName);
-        aResult = (sharable::TreeFragment *)( aCache->getTreeAddress(aModuleName) );
-
-        if (bAcquired)
-        try
-    {
-            std::auto_ptr<SubtreeChange> aTreeChanges;
-            sharable::Node * aRootAddress;
-
-            {
-                sharable::Node * rootNode = aResult == 0 ? 0 : aResult->getRootNode();
-
-                aTreeChanges = createDiffs(rootNode, aLoadedNodeInstance->data().get(), aLoadedNodeInstance->root());
-                aRootAddress = rootNode;
-            }
-
-            if (aTreeChanges.get() != NULL)
-            {
-        // change all Values... found in the Subtree in the CacheTree
-        applyUpdateWithAdjustmentToTree(*aTreeChanges, aRootAddress);
-                
-                UpdateRequest anUpdateReq(  aTreeChanges.get(),
-                                            aLoadedNodeInstance->root(),
-                                            _aRequest.getOptions()
-                                          );
-
-                m_aNotifier.notifyChanged(anUpdateReq);
-            }
-        aCache->releaseModule(aModuleName);
-        }
-        catch (...)
-        {
-        aCache->releaseModule(aModuleName);
-            throw;
-        }
-    }
-    return aResult;
-}
-
-// -----------------------------------------------------------------------------
-    } // namespace backend
-
-// -----------------------------------------------------------------------------
-} // namespace configmgr
-
diff --git a/configmgr/source/treecache/makefile.mk b/configmgr/source/treecache/makefile.mk
deleted file mode 100644
index d8649085bb..0000000000
--- a/configmgr/source/treecache/makefile.mk
+++ /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: 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=..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=treecache
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-        $(SLO)$/timestamp.obj			\
-        $(SLO)$/disposetimer.obj		\
-        $(SLO)$/cachewritescheduler.obj	\
-        $(SLO)$/invalidatetree.obj		\
-        $(SLO)$/cachefactory.obj		\
-        $(SLO)$/cacheaccess.obj			\
-        $(SLO)$/cachedata.obj			\
-        $(SLO)$/cacheline.obj			\
-        $(SLO)$/cachemulticaster.obj	\
-        $(SLO)$/cachecontroller.obj		\
-        $(SLO)$/treemanager.obj			\
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/treecache/timestamp.cxx b/configmgr/source/treecache/timestamp.cxx
deleted file mode 100644
index a577bfcb56..0000000000
--- a/configmgr/source/treecache/timestamp.cxx
+++ /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: timestamp.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_configmgr.hxx"
-
-#include <stdio.h>
-
-#include "timestamp.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    const sal_uInt32 maxTimeValueSeconds	= 0xFF000000ul; // catches accidetally added values as well
-    const sal_uInt32 maxTimeValueNanos		= 999999999ul;
-    const sal_uInt32 minTimeValueSeconds	= 0ul;
-    const sal_uInt32 minTimeValueNanos		= 0ul;
-// -------------------------------------------------------------------------
-    TimeStamp TimeStamp::never()
-    {
-        const ::TimeValue maxTimeValue = { maxTimeValueSeconds, maxTimeValueNanos };
-
-        return TimeStamp( maxTimeValue );
-    }
-// -------------------------------------------------------------------------
-    TimeStamp TimeStamp::getCurrentTime()
-    {
-        TimeStamp aResult;
-        if (! ::osl_getSystemTime( &aResult.m_aTime ) )
-            return never();
-        return aResult;
-    }
-// -------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/treecache/timestamp.hxx b/configmgr/source/treecache/timestamp.hxx
deleted file mode 100644
index a28973bc6c..0000000000
--- a/configmgr/source/treecache/timestamp.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: timestamp.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 CONFIGMGR_TIMESTAMP_HXX
-#define CONFIGMGR_TIMESTAMP_HXX
-
-#include <vos/timer.hxx>
-
-namespace configmgr
-{
-////////////////////////////////////////////////////////////////////////////////
-
-    class TimeInterval
-    {
-        vos::TTimeValue m_aTime;
-    public:
-        TimeInterval() : m_aTime()
-        {}
-
-        explicit
-        TimeInterval(sal_uInt32 nSeconds) : m_aTime(nSeconds,0)
-        {}
-
-        explicit
-        TimeInterval(const TimeValue& rTimeValue) : m_aTime(rTimeValue)
-        {}
-
-        sal_Bool isEmpty() const { return m_aTime.isEmpty(); }
-
-        vos::TTimeValue const& getTimeValue() const { return m_aTime; }
-    };	
-////////////////////////////////////////////////////////////////////////////////
-
-    class TimeStamp
-    {
-        vos::TTimeValue m_aTime;
-    public:
-        TimeStamp() : m_aTime()
-        {}
-
-        explicit
-        TimeStamp(TimeValue const& rTimeValue) : m_aTime(rTimeValue)
-        {}
-
-        TimeStamp& operator += (TimeInterval const& aInterval)
-        { m_aTime.addTime(aInterval.getTimeValue()); return *this; }
-
-        vos::TTimeValue const& getTimeValue() const { return m_aTime; }
-
-        sal_Bool isNever() const;
-
-        static TimeStamp getCurrentTime();
-        static TimeStamp never(); // is later than (>) any other TimeStamp
-    };
-
-    inline
-    TimeStamp operator +(TimeStamp const& aTime, TimeInterval const& aInterval)
-    {
-        TimeStamp aResult(aTime);
-        aResult += aInterval;
-        return aResult;
-    }
-    inline
-    TimeStamp operator +(TimeInterval const& aInterval, TimeStamp const& aTime)
-    {
-        TimeStamp aResult(aTime);
-        aResult += aInterval;
-        return aResult;
-    }
-////////////////////////////////////////////////////////////////////////////////	
-    inline sal_Bool operator ==(TimeStamp const& lhs, TimeStamp const& rhs)
-    { return lhs.getTimeValue() == rhs.getTimeValue(); }
-    inline sal_Bool operator < (TimeStamp const& lhs, TimeStamp const& rhs)
-    { return lhs.getTimeValue() < rhs.getTimeValue(); }
-    inline sal_Bool operator > (TimeStamp const& lhs, TimeStamp const& rhs)
-    { return lhs.getTimeValue() > rhs.getTimeValue(); }
-
-    inline sal_Bool operator !=(TimeStamp const& lhs, TimeStamp const& rhs)
-    { return !(lhs == rhs); }
-    inline sal_Bool operator <=(TimeStamp const& lhs, TimeStamp const& rhs)
-    { return !(rhs < lhs); }
-    inline sal_Bool operator >=(TimeStamp const& lhs, TimeStamp const& rhs)
-    { return !(lhs < rhs); }
-
-    inline sal_Bool TimeStamp::isNever() const
-    {
-        return never() <= *this;
-    }
-////////////////////////////////////////////////////////////////////////////////	
-
-    struct ltTimeStamp //: std::binary_function<TimeStamp,TimeStamp,bool>
-    {
-        bool operator()(TimeStamp const& lhs, TimeStamp const& rhs) const
-        { return !!(lhs < rhs); }
-    };
-
-////////////////////////////////////////////////////////////////////////////////	
-} // namespace configmgr
-
-#endif // CONFIGMGR_TIMESTAMP_HXX
-
diff --git a/configmgr/source/treecache/treemanager.cxx b/configmgr/source/treecache/treemanager.cxx
deleted file mode 100644
index 44b36bf53a..0000000000
--- a/configmgr/source/treecache/treemanager.cxx
+++ /dev/null
@@ -1,515 +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: treemanager.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_configmgr.hxx"
-
-#include "treemanager.hxx"
-#include "mergeddataprovider.hxx"
-#include "cacheaccess.hxx"
-#include "cachecontroller.hxx"
-#include "cachemulticaster.hxx"
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include "tracer.hxx"
-#include <osl/diagnose.h>
-#include <rtl/logfile.hxx>
-
-namespace configmgr
-{
-
-    namespace uno = ::com::sun::star::uno;
-    namespace lang= ::com::sun::star::lang;
-
-    namespace Path = configuration::Path;
-// =========================================================================
-//#if OSL_DEBUG_LEVEL > 0
-#if 0 // currently not used in debug build!
-static void test_complete(memory::HeapManager & _rDummy)
-{ new TreeManager(NULL,_rDummy); }
-#endif
-// =========================================================================
-
-#define MAKEUSTRING( char_array ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( char_array ) )
-// =========================================================================
-
-static inline 
-configuration::AbsolutePath extractModulePath(configuration::AbsolutePath const & _aPath)
-{
-    if (_aPath.getDepth() <= 1) return _aPath;
-
-    rtl::OUString aModule = _aPath.getModuleName();
-
-    return configuration::AbsolutePath::makeModulePath(aModule);
-}
-// =========================================================================
-
-// disposing
-// -------------------------------------------------------------------------
-void TreeManager::disposeAll()
-{	
-    CFG_TRACE_INFO("TreeManager: Disposing all data" );			
-    CacheList::Map aReleaseList;
-    
-    m_aCacheList.swap(aReleaseList);			 // move data out of m_aCacheList		
-
-    // free all the trees - not exception safe !! (i.e. disposeBroadcastHelper() must not throw)
-    for (CacheList::Map::iterator i = aReleaseList.begin(); i != aReleaseList.end(); ++i)
-    {
-        if (ConfigChangeBroadcastHelper * pHelper = i->second->releaseBroadcaster())
-            disposeBroadcastHelper(pHelper);		
-        i->second.clear();
-    }	
-}
-
-// -------------------------------------------------------------------------
-void TreeManager::dispose()
-{
-    CFG_TRACE_INFO("TreeManager: dispoing the treemanager" );		
-
-    RTL_LOGFILE_CONTEXT_AUTHOR(aLog, "configmgr::TreeManager", "jb99855", "configmgr: TreeManager::dispose().");
-
-    rtl::Reference< backend::CacheController > xBackendCache = maybeGetBackendCache();
-
-    if (xBackendCache.is()) xBackendCache->getNotifier().removeListener(this);
-
-    // cleaning the cache
-    disposeAll();
-    
-    disposeBackendCache();
-}
-
-// -------------------------------------------------------------------------
-ConfigChangeBroadcastHelper* TreeManager::getBroadcastHelper(RequestOptions const& _aOptions, bool bCreate)
-{
-    rtl::Reference<CacheClientAccess> aCache =  bCreate  ? this->getCacheAlways(_aOptions) 
-                                : m_aCacheList.get(_aOptions);
-
-    return aCache.is() ? aCache->getBroadcaster() : NULL;	
-}
-
-
-// -------------------------------------------------------------------------
-TreeManager::TreeManager(rtl::Reference< backend::CacheController > const & _xBackend) 
-: m_xCacheController(_xBackend)
-, m_aCacheList()
-, m_aTemplates(new CacheData())
-, m_bEnableAsync(true)
-{
-    OSL_PRECOND(_xBackend.is(),"Trying to create a TreeManager without a backend");
-
-    if (m_xCacheController.is()) m_xCacheController->getNotifier().addListener(this);
-}
-
-// -------------------------------------------------------------------------
-TreeManager::~TreeManager()
-{
-}
-
-// -------------------------------------------------------------------------
-rtl::Reference< backend::CacheController > TreeManager::maybeGetBackendCache() SAL_THROW(())
-{
-    osl::MutexGuard aGuard(m_aCacheControllerMutex);
-    rtl::Reference< backend::CacheController > xResult(m_xCacheController);
-    return xResult;
-}
-
-// -------------------------------------------------------------------------
-rtl::Reference< backend::CacheController > TreeManager::getCacheLoader() SAL_THROW((com::sun::star::uno::RuntimeException))
-{
-    osl::MutexGuard aGuard(m_aCacheControllerMutex);
-    if (!m_xCacheController.is())
-    {
-        rtl::OUString sMsg = rtl::OUString::createFromAscii("TreeManager: No backend available - tree manager was already disposed.");
-        throw com::sun::star::lang::DisposedException(sMsg,NULL);
-    }
-    rtl::Reference< backend::CacheController > xResult(m_xCacheController);
-    return xResult;
-}
-
-// -------------------------------------------------------------------------
-void TreeManager::disposeBackendCache() SAL_THROW(())
-{
-    osl::ClearableMutexGuard aGuard(m_aCacheControllerMutex);
-    if (m_xCacheController.is())
-    {
-        rtl::Reference< backend::CacheController > xBackendCache(m_xCacheController);
-        m_xCacheController.clear();
-        aGuard.clear();
-        xBackendCache->dispose();
-    }
-}
-
-// -------------------------------------------------------------------------
-
-rtl::Reference<CacheClientAccess> TreeManager::getCacheAlways(RequestOptions const & _aOptions)
-{
-    rtl::Reference<CacheClientAccess> aResult = m_aCacheList.get(_aOptions);
-    if (!aResult.is())
-    {
-        rtl::Reference<CacheClientAccess> aNewCache( new CacheClientAccess(new ConfigChangeBroadcastHelper()) );
-        aResult = m_aCacheList.insert(_aOptions,aNewCache);
-    }
-    return aResult;
-}
-
-// -------------------------------------------------------------------------
-
-sharable::Node * TreeManager::requestSubtree(configuration::AbsolutePath const& aSubtreePath, 
-                         const RequestOptions& _aOptions)  
-                        SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("TreeManager: request for subtree '%s'", OUSTRING2ASCII(aSubtreePath.toString()));
-
-    rtl::Reference<CacheClientAccess> aCache = getCacheAlways(_aOptions);
-    OSL_ENSURE(aCache.is(),"TreeManager: Cannot create cache access for loading node");
-
-    if (!aCache->hasModule(aSubtreePath))
-    {
-    CFG_TRACE_INFO_NI("TreeManager: cache miss. going to load the node");
-        backend::ComponentRequest aQuery( aSubtreePath.getModuleName(), _aOptions );
-
-        sharable::TreeFragment * aLoadedLocation = getCacheLoader()->loadComponent(aQuery);
-        if (aLoadedLocation == NULL)
-        {
-            CFG_TRACE_WARNING_NI("TreeManager: requested component not found");
-            throw com::sun::star::container::
-                    NoSuchElementException( MAKEUSTRING("Requested component not found"), NULL);
-        }
-
-    CFG_TRACE_INFO_NI("TreeManager: attaching loaded cache segment ");
-        aCache->attachModule(aLoadedLocation,aSubtreePath.getModuleName());
-    }
-    else
-    { 
-    CFG_TRACE_INFO_NI("TreeManager: found node in cache");
-        if (_aOptions.isRefreshEnabled())
-        {
-             backend::ComponentRequest aRequest( aSubtreePath.getModuleName(), _aOptions );
-             getCacheLoader()->refreshComponent(aRequest);
-        }
-    }
-
-    return aCache->acquireNode(aSubtreePath);
-}
-
-// -------------------------------------------------------------------------
-void TreeManager::fetchSubtree(configuration::AbsolutePath const& aSubtreePath, const RequestOptions&  ) SAL_THROW(())
-{
-    (void) aSubtreePath; // avoid warning about unused parameter
-    CFG_TRACE_WARNING("TreeManager: Prefetching not implemented. (Request to prefetch component %s.", OUSTRING2ASCII(aSubtreePath.toString()));
-}
-
-// -------------------------------------------------------------------------
-sal_Bool TreeManager::fetchDefaultData( configuration::AbsolutePath const& aSubtreePath, 
-                                        const RequestOptions& _aOptions
-    ) SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("tree manager: checking the cache for defaults");
-
-    rtl::Reference<CacheClientAccess> aCache = m_aCacheList.get(_aOptions);
-
-    if (!aCache.is())
-    {
-    OSL_ENSURE(aCache.is(),"TreeManager: Cache access to fetch defaults for does not exist ! Where does the node access come from ?");
-        return false;
-    }
-
-    if (aCache->hasModuleDefaults(aSubtreePath))
-    {
-        CFG_TRACE_INFO_NI("TreeManager: found default data in cache");
-        return true;
-    }
-
-    configuration::AbsolutePath aRequestPath = extractModulePath(aSubtreePath);
-    
-    backend::NodeRequest aRequest(aRequestPath,_aOptions);
-
-    backend::ResultHolder< backend::NodeInstance > aDefaults = getCacheLoader()->getDefaultData( aRequest );
-
-    if (!aDefaults.is())
-    {
-        CFG_TRACE_INFO_NI("TreeManager: merging loaded defaults into cache");
-        return aCache->insertDefaults(aDefaults.instance());
-    }
-    else
-    {
-        CFG_TRACE_WARNING_NI("TreeManager: cannot load defaults: no data available or not supported");
-        return false;
-    }
-}
-
-// -------------------------------------------------------------------------
-std::auto_ptr<ISubtree> TreeManager::requestDefaultData(configuration::AbsolutePath const& aSubtreePath, 
-                                                        const RequestOptions& _aOptions
-                                                       ) SAL_THROW((com::sun::star::uno::Exception))
-{
-    // to do: check cache for existing default data (?!)
-    CFG_TRACE_INFO_NI("TreeManager: loading default data directly");
-
-    backend::NodeRequest aRequest(aSubtreePath,_aOptions);
-
-    backend::ResultHolder< backend::NodeInstance > aDefaults = getCacheLoader()->getDefaultData( aRequest );
-
-    return aDefaults.extractDataAndClear();
-}
-
-// -------------------------------------------------------------------------
-configuration::AbsolutePath TreeManager::encodeTemplateLocation(const rtl::OUString& _rLogicalTemplateName, const rtl::OUString &_rModule)
-{
-//	static const 
-//  configuration::Path::Component aTemplateRoot = configuration::Path::wrapSimpleName(rtl::OUString::createFromAscii("org.openoffice.Templates"));
-
-    configuration::Path::Component aTemplateModule = configuration::Path::wrapSimpleName(_rModule);
-    configuration::Path::Component aTemplateName   = configuration::Path::wrapSimpleName(_rLogicalTemplateName);
-
-    Path::Rep aResult(aTemplateName);
-    aResult.prepend(aTemplateModule);
-//    aResult.prepend(aTemplateRoot);
-
-    return configuration::AbsolutePath(aResult);
-}
-        
-// -------------------------------------------------------------------------
-sharable::TreeFragment * TreeManager::requestTemplate(rtl::OUString const& _rName,
-                                                rtl::OUString const& _rModule) SAL_THROW((com::sun::star::uno::Exception))
-{
-    OSL_ENSURE(_rName.getLength() != 0, "TreeManager::requestTemplate : invalid template name !");
-
-    CFG_TRACE_INFO("TreeManager: going to get a template named %s", OUSTRING2ASCII(_rName));
-
-    configuration::AbsolutePath aTemplateLocation = encodeTemplateLocation(_rName, _rModule);
-    rtl::OUString aCacheModule = aTemplateLocation.getModuleName();
-
-    if (!getTemplates().hasNode(aTemplateLocation))
-    {
-        CFG_TRACE_INFO_NI("TreeManager: cache miss. going to load the template");
-        backend::TemplateRequest aQuery( _rName, _rModule );
-
-        sharable::TreeFragment * aLoadedLocation = getCacheLoader()->loadTemplate(aQuery);
-        if (aLoadedLocation == NULL)
-        {
-            CFG_TRACE_ERROR_NI("TreeManager: requested template module not found");
-            throw com::sun::star::container::
-                    NoSuchElementException( MAKEUSTRING("Requested template module not found"), NULL);
-        }
-
-        CFG_TRACE_INFO_NI("TreeManager: attaching to loaded template module");
-
-        getTemplates().attachModule(aLoadedLocation,aCacheModule);
-
-        // create a client ref count on the template module
-        getTemplates().acquireNode(aTemplateLocation);
-    }
-    else
-    { 
-        CFG_TRACE_INFO_NI("TreeManager: template module found in cache");
-    }
-
-    sharable::TreeFragment * aTemplateAddr = getTemplates().getTemplateTree(aTemplateLocation);
-    if (aTemplateAddr == NULL)
-    {
-        CFG_TRACE_ERROR_NI("TreeManager: template not found in module");
-        throw com::sun::star::container::
-                    NoSuchElementException( MAKEUSTRING("Unknown template. Type description could not be found in the given module."), NULL);
-    }
-    return aTemplateAddr;
-}
-
-// -------------------------------------------------------------------------
-void TreeManager::saveAndNotifyUpdate(TreeChangeList const& aChangeTree) SAL_THROW((com::sun::star::uno::Exception))
-{
-    {
-        CFG_TRACE_INFO("TreeManager: committing an Update to the cache controller");
-        RequestOptions aOptions = aChangeTree.getOptions();;
-        //Modify RequestOptions - suppress async commit, if disabled
-        if(!m_bEnableAsync)
-            aOptions.enableAsync(false);
-
-        backend::UpdateRequest anUpdate(
-                                & aChangeTree.root,
-                                aChangeTree.getRootNodePath(),
-                                aOptions);
-
-        getCacheLoader()->saveAndNotify(anUpdate);
-        CFG_TRACE_INFO_NI("TreeManager: committing done");
-    }
-}
-
-// -----------------------------------------------------------------------------
-void TreeManager::updateTree(TreeChangeList& _aChanges) SAL_THROW((com::sun::star::uno::Exception))
-{
-    CFG_TRACE_INFO("TreeManager: updating the cache from a changes list");
-        
-    backend::UpdateInstance anUpdate(&_aChanges.root,_aChanges.getRootNodePath());
-
-    rtl::Reference<CacheClientAccess> aCache = m_aCacheList.get(_aChanges.getOptions());
-
-    if (!aCache.is())
-    {
-        CFG_TRACE_ERROR_NI("TreeManager: Cache access to update into does not exist !");
-        OSL_ENSURE(aCache.is(),"TreeManager: Cache access to update into does not exist ! Where does the update access come from ?");
-        throw lang::DisposedException(rtl::OUString::createFromAscii("Tree to be updated was already disposed"), NULL);
-    }
-
-    // merge the changes into the tree
-    aCache->applyUpdate(anUpdate);
-
-    CFG_TRACE_INFO_NI("TreeManager: cache update done");
-}
-
-// -----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-void TreeManager::releaseSubtree( configuration::AbsolutePath const& aSubtreePath, const RequestOptions& _aOptions ) SAL_THROW(())
-{
-    CFG_TRACE_INFO("TreeManager: releasing subtree '%s' for entity '%s' with locale '%s'", OUSTRING2ASCII(aSubtreePath.toString()), OUSTRING2ASCII(_aOptions.getEntity()), OUSTRING2ASCII(_aOptions.getLocale()) );
-
-    rtl::Reference<CacheClientAccess> aCache = m_aCacheList.get(_aOptions);
-
-    OSL_ENSURE(aCache.is(),"TreeManager: No local data to release");
-
-    if (aCache.is())
-    {
-        CFG_TRACE_INFO_NI("TreeManager: decrementing refcount for subtree '%s'", OUSTRING2ASCII(aSubtreePath.toString()) );
-        if (aCache->releaseNode(aSubtreePath) == 0)
-        {
-            backend::ComponentRequest aComponentDesc(aSubtreePath.getModuleName(),_aOptions);
-            rtl::Reference< backend::CacheController > xBackendCache = maybeGetBackendCache();
-            if (xBackendCache.is()) xBackendCache->freeComponent(aComponentDesc);
-        }
-    }
-}
-// ----------------------------------------------------------------------------
-void TreeManager::refreshAll() SAL_THROW((com::sun::star::uno::Exception))
-{
-    //Find what components are in cache and that have client references and reload
-    //such components.
-     rtl::Reference< backend::CacheController > aCacheRef = maybeGetBackendCache();
-     if (aCacheRef.is()) aCacheRef->refreshAllComponents();
-}
-// ----------------------------------------------------------------------------
-void TreeManager::flushAll()SAL_THROW(())
-{
-     rtl::Reference< backend::CacheController > aCacheRef = maybeGetBackendCache();
-     if (aCacheRef.is()) aCacheRef->flushPendingUpdates();   
-}
-//-----------------------------------------------------------------------------
-void TreeManager::enableAsync(const sal_Bool& bEnableAsync) SAL_THROW(())
-{
-    m_bEnableAsync = bEnableAsync;
-}
-
-    /////////////////////////////////////////////////////////////////////////
-    void TreeManager::addListener(configuration::AbsolutePath const& aName, RequestOptions const & _aOptions, rtl::Reference<INodeListener> const& pHandler)	
-    { 
-        if (ConfigChangeBroadcastHelper* pHelper = getBroadcastHelper(_aOptions,true))
-        {
-            pHelper->addListener(aName, pHandler); 
-        }
-        else
-            OSL_ASSERT(false);
-    }
-
-    void TreeManager::removeListener(RequestOptions const & _aOptions, rtl::Reference<INodeListener> const& pHandler)						
-    { 
-        if (ConfigChangeBroadcastHelper* pHelper = getBroadcastHelper(_aOptions,false))
-        {
-            pHelper->removeListener( pHandler); 
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////
-    void TreeManager::fireChanges(TreeChangeList const& rList_, sal_Bool bError_)
-    {
-        if (ConfigChangeBroadcastHelper* pHelper = getBroadcastHelper(rList_.getOptions(),false))
-        {
-            pHelper->broadcast(rList_, bError_, this);
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////////////
-    void TreeManager::disposeBroadcastHelper(ConfigChangeBroadcastHelper* pHelper) 
-    {
-        if (pHelper)
-        {
-            pHelper->dispose(this);
-            delete pHelper;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-void TreeManager::nodeUpdated(TreeChangeList& _rChanges)
-{
-    CFG_TRACE_INFO("TreeManager: nodeUpdated");	
-    try
-    {		
-    rtl::Reference<CacheClientAccess> aCache = m_aCacheList.get(_rChanges.getOptions());
-
-    if (aCache.is())
-    {
-        // first approve the changes and merge them with the current tree
-        configuration::AbsolutePath aSubtreeName = _rChanges.getRootNodePath();
-
-        sharable::Node * aCacheTree = aCache->findInnerNode(aSubtreeName);
-        //OSL_ENSURE(aCacheTree != NULL, "TreeManager::nodeUpdated : node not found in cache!");
-
-        if (aCacheTree != NULL)
-            this->fireChanges(_rChanges,false);
-    }	
-    }
-    catch (uno::RuntimeException&)
-    {
-    CFG_TRACE_ERROR_NI("TreeManager::nodeUpdated : could not notify !");
-    }
-    CFG_TRACE_INFO_NI("TreeManager: nodeUpdated done");	
-}
-
-// ----------------------------------------------------------------------------
-
-void TreeManager::componentCreated(backend::ComponentRequest const & ) SAL_THROW(())
-{
-    CFG_TRACE_INFO("TreeManager: component was created");	
-}
-// ----------------------------------------------------------------------------
-
-void TreeManager::componentChanged(backend::UpdateRequest  const & _anUpdate)     SAL_THROW(())
-{
-    TreeChangeList aChanges(_anUpdate.getOptions(),
-                            _anUpdate.getUpdateRoot(),
-                            *_anUpdate.getUpdateData(), 
-                            treeop::DeepChildCopy() );
-
-    this->nodeUpdated(aChanges);
-}       
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-} // namespace
diff --git a/configmgr/source/treemgr/collectchanges.cxx b/configmgr/source/treemgr/collectchanges.cxx
deleted file mode 100644
index be8d1d5396..0000000000
--- a/configmgr/source/treemgr/collectchanges.cxx
+++ /dev/null
@@ -1,244 +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: collectchanges.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_configmgr.hxx"
-
-#include <string.h>
-#include "collectchanges.hxx"
-
-#include "nodechangeinfo.hxx"
-
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-
-//-----------------------------------------------------------------------------
-// conversion helper function
-//-----------------------------------------------------------------------------
-bool convertNodeChange(NodeChangeData& aData_, ValueChange const& aChange_)
-{
-    switch(aChange_.getMode())
-    {
-    case ValueChange::wasDefault:
-    case ValueChange::changeValue:
-        aData_.type = NodeChangeData::eSetValue;
-        break;
-
-    case ValueChange::setToDefault:
-        aData_.type = NodeChangeData::eSetDefault;
-        break;
-
-    case ValueChange::changeDefault:
-        aData_.type = NodeChangeData::eNoChange; // ??
-        break;
-
-    default:
-        OSL_ENSURE(false,"Unknown change type found");
-        return false;
-    }	
-
-    aData_.unoData.newValue = aChange_.getNewValue();
-    aData_.unoData.oldValue = aChange_.getOldValue();
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-bool convertNodeChange(NodeChangeData& aData_, AddNode const& aChange_)
-{
-    aData_.type = aChange_.isReplacing() 
-                    ? NodeChangeData::eReplaceElement
-                    : NodeChangeData::eInsertElement;
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-bool convertNodeChange(NodeChangeData& aData_, RemoveNode const& /*aChange_*/)
-{
-    aData_.type = NodeChangeData::eRemoveElement;
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// CollectChanges visitor class
-//-----------------------------------------------------------------------------
-
-CollectChanges::CollectChanges(	NodeChangesInformation& rTargetList_, 
-                Tree& rStartTree_, unsigned int nStartNode_,
-                rtl::Reference<Template> aElementTemplate_,
-                unsigned int nMaxDepth) 
-: m_rTargetList(rTargetList_)
-, m_aAccessor()
-, m_aContextTypeName()
-, m_pBaseTree(&rStartTree_)
-, m_nBaseNode(nStartNode_)
-, m_nDepthLeft( nMaxDepth ) 
-{
-    if (aElementTemplate_.is()) 
-        m_aContextTypeName = aElementTemplate_->getName();
-}
-
-//-----------------------------------------------------------------------------
-CollectChanges::CollectChanges(	CollectChanges const& rBase, Path::Component const& rChildName, rtl::OUString const& aSubTypeName_) 
-: m_rTargetList(rBase.m_rTargetList)
-, m_aAccessor(rBase.m_aAccessor.compose(rChildName))
-, m_aContextTypeName(aSubTypeName_)
-, m_pBaseTree(rBase.m_pBaseTree)
-, m_nBaseNode(rBase.m_nBaseNode)
-, m_nDepthLeft(childDepth(rBase.m_nDepthLeft)) 
-{
-    OSL_ASSERT(rBase.m_nDepthLeft > 0);
-}
-
-//-----------------------------------------------------------------------------
-inline
-Path::Component CollectChanges::implGetNodeName(Change const& aChange_) const
-{
-    rtl::OUString aSimpleNodeName( aChange_.getNodeName() );
-
-    if (m_aContextTypeName.getLength() == 0)
-    {
-        OSL_ENSURE(isSimpleName(aSimpleNodeName),"Unexpected: Found non-simple name without a type");
-        return Path::wrapSafeName(aSimpleNodeName);
-    }
-    else
-        return Path::makeCompositeName(aSimpleNodeName, m_aContextTypeName);
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::collectFrom(ValueChange const& aChange_)
-{ 
-    NodeChangeInformation aInfo;
-
-    if ( convertNodeChange( aInfo.change, aChange_ ) &&
-         implSetLocation( aInfo.location, aChange_, false ) )
-    {
-        implAdd( aInfo ); 
-    }
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::collectFrom(AddNode const& aChange_)
-{ 
-    NodeChangeInformation aInfo;
-
-    if ( convertNodeChange( aInfo.change, aChange_ ) &&
-         implSetLocation( aInfo.location, aChange_, true ) )
-    {
-        implAdd( aInfo ); 
-    }
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::collectFrom(RemoveNode const& aChange_)
-{ 
-    NodeChangeInformation aInfo;
-
-    if ( convertNodeChange( aInfo.change, aChange_ ) &&
-         implSetLocation( aInfo.location, aChange_, true ) )
-    {
-        implAdd( aInfo ); 
-    }
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::collectFrom(SubtreeChange const& aChanges_)
-{
-    if (m_nDepthLeft > 0)
-    {
-        rtl::OUString aSubTypeName( aChanges_.getElementTemplateName() );
-
-        CollectChanges aSubcollector( *this, implGetNodeName(aChanges_), aSubTypeName );
-
-        aSubcollector.applyToChildren(aChanges_);
-    }
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::implAdd(NodeChangeInformation const& aChangeInfo_)
-{
-    m_rTargetList.push_back(aChangeInfo_);
-}
-        
-//-----------------------------------------------------------------------------
-bool CollectChanges::implSetLocation(NodeChangeLocation& rLocation_, Change const& aOriginal_, bool bSet_) const
-{
-    NodeID aBaseID(m_pBaseTree,m_nBaseNode);
-    if (aBaseID.isEmpty())
-        return false;
-
-    rLocation_.setBase( aBaseID ); 
-
-    if (bSet_ && m_aAccessor.isEmpty()) // It is  a set change affecting the base ...
-        rLocation_.setAffected( aBaseID );
-
-    Path::Component aChangeName = implGetNodeName( aOriginal_ );
-    rLocation_.setAccessor( m_aAccessor.compose( aChangeName ) ); 
-
-    return true;
-}
-
-// ChangeTreeAction implementations
-//-----------------------------------------------------------------------------
-void CollectChanges::handle(ValueChange const& aValueNode_)
-{
-    collectFrom(aValueNode_);
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::handle(AddNode const& aAddNode_)
-{
-    collectFrom(aAddNode_);
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::handle(RemoveNode const& aRemoveNode_)
-{
-    collectFrom(aRemoveNode_);
-}
-
-//-----------------------------------------------------------------------------
-void CollectChanges::handle(SubtreeChange const& aSubtree_)
-{
-    collectFrom( aSubtree_ );
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-    }
-}
-
diff --git a/configmgr/source/treemgr/collectchanges.hxx b/configmgr/source/treemgr/collectchanges.hxx
deleted file mode 100644
index c8a924e3e2..0000000000
--- a/configmgr/source/treemgr/collectchanges.hxx
+++ /dev/null
@@ -1,124 +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: collectchanges.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 CONFIGMGR_COLLECTCHANGES_HXX_
-#define CONFIGMGR_COLLECTCHANGES_HXX_
-
-// low.level (cache model) changes (needed for change tree action class)
-#include "change.hxx"
-
-// pathes for accessors
-#include "configpath.hxx"
-
-// need c_TreeDepthAll
-#include "tree.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class NodeChangeData;
-        class NodeChangeLocation;
-        class NodeChangeInformation;
-        class NodeChangesInformation;
-//-----------------------------------------------------------------------------
-
-        /// Change model translation: Create a NodeChangeData from a ValueChange object
-        bool convertNodeChange(NodeChangeData& aData_, ValueChange const& aChange_);
-        /// Change model translation: Create a NodeChangeData from an AddNode change object
-        bool convertNodeChange(NodeChangeData& aData_, AddNode const& aChange_);
-        /// Change model translation: Create a NodeChangeData from a RemoveNode change object
-        bool convertNodeChange(NodeChangeData& aData_, RemoveNode const& aChange_);
-
-        /** Change Tree Visitor that appends all changes in the changes tree
-         to a NodeChanges list, optionally restricted to a given depth
-        */
-        class CollectChanges : private ChangeTreeAction
-        {
-            NodeChangesInformation&	m_rTargetList;
-            RelativePath			m_aAccessor;
-            rtl::OUString m_aContextTypeName;
-            Tree*				m_pBaseTree;
-            unsigned int				m_nBaseNode;
-            unsigned int				m_nDepthLeft;
-            
-        public:
-            /// Constructs a Visitor object, sets the output target list and context
-            CollectChanges(	NodeChangesInformation& rTargetList_, 
-                            Tree& rStartTree_, unsigned int nStartNode_, 
-                            rtl::Reference<Template> aElementTemplate_,
-                            unsigned int nMaxDepth = c_TreeDepthAll);
-
-            /// Adds a (translated) ValueChange to the target list
-            void collectFrom(ValueChange const& aChange_);
-
-            /// Adds a (translated) AddNode to the target list
-            void collectFrom(AddNode const& aChange_);
-
-            /// Adds a (translated) RemoveNode to the target list
-            void collectFrom(RemoveNode const& aChange_);
-
-            /// Appends (translated) Changes from the subtree to the target list, possibly with a depth limit
-            void collectFrom(SubtreeChange const& aChange_);
-
-            /// Appends the given Change and its descendants to the target list, possibly with a depth limit
-            void collectFrom(Change const& aChange_)
-            {
-                this->applyToChange( aChange_ );
-            }
-
-            /// Appends the descendants of the given Change to the target list, possibly with a depth limit
-            void collectFromChildren(SubtreeChange const& aParent_)
-            {
-                this->applyToChildren( aParent_ );
-            }
-
-        protected:
-            /// Constructs a Visitor object for a child of another one's context 
-            CollectChanges(	CollectChanges const& rBase, Path::Component const& rChildName, rtl::OUString const& aSubTypeName );
-
-        private:
-            // ChangeTreeAction implementations
-            virtual void handle(ValueChange const& aValueNode);
-            virtual void handle(AddNode const& aAddNode);
-            virtual void handle(RemoveNode const& aRemoveNode);
-            virtual void handle(SubtreeChange const& aSubtree);
-
-            bool implSetLocation(NodeChangeLocation& rLocation_, Change const& aOriginal_, bool bSet_) const;
-            void implAdd(NodeChangeInformation const& aChangeInfo_);
-            Path::Component implGetNodeName(Change const& _aChange_) const;
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_COLLECTCHANGES_HXX_
diff --git a/configmgr/source/treemgr/configdefaultprovider.cxx b/configmgr/source/treemgr/configdefaultprovider.cxx
deleted file mode 100644
index c36d5ded16..0000000000
--- a/configmgr/source/treemgr/configdefaultprovider.cxx
+++ /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: configdefaultprovider.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_configmgr.hxx"
-
-#include "configdefaultprovider.hxx"
-#include "defaultproviderproxy.hxx"
-#include "noderef.hxx"
-#include "valuenode.hxx"
-#include "tree.hxx"
-#include "options.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// class DefaultProvider
-//-----------------------------------------------------------------------------
-
-// standard c/d-tors to make compiler barrier
-DefaultProvider DefaultProvider::createEmpty()
-{
-    return DefaultProvider(NULL);
-}
-//-----------------------------------------------------------------------------
-
-DefaultProvider DefaultProvider::create(rtl::Reference< Tree > const& _aRootTree, RequestOptions const& _aOptions, 
-                                          rtl::Reference< TreeManager > const &  _xDefaultProvider,
-                                          IDefaultableTreeManager* _pDefaultableTree)
-{
-    OSL_PRECOND( !isEmpty(_aRootTree.get()), "ERROR: Cannot create DefaultProvider for NULL tree");
-
-    rtl::Reference< DefaultProviderProxy > xNewProxy;
-
-    if (!isEmpty(_aRootTree.get()))
-    {
-        xNewProxy = new DefaultProviderProxy(_xDefaultProvider,_pDefaultableTree,
-                                             _aRootTree->getRootPath(), _aOptions );
-    }
-
-    return DefaultProvider( xNewProxy );
-}
-//-----------------------------------------------------------------------------
-
-DefaultProvider::DefaultProvider(DefaultProvider const& _aOther)
-: m_aProxy(_aOther.m_aProxy)
-{
-}
-//-----------------------------------------------------------------------------
-
-DefaultProvider& DefaultProvider::operator=(DefaultProvider const& _aOther)
-{
-    m_aProxy = _aOther.m_aProxy;
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-DefaultProvider::~DefaultProvider()
-{
-}
-//-----------------------------------------------------------------------------
-
-DefaultProvider::DefaultProvider(rtl::Reference< DefaultProviderProxy > const& _xProviderProxy)
-: m_aProxy(_xProviderProxy)
-{
-}
-//-----------------------------------------------------------------------------
-
-/// tries to load a default instance of the specified node
-std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree(
-            rtl::Reference< Tree > const& _aTree, NodeRef const& _aNode
-     ) const SAL_THROW((com::sun::star::uno::Exception))
-{
-    std::auto_ptr<ISubtree> aRet;
-        
-    node::Attributes aAttributes = _aTree->getAttributes(_aNode);
-
-//    if (aAttributes.bDefaulted)
-//        clone the ISubtree (no interface for that) :-(
-
-    if (m_aProxy.is() && aAttributes.existsInDefault()) 
-        aRet = m_aProxy->getDefaultTree(_aTree->getAbsolutePath(_aNode));
-
-    return aRet;
-}
-
-//-----------------------------------------------------------------------------
-/// tries to load default data into the specified tree
-static bool shouldFetchDefaultData(rtl::Reference< Tree > const& _aTreeRef, bool & _rbHasDefaults)
-{
-    bool bShouldFetch = false;
-
-    node::Attributes aAttributes = _aTreeRef->getAttributes(_aTreeRef->getRootNode());
-
-    if (aAttributes.isDefault())
-        _rbHasDefaults = true;
-
-    // in replaced/added parts, defaults are considered non-existing
-    else if (!aAttributes.isReplacedForUser())  
-        _rbHasDefaults = false;
-
-    else
-        bShouldFetch = true;
-
-    return bShouldFetch;
-}
-
-//-----------------------------------------------------------------------------
-/// tries to load default data into the specified tree
-bool DefaultProvider::fetchDefaultData(rtl::Reference< Tree > const& _aTreeRef) const SAL_THROW((com::sun::star::uno::Exception))
-{
-    bool bHasDefaults = false;
-
-    if (shouldFetchDefaultData(_aTreeRef,bHasDefaults) && m_aProxy.is() ) 
-        bHasDefaults = m_aProxy->fetchDefaultData();
-
-    return bHasDefaults;
-}
-
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/configexcept.cxx b/configmgr/source/treemgr/configexcept.cxx
deleted file mode 100644
index 4c4df0eb61..0000000000
--- a/configmgr/source/treemgr/configexcept.cxx
+++ /dev/null
@@ -1,184 +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: configexcept.cxx,v $
- * $Revision: 1.7.10.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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "configexcept.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-        //---------------------------------------------------------------------
-        Exception::Exception(char const* sAsciiMessage)
-        : m_sAsciiMessage(sAsciiMessage)
-        {
-        }
-        //---------------------------------------------------------------------
-        Exception::Exception(rtl::OString const& sAsciiMessage)
-        : m_sAsciiMessage(sAsciiMessage)
-        {
-        }
-        //---------------------------------------------------------------------
-
-        rtl::OUString Exception::message() const
-        {
-
-            return rtl::OStringToOUString( m_sAsciiMessage, RTL_TEXTENCODING_ASCII_US );
-        }
-        //---------------------------------------------------------------------
-        char const* Exception::what() const
-        {
-            return m_sAsciiMessage.getLength() ? m_sAsciiMessage.getStr() : "FAILURE in CONFIGURATION: No description available";
-        }
-        //---------------------------------------------------------------------
-
-        static const char c_sInvalidNamePre[] = "CONFIGURATION: Invalid path or name: ";
-        static const char c_sInvalidName[] = "CONFIGURATION: <Invalid path or name>";
-//-----------------------------------------------------------------------------
-
-        //---------------------------------------------------------------------
-            
-        InvalidName::InvalidName(rtl::OUString const& sName, char const* sAsciiDescription)
-        : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sInvalidName)) += sAsciiDescription ) 
-        , m_sName( sName.concat(rtl::OUString::createFromAscii(sAsciiDescription)) )
-        {
-        }
-        //---------------------------------------------------------------------
-
-        rtl::OUString InvalidName::message() const
-        {
-            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(c_sInvalidNamePre)).concat( m_sName );
-        }
-//-----------------------------------------------------------------------------
-
-        static const char c_sViolation[] = "CONFIGURATION: Update Violates Constraint: ";
-        //---------------------------------------------------------------------
-            
-        ConstraintViolation::ConstraintViolation(char const* sConstraint)
-        : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sViolation)) += sConstraint) 
-        {
-        }
-            
-//-----------------------------------------------------------------------------
-
-        static const char c_sTypeMismatch[] = "CONFIGURATION: Data Types do not match: ";
-    //---------------------------------------------------------------------
-        rtl::OUString TypeMismatch::describe(rtl::OUString const& sFoundType, rtl::OUString const& sExpectedType)
-        {
-            rtl::OUString sRet = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Found Type: '"));
-            sRet += sFoundType;
-            if (sExpectedType.getLength() != 0)
-            {
-                sRet += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("' - Expected Type: '"));
-                sRet += sExpectedType;
-                sRet += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
-            }
-            else
-            {
-                sRet += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("' is not valid in this context"));
-            }
-            return sRet;
-        }
-    //---------------------------------------------------------------------
-
-    //---------------------------------------------------------------------
-
-        TypeMismatch::TypeMismatch(rtl::OUString const& sType1, rtl::OUString const& sType2)
-        : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sTypeMismatch)) )
-        , m_sTypes( describe(sType1,sType2) )
-        {
-        }
-    //---------------------------------------------------------------------
-        TypeMismatch::TypeMismatch(rtl::OUString const& sType1, rtl::OUString const& sType2, char const* sAsciiDescription)
-        : Exception( rtl::OString(RTL_CONSTASCII_STRINGPARAM(c_sTypeMismatch)) += sAsciiDescription)
-        , m_sTypes( describe(sType1,sType2).concat(rtl::OUString::createFromAscii(sAsciiDescription)) )
-        {
-        }
-     //---------------------------------------------------------------------
-
-        rtl::OUString TypeMismatch::message() const
-        {
-            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(c_sTypeMismatch)).concat( m_sTypes );
-        }
-//-----------------------------------------------------------------------------
-    }
-
-    namespace configapi
-    {
-//-----------------------------------------------------------------------------
-        ExceptionMapper::ExceptionMapper(configuration::Exception& e)
-        : m_eOriginal(e)
-        , m_xContext()
-        , m_sMessage(e.message())
-        {
-        }
-        //---------------------------------------------------------------------
-
-        ExceptionMapper::~ExceptionMapper()
-        {
-        }
-        //---------------------------------------------------------------------
-
-        void ExceptionMapper::setContext(uno::XInterface* pContext)
-        {
-            m_xContext = pContext;
-        }
-        //---------------------------------------------------------------------
-
-        rtl::OUString ExceptionMapper::message() const
-        {
-            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILURE in CONFIGMGR: ")).concat( m_sMessage );
-        }
-        //---------------------------------------------------------------------
-
-        uno::Reference<uno::XInterface> ExceptionMapper::context() const
-        {
-            return m_xContext;
-        }
-        //---------------------------------------------------------------------
-
-        void ExceptionMapper::illegalArgument(sal_Int16 nArgument) throw(lang::IllegalArgumentException)
-        {
-            throw lang::IllegalArgumentException(message(),context(),nArgument);
-        }
-        //---------------------------------------------------------------------
-
-        void ExceptionMapper::unhandled() throw(uno::RuntimeException)
-        {
-            throw uno::RuntimeException(message(),context());
-        }
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/configgroup.cxx b/configmgr/source/treemgr/configgroup.cxx
deleted file mode 100644
index 5420a61394..0000000000
--- a/configmgr/source/treemgr/configgroup.cxx
+++ /dev/null
@@ -1,407 +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: configgroup.cxx,v $
- * $Revision: 1.14.14.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_configmgr.hxx"
-
-#include "configgroup.hxx"
-#include "configset.hxx"
-#include "valueref.hxx"
-#include "anynoderef.hxx"
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "tree.hxx"
-#include "groupnodeimpl.hxx"
-#include "valuenodeimpl.hxx"
-#include "typeconverter.hxx"
-#include "tracer.hxx"
-#include <com/sun/star/script/XTypeConverter.hpp>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-
-//-----------------------------------------------------------------------------
-// class GroupUpdateHelper
-//-----------------------------------------------------------------------------
-
-GroupUpdateHelper::GroupUpdateHelper(rtl::Reference< Tree > const& aParentTree, NodeRef const& aGroupNode)
-: m_aTree(aParentTree)
-, m_aNode(aGroupNode)
-{
-    implValidateTree(m_aTree);
-    implValidateNode(m_aTree,m_aNode);
-
-    if (! view::ViewTreeAccess(m_aTree.get()).isGroupNode(m_aNode) ) 
-        throw Exception("INTERNAL ERROR: Group Member Update: node is not a group");
-}
-//-----------------------------------------------------------------------------
-
-void GroupUpdateHelper::implValidateTree(rtl::Reference< Tree > const& aTree) const
-{
-    if (isEmpty(aTree.get())) 
-        throw Exception("INTERNAL ERROR: Group Member Update: Unexpected NULL tree");
-
-    // check for proper nesting
-    for(rtl::Reference<Tree> aTestTree = aTree; 
-        aTestTree != m_aTree;			// search this as ancestor tree
-        aTestTree = aTestTree->getContextTree() )
-    {
-        if (!aTestTree.is()) // no more trees to look for
-            throw Exception("INTERNAL ERROR: Group Member Update: improper tree relationship");
-    }
-}
-//-----------------------------------------------------------------------------
-
-void GroupUpdateHelper::implValidateNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode) const
-{
-    if (!aNode.isValid()) 
-        throw Exception("INTERNAL ERROR: Group Member Update: Unexpected NULL node");
-
-    if (!aTree->isValidNode(aNode.getOffset())) 
-        throw Exception("INTERNAL ERROR: Group Member Update: node does not match tree");
-}
-//-----------------------------------------------------------------------------
-
-void GroupUpdateHelper::implValidateNode(rtl::Reference< Tree > const& aTree, ValueRef const& aNode) const
-{
-    if (!aNode.isValid()) 
-        throw Exception("INTERNAL ERROR: Group Member Update: Unexpected NULL node");
-
-    if (!aTree->isValidValueNode(aNode)) 
-        throw Exception("INTERNAL ERROR: Group Member Update: changed node does not match tree");
-
-    if (aTree->getAttributes(aNode).isReadonly()) 
-        throw ConstraintViolation( "Group Member Update: Node is read-only !" );
-
-}
-//-----------------------------------------------------------------------------
-
-void GroupUpdateHelper::validateNode(ValueRef const& aNode) const
-{
-    implValidateNode(m_aTree,aNode);
-}
-//-----------------------------------------------------------------------------
-
-void GroupUpdateHelper::validateNode(NodeRef const& aNode) const
-{
-    implValidateNode(m_aTree,aNode);
-}
-//-----------------------------------------------------------------------------
-
-/** a helper that gets the UNO <type scope='com::sun::star::uno'>Type</type> 
-    for a UNO <type scope='com::sun::star::uno'>Any</type>.
-*/
-static inline com::sun::star::uno::Type getUnoAnyType() 
-{
-    com::sun::star::uno::Any const * const selectAny = 0;
-    return ::getCppuType(selectAny);
-}
-//-----------------------------------------------------------------------------
-
-bool isPossibleValueType(com::sun::star::uno::Type const& aValueType)
-{
-    switch(aValueType.getTypeClass())
-    {
-    case uno::TypeClass_BOOLEAN:  
-    case uno::TypeClass_SHORT:    
-    case uno::TypeClass_LONG:     
-    case uno::TypeClass_HYPER:    
-    case uno::TypeClass_DOUBLE:   
-    case uno::TypeClass_STRING: 
-        return true;
-
-    case uno::TypeClass_SEQUENCE: 
-        switch(getSequenceElementType(aValueType).getTypeClass())
-        {
-        case uno::TypeClass_BYTE:  // scalar binary
-
-        case uno::TypeClass_BOOLEAN:  
-        case uno::TypeClass_SHORT:    
-        case uno::TypeClass_LONG:     
-        case uno::TypeClass_HYPER:    
-        case uno::TypeClass_DOUBLE:   
-        case uno::TypeClass_STRING: 
-            return true;
-
-        case uno::TypeClass_SEQUENCE: 
-            {
-                uno::Sequence< uno::Sequence< sal_Int8 > > const * const forBinaryList = 0;
-                return !!(aValueType == ::getCppuType(forBinaryList));
-            }
-
-        default:
-            return false;
-        }
-
-    default:
-        return false;
-    }
-}
-
-//-----------------------------------------------------------------------------
-bool convertCompatibleValue(com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> const& xTypeConverter, uno::Any& rConverted, com::sun::star::uno::Any const& rNewValue, com::sun::star::uno::Type const& rTargetType) 
-{	
-    OSL_ASSERT( isPossibleValueType(rTargetType) );
-
-    if (rTargetType == rNewValue.getValueType())
-    {
-        rConverted = rNewValue;
-        return true;
-    }
-
-    if (xTypeConverter.is())
-    try 
-    {
-        rConverted = xTypeConverter->convertTo(rNewValue,rTargetType);
-
-        OSL_ASSERT( rConverted.getValueType() == rTargetType );
-    }
-    catch(uno::RuntimeException&) { throw; }
-    catch(css::lang::IllegalArgumentException&)
-    {
-        // try to do more conversion here ?!
-        return false;
-    }
-    catch(css::script::CannotConvertException&)
-    {
-        // try to do more conversion here ?!
-        return false;
-    }
-    catch(uno::Exception&)
-    {
-        OSL_ENSURE(sal_False, "ValueUpdater::convertValue : generic exception ... thought we caught all allowed exceptions !");
-        // try to do more conversion here ?!
-        return false;
-    }
-    
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class GroupUpdater
-//-----------------------------------------------------------------------------
-
-GroupUpdater::GroupUpdater(rtl::Reference< Tree > const& aParentTree, NodeRef const& aGroupNode, com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> const& xConverter)
-: m_aHelper(aParentTree,aGroupNode)
-, m_xTypeConverter(xConverter)
-{
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any GroupUpdater::implValidateValue(rtl::Reference< Tree > const& aTree, ValueRef const& aNode, com::sun::star::uno::Any const& aValue) const
-{
-    com::sun::star::uno::Type aValueType	= aValue.getValueType();
-    com::sun::star::uno::Type aTargetType = aTree->getUnoType(aNode);
-
-    OSL_ENSURE( aTargetType.getTypeClass() == uno::TypeClass_ANY || isPossibleValueType(aTargetType),
-                "Invalid value type found on existing property" );
-
-    OSL_ASSERT( aValueType.getTypeClass() != uno::TypeClass_ANY);
-
-    com::sun::star::uno::Any aRet;
-
-    if (!aValue.hasValue())
-    {
-        if (!aTree->getAttributes(aNode).isNullable()) 
-        {
-            rtl::OString sError("Group Member Update: Node (");
-            sError += OUSTRING2ASCII(aNode.m_sNodeName);
-            sError += ") is not nullable !";
-            throw ConstraintViolation( sError );
-        }
-        OSL_ASSERT( !aRet.hasValue() );
-    }
-
-    else if (aValueType == aTargetType) 
-    { 
-        aRet = aValue; 
-    }
-
-    else if (aTargetType == getUnoAnyType())
-    { 
-        if ( ! isPossibleValueType(aValueType) )
-            throw TypeMismatch(aValueType.getTypeName(), aTargetType.getTypeName(), " - new property value has no legal configuration data type");
-            
-        // OK - any type
-        aRet = aValue; 
-    }
-
-    else 
-    {
-        if (!convertCompatibleValue(m_xTypeConverter, aRet, aValue,aTargetType))
-            throw TypeMismatch(aValueType.getTypeName(), aTargetType.getTypeName(), " cannot set incompatible value");
-    }
-
-
-    OSL_ASSERT( !aRet.hasValue() || isPossibleValueType(aRet.getValueType()) );
-
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-
-NodeChange GroupUpdater::validateSetValue(ValueRef const& aValueNode, com::sun::star::uno::Any const& newValue )
-{
-    m_aHelper.validateNode(aValueNode);
-
-    com::sun::star::uno::Any aNewValue = implValidateValue(m_aHelper.tree(), aValueNode, newValue);
-
-    // now build the specific change
-    std::auto_ptr<ValueChangeImpl> pChange( new ValueReplaceImpl(aNewValue) );
-
-    NodeRef aParent = m_aHelper.tree()->getParent(aValueNode);
-    pChange->setTarget( 
-               view::ViewTreeAccess(m_aHelper.tree().get()).toGroupNode(aParent),
-                aValueNode.m_sNodeName
-            );
-
-    return NodeChange(pChange.release());
-}
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// helper class NodeDefaulter
-//-----------------------------------------------------------------------------
-
-namespace
-{
-    struct NodeDefaulter : NodeVisitor
-    {
-        GroupDefaulter& updater;
-        NodeChanges     result;
-        
-        explicit
-        NodeDefaulter(GroupDefaulter& _rUpdater) : updater(_rUpdater), result() {}
-
-        /// do the operation on <var>aNode</var>. needs to be implemented by concrete visitor classes
-        Result handle(rtl::Reference< Tree > const& aTree, NodeRef const& aNode);
-
-        /// do the operation on <var>aValue</var>. needs to be implemented by concrete visitor classes
-        Result handle(rtl::Reference< Tree > const& aTree, ValueRef const& aValue);
-
-        inline void addResult(NodeChange const& aChange)
-        {
-            if (aChange.maybeChange())
-                this->result.add(aChange);
-        }
-    };
-
-    NodeVisitor::Result NodeDefaulter::handle(rtl::Reference< Tree > const& , NodeRef const& aNode)
-    {
-        addResult( updater.validateSetToDefaultState(aNode) );
-        return CONTINUE;
-    }
-
-    NodeVisitor::Result NodeDefaulter::handle(rtl::Reference< Tree > const& , ValueRef const& aValue)
-    {
-        addResult( updater.validateSetToDefaultValue(aValue) );
-        return CONTINUE;
-    }
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class GroupDefaulter
-//-----------------------------------------------------------------------------
-
-GroupDefaulter::GroupDefaulter(rtl::Reference< Tree > const& _aParentTree, NodeRef const& _aGroupNode, DefaultProvider const& _aProvider)
-: m_aHelper(_aParentTree,_aGroupNode)
-, m_aDefaultProvider(_aProvider)
-, m_bHasDoneSet(false)
-{
-}
-//-----------------------------------------------------------------------------
-bool GroupDefaulter::isDataAvailable(rtl::Reference< Tree > const& _aParentTree, NodeRef const& _aGroupNode)
-{ 
-    return _aParentTree->areValueDefaultsAvailable(_aGroupNode);
-}
-//-----------------------------------------------------------------------------
-bool GroupDefaulter::ensureDataAvailable(rtl::Reference< Tree > const& _aParentTree, NodeRef const& _aGroupNode, DefaultProvider const& _aDataSource)
-{ 
-    return  isDataAvailable(_aParentTree, _aGroupNode) ||
-            _aDataSource.fetchDefaultData( _aParentTree );
-}
-//-----------------------------------------------------------------------------
-
-NodeChange GroupDefaulter::validateSetToDefaultValue(ValueRef const& aValueNode)
-{
-    m_aHelper.validateNode(aValueNode);
-
-    if (!m_aHelper.tree()->hasNodeDefault(aValueNode)) 
-        throw Exception("INTERNAL ERROR: Group Member Update: Node has no default value" );
-
-    // now build the specific change
-    std::auto_ptr<ValueChangeImpl> pChange( new ValueResetImpl() );
-
-    NodeRef aParent = m_aHelper.tree()->getParent(aValueNode);
-    pChange->setTarget( 
-               view::ViewTreeAccess(m_aHelper.tree().get()).toGroupNode(aParent),
-                aValueNode.m_sNodeName
-            );
-
-    return NodeChange(pChange.release());
-}
-//-----------------------------------------------------------------------------
-
-NodeChange GroupDefaulter::validateSetToDefaultState(NodeRef const& aNode)
-{
-    m_aHelper.validateNode(aNode);
-
-    NodeChange aResult;
-    
-    // only works for set nodes - groups are left alone
-    if ( view::ViewTreeAccess(m_aHelper.tree().get()).isSetNode(aNode) ) 
-    {
-       aResult = SetDefaulter( m_aHelper.tree(), aNode, m_aDefaultProvider ).validateSetToDefaultState();
-    }
-
-    m_bHasDoneSet = aResult.maybeChange();
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-NodeChanges GroupDefaulter::validateSetAllToDefault()
-{
-    NodeDefaulter aDefaulter(*this);
-
-    m_aHelper.tree()->dispatchToChildren(m_aHelper.node(),aDefaulter);
-
-    return aDefaulter.result;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/configpath.cxx b/configmgr/source/treemgr/configpath.cxx
deleted file mode 100644
index 6a10b72b03..0000000000
--- a/configmgr/source/treemgr/configpath.cxx
+++ /dev/null
@@ -1,1001 +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: configpath.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_configmgr.hxx"
-
-#include "configpath.hxx"
-#include "configexcept.hxx"
-#include <rtl/ustrbuf.hxx>
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-
-#ifndef CFG_PATH_STRICT
-//#define CFG_PATH_STRICT 1
-#endif
-
-#define dprint(a,b,c)
-
-namespace configmgr
-{
-    namespace configuration
-    {
-
-    //-------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Name validation
-//-----------------------------------------------------------------------------
-namespace 
-{
-    //-------------------------------------------------------------------------
-    inline
-    bool isValidNameStart(sal_Unicode ch) SAL_THROW(())
-    {
-        return (sal_Unicode('A') <= ch && ch <= sal_Unicode('Z')) || 
-               (sal_Unicode('a') <= ch && ch <= sal_Unicode('z')) || 
-                sal_Unicode('_') == ch; 
-    }
-    inline
-    bool isValidNameCont(sal_Unicode ch) SAL_THROW(())
-    {
-        return	(	(sal_Unicode('0') <= ch && ch <= sal_Unicode('9'))
-                ||	(sal_Unicode('.') == ch) // eg for module names
-                ||	(sal_Unicode('-') == ch) // eg for locale names
-                ||	(sal_Unicode(':') == ch) // support special namespaced names
-                );
-    }
-
-    //-------------------------------------------------------------------------
-}
-//-----------------------------------------------------------------------------
-
-bool isSimpleName(rtl::OUString const& sName) SAL_THROW(())
-{
-    sal_Unicode const* const pStr = sName.getStr();
-    sal_Unicode const* const pEnd = pStr + sName.getLength();
-
-    if ( (pStr == pEnd) || !isValidNameStart(*pStr) ) 
-        return false;
-
-    for (sal_Unicode const* pValidate = pStr+1; pValidate != pEnd; ++pValidate)
-    {
-        if (!isValidNameStart(*pValidate) && !isValidNameCont(*pValidate))
-            return false;
-    }
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString validateNodeName(rtl::OUString const& sName)
-{
-    if (!isSimpleName(sName))
-        throw InvalidName(sName, "is not a valid name for a configuration node");
-
-    return sName;
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString validateElementName(rtl::OUString const& sName)
-{
-    if (sName.getLength() == 0)
-        throw InvalidName(sName, "is not a valid name for a configuration item (empty names are not permitted)");
-
-    return sName;
-}
-//-----------------------------------------------------------------------------
-
-namespace // path helpers I
-{
-//-----------------------------------------------------------------------------
-    const sal_Unicode c_cDelimiter = '/';
-        
-    const sal_Unicode c_lBracket = '[', c_rBracket = ']';
-
-    const sal_Unicode c_cAnytype = '*';
-//-----------------------------------------------------------------------------
-
-    // Textually an Absolute path starts with a slash
-    static
-    inline
-    bool detectAbsolutePath(sal_Unicode const* _pPath) SAL_THROW(()) 
-    { 
-        OSL_ASSERT( _pPath != NULL );
-        return	*_pPath == c_cDelimiter; 
-    }
-//-----------------------------------------------------------------------------
-
-    static 
-    inline 
-    rtl::OUString makeWildcardType() SAL_THROW(()) 
-    { 
-        return rtl::OUString(&c_cAnytype,1); 
-    }
-//-----------------------------------------------------------------------------
-
-    // even handles empty strings (if NUL-terminated)
-    static 
-    inline 
-    bool isWildcardType(sal_Unicode const* _sType) SAL_THROW(()) 
-    { 
-        OSL_ASSERT( _sType != NULL );
-        return  _sType[0] == c_cAnytype &&
-                _sType[1] == 0; 
-    }
-//-----------------------------------------------------------------------------
-
-    static 
-    inline 
-    bool isEmptyString(sal_Unicode const* _sType) SAL_THROW(()) 
-    { 
-        OSL_ASSERT( _sType != NULL );
-        return  _sType[0] == 0; 
-    }
-//-----------------------------------------------------------------------------
-    static 
-    inline 
-    sal_Unicode lastChar(rtl::OUString const& _sString) SAL_THROW(())
-    {
-        sal_Int32 const nLen = _sString.getLength();
-
-        OSL_PRECOND( nLen > 0, "Non-empty string expected");
-
-        return _sString[nLen-1];
-    }
-//-----------------------------------------------------------------------------
-
-    rtl::OUString implMakeCompositeName(rtl::OUString const& _sBaseName, rtl::OUString const& _sPredicate) SAL_THROW((InvalidName));
-    void implSplitCompositeName(rtl::OUString const& _aCompositeName, rtl::OUString& _rBaseName, rtl::OUString& _rPredicate) SAL_THROW(());
-//-----------------------------------------------------------------------------
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-namespace Path
-{
-//-----------------------------------------------------------------------------
-// class configuration::Path::Component
-//-----------------------------------------------------------------------------
-
-inline // though public, this method is not available outside this translation unit
-Component::Component(rtl::OUString const& _sName) SAL_THROW(())
-: m_aName(_sName)
-{
-}
-//-----------------------------------------------------------------------------
-
-bool Component::isSimpleName()    const SAL_THROW(())
-{
-    return m_aName.getLength() != 0 && lastChar(m_aName) != c_rBracket;
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString Component::getName()    const SAL_THROW(())
-{
-    if (isSimpleName()) return m_aName;
-
-    rtl::OUString sName, sType;
-    implSplitCompositeName(m_aName,sType,sName);
-        
-    return sName;
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString Component::getTypeName()      const SAL_THROW(())
-{
-    if (isSimpleName()) return rtl::OUString();
-
-    rtl::OUString sName, sType;
-    implSplitCompositeName(m_aName,sType,sName);
-        
-    return sType;
-}
-//-----------------------------------------------------------------------------
-
-Component makeEmptyComponent() SAL_THROW(())
-{
-    return Component( rtl::OUString() );
-}
-//-----------------------------------------------------------------------------
-
-Component wrapSimpleName(rtl::OUString const& _sName)
-{
-    OSL_ENSURE( isSimpleName(_sName), "Simple name expected creating path component");
-    if (!isSimpleName(_sName))
-        throw InvalidName(_sName, "is not a simple name. Cannot convert to path component");
-
-    return Component( _sName );
-}
-//-----------------------------------------------------------------------------
-
-Component makeCompositeName(rtl::OUString const& _sElementName, rtl::OUString const& _sTypeName)
-{
-    return Component( implMakeCompositeName(_sTypeName,_sElementName) );
-}
-//-----------------------------------------------------------------------------
-            
-
-bool matches(Component const& lhs,Component const& rhs) SAL_THROW(())
-{
-    // this extra preflight check might be left out (is it good for performance ?)
-    if (lhs.getInternalName() == rhs.getInternalName())
-        return true;
-
-    if (lhs.getName() != rhs.getName())
-        return false;
-
-    // simple names are considered equivalent to wildcard namess
-    if (lhs.isSimpleName() || rhs.isSimpleName())
-        return true;
-
-    rtl::OUString aTypeLHS = lhs.getTypeName();
-    rtl::OUString aTypeRHS = rhs.getTypeName();
-
-    // this would need an extra test without our preflight check
-    OSL_ASSERT(aTypeLHS != aTypeRHS); // would have been dicovered by first check
-
-    if ( isWildcardType(aTypeLHS) || isWildcardType(aTypeRHS) )
-        return true;
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// weak comparison of components
-//-----------------------------------------------------------------------------
-bool before(Component const& lhs, Component const& rhs) SAL_THROW(())
-{ return lhs.getName() < rhs.getName(); }
-
-//-----------------------------------------------------------------------------
-bool equiv(Component const& lhs, Component const& rhs) SAL_THROW(())
-{ return lhs.getName() == rhs.getName(); }
-    
-//-----------------------------------------------------------------------------
-size_t hashCode(Component const& comp)  SAL_THROW(())
-{ return comp.getName().hashCode(); }
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class configuration::Path::Rep
-//-----------------------------------------------------------------------------
-void Rep::check_not_empty() const
-{
-    if (m_aComponents.empty()) 
-    {
-        OSL_ENSURE(!m_aComponents.empty(),"Trying to access components of an empty path");
-        throw Exception("Trying to access components of an empty path");
-    }
-}
-//-----------------------------------------------------------------------------
-
-void Rep::prepend(Rep const& _aOther) SAL_THROW(())
-{
-    // to prepend the other path append its components
-    m_aComponents.insert( m_aComponents.end(),
-                            _aOther.m_aComponents.begin(),
-                            _aOther.m_aComponents.end());
-
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString Rep::toString(bool _bAbsolute) const SAL_THROW(())
-{
-    std::vector<Component>::const_reverse_iterator cur = begin();
-    std::vector<Component>::const_reverse_iterator const stop = end();
-
-    rtl::OUStringBuffer sRet;
-
-    if (!_bAbsolute && cur != stop)
-        sRet = cur++->toPathString();
-
-    for ( ;cur != stop; ++cur)
-        sRet.append( c_cDelimiter ).append( cur->toPathString() );
-
-    return sRet.makeStringAndClear();
-}
-//-----------------------------------------------------------------------------
-
-size_t Rep::hashCode() const  SAL_THROW(())
-{ 
-    const unsigned long mangle_factor = 11; // 1011 (2)
-    unsigned long nHash = 0;
-    for (std::vector<Component>::const_reverse_iterator it = begin(), stop = end(); it != stop; ++it)
-    {
-        nHash = mangle_factor*nHash + Path::hashCode(*it);
-    }
-    return nHash;
-}
-//-----------------------------------------------------------------------------
-
-bool before(Rep const& lhs, Rep const& rhs) SAL_THROW(())
-{
-    return std::lexicographical_compare(lhs.begin(),lhs.end(),rhs.begin(),rhs.end(), Before());
-}
-//-----------------------------------------------------------------------------
-
-bool equiv(Rep const& lhs, Rep const& rhs) SAL_THROW(())
-{
-    return (lhs.countComponents() == rhs.countComponents()) &&
-            std::equal(lhs.begin(),lhs.end(),rhs.begin(),Equiv());
-}
-//-----------------------------------------------------------------------------
-
-bool matches(Rep const& lhs, Rep const& rhs) SAL_THROW(())
-{
-    return (lhs.countComponents() == rhs.countComponents()) &&
-            std::equal(lhs.begin(),lhs.end(),rhs.begin(),Matches());
-}
-//-----------------------------------------------------------------------------
-
-bool isAbsolutePath(rtl::OUString const& _sPath) SAL_THROW(()) 
-{
-    return detectAbsolutePath(_sPath);
-}
-//-----------------------------------------------------------------------------
-
-bool hasMatchingPrefix(Rep const& _aPath, Rep const& _aPrefix) SAL_THROW(()) 
-{
-    return (_aPath.countComponents() >= _aPrefix.countComponents()) &&
-            std::equal( _aPrefix.begin(), _aPrefix.end(), _aPath.begin(), Matches());
-}
-//-----------------------------------------------------------------------------
-
-Rep stripMatchingPrefix(Rep const& _aPath,Rep const& _aPrefix) //  SAL_THROW((InvalidName)) 
-{
-    Rep aResult(_aPath);
-
-    for (std::vector<Component>::const_reverse_iterator it = _aPrefix.begin(); it != _aPrefix.end(); ++it)
-    {
-        if (aResult.isEmpty() || !matches(*it,aResult.getFirstName()))
-            throw InvalidName(aResult.getFirstName().toPathString(), "does not match the expected location.");
-
-        aResult.dropFirstName();
-    }
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-} // namespace Path
-//-----------------------------------------------------------------------------
-
-namespace 
-{
-//-----------------------------------------------------------------------------
-    const sal_Unicode c_quot = '\"';
-    const sal_Unicode c_apos = '\'';
-    const sal_Unicode c_amp = '&';
-
-    const sal_Unicode c_end_escape = ';';
-
-    const sal_Unicode c_normal_quot = c_apos;
-    //-------------------------------------------	
-    static sal_Char const c_amp_name[]  = "&amp;";
-    static sal_Char const c_apos_name[] = "&apos;";
-    static sal_Char const c_quot_name[] = "&quot;";
-
-    const sal_Int32 c_nMinEscapeLen = sizeof c_amp_name  - 1;
-    const sal_Int32 c_nMaxEscapeLen = sizeof c_quot_name - 1;
-//-------------------------------------------------------------------------
-    /// distinguishes which kind of path is held in a path object
-    enum PathType { eRELATIVE = 1, eABSOLUTE = 2 };
-
-//-----------------------------------------------------------------------------
-    // missing or mis leading in SAL/rtl: pStr1[nLength] must NOT be evaluated
-    static 
-    sal_Int32 cfg_ustr_ascii_compare_WithLength( const sal_Unicode* pStr1,
-                                                          sal_Int32 nStr1Len,
-                                                          const sal_Char* pStr2 )
-    {
-        while( nStr1Len ) 
-        {
-            sal_Int32 nRet = static_cast<sal_Int32>(*pStr1)-
-                             static_cast<sal_Int32>(static_cast<unsigned char>(*pStr2));
-
-            if (nRet != 0 || *pStr2 == 0) return nRet;
-
-            ++pStr1;
-            ++pStr2;
-            --nStr1Len;
-        }
-
-        return -static_cast<sal_Int32>(static_cast<unsigned char>(*pStr2));
-    }
-//-----------------------------------------------------------------------------
-
-   
-    /** find the char being escaped by the escape sequence in the given string range
-        @return 
-            the char being escaped or zero, if the range is no known escape
-    */
-    sal_Unicode implParseEscape(sal_Unicode const *  pBegin, sal_Unicode const *  pEnd) SAL_THROW(())
-    {
-        OSL_PRECOND( pBegin <  pEnd, "Nonempty string range expected" );
-        OSL_PRECOND( pBegin[0] == c_amp,        "String range is not a possible escape: missing start marker" );
-        OSL_PRECOND( pEnd[-1]  == c_end_escape, "String range is not a possible escape: missing end marker" );
-
-        sal_Int32 const nLen = pEnd - pBegin;
-
-        sal_Unicode chResult;
-
-        if ( c_nMinEscapeLen > nLen || nLen > c_nMaxEscapeLen) // quick check, if there is no possible match
-            chResult = 0;
-        // the standard escapes
-        else if (0 == cfg_ustr_ascii_compare_WithLength(pBegin,nLen,c_amp_name))   chResult = c_amp;
-        else if (0 == cfg_ustr_ascii_compare_WithLength(pBegin,nLen,c_apos_name))  chResult = c_apos;
-        else if (0 == cfg_ustr_ascii_compare_WithLength(pBegin,nLen,c_quot_name))  chResult = c_quot;
-        // extra escapes for XML compatibility
-        else if (0 == cfg_ustr_ascii_compare_WithLength(pBegin,nLen,"&lt;"))    chResult = sal_Unicode('<');
-        else if (0 == cfg_ustr_ascii_compare_WithLength(pBegin,nLen,"&gt;"))    chResult = sal_Unicode('>');
-        else chResult = 0;
-
-        return chResult;
-    }
-
-//-----------------------------------------------------------------------------
-
-    /** find the escape sequence to use for the given char
-        @return 
-            an escape sequence, or NULL, if the char should not be escaped
-    */
-    inline
-    sal_Char const* implGetEscape(sal_Unicode ch ) SAL_THROW(())
-    {
-        switch (ch) 
-        {
-        case c_amp:  return c_amp_name;
-        case c_apos: return c_apos_name;
-        case c_quot: return c_quot_name;
-
-        default: return NULL;
-        }
-    }
-
-//-----------------------------------------------------------------------------
-
-    /** find the start of the path component ending before pEnd in the string starting at pBegin
-        @return 
-            a pointer to the last character before pEnd that is not a name delimiter 
-    */
-    sal_Unicode const *  implFindNameStart(sal_Unicode const *  pBegin, sal_Unicode const *  pEnd) SAL_THROW(())
-    {
-        OSL_PRECOND(pBegin <= pEnd, "Invalid string range");
-
-        sal_Int32 const nLen = pEnd-pBegin;
-        sal_Int32 const nPos = rtl_ustr_lastIndexOfChar_WithLength(pBegin, nLen, c_cDelimiter) + 1;    
-
-        OSL_ASSERT(0 <= nPos && nPos <= nLen);
-
-        return pBegin + nPos;
-    }
-//-----------------------------------------------------------------------------
-
-    /** find the start of the bracketed & quoted predicate ending before pEnd in the string starting at pBegin
-        @return 
-            <ul><li>a pointer to the opening bracket matching the closing bracket at pEnd[-1], if found</li>
-            <li><var>pEnd</var>, if no bracketed string was found</li>
-            <li>NULL, if there was a closing bracket, but the beginning could not be discovered</li></ul>
-    */
-    sal_Unicode const *  implFindPredicateStart(sal_Unicode const *  pBegin, sal_Unicode const *  pEnd) SAL_THROW(())
-    {
-        OSL_PRECOND(pBegin < pEnd, "Nonempty string range required");
-
-        if (pEnd == pBegin || pEnd[-1] != c_rBracket) return pEnd;
-
-        if (--pEnd == pBegin) 
-        {
-            OSL_ENSURE(false, "Invalid path component: single ']'");
-            return NULL; // string was only "]"
-        }
-
-        sal_Unicode chQuote = *--pEnd;
-
-        if (chQuote != c_quot && chQuote != c_apos)
-        {
-            // should we support empty brackets ?
-            if (chQuote == c_lBracket)
-            {
-                OSL_ENSURE(false, "Empty predicate brackets found");
-                return NULL; // for now we don't
-
-            }
-
-            // should we support brackets with non-quoted strings ?
-            chQuote = c_lBracket; // for now we do
-        }
-
-        sal_Int32 nStart = rtl_ustr_lastIndexOfChar_WithLength(pBegin, pEnd-pBegin, chQuote); 
-        
-        if (chQuote != c_lBracket) // needed to support non-quoted strings 
-            --nStart;
-
-        if (nStart < 0)
-        {
-            OSL_ENSURE(false, "Could not find opening quote or bracket for bracketed predicate");
-            return NULL; 
-        }
-
-        if (pBegin[nStart] != c_lBracket) 
-        {
-            OSL_ENSURE(false, "Illegal quote character in string");
-            return NULL; // for now we don't
-        }
-
-        return pBegin + nStart;
-    }
-//-----------------------------------------------------------------------------
-
-    /// find the position of the given char in the range given. 
-    inline 
-    sal_Int32 indexOfCharInRange(sal_Unicode const *  pBegin, sal_Unicode const *  pEnd, sal_Unicode ch) SAL_THROW(())
-    {
-        return rtl_ustr_indexOfChar_WithLength(pBegin, pEnd-pBegin, ch);
-    }
-//-----------------------------------------------------------------------------
-
-    /// find the position of the given char in the range given. 
-    inline 
-    bool containsChar(sal_Unicode const * pString, sal_Unicode ch) SAL_THROW(())
-    {
-        return rtl_ustr_indexOfChar(pString, ch) >= 0;
-    }
-//-----------------------------------------------------------------------------
-
-    /** validate and normalize a bracketed & quoted predicate from content the string range [pBegin,pEnd)
-        @param pRequiredEscapes
-            contains a list of characters that must be preescaped or are otherwise invalid
-            if NULL is passed, the source range is presumed to contain no escaped data
-            otherwise the ampersand (&) and all characters in the list are required to be escaped
-        @return 
-            the normalized, bracketed and quoted predicate
-        @throw
-            InvalidName, if the predicate data is not valid
-    */
-    rtl::OUString implMakeNormalizedPredicate(sal_Unicode const *  pBeginContent, sal_Unicode const *  pEndContent, sal_Unicode const* pRequiredEscapes) SAL_THROW((InvalidName))
-    {
-        OSL_PRECOND(pBeginContent <= pEndContent, "Invalid string range");
-        if (pBeginContent == pEndContent)
-            return rtl::OUString();
-
-        rtl::OUStringBuffer aNormalized(pEndContent-pBeginContent + 4); // reserve approximate size initially
-        
-        // prefix: opening bracket and quote
-        aNormalized.append(c_lBracket).append(c_normal_quot);
-
-        // content: copy over each char and handle escaping
-        for(sal_Unicode const *  pCur = pBeginContent; pCur != pEndContent; ++pCur)
-        {
-            sal_Unicode ch = *pCur; 
-            
-            // maybe parse contained escaping
-            if (pRequiredEscapes)
-            {
-                if (ch == c_amp)
-                {
-                    // find an escape end marker (after pCur). Result is pCur, if the end marker is not there
-                    sal_Unicode const *  pEndEscape = pCur + 1 + indexOfCharInRange(pCur+1,pEndContent,c_end_escape);
-                    sal_Unicode ch2   = pCur != pEndEscape ? implParseEscape(pCur,pEndEscape+1) : 0;
-
-                    if (ch2 != 0) // found and read a valid escape sequence
-                    {
-                        ch = ch2;
-                        pCur = pEndEscape;
-                        OSL_ASSERT(*pCur == c_end_escape);
-                    }
-                    else
-                    {
-                        OSL_ENSURE(false, "Character '&' must be escaped in this context");
-                        #if 0
-                            throw InvalidName(rtl::OUString(pBeginContent,pEndContent-pBeginContent), 
-                                          "is not a valid element name string. "
-                                          "Character '&' must be escaped in this context");
-                        #endif
-                    }
-                }
-                else if ( containsChar(pRequiredEscapes, ch) )
-                {
-                    throw InvalidName(rtl::OUString(pBeginContent,pEndContent-pBeginContent), 
-                                        "is not a valid element name string. "
-                                        "Some characters must be escaped in this context");
-                }
-            }
-
-            // now append (escape if normal)
-            if (sal_Char const * pEscape = implGetEscape(ch))
-                aNormalized.appendAscii( pEscape );
-
-            else
-                aNormalized.append( ch );
-        }
-
-        // suffix: closing quote and bracket
-        aNormalized.append(c_normal_quot).append(c_rBracket);
-
-        return aNormalized.makeStringAndClear();
-    }
-//-----------------------------------------------------------------------------
-
-    /** extract and unescape the normalized predicate content in the string range [pBegin,pEnd)
-        @return 
-            the denormalized predicate content
-    */
-    rtl::OUString implReadPredicate(sal_Unicode const *  pBegin, sal_Unicode const *  pEnd) SAL_THROW(())
-    {
-        OSL_PRECOND(pBegin <= pEnd, "Invalid string range");
-
-        rtl::OUStringBuffer aContent(pEnd-pBegin); // reserve approximate size initially
-
-        sal_Unicode const *  pReadPos = pBegin;
-
-        // content: copy data, handling escapes
-        for(sal_Unicode const *  pCur = pReadPos; pCur != pEnd; ++pCur)
-        {
-            if (*pCur != c_amp) continue; // no escape here 
-            
-        // handle an escape
-            // find an escape end marker (after pCur). Result is pCur, if the end marker is not there
-            sal_Unicode const *  pEndEscape = pCur + 1 + indexOfCharInRange(pCur+1,pEnd,c_end_escape);
-
-            OSL_ENSURE(pEndEscape != pCur, "Found dangling ampersand in normalized data");
-                    
-            sal_Unicode ch = implParseEscape(pCur,pEndEscape+1);
-
-            OSL_ENSURE(ch != 0, "Found unreckognized escape in normalized data");
-
-            if (ch != 0) // found and read a valid escape sequence
-            {
-                // do copy of preceding data
-                aContent.append(pReadPos, pCur-pReadPos).append(ch);
-                pCur = pReadPos = pEndEscape;
-
-                ++pReadPos;
-
-                OSL_ASSERT(*pCur == c_end_escape);
-            }
-            // otherwise just treat the ampersand as a mormal character
-        }
-
-        // do copy of remaining data
-        if (pReadPos != pEnd)
-            aContent.append(pReadPos, pEnd-pReadPos);
-
-        return aContent.makeStringAndClear();
-    }
-//-----------------------------------------------------------------------------
-
-    /** validate and normalize the bracketed & quoted predicate in the string range [pBegin,pEnd)
-        @return 
-            the normalized predicate
-        @throw
-            InvalidName, if the predicate is not valid
-    */
-    rtl::OUString implNormalizePredicate(sal_Unicode const *  pBegin, sal_Unicode const *  pEnd) SAL_THROW((InvalidName))
-    {
-        sal_Unicode sStopCharBuf[2];
-        sal_Unicode const * pStopChars;
-
-        OSL_PRECOND(pBegin < pEnd,          "Nonempty string range expected");
-        OSL_PRECOND(pEnd-pBegin >= 2,       "Bracketed string range expected");
-        OSL_PRECOND(pBegin[0] == c_lBracket,"Bracketed string range expected");
-        OSL_PRECOND(pEnd[-1] == c_rBracket, "Bracketed string range expected");
-
-        ++pBegin; --pEnd; // skip brackets
-
-        sal_Unicode const chUsedQuot = *pBegin;
-        if (chUsedQuot == c_apos || chUsedQuot == c_quot)
-        {
-            OSL_PRECOND(pBegin < pEnd && pEnd-pBegin >= 2,  "Bracketed quoted string range expected");
-            OSL_PRECOND(pEnd[-1] == chUsedQuot,             "Non-matching quotes in bracketed quoted string");
-
-            if (pEnd-pBegin <= 1 || pEnd[-1] != chUsedQuot)
-                throw InvalidName( rtl::OUString(pBegin, pEnd-pBegin), "is not a valid element predicate: quotes do not match");
-
-            ++pBegin; --pEnd; // skip quotes
-            
-            sStopCharBuf[0] = chUsedQuot;
-            sStopCharBuf[1] = 0;
-            
-            pStopChars = sStopCharBuf;
-        }
-
-        // non-quoted strings are not really valid, but we tolerate them
-        else
-        {
-            OSL_ENSURE(false, "Warning: Invalid path - non-quoted data in bracketed predicate");
-
-            static sal_Unicode const sGeneralStoppers[] = { c_quot, c_apos, c_rBracket, c_lBracket, 0 };
-
-            pStopChars = sGeneralStoppers;
-        }
-
-        if (pBegin == pEnd)
-            throw InvalidName(rtl::OUString(pBegin-1,2),"Empty element name in predicate");
-
-        return implMakeNormalizedPredicate(pBegin, pEnd, pStopChars);
-    }
-//-----------------------------------------------------------------------------
-    /// parse a path into a sequence of components
-    Path::Rep implParsePath(rtl::OUString const& _aPathString, PathType eType) SAL_THROW((InvalidName))
-    {
-        Path::Rep aResult;
-
-        dprint (stderr, "implParsePath '%s' ",
-                 rtl::OUStringToOString(_aPathString, RTL_TEXTENCODING_UTF8).getStr());
-        
-        sal_Unicode const *  pBegin = _aPathString.getStr();
-        sal_Unicode const *  pEnd   = pBegin + _aPathString.getLength();
-
-        if (eType == eABSOLUTE) 
-        {
-            if ( detectAbsolutePath(_aPathString) ) 
-                ++pBegin; // skip the leading slash
-
-#ifdef CFG_PATH_STRICT
-            else
-                OSL_ENSURE(false, "Warning: trying to parse relative path as absolute");
-#endif
-        }
-        else
-            OSL_ENSURE(!detectAbsolutePath(_aPathString), "ERROR: trying to parse absolute path as relative one");
-
-        if (detectAbsolutePath(pBegin))
-            throw InvalidName(_aPathString, "is not a valid path. Illegal empty first component");
-
-        else if (pBegin != pEnd && pEnd[-1] == '/')
-        {
-#ifdef CFG_PATH_STRICT
-            OSL_ENSURE(false, "Illegal configuration path. Terminating '/' found.");
-#endif
-            --pEnd;
-        }
-
-        while (pEnd != pBegin)
-        {
-            // check for predicate
-            sal_Unicode const *  pQuoteStart = implFindPredicateStart(pBegin, pEnd);
-            if (pQuoteStart == NULL)
-                throw InvalidName(_aPathString, "is not a valid path. Invalid name or predicate syntax");
-
-            sal_Unicode const *  pNameStart = implFindNameStart(pBegin, pQuoteStart);
-
-            rtl::OUString aElementName(pNameStart, pQuoteStart-pNameStart);
-            
-            if (!isSimpleName(aElementName))
-            {
-                // this is OK only for few cases WITH predicate 
-                if (pQuoteStart == pEnd)
-                    throw InvalidName(_aPathString, "is not a valid path. Invalid name");
-
-                if (isEmptyString(aElementName))
-                    aElementName = makeWildcardType();
-
-                else if ( !isWildcardType(aElementName)) 
-                    throw InvalidName(_aPathString, "is not a valid path. Invalid type tag for predicate");
-            }
-            if (pQuoteStart != pEnd)
-            {
-                dprint (stderr, "add 'normalize predicate'", "");
-                rtl::OUString aPred = implNormalizePredicate(pQuoteStart,pEnd);
-                aElementName += aPred;
-                dprint (stderr, " [result pred '%s']",
-                         rtl::OUStringToOString(aPred, RTL_TEXTENCODING_UTF8).getStr());
-            }
-
-            aResult.prepend( Path::Component(aElementName) );
-
-            pEnd = pNameStart;
-            if (pNameStart != pBegin) --pEnd;
-        }
-        dprint (stderr, "\n", "");
-        return aResult;
-    }
-//-----------------------------------------------------------------------------
-
-    /// build a composite path component from a base name (type) and a (somewhat optional) predicate
-    rtl::OUString implMakeCompositeName(rtl::OUString const& _sBaseName, rtl::OUString const& _sPredicate) SAL_THROW((InvalidName))
-    {
-        rtl::OUString sComposite(_sBaseName);
-
-        if (isEmptyString(_sBaseName))
-            sComposite = makeWildcardType();
-
-        else if (!isWildcardType(_sBaseName) && !isSimpleName(_sBaseName))
-            throw InvalidName(_sBaseName, "The base-name (type) part of a composite node name must be a simple word");
-
-        dprint (stderr, "implMakeNormalizePred '%s' ",
-                rtl::OUStringToOString(_sPredicate, RTL_TEXTENCODING_UTF8).getStr());
-
-        sal_Unicode const *  pPredStart = _sPredicate.getStr();
-        sal_Unicode const *  pPredEnd   = pPredStart + _sPredicate.getLength();
-
-        if (pPredStart != pPredEnd)
-            sComposite += implMakeNormalizedPredicate(pPredStart, pPredEnd, NULL);
-
-        dprint (stderr, " [result pred '%s']\n",
-                rtl::OUStringToOString(sComposite, RTL_TEXTENCODING_UTF8).getStr());
-
-        return sComposite;
-    }
-//-----------------------------------------------------------------------------
-
-    /// split a composite path component into a base name (type) and a predicate (if present)
-    void implSplitCompositeName(rtl::OUString const& _aCompositeName, rtl::OUString& _rBaseName, rtl::OUString& _rPredicate) SAL_THROW(())
-    {
-        sal_Int32 nPos = _aCompositeName.indexOf(c_lBracket);
-
-        if (nPos >= 0)
-        {
-            OSL_ENSURE( nPos > 0, "Invalid name: Only predicate, no base type");
-
-            _rBaseName = _aCompositeName.copy(0,nPos);
-
-            sal_Unicode const *  pBeginPred = _aCompositeName.getStr() + nPos;
-            sal_Unicode const *  pEndPred   = _aCompositeName.getStr() + _aCompositeName.getLength();
-
-            OSL_ASSERT(pBeginPred[0] == c_lBracket);
-            OSL_ENSURE(pBeginPred[1] == c_normal_quot, "Missing or unexpected quote mark");
-            OSL_ENSURE(pEndPred[-1] == c_rBracket, "Invalid name: Predicate brackets not closed");
-            OSL_ENSURE(pEndPred[-2] == c_normal_quot, "Missing or unexpected quote mark");
-
-            // skip brackets and quotes - then read data
-            _rPredicate = implReadPredicate(pBeginPred+2, pEndPred-2);
-        }
-        else
-        {
-            OSL_ENSURE( _aCompositeName.indexOf(c_rBracket) < 0, "Invalid name: Predicate brackets not opened");
-            _rBaseName = _aCompositeName;
-            _rPredicate = rtl::OUString();
-        }
-    }
-//-----------------------------------------------------------------------------
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class RelativePath
-//-----------------------------------------------------------------------------
-
-// Currently unused method to check/ensure validity
-void RelativePath::init() SAL_THROW(()) 
-{
-}
-//-----------------------------------------------------------------------------
-
-RelativePath RelativePath::parse(rtl::OUString const& aString)
-{
-    return RelativePath( implParsePath(aString, eRELATIVE) );
-}
-//-----------------------------------------------------------------------------
-
-RelativePath::RelativePath(Path::Component const& aName) SAL_THROW(())
-: m_aRep(aName)
-{
-    if (aName.isEmpty()) m_aRep.clearComponents();
-}
-//-----------------------------------------------------------------------------
-
-RelativePath RelativePath::compose(RelativePath const& aPath) const SAL_THROW(())
-{
-    Path::Rep aResult = aPath.rep();
-    aResult.prepend( this->m_aRep );
-    return RelativePath( aResult );
-}
-//-----------------------------------------------------------------------------
-rtl::OUString RelativePath::toString() const SAL_THROW(())
-{
-    return m_aRep.toString(false);
-}
-
-//-----------------------------------------------------------------------------
-// class AbsolutePath
-//-----------------------------------------------------------------------------
-
-// Currently unused method to check/ensure validity
-void AbsolutePath::init() SAL_THROW(())
-{
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath AbsolutePath::parse(rtl::OUString const& aString)
-{
-    return AbsolutePath( implParsePath(aString, eABSOLUTE) );
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath AbsolutePath::root() SAL_THROW(())
-{
-    return AbsolutePath( Path::Rep() );
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath AbsolutePath::detachedRoot() SAL_THROW(())
-{
-    Path::Rep aRep( Path::makeEmptyComponent() ); // use 1 empty component here, to start detached names
-    return AbsolutePath( aRep );
-}
-//-----------------------------------------------------------------------------
-
-static inline Path::Component implMakeSafeModuleName(rtl::OUString const& _sModuleName) SAL_THROW(())
-{
-    OSL_ENSURE( isSimpleName(_sModuleName), "A module name must be a simple name");
-    
-    // if (isSimpleName(_sModuleName)) sModuleName = escape_name( _sModuleName );
-        
-    return Path::Component(_sModuleName);
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath AbsolutePath::makeModulePath(rtl::OUString const& _sModuleName) SAL_THROW(())
-{
-    return AbsolutePath( Path::Rep( implMakeSafeModuleName(_sModuleName) ) );
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath AbsolutePath::compose(RelativePath const& aPath) const SAL_THROW(())
-{
-    Path::Rep aResult = aPath.rep();
-    aResult.prepend( this->m_aRep );
-    return AbsolutePath( aResult );
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath AbsolutePath::getParentPath() const
-{
-    // or: m_aRep.check_not_empty();
-    OSL_ENSURE(!isRoot(), "ERROR: Requesting the parent of a root path");
-    if (isRoot()) return *this;
-
-    OSL_ENSURE(!isDetached(), "ERROR: Requesting the parent of a detached path");
-
-    return AbsolutePath( Path::Rep(begin(),end()-1) );
-}
-#if OSL_DEBUG_LEVEL > 0
-//-----------------------------------------------------------------------------
-
-bool AbsolutePath::isDetached() const SAL_THROW(())
-{
-    return !m_aRep.isEmpty() && begin()->isEmpty();
-}
-#endif
-//-----------------------------------------------------------------------------
-
-rtl::OUString AbsolutePath::toString() const SAL_THROW(())
-{
-    return m_aRep.toString(true);
-}
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/configset.cxx b/configmgr/source/treemgr/configset.cxx
deleted file mode 100644
index 941136728d..0000000000
--- a/configmgr/source/treemgr/configset.cxx
+++ /dev/null
@@ -1,577 +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: configset.cxx,v $
- * $Revision: 1.32 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h> // needed for Solaris 8
-#include "configset.hxx"
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "tree.hxx"
-#include "treefragment.hxx"
-#include "template.hxx"
-#include "templateimpl.hxx"
-#include "configgroup.hxx"
-#include "valuenode.hxx"
-#include "valuenodeimpl.hxx"
-#include "setnodeimpl.hxx"
-#include <vos/refernce.hxx>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// class SetElementFactory
-//-----------------------------------------------------------------------------
-
-SetElementFactory::SetElementFactory(TemplateProvider const& aProvider)
-: m_aProvider(aProvider)
-{
-    OSL_ENSURE(aProvider.m_aImpl.is(), "WARNING: Template Instance Factory created without template provider - cannot instantiate elements");
-}
-//-----------------------------------------------------------------------------
-
-SetElementFactory::SetElementFactory(SetElementFactory const& aOther)
-: m_aProvider(aOther.m_aProvider)
-{
-}
-//-----------------------------------------------------------------------------
-
-SetElementFactory& SetElementFactory::operator=(SetElementFactory const& aOther)
-{
-    m_aProvider = aOther.m_aProvider;
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-SetElementFactory::~SetElementFactory()
-{
-}
-
-//-----------------------------------------------------------------------------
-rtl::Reference< ElementTree > SetElementFactory::instantiateTemplate(rtl::Reference<Template> const& aTemplate)
-{
-    OSL_ENSURE(m_aProvider.m_aImpl.is(), "ERROR: Template Instance Factory has no template provider - cannot instantiate element");
-    OSL_ENSURE(aTemplate.is(), "ERROR: Template is NULL - cannot instantiate element");
-
-    rtl::Reference< data::TreeSegment > aInstanceTree( m_aProvider.m_aImpl->instantiate(aTemplate) );
-    OSL_ENSURE(aInstanceTree.is(), "ERROR: Cannot create Element Instance: Provider could not instantiate template");
-
-    //set removable state 
-    aInstanceTree->fragment->header.state |= data::State::flag_removable;
-    
-    return new ElementTree( aInstanceTree, aTemplate, m_aProvider );
-}
-//-----------------------------------------------------------------------------
-rtl::Reference< ElementTree > SetElementFactory::instantiateOnDefault(rtl::Reference< data::TreeSegment > const& _aElementData, rtl::Reference<Template> const& aDummyTemplate)
-{
-//	OSL_ENSURE(m_aProvider.m_aImpl(), "ERROR: Template Instance Factory has no template provider - cannot instantiate element");
-    OSL_ENSURE(_aElementData.is(), "ERROR: Tree is NULL - cannot instantiate element");
-    OSL_ENSURE(aDummyTemplate.is(), "ERROR: Template is NULL - cannot instantiate element");
-
-    return new ElementTree( _aElementData, aDummyTemplate, m_aProvider );
-}
-//-----------------------------------------------------------------------------
-
-TemplateProvider SetElementFactory::findTemplateProvider(rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_ENSURE(!isEmpty(aTree.get()), "ERROR: Getting Element Factory requires a valid tree");
-    OSL_ENSURE(aNode.isValid(), "ERROR: Getting Element Factory requires a valid node");
-    OSL_ENSURE(aTree->isValidNode(aNode.getOffset()), "ERROR: Tree/Node mismatch");
-    if (aNode.isValid() )
-    {
-      view::ViewTreeAccess aView(aTree.get());
-
-        OSL_ENSURE (aView.isSetNode(aNode), "WARNING: Getting Element Factory requires a SET node");
-        if (aView.isSetNode(aNode))
-            return aView.getTemplateProvider(aView.toSetNode(aNode));
-    }
-    return TemplateProvider();
-}
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class TreeSetUpdater and ValueSetUpdater
-//-----------------------------------------------------------------------------
-
-static node::Attributes getNewElementAttributes(bool bInserting)
-{
-    node::Attributes aResult;
-    aResult.setState( node::isReplaced );
-    //Check if you are inserting new dynamic property
-    if(bInserting)
-    {
-        aResult.markRemovable();
-    }
-    return aResult;
-}
-
-// Value Element Factory methods
-//-----------------------------------------------------------------------------
-
-rtl::Reference<ElementTree> ValueSetUpdater::makeValueElement(rtl::OUString const& aName, com::sun::star::uno::Any const& aValue, bool bInserting)
-{
-   
-    const node::Attributes aNewValueAttributes = getNewElementAttributes(bInserting); // TODO: get real value
-    
-    com::sun::star::uno::Type aType = m_aTemplate->getInstanceType();
-
-    rtl::OUString aTypeName = m_aTemplate->getName();
-
-    std::auto_ptr<INode> pNode;
-    if (aValue.hasValue())
-        pNode.reset( new ValueNode(aTypeName, aValue, aNewValueAttributes) );
-    else
-        pNode.reset( new ValueNode(aTypeName, aType, aNewValueAttributes) );
-
-    rtl::Reference< data::TreeSegment > aValueTree = data::TreeSegment::create(aName, pNode);
-
-    return new ElementTree(aValueTree, m_aTemplate, TemplateProvider() );
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference<ElementTree> ValueSetUpdater::makeValueElement(rtl::OUString const& aName, rtl::Reference< Tree > const& , com::sun::star::uno::Any const& aValue, bool bInserting)
-{
-    // for now ignoring the node.
-    // TODO: merge attributes etc. from that node's value
-    return makeValueElement(aName, aValue,bInserting);
-}
-//-----------------------------------------------------------------------------
-
-
-TreeSetUpdater::TreeSetUpdater(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode, rtl::Reference< Template > const& aTemplate)
-: m_aParentTree(aParentTree)
-, m_aSetNode(aSetNode)
-, m_aTemplate(aTemplate)
-{
-    implValidateSet();
-}
-//-----------------------------------------------------------------------------
-
-ValueSetUpdater::ValueSetUpdater(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode,
-                                 rtl::Reference< Template > const& aTemplate, com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> const& xConverter)
-: m_aParentTree(aParentTree)
-, m_aSetNode(aSetNode)
-, m_aTemplate(aTemplate)
-, m_xTypeConverter(xConverter)
-{
-    implValidateSet();
-}
-//-----------------------------------------------------------------------------
-
-SetDefaulter::SetDefaulter(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode,
-                            DefaultProvider const& aDefaultProvider)
-: m_aParentTree(aParentTree)
-, m_aSetNode(aSetNode)
-, m_aDefaultProvider(aDefaultProvider)
-{
-    implValidateSet();
-}
-//-----------------------------------------------------------------------------
-
-/// validates that a actual set and an updater's construction parameters match
-static void doValidateSet(rtl::Reference< Tree > const& aParentTree, NodeRef const& aSetNode)
-{
-    if (isEmpty(aParentTree.get()))
-        throw Exception("INTERNAL ERROR: Set Update: Unexpected NULL tree");
-
-    if (!aSetNode.isValid())
-        throw Exception("INTERNAL ERROR: Set Update: Unexpected NULL node");
-
-    if (!aParentTree->isValidNode(aSetNode.getOffset()))
-        throw Exception("INTERNAL ERROR: Set Update: node does not match tree");
-
-    if (! view::ViewTreeAccess(aParentTree.get()).isSetNode(aSetNode))
-        throw Exception("INTERNAL ERROR: Set Update: node is not a set");
-
-    if (aParentTree->getAttributes(aSetNode).isReadonly()) 
-        throw ConstraintViolation( "Set Update: Set is read-only !" );
-}
-//-----------------------------------------------------------------------------
-
-/// validates that the actual set and the construction parameters match
-void TreeSetUpdater::implValidateSet()
-{
-    doValidateSet(m_aParentTree,m_aSetNode);
-
-    if (!m_aTemplate.is())
-        throw Exception("INTERNAL ERROR: No template available for tree set update");
-
-    if (m_aTemplate->isInstanceValue())
-        throw Exception("INTERNAL ERROR: Tree set update invoked on a value-set");
-
-    view::ViewTreeAccess aParentView(m_aParentTree.get());
-
-    if ( aParentView.getElementTemplate(aParentView.toSetNode(m_aSetNode)) != m_aTemplate)
-        throw Exception("INTERNAL ERROR: Set Update: template mismatch");
-}
-//-----------------------------------------------------------------------------
-
-/// validates that the actual set and the construction parameters match
-void ValueSetUpdater::implValidateSet()
-{
-    doValidateSet(m_aParentTree,m_aSetNode);
-
-    com::sun::star::uno::Type aThisType = m_aTemplate->getInstanceType();
-
-    switch ( aThisType.getTypeClass())
-    {
-    case uno::TypeClass_VOID:		throw Exception("INTERNAL ERROR: Value set element type is void");
-    case uno::TypeClass_INTERFACE:	throw Exception("INTERNAL ERROR: Value update invoked on a complex set");
-
-    case uno::TypeClass_STRUCT:
-    case uno::TypeClass_EXCEPTION:	throw Exception("INTERNAL ERROR: Unexpected/Invalid type for set elements");
-
-    default: break;
-    }
-
-    view::ViewTreeAccess aParentView(m_aParentTree.get());
-
-    if ( aParentView.getElementTemplate(aParentView.toSetNode(m_aSetNode))->getInstanceType() != aThisType)
-        throw Exception("INTERNAL ERROR: Set Update: element type mismatch");
-}
-//-----------------------------------------------------------------------------
-
-/// validates that the actual set and the construction parameters match
-void SetDefaulter::implValidateSet()
-{
-    doValidateSet(m_aParentTree,m_aSetNode);
-
-    if (!m_aDefaultProvider.isValid())
-        throw Exception("INTERNAL ERROR: No default provider available for restoring set default state");
-}
-//-----------------------------------------------------------------------------
-
-static void doValidateElement(rtl::Reference< ElementTree > const& aElement, bool bReqRemovable)
-{
-    if (!aElement.is())
-        throw Exception("INTERNAL ERROR: Set Update: Unexpected NULL element");
-
-    if ( bReqRemovable)
-    {
-        rtl::Reference< Tree > aElementTree = aElement.get();
-    
-        if(!aElementTree->getAttributes(aElementTree->getRootNode()).isRemovable())
-            throw ConstraintViolation( "New Set Update: Existing element cannot be removed (or replaced) !" );
-    }
-}
-//-----------------------------------------------------------------------------
-
-/// validates that the given element is valid in this context and returns its name
-Path::Component TreeSetUpdater::implValidateElement(rtl::Reference< ElementTree > const& aElement, bool bReqRemovable)
-{
-    doValidateElement(aElement,bReqRemovable);
-    return aElement->getExtendedRootName();
-}
-//-----------------------------------------------------------------------------
-
-/// validates that the given element is valid and can be replaced in this context and returns its name
-Path::Component ValueSetUpdater::implValidateElement(rtl::Reference< ElementTree > const& aElement, bool mReqRemovable)
-{
-    doValidateElement(aElement,mReqRemovable);
-
-#if OSL_DEBUG_LEVEL > 0
-    com::sun::star::uno::Type aNodeType = ElementHelper::getUnoType(aElement);
-
-    OSL_ENSURE(aNodeType.getTypeClass() != uno::TypeClass_VOID, "INTERNAL ERROR: Set Element without associated type found");
-    OSL_ENSURE(aNodeType.getTypeClass() != uno::TypeClass_INTERFACE,"INTERNAL ERROR: Set Element with complex type found");
-
-    OSL_ENSURE(aNodeType == m_aTemplate->getInstanceType() ||
-               uno::TypeClass_ANY == m_aTemplate->getInstanceType().getTypeClass(),
-               "INTERNAL ERROR: Set Update: existing element does not match template type");
-#endif
-
-    return aElement->getExtendedRootName();
-}
-//-----------------------------------------------------------------------------
-static void checkEligibleChild(rtl::Reference< ElementTree > const& aElementTree, rtl::Reference< Tree > const& aParentTree)
-{
-    ElementTree const * const pElement = aElementTree.get();	OSL_ASSERT(pElement);
-
-    if (pElement->getContextTree() != NULL)
-        throw ConstraintViolation( "Set Update: cannot insert an element that already has a parent." );
-
-    Tree const* pAncestor = aParentTree.get();
-    while (pAncestor != NULL)
-    {
-        if (pElement == pAncestor)
-            throw ConstraintViolation( "Set Update: Circular insertion - trying to insert an element into self or descendant" );
-
-        pAncestor = pAncestor->getContextTree();
-        OSL_ENSURE(pAncestor != aParentTree.get(), "ERROR: Circular tree found");
-    }
-}
-
-//-----------------------------------------------------------------------------
-
-void TreeSetUpdater::implValidateTree(rtl::Reference< ElementTree > const& aElementTree)
-{
-    if (!aElementTree.is())
-        throw ConstraintViolation( "Set Update: cannot replace element of complex set with NULL node. Remove the element instead !" );
-
-    checkEligibleChild(aElementTree,m_aParentTree);
-
-    if (! aElementTree->isTemplateInstance())
-    {
-        throw TypeMismatch(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<Unnamed> (Template missing)")),
-                                    m_aTemplate->getName(), " - new element without template in Set Update");
-    }
-
-    if (!aElementTree->isInstanceOf(m_aTemplate))
-    {
-        throw TypeMismatch( aElementTree->getTemplate()->getPathString(),
-                            m_aTemplate->getPathString(), " - new element without template in Set Update");
-    }
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any ValueSetUpdater::implValidateValue(com::sun::star::uno::Any const& aValue)
-{
-    com::sun::star::uno::Type const aThisType = m_aTemplate->getInstanceType();
-
-    OSL_ENSURE( aThisType.getTypeClass() == uno::TypeClass_ANY || isPossibleValueType(aThisType),
-                "Invalid element type for value set" );
-
-    com::sun::star::uno::Any aRet;
-    if (aValue.hasValue())
-    {
-        com::sun::star::uno::Type const aValType = aValue.getValueType();
-
-        if (aValType.getTypeClass() == uno::TypeClass_INTERFACE)
-            throw TypeMismatch(aValType.getTypeName(), aThisType.getTypeName(), " - cannot replace value by complex tree in Set update");
-
-        if (aValType == aThisType)
-        {
-            aRet = aValue;
-        }
-
-        else if ( uno::TypeClass_ANY == aThisType.getTypeClass() )
-        {
-            if ( ! isPossibleValueType(aValType) )
-                throw TypeMismatch(aValType.getTypeName(), aThisType.getTypeName(), " - new element has no legal configuration data type");
-
-            aRet = aValue;
-        }
-
-        else
-        {
-            if (!convertCompatibleValue(m_xTypeConverter, aRet, aValue, aThisType))
-                throw TypeMismatch(aValType.getTypeName(), aThisType.getTypeName(), " - new element does not match template type in SetUpdate");
-        }
-
-        OSL_ASSERT( isPossibleValueType(aRet.getValueType()) );
-    }
-    else
-    {
-        //  cannot do anything about null values here
-        OSL_ASSERT(aValue.getValueTypeClass() == uno::TypeClass_VOID);
-
-    }
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any ValueSetUpdater::implValidateValue(rtl::Reference< Tree > const& aElementTree, com::sun::star::uno::Any const& aValue)
-{
-    node::Attributes aAttributes = aElementTree->getAttributes(aElementTree->getRootNode());
-    // Here we assume writable == removable/replaceable
-    if (aAttributes.isReadonly()) 
-        throw ConstraintViolation( "Set Update: Existing element is read-only !" );
-
-    // Here we assume nullable != removable
-    if (!aValue.hasValue())
-    {
-        if (!aAttributes.isNullable())
-            throw ConstraintViolation( "Set Update: Value is not nullable !" );
-    }
-    return implValidateValue( aValue);
-}
-//-----------------------------------------------------------------------------
-
-NodeChange TreeSetUpdater::validateInsertElement (rtl::OUString const& aName, rtl::Reference< ElementTree > const& aNewElement)
-{
-    view::ViewTreeAccess aParentView(m_aParentTree.get());
-
-    SetEntry anEntry = aParentView.findElement(aParentView.toSetNode(m_aSetNode),aName);
-    if (anEntry.isValid())
-        throw Exception("INTERNAL ERROR: Set Update: Element to be inserted already exists");
-
-    implValidateTree(aNewElement);
-
-    std::auto_ptr<SetElementChangeImpl> pChange( new SetInsertImpl(aNewElement->makeExtendedName(aName), aNewElement) );
-
-    pChange->setTarget(aParentView.makeNode(m_aSetNode));
-
-    return NodeChange(pChange.release());
-}
-//-----------------------------------------------------------------------------
-
-NodeChange ValueSetUpdater::validateInsertElement (rtl::OUString const& aName, com::sun::star::uno::Any const& aNewValue)
-{
-    view::ViewTreeAccess aParentView(m_aParentTree.get());
-
-    SetEntry anEntry = aParentView.findElement(aParentView.toSetNode(m_aSetNode),aName);
-    if (anEntry.isValid())
-        throw Exception("INTERNAL ERROR: Set Update: Element to be inserted already exists");
-
-    com::sun::star::uno::Any aValidValue = implValidateValue(aNewValue);
-
-    rtl::Reference<ElementTree> aNewElement = makeValueElement(aName, aValidValue,true);
-
-    std::auto_ptr<SetElementChangeImpl> pChange( new SetInsertImpl(aNewElement->makeExtendedName(aName), aNewElement) );
-
-    pChange->setTarget(aParentView.makeNode(m_aSetNode));
-
-    return NodeChange(pChange.release());
-}
-//-----------------------------------------------------------------------------
-
-NodeChange TreeSetUpdater::validateReplaceElement(rtl::Reference< ElementTree > const& aElement, rtl::Reference< ElementTree > const& aNewElement)
-{
-    Path::Component aName = implValidateElement(aElement,true);
-
-    implValidateTree(aNewElement);
-
-    std::auto_ptr<SetElementChangeImpl> pChange( new SetReplaceImpl(aName, aNewElement) );
-
-    pChange->setTarget(view::ViewTreeAccess(m_aParentTree.get()).makeNode(m_aSetNode));
-
-    return NodeChange(pChange.release());
-}
-//-----------------------------------------------------------------------------
-
-NodeChange ValueSetUpdater::validateReplaceElement(rtl::Reference< ElementTree > const& aElement, com::sun::star::uno::Any const& aNewValue)
-{
-    Path::Component aName = implValidateElement(aElement,false);
-
-    rtl::Reference< Tree > aElementNode = extractElementNode(aElement);
-
-    com::sun::star::uno::Any aValidValue = implValidateValue(aElementNode, aNewValue);
-   
-    rtl::Reference< Tree > aElementTree = aElement.get();
-    
-    rtl::Reference<ElementTree> aNewElement;
-    if(aElementTree->getAttributes(aElementTree->getRootNode()).isRemovable())
-    {
-        aNewElement = makeValueElement(aName.getName(), aElementNode, aValidValue,true);
-    }
-    else
-    {
-        aNewElement = makeValueElement(aName.getName(), aElementNode, aValidValue,false);
-    }
-
-    std::auto_ptr<SetElementChangeImpl> pChange( new SetReplaceImpl(aName, aNewElement) );
-
-    pChange->setTarget(view::ViewTreeAccess(m_aParentTree.get()).makeNode(m_aSetNode));
-
-    return NodeChange(pChange.release());
-}
-//-----------------------------------------------------------------------------
-
-NodeChange TreeSetUpdater::validateRemoveElement (rtl::Reference< ElementTree > const& aElement)
-{
-    Path::Component aName = implValidateElement(aElement,true);
-
-    std::auto_ptr<SetElementChangeImpl> pChange( new SetRemoveImpl(aName) );
-
-    pChange->setTarget(view::ViewTreeAccess(m_aParentTree.get()).makeNode(m_aSetNode));
-
-    return NodeChange(pChange.release());
-}
-
-//-----------------------------------------------------------------------------
-
-NodeChange ValueSetUpdater::validateRemoveElement (rtl::Reference< ElementTree > const& aElement)
-{
-    Path::Component aName = implValidateElement(aElement,true);
-
-    std::auto_ptr<SetElementChangeImpl> pChange( new SetRemoveImpl(aName) );
-
-    pChange->setTarget(view::ViewTreeAccess(m_aParentTree.get()).makeNode(m_aSetNode));
-
-    return NodeChange(pChange.release());
-}
-
-//-----------------------------------------------------------------------------
-
-NodeChange SetDefaulter::validateSetToDefaultState()
-{
-    std::auto_ptr< ISubtree > aDefault = m_aDefaultProvider.getDefaultTree(m_aParentTree,m_aSetNode);
-
-    // now build the specific change
-    std::auto_ptr<SetChangeImpl> pChange;
-
-    if (aDefault.get())
-    {
-        TemplateProvider aProvider = SetElementFactory::findTemplateProvider(m_aParentTree,m_aSetNode);
-
-        configmgr::configuration::SetElementFactory aTmp(aProvider);
-        pChange.reset( new SetResetImpl(aTmp, aDefault) );
-    pChange->setTarget(view::ViewTreeAccess(m_aParentTree.get()).makeNode(m_aSetNode));
-    }
-    return NodeChange(pChange.release());
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< Tree > ValueSetUpdater::extractElementNode (rtl::Reference< ElementTree > const& aElement)
-{
-    return aElement.get();
-}
-//-----------------------------------------------------------------------------
-
-#if OSL_DEBUG_LEVEL > 0
-com::sun::star::uno::Type	ElementHelper::getUnoType(rtl::Reference< ElementTree > const& aElement)
-{
-    OSL_PRECOND( aElement.is(), "ERROR: Configuration: ElementTree operation requires valid node" );
-
-    rtl::Reference< Tree > aElementTree(aElement.get());
-
-    NodeRef aNode = aElementTree->getRootNode();
-    OSL_ASSERT( aNode.isValid() );
-
-    view::ViewTreeAccess aElementView(aElementTree.get());
-
-    if ( aElementView.isValueNode(aNode) )
-    {
-        return aElementView.getValueType(aElementView.toValueNode(aNode));
-    }
-    else
-    {
-        uno::Reference< uno::XInterface > const * const selectInterface=0;
-        return ::getCppuType(selectInterface);
-    }
-}
-#endif
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/defaultproviderproxy.cxx b/configmgr/source/treemgr/defaultproviderproxy.cxx
deleted file mode 100644
index 89a0fdf00d..0000000000
--- a/configmgr/source/treemgr/defaultproviderproxy.cxx
+++ /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: defaultproviderproxy.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_configmgr.hxx"
-
-#include "defaultproviderproxy.hxx"
-#include "defaultprovider.hxx"
-#include "treemanager.hxx"
-#include "valuenode.hxx"
-#include "options.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-DefaultProviderProxy::DefaultProviderProxy(
-        rtl::Reference< TreeManager > const & _xDefaultTreeProvider,  
-        IDefaultableTreeManager *   _pDefaultTreeManager,  
-        AbsolutePath        const&  _aBaseLocation,
-        RequestOptions      const&  _aOptions
-    )
-: m_aBaseLocation(_aBaseLocation)
-, m_aOptions(_aOptions)
-, m_xDefaultTreeProvider(_xDefaultTreeProvider)
-, m_pDefaultTreeManager(_pDefaultTreeManager)
-{
-}
-//-----------------------------------------------------------------------------
-
-DefaultProviderProxy::~DefaultProviderProxy()
-{
-}
-//-----------------------------------------------------------------------------
-
-/// tries to load a default instance of the specified node (which must be within the request range owned)
-std::auto_ptr<ISubtree> DefaultProviderProxy::getDefaultTree(
-                            AbsolutePath const& _aLocation
-                       ) const SAL_THROW((com::sun::star::uno::Exception))
-{
-    OSL_ENSURE( Path::hasPrefix(_aLocation,m_aBaseLocation), 
-                "ERROR: DefaultProviderProxy called for out-of-scope location" );
-    
-    std::auto_ptr<ISubtree> aRet;
-
-    if (m_xDefaultTreeProvider.is())
-        aRet = m_xDefaultTreeProvider->requestDefaultData(_aLocation, m_aOptions);
-
-    return aRet;
-}
-
-//-----------------------------------------------------------------------------
-/// tries to load default data into the specified tree
-bool DefaultProviderProxy::fetchDefaultData()  SAL_THROW((com::sun::star::uno::Exception))
-{
-    OSL_PRECOND(m_pDefaultTreeManager, "No tree to fetch defaults into");
-    if (!m_pDefaultTreeManager) return false;
-
-    return !! m_pDefaultTreeManager->fetchDefaultData(m_aBaseLocation,m_aOptions);
-}
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/defaultproviderproxy.hxx b/configmgr/source/treemgr/defaultproviderproxy.hxx
deleted file mode 100644
index 7d1867015d..0000000000
--- a/configmgr/source/treemgr/defaultproviderproxy.hxx
+++ /dev/null
@@ -1,89 +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: defaultproviderproxy.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_DEFAULTPROVIDER_PROXY_HXX_
-#define CONFIGMGR_DEFAULTPROVIDER_PROXY_HXX_
-
-#include "configpath.hxx"
-#include "utility.hxx"
-#include "requestoptions.hxx"
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class ISubtree;
-    class IDefaultableTreeManager;
-    class OOptions;
-    class TreeManager;
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-        /// provides access to the defaults for a given request
-        class DefaultProviderProxy 
-        : public salhelper::SimpleReferenceObject
-        {
-            // the data defining a request
-            AbsolutePath            m_aBaseLocation;
-            RequestOptions          m_aOptions;
-
-            // the object(s) that provide the defaults
-            rtl::Reference< TreeManager >    m_xDefaultTreeProvider;
-            IDefaultableTreeManager *                   m_pDefaultTreeManager;  
-        public:
-            explicit
-            DefaultProviderProxy(
-                    rtl::Reference< TreeManager > const & _xDefaultTreeProvider,  
-                    IDefaultableTreeManager *   _pDefaultTreeManager,  
-                    AbsolutePath        const&  _aBaseLocation,
-                    RequestOptions      const&  _aOptions
-                );
-
-            ~DefaultProviderProxy();
-
-        /// tries to load a default instance of the specified node (which must be within the request range owned)
-            std::auto_ptr<ISubtree> getDefaultTree(AbsolutePath const& _aLocation) const SAL_THROW((com::sun::star::uno::Exception));
-
-            /// tries to load default data into the owned tree - call only outside of any locks
-            bool fetchDefaultData() SAL_THROW((com::sun::star::uno::Exception));
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_DEFAULTPROVIDER_PROXY_HXX_
diff --git a/configmgr/source/treemgr/deferredview.cxx b/configmgr/source/treemgr/deferredview.cxx
deleted file mode 100644
index 5e82a08f36..0000000000
--- a/configmgr/source/treemgr/deferredview.cxx
+++ /dev/null
@@ -1,446 +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: deferredview.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_configmgr.hxx"
-#include <stdio.h>
-#include "deferredview.hxx"
-#include "viewfactory.hxx"
-#include "nodeimplobj.hxx"
-
-namespace configmgr
-{
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-static inline configuration::DeferredGroupNodeImpl* deferredGroupNode(Node const& _aNode)
-{
-    return static_cast<configuration::DeferredGroupNodeImpl*>(_aNode.get_impl());
-}
-//-----------------------------------------------------------------------------
-
-static inline configuration::DeferredGroupNodeImpl* deferredGroupNode(GroupNode const& _aNode)
-{
-    return static_cast<configuration::DeferredGroupNodeImpl*>(_aNode.get_impl());
-}
-//-----------------------------------------------------------------------------
-
-static inline configuration::DeferredSetNodeImpl* deferredSetNode(Node const& _aNode)
-{
-    return static_cast<configuration::DeferredSetNodeImpl*>(_aNode.get_impl());
-}
-//-----------------------------------------------------------------------------
-
-static inline configuration::DeferredSetNodeImpl* deferredSetNode(SetNode const& _aNode)
-{
-    return static_cast<configuration::DeferredSetNodeImpl*>(_aNode.get_impl());
-}
-//-----------------------------------------------------------------------------
-
-static inline void deferredValueNode(Node const& _aNode)
-{
-    { (void)_aNode; }
-    OSL_ENSURE( _aNode.isValueNode(),"Unknown Node type in deferred view");
-    OSL_ENSURE(_aNode.get_offset() == configuration::Tree::ROOT, "Tree: Unexpected node type - non-root value element");
-}
-//-----------------------------------------------------------------------------
-
-static void deferredValueNodeChanged(Node const& _aNode)
-{
-    { (void)_aNode; }
-    OSL_ENSURE( _aNode.isValueNode(),"Unknown Node type in deferred view");
-    OSL_ENSURE(_aNode.get_offset() == configuration::Tree::ROOT, "Tree: Unexpected node type - non-root value element");
-    OSL_ENSURE(!_aNode.isValueNode(),"Value node changes not supported in deferred view");
-    throw configuration::Exception("Internal Error: Invalid operation applied to element");
-}
-//-----------------------------------------------------------------------------
-
-bool DeferredViewStrategy::doHasChanges(Node const& _aNode) const
-{
-    if (_aNode.isGroupNode())
-        return deferredGroupNode(_aNode)->hasChanges();
-
-    else if (_aNode.isSetNode())
-        return deferredSetNode(_aNode)->hasChanges();
-
-    else 
-       deferredValueNode(_aNode);
-        
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doMarkChanged(Node const& _aNode)
-{
-    if (_aNode.isGroupNode())
-        deferredGroupNode(_aNode)->markChanged();
-
-    else if (_aNode.isSetNode())
-        deferredSetNode(_aNode)->markChanged();
-
-    else 
-       deferredValueNodeChanged(_aNode);
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doCollectChanges(Node const& _aNode, configuration::NodeChanges& _rChanges) const
-{
-    implCollectChangesIn(_aNode,_rChanges);
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::implCollectChangesIn(Node const& _aNode, configuration::NodeChanges& _rChanges)	const
-{ 
-    if ( hasChanges(_aNode) )
-    {
-        if (_aNode.isSetNode())
-        {
-            deferredSetNode(_aNode)->collectElementChanges( _rChanges);
-        }
-        else if (_aNode.isGroupNode())
-        {
-            GroupNode aGroup(_aNode);
-
-            deferredGroupNode(aGroup)->collectValueChanges( _rChanges, _aNode.tree(), _aNode.get_offset());
-
-            for( Node aChild = aGroup.getFirstChild(); 
-                 aChild.is(); 
-                 aChild = aGroup.getNextChild(aChild) 
-               )
-            {
-                this->implCollectChangesIn( aChild, _rChanges ); 
-            }
-        }
-        else 
-            OSL_ASSERT(!"Unreachable code");
-    }
-}
-
-//-----------------------------------------------------------------------------
-std::auto_ptr<SubtreeChange> DeferredViewStrategy::doPreCommitChanges(configuration::Tree * tree, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements)
-{
-    std::auto_ptr<SubtreeChange> pRet;
-    if (hasChanges(tree)) 
-    {
-        pRet = implPreCommitChanges(getRootNode(tree),_rRemovedElements);
-        if (pRet.get() != NULL)
-        {
-            pRet->setNodeName(getSimpleRootName(tree));
-        }
-    }
-    return pRet;
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doFailedCommit(configuration::Tree * tree, SubtreeChange& rChanges)
-{
-    implFailedCommit(getRootNode(tree),rChanges);
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doFinishCommit(configuration::Tree * tree, SubtreeChange& rChanges)
-{
-    implFinishCommit(getRootNode(tree),rChanges);
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doRevertCommit(configuration::Tree * tree, SubtreeChange& rChanges)
-{
-    implRevertCommit(getRootNode(tree),rChanges);
-}
-
-//-----------------------------------------------------------------------------
-configuration::ValueChangeImpl* DeferredViewStrategy::doAdjustToValueChange(GroupNode const& _aGroupNode, rtl::OUString const& _aName, ValueChange const& rExternalChange)
-{
-    rtl::Reference<configuration::ValueMemberNode::DeferredImpl> aChange = deferredGroupNode(_aGroupNode)->findValueChange(_aName);
-    
-    if (aChange.is())
-    {
-        if (configuration::ValueChangeImpl* pValueChange = aChange->adjustToChange(rExternalChange))
-        {
-            OSL_ENSURE(aChange->isChange(), "Got an adjusted change from a non-changing value");
-
-            return pValueChange;
-        }
-        else // a non-change
-        {
-            OSL_ENSURE(!aChange->isChange(), "Got no adjusted change from a changing value") ;
-            OSL_ENSURE(false, "Got a non-change from a (deferred) group") ;
-            // then do as without deferred change
-        }
-    }
-
-    return ViewStrategy::doAdjustToValueChange(_aGroupNode, _aName, rExternalChange);
-
-}
-
-//-----------------------------------------------------------------------------
-node::Attributes DeferredViewStrategy::doAdjustAttributes(node::Attributes const& _aAttributes) const
-{
-    return _aAttributes;
-}
-
-//-----------------------------------------------------------------------------
-configuration::ValueMemberNode DeferredViewStrategy::doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const
-{
-    return deferredGroupNode(_aNode)->makeValueMember(_aName,_bForUpdate);
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doInsertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& _aNewEntry)
-{
-    // move to this memory segment
-    // should be direct (as any free-floating one)
-
-    //implMakeElement(aNewEntry)
-    configuration::ElementTreeData aNewElement = implMakeElement(_aNode, _aNewEntry );
-
-    deferredSetNode(_aNode)->insertNewElement(aName, aNewElement);
-}
-
-//-----------------------------------------------------------------------------
-void DeferredViewStrategy::doRemoveElement(SetNode const& _aNode, rtl::OUString const& aName)
-{
-    deferredSetNode(_aNode)->removeOldElement(aName);
-}
-
-//-----------------------------------------------------------------------------
-extern NodeFactory& getDeferredChangeFactory();
-
-NodeFactory& DeferredViewStrategy::doGetNodeFactory()
-{
-    return getDeferredChangeFactory();
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-rtl::Reference<ViewStrategy> createDeferredChangeStrategy()
-{
-    return new DeferredViewStrategy();
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<SubtreeChange> DeferredViewStrategy::implPreCommitChanges(Node const& _aNode, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements)
-{
-    std::auto_ptr<SubtreeChange> aRet;
-
-    OSL_ASSERT (this->hasChanges( _aNode) );
-
-    if (_aNode.isSetNode())
-    {
-        aRet = deferredSetNode(_aNode)->preCommitChanges(_rRemovedElements);
-    }
-    else if (_aNode.isGroupNode())
-    {
-        std::auto_ptr<SubtreeChange> aGroupChange(deferredGroupNode(_aNode)->preCommitValueChanges());
-
-        OSL_ASSERT(aGroupChange.get());
-        if (aGroupChange.get())
-            implPreCommitSubChanges( GroupNode(_aNode), _rRemovedElements, *aGroupChange);
-
-        aRet = aGroupChange;
-    } 
-    else 
-       deferredValueNode(_aNode);
-
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implFinishCommit(Node const& _aNode, SubtreeChange& rSubtreeChange)
-{
-    OSL_PRECOND( getSimpleNodeName(_aNode) == rSubtreeChange.getNodeName(), "ERROR: Change name does not match node");
-
-    if (_aNode.isSetNode())
-    {
-        OSL_ENSURE(rSubtreeChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-
-        deferredSetNode(_aNode)->finishCommit(rSubtreeChange);
-    }
-    else if (_aNode.isGroupNode())
-    {
-        OSL_ENSURE(!rSubtreeChange.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-        deferredGroupNode(_aNode)->finishCommit(rSubtreeChange);
-        implFinishSubCommitted( GroupNode(_aNode), rSubtreeChange );
-    }
-    else
-    {
-        deferredValueNode(_aNode);
-        OSL_ENSURE(false, "Tree: Cannot finish commit: Unexpected node type");
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implRevertCommit(Node const& _aNode, SubtreeChange& rSubtreeChange)
-{
-    OSL_PRECOND( getSimpleNodeName(_aNode) == rSubtreeChange.getNodeName(), "ERROR: Change name does not match node");
-
-    if (_aNode.isSetNode())
-    {
-        OSL_ENSURE(rSubtreeChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-
-        deferredSetNode(_aNode)->revertCommit(rSubtreeChange);
-    }
-    else if (_aNode.isGroupNode())
-    {
-        OSL_ENSURE(!rSubtreeChange.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-        deferredGroupNode(_aNode)->revertCommit(rSubtreeChange);
-        implRevertSubCommitted( GroupNode(_aNode), rSubtreeChange );
-    }
-    else
-    {
-        deferredValueNode(_aNode);
-        OSL_ENSURE(false, "Tree: Cannot revert commit: Unexpected node type");
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implFailedCommit(Node const& _aNode, SubtreeChange& rSubtreeChange)
-{
-    OSL_PRECOND( getSimpleNodeName(_aNode) == rSubtreeChange.getNodeName(), "ERROR: Change name does not match node");
-
-    if (_aNode.isSetNode())
-    {
-        OSL_ENSURE(rSubtreeChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-
-        deferredSetNode(_aNode)->failedCommit(rSubtreeChange);
-    }
-    else if (_aNode.isGroupNode())
-    {
-        OSL_ENSURE(!rSubtreeChange.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-        deferredGroupNode(_aNode)->failedCommit(rSubtreeChange);
-        implFailedSubCommitted( GroupNode(_aNode), rSubtreeChange );
-    }
-    else
-    {
-        deferredValueNode(_aNode);
-        OSL_ENSURE(false, "Tree: Cannot handle commit failure: Unexpected node type");
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implPreCommitSubChanges(GroupNode const & _aGroup, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements, SubtreeChange& _rParentChange)
-{
-    for( Node aChild = _aGroup.getFirstChild(); aChild.is(); aChild = _aGroup.getNextChild(aChild) )
-    {
-        if (this->hasChanges(aChild))
-        {
-            std::auto_ptr<SubtreeChange> aSubChanges( this->implPreCommitChanges(aChild,_rRemovedElements) );
-            std::auto_ptr<Change> aSubChangesBase( aSubChanges.release() );
-            _rParentChange.addChange( aSubChangesBase );
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implFinishSubCommitted(GroupNode const & _aGroup, SubtreeChange& aChangesParent)
-{
-    for(SubtreeChange::MutatingChildIterator 
-            it = aChangesParent.begin_changes(), 
-            stop = aChangesParent.end_changes();
-        it != stop; 
-        ++it)
-    {
-        if (dynamic_cast< SubtreeChange * >(&*it) != 0)
-        {
-            Node aChild = _aGroup.findChild( it->getNodeName() );
-            OSL_ENSURE( aChild.is(), "Changed sub-node not found in tree");
-
-            this->implFinishCommit(aChild, static_cast<SubtreeChange&>(*it));
-        }
-        else
-        {
-            OSL_ENSURE(dynamic_cast< ValueChange * >(&*it) != 0, "Unexpected change type for inner node; change is ignored");
-            OSL_ENSURE(! _aGroup.findChild(it->getNodeName()).is() ,
-                        "Found sub(tree) node where a value was changed");
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implRevertSubCommitted(GroupNode const & _aGroup, SubtreeChange& aChangesParent)
-{
-    for(SubtreeChange::MutatingChildIterator 
-            it = aChangesParent.begin_changes(), 
-            stop = aChangesParent.end_changes();
-        it != stop; 
-        ++it)
-    {
-        if (dynamic_cast< SubtreeChange * >(&*it) != 0)
-        {
-            Node aChild = _aGroup.findChild( it->getNodeName() );
-            OSL_ENSURE( aChild.is(), "Changed sub-node not found in tree");
-
-            this->implRevertCommit(aChild, static_cast<SubtreeChange&>(*it));
-        }
-        else
-        {
-            OSL_ENSURE(dynamic_cast< ValueChange * >(&*it) != 0, "Unexpected change type for inner node; change is ignored");
-            OSL_ENSURE(! _aGroup.findChild(it->getNodeName()).is() ,
-                        "Found sub(tree) node where a value was changed");
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredViewStrategy::implFailedSubCommitted(GroupNode const & _aGroup, SubtreeChange& aChangesParent)
-{
-    for(SubtreeChange::MutatingChildIterator 
-            it = aChangesParent.begin_changes(), 
-            stop = aChangesParent.end_changes();
-        it != stop; 
-        ++it)
-    {
-        if (dynamic_cast< SubtreeChange * >(&*it) != 0)
-        {
-            Node aChild = _aGroup.findChild( it->getNodeName() );
-            OSL_ENSURE( aChild.is(), "Changed sub-node not found in tree");
-
-            this->implFailedCommit(aChild, static_cast<SubtreeChange&>(*it));
-        }
-        else
-        {
-            OSL_ENSURE(dynamic_cast< ValueChange * >(&*it) != 0, "Unexpected change type for inner node; change is ignored");
-            OSL_ENSURE(! _aGroup.findChild(it->getNodeName()).is() ,
-                        "Found sub(tree) node where a value was changed");
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/deferredview.hxx b/configmgr/source/treemgr/deferredview.hxx
deleted file mode 100644
index 4aa90f8513..0000000000
--- a/configmgr/source/treemgr/deferredview.hxx
+++ /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: deferredview.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 CONFIGMGR_DEFERREDVIEW_HXX_
-#define CONFIGMGR_DEFERREDVIEW_HXX_
-
-#include "viewstrategy.hxx"
-
-
-namespace configmgr
-{
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-// View behavior for direct data access
-//-----------------------------------------------------------------------------
-
-        class DeferredViewStrategy : public ViewStrategy
-        {
-        public:
-            explicit 
-            DeferredViewStrategy() {} 
-
-        // ViewStrategy implementation
-        private:
-            // change handling -required
-            virtual bool doHasChanges(Node const& _aNode) const;
-            virtual void doMarkChanged(Node const& _aNode);
-
-
-            // change handling
-            virtual void doCollectChanges(Node const& _aNode, configuration::NodeChanges& rChanges) const;
-
-            // commit protocol
-            virtual std::auto_ptr<SubtreeChange> doPreCommitChanges(configuration::Tree * tree, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements);
-            virtual void doFailedCommit(configuration::Tree * tree, SubtreeChange& rChanges);
-            virtual void doFinishCommit(configuration::Tree * tree, SubtreeChange& rChanges);
-            virtual void doRevertCommit(configuration::Tree * tree, SubtreeChange& rChanges);
-
-            // notification protocol
-            virtual configuration::ValueChangeImpl* doAdjustToValueChange(GroupNode const& _aGroupNode, rtl::OUString const& aName, ValueChange const& rExternalChange);
-        //	virtual void doAdjustToElementChanges(configuration::NodeChangesInformation& rLocalChanges, SetNode const& _aNode, SubtreeChange const& rExternalChanges, TreeDepth nDepth);
-
-            // common attributes 
-            virtual node::Attributes doAdjustAttributes(node::Attributes const& _aAttributes) const;
-
-            // group member access
-            virtual configuration::ValueMemberNode doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const;
-
-            // set element access
-            virtual void doInsertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& aNewEntry);
-            virtual void doRemoveElement(SetNode const& _aNode, rtl::OUString const& aName);
-
-            virtual NodeFactory& doGetNodeFactory();
-        private:
-            void implCollectChangesIn(Node const& _aNode, configuration::NodeChanges& rChanges) const;
-            // commit protocol
-            std::auto_ptr<SubtreeChange> implPreCommitChanges(Node const& _aNode, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements);
-            void implFailedCommit(Node const& _aNode, SubtreeChange& rChanges);
-            void implFinishCommit(Node const& _aNode, SubtreeChange& rChanges);
-            void implRevertCommit(Node const& _aNode, SubtreeChange& rChanges);
-
-            void implPreCommitSubChanges(GroupNode const & _aGroup, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements, SubtreeChange& _rParentChange);
-            void implFailedSubCommitted(GroupNode const & _aGroup, SubtreeChange& rChanges);
-            void implFinishSubCommitted(GroupNode const & _aGroup, SubtreeChange& rChanges);
-            void implRevertSubCommitted(GroupNode const & _aGroup, SubtreeChange& rChanges);
-
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_DEFERREDVIEW_HXX_
diff --git a/configmgr/source/treemgr/directview.cxx b/configmgr/source/treemgr/directview.cxx
deleted file mode 100644
index 16737a23a1..0000000000
--- a/configmgr/source/treemgr/directview.cxx
+++ /dev/null
@@ -1,130 +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: directview.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_configmgr.hxx"
-#include <stdio.h>
-#include "directview.hxx"
-#include "viewfactory.hxx"
-#include "setnodeimpl.hxx"
-
-namespace configmgr
-{
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-
-void DirectViewStrategy::implMarkNondefault(SetNode const& _aSetNode) 
-{
-    sharable::SetNode * set = _aSetNode.getAccess();
-
-    OSL_ASSERT(set != 0);
-
-    sharable::SetNode* pNode = NULL;
-    if (m_aTreeSegment.is())
-        pNode = set;
-
-    OSL_ASSERT(pNode);
-
-    pNode->info.markAsDefault(false);
-}
-//-----------------------------------------------------------------------------
-
-bool DirectViewStrategy::doHasChanges(Node const& ) const
-{
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-void DirectViewStrategy::doMarkChanged(Node const& )
-{
-    // do nothing
-}
-//-----------------------------------------------------------------------------
-
-node::Attributes DirectViewStrategy::doAdjustAttributes(node::Attributes const& _aAttributes) const
-{
-    node::Attributes aAttributes = _aAttributes;
-
-    if (aAttributes.isReadonly()) 
-        aAttributes.setAccess(node::accessFinal);
-
-    return aAttributes;
-}
-//-----------------------------------------------------------------------------
-
-configuration::ValueMemberNode DirectViewStrategy::doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const
-{
-    return ViewStrategy::doGetValueMember(_aNode,_aName,_bForUpdate);
-}
-//-----------------------------------------------------------------------------
-void DirectViewStrategy::doInsertElement(SetNode const& _aNode, rtl::OUString const& _aName, configuration::SetEntry const& _aNewEntry)
-{
-    // move to this memory segment
-    // should already be direct (as any free-floating one)
-
-    //implMakeElement(aNewEntry)
-    configuration::ElementTreeData aNewElement = implMakeElement(_aNode, _aNewEntry );
- //   _aNewEntry.tree()->rebuild(this, _aNode.accessor());
-
-    _aNode.get_impl()->insertElement(_aName, aNewElement);
-
-    aNewElement->attachTo( _aNode.getAccess(), _aName );
-
-    implMarkNondefault( _aNode );
-}
-//-----------------------------------------------------------------------------
-
-void DirectViewStrategy::doRemoveElement(SetNode const& _aNode, rtl::OUString const& _aName)
-{
-    configuration::ElementTreeData aOldElement = _aNode.get_impl()->removeElement(_aName);
-
-    aOldElement->detachFrom( _aNode.getAccess(), _aName);
-
-    implMarkNondefault( _aNode );
-}
-//-----------------------------------------------------------------------------
-
-extern NodeFactory& getDirectAccessFactory();
-
-NodeFactory& DirectViewStrategy::doGetNodeFactory()
-{
-    return getDirectAccessFactory();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference<ViewStrategy> createDirectAccessStrategy(rtl::Reference< data::TreeSegment > const & _aTreeSegment)
-{
-    return new DirectViewStrategy(_aTreeSegment);
-}
-
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/directview.hxx b/configmgr/source/treemgr/directview.hxx
deleted file mode 100644
index 473f09730e..0000000000
--- a/configmgr/source/treemgr/directview.hxx
+++ /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: directview.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 CONFIGMGR_DIRECTVIEW_HXX_
-#define CONFIGMGR_DIRECTVIEW_HXX_
-
-#include "viewstrategy.hxx"
-#include "treesegment.hxx"
-
-namespace configmgr
-{
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-// View behavior for direct data access
-//-----------------------------------------------------------------------------
-
-        class DirectViewStrategy : public ViewStrategy
-        {
-            rtl::Reference< data::TreeSegment > m_aTreeSegment;
-        public:
-            explicit 
-            DirectViewStrategy(rtl::Reference< data::TreeSegment > const & _aTreeSegment)
-            : m_aTreeSegment(_aTreeSegment)
-            {}
-
-        protected:
-            // change handling -required
-            virtual bool doHasChanges(Node const& _aNode) const;
-            virtual void doMarkChanged(Node const& _aNode);
-
-            // common attributes 
-            virtual node::Attributes doAdjustAttributes(node::Attributes const& _aAttributes) const;
-
-            // group member access
-            virtual configuration::ValueMemberNode doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const;
-
-            // set element access
-            virtual void doInsertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& aNewEntry);
-            virtual void doRemoveElement(SetNode const& _aNode, rtl::OUString const& aName);
-
-            virtual NodeFactory& doGetNodeFactory();
-
-        private:
-            void implMarkNondefault(SetNode const& _aNode);
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_DIRECTVIEW_HXX_
diff --git a/configmgr/source/treemgr/groupnodeimpl.hxx b/configmgr/source/treemgr/groupnodeimpl.hxx
deleted file mode 100644
index cf9d9ac6d8..0000000000
--- a/configmgr/source/treemgr/groupnodeimpl.hxx
+++ /dev/null
@@ -1,91 +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: groupnodeimpl.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 CONFIGMGR_GROUPNODEBEHAVIOR_HXX_
-#define CONFIGMGR_GROUPNODEBEHAVIOR_HXX_
-
-#include "nodeimpl.hxx"
-#include "valuemembernode.hxx"
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class SubtreeChange;
-    class ValueChange;
-
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class ValueChangeImpl;
-//-----------------------------------------------------------------------------
-// a visitor
-//-----------------------------------------------------------------------------
-        struct GroupMemberVisitor
-        {
-            enum Result { DONE, CONTINUE };
-            virtual Result visit(ValueMemberNode const& aValue) = 0;
-        protected:
-            virtual ~GroupMemberVisitor() {}
-        };
-
-
-// Specific type of nodes
-//-----------------------------------------------------------------------------
-
-        class GroupNodeImpl : public NodeImpl
-        {
-            mutable sharable::Node *m_pCache;
-        public:
-            explicit GroupNodeImpl(sharable::GroupNode * _pNodeRef);
-
-            sharable::GroupNode * getDataAccess() const;
-
-            bool areValueDefaultsAvailable() const;
-
-            sharable::ValueNode * getOriginalValueNode(rtl::OUString const& aName) const;
-
-            ValueMemberNode makeValueMember(sharable::ValueNode * node);
-        };
-
-//-----------------------------------------------------------------------------
-
-        // domain-specific 'dynamic_cast' replacements
-        GroupNodeImpl&	AsGroupNode(NodeImpl& rNode);
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_GROUPNODEBEHAVIOR_HXX_
diff --git a/configmgr/source/treemgr/makefile.mk b/configmgr/source/treemgr/makefile.mk
deleted file mode 100644
index ba98a6a161..0000000000
--- a/configmgr/source/treemgr/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.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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)$/source$/inc
-PRJNAME=configmgr
-TARGET=treemgr
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-        $(SLO)$/collectchanges.obj \
-        $(SLO)$/configdefaultprovider.obj	\
-        $(SLO)$/configexcept.obj	\
-        $(SLO)$/configgroup.obj	\
-        $(SLO)$/configpath.obj	\
-        $(SLO)$/configset.obj	\
-        $(SLO)$/defaultproviderproxy.obj	\
-        $(SLO)$/valuemembernode.obj	\
-        $(SLO)$/nodechange.obj	\
-        $(SLO)$/nodechangeimpl.obj	\
-        $(SLO)$/nodechangeinfo.obj	\
-        $(SLO)$/nodefactory.obj	\
-        $(SLO)$/nodeimpl.obj	\
-        $(SLO)$/nodeimplobj.obj	\
-        $(SLO)$/noderef.obj	\
-        $(SLO)$/roottree.obj	\
-        $(SLO)$/setnodeimpl.obj	\
-        $(SLO)$/template.obj	\
-        $(SLO)$/templateimpl.obj	\
-        $(SLO)$/treeimpl.obj	\
-        $(SLO)$/viewaccess.obj \
-        $(SLO)$/viewstrategy.obj \
-        $(SLO)$/viewnode.obj \
-        $(SLO)$/deferredview.obj \
-        $(SLO)$/directview.obj \
-        $(SLO)$/readonlyview.obj \
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/treemgr/nodechange.cxx b/configmgr/source/treemgr/nodechange.cxx
deleted file mode 100644
index cfffd7cc15..0000000000
--- a/configmgr/source/treemgr/nodechange.cxx
+++ /dev/null
@@ -1,276 +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: nodechange.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "nodechangeinfo.hxx"
-
-#include "noderef.hxx"
-#include "tree.hxx"
-
-#include <algorithm>
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-
-//-----------------------------------------------------------------------------
-// NodeChange handle class
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-inline void NodeChange::init()
-{
-    if (m_pImpl) m_pImpl->acquire();
-}
-inline void NodeChange::deinit()
-{
-    if (m_pImpl) m_pImpl->release();
-}
-
-//-----------------------------------------------------------------------------
-NodeChange::NodeChange()
-: m_pImpl(0)
-{
-}
-//-----------------------------------------------------------------------------
-
-NodeChange::NodeChange(NodeChangeImpl* pImpl)
-: m_pImpl(pImpl)
-{
-    init();
-}
-//-----------------------------------------------------------------------------
-
-NodeChange::NodeChange(NodeChange const& rOther)
-: m_pImpl(rOther.m_pImpl)
-{
-    init();
-}
-//-----------------------------------------------------------------------------
-
-NodeChange& NodeChange::operator=(NodeChange const& rOther)
-{
-    NodeChange(rOther).swap(*this);
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-void NodeChange::swap(NodeChange& rOther)
-{
-    std::swap(m_pImpl,rOther.m_pImpl);
-}
-//-----------------------------------------------------------------------------
-
-NodeChange::~NodeChange()
-{
-    deinit();
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChange::maybeChange() const
-{
-    return m_pImpl && m_pImpl->isChange(true);
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChange::isChange() const
-{
-    return m_pImpl && m_pImpl->isChange(false);
-}
-//-----------------------------------------------------------------------------
-            
-sal_uInt32 NodeChange::getChangeInfos(NodeChangesInformation& _rInfos) const
-{
-    sal_uInt32 nCount = 0;
-    if (m_pImpl)
-    {
-        sal_uInt32 nChanges = m_pImpl->getChangeDataCount();	    
-           
-        for (sal_uInt32 ix = 0; ix < nChanges; ++ix)
-        {
-        NodeChangeInformation aSingleInfo;
-            aSingleInfo.change.type = NodeChangeData::eNoChange;
-
-            m_pImpl->fillChangeInfo(aSingleInfo,ix);
-
-            if ( !aSingleInfo.isEmptyChange() )
-            {
-                _rInfos.push_back(aSingleInfo);
-                ++nCount;
-            }
-        }
-    }
-
-    return nCount;
-}
-//-----------------------------------------------------------------------------
-            
-bool NodeChange::getChangeLocation(NodeChangeLocation& rLoc) const
-{
-    return m_pImpl && m_pImpl->fillChangeLocation(rLoc);
-}
-
-//-----------------------------------------------------------------------------
-
-// retrieve the tree where the change is actually taking place
-rtl::Reference< Tree > NodeChange::getAffectedTree() const
-{
-    if (this->maybeChange())
-        return m_pImpl->getTargetTree().get();
-    else
-        return NULL;
-}
-//-----------------------------------------------------------------------------
-
-// retrieve the tree where the change is actually taking place
-NodeRef NodeChange::getAffectedNode() const
-{
-    if (this->maybeChange())
-    {
-        rtl::Reference<Tree> aTree = m_pImpl->getTargetTree();
-        unsigned int nOffset = m_pImpl->getTargetNode();
-
-        OSL_ASSERT(aTree.is() && aTree->isValidNode(nOffset));
-
-        if (aTree.is() && nOffset)
-            return aTree->getNode(nOffset);
-    }
-    return NodeRef();
-}
-//-----------------------------------------------------------------------------
-
-NodeChange& NodeChange::test()
-{
-    if (m_pImpl) m_pImpl->test();
-    return *this;
-}
-
-//-----------------------------------------------------------------------------
-NodeChange const& NodeChange::test() const
-{
-    if (m_pImpl) m_pImpl->test();
-    return *this;
-}
-
-//-----------------------------------------------------------------------------
-NodeChange& NodeChange::apply()
-{
-    if (m_pImpl) m_pImpl->apply();
-    return *this;
-}
-
-//-----------------------------------------------------------------------------
-NodeChange const& NodeChange::apply() const
-{
-    if (m_pImpl) m_pImpl->apply();
-    return *this;
-}
-
-//-----------------------------------------------------------------------------
-// NodeChanges collection
-//-----------------------------------------------------------------------------
-
-NodeChanges::NodeChanges()
-: m_aChanges()
-{
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChanges::isEmpty() const
-{
-    return m_aChanges.empty();
-}
-//-----------------------------------------------------------------------------
-
-/// predicate for compact
-
-static bool isEmptyChange(NodeChange const& aChange)
-{
-    return !aChange.maybeChange();
-}
-//-----------------------------------------------------------------------------
-
-
-NodeChanges& NodeChanges::compact()
-{
-    m_aChanges.erase( std::remove_if(begin(),end(),isEmptyChange), end() );
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-void NodeChanges::implTest() const
-{
-    for(std::vector<NodeChange>::const_iterator it = begin(), stop = end(); it != stop; ++it)
-    {
-        it ->test();
-    }
-}
-//-----------------------------------------------------------------------------
-/** insert a change into this collection
-*/
-void NodeChanges::add(NodeChange const& aChange)
-{
-    m_aChanges.push_back(aChange);
-}
-
-//-----------------------------------------------------------------------------
-
-/** removes a change to <var>aNode</var> from this collection (if there is one)
-void NodeChanges::reset(Node const& aNode)
-{
-}
-*/
-            
-sal_uInt32 NodeChanges::getChangesInfos(NodeChangesInformation& _rInfos) const
-{
-    if (isEmpty()) return 0;
-
-    _rInfos.reserve(_rInfos.size() + this->getCount());
-
-    sal_Int32 nResult = 0;
-    for (std::vector<NodeChange>::const_iterator it = begin(); it != end(); ++it)
-    {
-        nResult += it->getChangeInfos(_rInfos);
-    }
-
-    return nResult;
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-    }
-}
-
diff --git a/configmgr/source/treemgr/nodechangeimpl.cxx b/configmgr/source/treemgr/nodechangeimpl.cxx
deleted file mode 100644
index aa049fa600..0000000000
--- a/configmgr/source/treemgr/nodechangeimpl.cxx
+++ /dev/null
@@ -1,788 +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: nodechangeimpl.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "nodechangeimpl.hxx"
-#include "nodechangeinfo.hxx"
-#include "nodeimpl.hxx"
-#include "tree.hxx"
-#include "configset.hxx"
-#include "setnodeimpl.hxx"
-#include "groupnodeimpl.hxx"
-#include "valuenode.hxx"
-#include "change.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// All Changes:NodeChangeImpl  - common base
-//-----------------------------------------------------------------------------
-
-// life cycle states for a NodeChangeImpl
-enum { eTestedChange = 0x01, eAppliedChange = 0x02, eNoCheck = 0x07 };
-//-----------------------------------------------------------------------------
-
-NodeChangeImpl::NodeChangeImpl(bool bNoCheck)
-: m_aAffectedTree()
-, m_nAffectedNode(0)
-, m_nState(0)
-{
-    if (bNoCheck) m_nState = eNoCheck;
-}
-//-----------------------------------------------------------------------------
-
-view::ViewTreeAccess NodeChangeImpl::getTargetView()
-{
-    OSL_ENSURE( m_aAffectedTree.is(), "ERROR: Configuration Change: Target Tree Access has not been set up" );
-
-    return view::ViewTreeAccess(m_aAffectedTree.get());
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference<Tree> NodeChangeImpl::getTargetTree() const
-{
-    rtl::Reference<Tree> aRet = m_aAffectedTree;
-    OSL_ENSURE( aRet.is(), "ERROR: Configuration Change: Target Tree has not been set up" );
-
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-
-unsigned int NodeChangeImpl::getTargetNode() const
-{
-    unsigned int nRet = m_nAffectedNode;
-    OSL_ENSURE( nRet != 0, "ERROR: Configuration Change: Target Node has not been set up" );
-    OSL_ENSURE( m_aAffectedTree.is() && m_aAffectedTree->isValidNode(nRet),
-                "ERROR: Configuration Change: Changing Node does not match tree" );
-
-    return nRet;
-}
-//-----------------------------------------------------------------------------
-
-void NodeChangeImpl::setTarget(view::Node _aAffectedNode)
-{
-    this->setTarget(_aAffectedNode.tree(), _aAffectedNode.get_offset());
-
-}
-void NodeChangeImpl::setTarget(rtl::Reference<Tree> const& _aAffectedTree, unsigned int _nAffectedNode)
-{
-    OSL_ENSURE(m_nState == 0 || (!m_aAffectedTree.is() && m_nState == eNoCheck), "WARNING: Configuration: Retargeting change that already was tested or applied");
-
-    OSL_ENSURE( _aAffectedTree.is(), "ERROR: Configuration Change: NULL Target Tree is not allowed" );
-    OSL_ENSURE( _nAffectedNode, "ERROR: Configuration Change: NULL Target Node is not allowed" );
-    OSL_ENSURE( _aAffectedTree->isValidNode(_nAffectedNode), "ERROR: Configuration Change: Target Node does not match Tree" );
-
-    if (m_nState != eNoCheck) m_nState = 0; // previous checks are invalidated
-
-    m_aAffectedTree = _aAffectedTree;
-    m_nAffectedNode = _nAffectedNode;
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChangeImpl::isChange(bool bAllowUntested) const
-{
-    OSL_ENSURE(bAllowUntested || (m_nState & eTestedChange), "WARNING: Configuration: Change was not tested  - isChange is meaningless");
-
-    if (m_nState == eNoCheck) 
-        return true;
-
-    if (!(m_nState & eTestedChange))
-        return bAllowUntested;			
-
-    return doIsChange();
-}
-//-----------------------------------------------------------------------------
-
-sal_uInt32 NodeChangeImpl::getChangeDataCount() const
-{
-    OSL_PRECOND(m_nState & eTestedChange, "WARNING: Configuration: Change was not tested  - change data count may be incorrect");
-    
-    return  doGetChangeCount(); 
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChangeImpl::fillChangeData(NodeChangeData& rChange, sal_uInt32 _ix) const
-{
-    OSL_PRECOND(_ix < doGetChangeCount(), "ERROR: Configuration: Change index out of range");
-    OSL_PRECOND(m_nState & eTestedChange, "WARNING: Configuration: Change was not tested  - fillChange is partially meaningless");
-    
-    return doFillChange(rChange, _ix) || rChange.isDataChange(); // force true if the data is signaling change
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChangeImpl::fillChangeLocation(NodeChangeLocation& rChange, sal_uInt32 _ix) const
-{
-    if (!m_aAffectedTree.is()) return false;
-
-    rChange.setBase( NodeID(this->getTargetTree().get(), this->getTargetNode()) );
-
-    rChange.setAccessor( this->doGetChangingNodePath(_ix) );
-
-    rChange.setAffected( NodeID(this->getTargetTree().get(), this->getTargetNode()) );
-
-    rChange.setChangingSubnode( this->doIsChangingSubnode() );
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-bool NodeChangeImpl::fillChangeInfo(NodeChangeInformation& rChange, sal_uInt32 _ix) const
-{
-    return fillChangeLocation(rChange.location, _ix) & fillChangeData(rChange.change, _ix);
-}
-//-----------------------------------------------------------------------------
-
-void NodeChangeImpl::test()
-{
-    if (!(m_nState & eTestedChange))
-    {
-        doTest(implGetTarget());
-        m_nState |= eTestedChange;
-    }
-}
-//-----------------------------------------------------------------------------
-
-void NodeChangeImpl::apply()
-{
-    if (!(m_nState & eAppliedChange))
-    {
-        implApply();
-
-        OSL_ENSURE(m_nState & eAppliedChange, "ERROR: Configuration: Change could not be applied");
-        OSL_ENSURE(m_nState & eTestedChange, "ERROR: Configuration: Change was not tested while applied");
-    }
-    else
-        OSL_ENSURE(m_nState & eTestedChange, "ERROR: Configuration: Change marked applied but not tested");
-}
-//-----------------------------------------------------------------------------
-
-// default count is 1
-sal_uInt32 NodeChangeImpl::doGetChangeCount() const
-{
-    return  1; 
-}
-//-----------------------------------------------------------------------------
-
-/// apply this change to the given node - start state is nState (which is then updated)
-void NodeChangeImpl::implApply()
-{
-    OSL_ASSERT( !(m_nState & eAppliedChange)); // Caller must check
-
-    view::Node aTarget = implGetTarget();
-
-    if (!(m_nState & eTestedChange))  // Test checks the old value if there is realy a change
-    {                               // for eventlisteners to say "the old value is kept"
-        doTest(aTarget);
-        m_nState |= eTestedChange;
-    }
-
-    doApply(aTarget);
-    m_nState |= eAppliedChange;
-}
-//-----------------------------------------------------------------------------
-
-view::Node NodeChangeImpl::implGetTarget()
-{
-    OSL_ENSURE(m_aAffectedTree.is(), "ERROR: Configuration Change: no target tree set");
-    
-    OSL_ENSURE(m_aAffectedTree->isValidNode(m_nAffectedNode), "ERROR: Configuration Change: target node not in target tree");
-
-    view::Node aTarget = getTargetView().makeNode(m_nAffectedNode);
-    OSL_ENSURE(aTarget.is(), "ERROR: Configuration: No target for change");
-    return aTarget;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Value operations: ValueChangeImpl = common base
-//-----------------------------------------------------------------------------
-
-ValueChangeImpl::ValueChangeImpl()
-: m_aNewValue()			
-, m_aOldValue()
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueChangeImpl::ValueChangeImpl(com::sun::star::uno::Any const& aNewValue)
-: m_aNewValue(aNewValue)			
-, m_aOldValue()
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueChangeImpl::ValueChangeImpl(com::sun::star::uno::Any const& aNewValue, com::sun::star::uno::Any const& aOldValue)
-: NodeChangeImpl(true)
-, m_aNewValue(aNewValue)			
-, m_aOldValue(aOldValue)
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueChangeImpl::~ValueChangeImpl()
-{
-}
-//-----------------------------------------------------------------------------
-
-void ValueChangeImpl::setTarget(view::GroupNode const& _aParentNode, rtl::OUString const& sNodeName)
-{
-    OSL_ENSURE(sNodeName.getLength() != 0, "ValueChangeTarget is being set without a name");
-
-    NodeChangeImpl::setTarget(_aParentNode.node());
-    m_aName = sNodeName;
-}
-//-----------------------------------------------------------------------------
-
-void ValueChangeImpl::setTarget(rtl::Reference<Tree> const& aAffectedTree, unsigned int nParentNode, rtl::OUString const& sNodeName)
-{
-    OSL_ENSURE(sNodeName.getLength() != 0, "ValueChangeTarget is being set without a name");
-
-    NodeChangeImpl::setTarget(aAffectedTree,nParentNode);
-    m_aName = sNodeName;
-}
-//-----------------------------------------------------------------------------
-
-RelativePath ValueChangeImpl::doGetChangingNodePath(sal_uInt32 ) const
-{
-    return RelativePath( Path::wrapSimpleName(m_aName) );
-}
-//-----------------------------------------------------------------------------
-
-bool ValueChangeImpl::doIsChangingSubnode() const
-{
-    return m_aName.getLength() != 0;
-}
-//-----------------------------------------------------------------------------
-
-bool ValueChangeImpl::doIsChange() const
-{
-    return !!(getNewValue() != getOldValue());
-}
-//-----------------------------------------------------------------------------
-
-bool ValueChangeImpl::doFillChange(NodeChangeData& rChange, sal_uInt32) const
-{
-    rChange.unoData.newValue = getNewValue();
-    rChange.unoData.oldValue = getOldValue();
-    return rChange.unoData.isDataChange();
-}
-//-----------------------------------------------------------------------------
-
-void ValueChangeImpl::doTest( view::Node const& rTarget)
-{
-    view::ViewTreeAccess aTargetView = getTargetView();
-
-    OSL_ENSURE(rTarget.isGroupNode(), "ERROR: Configuration: Target type mismatch: expected a group node holding the value");
-    
-    ValueMemberNode aValueTarget = aTargetView.getValue( view::GroupNode(rTarget), m_aName );
-
-    OSL_ENSURE(aValueTarget.isValid(), "ERROR: Configuration: Target missing: could not find the changing value");
-
-    preCheckValue(aValueTarget, m_aOldValue, m_aNewValue);
-}
-//-----------------------------------------------------------------------------
-
-void ValueChangeImpl::doApply( view::Node const& rTarget)
-{
-    view::ViewTreeAccess aTargetView = getTargetView();
-
-    OSL_ENSURE(rTarget.isGroupNode(), "ERROR: Configuration: Target type mismatch: expected a group node holding the value");
-    
-    ValueMemberUpdate aValueTarget = aTargetView.getValueForUpdate( view::GroupNode(rTarget), m_aName );
-
-    OSL_ENSURE(aValueTarget.isValid(), "ERROR: Configuration: Target missing: could not find the changing value");
-
-    doApplyChange(aValueTarget);
-    configmgr::configuration::ValueMemberNode aNode(aValueTarget.getNode());
-    postCheckValue(aNode, m_aNewValue); // Sideeffect: m_aNewValue will be changed
-}
-//-----------------------------------------------------------------------------
-
-void ValueChangeImpl::preCheckValue(ValueMemberNode& rNode, com::sun::star::uno::Any& rOld, com::sun::star::uno::Any& )
-{
-    com::sun::star::uno::Any aPrevValue = rNode.getValue();
-    OSL_ENSURE(!rOld.hasValue() || rOld == aPrevValue, "ERROR: Configuration: Stored old value of target does not match the actual value");
-    rOld = aPrevValue;
-}
-//-----------------------------------------------------------------------------
-
-void ValueChangeImpl::postCheckValue(ValueMemberNode& rNode, com::sun::star::uno::Any& rNew)
-{
-    com::sun::star::uno::Any aResultValue = rNode.getValue();
-    OSL_ENSURE(!rNew.hasValue() || rNew == aResultValue, "ERROR: Configuration: New value of target does not match the predicted result");
-    rNew = aResultValue;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Value operations: ValueReplaceImpl = set local value
-//-----------------------------------------------------------------------------
-
-ValueReplaceImpl::ValueReplaceImpl(com::sun::star::uno::Any const& aNewValue)
-:ValueChangeImpl(aNewValue) 
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueReplaceImpl::ValueReplaceImpl(com::sun::star::uno::Any const& aNewValue, com::sun::star::uno::Any const& aOldValue)
-:ValueChangeImpl(aNewValue, aOldValue) 
-{
-}
-//-----------------------------------------------------------------------------
-
-void ValueReplaceImpl::doApplyChange( ValueMemberUpdate& rNode)
-{
-    rNode.setValue(getNewValue());
-}
-//-----------------------------------------------------------------------------
-
-bool ValueReplaceImpl::doFillChange( NodeChangeData& rChange, sal_uInt32 _ix) const
-{
-    rChange.type = NodeChangeData::eSetValue;
-    return ValueChangeImpl::doFillChange(rChange, _ix);
-}
-
-//-----------------------------------------------------------------------------
-// Value operations: ValueResetImpl = set to default
-//-----------------------------------------------------------------------------
-
-ValueResetImpl::ValueResetImpl()
-:ValueChangeImpl() 
-, m_bTargetIsDefault(false)
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueResetImpl::ValueResetImpl(com::sun::star::uno::Any const& aNewValue, com::sun::star::uno::Any const& aOldValue)
-:ValueChangeImpl(aNewValue, aOldValue) 
-, m_bTargetIsDefault(false)
-{
-}
-//-----------------------------------------------------------------------------
-
-void ValueResetImpl::doApplyChange( ValueMemberUpdate& rNode)
-{
-    rNode.setDefault();
-}
-//-----------------------------------------------------------------------------
-
-bool ValueResetImpl::doIsChange() const
-{
-    return !m_bTargetIsDefault;
-}
-//-----------------------------------------------------------------------------
-
-bool ValueResetImpl::doFillChange( NodeChangeData& rChange, sal_uInt32 _ix) const
-{
-    rChange.type = NodeChangeData::eSetDefault;
-    ValueChangeImpl::doFillChange(rChange,_ix);
-    return !m_bTargetIsDefault && !rChange.isEmptyChange(); // do it defensively here - default (= 'new') may be unknown still
-}
-//-----------------------------------------------------------------------------
-
-void ValueResetImpl::preCheckValue(ValueMemberNode& rNode, com::sun::star::uno::Any& rOld, com::sun::star::uno::Any& rNew)
-{
-    ValueChangeImpl::preCheckValue(rNode,rOld,rNew);
-
-    com::sun::star::uno::Any aDefaultValue = rNode.getDefaultValue();
-    OSL_ENSURE(!rNew.hasValue() || rNew == aDefaultValue, "ERROR: Configuration: Stored new value of target does not match the actual default value");
-    rNew = aDefaultValue;
-    m_bTargetIsDefault = rNode.isDefault();
-}
-
-//-----------------------------------------------------------------------------
-// All Set Changes: SetChangeImpl - common base
-//-----------------------------------------------------------------------------
-
-SetChangeImpl::SetChangeImpl(bool bNoCheck)
-: NodeChangeImpl(bNoCheck)
-{
-}
-//-----------------------------------------------------------------------------
-
-bool SetChangeImpl::doIsChangingSubnode() const
-{
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// Resetting a set to its default state
-//-----------------------------------------------------------------------------
-
-SetResetImpl::SetResetImpl(
-    SetElementFactory& _rElementFactory,
-    std::auto_ptr<ISubtree> _pDefaultData, 
-    bool _bNoCheck
-)
-: SetChangeImpl(_bNoCheck)
-, m_aDefaultData(_pDefaultData)
-, m_rElementFactory(_rElementFactory)
-, m_aTreeChanges()
-{
-}
-//-----------------------------------------------------------------------------
-
-SetResetImpl::~SetResetImpl()
-{
-}
-//-----------------------------------------------------------------------------
-
-RelativePath SetResetImpl::doGetChangingNodePath(sal_uInt32 _ix) const
-{
-    OSL_ENSURE( _ix < m_aTreeChanges.size() || _ix == scCommonBase, "Illegal Change index" );
-    OSL_ASSERT( static_cast<size_t>(scCommonBase) > m_aTreeChanges.size() );
-
-    if ( _ix < m_aTreeChanges.size() )
-        return RelativePath( m_aTreeChanges[_ix].m_aElementName);
-
-    else
-        return RelativePath();
-}
-//-----------------------------------------------------------------------------
-
-static NodeChangeData::Type getChangeType(ElementTreeChange const& aChange)
-{
-    sal_Bool bHasNew = aChange.m_aAddedElement.is();
-    sal_Bool bHasOld = aChange.m_aRemovedElement.is();
-
-    NodeChangeData::Type aResult;
-     if (bHasNew)
-        aResult = bHasOld ? NodeChangeData::eReplaceElement : NodeChangeData::eInsertElement;
-    else
-        aResult = bHasOld ? NodeChangeData::eRemoveElement : NodeChangeData::eSetDefault;
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-bool SetResetImpl::doIsChange() const
-{
-    return !m_aTreeChanges.empty() || m_aDefaultData.get();
-} 
-//-----------------------------------------------------------------------------
-
-bool SetResetImpl::doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const
-{
-    OSL_ENSURE( _ix < m_aTreeChanges.size() || _ix == scCommonBase, "Illegal Change index" );
-    if (_ix >= m_aTreeChanges.size()) 
-    {
-        rChange.type = NodeChangeData::eResetSetDefault;
-        return m_aDefaultData.get() != NULL;
-    }
-    ElementTreeChange const& aChange = m_aTreeChanges[_ix];
-
-    rChange.type = getChangeType(aChange);
-
-    rChange.element.newValue =  aChange.m_aAddedElement;
-    rChange.element.oldValue =  aChange.m_aRemovedElement;
-
-    return true;
-} 
-//-----------------------------------------------------------------------------
-
-void SetResetImpl::doTest( view::Node const& rTarget)
-{
-    if ( m_aDefaultData.get() )
-    {
-        view::ViewTreeAccess accessor = this->getTargetView();
-
-        view::SetNode aTargetSet(rTarget);
-
-        std::auto_ptr<SubtreeChange> pChanges = accessor.differenceToDefaultState(aTargetSet, *m_aDefaultData);
-
-        if (pChanges.get())
-        {
-            for (SubtreeChange::MutatingChildIterator   it = pChanges->begin_changes(), 
-                                                        stop = pChanges->end_changes();
-                 it != stop;
-                 ++it)
-            {
-                rtl::OUString aName(it->getNodeName());
-
-                SetEntry anExistingEntry = accessor.findElement(aTargetSet,aName);
-
-                rtl::Reference<ElementTree> aOldTree = anExistingEntry.tree();
-                rtl::Reference<ElementTree> aNewTree;
-
-                if (AddNode * addNode = dynamic_cast< AddNode * >(&*it))
-                {
-                    rtl::Reference< data::TreeSegment > pAddedNode = addNode->getNewTree();
-
-                    OSL_ENSURE(pAddedNode.is(), "Processing an addNode to default - no node to add");
-
-                    aNewTree = m_rElementFactory.instantiateOnDefault(pAddedNode,accessor.getElementTemplate(aTargetSet)).get();
-                }
-                
-                
-                Path::Component aFullName = 
-                                    aNewTree.is() ? aNewTree->getExtendedRootName() :
-                                    aOldTree.is() ? aOldTree->getExtendedRootName() :
-                                    Path::makeCompositeName(aName,accessor.getElementTemplate(aTargetSet)->getName());
-
-                OSL_ENSURE(aOldTree.is() || aNewTree.is(), "No data for change to default");
-
-                m_aTreeChanges.push_back(ElementTreeChange(aFullName,aNewTree,aOldTree));
-            }
-        }
-
-        m_aDefaultData.reset();
-    }
-}
-//-----------------------------------------------------------------------------
-
-void SetResetImpl::doApply( view::Node const& rTarget)
-{
-    view::ViewTreeAccess accessor = this->getTargetView();
-
-    view::SetNode aTargetSet(rTarget);
-
-    for (std::vector< ElementTreeChange >::iterator it = m_aTreeChanges.begin(); it != m_aTreeChanges.end(); ++it)
-    {
-        rtl::OUString aElementName = it->m_aElementName.getName();
-
-        if (it->m_aRemovedElement.is())
-            accessor.removeElement(aTargetSet, aElementName);
-
-        if (it->m_aAddedElement.is())
-        {
-            SetEntry aNewEntry( it->m_aAddedElement.get() );
-            accessor.insertElement(aTargetSet, aElementName, aNewEntry);
-        }
-
-        OSL_ENSURE(getChangeType(*it) != NodeChangeData::eSetDefault,
-                    "Cannot apply change without data");
-    }
-}
-
-//-----------------------------------------------------------------------------
-// All Set Changes affecting a single element: SetElementChangeImpl - common base
-//-----------------------------------------------------------------------------
-
-SetElementChangeImpl::SetElementChangeImpl(Path::Component const& aName, bool bNoCheck)
-: SetChangeImpl(bNoCheck)
-, m_aName(aName)
-{
-}
-//-----------------------------------------------------------------------------
-
-RelativePath SetElementChangeImpl::doGetChangingNodePath(sal_uInt32 ) const
-{
-    return RelativePath(getFullElementName());
-}
-//-----------------------------------------------------------------------------
-
-void SetElementChangeImpl::doTest( view::Node const& rTarget)
-{
-    doTestElement(view::SetNode(rTarget), getElementName() );
-}
-//-----------------------------------------------------------------------------
-
-void SetElementChangeImpl::doApply( view::Node const& rTarget)
-{
-    doApplyToElement(view::SetNode(rTarget), getElementName() );
-}
-
-//-----------------------------------------------------------------------------
-// Full Sets: SetInsertTreeImpl
-//-----------------------------------------------------------------------------
-
-SetInsertImpl::SetInsertImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aNewTree, bool bNoCheck)
-: SetElementChangeImpl(aName,bNoCheck)
-, m_aNewTree(aNewTree)
-{
-} 
-//-----------------------------------------------------------------------------
-
-bool SetInsertImpl::doIsChange() const
-{
-    return !!m_aNewTree.is();
-} 
-//-----------------------------------------------------------------------------
-
-bool SetInsertImpl::doFillChange(NodeChangeData& rChange, sal_uInt32) const
-{
-    rChange.type = NodeChangeData::eInsertElement;
-    if (m_aNewTree.is()) 
-        rChange.element.newValue = m_aNewTree;
-    
-    return isChange(true);
-} 
-//-----------------------------------------------------------------------------
-
-void SetInsertImpl::doTestElement( view::SetNode const& _aNode, rtl::OUString const& aName)
-{
-    SetEntry anEntry = getTargetView().findElement(_aNode,aName); // require loaded children
-    OSL_ENSURE(!anEntry.isValid(), "ERROR: Configuration: Adding a node that already exists"); 
-}
-//-----------------------------------------------------------------------------
-
-void SetInsertImpl::doApplyToElement( view::SetNode const& _aNode, rtl::OUString const& aName)
-{
-    if (m_aNewTree.is()) 
-    {
-        SetEntry aNewEntry( m_aNewTree.get() );
-        getTargetView().insertElement( _aNode, aName, aNewEntry);
-    }
-} 
-
-//-----------------------------------------------------------------------------
-// Full Sets: SetReplaceTreeImpl
-//-----------------------------------------------------------------------------
-
-SetReplaceImpl::SetReplaceImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aNewTree)
-: SetElementChangeImpl(aName)
-, m_aNewTree(aNewTree)
-, m_aOldTree()
-{
-} 
-//-----------------------------------------------------------------------------
-
-SetReplaceImpl::SetReplaceImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aNewTree, rtl::Reference<ElementTree> const& aOldTree)
-: SetElementChangeImpl(aName,true)
-, m_aNewTree(aNewTree)
-, m_aOldTree(aOldTree)
-{
-} 
-//-----------------------------------------------------------------------------
-
-/// checks, if this represents an actual change
-bool SetReplaceImpl::doIsChange() const
-{
-    return !(m_aOldTree == m_aNewTree);
-} 
-//-----------------------------------------------------------------------------
-
-/// fills in pre- and post-change values, returns wether they differ
-bool SetReplaceImpl::doFillChange(NodeChangeData& rChange, sal_uInt32) const
-{
-    rChange.type = NodeChangeData::eReplaceElement;
-    if (m_aNewTree.is()) 
-        rChange.element.newValue =  m_aNewTree;
-
-    if (m_aOldTree.is()) 
-        rChange.element.oldValue = m_aOldTree;
-    
-    return isChange(true);
-} 
-//-----------------------------------------------------------------------------
-
-void SetReplaceImpl::doTestElement( view::SetNode const& _aNode, rtl::OUString const& aName)
-{
-    OSL_ASSERT(!m_aOldTree.is()); // already tested ?
-
-    // remove the old node
-    SetEntry anEntry = getTargetView().findElement(_aNode,aName); // require loaded children
-    OSL_ENSURE(anEntry.isValid(), "ERROR: Configuration: Replacing a node that doesn't exist"); 
-
-    m_aOldTree = anEntry.tree();
-} 
-//-----------------------------------------------------------------------------
-
-void SetReplaceImpl::doApplyToElement( view::SetNode const& _aNode, rtl::OUString const& aName)
-{
-    if (m_aOldTree != m_aNewTree)
-    {
-        view::ViewTreeAccess aTargetView = this->getTargetView();
-
-        OSL_ENSURE(m_aOldTree.is(), "ERROR: Configuration: Replacing a node that doesn't exist"); 
-        aTargetView.removeElement(_aNode, aName);
-
-    // add the new one
-        OSL_ENSURE(m_aNewTree.is(), "ERROR: Configuration: Replacing a node with nothing"); 
-        if (m_aNewTree.is()) 
-        {
-            SetEntry aNewEntry( m_aNewTree.get() );
-            aTargetView.insertElement( _aNode, aName, aNewEntry);
-        }
-    }
-} 
-
-//-----------------------------------------------------------------------------
-// Full Sets: SetRemoveTreeImpl
-//-----------------------------------------------------------------------------
-
-SetRemoveImpl::SetRemoveImpl(Path::Component const& aName)
-: SetElementChangeImpl(aName)
-, m_aOldTree()
-{
-} 
-//-----------------------------------------------------------------------------
-
-SetRemoveImpl::SetRemoveImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aOldTree)
-: SetElementChangeImpl(aName,true)
-, m_aOldTree(aOldTree)
-{
-} 
-//-----------------------------------------------------------------------------
-
-/// checks, if this represents an actual change
-bool SetRemoveImpl::doIsChange() const
-{
-    return !!m_aOldTree.is();
-} 
-//-----------------------------------------------------------------------------
-
-/// fills in pre- and post-change values, returns wether they differ
-bool SetRemoveImpl::doFillChange(NodeChangeData& rChange, sal_uInt32) const
-{
-    rChange.type = NodeChangeData::eRemoveElement;
-    if (m_aOldTree.is()) 
-        rChange.element.oldValue = m_aOldTree;
-    
-    return isChange(true);
-} 
-//-----------------------------------------------------------------------------
-
-void SetRemoveImpl::doTestElement( view::SetNode const& _aNode, rtl::OUString const& aName)
-{
-    OSL_ASSERT(!m_aOldTree.is()); // already tested ?
-
-    // remove the old node
-    SetEntry anEntry = getTargetView().findElement(_aNode,aName); // require loaded children
-    OSL_ENSURE(anEntry.isValid(), "ERROR: Configuration: Removing a node that doesn't exist"); 
-
-    m_aOldTree = anEntry.tree();
-}
-//-----------------------------------------------------------------------------
-
-void SetRemoveImpl::doApplyToElement( view::SetNode const& _aNode, rtl::OUString const& aName)
-{
-    getTargetView().removeElement(_aNode, aName);
-} 
-
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/nodechangeimpl.hxx b/configmgr/source/treemgr/nodechangeimpl.hxx
deleted file mode 100644
index 5040b7d214..0000000000
--- a/configmgr/source/treemgr/nodechangeimpl.hxx
+++ /dev/null
@@ -1,432 +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: nodechangeimpl.hxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGCHANGEIMPL_HXX_
-#define CONFIGMGR_CONFIGCHANGEIMPL_HXX_
-
-#include "configexcept.hxx"
-#include "configpath.hxx"
-#include "viewaccess.hxx"
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#include "utility.hxx"
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-    class ISubtree;
-
-    namespace view { class ViewTreeAccess; struct Node; struct GroupNode; struct SetNode; }
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-        class ValueMemberNode;
-        class ValueMemberUpdate;
-//-----------------------------------------------------------------------------
-        class NodeChangeData;
-        class NodeChangeLocation;
-        class NodeChangeInformation;
-//-----------------------------------------------------------------------------
-        struct ElementTreeChange 
-        { 
-            Path::Component m_aElementName;
-            rtl::Reference<ElementTree>  m_aAddedElement; 
-            rtl::Reference<ElementTree>  m_aRemovedElement; 
-            
-            ElementTreeChange(
-                Path::Component const& _aElementName,
-                rtl::Reference<ElementTree>  const& _aAddedElement,
-                rtl::Reference<ElementTree>  const& _aRemovedElement
-             )
-            : m_aElementName(_aElementName)
-            , m_aAddedElement(_aAddedElement)
-            , m_aRemovedElement(_aRemovedElement)
-            {}
-
-            bool isChange() const
-            {
-                return !!(m_aAddedElement != m_aRemovedElement);
-            }
-        };
-//-----------------------------------------------------------------------------
-
-
-        /// represents a node position in some tree
-        class NodeChangeImpl 
-        : public salhelper::SimpleReferenceObject
-        {
-        public:
-            explicit
-            NodeChangeImpl(bool bNoCheck = false); 
-
-        public:
-        // related/affected nodes and trees
-            /// the tree within which the change occurs
-            rtl::Reference<Tree> getTargetTree() const;
-
-            /// the node that is affected by the change
-            unsigned int getTargetNode() const;
-
-        protected:
-            /// setup the 'target' node that is to be affected or changed
-            void setTarget(rtl::Reference<Tree> const& _aAffectedTree, unsigned int _nAffectedNode);
-            void setTarget(view::Node _aAffectedNode);
-
-            view::ViewTreeAccess getTargetView();
-        public:
-        // getting information
-            /*static const sal_uInt32*/ enum { scCommonBase = ~0u };
-
-            /// checks, if this represents an actual change - with or without requiring a preceding test
-            bool isChange(bool bAllowUntested) const;
-
-            /// return the number of distict changes in this object
-            sal_uInt32 getChangeDataCount() const;
-
-            /// fills in base change location, returns whether it is set
-            bool fillChangeLocation(NodeChangeLocation& rChange, sal_uInt32 _ix = scCommonBase) const;
-
-            /// fills in pre- and post-change values, returns whether they may differ
-            bool fillChangeData(NodeChangeData& rChange, sal_uInt32 _ix) const;
-
-            /// fills in change location and values, returns whether data may be changed
-            bool fillChangeInfo(NodeChangeInformation& rChange, sal_uInt32 _ix) const;
-
-        /// test whether this really is a change to the stored 'changing' node
-            void test();
-
-        /// apply this change to the stored 'changing' node
-            void apply();
-
-        private:
-        /// virtual hooks for some of the public methods
-            /// return the number of distict changes in this object
-            sal_uInt32 doGetChangeCount() const;
-
-            /// the path from base to 'changing' node 
-            virtual RelativePath doGetChangingNodePath(sal_uInt32 _ix) const = 0;
-
-            /// is the change really affecting a child (or children) of the affected node (true for values) 
-            virtual bool doIsChangingSubnode() const = 0;
-
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const = 0;
-
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const = 0;
-
-            /// dry-check whether this is a change
-            virtual void doTest( view::Node const& rTarget) = 0;
-            /// do apply the actual change
-            virtual void doApply( view::Node const& rTarget) = 0;
-
-        private:
-            rtl::Reference<Tree> m_aAffectedTree;
-            unsigned int m_nAffectedNode;
-            sal_uInt16      m_nState;
-
-            void implApply();
-            view::Node implGetTarget();
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents a node position in some tree
-        class ValueChangeImpl 
-        : public NodeChangeImpl 
-        {
-            rtl::OUString m_aName;
-            com::sun::star::uno::Any m_aNewValue;
-            com::sun::star::uno::Any m_aOldValue;
-        public:
-            explicit ValueChangeImpl(); 
-            explicit ValueChangeImpl(com::sun::star::uno::Any const& aNewValue); 
-            explicit ValueChangeImpl(com::sun::star::uno::Any const& aNewValue, com::sun::star::uno::Any const& aOldValue); 
-            ~ValueChangeImpl();
-
-        public:
-            /// setup the 'target' node that is to be affected or changed
-            void setTarget(view::GroupNode const& _aParentNode, rtl::OUString const& sNodeName);
-            void setTarget(rtl::Reference<Tree> const& aAffectedTree, unsigned int nParentNode, rtl::OUString const& sNodeName);
-
-        public:
-            /// get the name of the value
-            rtl::OUString getValueName() const { return m_aName; }
-
-            /// get the pre-change value (if known)
-            com::sun::star::uno::Any getOldValue() const { return m_aOldValue; }
-            /// get the post-change value (if known)
-            com::sun::star::uno::Any getNewValue() const { return m_aNewValue; }
-
-        protected:
-                     using NodeChangeImpl::setTarget;
-        // override information items
-            /// the path from base to 'affected' node - here is the name of the changing node
-            virtual RelativePath doGetChangingNodePath(sal_uInt32 _ix) const;
-
-            /// is the change really affecting a child of the affected node (true here) 
-            virtual bool doIsChangingSubnode() const;
-
-        protected:
-        // override change information items
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const;
-
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const = 0;
-
-        protected:
-        // override apply functionality
-            /// retrieve the old value from the given node
-            virtual void doTest( view::Node const& rTarget);
-            /// do apply the actual change
-            virtual void doApply( view::Node const& rTarget);
-
-        protected:
-        // new overrideables
-            /// extract the pre-change value from the target context
-            virtual void preCheckValue(ValueMemberNode& rNode, com::sun::star::uno::Any& rOld, com::sun::star::uno::Any& rNew);
-            /// extract the post-change value from the target context
-            virtual void postCheckValue(ValueMemberNode& rNode, com::sun::star::uno::Any& rNew);
-            /// apply the new value to the target context
-            virtual void doApplyChange(ValueMemberUpdate& rNode) = 0;
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents setting a value node to a given value
-        class ValueReplaceImpl 
-        : public ValueChangeImpl 
-        {
-        public:
-            explicit ValueReplaceImpl(com::sun::star::uno::Any const& aNewValue); 
-            explicit ValueReplaceImpl(com::sun::star::uno::Any const& aNewValue, com::sun::star::uno::Any const& aOldValue); 
-
-        protected:
-            // implement: set the target to the new value
-            virtual void doApplyChange( ValueMemberUpdate& rNode);
-
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const;
-
-//			friend class SetReplaceValueImpl;
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents resetting a value node to its default value
-        class ValueResetImpl 
-        : public ValueChangeImpl 
-        {
-            bool m_bTargetIsDefault;
-        public:
-            explicit ValueResetImpl(); 
-            explicit ValueResetImpl(com::sun::star::uno::Any const& aNewValue, com::sun::star::uno::Any const& aOldValue); 
-
-        protected:
-            // override: set the new value as well and check the default state
-            virtual void preCheckValue(ValueMemberNode& rNode, com::sun::star::uno::Any& rOld, com::sun::star::uno::Any& rNew);
-
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const;
-
-            // implement: set the target to default
-            virtual void doApplyChange( ValueMemberUpdate& rNode);
-
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const;
-        };
-//-----------------------------------------------------------------------------
-
-
-        /// represents a change to a set (as a container)
-        class SetChangeImpl 
-        : public NodeChangeImpl 
-        {
-        public:
-            explicit SetChangeImpl(bool bNoCheck = false);
-
-            using NodeChangeImpl::setTarget;
-
-        protected:
-        /// virtual hooks for some of the public methods
-            /// is the change really affecting a child of the affected node (false here) 
-            virtual bool doIsChangingSubnode() const;
-        };
-//-----------------------------------------------------------------------------
-        class SetElementFactory;
-
-        /// represents setting to its default state a set (as a container)
-        class SetResetImpl 
-        : public SetChangeImpl 
-        {
-            std::auto_ptr<ISubtree>             m_aDefaultData;
-            SetElementFactory&                  m_rElementFactory;
-            std::vector< ElementTreeChange >                         m_aTreeChanges;
-        public:
-            explicit SetResetImpl(
-                SetElementFactory& _rElementFactory,
-                std::auto_ptr<ISubtree> _pDefaultData, 
-                bool _bNoCheck = false);
-
-            ~SetResetImpl();
-
-        protected:
-        /// virtual hooks for some of the public methods
-            /// retrieve the count of elements affected
-            sal_uInt32 doGetChangeCount() const;
-
-            /// the path from base to 'affected' node 
-            virtual RelativePath doGetChangingNodePath(sal_uInt32 _ix) const;
-
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const;
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const;
-
-
-            /// retrieve the old value from the given node
-            virtual void doTest( view::Node const& rTarget);
-            /// do apply the actual change
-            virtual void doApply( view::Node const& rTarget);
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents a change to an element of a set (as a container)
-        class SetElementChangeImpl 
-        : public SetChangeImpl 
-        {
-            Path::Component m_aName;
-        public:
-            explicit SetElementChangeImpl(Path::Component const& aName, bool bNoCheck = false);
-
-            /// the name of the element being changed
-            Path::Component getFullElementName() const { return m_aName; }
-
-            /// the name of the element being changed
-            rtl::OUString getElementName() const { return m_aName.getName(); }
-
-        protected:
-        /// virtual hooks for some of the public methods
-            /// the path from base to 'affected' node - use element name
-            virtual RelativePath doGetChangingNodePath(sal_uInt32 _ix) const;
-
-            /// retrieve the old value from the given node
-            virtual void doTest( view::Node const& rTarget);
-            /// do apply the actual change
-            virtual void doApply( view::Node const& rTarget);
-
-        private:
-            /// new overridable: retrieve the old value from a properly typed node
-            virtual void doTestElement(view::SetNode const& _aNode, rtl::OUString const& aName) = 0;
-            /// new overridable: apply the change to a properly typed node
-            virtual void doApplyToElement(view::SetNode const& _aNode, rtl::OUString const& aName) = 0;
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents an insertion into a set of trees
-        class SetInsertImpl 
-        : public SetElementChangeImpl 
-        {
-            rtl::Reference<ElementTree> m_aNewTree;
-        public:
-            explicit SetInsertImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aNewTree, bool bNoCheck = false); 
-
-        protected:
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const;
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const;
-
-            /// new overridable: retrieve the old value from a properly typed node
-            virtual void doTestElement(view::SetNode const& _aNode, rtl::OUString const& aName);
-            /// new overridable: apply the change to a properly typed node
-            virtual void doApplyToElement(view::SetNode const& _aNode, rtl::OUString const& aName);
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents a substitution within a set of trees
-        class SetReplaceImpl 
-        : public SetElementChangeImpl 
-        {
-            rtl::Reference<ElementTree> m_aNewTree;
-            rtl::Reference<ElementTree> m_aOldTree;
-        public:
-            explicit SetReplaceImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aNewTree); 
-            explicit SetReplaceImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aNewTree, rtl::Reference<ElementTree> const& aOldTree); 
-
-        protected:
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const;
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const;
-
-            /// new overridable: retrieve the old value from a properly typed node
-            virtual void doTestElement(view::SetNode const& _aNode, rtl::OUString const& aName);
-            /// new overridable: apply the change to a properly typed node
-            virtual void doApplyToElement(view::SetNode const& _aNode, rtl::OUString const& aName);
-        };
-//-----------------------------------------------------------------------------
-
-        /// represents a removal from of a set of trees
-        class SetRemoveImpl 
-        : public SetElementChangeImpl 
-        {
-            rtl::Reference<ElementTree> m_aOldTree;
-        public:
-            explicit SetRemoveImpl(Path::Component const& aName); 
-            explicit SetRemoveImpl(Path::Component const& aName, rtl::Reference<ElementTree> const& aOldTree); 
-
-        protected:
-            /// checks, if this represents an actual change (given whether the change has been applied or not)
-            virtual bool doIsChange() const;
-            /// fills in pre- and post-change values, returns wether they differ
-            virtual bool doFillChange(NodeChangeData& rChange, sal_uInt32 _ix) const;
-
-            /// new overridable: retrieve the old value from a properly typed node
-            virtual void doTestElement(view::SetNode const& _aNode, rtl::OUString const& aName);
-            /// new overridable: apply the change to a properly typed node
-            virtual void doApplyToElement(view::SetNode const& _aNode, rtl::OUString const& aName);
-        };
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGCHANGEIMPL_HXX_
diff --git a/configmgr/source/treemgr/nodechangeinfo.cxx b/configmgr/source/treemgr/nodechangeinfo.cxx
deleted file mode 100644
index 9a6a0c21c6..0000000000
--- a/configmgr/source/treemgr/nodechangeinfo.cxx
+++ /dev/null
@@ -1,224 +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: nodechangeinfo.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_configmgr.hxx"
-
-#include "nodechangeinfo.hxx"
-
-#include "noderef.hxx"
-#include "tree.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {	
-//-----------------------------------------------------------------------------
-
-NodeChangeData::NodeChangeData()
-: type(eNoChange)
-, unoData()
-, element()
-{
-}
-//-----------------------------------------------------------------------------
-        
-NodeChangeData::NodeChangeData(NodeChangeData const& aOther)
-: type(aOther.type)
-, unoData(aOther.unoData)
-, element(aOther.element)
-{
-}
-//-----------------------------------------------------------------------------
-        
-NodeChangeData& NodeChangeData::operator=(NodeChangeData const& aOther)
-{
-    type		= aOther.type;
-    unoData		= aOther.unoData;
-    element		= aOther.element;
-    return *this;
-}
-//-----------------------------------------------------------------------------
-        
-NodeChangeData::~NodeChangeData()
-{
-}
-//-----------------------------------------------------------------------------
-        
-bool NodeChangeData::isDataChange() const
-{
-    if (isSetChange() && element.isDataChange())
-        return true;
-    
-    return unoData.isDataChange();
-}
-//-----------------------------------------------------------------------------
-        
-rtl::Reference< Tree > NodeChangeData::getNewElementTree() const
-{
-    return element.newValue.get();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< Tree > NodeChangeData::getOldElementTree() const
-{
-    return element.oldValue.get();
-}
-//-----------------------------------------------------------------------------
-
-NodeID NodeChangeData::getNewElementNodeID() const
-{
-    rtl::Reference<ElementTree> newElement = this->element.newValue;
-    if ( newElement.is() &&  newElement->nodeCount() > 0)
-    {
-        return NodeID( newElement.get(), Tree::ROOT );
-    }
-    else
-        return NodeID(0,0);
-}
-//-----------------------------------------------------------------------------
-
-NodeID NodeChangeData::getOldElementNodeID() const
-{
-    rtl::Reference<ElementTree> oldElement = this->element.oldValue;
-    if ( oldElement.is() &&  oldElement->nodeCount() > 0)
-    {
-        return NodeID( oldElement.get(), Tree::ROOT );
-    }
-    else
-        return NodeID(0,0);
-}
-//-----------------------------------------------------------------------------
-
-NodeChangeLocation::NodeChangeLocation()
-: m_path()
-, m_base(0,0)
-, m_affected(0,0)
-, m_bSubNodeChanging(false)
-{
-}
-//-----------------------------------------------------------------------------
-bool NodeChangeLocation::isValidLocation() const
-{
-    return	 m_base.isValidNode() && 
-            (m_affected.isEmpty() 
-                ?	! m_bSubNodeChanging
-                :	( m_affected.isValidNode() && 
-                      (! m_bSubNodeChanging || 
-                         (!m_path.isEmpty() && 
-                            SubNodeID(m_affected,m_path.getLocalName().getName()).isValidNode()
-                    ) )  ) );
-}
-#if OSL_DEBUG_LEVEL > 0
-//-----------------------------------------------------------------------------
-bool NodeChangeLocation::isValidData() const
-{
-    return	 m_base.isValidNode() && 
-            (m_affected.isEmpty() 
-                ?	! m_bSubNodeChanging
-                :	( m_affected.isValidNode() && 
-                      (! m_bSubNodeChanging || !m_path.isEmpty() )
-            )       );
-}
-#endif
-//-----------------------------------------------------------------------------
-
-void NodeChangeLocation::setAccessor(RelativePath const& aAccessor)
-{
-    m_path = aAccessor;
-}
-//-----------------------------------------------------------------------------
-
-void NodeChangeLocation::setBase(NodeID const& aBaseNode)
-{
-    m_base = aBaseNode;
-}
-//-----------------------------------------------------------------------------
-
-void NodeChangeLocation::setAffected(NodeID const& aTargetNode)
-{
-    m_affected = aTargetNode;
-
-    if (m_base.isEmpty())
-        setBase(aTargetNode);
-}
-//-----------------------------------------------------------------------------
-
-void NodeChangeLocation::setChangingSubnode( bool bSubnode )
-{
-    OSL_ENSURE(!m_affected.isEmpty() || !bSubnode, "Change without target cannot affect subnode");
-
-    m_bSubNodeChanging = bSubnode;
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< Tree > NodeChangeLocation::getBaseTree() const
-{
-    OSL_ENSURE(m_base.isValidNode(), "Invalid base location set in NodeChangeLocation");
-    return m_base.getTree();
-}
-//-----------------------------------------------------------------------------
-
-NodeRef NodeChangeLocation::getBaseNode() const
-{
-    OSL_ENSURE(m_base.isValidNode(), "Invalid base location set in NodeChangeLocation");
-    return m_base.getNode();
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< Tree > NodeChangeLocation::getAffectedTreeRef() const
-{
-    NodeID aAffected = this->getAffectedNodeID();
-    return aAffected.getTree();
-}
-//-----------------------------------------------------------------------------
-
-NodeID NodeChangeLocation::getAffectedNodeID() const
-{
-    OSL_ENSURE(m_affected.isEmpty() || m_affected.isValidNode(), "Invalid target location set in NodeChangeLocation");
-    return m_affected;
-}
-//-----------------------------------------------------------------------------
-
-SubNodeID NodeChangeLocation::getChangingValueID() const
-{
-    if (!m_bSubNodeChanging) return SubNodeID::createEmpty();
-        
-    OSL_ENSURE(!m_affected.isEmpty() && m_affected.isValidNode(), "Invalid target location set in NodeChangeLocation with subnode");
-    OSL_ENSURE(!m_path.isEmpty(), "No target accessor set in NodeChangeLocation with subnode");
-
-    SubNodeID aResult( m_affected, m_path.getLocalName().getName() );
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/nodefactory.cxx b/configmgr/source/treemgr/nodefactory.cxx
deleted file mode 100644
index 3c9deb28ff..0000000000
--- a/configmgr/source/treemgr/nodefactory.cxx
+++ /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: nodefactory.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_configmgr.hxx"
-#include <stdio.h>
-#include "nodefactory.hxx"
-#include "nodeimplobj.hxx"
-#include "configpath.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-namespace view 
-{ 
-
-// Creating Specific types of nodes
-//-----------------------------------------------------------------------------
-namespace 
-{
-//---------------------------------------------------------------------
-    struct BasicNodeFactory : NodeFactory
-    {
-        rtl::Reference<configuration::NodeImpl> makeValueNode(sharable::ValueNode * node);
-        rtl::Reference<configuration::NodeImpl> makeGroupNode(sharable::GroupNode * node);
-        rtl::Reference<configuration::NodeImpl> makeSetNode(sharable::SetNode * node, configuration::Template* pTemplate);
-    };
-    //-------------------------------------------------------------------------
-
-    rtl::Reference<configuration::NodeImpl> BasicNodeFactory::makeValueNode(sharable::ValueNode * node)
-    {
-        return new configuration::ValueElementNodeImpl(node);
-    }
-    //-------------------------------------------------------------------------
-
-    rtl::Reference<configuration::NodeImpl> BasicNodeFactory::makeGroupNode(sharable::GroupNode * node)
-    {
-        return new configuration::GroupNodeImpl(node);
-    }
-    //-------------------------------------------------------------------------
-
-    rtl::Reference<configuration::NodeImpl> BasicNodeFactory::makeSetNode(sharable::SetNode * node, configuration::Template* pTemplate)
-    {
-        return new configuration::SetNodeImpl(node, pTemplate);
-    }
-    //-------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-
-    struct DeferredNodeFactory : NodeFactory
-    {
-        rtl::Reference<configuration::NodeImpl> makeValueNode(sharable::ValueNode * node);
-        rtl::Reference<configuration::NodeImpl> makeGroupNode(sharable::GroupNode * node);
-        rtl::Reference<configuration::NodeImpl> makeSetNode(sharable::SetNode * node, configuration::Template* pTemplate);
-    };
-    //-------------------------------------------------------------------------
-
-    rtl::Reference<configuration::NodeImpl> DeferredNodeFactory::makeValueNode(sharable::ValueNode * node)
-    {
-    //    OSL_ENSURE(false, "Wrong factory for value elements - should be immutable (=read-only)");
-        return new configuration::ValueElementNodeImpl(node);
-    }
-    //-------------------------------------------------------------------------
-
-    rtl::Reference<configuration::NodeImpl> DeferredNodeFactory::makeGroupNode(sharable::GroupNode * node)
-    {
-        return new configuration::DeferredGroupNodeImpl(node);
-    }
-    //-------------------------------------------------------------------------
-
-    rtl::Reference<configuration::NodeImpl> DeferredNodeFactory::makeSetNode(sharable::SetNode * node, configuration::Template* pTemplate)
-    {
-        return new configuration::DeferredSetNodeImpl(node, pTemplate);
-    }
-    //-------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-} // anonymous
-//-----------------------------------------------------------------------------
-
-// Different standard (static) factories
-//---------------------------------------------------------------------
-
-    /// provides a factory for immediately commiting node implementations
-    NodeFactory& getDirectAccessFactory()
-    {
-        static BasicNodeFactory aFactory;
-        return aFactory;
-    }
-    /// provides a factory for read-only node implementations
-    NodeFactory& getReadAccessFactory()
-    {
-        static BasicNodeFactory aFactory;
-        return aFactory;
-    }
-    /// provides a factory for nodes that cache changes temporarily
-    NodeFactory& getDeferredChangeFactory()
-    {
-        static DeferredNodeFactory aFactory;
-        return aFactory;
-    }
-
-//---------------------------------------------------------------------
-} // view
-
-//-----------------------------------------------------------------------------
-} // configmgr
-
diff --git a/configmgr/source/treemgr/nodefactory.hxx b/configmgr/source/treemgr/nodefactory.hxx
deleted file mode 100644
index 73c9e9603b..0000000000
--- a/configmgr/source/treemgr/nodefactory.hxx
+++ /dev/null
@@ -1,67 +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: nodefactory.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 CONFIGMGR_CONFIGNODEFACTORY_HXX_
-#define CONFIGMGR_CONFIGNODEFACTORY_HXX_
-
-#include <rtl/ref.hxx>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-        class NodeImpl;
-        class Template;
-    }
-    namespace sharable {
-        struct GroupNode;
-        struct SetNode;
-        struct ValueNode;
-    }
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-
-// Creating Specific types of nodes
-//-----------------------------------------------------------------------------
-
-        struct NodeFactory
-        {
-            virtual rtl::Reference<configuration::NodeImpl> makeValueNode(sharable::ValueNode * node) = 0;
-            virtual rtl::Reference<configuration::NodeImpl> makeGroupNode(sharable::GroupNode * node) = 0;
-            virtual rtl::Reference<configuration::NodeImpl> makeSetNode(sharable::SetNode * node, configuration::Template* pTemplate) = 0;
-        };
-    }
-//-----------------------------------------------------------------------------
-
-}
-
-#endif // CONFIGMGR_CONFIGNODEFACTORY_HXX_
diff --git a/configmgr/source/treemgr/nodeimpl.cxx b/configmgr/source/treemgr/nodeimpl.cxx
deleted file mode 100644
index 5c4abf60be..0000000000
--- a/configmgr/source/treemgr/nodeimpl.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: nodeimpl.cxx,v $
- * $Revision: 1.26 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-#include "nodeimpl.hxx"
-#include "valuenodeimpl.hxx"
-#include "groupnodeimpl.hxx"
-#include "nodevisitor.hxx"
-#include "tree.hxx"
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "nodechangeinfo.hxx"
-#include "change.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-
-// Specific types of nodes
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class GroupNodeImpl
-//-----------------------------------------------------------------------------
-
-sharable::GroupNode * GroupNodeImpl::getDataAccess() const
-{
-    sharable::Node * node = getOriginalNodeAccess();
-    OSL_ASSERT(node != 0 && node->isGroup());
-    return &node->group;
-}
-//-----------------------------------------------------------------------------
-
-GroupNodeImpl::GroupNodeImpl(sharable::GroupNode * _pNodeRef)
-    : NodeImpl(reinterpret_cast<sharable::Node *>(_pNodeRef))
-    , m_pCache( NULL )
-{
-}
-//-----------------------------------------------------------------------------
-
-bool GroupNodeImpl::areValueDefaultsAvailable() const
-{
-    return getDataAccess()->hasDefaultsAvailable();
-}
-//-----------------------------------------------------------------------------
-
-ValueMemberNode GroupNodeImpl::makeValueMember(sharable::ValueNode * node)
-{
-    return ValueMemberNode(node);
-}
-//-----------------------------------------------------------------------------
-
-sharable::ValueNode * GroupNodeImpl::getOriginalValueNode(rtl::OUString const& _aName) const
-{
-    OSL_ENSURE( _aName.getLength() != 0, "Cannot get nameless child value");
-
-    sharable::GroupNode * group = getDataAccess();
-
-    if (m_pCache)
-    {
-        if (m_pCache->isNamed(_aName))
-            return m_pCache->valueData();
-
-        m_pCache = group->getNextChild(m_pCache);
-
-        if (m_pCache && m_pCache->isNamed(_aName))
-            return m_pCache->valueData();
-        m_pCache = NULL;
-    }
-
-    sharable::Node * child = group->getChild(_aName);
-    m_pCache = child;
-
-    // to do: investigate cache lifecycle more deeply.
-
-    return child == 0 ? 0 : child->valueData();
-}
-
-//-----------------------------------------------------------------------------
-// class ValueElementNodeImpl
-//-----------------------------------------------------------------------------
-
-sharable::ValueNode * ValueElementNodeImpl::getDataAccess() const
-{ 
-    sharable::Node * node = getOriginalNodeAccess();
-    OSL_ASSERT(node != 0 && node->isValue());
-    return &node->value;
-}
-//-----------------------------------------------------------------------------
-
-ValueElementNodeImpl::ValueElementNodeImpl(sharable::ValueNode * const& _aNodeRef)
-    : NodeImpl(reinterpret_cast<sharable::Node *>(_aNodeRef))
-{
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any	ValueElementNodeImpl::getValue() const
-{
-    return getDataAccess()->getValue();
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Type	ValueElementNodeImpl::getValueType() const
-{
-    return getDataAccess()->getValueType();
-}
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/nodeimpl.hxx b/configmgr/source/treemgr/nodeimpl.hxx
deleted file mode 100644
index e4b350c30c..0000000000
--- a/configmgr/source/treemgr/nodeimpl.hxx
+++ /dev/null
@@ -1,92 +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: nodeimpl.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_CONFIGNODEBEHAVIOR_HXX_
-#define CONFIGMGR_CONFIGNODEBEHAVIOR_HXX_
-
-#include "attributes.hxx"
-#include "node.hxx"
-#include "utility.hxx"
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace view { class ViewStrategy; }
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-    //-----------------------------------------------------------------------------
-    class Tree;
-    class NodeChange;
-    class NodeChanges;
-    class NodeChangesInformation;
-
-//-----------------------------------------------------------------------------
-// Specific types of nodes
-//-----------------------------------------------------------------------------
-
-    class NodeImpl;
-    struct INodeHandler;
-
-    // Almost an interface, but derives from concrete OReference
-    class NodeImpl : public salhelper::SimpleReferenceObject
-    {
-        friend class view::ViewStrategy;
-            sharable::Node * m_pNodeRef;
-    public:
-            NodeImpl(sharable::Node * _pNodeRef)
-        : m_pNodeRef(_pNodeRef) {}
-
-    public:
-        /// provide access to the data of the underlying node
-        sharable::Node * getOriginalNodeAccess() const
-        { return m_pNodeRef; }
-    };
-
-//-----------------------------------------------------------------------------
-        class ValueElementNodeImpl;
-        class GroupNodeImpl;
-        class SetNodeImpl;
-//-----------------------------------------------------------------------------
-
-        struct INodeHandler
-        {
-            virtual void handle( ValueElementNodeImpl& rNode) = 0;
-            virtual void handle( GroupNodeImpl& rNode) = 0;
-            virtual void handle( SetNodeImpl& rNode) = 0;
-        };
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_CONFIGNODEBEHAVIOR_HXX_
diff --git a/configmgr/source/treemgr/nodeimplobj.cxx b/configmgr/source/treemgr/nodeimplobj.cxx
deleted file mode 100644
index 128bb97baa..0000000000
--- a/configmgr/source/treemgr/nodeimplobj.cxx
+++ /dev/null
@@ -1,1165 +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: nodeimplobj.cxx,v $
- * $Revision: 1.26 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-#include "nodeimplobj.hxx"
-
-
-#include "nodechange.hxx"
-#include "nodechangeinfo.hxx"
-#include "nodechangeimpl.hxx"
-#include "valuenode.hxx"
-#include "change.hxx"
-#include "viewaccess.hxx"
-#include "viewfactory.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// Value Nodes
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class DeferredValueElementNodeImpl
-//-----------------------------------------------------------------------------
-
-// Group Nodes
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class DeferredGroupNodeImpl
-//-----------------------------------------------------------------------------
-
-DeferredGroupNodeImpl::DeferredGroupNodeImpl(sharable::GroupNode * const& _aNodeRef)
-: GroupNodeImpl(_aNodeRef)
-, m_aChanges()
-{
-}
-//-----------------------------------------------------------------------------
-
-DeferredGroupNodeImpl::~DeferredGroupNodeImpl()
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueMemberNode DeferredGroupNodeImpl::makeValueMember(rtl::OUString const& _aName, bool _bForUpdate)
-{
-    MemberChanges::iterator it = m_aChanges.find(_aName);
-    
-    if (it != m_aChanges.end())
-    {
-        if (!it->second.is())
-            OSL_ENSURE(_aName.getLength() == 0, "ERROR: Found empty change reference");
-
-        else if (_bForUpdate || it->second->isChange()) // found one
-            return ValueMemberNode(it->second);
-
-        else // leftover non-change
-            m_aChanges.erase(it);
-
-        // if not found continue with default
-    }
-    
-    sharable::ValueNode * original = getOriginalValueNode(_aName);
-
-    if (_bForUpdate) // create a new change 
-    {
-        if (original != 0)
-        {
-            rtl::Reference<ValueMemberNode::DeferredImpl> aNewChange(new ValueMemberNode::DeferredImpl(original)); 
-            m_aChanges[_aName] = aNewChange; 
-             
-            return ValueMemberNode(aNewChange);
-       }
-    }
-
-    return GroupNodeImpl::makeValueMember(original);
-}
-//-----------------------------------------------------------------------------
-
-bool DeferredGroupNodeImpl::hasChanges() const
-{
-    for (MemberChanges::const_iterator it = m_aChanges.begin(); it != m_aChanges.end(); ++it)
-    {
-        if (!it->second.is())
-        {
-            // empty element is present -> marked as changed
-            OSL_ASSERT(it->first.getLength() == 0);
-            return true;
-        }
-
-        if (it->second->isChange()) 
-            return true;
-    }
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-void DeferredGroupNodeImpl::collectValueChanges(NodeChanges& rChanges, Tree* pParentTree, unsigned int nNode) const
-{
-    for (MemberChanges::const_iterator it = m_aChanges.begin(); it != m_aChanges.end(); ++it)
-    {
-        if (it->second.is())
-        {
-            OSL_ASSERT(it->first.getLength() != 0);
-            if (ValueChangeImpl* pValueChange = it->second->collectChange())
-            {
-                pValueChange->setTarget(pParentTree,nNode,it->first);
-
-                rChanges.add( NodeChange(pValueChange) );
-            }
-            else // leftover non-change
-                OSL_ENSURE(!it->second->isChange(), "Got no change from a changing value") ;
-        }
-        else
-            OSL_ASSERT(it->first.getLength() == 0);
-    }
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference<ValueMemberNode::DeferredImpl> DeferredGroupNodeImpl::findValueChange(rtl::OUString const& aName)
-{
-    rtl::Reference<ValueMemberNode::DeferredImpl> aResult;
-
-    MemberChanges::iterator it = m_aChanges.find(aName);
-    
-    if (it != m_aChanges.end())
-    {
-        if (it->second.is() )
-        {
-            if (it->second->isChange())
-            {
-                aResult = it->second; 
-            }
-
-            else // leftover non-change -> drop
-            {
-                m_aChanges.erase(it);
-            }
-        }
-        else
-            OSL_ENSURE(aName.getLength() == 0, "ERROR: Found empty change reference");
-    }
-
-    return aResult;
-}
-
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<SubtreeChange> DeferredGroupNodeImpl::preCommitValueChanges()
-{	
-    std::auto_ptr<SubtreeChange> aRet;
-    
-    if (!m_aChanges.empty())
-    {
-        sharable::Node * originalData = this->getOriginalNodeAccess();
-        aRet.reset( new SubtreeChange(  originalData->getName(), 
-                        originalData->getAttributes() ) );
-
-        for (MemberChanges::iterator pos = m_aChanges.begin(); pos != m_aChanges.end(); )
-        {
-            MemberChanges::iterator it = pos++; // this is used to allow erasing below
-
-            if (!it->second.is())
-            {
-                OSL_ASSERT(it->first.getLength() == 0);
-            }
-            else if (it->second->isChange())
-            {
-                std::auto_ptr<ValueChange> aValueChange = it->second->preCommitChange(); 
-                if (aValueChange.get())
-                {
-                    std::auto_ptr<Change> aBaseChange(aValueChange.release()); 
-                    aRet->addChange( aBaseChange );
-                }
-                else
-                    OSL_ENSURE(false, "Got no change from a changed member");
-            }
-            else // found left-over non-change
-                m_aChanges.erase(it);
-        }
-        if (m_aChanges.empty()) aRet.reset();
-    }
-
-    return aRet;
-}
-//-----------------------------------------------------------------------------
-
-void DeferredGroupNodeImpl::finishCommit(SubtreeChange& rChanges)
-{
-    OSL_ENSURE(!rChanges.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-    for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
-        it != stop;
-        ++it)
-    {
-        rtl::OUString aValueName(it->getNodeName());
-
-        MemberChanges::iterator itStoredChange = m_aChanges.find(aValueName);
-
-        if (itStoredChange != m_aChanges.end())
-        {
-            ValueChange * valueChange = dynamic_cast< ValueChange * >(&*it);
-            OSL_ENSURE(valueChange != 0, "Unexpected type of element change");
-            if (valueChange == 0) throw Exception("Unexpected type of element change");
-
-            rtl::Reference<ValueMemberNode::DeferredImpl> aStoredChange = itStoredChange->second;
-            OSL_ENSURE( aStoredChange.is(), "Found empty change object for Member value change");
-
-            if (aStoredChange.is())
-            {
-                aStoredChange->finishCommit(*valueChange);
-                OSL_ENSURE(!aStoredChange->isChange(),"ValueChange is not moot after finishCommit");
-            }
-            
-            m_aChanges.erase( itStoredChange ); // remove finished change
-        }
-        else
-            OSL_ENSURE(dynamic_cast< ValueChange * >(&*it) == 0, "Value member change has no change data representation");
-
-    }
-
-    OSL_DEBUG_ONLY( m_aChanges.erase( rtl::OUString() ) ); // remove change marker (if present)
-    OSL_ENSURE(m_aChanges.empty(), "Found unprocessed changes to values in group"); 
-
-    m_aChanges.clear(); // remove all pending stuff and marker
-}
-//-----------------------------------------------------------------------------
-
-void DeferredGroupNodeImpl::revertCommit(SubtreeChange& rChanges)
-{
-    OSL_ENSURE(!rChanges.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-    for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
-        it != stop;
-        ++it)
-    {
-        rtl::OUString aValueName(it->getNodeName());
-
-        MemberChanges::iterator itStoredChange = m_aChanges.find(aValueName);
-
-        if (itStoredChange != m_aChanges.end())
-        {
-            ValueChange * valueChange = dynamic_cast< ValueChange * >(&*it);
-            OSL_ENSURE(valueChange != 0, "Unexpected type of element change");
-            if (valueChange == 0) continue;
-
-            rtl::Reference<ValueMemberNode::DeferredImpl> aStoredChange = itStoredChange->second;
-            OSL_ENSURE( aStoredChange.is(), "Cannot restore change: found empty change object for Member value change");
-
-            if (aStoredChange.is())
-            {
-                aStoredChange->revertCommit(*valueChange);
-                OSL_ENSURE(!aStoredChange->isChange(),"ValueChange is not moot after reverting - will be discarded nevertheless");
-            }
-            m_aChanges.erase( itStoredChange ); // remove change if it is moot
-        }
-        else
-            OSL_ENSURE(dynamic_cast< ValueChange * >(&*it) == 0, "Value member change has no change data representation");
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredGroupNodeImpl::failedCommit(SubtreeChange& rChanges)
-{
-    OSL_ENSURE(!rChanges.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-    for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
-        it != stop;
-        ++it)
-    {
-        rtl::OUString aValueName(it->getNodeName());
-
-        MemberChanges::iterator itStoredChange = m_aChanges.find(aValueName);
-
-        if (itStoredChange != m_aChanges.end())
-        {
-            ValueChange * valueChange = dynamic_cast< ValueChange * >(&*it);
-            OSL_ENSURE(valueChange != 0, "Unexpected type of element change");
-            if (valueChange == 0) continue;
-
-            rtl::Reference<ValueMemberNode::DeferredImpl> aStoredChange = itStoredChange->second;
-            OSL_ENSURE( aStoredChange.is(), "Cannot recover from failed change: found empty change object for Member value change");
-
-            if (aStoredChange.is())
-                 aStoredChange->failedCommit(*valueChange);
-           {
-                if (!aStoredChange->isChange())
-                    m_aChanges.erase( itStoredChange ); // remove change if it is moot
-            }
-        }
-        else
-            OSL_ENSURE(dynamic_cast< ValueChange * >(&*it) == 0, "Value member change has no change data representation");
-    }
-
-    OSL_DEBUG_ONLY( m_aChanges.erase( rtl::OUString() ) ); // remove change marker (if present)
-    OSL_ENSURE(m_aChanges.empty(), "RevertCommit: Found unprocessed changes to values in group"); 
-
-    m_aChanges.clear(); // discard all pending stuff and marker
-}
-//-----------------------------------------------------------------------------
-
-
-void DeferredGroupNodeImpl::markChanged()
-{
-    // special mark: a NULL rtl::Reference<ValueMemberNode::DeferredImpl> at empty name
-    m_aChanges.insert( MemberChanges::value_type() ); 
-}
-//-----------------------------------------------------------------------------
-
-// Set nodes
-//-----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-// class DeferredTreeSetNodeImpl
-//-----------------------------------------------------------------------------
-
-DeferredSetNodeImpl::DeferredSetNodeImpl(sharable::SetNode * const& _aNodeRef, Template* pTemplate)
-: SetNodeImpl(_aNodeRef,pTemplate)
-, m_aChangedData()
-, m_bChanged(false)
-, m_bDefault(false)
-{
-}
-//-----------------------------------------------------------------------------
-
-bool DeferredSetNodeImpl::doIsEmpty() const
-{
-    if (m_aChangedData.isEmpty())
-        return SetNodeImpl::doIsEmpty();
-
-    // look for added elements	
-    {for(ElementSet::ConstIterator it = m_aChangedData.begin(), stop = m_aChangedData.end();
-        it != stop;
-        ++it)
-    {
-        if (it->isValid()) return false;
-    }}
-    
-
-    // look for elements in the base set that are not 'deleted' (the changes are all deletions here)
-    {for(ElementSet::Data::const_iterator it = SetNodeImpl::beginElementSet(), stop = SetNodeImpl::endElementSet();
-        it != stop;
-        ++it)
-    {
-        if (!m_aChangedData.hasElement(it->first)) return false;
-    }}
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-ElementTree* DeferredSetNodeImpl::doFindElement(rtl::OUString const& aName)
-{
-    ElementTreeData* pElement = m_aChangedData.getElement(aName);
-    if (!pElement)	
-        pElement = SetNodeImpl::getStoredElement(aName);
-
-    return pElement ? pElement->get() : 0;
-}
-//-----------------------------------------------------------------------------
-
-SetNodeVisitor::Result DeferredSetNodeImpl::doDispatchToElements(SetNodeVisitor& aVisitor)
-{
-    SetNodeVisitor::Result eRet = SetNodeVisitor::CONTINUE;
-    // look for elements in the base set that are not hidden by changes
-    {for(ElementSet::Data::const_iterator it = SetNodeImpl::beginElementSet(), stop = SetNodeImpl::endElementSet();
-        it != stop && eRet != SetNodeVisitor::DONE;
-        ++it)
-    {
-        if (m_aChangedData.getElement(it->first) == 0) 
-        {
-            OSL_ASSERT(it->second.isValid());
-            eRet = aVisitor.visit(SetEntry(it->second.get()));
-        }
-    }}
-
-    // look for added elements	
-    {for(ElementSet::ConstIterator it = m_aChangedData.begin(), stop = m_aChangedData.end();
-        it != stop && eRet != SetNodeVisitor::DONE;
-        ++it)
-    {
-        if (it->isValid())
-        {
-            eRet = aVisitor.visit(SetEntry(it->get()));
-        }
-    }}
-    return eRet;
-}
-//-----------------------------------------------------------------------------
-
-bool DeferredSetNodeImpl::hasChanges() const
-{
-    return m_bChanged || !m_aChangedData.isEmpty();
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::collectElementChanges(NodeChanges& rChanges) const
-{
-    // collect added and deleted nodes
-    {for(ElementSet::Data::const_iterator it = m_aChangedData.beginNative(), stop = m_aChangedData.endNative();
-        it != stop;
-        ++it)
-    {
-        ElementTreeData const* pOriginal = SetNodeImpl::getStoredElement(it->first);
-
-        if (it->second.isValid()) // added one
-        {
-            if (pOriginal)
-            {
-                rChanges.add(NodeChange(implCreateReplace(it->first,it->second,*pOriginal)));
-            }
-            else
-            {
-                rChanges.add(NodeChange(implCreateInsert(it->first,it->second)));
-            }
-        }
-        else
-        {
-            if (pOriginal)
-            {
-                rChanges.add(NodeChange(implCreateRemove(it->first,*pOriginal)));
-            }
-
-            //else nothing to do
-        }
-    }}
-
-    // collect preexisting nodes
-    // if (!containsValues()) // value elements ar immutable !
-    {for(ElementSet::Data::const_iterator it = SetNodeImpl::beginElementSet(), stop = SetNodeImpl::endElementSet();
-        it != stop;
-        ++it)
-    {
-        if (m_aChangedData.getElement(it->first) == 0) 
-        {
-            OSL_ASSERT(it->second.isValid());
-            view::ViewTreeAccess aElementView(it->second.get());
-
-            if (aElementView.hasChanges())
-                aElementView.collectChanges(rChanges);
-        }
-    }}
-
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::markChanged()
-{
-    m_bChanged = true;
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::doTransferElements(ElementSet& rReplacement)
-{
-    // transfer preexisting nodes (unless replaced/deleted)
-    {for(ElementSet::Data::const_iterator it = SetNodeImpl::beginElementSet(), stop = SetNodeImpl::endElementSet();
-        it != stop;
-        ++it)
-    {
-        if (m_aChangedData.getElement(it->first) == 0) 
-        {
-            OSL_ASSERT(it->second.isValid());
-
-            rReplacement.insertElement(it->first,it->second);
-        }
-    }}
-
-    // commit added and deleted nodes
-    {
-        ElementSet::Data::const_iterator it = m_aChangedData.beginNative();
-        ElementSet::Data::const_iterator const stop = m_aChangedData.endNative();
-
-        while(it != stop)
-        {
-            if (it->second.isValid())
-                rReplacement.insertElement(it->first,it->second);
-
-            ++it;
-            m_aChangedData.removeElement(it->first);
-        }
-    }
-
-    m_bChanged = false; 
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::rebuildElement(rtl::OUString const& _aName, ElementTreeData const& _aElement)
-{
-    Tree* pContext = this->getParentTree();
-    OSL_ENSURE(pContext, "Context tree must be set before rebuilding");
-
-    rtl::Reference<view::ViewStrategy> xContextBehavior = pContext->getViewBehavior();
-    
-    sharable::TreeFragment * elementAccessor = this->getDataAccess()->getElement(_aName);
-    OSL_ENSURE(elementAccessor != 0, "Element Tree not found in data");
-
-    OSL_ENSURE(_aElement.isValid(), "Element not found in view");
-    _aElement->rebuild(xContextBehavior, elementAccessor);
-}
-
-//-----------------------------------------------------------------------------
-std::auto_ptr<SubtreeChange> DeferredSetNodeImpl::preCommitChanges(std::vector< rtl::Reference<ElementTree> >& _rRemovedElements)
-{	
-    sharable::Node * originalData = this->getOriginalNodeAccess();
-    // now first get the name of this node
-    rtl::OUString sSetName = originalData->getName();
-
-    // and make a SubtreeChange
-    std::auto_ptr<SubtreeChange> pSetChange( new SubtreeChange(sSetName, 															   
-                                   getElementTemplate()->getName(),
-                                   getElementTemplate()->getModule(),
-                                   originalData->getAttributes() ) );			
-    
-    // commit preexisting nodes
-    {
-    for(ElementSet::Data::const_iterator it = SetNodeImpl::beginElementSet(), stop = SetNodeImpl::endElementSet();
-        it != stop;
-        ++it)
-    {
-        if (m_aChangedData.getElement(it->first) == 0) 
-        {
-        OSL_ASSERT(it->second.isValid());
-        OSL_ENSURE( !m_bDefault || it->second.inDefault, "m_bDefault is inconsistent");
-
-        view::ViewTreeAccess aElementView(it->second.get());
-        std::auto_ptr<SubtreeChange> pNewChange = aElementView.preCommitChanges(_rRemovedElements);
-        if (pNewChange.get() != 0)
-        {
-            //OSL_ENSURE( !containsValues(), "Unexpected change generated by value set element");
-          std::auto_ptr<Change> pNewChangeBase( pNewChange.release() );
-          pSetChange->addChange(pNewChangeBase);
-        }
-        }
-    }
-    }
-
-    // commit added and deleted nodes
-    {
-        ElementSet::Data::const_iterator it = m_aChangedData.beginNative();
-        ElementSet::Data::const_iterator const stop = m_aChangedData.endNative();
-
-        while(it != stop)
-        {
-            rtl::OUString	aName		= it->first;
-            ElementTreeData aNewElement = it->second;
-
-            ElementTreeData* pOriginal = SetNodeImpl::getStoredElement(aName);
-
-            if (aNewElement.isValid())
-            {
-                rtl::Reference< data::TreeSegment > aAddedTree = aNewElement->releaseOwnedTree();
-                if (!aAddedTree.is())
-                {
-                    throw Exception("INTERNAL ERROR: Could not find data for the added ElementTree");
-                }
-
-                OSL_ENSURE( !m_bDefault || aNewElement.inDefault, "m_bDefault is inconsistent");
-
-                AddNode* pAddNode = new AddNode(aAddedTree, aName, aNewElement.inDefault );
-
-                std::auto_ptr<Change> pNewChange( pAddNode );
-
-                if (pOriginal)
-                    pAddNode->setReplacing();
-
-                pSetChange->addChange(pNewChange);
-            }
-            else
-            {
-                if (pOriginal)
-                {
-                    OSL_ENSURE( !m_bDefault || aNewElement.inDefault, "m_bDefault is inconsistent");
-
-                    std::auto_ptr<Change> pNewChange( new RemoveNode(aName,aNewElement.inDefault) );
-                    
-                    pSetChange->addChange(pNewChange);
-                }
-                //else nothing to do
-            }
-
-            // collect removed or replaced element
-            if (pOriginal)
-                _rRemovedElements.push_back( pOriginal->tree );
-
-            ++it;
-        }
-    }
-    return pSetChange;		
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::finishCommit(SubtreeChange& rChanges)
-{
-    OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE(	rChanges.getElementTemplateName() ==  getElementTemplate()->getName(),
-                "ERROR: Element template of change does not match the template of the set");
-    OSL_ENSURE(	rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule(),
-                "ERROR: Element template module of change does not match the template of the set");
-
-    for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
-        it != stop;
-        ++it)
-    {
-        rtl::OUString aElementName(it->getNodeName());
-
-        ElementTreeData* pOriginal = getStoredElement(aElementName);
-
-        if (ElementTreeData* pNewElement = m_aChangedData.getElement(aElementName)) 
-        {
-            ElementTreeData aOriginal;
-            if (pOriginal)
-            {
-                aOriginal = *pOriginal;
-                OSL_ASSERT(aOriginal.isValid());
-            }
-            else
-                OSL_ASSERT(!aOriginal.isValid());
-
-            // handle a added, replaced or deleted node
-            rtl::Reference< data::TreeSegment > aRemovedTree;
-
-            if (pNewElement->isValid())
-            {
-                AddNode * addNode = dynamic_cast< AddNode * >(&*it);
-                OSL_ENSURE(addNode != 0, "Unexpected type of element change");
-                if (addNode == 0) throw Exception("Unexpected type of element change");
-
-                aRemovedTree = addNode->getReplacedTree();
-                OSL_ASSERT( addNode->isReplacing() == (0!=pOriginal)  );
-                OSL_ASSERT( addNode->isReplacing() == (bool) aRemovedTree.is() );
-
-                if (aOriginal.isValid())
-                    SetNodeImpl::replaceElement(aElementName,*pNewElement);
-
-                else
-                    SetNodeImpl::insertElement(aElementName,*pNewElement);
-
-                this->rebuildElement(aElementName,*pNewElement);
-            }
-            else
-            {
-                RemoveNode * removeNode = dynamic_cast< RemoveNode * >(&*it);
-                OSL_ENSURE(removeNode != 0, "Unexpected type of element change");
-                if (removeNode == 0) throw Exception("Unexpected type of element change");
-
-                aRemovedTree = removeNode->getRemovedTree();
-
-                OSL_ASSERT(aOriginal.isValid());
-                if (aOriginal.isValid())
-                    SetNodeImpl::removeElement(aElementName);
-            }
-            // handle a added or deleted node
-            if (aOriginal.isValid())
-            {
-                OSL_ENSURE(aRemovedTree.is(), "Cannot take over the removed node");
-            
-                aOriginal->takeTreeAndRebuild(aRemovedTree);
-            }
-            m_aChangedData.removeElement(aElementName);
-        }
-        else 
-        {
-            // handle preexisting nodes
-            //OSL_ENSURE(!containsValues(), "Unexpected change to value set element");
-            OSL_ENSURE(pOriginal && pOriginal->isValid(), "Changed Element is missing");
-            SubtreeChange * subtreeChange = dynamic_cast< SubtreeChange * >(&*it);
-            OSL_ENSURE(subtreeChange != 0, "Unexpected type of element change");
-                
-            if (subtreeChange == 0) throw Exception("Unexpected set element change");
-
-            if (pOriginal && pOriginal->isValid())
-                view::ViewTreeAccess(pOriginal->get()).finishCommit(*subtreeChange);
-        }
-    }
-    m_bChanged = false;
-
-    OSL_ENSURE(m_aChangedData.isEmpty(), "ERROR: Uncommitted changes left in set node");
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::revertCommit(SubtreeChange& rChanges)
-{
-    OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE(	rChanges.getElementTemplateName() ==  getElementTemplate()->getName(),
-                "ERROR: Element template of change does not match the template of the set");
-    OSL_ENSURE(	rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule(),
-                "ERROR: Element template module of change does not match the template of the set");
-
-
-    for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
-        it != stop;
-        ++it)
-    {
-        rtl::OUString aElementName(it->getNodeName());
-
-        ElementTreeData* pOriginal = getStoredElement(aElementName);
-
-        if (ElementTreeData* pNewElement = m_aChangedData.getElement(aElementName)) 
-        {
-            // handle a added, replaced or deleted node
-            rtl::Reference< data::TreeSegment > pRemovedTree;
-
-            if (pNewElement->isValid())
-            {
-                AddNode * addNode = dynamic_cast< AddNode * >(&*it);
-                OSL_ENSURE(addNode != 0, "Unexpected type of element change");
-                if (addNode == 0) throw Exception("Unexpected type of element change");
-
-                pRemovedTree = addNode->getReplacedTree();
-                OSL_ASSERT( addNode->isReplacing() == (0!=pOriginal)  );
-                OSL_ASSERT( addNode->isReplacing() == (0!=pRemovedTree.is())  );
-            
-                OSL_ENSURE(!addNode->wasInserted(), "Cannot retract new node: Change was integrated");
-
-                rtl::Reference< data::TreeSegment > aAddedTree = addNode->getNewTree();
-                OSL_ENSURE(aAddedTree.is(), "Cannot restore new node: Change lost ownership");
-
-                // restore the tree
-                (*pNewElement)->takeTreeBack(aAddedTree);
-            }
-            else
-            {
-                RemoveNode * removeNode = dynamic_cast< RemoveNode * >(&*it);
-                OSL_ENSURE(removeNode != 0, "Unexpected type of element change");
-                if (removeNode == 0) throw Exception("Unexpected type of element change");
-
-                pRemovedTree = removeNode->getRemovedTree();
-
-                OSL_ASSERT(pOriginal);
-                OSL_ASSERT((0 != pOriginal) == (0!=pRemovedTree.is())  );
-            }
-            OSL_ENSURE(pRemovedTree.is(), "Possible problems reverting removed node: Change took ownership");
-            // try handle a added or deleted node
-            if (pOriginal)
-            {
-                OSL_ASSERT(pOriginal->isValid());
-                (*pOriginal)->takeTreeAndRebuild(pRemovedTree);
-                OSL_DEBUG_ONLY(pRemovedTree.clear());
-            }
-            OSL_ENSURE(!pRemovedTree.is(), "Could not revert removed node: Nowhere to put ownership");
-        }
-        else 
-        {
-            // handle preexisting nodes
-            //OSL_ENSURE(!containsValues(), "Unexpected change to value set element");
-            OSL_ENSURE(pOriginal && pOriginal->isValid(), "Changed Element is missing");
-            SubtreeChange * subtreeChange = dynamic_cast< SubtreeChange * >(&*it);
-            OSL_ENSURE(subtreeChange != 0, "Unexpected set element change");
-
-            if (subtreeChange == 0) throw Exception("Unexpected set element change");
-
-            if (pOriginal && pOriginal->isValid())
-                view::ViewTreeAccess(pOriginal->get()).revertCommit(*subtreeChange);
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::failedCommit(SubtreeChange& rChanges)
-{
-    OSL_ENSURE(rChanges.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-    OSL_ENSURE(	rChanges.getElementTemplateName() ==  getElementTemplate()->getName(),
-                "ERROR: Element template of change does not match the template of the set");
-    OSL_ENSURE(	rChanges.getElementTemplateModule() ==  getElementTemplate()->getModule(),
-                "ERROR: Element template module of change does not match the template of the set");
-
-    for(SubtreeChange::MutatingChildIterator it = rChanges.begin_changes(), stop = rChanges.end_changes();
-        it != stop;
-        ++it)
-    {
-        rtl::OUString aElementName(it->getNodeName());
-
-        ElementTreeData* pOriginal = getStoredElement(aElementName);
-
-        if (ElementTreeData* pNewElement = m_aChangedData.getElement(aElementName)) 
-        {
-            ElementTreeData aOriginal;
-            if (pOriginal)
-            {
-                aOriginal = *pOriginal;
-                OSL_ASSERT(aOriginal.isValid());
-            }
-            else
-                OSL_ASSERT(!aOriginal.isValid());
-
-            // handle a added, replaced or deleted node
-            rtl::Reference< data::TreeSegment > aRemovedTree;
-
-            if (pNewElement->isValid())
-            {
-                AddNode * addNode = dynamic_cast< AddNode * >(&*it);
-                OSL_ENSURE(addNode != 0, "Unexpected type of element change");
-                if (addNode == 0) throw Exception("Unexpected type of element change");
-
-                aRemovedTree = addNode->getReplacedTree();
-                OSL_ASSERT( addNode->isReplacing() == (0!=pOriginal)  );
-                OSL_ASSERT( addNode->isReplacing() == (bool) aRemovedTree.is() );
-
-                if (addNode->wasInserted())
-                { // it has been integrated into the master tree
-                    OSL_ENSURE(getDataAccess()->getElement(aElementName) == addNode->getInsertedTree(),
-                           "Internal Error: Inserted tree address does not match actual data");
-
-                    // so add it
-                    if (aOriginal.isValid())
-                        SetNodeImpl::replaceElement(aElementName,*pNewElement);
-
-                    else
-                        SetNodeImpl::insertElement(aElementName,*pNewElement);
-
-                    this->rebuildElement(aElementName,*pNewElement);
-                }
-                else // Change not done; need to restore new node (element will be released into the wild then)
-                {
-                    rtl::Reference< data::TreeSegment > aAddedTree = addNode->getNewTree();
-
-                    OSL_ENSURE(aAddedTree.is(), "Unexpected: added node is gone, but where ? May cause invalid references");
-                    (*pNewElement)->takeTreeBack(aAddedTree);
-                    detach(*pNewElement);
-                }
-            }
-            else
-            {
-                RemoveNode * removeNode = dynamic_cast< RemoveNode * >(&*it);
-                OSL_ENSURE(removeNode != 0, "Unexpected type of element change");
-                if (removeNode == 0) throw Exception("Unexpected type of element change");
-
-                aRemovedTree = removeNode->getRemovedTree();
-
-                OSL_ASSERT(aOriginal.isValid());
-                if (aRemovedTree.is() && getDataAccess()->getElement(aElementName) == 0)
-                {
-                    // really removed - then remove the originel
-                    if (aOriginal.isValid())
-                        SetNodeImpl::removeElement(aElementName);
-                }
-            }
-
-            // handle a added or deleted node
-            if (aOriginal.isValid() && aRemovedTree.is())
-            {
-              aOriginal->takeTreeAndRebuild(aRemovedTree);
-                //aOriginal->getAccess().makeDirect();
-                OSL_DEBUG_ONLY(aRemovedTree.clear());
-            }
-            OSL_ENSURE(!aRemovedTree.is(), "Could not revert removed node: Nowhere to put ownership");
-
-            m_aChangedData.removeElement(aElementName);
-        }
-        else 
-        {
-            // handle preexisting nodes
-            //OSL_ENSURE(!containsValues(), "Unexpected change to value set element");
-            OSL_ENSURE(pOriginal && pOriginal->isValid(), "Changed Element is missing");
-            SubtreeChange * subtreeChange = dynamic_cast< SubtreeChange * >(&*it);
-            OSL_ENSURE(subtreeChange != 0, "Unexpected set element change");
-
-            if (subtreeChange == 0) throw Exception("Unexpected set element change");
-
-            if (pOriginal && pOriginal->isValid())
-                view::ViewTreeAccess(pOriginal->get()).recoverFailedCommit(*subtreeChange);
-        }
-    }
-    m_bChanged = false;
-    m_bDefault = false;
-
-    OSL_ENSURE(m_aChangedData.isEmpty(), "ERROR: Uncommitted changes left in set node");
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::insertNewElement(rtl::OUString const& aName, ElementTreeData const& aNewElement) 
-{ 
-    attach(aNewElement,aName);
-    try 
-    { 
-        // put the new element into the changed set
-        ElementTreeData* pAddedElement = m_aChangedData.getElement(aName);
-        if (pAddedElement)
-        {
-            OSL_ENSURE(!pAddedElement->isValid(),"WARNING: Element being inserted was already there - replacing");
-            detach(m_aChangedData.replaceElement(aName,aNewElement)); 
-        }
-        else
-        {
-            m_aChangedData.insertElement(aName, aNewElement);
-        }
-        m_bChanged = true;
-        m_bDefault = false;
-    }
-    catch (std::exception&) 
-    { 
-        detach(aNewElement); 
-        throw; 
-    }
-}
-//-------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::removeOldElement(rtl::OUString const& aName)
-{ 
-    // put an empty (dummy) element into the changed set
-    ElementTreeData* pAddedElement = m_aChangedData.getElement(aName);
-    if (pAddedElement)
-    {
-        OSL_ENSURE(pAddedElement->isValid(),"WARNING: Element being removed was already removed");
-        detach(m_aChangedData.replaceElement(aName, ElementTreeData()));
-        m_bChanged = true;
-        m_bDefault = false;
-    }
-    else
-    {
-        m_aChangedData.insertElement(aName, ElementTreeData());
-    }
-
-    // now check the original one
-    ElementTreeData* pOldElement = getStoredElement(aName);
-    if (pOldElement)
-    {
-        OSL_ASSERT(pOldElement->isValid());
-        detach(*pOldElement);
-        m_bChanged = true;
-        m_bDefault = false;
-    }
-    else // just clear things out
-    {
-        m_aChangedData.removeElement(aName);
-    }
-
-    OSL_ENSURE(pOldElement || pAddedElement,"WARNING: Element being removed was not found in set");
-}
-//-----------------------------------------------------------------------------
-
-SetElementChangeImpl* DeferredSetNodeImpl::doAdjustChangedElement(NodeChangesInformation& rLocalChanges, rtl::OUString const& aName, Change const& aChange)
-{
-    if (ElementTreeData* pLocalElement = m_aChangedData.getElement(aName))
-    {
-        if (ElementTreeData* pElement = getStoredElement(aName))
-        {
-            OSL_ASSERT(pElement->isValid());
-            
-            if (SubtreeChange const * subtreeChange = dynamic_cast< SubtreeChange const * >(&aChange))
-            {
-                // recurse to element tree - but do not notify those changes (?)
-                Tree * elementTree = pElement->get();
-
-                NodeChangesInformation aIgnoredChanges;
-                view::getViewBehavior(elementTree)->adjustToChanges(aIgnoredChanges, view::getRootNode(elementTree), *subtreeChange);
-            }
-            else
-            {
-                OSL_ENSURE(dynamic_cast<ValueChange const * >(&aChange) != 0, "Unexpected kind of change to value set element" );
-                //OSL_ENSURE( containsValues(), "Unexpected kind of change: Value change applied to tree set element" );
-            }
-
-        }
-        else
-        {
-            // could be changed to do an insert instead (?)
-            OSL_ENSURE( false, "Changed Element didn't exist before it was removed/replaced" );
-        }
-
-        if (pLocalElement->isValid()) 
-        {
-            // we have a complete replacement for the changed node 
-            ElementTreeData aLocalElement = *pLocalElement;
-
-            // also signal something happened
-            return implCreateReplace(aName,aLocalElement,aLocalElement);
-        }
-        else
-        { 
-            // already removed locally - should be notified by different route (if applicable)
-            return NULL;
-        }
-    }
-    else
-    {
-        return SetNodeImpl::doAdjustChangedElement( rLocalChanges,aName,aChange);
-    }
-}
-//-----------------------------------------------------------------------------
-
-SetElementChangeImpl* DeferredSetNodeImpl::doAdjustToAddedElement(rtl::OUString const& aName, AddNode const& aAddNodeChange, ElementTreeData const& aNewElement)
-{
-    m_bDefault = false;
-    if (ElementTreeData* pLocalElement = m_aChangedData.getElement(aName))
-    {
-        // We have another element replacing ours - what do we do ?
-        if (hasStoredElement(aName))
-        {
-            OSL_ENSURE( aAddNodeChange.isReplacing(), "Added Element already exists - replacing" );
-
-            this->replaceElement(aName,aNewElement);
-        }
-        else
-        {
-            OSL_ENSURE( !aAddNodeChange.isReplacing(), "Replaced Element doesn't exist - simply adding" );
-            this->insertElement(aName,aNewElement);
-        }
-
-
-        if (pLocalElement->isValid()) // ours remains a valid replacement
-        {
-            ElementTreeData aLocalElement = *pLocalElement;
-
-            // just signal something happened
-            return implCreateReplace(aName,aLocalElement,aLocalElement);
-        }
-        else // had been removed locally
-        {
-            // signal what happened
-            return implCreateInsert(aName,aNewElement);
-        }
-    }
-    else
-    {
-        return SetNodeImpl::implAdjustToAddedElement(aName,aNewElement,aAddNodeChange.isReplacing());
-    }
-}
-//-----------------------------------------------------------------------------
-
-SetElementChangeImpl* DeferredSetNodeImpl::doAdjustToRemovedElement(rtl::OUString const& aName, RemoveNode const& /*aRemoveNodeChange*/)
-{
-    m_bDefault = false;
-    if (ElementTreeData* pLocalElement = m_aChangedData.getElement(aName))
-    {
-        if (hasStoredElement(aName))
-        {
-            // take away the original
-            this->removeElement(aName);
-        }
-
-        if (pLocalElement->isValid()) // remains a valid replacement
-        {
-            ElementTreeData aLocalElement = *pLocalElement;
-
-            // signal something happened 
-            return implCreateReplace(aName,aLocalElement,aLocalElement);
-        }
-        else // already was removed locally
-        {
-            return 0;
-        }
-    }
-    else
-    {
-        return SetNodeImpl::implAdjustToRemovedElement(aName);
-    }
-}
-//-----------------------------------------------------------------------------
-
-void DeferredSetNodeImpl::doDifferenceToDefaultState(SubtreeChange& _rChangeToDefault, ISubtree& _rDefaultTree)
-{
-    if (!m_bDefault)
-    {
-        implDifferenceToDefaultState(_rChangeToDefault,_rDefaultTree);
-
-        ElementSet::Data::const_iterator it = m_aChangedData.beginNative();
-        ElementSet::Data::const_iterator const stop = m_aChangedData.endNative();
-
-        while(it != stop)
-        {
-            rtl::OUString	aName		= it->first;
-            ElementTreeData aElement    = it->second;
-
-            Change* pChange = _rChangeToDefault.getChange( aName );
-            OSL_ENSURE(pChange == NULL || dynamic_cast< AddNode * >(pChange) != 0 || dynamic_cast< RemoveNode * >(pChange) != 0,
-                        "Unexpected change type found in difference to default tree");
-
-            if (pChange == NULL)
-            {
-                std::auto_ptr<INode> aDefaultNode = _rDefaultTree.removeChild(aName);
-                OSL_ENSURE( aDefaultNode.get(), "Error: unused Default tree not found after SetNodeImpl::implDifferenceToDefaultState");
-
-                rtl::OUString aElementTypeName = _rDefaultTree.getElementTemplateName();
-                OSL_ENSURE( _rDefaultTree.isSetNode(), "Error: missing set template information in default data");
-
-                rtl::Reference< data::TreeSegment > aDefaultTree = data::TreeSegment::create(aDefaultNode,aElementTypeName);
-                OSL_ENSURE(aDefaultTree.is(), "Error: unused Default tree not accessible after SetNodeImpl::implDifferenceToDefaultState");
-
-                AddNode* pAddIt = new AddNode(aDefaultTree, aName, true );
-
-                std::auto_ptr<Change> pNewChange( pAddIt );
-
-                if (aElement.isValid())
-                {
-                    OSL_ENSURE(!aElement.inDefault, "Default element replaced by default");
-                    pAddIt->setReplacing();
-                }
-
-                _rChangeToDefault.addChange(pNewChange);
-                
-            }
-            else if (AddNode * addNode = dynamic_cast< AddNode * >(pChange))
-            {
-                // adjust the AddNode - remove the original expected node
-                addNode->clearReplacedTree();
-
-                if (aElement.isValid())
-                {
-                    if (aElement.inDefault)
-                    {
-                        // change already done locally
-                        _rChangeToDefault.removeChange(aName);
-                    }
-                    else // adjust here
-                        addNode->setReplacing();
-                }
-
-                else
-                    OSL_ENSURE(!addNode->isReplacing(),"Could not unmark the 'replacing' state of an AddNode");
-            }
-            else if (RemoveNode * removeNode = dynamic_cast< RemoveNode * >(pChange))
-            {
-                if (aElement.isValid())
-                {
-                    OSL_ENSURE(!aElement.inDefault, "Default element replaced by default");
-                    // adjust the RemoveNode - remove the original expected node
-                    removeNode->clearRemovedTree();
-                }
-                else
-                {
-                    // change already done locally
-                    _rChangeToDefault.removeChange(aName);
-                }
-                // TODO: mark local removal as to-default
-            }
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/nodeimplobj.hxx b/configmgr/source/treemgr/nodeimplobj.hxx
deleted file mode 100644
index 4aa2431958..0000000000
--- a/configmgr/source/treemgr/nodeimplobj.hxx
+++ /dev/null
@@ -1,201 +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: nodeimplobj.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_NODEIMPLOBJECTS_HXX_
-#define CONFIGMGR_NODEIMPLOBJECTS_HXX_
-
-#include "sal/config.h"
-
-#include "salhelper/simplereferenceobject.hxx"
-
-#include "node.hxx"
-#include "nodeimpl.hxx"
-#include "groupnodeimpl.hxx"
-#include "setnodeimpl.hxx"
-#include "valuenodeimpl.hxx"
-#include "utility.hxx"
-
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-// Specific types of nodes for direct or read only access
-//-----------------------------------------------------------------------------
-
-// Value Nodes
-//-----------------------------------------------------------------------------
-
-        class ValueMemberNode::DeferredImpl : public salhelper::SimpleReferenceObject
-        {
-            sharable::ValueNode * m_valueNode;
-
-            com::sun::star::uno::Any      m_aNewValue;
-            bool	    m_bToDefault;
-            bool	    m_bChange;
-        public:
-            explicit DeferredImpl(sharable::ValueNode * valueNode);
-
-            /// does this wrap a change
-            bool isChange() const   { return m_bChange; }
-
-            /// retrieve the underlying (original) node
-            sharable::ValueNode * getOriginalNode() const
-            { return m_valueNode; }
-
-            /// Does this node change to default
-            bool isToDefault()		const { return m_bToDefault; }
-
-            /// retrieve the current value of this node
-            com::sun::star::uno::Any	getNewValue()	const { return m_aNewValue; }
-
-            /// Set this node to a new value
-            void	setValue(com::sun::star::uno::Any const& aNewValue, sharable::ValueNode * originalNode);
-
-            /// Set this node to assume its default value
-            void	setValueToDefault(sharable::ValueNode * originalNode); 
-            
-        public:
-            // commit protocol
-            std::auto_ptr<ValueChange> preCommitChange();
-            void finishCommit(ValueChange& rChange);
-            void revertCommit(ValueChange& rChange);
-            void failedCommit(ValueChange& rChange);
-
-            ValueChangeImpl* collectChange();
-            ValueChangeImpl* adjustToChange(ValueChange const& rExternalChange);
-
-            // notification protocol
-            void adjustToChange(NodeChangesInformation& rLocalChange, ValueChange const& rExternalChange, Tree& rParentTree, unsigned int nParentPos, rtl::OUString const& aName);
-        };
-//-----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-
-// Group Nodes
-//-----------------------------------------------------------------------------
-    
-        class DeferredGroupNodeImpl : public GroupNodeImpl
-        {
-        public:
-            explicit 
-            DeferredGroupNodeImpl(sharable::GroupNode * const& _aNodeRef);
-            explicit 
-            DeferredGroupNodeImpl(sharable::GroupNode * const& _aNewAddress, GroupNodeImpl& rOriginal);
-
-            ~DeferredGroupNodeImpl();
-
-        public:
-        // commit protocol
-            std::auto_ptr<SubtreeChange> preCommitValueChanges();
-            void finishCommit(SubtreeChange& rChange);
-            void revertCommit(SubtreeChange& rChange);
-            void failedCommit(SubtreeChange& rChange);
-
-            void collectValueChanges(NodeChanges& rChanges, Tree* pParent, unsigned int nNode) const;
-            
-        public:
-        // data access
-            bool hasChanges() const;
-            void markChanged();
-
-            rtl::Reference<ValueMemberNode::DeferredImpl> findValueChange(rtl::OUString const& aName);
-
-            using GroupNodeImpl::makeValueMember;
-            ValueMemberNode makeValueMember(rtl::OUString const& _aName, bool _bForUpdate);
-
-        private:
-            typedef std::map< rtl::OUString, rtl::Reference<ValueMemberNode::DeferredImpl> > MemberChanges;
-
-            MemberChanges    m_aChanges;
-        };
-//-----------------------------------------------------------------------------
-
-// Set nodes
-//-----------------------------------------------------------------------------
-
-        class DeferredSetNodeImpl : public SetNodeImpl
-        {
-        public:
-            explicit 
-            DeferredSetNodeImpl(sharable::SetNode * const& _aNodeRef, Template* pTemplate);
-
-        public:
-            bool hasChanges() const;
-            void markChanged();
-            void collectElementChanges(NodeChanges& rChanges) const;
-
-        public:
-            std::auto_ptr<SubtreeChange> preCommitChanges(std::vector< rtl::Reference<ElementTree> >& _rRemovedElements);
-            void failedCommit(SubtreeChange& rChanges);
-            void finishCommit(SubtreeChange& rChanges);
-            void revertCommit(SubtreeChange& rChanges);
-
-            void insertNewElement(rtl::OUString const& aName, ElementTreeData const& aNewElement);
-            void removeOldElement(rtl::OUString const& aName);
-        // Base Overrideables
-        private:
-        // NodeImpl implementation
-            virtual bool		           doIsEmpty() const;
-            virtual ElementTree*	   doFindElement(rtl::OUString const& aName) ;
-            virtual SetNodeVisitor::Result doDispatchToElements(SetNodeVisitor& aVisitor);
-
-            virtual void doDifferenceToDefaultState(SubtreeChange& _rChangeToDefault, ISubtree& _rDefaultTree);
-
-            virtual SetElementChangeImpl* doAdjustToAddedElement(rtl::OUString const& aName, AddNode const& aAddNodeChange, ElementTreeData const & aNewElement);
-            virtual SetElementChangeImpl* doAdjustToRemovedElement(rtl::OUString const& aName, RemoveNode const& aRemoveNodeChange);
-
-            virtual SetElementChangeImpl* doAdjustChangedElement(NodeChangesInformation& rLocalChanges, rtl::OUString const& aName, Change const& aChange);
-
-            virtual void doTransferElements(ElementSet& rReplacement);
-
-        // Implementation
-        private:
-            void rebuildElement(rtl::OUString const& aName, ElementTreeData const& _aElement);
-
-        private:
-            ElementSet m_aChangedData;
-            bool	m_bChanged;
-            bool	m_bDefault;
-        };
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_NODEIMPLOBJECTS_HXX_
diff --git a/configmgr/source/treemgr/noderef.cxx b/configmgr/source/treemgr/noderef.cxx
deleted file mode 100644
index c7aeeca267..0000000000
--- a/configmgr/source/treemgr/noderef.cxx
+++ /dev/null
@@ -1,920 +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: noderef.cxx,v $
- * $Revision: 1.34 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include "anynoderef.hxx"
-#include "valueref.hxx"
-#include "noderef.hxx"
-#include "tree.hxx"
-#include "viewaccess.hxx"
-#include "configpath.hxx"
-#include "nodechange.hxx"
-#include "configexcept.hxx"
-#include "configset.hxx"
-#include "tracer.hxx"
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm> // for swap
-#define INCLUDED_ALGORITHM
-#endif
-#ifndef INCLUDED_FUNCTIONAL
-#include <functional> // for less
-#define INCLUDED_FUNCTIONAL
-#endif
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// local  helpers 
-//-----------------------------------------------------------------------------
-
-namespace 
-{
-//-----------------------------------------------------------------------------
-    struct CollectValueIDs : GroupMemberVisitor
-    {
-        CollectValueIDs(NodeID const& aParentID, std::vector<SubNodeID>& rValueList) 
-        : m_aParentID(aParentID) 
-        , m_rValueList(rValueList) 
-        {
-        }
-
-        Result visit(ValueMemberNode const& anEntry);
-        
-        NodeID  m_aParentID;
-        std::vector<SubNodeID>& m_rValueList;
-    };
-
-    GroupMemberVisitor::Result CollectValueIDs::visit(ValueMemberNode const& aValue)
-    {
-        OSL_ASSERT(aValue.isValid());
-
-        rtl::OUString aValueName = aValue.getNodeName();
-
-        m_rValueList.push_back(SubNodeID( m_aParentID, aValueName)); 
-
-        return CONTINUE;
-    }
-//-----------------------------------------------------------------------------
-}
-
-//-----------------------------------------------------------------------------
-// class NodeRef
-//-----------------------------------------------------------------------------
-
-NodeRef::NodeRef()
-: m_nPos(0)
-, m_nDepth(0)
-{
-}
-//-----------------------------------------------------------------------------
-
-NodeRef::NodeRef(unsigned int nPos, unsigned int nDepth)
-: m_nPos(nPos)
-, m_nDepth(nDepth)
-{}
-//-----------------------------------------------------------------------------
-
-NodeRef::NodeRef(NodeRef const& rOther)
-: m_nPos(rOther.m_nPos)
-, m_nDepth(rOther.m_nDepth)
-{
-}
-//-----------------------------------------------------------------------------
-
-NodeRef& NodeRef::operator=(NodeRef const& rOther)
-{
-    NodeRef(rOther).swap(*this);
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-void NodeRef::swap(NodeRef& rOther)
-{
-    std::swap(m_nPos,	rOther.m_nPos);
-    std::swap(m_nDepth,	rOther.m_nDepth);
-}
-//-----------------------------------------------------------------------------
-
-NodeRef::~NodeRef()
-{
-}
-
-//-----------------------------------------------------------------------------
-// class ValueRef
-//-----------------------------------------------------------------------------
-
-bool ValueRef::checkValidState() const
-{
-    if (m_nParentPos  == 0)    return false; 
-
-    // old node semantics for now
-    if ( m_sNodeName.getLength() == 0 ) return false;
-
-    return true; 
-}
-//-----------------------------------------------------------------------------
-
-ValueRef::ValueRef()
-: m_sNodeName()
-, m_nParentPos(0)
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueRef::ValueRef(rtl::OUString const& aName, unsigned int nParentPos)
-: m_sNodeName(aName)
-, m_nParentPos(nParentPos)
-{
-    OSL_ENSURE( nParentPos == 0 || checkValidState(), "Constructing invalid ValueRef");
-}
-//-----------------------------------------------------------------------------
-
-ValueRef::ValueRef(ValueRef const& rOther)
-: m_sNodeName(rOther.m_sNodeName)
-, m_nParentPos(rOther.m_nParentPos)
-{
-}
-//-----------------------------------------------------------------------------
-
-ValueRef& ValueRef::operator=(ValueRef const& rOther)
-{
-    ValueRef(rOther).swap(*this);
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-void ValueRef::swap(ValueRef& rOther)
-{
-    std::swap(m_sNodeName,	rOther.m_sNodeName);
-    std::swap(m_nParentPos,	rOther.m_nParentPos);
-}
-//-----------------------------------------------------------------------------
-
-ValueRef::~ValueRef()
-{
-}
-
-//-----------------------------------------------------------------------------
-// class AnyNodeRef
-//-----------------------------------------------------------------------------
-#if OSL_DEBUG_LEVEL > 0
-bool AnyNodeRef::checkValidState() const
-{
-    if (m_nUsedPos  == 0)    return false; 
-
-    if ( m_sNodeName.getLength() != 0 ) // it's a local value
-    { 
-        // not used as runtime check as it should not be dangerous
-        OSL_ENSURE(m_nDepth ==0, "AnyNodeRef that wraps a ValueRef should have no depth"); // value has no depth
-    }
-
-    return true;
-}
-#endif
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::AnyNodeRef()
-: m_sNodeName()
-, m_nUsedPos(0)
-, m_nDepth(0)
-{
-}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::AnyNodeRef(unsigned int nPos, unsigned int nDepth)
-: m_sNodeName()
-, m_nUsedPos(nPos)
-, m_nDepth(nDepth)
-{}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::AnyNodeRef(rtl::OUString const& aName, unsigned int nParentPos)
-: m_sNodeName(aName)
-, m_nUsedPos(nParentPos)
-, m_nDepth(0)
-{}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::AnyNodeRef(AnyNodeRef const& rOther)
-: m_sNodeName(rOther.m_sNodeName)
-, m_nUsedPos(rOther.m_nUsedPos)
-, m_nDepth(rOther.m_nDepth)
-{
-}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::AnyNodeRef(NodeRef const& aNodeRef)
-: m_sNodeName()
-, m_nUsedPos(  aNodeRef.m_nPos )
-, m_nDepth( aNodeRef.m_nDepth )
-{}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::AnyNodeRef(ValueRef const& aValueRef)
-: m_sNodeName( aValueRef.m_sNodeName )
-, m_nUsedPos(  aValueRef.m_nParentPos )
-, m_nDepth( 0 )
-{}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef& AnyNodeRef::operator=(AnyNodeRef const& rOther)
-{
-    AnyNodeRef(rOther).swap(*this);
-    return *this;
-}
-//-----------------------------------------------------------------------------
-
-void AnyNodeRef::swap(AnyNodeRef& rOther)
-{
-    std::swap(m_sNodeName,	rOther.m_sNodeName);
-    std::swap(m_nUsedPos,	rOther.m_nUsedPos);
-    std::swap(m_nDepth,	    rOther.m_nDepth);
-}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef::~AnyNodeRef()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-bool AnyNodeRef::isNode() const
-{
-    OSL_PRECOND( isValid(), "ERROR: Configuration: AnyNodeRef operation requires valid node" );
-    if (!isValid()) return false;
-
-    return m_sNodeName.getLength() == 0;
-}
-//-----------------------------------------------------------------------------
-
-NodeRef AnyNodeRef::toNode() const
-{
-    OSL_PRECOND( isValid(), "ERROR: Configuration: AnyNodeRef operation requires valid node" );
-    if (!isValid() || !isNode()) return NodeRef();
-
-    return NodeRef(m_nUsedPos,m_nDepth);
-}
-//-----------------------------------------------------------------------------
-
-ValueRef AnyNodeRef::toValue() const
-{
-    OSL_PRECOND( isValid(), "ERROR: Configuration: AnyNodeRef operation requires valid node" );
-    if (!isValid() || isNode()) return ValueRef();
-
-    return ValueRef(m_sNodeName, m_nUsedPos);
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// hashing any pointer
-//-----------------------------------------------------------------------------
-static // for now
-// should move this to a more public place sometime
-// need  this, as STLPORT does not hash sal_(u)Int64 (at least on MSVC)
-inline
-size_t hash64(sal_uInt64 n)
-{
-    // simple solution (but the same that STLPORT uses for unsigned long long (if enabled))
-    return static_cast<size_t>(n);
-}
-//-----------------------------------------------------------------------------
-
-static // for now
-// should move this to a more public place sometime
-inline
-size_t hashAnyPointer(void* p)
-{
-    // most portable quick solution IMHO (we need this cast for UNO tunnels anyway)
-    sal_uInt64 n = reinterpret_cast<sal_uInt64>(p);
-
-    return hash64(n);
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class NodeID
-//-----------------------------------------------------------------------------
-
-NodeID::NodeID(rtl::Reference< Tree > const& rTree, NodeRef const& rNode)
-: m_pTree( rTree.get() )
-, m_nNode( rNode.getOffset() )
-{
-}
-//-----------------------------------------------------------------------------
-
-NodeID::NodeID(Tree* pImpl, unsigned int nNode)
-: m_pTree( pImpl )
-, m_nNode( nNode )
-{
-}
-//-----------------------------------------------------------------------------
-
-bool NodeID::isEmpty() const
-{
-    OSL_ENSURE( m_pTree == NULL || m_pTree->isValidNode(m_nNode), "Node does not match tree in NodeID");
-    return m_pTree == NULL;
-}
-//-----------------------------------------------------------------------------
-
-bool NodeID::isValidNode() const
-{
-    return m_pTree != NULL && m_pTree->isValidNode(m_nNode);
-}
-//-----------------------------------------------------------------------------
-
-// hashing
-size_t NodeID::hashCode() const
-{
-    return hashAnyPointer(m_pTree) + 5*m_nNode;
-}
-//-----------------------------------------------------------------------------
-
-unsigned int NodeID::toIndex() const
-{
-    unsigned int n = m_nNode;
-    if (m_pTree) 
-    {
-        OSL_ENSURE(m_pTree->isValidNode(n),"Cannot produce valid Index for NodeID");
-
-        n -= Tree::ROOT;
-    }
-    return n;
-}
-
-NodeRef NodeID::getNode() const {
-    return m_pTree == 0 ? NodeRef() : m_pTree->getNode(m_nNode);
-}
-
-//-----------------------------------------------------------------------------
-bool operator < (NodeID const& lhs, NodeID const& rhs)
-{
-    if (lhs.m_pTree == rhs.m_pTree)
-        return lhs.m_nNode < rhs.m_nNode;
-    else
-        return std::less<Tree*>()(lhs.m_pTree,rhs.m_pTree);
-}
-
-//-----------------------------------------------------------------------------
-// class SubNodeID
-//-----------------------------------------------------------------------------
-
-SubNodeID::SubNodeID()
-: m_sNodeName()
-, m_aParentID(0,0)
-{
-}
-//-----------------------------------------------------------------------------
-
-SubNodeID::SubNodeID(rtl::Reference< Tree > const& rTree, NodeRef const& rParentNode, rtl::OUString const& aName)
-: m_sNodeName(aName)
-, m_aParentID(rTree,rParentNode)
-{
-}
-//-----------------------------------------------------------------------------
-
-SubNodeID::SubNodeID(NodeID const& rParentNodeID, rtl::OUString const& aName)
-: m_sNodeName(aName)
-, m_aParentID(rParentNodeID)
-{
-}
-//-----------------------------------------------------------------------------
-
-bool SubNodeID::isValidNode() const
-{
-    if (!m_aParentID.isValidNode()) return false;
-
-    OSL_ENSURE(m_sNodeName.getLength() != 0,"Invalid subnode ID: Missing name");
-
-    rtl::Reference< Tree > aCheck( m_aParentID.getTree() );
-    return aCheck->hasChild( m_aParentID.getNode(), m_sNodeName );
-}
-//-----------------------------------------------------------------------------
-
-bool operator < (SubNodeID const& lhs, SubNodeID const& rhs)
-{
-    if (lhs.m_aParentID == rhs.m_aParentID)
-        return !!(lhs.m_sNodeName < rhs.m_sNodeName);
-    else
-        return lhs.m_aParentID < rhs.m_aParentID;
-}
-
-//-----------------------------------------------------------------------------
-// Free functions
-//-----------------------------------------------------------------------------
-
-rtl::OUString validateElementName(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode )
-{
-    { (void)aTree; (void)aNode; }
-    OSL_PRECOND( !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND(  aNode.isValid(), "ERROR: Configuration: Node operation requires a valid NodeRef");
-    OSL_PRECOND( aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-
-    OSL_PRECOND(  view::ViewTreeAccess(aTree.get()).isSetNode(aNode), "ERROR: Configuration: Set node expected.");
-
-    return validateElementName(sName);
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString validateChildName(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode )
-{
-    { (void)aTree; (void)aNode; }
-    OSL_PRECOND( !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND(  aNode.isValid(), "ERROR: Configuration: Node operation requires a valid NodeRef");
-    OSL_PRECOND( aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-
-    OSL_PRECOND(  view::ViewTreeAccess(aTree.get()).isGroupNode(aNode), "ERROR: Configuration: Group node expected.");
-
-    return validateNodeName(sName);
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString validateChildOrElementName(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode )
-{
-    OSL_PRECOND( !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND(  aNode.isValid(), "ERROR: Configuration: Node operation requires a valid NodeRef");
-    OSL_PRECOND( aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-
-    OSL_PRECOND(  isStructuralNode(aTree,aNode), "ERROR: Configuration: Inner node expected.");
-
-    if (view::ViewTreeAccess(aTree.get()).isSetNode(aNode))
-        return validateElementName(sName);
-
-    else 
-        return validateNodeName(sName);
-}
-//-----------------------------------------------------------------------------
-
-Path::Component validateElementPathComponent(rtl::OUString const& sName, rtl::Reference< Tree > const& aTree, NodeRef const& aNode )
-{
-    rtl::OUString aElementName = validateElementName(sName,aTree,aNode);
-
-    rtl::Reference<Template> aTemplate = aTree->extractElementInfo(aNode);
-    if (aTemplate.is())
-    {
-        return Path::makeCompositeName( aElementName, aTemplate->getName() );
-    }
-    else
-    {
-        OSL_ENSURE(false, "WARNING: Cannot find element type information for building an element name");
-        return Path::wrapElementName(aElementName);
-    }
-}
-//-----------------------------------------------------------------------------
-
-static void implValidateLocalPath(RelativePath& _rPath, rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    if (_rPath.isEmpty())
-        throw InvalidName(_rPath.toString(), "is an empty path.");
-
-    // FOR NOW: validate only the first component
-    if (!view::ViewTreeAccess(aTree.get()).isSetNode(aNode))
-        if (!_rPath.getFirstName().isSimpleName())
-            throw InvalidName(_rPath.toString(), "is not valid in this context. Predicate expression used to select group member.");
-}
-//-----------------------------------------------------------------------------
-
-RelativePath validateRelativePath(rtl::OUString const& _sPath, rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND(  aNode.isValid(), "ERROR: Configuration: Node operation requires a valid NodeRef");
-    OSL_PRECOND( aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-
-    OSL_PRECOND(  isStructuralNode(aTree,aNode), "ERROR: Configuration: Inner node expected.");
-
-    if (  Path::isAbsolutePath(_sPath) )
-    {
-        OSL_ENSURE(false, "Absolute pathes are not allowed here (compatibility support enabled");
-        return validateAndReducePath(_sPath,aTree,aNode);
-    }
-
-    RelativePath aResult = RelativePath::parse(_sPath);
-
-    implValidateLocalPath(aResult,aTree,aNode);
-
-    return aResult;
-}
-//-----------------------------------------------------------------------------
-
-RelativePath validateAndReducePath(rtl::OUString const& _sPath, rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND(  aNode.isValid(), "ERROR: Configuration: Node operation requires a valid NodeRef");
-    OSL_PRECOND( aTree->isValidNode(aNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-
-    OSL_PRECOND(  isStructuralNode(aTree,aNode), "ERROR: Configuration: Inner node expected.");
-
-    if ( !Path::isAbsolutePath(_sPath) )
-        return validateRelativePath(_sPath,aTree,aNode);
-
-    AbsolutePath aInputPath = AbsolutePath::parse(_sPath);
-
-    RelativePath aStrippedPath = Path::stripPrefix( aInputPath, aTree->getAbsolutePath(aNode) );
-
-    implValidateLocalPath(aStrippedPath,aTree,aNode);
-
-    return aStrippedPath;
-}
-//-----------------------------------------------------------------------------
-
-bool hasChildOrElement(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, rtl::OUString const& aName)
-{
-    return view::ViewTreeAccess(aTree.get()).isSetNode(aNode) ? aTree->hasElement(aNode,aName) : aTree->hasChild(aNode,aName);	
-}
-//-----------------------------------------------------------------------------
-
-bool hasChildOrElement(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, Path::Component const& aName)
-{
-    return view::ViewTreeAccess(aTree.get()).isSetNode(aNode) ? aTree->hasElement(aNode,aName) : aTree->hasChild(aNode,aName.getName());	
-}
-//-----------------------------------------------------------------------------
-
-bool findInnerChildOrAvailableElement(rtl::Reference< Tree > & aTree, NodeRef& aNode, rtl::OUString const& aName)
-{
-    if ( view::ViewTreeAccess(aTree.get()).isSetNode(aNode) )
-    {
-        rtl::Reference< ElementTree > aElement = aTree->getAvailableElement(aNode,aName);
-        if (aElement.is())
-        {
-            aTree = aElement.get();
-            aNode = aTree->getRootNode();
-            return true;	
-        }
-    }
-    else
-    {
-        NodeRef aChild = aTree->getChildNode(aNode,aName);	
-
-        if ( aChild.isValid() )
-        {
-            aNode = aChild;
-            return true;	
-        }
-    }
-
-    return false;	
-}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef getChildOrElement(rtl::Reference< Tree > & aTree, NodeRef const& aParentNode, rtl::OUString const& aName)
-{
-    if (aTree->hasChildValue(aParentNode,aName))
-    {
-        return AnyNodeRef(aTree->getChildValue(aParentNode,aName));
-    }
-
-    else if ( view::ViewTreeAccess(aTree.get()).isSetNode(aParentNode) )
-    {
-        rtl::Reference< ElementTree > aElement = aTree->getElement(aParentNode,aName);
-        if (aElement.is())
-        {
-            aTree = aElement.get();
-            return AnyNodeRef(aTree->getRootNode());
-        }
-    }
-
-    else
-    {
-        NodeRef aChild = aTree->getChildNode(aParentNode,aName);	
-
-        if ( aChild.isValid() )
-        {
-            return AnyNodeRef(aChild);
-        }
-    }
-
-    return AnyNodeRef();	
-}
-//-----------------------------------------------------------------------------
-
-static
-inline
-bool findLocalInnerChild(rtl::Reference< Tree > const& aTree, NodeRef& aNode, Path::Component const& aName)
-{
-    NodeRef aChild = aTree->getChildNode(aNode,aName.getName());	
-
-    if ( !aChild.isValid() ) return false;
-
-    OSL_ENSURE( aName.isSimpleName(), "Child of group was found by request using element name format -failing");
-    if ( !aName.isSimpleName()) return false;
-
-    aNode = aChild;
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-static
-inline
-bool findElement(rtl::Reference< Tree > & aTree, NodeRef& aNode, Path::Component const& aName)
-{
-    rtl::Reference< ElementTree > aElement = aTree->getElement(aNode,aName.getName());
-
-    if (!aElement.is()) return false;
-
-    rtl::Reference< Tree > aFoundTree = aElement.get();
-
-    OSL_ENSURE(matches(aFoundTree->getExtendedRootName(),aName), "Element found, but type prefix does not match - failing");
-    if ( !matches(aFoundTree->getExtendedRootName(),aName) ) return false;
-
-    aTree = aFoundTree;
-    aNode = aTree->getRootNode();
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-static
-bool findLocalInnerDescendant(rtl::Reference< Tree > const& aTree, NodeRef& aNode, RelativePath& rPath)
-{
-    while ( !rPath.isEmpty() )
-    {
-        if (  view::ViewTreeAccess(aTree.get()).isSetNode(aNode) ) return false;
-
-        if ( ! findLocalInnerChild(aTree,aNode,rPath.getFirstName()) ) return false;
-
-        rPath.dropFirstName();
-    }
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-static
-bool findDeepInnerDescendant(rtl::Reference< Tree > & aTree, NodeRef& aNode, RelativePath& rPath)
-{
-    while ( !rPath.isEmpty() )
-    {
-        if ( view::ViewTreeAccess(aTree.get()).isSetNode(aNode) )
-        {
-            if ( ! findElement(aTree,aNode,rPath.getFirstName()) ) return false;
-        }
-        else
-        {
-            if ( ! findLocalInnerChild(aTree,aNode,rPath.getFirstName()) ) return false;
-        }
-
-        rPath.dropFirstName();
-    }
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-static 
-inline
-bool identifiesLocalValue(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, RelativePath const& aPath)
-{
-    if ( aPath.getDepth() == 1 )
-    {
-        Path::Component const & aLocalName = aPath.getLocalName();
-        rtl::OUString aName = aLocalName.getName(); 
-
-        if (aTree->hasChildValue(aNode,aName))
-        {
-            OSL_ENSURE( aLocalName.isSimpleName(), "Value in group was found by request using element name format");
-            if ( aLocalName.isSimpleName()) 
-                return true;
-        }
-    }
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef getLocalDescendant(rtl::Reference< Tree > const& aTree, NodeRef const& aNode, RelativePath const& rPath)
-{
-    NodeRef aNestedNode( aNode );
-    RelativePath aRemainingPath(rPath);
-
-    if ( findLocalInnerDescendant(aTree,aNestedNode,aRemainingPath) )
-    {
-        OSL_ASSERT(
-            aNestedNode.isValid() &&
-            aTree->isValidNode(aNestedNode.getOffset()));
-        return AnyNodeRef(aNestedNode);
-    }
-
-    if ( identifiesLocalValue(aTree,aNestedNode,aRemainingPath) )
-    {
-        ValueRef aValue = aTree->getChildValue(aNestedNode,rPath.getLocalName().getName());
-        OSL_ASSERT(aTree->isValidValueNode(aValue));
-        return AnyNodeRef(aValue);
-    }
-
-    return AnyNodeRef();	
-}
-//-----------------------------------------------------------------------------
-
-AnyNodeRef getDeepDescendant(rtl::Reference< Tree > & aTree, NodeRef& aNode, RelativePath& rPath)
-{
-    if ( findDeepInnerDescendant(aTree,aNode,rPath) )
-    {
-        OSL_ASSERT(
-            aNode.isValid() && aTree->isValidNode(aNode.getOffset()));
-        return AnyNodeRef(aNode);
-    }
-
-    if ( identifiesLocalValue(aTree,aNode,rPath) )
-    {
-        ValueRef aValue = aTree->getChildValue(aNode,rPath.getLocalName().getName());
-        OSL_ASSERT(aTree->isValidValueNode(aValue));
-        return AnyNodeRef(aValue);
-    }
-
-    return AnyNodeRef();	
-}
-//-----------------------------------------------------------------------------
-
-void getAllContainedNodes(rtl::Reference< Tree > const& aTree, std::vector<NodeID>& aList)
-{
-    aList.clear();
-
-    if (Tree* pImpl = aTree.get())
-    {
-        unsigned int nCount = pImpl->nodeCount();
-        aList.reserve(nCount);
-
-        unsigned int const nEnd = Tree::ROOT + nCount;
-
-        for(unsigned int nOffset = Tree::ROOT;
-            nOffset < nEnd; 
-            ++nOffset)
-        {
-            OSL_ASSERT( pImpl->isValidNode(nOffset) );
-            aList.push_back( NodeID(pImpl,nOffset) );
-        }
-
-        OSL_ASSERT( aList.size()==nCount );
-    }
-}
-//-----------------------------------------------------------------------------
-
-void getAllChildrenHelper(NodeID const& aNode, std::vector<SubNodeID>& aList)
-{
-    aList.clear();
-
-    if (Tree* pTreeImpl = aNode.getTree())
-    {
-        view::ViewTreeAccess aView(pTreeImpl);
-
-        if (unsigned int const nParent = aNode.getOffset())
-        {
-            OSL_ASSERT( pTreeImpl->isValidNode(nParent) );
-
-            if (aView.isGroupNodeAt(nParent))
-            {
-                view::GroupNode aParent = aView.getGroupNodeAt(nParent);
-
-                {
-                    CollectValueIDs aCollector(aNode, aList);       
-                    aView.dispatchToValues(aView.getGroupNodeAt(nParent),aCollector);
-                }
-
-                for(view::Node aChild = aParent.getFirstChild(); 
-                    aChild.is(); 
-                    aChild = aParent.getNextChild(aChild))
-                {
-                    OSL_ASSERT( pTreeImpl->isValidNode(aChild.get_offset()) );
-                    aList.push_back( SubNodeID( aNode, pTreeImpl->getSimpleNodeName(aChild.get_offset())) );
-                }
-            }
-        }
-    }
-}
-
-//-----------------------------------------------------------------------------
-NodeID findNodeFromIndex(rtl::Reference< Tree > const& aTree, unsigned int nIndex)
-{
-    if (Tree* pImpl = aTree.get())
-    {
-        unsigned int nNode = nIndex + Tree::ROOT;
-        if (pImpl->isValidNode(nNode))
-        {
-            return NodeID(pImpl,nNode);
-        }
-    }
-    return NodeID(0,0);
-}
-
-//-----------------------------------------------------------------------------
-
-static inline bool isRootNode(NodeRef const& aNode)
-{
-    return aNode.getOffset() == Tree::ROOT;
-}
-//-----------------------------------------------------------------------------
-#if OSL_DEBUG_LEVEL > 0
-bool isSimpleValueElement(rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !aNode.isValid() || !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND( !aNode.isValid() || aTree->isValidNode(aNode.getOffset()), "WARNING: Configuration: NodeRef does not match Tree");
-
-    view::ViewTreeAccess aView = view::ViewTreeAccess(aTree.get());
-    
-    OSL_ASSERT( !aNode.isValid() || 
-                aView.isGroupNode(aNode) || 
-                aView.isSetNode(aNode) ||
-                (aView.isValueNode(aNode) && isRootNode(aNode)) );
-
-    return aNode.isValid() && isRootNode(aNode) && aView.isValueNode(aNode);
-}
-#endif
-//-----------------------------------------------------------------------------
-
-bool isStructuralNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !aNode.isValid() || !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND( !aNode.isValid() || aTree->isValidNode(aNode.getOffset()), "WARNING: Configuration: NodeRef does not match Tree");
-
-    view::ViewTreeAccess aView = view::ViewTreeAccess(aTree.get());
-
-    OSL_ASSERT( !aNode.isValid() || 
-                aView.isGroupNode(aNode) || 
-                aView.isSetNode(aNode) ||
-                (aView.isValueNode(aNode) && isRootNode(aNode)) );
-
-    return aNode.isValid() && ! aView.isValueNode(aNode);
-}
-//-----------------------------------------------------------------------------
-
-bool isGroupNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !aNode.isValid() || !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND( !aNode.isValid() || aTree->isValidNode(aNode.getOffset()), "WARNING: Configuration: NodeRef does not match Tree");
-
-    view::ViewTreeAccess aView = view::ViewTreeAccess(aTree.get());
-
-    OSL_ASSERT( !aNode.isValid() || 
-                aView.isGroupNode(aNode) || 
-                aView.isSetNode(aNode) ||
-                (aView.isValueNode(aNode) && isRootNode(aNode)) );
-
-    return aNode.isValid() && aView.isGroupNode(aNode);
-}
-//-----------------------------------------------------------------------------
-
-bool isSetNode(rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !aNode.isValid() || !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND( !aNode.isValid() || aTree->isValidNode(aNode.getOffset()), "WARNING: Configuration: NodeRef does not match Tree");
-
-    view::ViewTreeAccess aView = view::ViewTreeAccess(aTree.get());
-
-    OSL_ASSERT( !aNode.isValid() || 
-                aView.isGroupNode(aNode) || 
-                aView.isSetNode(aNode) ||
-                (aView.isValueNode(aNode) && isRootNode(aNode)) );
-
-    return aNode.isValid() && aView.isSetNode(aNode);
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any getSimpleElementValue(rtl::Reference< Tree > const& aTree, NodeRef const& aNode)
-{
-    OSL_PRECOND( !isEmpty(aTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND( aNode.isValid(), "ERROR: Configuration: Node operation requires a valid Node");
-    OSL_PRECOND( aTree->isValidNode(aNode.getOffset()), "WARNING: Configuration: NodeRef does not match Tree");
-
-    if (!aNode.isValid()) return com::sun::star::uno::Any();
-
-    OSL_PRECOND( isSimpleValueElement(aTree, aNode), "ERROR: Configuration: Getting value is supported only for value nodes");
-    
-    view::ViewTreeAccess aView = view::ViewTreeAccess(aTree.get());
-
-    return aView.getValue(aView.toValueNode(aNode));
-}
-
-//-----------------------------------------------------------------------------
-    }	// namespace configuration
-}		// namespace configmgr
diff --git a/configmgr/source/treemgr/readonlyview.cxx b/configmgr/source/treemgr/readonlyview.cxx
deleted file mode 100644
index ad06141ad0..0000000000
--- a/configmgr/source/treemgr/readonlyview.cxx
+++ /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: readonlyview.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_configmgr.hxx"
-#include <stdio.h>
-#include "readonlyview.hxx"
-#include "viewfactory.hxx"
-#include "configexcept.hxx"
-
-namespace configmgr
-{
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-void ReadOnlyViewStrategy::failReadOnly() const
-{
-    OSL_ENSURE(false, "Changing operation attempted on read-only node data");
-    throw configuration::ConstraintViolation("INTERNAL ERROR: Trying to update a read-only node");
-}
-
-//-----------------------------------------------------------------------------
-
-bool ReadOnlyViewStrategy::doHasChanges(Node const& ) const
-{
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-void ReadOnlyViewStrategy::doMarkChanged(Node const& )
-{
-    failReadOnly();
-}
-//-----------------------------------------------------------------------------
-
-node::Attributes ReadOnlyViewStrategy::doAdjustAttributes(node::Attributes const& _aAttributes) const
-{
-    node::Attributes aAttributes = _aAttributes;
-    aAttributes.markReadonly();
-    return aAttributes;
-}
-//-----------------------------------------------------------------------------
-
-configuration::ValueMemberNode ReadOnlyViewStrategy::doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const
-{
-    if (_bForUpdate) failReadOnly();
-
-    return ViewStrategy::doGetValueMember(_aNode,_aName,_bForUpdate);
-}
-//-----------------------------------------------------------------------------
-
-void ReadOnlyViewStrategy::doInsertElement(SetNode const& , rtl::OUString const& , configuration::SetEntry const& )
-{
-    failReadOnly();
-}
-//-----------------------------------------------------------------------------
-
-void ReadOnlyViewStrategy::doRemoveElement(SetNode const& /*_aNode*/, rtl::OUString const& /*_aName*/)
-{
-    failReadOnly();
-}
-//-----------------------------------------------------------------------------
-
-extern NodeFactory& getReadAccessFactory();
-
-NodeFactory& ReadOnlyViewStrategy::doGetNodeFactory()
-{
-    return getReadAccessFactory();
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-rtl::Reference<ViewStrategy> createReadOnlyStrategy()
-{
-    return new ReadOnlyViewStrategy();
-}
-
-//-----------------------------------------------------------------------------
-
-    }
-}
diff --git a/configmgr/source/treemgr/readonlyview.hxx b/configmgr/source/treemgr/readonlyview.hxx
deleted file mode 100644
index 271a192286..0000000000
--- a/configmgr/source/treemgr/readonlyview.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: readonlyview.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 CONFIGMGR_READONLYVIEW_HXX_
-#define CONFIGMGR_READONLYVIEW_HXX_
-
-#include "viewstrategy.hxx"
-
-
-namespace configmgr
-{
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-// View behavior for direct read-only access
-//-----------------------------------------------------------------------------
-
-        class ReadOnlyViewStrategy : public ViewStrategy
-        {
-        public:
-            explicit 
-            ReadOnlyViewStrategy() {}
-
-        protected:
-            // change handling -required
-            virtual bool doHasChanges(Node const& _aNode) const;
-            virtual void doMarkChanged(Node const& _aNode);
-
-            // common attributes 
-            virtual node::Attributes doAdjustAttributes(node::Attributes const& _aAttributes) const;
-
-            // group member access
-            virtual configuration::ValueMemberNode doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const;
-
-            // set element access
-            virtual void doInsertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& aNewEntry);
-            virtual void doRemoveElement(SetNode const& _aNode, rtl::OUString const& aName);
-
-            virtual NodeFactory& doGetNodeFactory();
-        private:
-            void failReadOnly() const;
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_READONLYVIEW_HXX_
diff --git a/configmgr/source/treemgr/roottree.cxx b/configmgr/source/treemgr/roottree.cxx
deleted file mode 100644
index 0b8e895cb0..0000000000
--- a/configmgr/source/treemgr/roottree.cxx
+++ /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: roottree.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_configmgr.hxx"
-#include <stdio.h>
-
-#include "roottree.hxx"
-#include "roottreeimpl.hxx"
-#include "viewaccess.hxx"
-#include "viewfactory.hxx"
-#include "noderef.hxx"
-#include "nodechangeinfo.hxx"
-#include "treechangelist.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// factory methods
-//-----------------------------------------------------------------------------
-
-rtl::Reference< Tree > createReadOnlyTree(	AbsolutePath const& aRootPath, 
-                                            sharable::Node * cacheNode, 
-                                unsigned int nDepth,
-                TemplateProvider const& aTemplateProvider)
-{
-    return new RootTree(view::createReadOnlyStrategy(),
-                      aRootPath, cacheNode, nDepth,
-                      aTemplateProvider
-                      ); 
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< Tree > createUpdatableTree(	AbsolutePath const& aRootPath, 
-                                            sharable::Node * cacheNode, 
-                                unsigned int nDepth,
-                                TemplateProvider const& aTemplateProvider)
-{
-    return new RootTree(view::createDeferredChangeStrategy(),
-                      aRootPath, cacheNode, nDepth,
-                      aTemplateProvider
-                      ); 
-}
-
-//-----------------------------------------------------------------------------
-// update on notify method
-//-----------------------------------------------------------------------------
-bool adjustToChanges(	NodeChangesInformation& rLocalChanges, 
-                        rtl::Reference< Tree > const& aBaseTree, NodeRef const& aBaseNode, 
-                        SubtreeChange const& aExternalChange)
-{
-    OSL_PRECOND( !isEmpty(aBaseTree.get()), "ERROR: Configuration: Tree operation requires a valid Tree");
-    OSL_PRECOND( aBaseNode.isValid() && aBaseTree->isValidNode(aBaseNode.getOffset()), "ERROR: Configuration: NodeRef does not match Tree");
-    
-    if (!isEmpty(aBaseTree.get()))
-    {
-        OSL_ENSURE(rLocalChanges.empty(), "Should pass empty container to adjustToChanges(...)");
-
-        view::ViewTreeAccess(aBaseTree.get()).adjustToChanges(rLocalChanges, aBaseNode, aExternalChange);
-
-        return !rLocalChanges.empty();
-    }
-    else
-        return false;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class CommitHelper
-//-----------------------------------------------------------------------------
-struct CommitHelper::Data
-{
-    std::vector< rtl::Reference<ElementTree> > m_aRemovedElements; // filled to keep the elements alive 'till after notification
-};
-
-//-----------------------------------------------------------------------------
-CommitHelper::CommitHelper(rtl::Reference< Tree > const& aTree)
-: m_pData(  )
-, m_pTree( aTree.get() )
-{
-    OSL_ENSURE(m_pTree, "INTERNAL ERROR: Unexpected NULL tree in commit helper");
-}
-//-----------------------------------------------------------------------------
-CommitHelper::~CommitHelper()
-{
-}
-
-//-----------------------------------------------------------------------------
-bool CommitHelper::prepareCommit(TreeChangeList& rChangeList)
-{
-    OSL_ENSURE(m_pTree,"ERROR: CommitHelper: Cannot commit without a tree");
-    if (m_pTree == NULL) 
-        return false;
-
-    OSL_ENSURE(m_pData.get() == NULL,"ERROR: CommitHelper: Need to reset before reusing");
-    m_pData.reset( new Data() );
-
-    // get and check the changes
-    std::auto_ptr<SubtreeChange> pTreeChange(view::ViewTreeAccess(m_pTree).preCommitChanges(m_pData->m_aRemovedElements));
-    if (pTreeChange.get() == NULL) 
-        return false;
-
-    // find the name and path of the change
-    OSL_ENSURE(m_pTree->getSimpleRootName() == pTreeChange->getNodeName(), "ERROR in Commit: Change name mismatch");
-    
-    // now fill the TreeChangeList
-    rChangeList.setRootPath( m_pTree->getRootPath() );
-    rChangeList.root.swap( *pTreeChange );
-
-    return true;
-}
-//-----------------------------------------------------------------------------
-
-void CommitHelper::finishCommit(TreeChangeList& rChangeList)
-{
-    OSL_ENSURE(m_pTree,"INTERNAL ERROR: Nothing to finish without a tree");
-
-    // find the name and path of the change
-    AbsolutePath aPath = m_pTree->getRootPath();
-
-    OSL_ENSURE( rChangeList.getRootNodePath().toString() == aPath.toString(), "ERROR: FinishCommit cannot handle rebased changes trees");
-    if ( !matches(rChangeList.getRootNodePath(), aPath) ) 
-        throw configuration::Exception("INTERNAL ERROR: FinishCommit cannot handle rebased changes trees");
-
-    view::ViewTreeAccess(m_pTree).finishCommit(rChangeList.root);
-}
-//-----------------------------------------------------------------------------
-
-void CommitHelper::failedCommit(TreeChangeList& rChangeList)
-{
-    OSL_ENSURE(m_pTree,"INTERNAL ERROR: Nothing to finish without a tree");
-
-    AbsolutePath aPath = m_pTree->getRootPath();
-
-    OSL_ENSURE( rChangeList.getRootNodePath().toString() == aPath.toString(), "ERROR: FinishCommit cannot handle rebased changes trees");
-    if ( !matches(rChangeList.getRootNodePath(), aPath) ) 
-        throw configuration::Exception("INTERNAL ERROR: FinishCommit cannot handle rebased changes trees");
-
-    view::ViewTreeAccess(m_pTree).recoverFailedCommit(rChangeList.root);
-}
-//-----------------------------------------------------------------------------
-
-    }
-}
-
diff --git a/configmgr/source/treemgr/roottreeimpl.hxx b/configmgr/source/treemgr/roottreeimpl.hxx
deleted file mode 100644
index f9466b0255..0000000000
--- a/configmgr/source/treemgr/roottreeimpl.hxx
+++ /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: roottreeimpl.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_ROOTTREEIMPL_HXX_
-#define CONFIGMGR_ROOTTREEIMPL_HXX_
-
-#include "tree.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        /** is the Implementation class for class <type>Tree</type>.
-            <p>	Holds a list of <type>Node</type> which it allows to access by 
-                <type>unsigned int</type> (which is basically a one-based index).
-            </p>
-            <p>	Also provides for navigation to the context this tree is located in
-            </p>
-        */
-        class RootTree : public Tree
-        {
-        public:
-        //  Construction
-            /// creates a Tree without a parent tree
-            RootTree(	rtl::Reference<view::ViewStrategy> const& _xStrategy, 
-                            AbsolutePath const& aRootPath, 
-                            sharable::Node * cacheNode, unsigned int nDepth,
-                            TemplateProvider const& aTemplateProvider);	
-
-            // make it public
-        private:
-            virtual Path::Component doGetRootName() const;
-            virtual void doFinishRootPath(Path::Rep& rPath) const;
-
-            AbsolutePath            m_aRootPath;
-        };
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_ROOTTREEIMPL_HXX_
diff --git a/configmgr/source/treemgr/setnodeimpl.cxx b/configmgr/source/treemgr/setnodeimpl.cxx
deleted file mode 100644
index 91dabe58a5..0000000000
--- a/configmgr/source/treemgr/setnodeimpl.cxx
+++ /dev/null
@@ -1,997 +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: setnodeimpl.cxx,v $
- * $Revision: 1.26 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-
-#include "builddata.hxx"
-#include "setnodeimpl.hxx"
-#include "treefragment.hxx"
-#include "viewfactory.hxx"
-#include "configpath.hxx"
-#include "tree.hxx"
-#include "valuenodeimpl.hxx"
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "nodevisitor.hxx"
-#include "change.hxx"
-#include "viewaccess.hxx"
-#include "nodeconverter.hxx" 
-#include "treeactions.hxx"
-#include "treechangefactory.hxx"
-#include "collectchanges.hxx"
-#include <osl/diagnose.h>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-------------------------------------------------------------------------
-// initialization helpers
-//-------------------------------------------------------------------------
-namespace
-{
-    class CollectElementTrees : data::SetVisitor
-    {
-    public:
-        CollectElementTrees(rtl::Reference<view::ViewStrategy> const& _xStrategy, 
-                            Tree* pParentTree, unsigned int nPos, 
-                            unsigned int nDepth, 
-                            rtl::Reference<Template> const& aTemplate, 
-                            TemplateProvider const& aTemplateProvider)
-        : m_aTemplate(aTemplate)
-        , m_aTemplateProvider(aTemplateProvider)
-        , m_xStrategy(_xStrategy)
-        , m_pParentTree(pParentTree)
-        , m_nPos(nPos)
-        , m_nDepth(nDepth)
-        {
-            OSL_ENSURE(m_aTemplate.is(),"WARNING: Collecting a set without a template");				
-        }
-
-        void collect(sharable::SetNode * node) 
-        { 
-            visitElements(node);
-        }
-
-        ElementTreeData create(sharable::TreeFragment * elementTree) 
-        { 
-            OSL_ENSURE(collection.empty(),"warning: trying to reuse a full collection");
-            
-            collection.resize(1); // make an empty one for case of failure
-            this->visitTree(elementTree);
-
-            OSL_ENSURE(collection.size()==2,"warning: could not create an element");				
-            return collection.back();
-        }
-
-        std::vector<ElementTreeData> collection;
-
-       private:
-        using SetVisitor::handle;
-
-        virtual bool handle(sharable::Node * node);
-
-        virtual bool handle(sharable::ValueNode * node);
-
-        virtual bool handle(sharable::TreeFragment * tree);
-
-        void add(sharable::TreeFragment * node);
-
-        rtl::Reference<Template>		    m_aTemplate;
-        TemplateProvider	    m_aTemplateProvider;
-        rtl::Reference<view::ViewStrategy>   m_xStrategy; 
-        Tree*	m_pParentTree;
-        unsigned int	m_nPos;
-        unsigned int	m_nDepth;
-    };
-    //-------------------------------------------------------------------------
-
-    static 
-    rtl::OUString validatedName(ElementTreeData const& aTree)
-    {
-        OSL_ENSURE(aTree.isValid(), "INTERNAL ERROR: Unexpected null tree constructed in set node");
-        if (!aTree.isValid()) throw Exception("INTERNAL ERROR: Unexpected null tree in set node");
-
-        OSL_ENSURE(aTree->nodeCount(), "INTERNAL ERROR: Unexpected empty (!) tree constructed in set node");
-        OSL_ENSURE(aTree->isValidNode(Tree::ROOT), "INTERNAL ERROR: Corrupt tree constructed in set node");
-
-        return aTree->getSimpleRootName();
-    }
-    //-------------------------------------------------------------------------
-
-    static 
-    bool isInDefault(SetEntry const& _anEntry)
-    {
-        if (!_anEntry.isValid()) return false;
-
-        node::Attributes aAttributes = _anEntry.getTreeView().getRootAttributes();
-
-        bool bReplaced = aAttributes.isReplacedForUser();
-
-        return !bReplaced;
-    }
-    //-------------------------------------------------------------------------
-    bool CollectElementTrees::handle(sharable::ValueNode * node)
-    {
-        if (m_aTemplate.is())
-        {
-            OSL_ENSURE(m_aTemplate->isInstanceTypeKnown(),"ERROR: Template must have a validated type when building a set.");
-            OSL_ENSURE(m_aTemplate->isInstanceValue(),"ERROR: Found a value node in a Complex Template Set");
-
-            if (!m_aTemplate->isInstanceValue())
-                throw Exception("INTERNAL ERROR: Corrupt tree contains a value node within a template-set");
-
-            com::sun::star::uno::Type aValueType = node->getValueType();
-            com::sun::star::uno::Type aExpectedType = m_aTemplate->getInstanceType();
-
-            if (aValueType.getTypeClass() != aExpectedType.getTypeClass() &&
-                aExpectedType.getTypeClass() != uno::TypeClass_ANY &&
-                aValueType.getTypeClass() != uno::TypeClass_VOID)
-            {
-                OSL_ENSURE(false, "WARNING: ValueType of set node does not match the template type");
-            //	throw TypeMismatch(aValueType.getTypeName(),aExpectedType.getTypeName(), "INTERNAL ERROR: - Corrupt tree contains mistyped value node within a value-set")));
-            }
-        }
-        return false;
-    }
-    //-------------------------------------------------------------------------
-    bool CollectElementTrees::handle(sharable::Node * node)
-    {	
-        (void) node; // avoid warnings
-        OSL_ENSURE(!node->isValue(), "Unexpected: Value-node dispatched to wrong handler");
-        if (m_aTemplate.is())
-        {
-            OSL_ENSURE(m_aTemplate->isInstanceTypeKnown(),"ERROR: Template must have a validated type when building a set.");
-            OSL_ENSURE(!m_aTemplate->isInstanceValue(),"ERROR: Found a non-leaf node in a Value Set");
-
-            if (m_aTemplate->isInstanceValue())
-                throw Exception("INTERNAL ERROR: Corrupt tree contains a non-leaf node within a value-set");
-
-        }
-        return false;
-    }
-    //-------------------------------------------------------------------------
-    bool CollectElementTrees::handle(sharable::TreeFragment * tree)
-    {
-        bool done = visitNode(tree->getRootNode());
-        if (!done) {
-            add(tree);
-        }
-        return done;
-    }
-    //-------------------------------------------------------------------------
-    void CollectElementTrees::add(sharable::TreeFragment * tree)
-    {
-        node::Attributes const aAttributes = tree->getAttributes();
-
-    bool bReadonly  = aAttributes.isReadonly();
-    bool bInDefault = !aAttributes.isReplacedForUser();
-
-        rtl::Reference<view::ViewStrategy> xStrategy = !bReadonly ? m_xStrategy : view::createReadOnlyStrategy();
-
-        ElementTree * pNewTree;
-        if (m_pParentTree)
-            pNewTree = new ElementTree(xStrategy, *m_pParentTree, m_nPos, tree, m_nDepth, m_aTemplate, m_aTemplateProvider);
-
-        else
-            pNewTree = new ElementTree(xStrategy, tree, m_nDepth, m_aTemplate, m_aTemplateProvider);
-            
-        collection.push_back( ElementTreeData(pNewTree,bInDefault));
-    }
-}
-
-//-------------------------------------------------------------------------
-// class ElementSet
-//-------------------------------------------------------------------------
-
-bool ElementSet::hasElement(rtl::OUString const& aName) const
-{
-    return m_aData.find(aName) != m_aData.end();
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData* ElementSet::getElement(rtl::OUString const& aName)
-{
-    Data::iterator it = m_aData.find(aName);
-    if (it != m_aData.end())
-        return &it->second;
-    else	
-        return 0;
-}
-//-------------------------------------------------------------------------
-
-
-ElementTreeData const* ElementSet::getElement(rtl::OUString const& aName) const
-{
-    Data::const_iterator it = m_aData.find(aName);
-    if (it != m_aData.end())
-        return &it->second;
-    else	
-        return 0;
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData ElementSet::findElement(rtl::OUString const& aName)
-{
-    ElementTreeData aRet;
-
-    Data::iterator it = m_aData.find(aName);
-    if (it != m_aData.end())
-        aRet = it->second;
-        
-    return aRet;
-}
-//-------------------------------------------------------------------------
-
-void ElementSet::insertElement(rtl::OUString const& aName, ElementTreeData const& aNewEntry)
-{
-    bool bInserted = m_aData.insert(Data::value_type(aName, aNewEntry)).second;
-
-    OSL_ENSURE(bInserted,"INTERNAL ERROR: Inserted set Element was already present");
-    if (!bInserted) throw Exception("INTERNAL ERROR: Inserted set Element was already present");
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData ElementSet::replaceElement(rtl::OUString const& aName, ElementTreeData const& aNewEntry)
-{
-    OSL_ENSURE(m_aData.find(aName) != m_aData.end(),"INTERNAL ERROR: Replaced set Element is not present");
-
-    ElementTreeData& rElement = m_aData[aName];
-
-    ElementTreeData aOld = rElement;
-    rElement = aNewEntry;
-
-    return aOld;
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData ElementSet::removeElement(rtl::OUString const& aName)
-{
-    Data::iterator it = m_aData.find(aName);
-    OSL_ENSURE(it != m_aData.end(),"INTERNAL ERROR: Removed set Element is not present");
-
-    ElementTreeData aOld;
-    if (it != m_aData.end())
-    {
-        aOld = it->second;
-        m_aData.erase(it);
-    }
-    return aOld;
-}
-//-------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class SetEntry
-//-----------------------------------------------------------------------------
-
-SetEntry::SetEntry(ElementTree* pTree_)
-: m_pTree(pTree_)
-{
-    OSL_ENSURE(pTree_ == 0 || pTree_->isValidNode(Tree::ROOT),
-                "INTERNAL ERROR: Invalid empty tree used for SetEntry ");
-}
-
-//-----------------------------------------------------------------------------
-
-view::ViewTreeAccess SetEntry::getTreeView() const
-{
-    OSL_ENSURE(isValid(), "Cannot get View Access for NULL SetEntry");
-    return view::ViewTreeAccess(m_pTree);
-}
-
-//-----------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-
-//-------------------------------------------------------------------------
-// class SetNodeImpl
-//-------------------------------------------------------------------------
-
-SetNodeImpl::SetNodeImpl(sharable::SetNode * _pNodeRef,Template* pTemplate) 
-: NodeImpl(reinterpret_cast<sharable::Node *>(_pNodeRef))
-,m_aTemplate(pTemplate)
-,m_aTemplateProvider()
-,m_pParentTree(0)
-,m_nContextPos(0)
-,m_aInit(0)
-{
-}
-    // unbind the original
-//-----------------------------------------------------------------------------
-
-SetNodeImpl::~SetNodeImpl() 
-{
-}
-//-----------------------------------------------------------------------------
-
-void SetNodeImpl::rebuildFrom(SetNodeImpl& rOldData, sharable::SetNode * newNode)
-{ 
-    m_aTemplate         = rOldData.m_aTemplate;
-    m_aTemplateProvider = rOldData.m_aTemplateProvider;
-    m_pParentTree       = rOldData.m_pParentTree;
-    m_nContextPos       = rOldData.m_nContextPos;
-    m_aInit             = rOldData.m_aInit;
-
-    if (rOldData.implHasLoadedElements())
-    {
-        rOldData.doTransferElements(m_aDataSet);
-        implRebuildElements(newNode);
-        OSL_ASSERT(this->implHasLoadedElements());
-    }
-    else
-        OSL_ASSERT(!this->implHasLoadedElements());
-    
-    rOldData.m_aTemplate.clear();
-    rOldData.m_aTemplateProvider = TemplateProvider();
-    rOldData.m_pParentTree = 0;
-    rOldData.m_nContextPos = 0;
-
-}
-
-//-----------------------------------------------------------------------------
-void SetNodeImpl::doTransferElements(ElementSet& rReplacement)
-{
-    m_aDataSet.swap(rReplacement);
-}
-//-----------------------------------------------------------------------------
-
-void SetNodeImpl::implRebuildElements(sharable::SetNode * newNode)
-{
-    OSL_ENSURE(m_pParentTree,"Cannot rebuild set without context tree");
-    rtl::Reference<view::ViewStrategy> xNewStrategy = m_pParentTree->getViewBehavior();
-
-    for(ElementSet::Iterator it = m_aDataSet.begin(), stop = m_aDataSet.end();
-    it != stop;
-    ++it)
-    {
-        OSL_ASSERT(it->isValid());
-        if (!it->isValid()) continue;
-
-        ElementTreeData aElement = *it;
-        rtl::OUString aName = aElement->getSimpleRootName();
-
-        sharable::TreeFragment * aNewElementAccess = newNode->getElement(aName);
-        OSL_ASSERT(
-            aNewElementAccess != 0 && aElement->getOriginalTreeAccess() != 0);
-
-    aElement->rebuild(xNewStrategy,aNewElementAccess);
-    }
-}
-//-----------------------------------------------------------------------------
-
-sharable::SetNode * SetNodeImpl::getDataAccess() const
-{ 
-    sharable::Node * node = getOriginalNodeAccess();
-    OSL_ASSERT(node != 0 && node->isSet());
-    return &node->set;
-}
-//-----------------------------------------------------------------------------
-
-Tree*	SetNodeImpl::getParentTree() const 
-{ 
-    OSL_ENSURE(m_pParentTree,"Set Node: Parent tree not set !");
-    return m_pParentTree; 
-}
-//-----------------------------------------------------------------------------
-
-unsigned int	SetNodeImpl::getContextOffset() const 
-{ 
-    OSL_ENSURE(m_nContextPos,"Set Node: Position within parent tree not set !");
-    return m_nContextPos; 
-}
-//-----------------------------------------------------------------------------
-
-bool SetNodeImpl::doIsEmpty() const 
-{ 
-    /*
-    for(ElementSet::Iterator it = m_aDataSet.begin(), stop = m_aDataSet.end();
-        it != stop;
-        ++it)
-    {
-        if (!it->isEmpty()) 
-            return false;
-    }
-    return true; 
-    */
-    return m_aDataSet.isEmpty();
-}
-//-------------------------------------------------------------------------
-
-ElementTree* SetNodeImpl::doFindElement(rtl::OUString const& aName)
-{ 
-    return m_aDataSet.findElement(aName).get(); 
-}
-//-------------------------------------------------------------------------
-void SetNodeImpl::doDifferenceToDefaultState(SubtreeChange& _rChangeToDefault, ISubtree& _rDefaultTree)
-{
-    OSL_ENSURE(implHasLoadedElements(),"Should not query difference to default state for set that is not loaded");
-    implDifferenceToDefaultState(_rChangeToDefault,_rDefaultTree);
-}
-//-----------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::doAdjustToAddedElement(rtl::OUString const& aName, AddNode const& aAddNodeChange, ElementTreeData const & aNewElement)
-{
-    return implAdjustToAddedElement(aName,aNewElement,aAddNodeChange.isReplacing());
-}
-//-------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::implAdjustToAddedElement(rtl::OUString const& aName, ElementTreeData const & aNewElement, bool _bReplacing)
-{
-    { (void)_bReplacing; }
-    OSL_ENSURE( validatedName(aNewElement) == aName, "Unexpected name on new element" );
-
-    if (hasStoredElement(aName))
-    {
-        OSL_ENSURE( _bReplacing, "Added Element already exists - replacing" );
-
-        ElementTreeData aOldElement = this->replaceElement(aName,aNewElement);
-
-        return implCreateReplace(aName,aNewElement,aOldElement);
-    }
-    else
-    {
-        OSL_ENSURE( !_bReplacing, "Replaced Element doesn't exist - simply adding" );
-        this->insertElement(aName,aNewElement);
-
-        return implCreateInsert(aName,aNewElement);
-    }
-}
-//-------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::doAdjustToRemovedElement(rtl::OUString const& aName, RemoveNode const& /*aRemoveNodeChange*/)
-{
-    return implAdjustToRemovedElement(aName);
-}
-//-------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::implAdjustToRemovedElement(rtl::OUString const& aName)
-{
-    if (ElementTreeData* pOriginal = getStoredElement(aName))
-    {
-        ElementTreeData aOldElement = *pOriginal;
-        this->removeElement(aName);
-
-        return implCreateRemove(aName,aOldElement);
-    }
-    else
-    {
-        OSL_ENSURE( false, "Removed Element doesn't exist - ignoring" );
-        return 0;
-    }
-}
-//-------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::implCreateInsert(rtl::OUString const& aName, ElementTreeData const& aNewElement) const
-{
-    Path::Component aFullName = Path::makeCompositeName(aName, this->getElementTemplate()->getName());
-
-    SetElementChangeImpl* pRet = new SetInsertImpl(aFullName, aNewElement.tree, true);
-    pRet->setTarget( getParentTree(), getContextOffset() );
-    return pRet;
-}
-//-------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::implCreateReplace(rtl::OUString const& aName, ElementTreeData const& aNewElement, ElementTreeData const& aOldElement) const
-{
-    Path::Component aFullName = Path::makeCompositeName(aName, this->getElementTemplate()->getName());
-
-    SetElementChangeImpl* pRet = new SetReplaceImpl(aFullName, aNewElement.tree, aOldElement.tree);
-    pRet->setTarget( getParentTree(), getContextOffset() );
-    return pRet;
-}
-//-------------------------------------------------------------------------
-
-SetElementChangeImpl* SetNodeImpl::implCreateRemove(rtl::OUString const& aName, ElementTreeData const& aOldElement) const
-{
-    Path::Component aFullName = Path::makeCompositeName(aName, this->getElementTemplate()->getName());
-
-    SetElementChangeImpl* pRet = new SetRemoveImpl(aFullName, aOldElement.tree);
-    pRet->setTarget( getParentTree(), getContextOffset() );
-    return pRet;
-}
-//-------------------------------------------------------------------------
-
-void SetNodeImpl::insertElement(rtl::OUString const& aName, ElementTreeData const& aNewElement) 
-{ 
-    attach(aNewElement,aName);
-    try 
-    { 
-        m_aDataSet.insertElement(aName,aNewElement); 
-    }
-    catch (std::exception&) 
-    { 
-        detach(aNewElement); 
-        throw; 
-    }
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData	SetNodeImpl::replaceElement(rtl::OUString const& aName, ElementTreeData const& aNewElement) 
-{ 
-    attach(aNewElement,aName);
-    try 
-    { 
-        ElementTreeData aOldElement = m_aDataSet.replaceElement(aName,aNewElement);
-        detach(aOldElement); 
-        return aOldElement;
-    }
-    catch (std::exception&) 
-    { 
-        detach(aNewElement); 
-        throw; 
-    }
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData	SetNodeImpl::removeElement(rtl::OUString const& aName)
-{ 
-    ElementTreeData aOldElement = m_aDataSet.removeElement(aName);
-    detach(aOldElement); 
-    return aOldElement;
-}
-//-------------------------------------------------------------------------
-SetNodeVisitor::Result	SetNodeImpl::doDispatchToElements(SetNodeVisitor& aVisitor)
-{
-    SetNodeVisitor::Result eRet = SetNodeVisitor::CONTINUE;
-    for(ElementSet::Iterator it = m_aDataSet.begin(), stop = m_aDataSet.end();
-        it != stop && eRet != SetNodeVisitor::DONE; 
-        ++it)
-    {
-        eRet = aVisitor.visit( SetEntry(it->get()) ); 
-    }
-    return eRet;
-}
-//-----------------------------------------------------------------------------
-
-void SetNodeImpl::attach(ElementTreeData const& aNewElement, rtl::OUString const& aName)
-{ 
-    // check for name (this also reject NULLs, therefore it should go first)
-    rtl::OUString aActualName = validatedName(aNewElement);
-
-    Tree*	pParentContext	= getParentTree();
-    unsigned int	nParentOffset	= getContextOffset();
-
-    OSL_ENSURE(nParentOffset != 0 && pParentContext != 0,"INTERNAL ERROR: Set has no context");
-
-    bool bHasContext = (aNewElement->getContextTree() != 0);
-
-    if (bHasContext)
-    {	
-        if (aNewElement->getContextTree() != pParentContext)
-        {
-            OSL_ENSURE(false,"INTERNAL ERROR: New set element belongs to another context tree" );
-            throw Exception("INTERNAL ERROR: New set element belongs to another context tree" );
-        }
-        if (aNewElement->getContextNode() != nParentOffset)
-        {
-            OSL_ENSURE(false,"INTERNAL ERROR: New set element belongs to another context node" );
-            throw Exception("INTERNAL ERROR: New set element belongs to another context node" );
-        }
-    }
-    else
-    {
-        OSL_ENSURE(aNewElement->getContextNode() == 0, "INTERNAL ERROR: New element has context position without a parent");
-        aNewElement->moveTree(pParentContext,nParentOffset); 
-    }
-
-    // check for and correct a misnomer - do only after parenthood is assured (else we don't own it anyways)
-    if (aName != aActualName)
-    {
-    //	OSL_ENSURE(aActualName.isEmpty(), "WARNING: Wrongly named tree inserted in set node");
-        aNewElement->renameTree(aName);
-        
-        aActualName = validatedName(aNewElement);
-        if (aName !=aActualName )
-        {
-            OSL_ENSURE(false, "INTERNAL ERROR: Cannot rename tree in set node");
-            throw Exception("INTERNAL ERROR: Cannot rename tree for insertion into set node");
-        }
-    }
-}
-//-------------------------------------------------------------------------
-
-void SetNodeImpl::detach(ElementTreeData const& aOldElement)
-{ 
-    if (aOldElement.isValid())
-    {
-        aOldElement->detachTree();
-    }
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData SetNodeImpl::entryToElement(SetEntry const& _anEntry)
-{ 
-    ElementTree * pTree = _anEntry.tree();
-    return ElementTreeData(pTree, isInDefault(_anEntry));
-}
-//-------------------------------------------------------------------------
-
-
-SetElementChangeImpl* SetNodeImpl::doAdjustChangedElement(NodeChangesInformation& rLocalChanges, rtl::OUString const& aName, Change const& _aElementChange)
-{
-    SetElementChangeImpl* pThisChange  = NULL;
-    
-    if (ElementTreeData* pElement = getStoredElement(aName))
-    {
-        OSL_ASSERT(pElement->isValid());
-
-        if (SubtreeChange const * subtreeChange = dynamic_cast< SubtreeChange const * >(&_aElementChange))
-        {
-            // recurse to element tree
-            Tree * elementTree = pElement->get();
-
-            view::getViewBehavior(elementTree)->adjustToChanges(rLocalChanges, view::getRootNode(elementTree), *subtreeChange);
-        }
-        else if (ValueChange const * valueChange = dynamic_cast< ValueChange const * >(&_aElementChange))
-        {
-            // make an element for the old element
-            std::auto_ptr<ValueNode> aOldNode = OTreeNodeConverter().createCorrespondingNode(*valueChange);
-            aOldNode->setValue(valueChange->getOldValue());
-
-            bool bWasDefault = (valueChange->getMode() == ValueChange::wasDefault);
-
-            std::auto_ptr<INode> aBasePtr(aOldNode.release());
-            rtl::OUString aElementTypeName = getElementTemplate()->getName();
-            rtl::Reference< data::TreeSegment > aOldBaseTree = data::TreeSegment::create( aBasePtr, aElementTypeName );
-
-            rtl::Reference<ElementTree> aOldElement = new ElementTree(aOldBaseTree, getElementTemplate(), getTemplateProvider());
-
-            OSL_ASSERT(aOldBaseTree.is()); // the tree took ownership
-            OSL_ASSERT(aOldElement->isFree()); // the tree is free-floating
-
-            pThisChange = implCreateReplace(aName,*pElement,ElementTreeData(aOldElement,bWasDefault));
-        }
-        else
-            OSL_ENSURE( false, "Unexpected kind of change to set element" );
-
-    }
-    else
-    {
-        // could be changed to do an insert instead (?)
-        OSL_ENSURE( false, "Changed Element doesn't exist - (and not adding now)" );
-    }
-    return pThisChange;
-}
-//-------------------------------------------------------------------------
-
-bool SetNodeImpl::implHasLoadedElements() const 
-{
-    return m_aInit == 0; // cannot check whether init was called though ...
-}
-//-----------------------------------------------------------------------------
-
-void SetNodeImpl::initElements(TemplateProvider const& aTemplateProvider,Tree& rParentTree,unsigned int nPos,unsigned int nDepth)
-{
-    OSL_ENSURE(m_pParentTree == 0 || m_pParentTree == &rParentTree,	"WARNING: Set Node: Changing parent");
-    OSL_ENSURE(m_nContextPos == 0 || m_nContextPos == nPos,			"WARNING: Set Node: Changing location within parent");
-    m_pParentTree = &rParentTree;
-    m_nContextPos = nPos;
-
-    OSL_ENSURE(!m_aTemplateProvider.isValid() || !implHasLoadedElements(),"ERROR: Reinitializing set"); //doClearElements();
-    OSL_ASSERT(doIsEmpty()); //doClearElements();
-
-    OSL_ENSURE(!m_aTemplate.is() || m_aTemplate->isInstanceTypeKnown(),"ERROR: Need a type-validated template to fill a set");
-    OSL_ENSURE(aTemplateProvider.isValid() || nDepth == 0 || m_aTemplate->isInstanceValue(), "ERROR: Need a template provider to fill a non-primitive set");
-
-    if (nDepth > 0) // dont set a template provider for zero-depth sets
-    {
-        m_aInit = nDepth;
-        m_aTemplateProvider = aTemplateProvider;
-    }
-}
-//-----------------------------------------------------------------------------
-
-bool SetNodeImpl::implLoadElements() 
-{
-    if (m_aInit > 0)
-    {
-    OSL_ENSURE(!getElementTemplate().is() || getElementTemplate()->isInstanceTypeKnown(),"ERROR: Need a type-validated template to fill a set");
-    OSL_ENSURE(getTemplateProvider().isValid() || getElementTemplate()->isInstanceValue(), "ERROR: Need a template provider to fill a non-primitive set");
-
-        unsigned int nDepth = m_aInit;
-    implInitElements(this->getDataAccess(),nDepth);
-    m_aInit = 0;
-    }
-    OSL_ASSERT(implHasLoadedElements());
-
-    return m_aInit == 0;
-}
-//-----------------------------------------------------------------------------
-
-void SetNodeImpl::implEnsureElementsLoaded() 
-{
-    if (!implLoadElements())
-        throw ConstraintViolation("Trying to access set elements beyond the loaded nestíng level");
-}
-//-----------------------------------------------------------------------------
-
-void SetNodeImpl::implInitElements(sharable::SetNode * node, unsigned int nDepth)
-{
-    Tree* pThisTree = getParentTree();
-
-    OSL_ENSURE(pThisTree,"Cannot load elements of a set that has no parent tree");
-
-    CollectElementTrees aCollector( pThisTree->getViewBehavior(), pThisTree, getContextOffset(),
-                                    nDepth, getElementTemplate(), getTemplateProvider() );
-    aCollector.collect(node);
-
-    for(std::vector<ElementTreeData>::const_iterator it = aCollector.collection.begin(), stop = aCollector.collection.end();
-        it != stop; ++it)
-    {
-        implInitElement(implValidateElement(*it));
-    }
-}
-//-------------------------------------------------------------------------
-
-void SetNodeImpl::implInitElement(ElementTreeData const& aNewElement) 
-{ 
-    OSL_PRECOND(aNewElement.isValid(),"INTERNAL ERROR: Set element is NULL");
-    OSL_ENSURE(!aNewElement->isFree(),"INTERNAL ERROR: Set element is free-floating");
-
-    OSL_ENSURE(aNewElement->getContextTree() == getParentTree(),"INTERNAL ERROR: Set element has wrong context tree");
-    OSL_ENSURE(aNewElement->getContextNode() == getContextOffset(),"INTERNAL ERROR: Set element has wrong context node");
-
-    rtl::OUString aName = validatedName(aNewElement);
-
-    OSL_ENSURE(aName.getLength() != 0,"INTERNAL ERROR: Unnamed element in set");
-    OSL_ENSURE(m_aDataSet.getElement(aName) == 0,"INTERNAL ERROR: Duplicate element name in set");
-
-    m_aDataSet.insertElement(aName,aNewElement); 
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData SetNodeImpl::makeAdditionalElement(rtl::Reference<view::ViewStrategy> const& _xStrategy, AddNode const& aAddNodeChange, unsigned int nDepth)
-{
-    OSL_ENSURE(aAddNodeChange.wasInserted(), "Cannot integrate element that is not in tree yet");
-
-    sharable::TreeFragment * aAddedTree = aAddNodeChange.getInsertedTree();
-    // need 'unsafe', because ownership would be gone when notifications are sent
-    if (aAddedTree != NULL)
-    {
-        CollectElementTrees aCollector( _xStrategy, getParentTree(), getContextOffset(),
-                                        nDepth, getElementTemplate(), getTemplateProvider() );
-
-        return implValidateElement(aCollector.create(aAddedTree));
-    }
-
-    return ElementTreeData();
-}
-//-------------------------------------------------------------------------
-
-ElementTreeData SetNodeImpl::implValidateElement(ElementTreeData const& aNewElement)
-{
-    rtl::Reference<Template> aTemplate = getElementTemplate();
-    OSL_ENSURE(aTemplate.is(),"INTERNAL ERROR: No template in set node");
-    OSL_ENSURE(aTemplate->isInstanceTypeKnown(),"INTERNAL ERROR: Unspecifed template in set node");
-
-    OSL_ENSURE(aNewElement.isValid(),"INTERNAL ERROR: Unexpected NULL element in set node");
-    if (aNewElement.isValid())
-    {
-        if (aTemplate->isInstanceValue())
-        {
-            if (aNewElement->nodeCount() == 0)
-            {
-                OSL_ENSURE(false,"INTERNAL ERROR: Invalid (empty) element tree in value set");
-                throw Exception("INTERNAL ERROR: Invalid (empty) element tree in value set");
-            }
-            if (aNewElement->nodeCount() > 1)
-            {
-                OSL_ENSURE(false,"INTERNAL ERROR: Complex element tree in value set");
-                throw Exception("INTERNAL ERROR: Complex element tree in value set");
-            }
-
-            view::Node aElementRoot = view::getRootNode(aNewElement.get());
-
-            OSL_ENSURE(aElementRoot.isValueNode(),"INTERNAL ERROR: Inserting complex type into value set node");
-             
-            view::ValueNode aValueNode(aElementRoot);
-            com::sun::star::uno::Type aValueType = aValueNode.get_impl()->getValueType();
-
-            OSL_ENSURE(	aValueType.getTypeClass() != uno::TypeClass_INTERFACE,
-                        "INTERNAL ERROR: Inserting complex type into value set node");
-
-            com::sun::star::uno::Type aElementType	= aTemplate->getInstanceType();
-
-            if (aValueType != aElementType)
-            {
-                // handle 'Any'
-                if (aElementType.getTypeClass() != uno::TypeClass_ANY)
-                {
-                    OSL_ENSURE(false,"INTERNAL ERROR:  ´Wrong value type inserting into value set");
-                    throw TypeMismatch(aValueType.getTypeName(), aElementType.getTypeName(),
-                                        "- INTERNAL ERROR: Mistyped element in value set");
-                }
-            }
-        }
-        else // a complete tree
-        {
-            // TODO: add some validation here
-            if (!aNewElement->isTemplateInstance())
-            {
-                throw TypeMismatch(	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<Unknown> [Missing Template]")),
-                                    aTemplate->getName(),
-                                    " - Trying to insert element without template into set");
-            }
-            if (!aNewElement->isInstanceOf(aTemplate))
-            {
-                throw TypeMismatch(	aNewElement->getTemplate()->getPathString(),
-                                    aTemplate->getPathString(),
-                                    " - Trying to insert element with wrong template into set");
-            }
-        }
-    }
-    return aNewElement;
-}
-//-------------------------------------------------------------------------
-
-namespace
-{
-    //-------------------------------------------------------------------------
-    class DiffToDefault : data::SetVisitor
-    {
-        SubtreeChange&          m_rChange;
-        ISubtree&               m_rDefaultTree;
-        OTreeChangeFactory&     m_rChangeFactory;
-    public:
-        explicit
-        DiffToDefault(SubtreeChange& _rChange, ISubtree& _rDefaultTree)
-        : m_rChange(_rChange)
-        , m_rDefaultTree(_rDefaultTree)
-        , m_rChangeFactory( getDefaultTreeChangeFactory() )
-        {   
-        }
-
-        void diff(sharable::SetNode * actualTree)
-        { 
-            translate(m_rDefaultTree);
-            visitElements(actualTree); 
-        }
-
-    private:
-        void translate(ISubtree& _rDefaultTree);
-        void handleDefault(rtl::Reference< data::TreeSegment > const & _pDefaultElement);
-        void handleActual(sharable::TreeFragment * element);
-
-        using SetVisitor::handle;
-        virtual bool handle(sharable::TreeFragment * tree)
-        { handleActual(tree); return false; }
-    };
-    //-------------------------------------------------------------------------
-
-    void DiffToDefault::translate(ISubtree& _rDefaultTree)
-    {
-        rtl::OUString aTypeName = _rDefaultTree.getElementTemplateName();
-        OSL_ENSURE(aTypeName.getLength(),"Cannot get element type for default set");
-
-        CollectNames aCollector;
-        aCollector.applyToChildren(_rDefaultTree);
-        
-        std::vector<rtl::OUString> const& aNames = aCollector.list();
-
-        for(std::vector<rtl::OUString>::const_iterator it = aNames.begin(); it != aNames.end(); ++it)
-        {
-            std::auto_ptr<INode> aChild = _rDefaultTree.removeChild(*it);
-            handleDefault( data::TreeSegment::create(aChild,aTypeName) );
-        }
-
-    }
-    //-------------------------------------------------------------------------
-
-    void DiffToDefault::handleDefault(rtl::Reference< data::TreeSegment > const &_pDefaultElement)
-    {
-        OSL_PRECOND(_pDefaultElement.is(), "Unexpected NULL default node");
-
-        rtl::OUString sName = _pDefaultElement->fragment->getName();
-
-        OSL_ENSURE(_pDefaultElement->fragment->getAttributes().isDefault(), "Missing default state on default element tree");
-        OSL_ENSURE(_pDefaultElement->fragment->nodes[0].isDefault(), "Missing default attribute on default node");
-
-        std::auto_ptr<AddNode> pAddIt( m_rChangeFactory.createAddNodeChange(_pDefaultElement, sName,true) );
-
-        m_rChange.addChange(base_ptr(pAddIt));
-    }
-    //-------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------	
-    void DiffToDefault::handleActual(sharable::TreeFragment * element)
-    {
-        bool bDefaultElement = element->getRootNode()->isDefault();
-
-        rtl::OUString sName = element->getName();
-
-        if (Change* pDefaultNode = m_rChange.getChange(sName) )
-        {
-
-            if (AddNode * addNode = dynamic_cast< AddNode * >(pDefaultNode))
-            {
-                if (bDefaultElement)
-                {
-                    rtl::Reference< data::TreeSegment > aDefaultTree = addNode->getNewTree();
-                    m_rDefaultTree.addChild(data::convertTree(aDefaultTree.is() ? aDefaultTree->fragment : 0, true));
-                    
-                    // no change needed - remove the change and recover the default
-                    m_rChange.removeChange(sName);
-                }
-            }
-            else
-            {
-                // should never happen
-                OSL_ASSERT(false);
-                if (bDefaultElement) m_rChange.removeChange(sName);
-            }
-        }
-        else
-        {
-            OSL_ENSURE(!bDefaultElement, "Node marked 'default' not found in actual default data");
-
-            std::auto_ptr<RemoveNode> pRemoveIt( m_rChangeFactory.createRemoveNodeChange(sName,true) );
-            // pRemoveIt->expectRemovedNode(pActualNode);
-            m_rChange.addChange(base_ptr(pRemoveIt));
-        }
-    }
-//-----------------------------------------------------------------------------
-}
-//-----------------------------------------------------------------------------
-void SetNodeImpl::implDifferenceToDefaultState(SubtreeChange& _rChangeToDefault, ISubtree& _rDefaultTree) const
-{
-    DiffToDefault(_rChangeToDefault,_rDefaultTree).diff( getDataAccess() );
-}
-//-----------------------------------------------------------------------------
-void SetNodeImpl::convertChanges(NodeChangesInformation& rLocalChanges, SubtreeChange const& rExternalChange, 
-                                 unsigned int nDepth)
-{
-    OSL_ASSERT(nDepth > 0);
-
-    if (Tree* pParentTree = this->getParentTree())
-    {
-        unsigned int nNode = getContextOffset();
-
-        OSL_ENSURE(pParentTree->isValidNode(nNode), "Invalid context node in Set");
-        OSL_ENSURE(view::Node(pParentTree, nNode).get_impl() == this, 
-                    "Wrong context node in Set");
-
-        CollectChanges aCollector(rLocalChanges, *pParentTree, nNode, getElementTemplate(), nDepth);
-
-        aCollector.collectFromChildren(rExternalChange);
-    }
-    else
-        OSL_ENSURE(false, "Missing context tree in Set");
-}
-//-----------------------------------------------------------------------------
-
-    }
-}
-
diff --git a/configmgr/source/treemgr/setnodeimpl.hxx b/configmgr/source/treemgr/setnodeimpl.hxx
deleted file mode 100644
index ba1bfaafd9..0000000000
--- a/configmgr/source/treemgr/setnodeimpl.hxx
+++ /dev/null
@@ -1,309 +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: setnodeimpl.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_SETNODEBEHAVIOR_HXX_
-#define CONFIGMGR_SETNODEBEHAVIOR_HXX_
-
-#include "nodeimpl.hxx"
-#include "tree.hxx"
-#include "template.hxx"
-#include <rtl/ref.hxx>
-
-#ifndef INCUDED_MAP
-#include <map>
-#define INCUDED_MAP
-#endif
-#ifndef INCLUDED_MEMORY
-#include <memory>
-#define INCLUDED_MEMORY
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    class SubtreeChange;
-    class AddNode;
-    class RemoveNode;
-    namespace view { class ViewTreeAccess; }
-//-----------------------------------------------------------------------------
-
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-        class SetElementChangeImpl;
-
-//-----------------------------------------------------------------------------
-    
-        struct SetEntry
-        { 
-            SetEntry(ElementTree* _pTree);
-
-            bool isValid()	const { return m_pTree != 0; }
-
-            ElementTree* tree() const { return m_pTree; }; 
-
-            view::ViewTreeAccess    getTreeView() const;
-        private:
-            ElementTree* m_pTree; 
-        };
-    //-------------------------------------------------------------------------
-
-        struct SetNodeVisitor
-        {
-            enum Result { DONE, CONTINUE };
-            virtual Result visit(SetEntry const& anEntry) = 0;
-        };
-
-    //-----------------------------------------------------------------------------
-
-    // basic implementations of set node contents
-    //-----------------------------------------------------------------------------
-
-        struct ElementTreeData
-        {
-            // construction
-            ElementTreeData() : tree(), inDefault(false) {}
-
-            ElementTreeData(rtl::Reference<ElementTree> const& _tree, bool _bDefault) 
-             : tree(_tree), inDefault(_bDefault) {}
-
-            // ORef compatibility
-            sal_Bool isValid() const { return this->tree.is(); }
-            ElementTree* get() const { return this->tree.get(); }
-            rtl::Reference<ElementTree> const& operator->() const { return this->tree; }
-            ElementTree& operator*() const { return *get(); }
-
-            // data
-            rtl::Reference<ElementTree>   tree;
-            bool                inDefault;
-        };
-    //-----------------------------------------------------------------------------
-
-        class ElementSet
-        {
-            struct FastLess
-            {
-                bool operator ()(
-                    rtl::OUString const & a, rtl::OUString const & b) const
-                {
-                    // first sort by length; order is immaterial, and it is fast
-                    return a.getLength() == b.getLength()
-                        ? a < b : a.getLength() < b.getLength();
-                }
-            };
-
-        public:
-            typedef std::map<rtl::OUString, ElementTreeData, FastLess> Data;
-
-        // the following must be implemented by derived classes
-            bool isEmpty() const { return m_aData.empty(); }
-
-            bool hasElement(rtl::OUString const& aName) const;
-            ElementTreeData* getElement(rtl::OUString const& aName);
-            ElementTreeData const* getElement(rtl::OUString const& aName) const;
-            ElementTreeData findElement(rtl::OUString const& aName);
-
-            void insertElement(rtl::OUString const& aName, ElementTreeData const& aNewEntry);
-            ElementTreeData replaceElement(rtl::OUString const& aName, ElementTreeData const& aNewEntry);
-            ElementTreeData removeElement(rtl::OUString const& aName);
-
-            void clearElements() {	m_aData.clear(); }
-
-            void swap(ElementSet& aOther) {	m_aData.swap(aOther.m_aData); }
-
-        // STL style iteration
-            class ConstIterator
-            {
-            public:
-                ConstIterator(Data::const_iterator const& it) : m_base(it) {}
-
-                ElementTreeData const& operator* () const { return  m_base->second; }
-                ElementTreeData const* operator->() const { return &m_base->second; }
-                
-                ConstIterator& operator++()		{ ++m_base; return *this; }
-                ConstIterator  operator++(int)	{ return ConstIterator(m_base++); }
-
-                ConstIterator& operator--()		{ --m_base; return *this; }
-                ConstIterator  operator--(int)	{ return ConstIterator(m_base--); }
-
-                friend bool operator ==(ConstIterator const& lhs, ConstIterator const& rhs)
-                { return lhs.m_base == rhs.m_base; }
-                friend bool operator !=(ConstIterator const& lhs, ConstIterator const& rhs)
-                { return lhs.m_base != rhs.m_base; }
-            private:
-                Data::const_iterator m_base;
-            };
-            ConstIterator begin() const	{ return ConstIterator(m_aData.begin()); }
-            ConstIterator end()	  const	{ return ConstIterator(m_aData.end()); }
-
-            class Iterator
-            {
-            public:
-                Iterator(Data::iterator const& it) : m_base(it) {}
-
-                ElementTreeData& operator* () const { return  m_base->second; }
-                ElementTreeData* operator->() const { return &m_base->second; }
-                
-                Iterator& operator++()		{ ++m_base; return *this; }
-                Iterator  operator++(int)	{ return Iterator(m_base++); }
-
-                Iterator& operator--()		{ --m_base; return *this; }
-                Iterator  operator--(int)	{ return Iterator(m_base--); }
-
-                friend bool operator ==(Iterator const& lhs, Iterator const& rhs)
-                { return lhs.m_base == rhs.m_base; }
-                friend bool operator !=(Iterator const& lhs, Iterator const& rhs)
-                { return lhs.m_base != rhs.m_base; }
-
-                operator ConstIterator() const { return ConstIterator(m_base); }
-            private:
-                Data::iterator m_base;
-            };
-            Iterator begin() 	{ return Iterator(m_aData.begin()); }
-            Iterator end()	  	{ return Iterator(m_aData.end()); }
-
-            Data::const_iterator beginNative() 	const { return m_aData.begin(); }
-            Data::const_iterator endNative()	const { return m_aData.end(); }
-        private:
-            Data m_aData;
-        };
-    //-------------------------------------------------------------------------
-
-    // Basic implementation of a set node
-    //-------------------------------------------------------------------------
-
-    class SetNodeImpl : public NodeImpl
-    {
-            friend class view::ViewStrategy;
-            ElementSet          m_aDataSet;
-            rtl::Reference<Template>	    m_aTemplate;
-            TemplateProvider    m_aTemplateProvider;
-            Tree*	    	m_pParentTree;
-            unsigned int		    m_nContextPos;
-
-            unsigned int		m_aInit;
-
-        public:
-            SetNodeImpl(sharable::SetNode * _pNodeRef, Template* pTemplate);
-
-            sharable::SetNode * getDataAccess() const;
-
-            /// Get the template that describes elements of this set
-            rtl::Reference<Template> getElementTemplate() const { return m_aTemplate; }
-
-            /// Get a template provider that can create new elements for this set
-            TemplateProvider getTemplateProvider() const { return m_aTemplateProvider; }
-
-            void convertChanges(NodeChangesInformation& rLocalChanges, SubtreeChange const& rExternalChange, unsigned int nDepth);
-
-            void	insertElement(rtl::OUString const& aName, ElementTreeData const& aNewElement); 
-            ElementTreeData	replaceElement(rtl::OUString const& aName, ElementTreeData const& aNewElement);
-            ElementTreeData	removeElement(rtl::OUString const& aName);
-
-            void rebuildFrom(SetNodeImpl& rOldData, sharable::SetNode * newNode);
-
-        protected:
-            ~SetNodeImpl();
-
-        protected:
-        // new overrideables
-            virtual bool                    doIsEmpty() const;
-            virtual ElementTree*	    doFindElement(rtl::OUString const& aName) ;
-            virtual SetNodeVisitor::Result  doDispatchToElements( SetNodeVisitor& aVisitor);
-            virtual void doDifferenceToDefaultState( SubtreeChange& _rChangeToDefault, ISubtree& _rDefaultTree);
-
-            virtual SetElementChangeImpl* doAdjustToAddedElement( rtl::OUString const& aName, AddNode const& aAddNodeChange, ElementTreeData const & aNewElement);
-            virtual SetElementChangeImpl* doAdjustToRemovedElement( rtl::OUString const& aName, RemoveNode const& aRemoveNodeChange);
-            virtual SetElementChangeImpl* doAdjustChangedElement( NodeChangesInformation& rLocalChanges, rtl::OUString const& aName, Change const& aChange);
-
-            virtual void doTransferElements(ElementSet& rReplacement);
-
-        protected:
-        // helpers
-            Tree*	getParentTree() const;
-            unsigned int	getContextOffset() const;
-
-            ElementTreeData makeElement( SetEntry const & _anEntry);
-            static ElementTreeData entryToElement(SetEntry const& _anEntry);
-            view::ViewTreeAccess getElementView();
-
-            /// Initialize the set data: Set context information, and build the view (actually loading the elements may be deferred)
-            friend class TreeImplBuilder;
-            void initElements(TemplateProvider const& aTemplateProvider, Tree& rParentTree, unsigned int nPos, unsigned int nDepth);
-
-        protected:
-            /// does this set contain any elements (loads elements if needed)
-            bool implHasLoadedElements() const;
-            bool implLoadElements();
-            void implEnsureElementsLoaded();
-            void implInitElements(sharable::SetNode * node, unsigned int nDepth);
-            void implInitElement(ElementTreeData const& aNewElement); 
- 
-            void implRebuildElements(sharable::SetNode * newNode);
-        protected:
-            SetElementChangeImpl* implCreateInsert    ( rtl::OUString const& aName, ElementTreeData const& aNewElement) const;
-            SetElementChangeImpl* implCreateReplace   ( rtl::OUString const& aName, ElementTreeData const& aNewElement, ElementTreeData const& aOldElement) const;
-            SetElementChangeImpl* implCreateRemove    ( rtl::OUString const& aName, ElementTreeData const& aOldElement) const;
-
-            SetElementChangeImpl* implAdjustToAddedElement( rtl::OUString const& aName, ElementTreeData const& aNewElement, bool _bReplacing);
-            SetElementChangeImpl* implAdjustToRemovedElement( rtl::OUString const& aName);
-            
-            ElementTreeData makeAdditionalElement( rtl::Reference<view::ViewStrategy> const& _xStrategy, AddNode const& aAddNodeChange, unsigned int nDepth);
-
-            ElementTreeData implValidateElement(ElementTreeData const& aNewElement);
-
-            void implDifferenceToDefaultState( SubtreeChange& _rChangeToDefault, ISubtree& _rDefaultTree) const;
-        protected:
-            bool hasStoredElement(rtl::OUString const& aName) const
-            { return m_aDataSet.hasElement(aName); }
-            ElementTreeData* getStoredElement(rtl::OUString const& aName)
-            { return m_aDataSet.getElement(aName); }
-            ElementTreeData const* getStoredElement(rtl::OUString const& aName) const
-            { return m_aDataSet.getElement(aName); }
-
-            ElementSet::Data::const_iterator beginElementSet() const
-            { return m_aDataSet.beginNative(); }
-            ElementSet::Data::const_iterator endElementSet() const 
-            { return m_aDataSet.endNative(); }
-
-            void attach(ElementTreeData const& aNewElement, rtl::OUString const& aName);
-            void detach(ElementTreeData const& aNewElement);
-        };
-
-//-----------------------------------------------------------------------------
-        // domain-specific 'dynamic_cast' replacement
-        SetNodeImpl&	AsSetNode  (NodeImpl& rNode);
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_SETNODEBEHAVIOR_HXX_
diff --git a/configmgr/source/treemgr/template.cxx b/configmgr/source/treemgr/template.cxx
deleted file mode 100644
index 1f8249c63f..0000000000
--- a/configmgr/source/treemgr/template.cxx
+++ /dev/null
@@ -1,127 +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: template.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_configmgr.hxx"
-
-#include "node.hxx"
-#include "template.hxx"
-#include "templateimpl.hxx"
-#include "apitypes.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// class TemplateProvider
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-TemplateProvider::TemplateProvider()
-: m_aImpl()
-{
-}
-
-//-----------------------------------------------------------------------------
-TemplateProvider::TemplateProvider(rtl::Reference< TreeManager > const & xProvider, RequestOptions const& aOptions)
-: m_aImpl( new TemplateProvider_Impl(xProvider,aOptions) )
-{
-}
-
-//-----------------------------------------------------------------------------
-TemplateProvider::TemplateProvider(TemplateProvider const& aOther)
-: m_aImpl(aOther.m_aImpl)
-{
-}
-
-//-----------------------------------------------------------------------------
-TemplateProvider& TemplateProvider::operator =(TemplateProvider const& aOther)
-{
-    m_aImpl = aOther.m_aImpl;
-    return *this;
-}
-
-//-----------------------------------------------------------------------------
-TemplateProvider::~TemplateProvider()
-{
-}
-
-//-----------------------------------------------------------------------------
-// class Template
-//-----------------------------------------------------------------------------
-
-Template::Template(rtl::OUString const& aName, rtl::OUString const& aModule,com::sun::star::uno::Type const& aType)
-: m_aName(aName)
-, m_aModule(aModule)
-, m_aInstanceType(aType)
-{
-}
-//-----------------------------------------------------------------------------
-
-bool Template::isInstanceTypeKnown() const
-{
-    OSL_ASSERT( TemplateImplHelper::getNoTypeAvailable().getTypeClass() == uno::TypeClass_VOID );
-    return m_aInstanceType.getTypeClass() != uno::TypeClass_VOID;
-}
-//-----------------------------------------------------------------------------
-
-/// checks if this is a 'value' template
-bool Template::isInstanceValue() const
-{
-    OSL_ENSURE( isInstanceTypeKnown(), "Template instance type unknown - cannot determine kind");
-    return m_aInstanceType.getTypeClass() != uno::TypeClass_INTERFACE;
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Type	Template::getInstanceType() const 
-{ 
-    OSL_ENSURE( isInstanceTypeKnown(), "Template instance type unknown - returning invalid (VOID) type");
-    return m_aInstanceType; 
-}
-//-----------------------------------------------------------------------------
-
-/// get the path where the template is located
-rtl::OUString Template::getPathString() const
-{
-    TemplateName aNames(m_aName,m_aModule);
-    return aNames.makePathString( );
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference<Template> makeSetElementTemplate(sharable::SetNode * set, TemplateProvider const& _aProvider)
-{
-    TemplateName aNames( set->getElementTemplateName(), set->getElementTemplateModule() );
-    return TemplateImplHelper::makeElementTemplateWithType(aNames, _aProvider, set);
-}
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/templateimpl.cxx b/configmgr/source/treemgr/templateimpl.cxx
deleted file mode 100644
index 87bccef5d2..0000000000
--- a/configmgr/source/treemgr/templateimpl.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: templateimpl.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-
-#include <stdio.h>
-#include "templateimpl.hxx"
-#include "treemanager.hxx"
-#include "node.hxx"
-#include "nodevisitor.hxx"
-#include "strdecl.hxx"
-#include "typeconverter.hxx"
-#include "localizedtreeactions.hxx"
-#include "treeactions.hxx"
-#include "apitypes.hxx"
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Type TemplateName::resolveSimpleTypeName(rtl::OUString const& aName)
-{
-    rtl::OUString sTypeName = aName;
-    return parseTemplateName(sTypeName);
-}
-//-----------------------------------------------------------------------------
-#if OSL_DEBUG_LEVEL > 0
-rtl::OUString TemplateName::makeNativeTypeModuleName()
-{
-    return rtl::OUString( TEMPLATE_MODULE_NATIVE_VALUE );
-}
-
-//-----------------------------------------------------------------------------
-rtl::OUString TemplateName::makeLocalizedTypeModuleName()
-{
-    return rtl::OUString( TEMPLATE_MODULE_LOCALIZED_VALUE );
-}
-#endif
-//-----------------------------------------------------------------------------
-bool TemplateName::isSimpleTypeName() const
-{
-    bool bIsSimple = (aModule.compareToAscii(TEMPLATE_MODULE_NATIVE_PREFIX,
-                                                        TEMPLATE_MODULE_NATIVE_PREFIX.getLength()) == 0);
-
-    OSL_ENSURE(!bIsSimple ||
-                aModule == makeNativeTypeModuleName() || 
-                aModule == makeLocalizedTypeModuleName(),
-                "ERROR: Invalid template module with native prefix found");
-
-    return bIsSimple;
-}
-//-----------------------------------------------------------------------------
-            
-com::sun::star::uno::Type TemplateName::resolveToSimpleType() const
-{
-    com::sun::star::uno::Type aType;
-    if ( isSimpleTypeName() )
-    {
-        aType = resolveSimpleTypeName( aName );
-    }
-    else
-        OSL_ENSURE(false, "TemplateName::resolveToSimpleType must be called only for simple type name pairs");
-    return aType;
-}
-//-----------------------------------------------------------------------------
-// class TemplateImplHelper
-//-----------------------------------------------------------------------------
-
-rtl::Reference<Template> TemplateImplHelper::createNew (TemplateName const& aNames,com::sun::star::uno::Type const& aType)
-{
-    return new Template(aNames.aName, aNames.aModule, aType);
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference<Template> TemplateImplHelper::makeElementTemplateWithType(TemplateName const& _aNames, TemplateProvider const& _aProvider, sharable::SetNode * set)
-{
-    OSL_ENSURE(_aProvider.m_aImpl.is(), "ERROR: Cannot find a template without a provider");
-
-    if (_aProvider.m_aImpl.is())
-        return _aProvider.m_aImpl->makeElementTemplateWithType(_aNames, set);
-
-    else
-        return rtl::Reference<Template>(0);
-}
-//-----------------------------------------------------------------------------
-
-void TemplateImplHelper::assignActualType (Template& aTemplate,com::sun::star::uno::Type const& aType)
-{
-    OSL_PRECOND( aType != getNoTypeAvailable(), "ERROR: Assigning NO type to a template" );
-
-    if (!aTemplate.isInstanceTypeKnown())
-        aTemplate.m_aInstanceType = aType;
-
-    OSL_ENSURE(aTemplate.isInstanceTypeKnown(), "ERROR: Could not assign given type to a template");
-    OSL_ENSURE(aTemplate.getInstanceType() == aType, "ERROR: Trying to change instance type of a template");
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class TemplateProvider_Impl
-//-----------------------------------------------------------------------------
-
-TemplateProvider_Impl::TemplateProvider_Impl(rtl::Reference< TreeManager > const & xProvider, RequestOptions const& aOptions)
-: m_xProvider(xProvider)
-, m_aOptions(aOptions)
-, m_aRepository()
-{
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< data::TreeSegment > TemplateProvider_Impl::instantiate(rtl::Reference<Template> const& aTemplate)
-{
-    if (aTemplate.is())
-    {
-        sharable::TreeFragment * aTemplateData = m_xProvider->requestTemplate(aTemplate->getName(), aTemplate->getModule());
-    
-        return cloneExpandedForLocale(aTemplateData, m_aOptions.getLocale());
-    } else {
-        return rtl::Reference< data::TreeSegment >();
-    }
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-namespace
-{
-//-----------------------------------------------------------------------------
-    struct TypeDetector : data::SetVisitor
-    {
-        enum State 
-        { 
-            Contradicting = -1, 
-            NotFound = 0,
-            SomeValue,
-            VariousValue,
-            SomeTree
-        };
-
-        State	result;
-        com::sun::star::uno::Type type;
-
-        TypeDetector() : result(NotFound), type() {}
-
-    private:
-        using SetVisitor::handle;            
-        virtual bool handle(sharable::Node * node);
-        virtual bool handle(sharable::ValueNode * node);
-    };
-//-----------------------------------------------------------------------------
-    static com::sun::star::uno::Type detectNodeType(sharable::TreeFragment * element)
-    {
-        if (element == 0)
-            throw configuration::Exception("Could not load required template to detect set elements");
-
-        TypeDetector aDetector;
-        aDetector.visitTree(element);
-
-        switch(aDetector.result)
-        {
-        case TypeDetector::SomeTree:		// found tree		
-        case TypeDetector::VariousValue:	// found an Any
-        case TypeDetector::SomeValue:		// found a particular value type
-            break;
-
-#ifdef DBG_UTIL
-        case TypeDetector::NotFound:		OSL_ENSURE(false,"Impossible Result: Node not handled");		if (false) // dirty abuse of case
-        case TypeDetector::Contradicting:	OSL_ENSURE(false,"Impossible Result: Node contradicts itself"); if (false) // dirty abuse of case
-#endif // DBG_UTIL
-        default:							OSL_ENSURE(false,"Impossible Result: Unknown result code");
-
-            throw configuration::Exception("INTERNAL ERROR: Could not detect set element type from loaded instance");
-        }
-        return aDetector.type;
-    }
-
-    //-------------------------------------------------------------------------
-    static bool detectElementType(com::sun::star::uno::Type& aType, sharable::SetNode * set)
-    {
-        TypeDetector aDetector;
-        aDetector.visitElements(set);
-
-        bool bResult = false;
-        switch(aDetector.result)
-        {
-        case TypeDetector::SomeTree:		// found tree		
-        case TypeDetector::VariousValue:	// found an Any
-            aType = aDetector.type;
-            bResult = true;
-            break;
-
-        case TypeDetector::SomeValue:		// found a value or an any
-        case TypeDetector::NotFound:		// found no element
-            break;
-            
-        case TypeDetector::Contradicting:
-            OSL_ENSURE(false,"Invalid Set: contains values and subtrees");
-            break;
-
-        default: OSL_ENSURE(false,"Unreachable code");	break;
-        }
-        return bResult;
-    }
-//-----------------------------------------------------------------------------
-
-}
-//-----------------------------------------------------------------------------
-rtl::Reference<Template> TemplateProvider_Impl::makeElementTemplateWithType(TemplateName const& _aNames, sharable::SetNode * set)
-{
-    TemplateRepository::iterator it = m_aRepository.find(_aNames);
-
-    if (it == m_aRepository.end() || !it->second->isInstanceTypeKnown())
-    {
-        com::sun::star::uno::Type aType;
-        if (_aNames.isSimpleTypeName()) // native type found
-        {
-            aType = _aNames.resolveToSimpleType();
-
-            if (aType == TemplateImplHelper::getNoTypeAvailable()) 
-                throw configuration::Exception("INTERNAL ERROR: Could not resolve native type");
-        }
-
-        else if (!detectElementType(aType, set))
-        {
-            OSL_ASSERT(_aNames.aName == set->getElementTemplateName());
-            OSL_ASSERT(_aNames.aModule == set->getElementTemplateModule());
-
-            sharable::TreeFragment * aTemplateData = m_xProvider->requestTemplate(_aNames.aName, _aNames.aModule);
-
-            aType = detectNodeType(aTemplateData); // throws if necessary
-        }
-        OSL_ASSERT( aType != TemplateImplHelper::getNoTypeAvailable() );
-
-        if (it == m_aRepository.end())
-            it = m_aRepository.insert( TemplateRepository::value_type( _aNames, TemplateImplHelper::createNew(_aNames,aType) ) ).first;
-
-        else
-            TemplateImplHelper::assignActualType(*it->second, aType);
-
-        OSL_ENSURE(it->second->isInstanceTypeKnown(), "No type assigned to Template");
-        OSL_ENSURE(it->second->getInstanceType() == aType, "Inconsistent type found for Template");
-    }
-
-#ifdef DBG_UTIL
-    else
-    {
-        OSL_ENSURE(it->second->isInstanceTypeKnown(), "No type assigned to Template");
-        com::sun::star::uno::Type aTestType;
-        if (detectElementType(aTestType, set))
-            OSL_ENSURE(it->second->getInstanceType() == aTestType, "Inconsistent type found for Template");
-    }
-#endif // DBG_UTIL
-
-    return it->second;
-
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-namespace
-{
-//-----------------------------------------------------------------------------
-    bool TypeDetector::handle(sharable::ValueNode * node)
-    {
-        com::sun::star::uno::Type aFoundType = node->getValueType();
-
-        bool isNullType = (aFoundType.getTypeClass() == uno::TypeClass_VOID);
-        bool isAnyType	= (aFoundType.getTypeClass() == uno::TypeClass_ANY);
-
-        switch (this->result) // transition depends on previous state
-        {
-        case NotFound: 
-            this->type = aFoundType;
-
-            if (isAnyType)			
-                this->result = VariousValue;
-
-            else if (!isNullType) 	
-                this->result = SomeValue;
-
-            break;
-
-        case SomeValue: 
-            if (!isNullType && this->type != aFoundType)
-            {
-                this->result = VariousValue;
-                this->type =  configapi::getAnyType();
-                OSL_ASSERT(type.getTypeClass() == uno::TypeClass_ANY);
-            }
-            break;
-
-        case VariousValue: // remain unchanged - type already is 'Any'
-            break;
-
-        case SomeTree: OSL_ENSURE(false, "Found value node does not match previous (tree) sibling");
-        default: 
-            this->result = Contradicting;
-            break;
-        }
-        return false; // always continue to detect errors in data
-    }
-//-----------------------------------------------------------------------------
-    bool TypeDetector::handle(sharable::Node * node)
-    {
-        (void) node; // avoid warnings
-        OSL_ENSURE(!node->isValue(), "Value node dipatched to wrong handler");
-        switch (this->result) // transition depends on previous state
-        {
-        case NotFound: 
-            this->type = configapi::getUnoInterfaceType();
-            this->result = SomeTree;
-            break;
-
-        case SomeTree: // remain unchanged - type already is Tree
-            break;
-
-        case SomeValue: 
-        case VariousValue:  OSL_ENSURE(false, "Found Subtree node does not match previous (value) sibling");
-        default: 
-            this->result = Contradicting;
-            break;
-        }
-        return false; // always continue to detect errors in data
-    }
-
-//-----------------------------------------------------------------------------
-} // anonymous
-//-----------------------------------------------------------------------------
-    } // configuration
-} // configmgr
-
diff --git a/configmgr/source/treemgr/templateimpl.hxx b/configmgr/source/treemgr/templateimpl.hxx
deleted file mode 100644
index 1142c59f02..0000000000
--- a/configmgr/source/treemgr/templateimpl.hxx
+++ /dev/null
@@ -1,175 +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: templateimpl.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_TEMPLATEIMPL_HXX_
-#define CONFIGMGR_TEMPLATEIMPL_HXX_
-
-#include "template.hxx"
-#include "configpath.hxx"
-#include "requestoptions.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-#include "utility.hxx"
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace data { class TreeSegment; }
-//-----------------------------------------------------------------------------
-
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-
-
-        //-----------------------------------------------------------------------------
-        // class TemplateName
-        //-----------------------------------------------------------------------------
-        struct TemplateName
-        {
-            //-----------------------------------------------------------------
-            rtl::OUString aName, aModule;
-
-            //-----------------------------------------------------------------
-            TemplateName() 
-            : aName()
-            , aModule() 
-            {}
-
-            TemplateName(rtl::OUString const& aName_) 
-            : aName(aName_)
-            , aModule() 
-            {}
-
-            TemplateName(rtl::OUString const& aName_, rtl::OUString const& aModule_) 
-            : aName(aName_)
-            , aModule(aModule_) 
-            {}
-
-            //-----------------------------------------------------------------
-
-            /// compose the path where the template is located
-            rtl::OUString makePathString() const
-            {
-                rtl::OUStringBuffer aBuffer;
-
-                if (aModule.getLength() != 0) 
-                    aBuffer.append( this->aModule ).append(sal_Unicode('/'));
-
-                aBuffer.append( this->aName );
-
-                return aBuffer.makeStringAndClear();
-            }
-            //-----------------------------------------------------------------
-            bool isEmpty() const
-            {
-                return aName.getLength() == 0; 
-            }
-
-            bool isSimpleTypeName() const;
-
-            com::sun::star::uno::Type resolveToSimpleType() const;
-            //-----------------------------------------------------------------
-
-            bool operator<(TemplateName const& aOther) const
-            {
-                return (aModule == aOther.aModule) ? (aName < aOther.aName) : (aModule < aOther.aModule);
-            }
-
-            //-----------------------------------------------------------------
-            static com::sun::star::uno::Type resolveSimpleTypeName(rtl::OUString const& aName);
-            //-----------------------------------------------------------------
-#if OSL_DEBUG_LEVEL > 0
-            static rtl::OUString makeNativeTypeModuleName();
-            //-----------------------------------------------------------------
-            static rtl::OUString makeLocalizedTypeModuleName();
-#endif
-            //-----------------------------------------------------------------
-        };
-    //-------------------------------------------------------------------------
-
-        //---------------------------------------------------------------------
-        // class TemplateImplHelper
-        //---------------------------------------------------------------------
-
-        class TemplateImplHelper
-        {
-        public:
-            //-----------------------------------------------------------------
-
-            static com::sun::star::uno::Type getNoTypeAvailable()
-            {
-                return getVoidCppuType();
-            }
-            //-----------------------------------------------------------------
-
-            static void assignActualType (Template& aTemplate,com::sun::star::uno::Type const& aType);
-            //-----------------------------------------------------------------
-
-            static rtl::Reference<Template> makeElementTemplateWithType(TemplateName const& aNames, TemplateProvider const& _aProvider, sharable::SetNode * set);
-            //-----------------------------------------------------------------
-
-            static rtl::Reference<Template> createNew (TemplateName const& aNames,com::sun::star::uno::Type const& aType);
-            //-----------------------------------------------------------------
-        };
-    //-------------------------------------------------------------------------
-
-        typedef std::map< TemplateName, rtl::Reference<Template> > TemplateRepository;
-    //-------------------------------------------------------------------------
-
-        //---------------------------------------------------------------------
-        // class TemplateProvider_Impl
-        //---------------------------------------------------------------------
-
-        struct TemplateProvider_Impl : salhelper::SimpleReferenceObject
-        {
-            TemplateProvider_Impl(rtl::Reference< TreeManager > const & xProvider, RequestOptions const& aOptions);
-            
-            rtl::Reference< data::TreeSegment > instantiate(rtl::Reference<Template> const& aTemplate);
-    
-            rtl::Reference<Template> makeElementTemplateWithType(TemplateName const& _aNames, sharable::SetNode * set);
-        private:
-            rtl::Reference< TreeManager >      m_xProvider;
-            RequestOptions          m_aOptions;
-
-            TemplateRepository      m_aRepository;
-        };
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_TEMPLATEIMPL_HXX_
diff --git a/configmgr/source/treemgr/treeimpl.cxx b/configmgr/source/treemgr/treeimpl.cxx
deleted file mode 100644
index ec0e3afece..0000000000
--- a/configmgr/source/treemgr/treeimpl.cxx
+++ /dev/null
@@ -1,1373 +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: treeimpl.cxx,v $
- * $Revision: 1.33 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#include <stdio.h>
-#include "anynoderef.hxx"
-#include "builddata.hxx"
-#include "configset.hxx"
-#include "tracer.hxx"
-#include "tree.hxx"
-#include "roottreeimpl.hxx"
-#include "nodeimpl.hxx"
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "noderef.hxx"
-#include "template.hxx"
-#include "nodevisitor.hxx"
-#include "valueref.hxx"
-#include "valuenode.hxx"
-#include "change.hxx"
-#include "valuenodeimpl.hxx"
-#include "setnodeimpl.hxx"
-#include "groupnodeimpl.hxx"
-#include "viewaccess.hxx"
-#include "viewfactory.hxx"
-#include "nodefactory.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// class TreeImplBuilder - friend of Tree
-//-----------------------------------------------------------------------------
-
-/** is a visitor-style algorithm to construct a <type>Tree::NodeList</type>
-    representing a configuration hierarchy
-*/
-class TreeImplBuilder : public data::NodeVisitor
-{
-public:
-    /** constructs a TreeImplBuilder to append onto <var>rList</var>
-        the products of <var>rFactory</var> up to depth <var>nDepth</var>
-    */
-    TreeImplBuilder(
-            TemplateProvider const& aTemplateProvider,
-            rtl::Reference<view::ViewStrategy> const& _xStrategy,
-            Tree& rTree
-         )
-        : m_xStrategy(_xStrategy)
-        , m_aTemplateProvider(aTemplateProvider)
-        , m_rFactory(_xStrategy->getNodeFactory())
-        , m_rTree(rTree)
-        , m_nParent(0)
-        , m_nDepthLeft(rTree.m_nDepth)
-    {
-        OSL_ASSERT(m_rTree.m_aNodes.empty());
-        OSL_DEBUG_ONLY(m_bMemberCheck = false);
-        m_rTree.m_xStrategy = _xStrategy;
-    }
-
-private:
-    using NodeVisitor::handle;
-
-    virtual bool handle(sharable::ValueNode * node);
-
-    virtual bool handle(sharable::GroupNode * node);
-
-    virtual bool handle(sharable::SetNode * node);
-
-    /// add a Node for group node <var>_aGroup</var> to the list
-    void addGroup(sharable::GroupNode * group);
-    /// add a Node for set node <var>_aSet</var> to the list
-    void addSet(sharable::SetNode * set);
-    /// add a Node for value node <var>rValue</var> to the list
-    void addValueElement(sharable::ValueNode * value);
-    /// add a Member for value node <var>rValue</var> to the list
-    void addValueMember(sharable::ValueNode * value);
-
-    rtl::Reference<view::ViewStrategy>  m_xStrategy;
-    TemplateProvider m_aTemplateProvider;
-    view::NodeFactory&	m_rFactory;
-    Tree&	    m_rTree;
-    unsigned int	    m_nParent;
-    unsigned int	    m_nDepthLeft;
-#if OSL_DEBUG_LEVEL > 0
-    bool m_bMemberCheck;
-#endif
-};
-//-----------------------------------------------------------------------------
-
-bool TreeImplBuilder::handle(sharable::ValueNode * node)
-{
-    if (m_nParent == 0)
-        addValueElement(node); // if it is the root it is a value set element
-    else
-        addValueMember(node); // if it is not the root it is a group member
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-bool TreeImplBuilder::handle(sharable::GroupNode * node)
-{
-    addGroup(node);
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-bool TreeImplBuilder::handle(sharable::SetNode * node)
-{
-    addSet(node);
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-void TreeImplBuilder::addValueElement(sharable::ValueNode * value)
-{
-    rtl::Reference<NodeImpl> aValueNode( m_rFactory.makeValueNode(value) );
-    OSL_ENSURE( aValueNode.is(), "could not make value node wrapper" );
-
-    OSL_ENSURE( m_nParent == 0, "Adding value element that is not root of its fragment" );
-    // TODO:!isValid() => maybe substitute a SimpleValueNodeImpl if possible
-    if( aValueNode.is() )
-    {
-        m_rTree.m_aNodes.push_back( NodeData(aValueNode, value->info.getName(), m_nParent) );
-    }
-}
-//-----------------------------------------------------------------------------
-
-void TreeImplBuilder::addValueMember(sharable::ValueNode *)
-{
-    // nothing to do
-    OSL_DEBUG_ONLY(m_bMemberCheck = true);
-}
-//-----------------------------------------------------------------------------
-
-void TreeImplBuilder::addGroup(sharable::GroupNode * group)
-{
-    rtl::Reference<NodeImpl> aGroupNode( m_rFactory.makeGroupNode(group) );
-    OSL_ENSURE( aGroupNode.is(), "could not make group node wrapper" );
-
-    // TODO:!isValid() => maybe substitute a SimpleValueNodeImpl if possible
-    if( aGroupNode.is() )
-    {
-        m_rTree.m_aNodes.push_back( NodeData(aGroupNode,group->info.getName(),m_nParent) );
-
-        // now fill in group members
-        if (m_nDepthLeft > 0)
-        {
-            unsigned int nSaveParent = m_nParent;
-            decDepth(m_nDepthLeft);
-
-            m_nParent = m_rTree.m_aNodes.size() + Tree::ROOT - 1;
-
-        #if OSL_DEBUG_LEVEL > 0
-            bool bSaveMemberCheck = m_bMemberCheck;
-            m_bMemberCheck = false;
-        #endif
-
-            // now recurse:
-            this->visitChildren(group);
-
-            OSL_ENSURE(m_nParent < m_rTree.m_aNodes.size() || m_bMemberCheck,
-                        "WARNING: Configuration: Group within requested depth has no members");
-
-            OSL_DEBUG_ONLY(m_bMemberCheck = bSaveMemberCheck);
-
-            incDepth(m_nDepthLeft);
-            m_nParent = nSaveParent;
-        }
-    }
-}
-//-----------------------------------------------------------------------------
-
-void TreeImplBuilder::addSet(sharable::SetNode * set)
-{
-    rtl::Reference<Template> aTemplate = makeSetElementTemplate(set, m_aTemplateProvider);
-    OSL_ASSERT(aTemplate.is());
-    OSL_ENSURE(aTemplate->isInstanceTypeKnown(),"ERROR: Cannor create set instance without knowing the instance type");
-
-    rtl::Reference<NodeImpl> aSetNode( m_rFactory.makeSetNode(set, aTemplate.get()) );
-    OSL_ENSURE( aSetNode.is(), "could not make set node wrapper" );
-
-    // TODO:!isValid() => maybe substitute a SimpleValueNodeImpl if possible
-    if( aSetNode.is() )
-    {
-        m_rTree.m_aNodes.push_back( NodeData(aSetNode, set->info.getName(), m_nParent) );
-
-        // this also relies on one based offsets
-        unsigned int nNodeAdded = m_rTree.m_aNodes.size() + Tree::ROOT - 1;
-
-        OSL_ASSERT(&m_rTree.m_aNodes.back().nodeImpl() == aSetNode.get());
-        static_cast<SetNodeImpl&>(*aSetNode).initElements(m_aTemplateProvider, m_rTree, nNodeAdded, m_nDepthLeft);
-    }
-}
-
-namespace {
-    class FindNonDefaultElement: public SetNodeVisitor {
-    public:
-        static bool hasNonDefaultElement(
-            view::ViewTreeAccess const & view, view::SetNode const & set)
-        {
-            FindNonDefaultElement visitor;
-            return view.dispatchToElements(set, visitor) == DONE;
-        }
-
-    protected:
-        virtual Result visit(SetEntry const & entry) {
-            OSL_ASSERT(entry.isValid());
-            rtl::Reference< Tree > tree(entry.tree());
-            OSL_ASSERT(tree.is());
-            node::Attributes atts(tree->getAttributes(tree->getRootNode()));
-            // A set element is considered default iff it is not replaced/added:
-            bool dflt = !atts.isReplacedForUser();
-            return dflt ? CONTINUE : DONE;
-        }
-    };
-
-    class SetVisitorAdapter: public SetNodeVisitor {
-    public:
-        explicit SetVisitorAdapter(NodeVisitor & visitor): m_visitor(visitor) {}
-
-    protected:
-        virtual Result visit(SetEntry const & entry) {
-            OSL_ASSERT(entry.isValid());
-            rtl::Reference< Tree > tree(entry.tree());
-            if (tree.is()) {
-                OSL_ASSERT(
-                    Result(NodeVisitor::DONE) == SetNodeVisitor::DONE &&
-                    Result(NodeVisitor::CONTINUE) == SetNodeVisitor::CONTINUE);
-                return Result(tree->visit(tree->getRootNode(), m_visitor));
-            } else {
-                return CONTINUE;
-            }
-        }
-
-    private:
-        NodeVisitor & m_visitor;
-    };
-
-    class GroupVisitorAdapter: public GroupMemberVisitor {
-    public:
-        GroupVisitorAdapter(
-            rtl::Reference< Tree > const & parentTree,
-            NodeRef const & parentNode, NodeVisitor & visitor):
-            m_parentTree(parentTree), m_parentPos(parentNode.getOffset()),
-            m_visitor(visitor)
-        {
-            OSL_ASSERT(
-                !isEmpty(parentTree.get()) && parentNode.isValid() &&
-                parentTree->isValidNode(parentNode.getOffset()));
-        }
-
-    protected:
-        virtual Result visit(ValueMemberNode const & value) {
-            OSL_ASSERT(
-                value.isValid() &&
-                Result(NodeVisitor::DONE) == GroupMemberVisitor::DONE &&
-                Result(NodeVisitor::CONTINUE) == GroupMemberVisitor::CONTINUE);
-            return Result(
-                m_parentTree->visit(
-                    ValueRef(value.getNodeName(), m_parentPos), m_visitor));
-        }
-
-    private:
-        rtl::Reference< Tree > m_parentTree;
-        unsigned int m_parentPos;
-        NodeVisitor & m_visitor;
-    };
-}
-
-//-----------------------------------------------------------------------------
-// class NodeData
-//-----------------------------------------------------------------------------
-
-NodeData::NodeData(rtl::Reference<NodeImpl> const& aSpecificNode, rtl::OUString const& aName, unsigned int nParent)
-: m_pSpecificNode(aSpecificNode)
-, m_aName_(aName)
-, m_nParent(nParent)
-{
-}
-
-//-----------------------------------------------------------------------------
-
-void NodeData::rebuild(rtl::Reference<view::ViewStrategy> const & _xNewStrategy, sharable::Node * newData)
-{
-    rtl::Reference<NodeImpl> aNewImpl;
-    if (this->isSetNode())
-    {
-        sharable::SetNode * newSet = newData == 0 ? 0 : newData->setData();
-        aNewImpl = _xNewStrategy->getNodeFactory().makeSetNode(newSet, 0);
-
-        SetNodeImpl & rOldSetData = this->setImpl();
-        SetNodeImpl & rNewSetData = static_cast<SetNodeImpl &>(*aNewImpl);
-
-        rNewSetData.rebuildFrom(rOldSetData, newSet);
-    }
-    else if (this->isGroupNode())
-        aNewImpl = _xNewStrategy->getNodeFactory().makeGroupNode(newData == 0 ? 0 : newData->groupData());
-
-    else if (this->isValueElementNode())
-        aNewImpl = _xNewStrategy->getNodeFactory().makeValueNode(newData == 0 ? 0 : newData->valueData());
-
-    m_pSpecificNode = aNewImpl;
-}
-
-//-----------------------------------------------------------------------------
-
-bool NodeData::isSetNode() const
-{
-    sharable::Node * node = getOriginalNodeAccess();
-    return node != 0 && node->isSet();
-}
-//-----------------------------------------------------------------------------
-
-bool NodeData::isValueElementNode()	const
-{
-    sharable::Node * node = getOriginalNodeAccess();
-    return node != 0 && node->isValue();
-}
-//-----------------------------------------------------------------------------
-
-bool NodeData::isGroupNode() const
-{
-    sharable::Node * node = getOriginalNodeAccess();
-    return node != 0 && node->isGroup();
-}
-//-----------------------------------------------------------------------------
-
-SetNodeImpl&   NodeData::implGetSetImpl()   const
-{
-    OSL_ASSERT(m_pSpecificNode != 0);
-    OSL_ASSERT(isSetNode());
-
-    if (!isSetNode())
-            throw Exception( "INTERNAL ERROR: Node is not a set node. Cast failing." );
-
-    return static_cast<SetNodeImpl&>(*m_pSpecificNode);
-}
-//---------------------------------------------------------------------
-
-GroupNodeImpl& NodeData::implGetGroupImpl() const
-{
-    OSL_ASSERT(m_pSpecificNode != 0);
-    OSL_ASSERT(isGroupNode());
-
-    if (!isGroupNode())
-            throw Exception( "INTERNAL ERROR: Node is not a group node. Cast failing." );
-
-    return static_cast<GroupNodeImpl&>(*m_pSpecificNode);
-}
-//---------------------------------------------------------------------
-
-ValueElementNodeImpl& NodeData::implGetValueImpl() const
-{
-    OSL_ASSERT(m_pSpecificNode != 0);
-    OSL_ASSERT(isValueElementNode());
-
-    if (!isValueElementNode())
-            throw Exception( "INTERNAL ERROR: Node is not a value node. Cast failing." );
-
-    return static_cast<ValueElementNodeImpl&>(*m_pSpecificNode);
-}
-
-sharable::Node * NodeData::getOriginalNodeAccess() const
-{
-    return m_pSpecificNode->getOriginalNodeAccess();
-}
-
-NodeImpl & NodeData::implGetNodeImpl() const 
-{
-    OSL_ASSERT(m_pSpecificNode != 0);
-    return *m_pSpecificNode;
-}
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// class Tree
-//-----------------------------------------------------------------------------
-
-/// creates a Tree for a detached, virgin instance of <var>aTemplate</var>
-Tree::Tree( )
-: m_aNodes()
-, m_pParentTree(0)
-, m_nParentNode(0)
-, m_nDepth(0)
-{
-}
-//-----------------------------------------------------------------------------
-
-Tree::Tree(	Tree& rParentTree, unsigned int nParentNode )
-: m_aNodes()
-, m_pParentTree(&rParentTree)
-, m_nParentNode(nParentNode)
-, m_nDepth(0)
-{
-}
-//-----------------------------------------------------------------------------
-
-Tree::~Tree()
-{
-}
-//-----------------------------------------------------------------------------
-
-void Tree::disposeData()
-{
-    m_aNodes.clear();
-}
-
-bool Tree::isRootNode(NodeRef const & node) const {
-        OSL_ASSERT(
-        nodeCount() != 0 && (!node.isValid() || isValidNode(node.getOffset())));
-        return node.isValid() && node.getOffset() == ROOT;
-}
-
-NodeRef Tree::getRootNode() const {
-    OSL_ASSERT(nodeCount() != 0);
-    return NodeRef(ROOT, m_nDepth);
-}
-
-NodeRef Tree::getContextNodeRef() const {
-    OSL_ASSERT(nodeCount() != 0 && (m_pParentTree == 0 || m_nParentNode != 0));
-    return m_pParentTree == 0
-        ? NodeRef() : m_pParentTree->getNode(m_nParentNode);
-}
-
-bool Tree::isValidValueNode(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0);
-    if (!(value.isValid() &&
-          value.checkValidState() &&
-          isValidNode(value.m_nParentPos) &&
-          view::ViewTreeAccess(this).isGroupNodeAt(value.m_nParentPos) &&
-          getMemberNode(value).isValid()))
-    {
-        return false;
-    }
-    OSL_ASSERT(value.m_sNodeName.getLength() != 0); // old value handling?
-    return true;
-}
-
-#if OSL_DEBUG_LEVEL > 0
-bool Tree::isValidAnyNode(AnyNodeRef const & node) {
-    OSL_ASSERT(nodeCount() != 0);
-    return node.isValid() && isValidNode(node.m_nUsedPos) &&
-        (node.isNode() ||
-         (view::ViewTreeAccess(this).isGroupNodeAt(node.m_nUsedPos) &&
-          getMemberNode(node.toValue()).isValid()));
-}
-#endif
-
-bool Tree::hasElements(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth" );
-    }
-    view::ViewTreeAccess v(this);
-    return v.isSetNode(node) && !v.isEmpty(v.toSetNode(node));
-}
-
-bool Tree::hasElement(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    return v.isSetNode(node) &&
-        v.findElement(v.toSetNode(node), name).isValid();
-}
-
-bool Tree::hasElement(NodeRef const & node, Path::Component const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    if (v.isSetNode(node)) {
-        SetEntry e(v.findElement(v.toSetNode(node), name.getName()));
-        // Check if types match:
-        return e.isValid() &&
-            Path::matches(e.tree()->getExtendedRootName(), name);
-    } else {
-        return false;
-    }
-}
-
-rtl::Reference< ElementTree > Tree::getElement(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    if (v.isSetNode(node)) {
-        SetEntry e(v.findElement(v.toSetNode(node), name));
-        return rtl::Reference< ElementTree >(e.tree());
-    } else {
-        return rtl::Reference< ElementTree >();
-    }
-}
-
-rtl::Reference< ElementTree > Tree::getAvailableElement(
-    NodeRef const & node, rtl::OUString const & name)
-{
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    view::ViewTreeAccess v(this);
-    if (v.isSetNode(node)) {
-        SetEntry e(v.findAvailableElement(v.toSetNode(node), name));
-        return rtl::Reference< ElementTree >(e.tree());
-    } else {
-        return rtl::Reference< ElementTree >();
-    }
-}
-
-bool Tree::hasChildren(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    if (v.isGroupNode(node)) {
-        view::GroupNode g(v.toGroupNode(node));
-        return v.hasValue(g) || g.getFirstChild().is();
-    } else {
-        return false;
-    }
-}
-
-bool Tree::hasChildValue(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    return v.isGroupNode(node) && v.hasValue(v.toGroupNode(node), name);
-}
-
-bool Tree::hasChildNode(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    return v.isGroupNode(node) && v.toGroupNode(node).findChild(name).is();
-}
-
-bool Tree::hasChild(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    if (v.isGroupNode(node)) {
-        view::GroupNode g(v.toGroupNode(node));
-        return v.hasValue(g, name) || g.findChild(name).is();
-    } else {
-        return false;
-    }
-}
-
-ValueRef Tree::getChildValue(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    return v.isGroupNode(node) && v.hasValue(v.toGroupNode(node), name)
-        ? ValueRef(name, node.getOffset()) : ValueRef();
-}
-
-NodeRef Tree::getChildNode(NodeRef const & node, rtl::OUString const & name)
-{
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    return NodeRef(
-        (v.isGroupNode(node)
-         ? v.toGroupNode(node).findChild(name).get_offset() : 0),
-        childDepth(node.getDepth()));
-}
-
-AnyNodeRef Tree::getAnyChild(NodeRef const & node, rtl::OUString const & name) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    unsigned int n = 0;
-    if (v.isGroupNode(node)) {
-        if (v.hasValue(v.toGroupNode(node), name)) {
-            return AnyNodeRef(name, node.getOffset());
-        }
-        n = v.toGroupNode(node).findChild(name).get_offset();
-    }
-    return AnyNodeRef(n, childDepth(node.getDepth()));
-}
-
-node::Attributes Tree::getAttributes(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    return view::ViewTreeAccess(this).getAttributes(node);
-}
-
-node::Attributes Tree::getAttributes(AnyNodeRef const & node) {
-    OSL_ASSERT(nodeCount() != 0 && isValidAnyNode(node));
-    if (node.isNode()) {
-        return view::ViewTreeAccess(this).getAttributes(node.toNode());
-    } else {
-        return getMemberNode(node.toValue()).getAttributes();
-    }
-}
-
-node::Attributes Tree::getAttributes(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0 && isValidValueNode(value));
-    return getMemberNode(value).getAttributes();
-}
-
-com::sun::star::uno::Type Tree::getUnoType(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0 && isValidValueNode(value));
-    return getMemberNode(value).getValueType();
-}
-
-NodeRef Tree::getParent(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    view::ViewTreeAccess v(this);
-    OSL_ASSERT(!v.makeNode(getRootNode()).getParent().is());
-    view::Node p(v.makeNode(node).getParent());
-    OSL_ASSERT(isValidNode(p.get_offset()));
-    return NodeRef(p.get_offset(), parentDepth(node.getDepth()));
-}
-
-NodeRef Tree::getParent(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0 && isValidValueNode(value));
-    unsigned int n = value.m_nParentPos;
-    OSL_ASSERT(n == 0 || value.m_sNodeName.getLength() != 0);
-    return getNode(n);
-}
-
-AbsolutePath Tree::getAbsolutePath(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    Path::Rep r;
-    prependLocalPathTo(node.getOffset(), r);
-    r.prepend(getRootPath().rep());
-    return AbsolutePath(r);
-}
-
-com::sun::star::uno::Any Tree::getNodeValue(ValueRef const & value) {
-    OSL_ASSERT(isValidValueNode(value));
-    return getMemberNode(value).getValue();
-}
-
-bool Tree::hasNodeDefault(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0 && isValidValueNode(value));
-    return getMemberNode(value).canGetDefaultValue();
-}
-
-bool Tree::isNodeDefault(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0 && isValidValueNode(value));
-    return hasNodeDefault(value) && getMemberNode(value).isDefault();
-}
-
-bool Tree::hasNodeDefault(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    // Not a set, then it has no default:
-    return view::ViewTreeAccess(this).isSetNode(node);
-}
-
-bool Tree::isNodeDefault(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (!hasNodeDefault(node)) {
-        return false;
-    }
-    view::ViewTreeAccess v(this);
-    OSL_ASSERT(v.isSetNode(node)); // not a set, then it has no default
-    // A set is default if all its elements are default:
-    return !FindNonDefaultElement::hasNonDefaultElement(v, v.toSetNode(node));
-}
-
-bool Tree::hasNodeDefault(AnyNodeRef const & node) {
-    OSL_ASSERT(nodeCount() != 0 && isValidAnyNode(node));
-    return node.isNode()
-        ? hasNodeDefault(node.toNode()) : hasNodeDefault(node.toValue());
-}
-
-bool Tree::isNodeDefault(AnyNodeRef const & node) {
-    OSL_ASSERT(nodeCount() != 0 && isValidAnyNode(node));
-    return node.isNode()
-        ? isNodeDefault(node.toNode()) : isNodeDefault(node.toValue());
-}
-
-bool Tree::areValueDefaultsAvailable(NodeRef const & node) {
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    view::ViewTreeAccess v(this);
-    OSL_ASSERT(v.isGroupNode(node));
-    return v.isGroupNode(node) &&
-        v.areValueDefaultsAvailable(v.toGroupNode(node));
-}
-
-com::sun::star::uno::Any Tree::getNodeDefaultValue(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0 && isValidValueNode(value));
-    ValueMemberNode m(getMemberNode(value));
-    return m.canGetDefaultValue() ?
-        m.getDefaultValue() : com::sun::star::uno::Any();
-}
-
-bool Tree::hasChanges() {
-    return view::ViewTreeAccess(this).hasChanges();
-}
-
-bool Tree::collectChanges(NodeChanges & changes) {
-    OSL_ASSERT(nodeCount() != 0);
-    view::ViewTreeAccess v(this);
-    if (v.hasChanges()) {
-        v.collectChanges(changes);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void Tree::integrate(NodeChange & change, NodeRef const & node, bool local)
-{
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (change.test().isChange()) {
-        change.apply();
-        if (local) {
-            view::ViewTreeAccess(this).markChanged(node);
-        } else {
-            rtl::Reference< Tree > at(change.getAffectedTree());
-            NodeRef an(change.getAffectedNode());
-            OSL_ASSERT(
-                !isEmpty(at.get()) && an.isValid() &&
-                at->isValidNode(an.getOffset()));
-            view::ViewTreeAccess(at.get()).markChanged(an);
-            OSL_ASSERT(view::ViewTreeAccess(this).hasChanges());
-        }
-    }
-}
-
-void Tree::integrate(NodeChanges& changes, NodeRef const & node, bool local)
-{
-    for (std::vector< NodeChange >::iterator it(changes.begin());
-         it != changes.end(); ++it)
-    {
-        integrate(*it, node, local);
-    }
-}
-
-NodeVisitor::Result Tree::dispatchToChildren(
-    NodeRef const & node, NodeVisitor & visitor)
-{
-    OSL_ASSERT(
-        nodeCount() != 0 && node.isValid() && isValidNode(node.getOffset()));
-    if (node.getDepth() == 0) {
-        CFG_TRACE_WARNING(
-            "configuration: Querying node beyond available depth");
-    }
-    view::ViewTreeAccess v(this);
-    if (v.isGroupNode(node)) {
-        view::GroupNode const p(v.toGroupNode(node));
-        OSL_ASSERT(
-            (NodeVisitor::Result(GroupMemberVisitor::DONE) ==
-             NodeVisitor::DONE) &&
-            (NodeVisitor::Result(GroupMemberVisitor::CONTINUE) ==
-             NodeVisitor::CONTINUE));
-        GroupVisitorAdapter adapter(this, node, visitor);
-        NodeVisitor::Result ret = NodeVisitor::Result(
-            v.dispatchToValues(p, adapter));
-        unsigned int n = childDepth(node.getDepth());
-        for (view::Node c(p.getFirstChild());
-             c.is() && ret != NodeVisitor::DONE; c = p.getNextChild(c))
-        {
-            ret = visit(NodeRef(c.get_offset(), n), visitor);
-        }
-        return ret;
-    } else if (v.isSetNode(node)) {
-        OSL_ASSERT(
-            NodeVisitor::Result(SetNodeVisitor::DONE) == NodeVisitor::DONE &&
-            (NodeVisitor::Result(SetNodeVisitor::CONTINUE) ==
-             NodeVisitor::CONTINUE));
-        SetVisitorAdapter adapter(visitor);
-        return NodeVisitor::Result(
-            v.dispatchToElements(v.toSetNode(node), adapter));
-    } else {
-        OSL_TRACE("configuration: Trying to iterate a value node");
-        return NodeVisitor::CONTINUE;
-    }
-}
-
-NodeRef Tree::getNode(unsigned int offset) const {
-    if (offset == 0) {
-        return NodeRef();
-    } else {
-        OSL_ASSERT(isValidNode(offset));
-        return NodeRef(
-            offset, remainingDepth(getAvailableDepth(), depthTo(offset)));
-    }
-}
-
-rtl::Reference< Template > Tree::extractElementInfo(NodeRef const & node) {
-    OSL_ASSERT(node.isValid() && isValidNode(node.getOffset()));
-    view::ViewTreeAccess v(this);
-    OSL_ASSERT(v.isSetNode(node));
-    return v.getElementTemplate(v.toSetNode(node));
-}
-
-//-----------------------------------------------------------------------------
-void Tree::rebuild(rtl::Reference<view::ViewStrategy> const & _xNewStrategy, sharable::Node * newData)
-{
-    m_xStrategy = _xNewStrategy;
-    this->implRebuild(ROOT, newData);
-}
-
-//-----------------------------------------------------------------------------
-void Tree::implRebuild(unsigned int nNode, sharable::Node * newData)
-{
-    NodeData * pNode = nodeData(nNode);
-    if (pNode->isGroupNode())
-    {
-        // first rebuild the children
-        OSL_ASSERT(newData != 0 && newData->isGroup());
-        sharable::GroupNode * newGroup = &newData->group;
-
-        for (unsigned int nChild = firstChild_(nNode); isValidNode(nChild); nChild = findNextChild_(nNode,nChild))
-        {
-            sharable::Node * childAccess = newGroup->getChild(implGetOriginalName(nChild));
-            OSL_ASSERT(childAccess != 0);
-            implRebuild(nChild, childAccess);
-        }
-    }
-
-    pNode->rebuild(m_xStrategy, newData);
-}
-
-//-----------------------------------------------------------------------------
-
-void ElementTree::doFinishRootPath(Path::Rep& rPath) const
-{
-    rPath.prepend( doGetRootName() );
-    rPath.prepend( AbsolutePath::detachedRoot().rep() );
-}
-//-----------------------------------------------------------------------------
-
-void RootTree::doFinishRootPath(Path::Rep& rPath) const
-{
-    rPath.prepend( m_aRootPath.rep() );
-}
-
-//-----------------------------------------------------------------------------
-
-void Tree::implPrependRootPath(Path::Rep& rPath) const
-{
-    if (m_pParentTree)
-    {
-        rPath.prepend( doGetRootName() );
-        OSL_ASSERT(m_nParentNode);
-        m_pParentTree->prependLocalPathTo(m_nParentNode,rPath);
-        m_pParentTree->implPrependRootPath(rPath);
-    }
-    else
-    {
-        doFinishRootPath( rPath );
-    }
-}
-//-----------------------------------------------------------------------------
-
-AbsolutePath Tree::getRootPath() const
-{
-    Path::Rep aPath;
-    implPrependRootPath(aPath);
-    return AbsolutePath(aPath);
-}
-//-----------------------------------------------------------------------------
-void Tree::build(rtl::Reference<view::ViewStrategy> const& _xStrategy, sharable::Node * rootNode, unsigned int nDepth, TemplateProvider const& aTemplateProvider)
-{
-    OSL_ASSERT(m_aNodes.empty());
-    m_nDepth = nDepth;
-    TreeImplBuilder a(aTemplateProvider, _xStrategy,*this);
-    a.visitNode(rootNode);
-}
-//-----------------------------------------------------------------------------
-
-rtl::Reference< view::ViewStrategy > Tree::getViewBehavior() const
-{
-    return m_xStrategy;
-}
-
-// context handling
-//-----------------------------------------------------------------------------
-
-void Tree::setContext(Tree* pParentTree, unsigned int nParentNode)
-{
-    OSL_ENSURE(pParentTree,"ERROR: Moving tree to nowhere");
-
-    if (pParentTree)
-    {
-        OSL_ENSURE( pParentTree->isValidNode(nParentNode),"ERROR: Moving tree to invalid node");
-        if (!pParentTree->isValidNode(nParentNode))
-            throw Exception("INTERNAL ERROR: Moving tree to invalid parent node");
-
-    //	OSL_ENSURE( pParentTree->isSetNodeAt(nParentNode),"WARNING: Moving tree to node that is not a set");
-    }
-    else
-    {
-        OSL_ENSURE( nParentNode == 0,"WARNING: Moving tree to node without a tree");
-        nParentNode = 0;
-    }
-
-    m_pParentTree = pParentTree;
-    m_nParentNode = nParentNode;
-}
-//-----------------------------------------------------------------------------
-
-void Tree::clearContext()
-{
-    m_pParentTree = 0;
-    m_nParentNode = 0;
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// Node Collection navigation
-//-----------------------------------------------------------------------------
-
-unsigned int Tree::parent_(unsigned int nNode) const
-{
-    OSL_ASSERT(isValidNode(nNode));
-    return nodeData(nNode)->getParent();
-}
-//-----------------------------------------------------------------------------
-inline // is protected and should be used only here
-rtl::OUString Tree::implGetOriginalName(unsigned int nNode) const
-{
-    OSL_ASSERT(isValidNode(nNode));
-
-    return nodeData(nNode)->getName();
-}
-//-----------------------------------------------------------------------------
-
-Path::Component ElementTree::doGetRootName() const
-{
-    return makeExtendedName( m_aElementName );
-}
-
-//-----------------------------------------------------------------------------
-
-rtl::OUString ElementTree::getSimpleRootName() const
-{
-    // Tree::getSimpleRootName tends to parse &
-    // then split the same name, burning CPU L&R
-    return m_aElementName;
-}
-
-//-----------------------------------------------------------------------------
-
-Path::Component RootTree::doGetRootName() const
-{
-    return m_aRootPath.getLocalName();
-}
-//-----------------------------------------------------------------------------
-
-
-rtl::OUString Tree::getSimpleNodeName(unsigned int nNode) const
-{
-    if (nNode == ROOT) return getSimpleRootName();
-
-    return implGetOriginalName(nNode);
-}
-//-----------------------------------------------------------------------------
-
-rtl::OUString Tree::getSimpleRootName() const
-{
-    return doGetRootName().getName();
-}
-
-//-----------------------------------------------------------------------------
-
-Path::Component Tree::getExtendedRootName() const
-{
-    return doGetRootName();
-}
-//-----------------------------------------------------------------------------
-
-unsigned int Tree::depthTo(unsigned int nNode) const
-{
-    OSL_ASSERT(isValidNode(nNode));
-
-    unsigned int nDepth = 0;
-    while( 0 != (nNode=parent_(nNode)) )
-    {
-        ++nDepth;
-    }
-
-    return nDepth;
-}
-//-----------------------------------------------------------------------------
-
-void Tree::prependLocalPathTo(unsigned int nNode, Path::Rep& rNames)
-{
-    OSL_ASSERT(isValidNode(nNode));
-
-    for (; nNode != ROOT; nNode = parent_(nNode) )
-    {
-        OSL_ENSURE( isValidNode(nNode), "ERROR: Configuration: node has invalid parent");
-        rNames.prepend( Path::wrapSimpleName( implGetOriginalName(nNode) ) );
-    }
-
-    OSL_ASSERT(nNode == ROOT);
-}
-//-----------------------------------------------------------------------------
-
-// Node iteration and access
-unsigned int Tree::firstChild_ (unsigned int nParent) const
-{
-    return findNextChild_(nParent,nParent);
-}
-//-----------------------------------------------------------------------------
-
-unsigned int Tree::findNextChild_(unsigned int nParent, unsigned int nStartAfter) const
-{
-    OSL_ASSERT(isValidNode(nParent));
-    OSL_ASSERT(nStartAfter == 0 || isValidNode(nStartAfter));
-
-    unsigned int nPos = nStartAfter ? nStartAfter : ROOT - 1;
-    unsigned int const nAfterLast = nodeCount() + ROOT;
-    while (++nPos < nAfterLast)
-    {
-        if(parent_(nPos) == nParent) return nPos;
-    }
-    return 0;
-}
-//-----------------------------------------------------------------------------
-
-unsigned int Tree::findChild_(unsigned int nParent, rtl::OUString const& aName) const
-{
-    OSL_ASSERT(isValidNode(nParent));
-
-    unsigned int nPos = nParent;
-    unsigned int const nAfterLast = nodeCount() + ROOT;
-    while (++nPos < nAfterLast)
-    {
-        if(parent_(nPos) == nParent && implGetOriginalName(nPos) == aName)
-            return nPos;
-    }
-    return 0;
-}
-
-ValueMemberNode Tree::getMemberNode(ValueRef const & value) {
-    OSL_ASSERT(nodeCount() != 0);
-    view::ViewTreeAccess v(this);
-    return v.getValue(v.getGroupNodeAt(value.m_nParentPos), value.m_sNodeName);
-}
-
-//-----------------------------------------------------------------------------
-// class RootTree
-//-----------------------------------------------------------------------------
-
-RootTree::RootTree(	rtl::Reference<view::ViewStrategy> const& _xStrategy,
-                            AbsolutePath const& aRootPath,
-                            sharable::Node * cacheNode, unsigned int nDepth,
-                            TemplateProvider const& aTemplateProvider)
-: Tree()
-, m_aRootPath(aRootPath)
-{
-//    OSL_ENSURE( aRootPath.getLocalName().getName() == cacheNode->getName(),
-//                "Constructing root node: Path does not match node name");
-
-    Tree::build(_xStrategy,cacheNode,nDepth,aTemplateProvider);
-}
-
-bool isEmpty(Tree * tree)
-{
-    return tree == 0 || tree->nodeCount() == 0;
-}
-
-//-----------------------------------------------------------------------------
-// class ElementTree
-//-----------------------------------------------------------------------------
-
-ElementTree::ElementTree(	rtl::Reference<view::ViewStrategy> const& _xStrategy,
-                                    sharable::TreeFragment * cacheTree, unsigned int nDepth,
-                                    rtl::Reference<Template> aTemplateInfo,
-                                    TemplateProvider const& aTemplateProvider )
-: Tree()
-, m_aInstanceInfo(aTemplateInfo)
-, m_aElementName(cacheTree->getName())
-, m_aDataAddress(cacheTree)
-, m_aOwnData()
-{
-    Tree::build( _xStrategy, cacheTree->getRootNode(), nDepth, aTemplateProvider );
-}
-//-----------------------------------------------------------------------------
-
-ElementTree::ElementTree(	rtl::Reference<view::ViewStrategy> const& _xStrategy,
-                                    Tree& rParentTree, unsigned int nParentNode,
-                                    sharable::TreeFragment * cacheTree, unsigned int nDepth,
-                                    rtl::Reference<Template> aTemplateInfo,
-                                    TemplateProvider const& aTemplateProvider )
-: Tree( rParentTree, nParentNode )
-, m_aInstanceInfo(aTemplateInfo)
-, m_aElementName(cacheTree->getName())
-, m_aDataAddress(cacheTree)
-, m_aOwnData()
-{
-    Tree::build( _xStrategy, cacheTree->getRootNode(), nDepth, aTemplateProvider );
-}
-//-----------------------------------------------------------------------------
-
-ElementTree::ElementTree( rtl::Reference< data::TreeSegment > const& pNewTree,
-                                    rtl::Reference<Template> aTemplate,
-                                    TemplateProvider const& aTemplateProvider )
-: Tree()
-, m_aInstanceInfo(aTemplate)
-, m_aOwnData(pNewTree)
-{
-    if (!pNewTree.is())
-    throw Exception("ERROR: Provider can't create Element Instance From Template");
-    m_aElementName = pNewTree->fragment->getName();
-    m_aDataAddress = pNewTree->fragment;
-
-    Tree::build( view::createDirectAccessStrategy(m_aOwnData), m_aOwnData->fragment->nodes, c_TreeDepthAll, aTemplateProvider );
-}
-//-----------------------------------------------------------------------------
-
-ElementTree::~ElementTree()
-{
-}
-//-----------------------------------------------------------------------------
-
-bool ElementTree::isUpdatableSegment(Tree& _rTree)
-{
-    Tree * pTree = &_rTree;
-
-    while (ElementTree * pElement = dynamic_cast< ElementTree * >(pTree))
-    {
-        if (pElement->m_aOwnData.is())
-        {
-            OSL_ENSURE( pElement->getContextTree()==NULL ||
-                        pElement->getContextTree()->getViewBehavior() != pElement->getViewBehavior(),
-                        "ElementTree with parent in same fragment should not own its data");
-            return true;
-        }
-
-        pTree = pElement->getContextTree();
-
-        if (!pTree)
-        {
-            OSL_ENSURE( false, "ElementTree without own data should have a parent");
-            return false;
-        }
-
-    }
-    OSL_ENSURE( false, "Tree is not part of free-floating segment - cannot support direct update");
-
-    return false;
-}
-//-----------------------------------------------------------------------------
-
-void ElementTree::disposeData()
-{
-    Tree::disposeData();
-    m_aOwnData.clear();
-}
-//-----------------------------------------------------------------------------
-
-Path::Component ElementTree::makeExtendedName(rtl::OUString const& _aSimpleName) const
-{
-    rtl::OUString aTypeName = implGetOriginalName(ROOT);
-
-    OSL_ENSURE(this->isTemplateInstance(), "ElementTree: Cannot discover the type this instantiatiates");
-
-    OSL_ENSURE(! this->isTemplateInstance() || this->getTemplate()->getName() == aTypeName,
-                "ElementTree: Type name does not match template");
-
-    return Path::makeCompositeName(_aSimpleName, aTypeName);
-}
-//-----------------------------------------------------------------------------
-
-// ownership handling
-//-----------------------------------------------------------------------------
-void ElementTree::rebuild(rtl::Reference<view::ViewStrategy> const & _aStrategy, sharable::TreeFragment * newTree)
-{
-    Tree::rebuild(_aStrategy, newTree->getRootNode());
-    m_aDataAddress = newTree;
-    m_aElementName = newTree->getName();
-}
-
-//-----------------------------------------------------------------------------
-/// transfer ownership to the given set
-// -----------------------------------------------------------------------------
-void ElementTree::attachTo(sharable::SetNode * owningSet, rtl::OUString const& aElementName)
-{
-    OSL_ENSURE(m_aOwnData.is(), "ERROR: Cannot add a non-owned node to a subtree");
-
-    if (m_aOwnData.is())
-    {
-        OSL_ENSURE(this->getSimpleRootName() == aElementName,"ElementTree: Attaching with unexpected element name");
-        m_aOwnData->fragment->setName(aElementName);
-
-        Tree* pOwningTree = this->getContextTree();
-        OSL_ENSURE(pOwningTree, "Element Tree Context must be set before attaching data");
-
-        if (isUpdatableSegment(*pOwningTree))
-        {
-            // copy over to the new segment
-            sharable::TreeFragment * aNewElement = data::buildTree(m_aOwnData->fragment);
-
-            owningSet->addElement(aNewElement);
-
-            rtl::Reference<view::ViewStrategy> xNewBehavior = pOwningTree->getViewBehavior();
-
-            this->rebuild(xNewBehavior,aNewElement);
-        }
-        else
-            OSL_ENSURE( false, "Cannot attach directly to new tree - no update access available");
-
-        m_aOwnData.clear();
-        OSL_ASSERT(!m_aOwnData.is());
-    }
-}
-//-----------------------------------------------------------------------------
-
-/// tranfer ownership from the given set
-void ElementTree::detachFrom(sharable::SetNode * owningSet, rtl::OUString const& aElementName)
-{
-    OSL_ENSURE(!m_aOwnData.is(),"ERROR: Cannot detach a already owned node from a subtree");
-    OSL_ENSURE(this->getSimpleRootName() == aElementName,"ElementTree: Detaching with unexpected element name");
-
-    rtl::Reference< view::ViewStrategy > xOldStrategy = this->getViewBehavior();
-    OSL_ENSURE(xOldStrategy.is(), "Element Tree Context must still have the old strategy when detaching data");
-
-    {
-        // make a new segment with a copy of the data
-        rtl::Reference< data::TreeSegment > aNewSegment = data::TreeSegment::create( this->getOriginalTreeAccess() );
-
-        OSL_ENSURE(aNewSegment.is(),"ERROR: Could not create detached copy of elment data");
-
-        this->takeTreeAndRebuild( aNewSegment );
-
-        sharable::TreeFragment * aOldElement = owningSet->removeElement(aElementName );
-        OSL_ENSURE(aOldElement != NULL,"ERROR: Detached node not found in the given subtree");
-
-        data::destroyTree(aOldElement);
-    }
-
-    OSL_ENSURE(m_aOwnData.is(),"ERROR: Could not create own data segment for detached node");
-}
-//-----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-/// transfer ownership from the given owner
-void ElementTree::takeTreeBack(rtl::Reference< data::TreeSegment > const & _aDataSegment)
-{
-    OSL_ENSURE(!m_aOwnData.is(), "ERROR: Cannot take over a node - already owning");
-    OSL_ENSURE(_aDataSegment.is(), "ERROR: Cannot take over NULL tree segment");
-
-    m_aOwnData = _aDataSegment;
-    OSL_ENSURE(m_aOwnData.is(), "ERROR: Could not take over data segment");
-
-    m_aDataAddress = m_aOwnData->fragment;
-    m_aElementName = m_aOwnData->fragment->getName();
-}
-//-----------------------------------------------------------------------------
-
-/// transfer ownership from the given owner
-void ElementTree::takeTreeAndRebuild(rtl::Reference< data::TreeSegment > const & _aDataSegment)
-{
-    OSL_ENSURE(!m_aOwnData.is(), "ERROR: Cannot take over a node - already owning");
-    OSL_ENSURE(_aDataSegment.is(), "ERROR: Cannot take over NULL tree segment");
-    this->rebuild(view::createDirectAccessStrategy(_aDataSegment), _aDataSegment->fragment);
-    m_aOwnData = _aDataSegment;
-}
-//-----------------------------------------------------------------------------
-
-/// release ownership
-rtl::Reference< data::TreeSegment > ElementTree::releaseOwnedTree()
-{
-    OSL_ENSURE(m_aOwnData.is(), "ERROR: Cannot release and rename a non-owned node");
-    rtl::Reference< data::TreeSegment > aTree(m_aOwnData);
-    m_aOwnData.clear();
-    aTree->fragment->setName(m_aElementName);
-    return aTree;
-}
-//-----------------------------------------------------------------------------
-
-// context handling
-//-----------------------------------------------------------------------------
-
-/// renames the tree's root without concern for context consistency !
-void ElementTree::renameTree(rtl::OUString const& aNewName)
-{
-    m_aElementName = aNewName;
-}
-//-----------------------------------------------------------------------------
-
-void ElementTree::moveTree(Tree* pParentTree, unsigned int nParentNode)
-{
-    Tree::setContext(pParentTree,nParentNode);
-}
-//-----------------------------------------------------------------------------
-
-void ElementTree::detachTree()
-{
-    Tree::clearContext();
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }	// namespace configuration
-}		// namespace configmgr
-
diff --git a/configmgr/source/treemgr/valuemembernode.cxx b/configmgr/source/treemgr/valuemembernode.cxx
deleted file mode 100644
index d56c811ab5..0000000000
--- a/configmgr/source/treemgr/valuemembernode.cxx
+++ /dev/null
@@ -1,336 +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: valuemembernode.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_configmgr.hxx"
-#include <stdio.h>
-
-#include "valuemembernode.hxx"
-#include "nodeimplobj.hxx"
-#include "nodechangeimpl.hxx"
-#include "change.hxx"
-#include "valuenode.hxx"
-#include <osl/diagnose.h>
-
-namespace configmgr
-{
-    namespace configuration
-    {
-
-// helpers
-//-----------------------------------------------------------------------------
-
-namespace 
-{
-
-//-----------------------------------------------------------------------------
-// internal accessors for direct updates to data
-//-----------------------------------------------------------------------------
-
-inline
-void setOriginalValue(sharable::ValueNode * const& rOriginalAddress, com::sun::star::uno::Any const& aNewValue)
-{
-    rOriginalAddress->setValue(aNewValue);
-}
-//-----------------------------------------------------------------------------
-
-inline
-void setOriginalToDefault(sharable::ValueNode * const& rOriginalAddress)
-{
-    rOriginalAddress->setToDefault();
-}
-} // anonymous namespace
-
-
-//-----------------------------------------------------------------------------
-// class ValueMemberNode
-//-----------------------------------------------------------------------------
-
-ValueMemberNode::ValueMemberNode(sharable::ValueNode * node)
-    : m_node(node)
-    , m_xDeferredOperation() 
-{}
-//-----------------------------------------------------------------------------
-ValueMemberNode::ValueMemberNode(rtl::Reference<DeferredImpl> const& _xDeferred) // must be valid
-    : m_node( _xDeferred->getOriginalNode() )
-    , m_xDeferredOperation(_xDeferred) 
-{}
-//-----------------------------------------------------------------------------
-
-ValueMemberNode::ValueMemberNode(ValueMemberNode const& rOriginal)
-    : m_node(rOriginal.m_node)
-    , m_xDeferredOperation(rOriginal.m_xDeferredOperation) 
-{}
-//-----------------------------------------------------------------------------
-ValueMemberNode& ValueMemberNode::operator=(ValueMemberNode const& rOriginal)
-{
-    m_node = rOriginal.m_node;
-    m_xDeferredOperation    = rOriginal.m_xDeferredOperation;
-    return *this;
-}
-//-----------------------------------------------------------------------------
-ValueMemberNode::~ValueMemberNode()
-{
-}
-//-----------------------------------------------------------------------------
-
-bool ValueMemberNode::isValid() const
-{
-    OSL_ASSERT( !m_xDeferredOperation.is() || 
-                 m_node == m_xDeferredOperation->getOriginalNode());
-    
-    return m_node != 0;
-}
-//-----------------------------------------------------------------------------
-
-bool ValueMemberNode::hasChange() const
-{
-    return m_xDeferredOperation.is() 
-           && m_xDeferredOperation->isChange();
-}
-//-----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-// external accessors 
-//-----------------------------------------------------------------------------
-
-rtl::OUString ValueMemberNode::getNodeName() const
-{
-    return m_node->info.getName();
-}
-//-----------------------------------------------------------------------------
-
-node::Attributes ValueMemberNode::getAttributes()	const
-{
-    return sharable::node(m_node)->getAttributes();
-}
-//-----------------------------------------------------------------------------
-
-
-bool ValueMemberNode::isDefault() const
-{
-    if (hasChange()) 
-        return m_xDeferredOperation->isToDefault();
-
-    return m_node->info.isDefault();
-}
-//-----------------------------------------------------------------------------
-
-bool ValueMemberNode::canGetDefaultValue() const
-{
-    return m_node->hasUsableDefault();
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any	ValueMemberNode::getValue() const
-{
-    if (hasChange()) 
-        return m_xDeferredOperation->getNewValue();
-
-    return m_node->getValue();
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Any ValueMemberNode::getDefaultValue() const
-{
-    return m_node->getDefaultValue();
-}
-//-----------------------------------------------------------------------------
-
-com::sun::star::uno::Type	ValueMemberNode::getValueType() const
-{
-    return m_node->getValueType();
-}
-//-----------------------------------------------------------------------------
-
-
-void ValueMemberUpdate::setValue(com::sun::star::uno::Any const& aNewValue)
-{
-    if (m_aMemberNode.m_xDeferredOperation.is())
-        m_aMemberNode.m_xDeferredOperation->setValue(aNewValue, m_aMemberNode.m_node);
-    else
-        setOriginalValue(m_aMemberNode.m_node, aNewValue );
-}
-//-----------------------------------------------------------------------------
-
-void ValueMemberUpdate::setDefault() 
-{
-    if (m_aMemberNode.m_xDeferredOperation.is())
-        m_aMemberNode.m_xDeferredOperation->setValueToDefault(m_aMemberNode.m_node);
-    else
-        setOriginalToDefault(m_aMemberNode.m_node);
-}
-
-//-----------------------------------------------------------------------------
-// class ValueMemberNode::DeferredImpl
-//-----------------------------------------------------------------------------
-
-ValueMemberNode::DeferredImpl::DeferredImpl(sharable::ValueNode * valueNode)
-: m_valueNode(valueNode)
-, m_aNewValue(valueNode->getValue())
-, m_bToDefault(false)
-, m_bChange(false)
-{}
-//-----------------------------------------------------------------------------
-
-void ValueMemberNode::DeferredImpl::setValue(com::sun::star::uno::Any const& aNewValue, sharable::ValueNode * originalNode)
-{
-    OSL_ENSURE(originalNode == m_valueNode, "Incorrect original node passed");
-    
-    m_aNewValue = aNewValue;
-    m_bToDefault = false;
-
-    m_bChange = originalNode->info.isDefault() || aNewValue != originalNode->getValue();
-}
-//-----------------------------------------------------------------------------
-
-void ValueMemberNode::DeferredImpl::setValueToDefault(sharable::ValueNode * originalNode)
-{
-    OSL_ENSURE(originalNode == m_valueNode, "Incorrect original node passed");
-    
-    m_aNewValue = originalNode->getDefaultValue();
-    m_bToDefault = true;
-
-    m_bChange = !originalNode->info.isDefault();
-}
-//-----------------------------------------------------------------------------
-
-std::auto_ptr<ValueChange> ValueMemberNode::DeferredImpl::preCommitChange()
-{
-    OSL_ENSURE(isChange(), "Trying to commit a non-change");
-
-    sharable::ValueNode * originalNode = getOriginalNode();
-
-    // first find the mode of the change
-    ValueChange::Mode eMode; 
-
-    if (m_bToDefault)
-        eMode = ValueChange::setToDefault;
-
-    else if (! originalNode->info.isDefault())
-        eMode = ValueChange::changeValue;
-
-    else
-        eMode = ValueChange::wasDefault;
-
-    // now make a ValueChange
-    std::auto_ptr<ValueChange>pChange( new ValueChange( originalNode->info.getName(),  
-                                                        sharable::node(originalNode)->getAttributes(), 
-                                                        eMode, 
-                                                        this->getNewValue(),
-                                                        originalNode->getValue()
-                                                      ) );
-
-    return  pChange;		
-}
-//-----------------------------------------------------------------------------
-
-void ValueMemberNode::DeferredImpl::finishCommit(ValueChange& rChange)
-{
-    { (void)rChange; }
-    OSL_ENSURE(rChange.getNewValue() == this->getNewValue(),"Committed change does not match the intended value");
-
-    sharable::ValueNode * originalNode = getOriginalNode();
-
-    m_aNewValue = originalNode->getValue();
-    m_bToDefault = false;
-
-    OSL_ENSURE(rChange.getNewValue() == m_aNewValue,"Committed change does not match the actual value");
-    m_bChange= false;
-}
-//-----------------------------------------------------------------------------
-
-void ValueMemberNode::DeferredImpl::revertCommit(ValueChange& rChange)
-{
-    { (void)rChange; }
-
-    OSL_ENSURE(rChange.getNewValue() == this->getNewValue(),"Reverted change does not match the intended value");
-    OSL_ENSURE(isChange(), "ValueMemeberNode::DeferredImpl: No Changes to revert");
-}
-//-----------------------------------------------------------------------------
-
-void ValueMemberNode::DeferredImpl::failedCommit(ValueChange&)
-{
-    sharable::ValueNode * originalNode = getOriginalNode();
-
-    // discard the change
-    m_aNewValue = originalNode->getValue();
-    m_bToDefault = false;
-
-    m_bChange= false;
-}
-//-----------------------------------------------------------------------------
-ValueChangeImpl* ValueMemberNode::DeferredImpl::collectChange()
-{
-    sharable::ValueNode * originalNode = getOriginalNode();
-
-    com::sun::star::uno::Any aOldValue = originalNode->getValue();
-    if (!m_bChange)
-    {
-        return NULL;
-    }
-    else if (m_bToDefault)
-    {
-        OSL_ASSERT( m_aNewValue == originalNode->getDefaultValue() );
-        return new ValueResetImpl( m_aNewValue, aOldValue );
-    }
-
-    else
-    {
-        return new ValueReplaceImpl( m_aNewValue, aOldValue );
-    }
-}
-//-----------------------------------------------------------------------------
-
-ValueChangeImpl* ValueMemberNode::DeferredImpl::adjustToChange(ValueChange const& rExternalChange)
-{
-    if (!m_bChange)
-    {
-        return NULL;
-    }
-    else if (m_bToDefault && rExternalChange.getMode() == ValueChange::changeDefault) 
-    {
-        OSL_ASSERT( m_aNewValue == rExternalChange.getOldValue() );
-        
-        m_aNewValue = rExternalChange.getNewValue();
-
-        return new ValueReplaceImpl(m_aNewValue, rExternalChange.getOldValue());
-    }
-    else // return Surrogate - does not honor m_bToDefault
-    {
-        return new ValueReplaceImpl(m_aNewValue, m_aNewValue);
-    }
-}
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-    }
-}
diff --git a/configmgr/source/treemgr/valuemembernode.hxx b/configmgr/source/treemgr/valuemembernode.hxx
deleted file mode 100644
index 7fac046425..0000000000
--- a/configmgr/source/treemgr/valuemembernode.hxx
+++ /dev/null
@@ -1,117 +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: valuemembernode.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 CONFIGMGR_VALUEMEMBERNODE_HXX_
-#define CONFIGMGR_VALUEMEMBERNODE_HXX_
-
-#include "nodeimpl.hxx"
-
-namespace configmgr
-{
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-       /// handle class for values that are not nodes themselves, but members of a group
-        class ValueMemberNode
-        {
-        public:
-            class DeferredImpl;
-        private:
-            sharable::ValueNode * m_node;
-            rtl::Reference<DeferredImpl> m_xDeferredOperation;
-        private:
-            friend class GroupNodeImpl;
-            friend class DeferredGroupNodeImpl;
-            friend class ValueMemberUpdate;
-
-            /// create a ValueMemberNode for a given node
-            explicit ValueMemberNode(sharable::ValueNode * node);
-            /// create a deferred ValueMemberNode (xOriginal must not be empty)
-            ValueMemberNode(rtl::Reference<DeferredImpl> const& _xDeferred);
-        public:
-            ValueMemberNode(ValueMemberNode const& rOriginal);
-            ValueMemberNode& operator=(ValueMemberNode const& rOriginal);
-            ~ValueMemberNode();
-
-            /// does this wrap a valid value ?
-            bool isValid() const;
-
-            /// does this wrap a change
-            bool hasChange() const;
-
-            /// retrieve the name of the underlying node
-            rtl::OUString getNodeName() const;
-            /// retrieve the attributes 
-            node::Attributes getAttributes()	const;
-
-            /// Does this node assume its default value
-            bool isDefault()		const;
-            /// is the default value of this node available
-            bool canGetDefaultValue() const; 
-            /// retrieve the current value of this node
-            com::sun::star::uno::Any	getValue()		const;
-            /// retrieve the default value of this node
-            com::sun::star::uno::Any getDefaultValue() const; 
-            
-            com::sun::star::uno::Type	getValueType()	const;
-
-        };
-    //-------------------------------------------------------------------------
-
-       /// handle class for updating values that are members of a group
-        class ValueMemberUpdate
-        {
-            ValueMemberNode                     m_aMemberNode;
-            view::ViewStrategy *                m_pStrategy; 
-        private:
-            friend class view::ViewStrategy;
-
-            ValueMemberUpdate(ValueMemberNode const& rOriginal, view::ViewStrategy& _rStrategy) 
-                : m_aMemberNode(rOriginal), m_pStrategy(&_rStrategy)  {}
-
-        public:
-            /// does this wrap a valid value ?
-            bool isValid() const  { return m_aMemberNode.isValid(); }
-
-            /// get access to the wrapped data
-            ValueMemberNode getNode() const { return m_aMemberNode; }
-
-            /// Set this node to a new value
-            void	setValue(com::sun::star::uno::Any const& aNewValue);
-
-            /// Set this node to assume its default value
-            void	setDefault(); 
-        };
-
-//-----------------------------------------------------------------------------
-    }
-}
-
-#endif // CONFIGMGR_GROUPNODEBEHAVIOR_HXX_
diff --git a/configmgr/source/treemgr/valuenodeimpl.hxx b/configmgr/source/treemgr/valuenodeimpl.hxx
deleted file mode 100644
index ed17bca95c..0000000000
--- a/configmgr/source/treemgr/valuenodeimpl.hxx
+++ /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: valuenodeimpl.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 CONFIGMGR_VALUENODEBEHAVIOR_HXX_
-#define CONFIGMGR_VALUENODEBEHAVIOR_HXX_
-
-#include "nodeimpl.hxx"
-
-namespace configmgr
-{
-    class ValueChange;
-
-    namespace configuration
-    {
-//-----------------------------------------------------------------------------
-// Another types of node
-//-----------------------------------------------------------------------------
-
-        /** a special kind of node that is used to represent an element of a set of values
-            <p> This is an immutable value (changes are done by adding/replacing/removing set elements)
-            </p>
-        */
-    class ValueElementNodeImpl : public NodeImpl
-    {
-    public:
-            explicit ValueElementNodeImpl(sharable::ValueNode * const& _aNodeRef) ;
-
-    // the following delegate directly to the original node
-    public:
-        /// Does this node assume its default value
-        /// retrieve the current value of this node
-        com::sun::star::uno::Any	getValue() const;
-
-        /// get the type of this value
-        com::sun::star::uno::Type	getValueType()	const;
-
-        sharable::ValueNode * getDataAccess() const;
-    };
-
-    // domain-specific 'dynamic_cast' replacement
-    ValueElementNodeImpl&	AsValueNode(NodeImpl& rNode);
-    }
-}
-
-#endif // CONFIGMGR_VALUENODEBEHAVIOR_HXX_
diff --git a/configmgr/source/treemgr/viewaccess.hxx b/configmgr/source/treemgr/viewaccess.hxx
deleted file mode 100644
index 0127d973c8..0000000000
--- a/configmgr/source/treemgr/viewaccess.hxx
+++ /dev/null
@@ -1,231 +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: viewaccess.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 CONFIGMGR_VIEWACCESS_HXX_
-#define CONFIGMGR_VIEWACCESS_HXX_
-
-#include "viewnode.hxx"
-#include "viewstrategy.hxx"
-#include <rtl/ref.hxx>
-
-//-----------------------------------------------------------------------------
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration	{ class NodeRef; }
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-
-    class ViewTreeAccess 
-    {
-            rtl::Reference< ViewStrategy >  m_xStrategy;
-            configuration::Tree * m_tree;
-
-        public:
-            explicit ViewTreeAccess(configuration::Tree * tree):
-                m_xStrategy(tree->getViewBehavior()), m_tree(tree) {}
-
-            rtl::Reference< view::ViewStrategy > getViewBehavior() { return m_xStrategy; }
-        public:
-            configuration::NodeData* nodeData(configuration::NodeRef const&    _aNodeArg) const;
-            configuration::NodeData* nodeData(unsigned int _aNodePos) const;
-
-            Node makeNode(configuration::NodeRef const&    _aNodeArg) const { return Node(m_tree,nodeData(_aNodeArg)); }
-            Node makeNode(unsigned int _aNodePos) const { return Node(m_tree,nodeData(_aNodePos)); }
-
-            bool isSetNode  (configuration::NodeRef const& _aNodeArg) const { return makeNode(_aNodeArg).isSetNode(); }
-            bool isGroupNode(configuration::NodeRef const& _aNodeArg) const { return makeNode(_aNodeArg).isGroupNode(); }
-            bool isValueNode(configuration::NodeRef const& _aNodeArg) const { return makeNode(_aNodeArg).isValueNode(); }
-
-            bool isSetNodeAt  (unsigned int _aNodeArg) const { return makeNode(_aNodeArg).isSetNode(); }
-            bool isGroupNodeAt(unsigned int _aNodeArg) const { return makeNode(_aNodeArg).isGroupNode(); }
-            bool isValueNodeAt(unsigned int _aNodeArg) const { return makeNode(_aNodeArg).isValueNode(); }
-
-            SetNode   toSetNode  (configuration::NodeRef const& _aNodeArg) const 
-            { return SetNode  (makeNode(_aNodeArg)); }
-
-            GroupNode toGroupNode(configuration::NodeRef const& _aNodeArg) const 
-            { return GroupNode(makeNode(_aNodeArg)); }
-
-            ValueNode toValueNode(configuration::NodeRef const& _aNodeArg) const 
-            { return ValueNode(makeNode(_aNodeArg)); }
-
-            SetNode   getSetNodeAt  (unsigned int _aNodeArg) const 
-            { return SetNode  (makeNode(_aNodeArg)); }
-
-            GroupNode getGroupNodeAt(unsigned int _aNodeArg) const 
-            { return GroupNode(makeNode(_aNodeArg)); }
-
-            ValueNode getValueNodeAt(unsigned int _aNodeArg) const 
-            { return ValueNode(makeNode(_aNodeArg)); }
-        // node attributes
-        public:
-            /// retrieve the name of the node
-            rtl::OUString getName(configuration::NodeRef const& _aNode)	const	
-            { return m_xStrategy->getName(makeNode(_aNode)); }
-
-            /// retrieve the attributes of the node
-            node::Attributes getAttributes(configuration::NodeRef const& _aNode)	const	
-            { return m_xStrategy->getAttributes(makeNode(_aNode)); }
-
-            /// retrieve the name of the tree root
-            rtl::OUString getRootName()	const	
-            { return m_xStrategy->getName( getRootNode(m_tree) ); }
-
-            /// retrieve the attributes of the tree root
-            node::Attributes getRootAttributes()	const	
-            { return m_xStrategy->getAttributes( getRootNode(m_tree) ); }
-
-        // tracking pending changes
-        public:
-            void collectChanges(configuration::NodeChanges& rChanges)	const
-            { m_xStrategy->collectChanges(m_tree,rChanges); }
-
-            bool hasChanges() const	
-            { return m_xStrategy->hasChanges(m_tree); }
-
-            bool hasChanges(configuration::NodeRef const& _aNode) const	
-            { return m_xStrategy->hasChanges(makeNode(_aNode)); }
-
-            void markChanged(configuration::NodeRef const& _aNode)						
-            { m_xStrategy->markChanged(makeNode(_aNode)); }
-
-        // commit protocol
-        public:
-            std::auto_ptr<SubtreeChange> preCommitChanges(std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements)
-            { return m_xStrategy->preCommitChanges(m_tree,_rRemovedElements); }
-
-            void finishCommit(SubtreeChange& rRootChange)
-            { m_xStrategy->finishCommit(m_tree,rRootChange); }
-
-            void revertCommit(SubtreeChange& rRootChange)
-            { m_xStrategy->revertCommit(m_tree,rRootChange); }
-
-            void recoverFailedCommit(SubtreeChange& rRootChange)
-            { m_xStrategy->recoverFailedCommit(m_tree,rRootChange); }
-
-        // notification protocol
-        public:
-            /// Adjust the internal representation after external changes to the original data - build NodeChangeInformation objects for notification
-            void	adjustToChanges(configuration::NodeChangesInformation& rLocalChanges, configuration::NodeRef const& _aNode, SubtreeChange const& aExternalChange)
-            { m_xStrategy->adjustToChanges(rLocalChanges,makeNode(_aNode), aExternalChange); }
-
-        // visitor dispatch
-        public:
-            configuration::GroupMemberVisitor::Result dispatchToValues(GroupNode const& _aNode, configuration::GroupMemberVisitor& _aVisitor) const
-            { return m_xStrategy->dispatchToValues(_aNode,_aVisitor); }
-
-            /// Call <code>aVisitor.visit(aElement)</code> for each element in this set until SetNodeVisitor::DONE is returned. 
-            configuration::SetNodeVisitor::Result dispatchToElements(SetNode const& _aNode, configuration::SetNodeVisitor& _aVisitor) const
-            { return m_xStrategy->dispatchToElements(_aNode,_aVisitor); }
-
-        // value (element) node specific operations
-        public:
-        /// Does this node assume its default value
-        /// retrieve the current value of this node
-        com::sun::star::uno::Any getValue(ValueNode const& _aNode) const
-            { return m_xStrategy->getValue(_aNode); }
-#if OSL_DEBUG_LEVEL > 0
-        /// get the type of this value
-        com::sun::star::uno::Type getValueType(ValueNode const& _aNode)	const
-            { return m_xStrategy->getValueType(_aNode); }
-#endif
-
-        // group node specific operations
-        public:
-            /// does this hold a child value of the given name
-            bool hasValue(GroupNode const& _aNode, rtl::OUString const& _aName) const
-            { return m_xStrategy->hasValue(_aNode,_aName); }
-            
-            /// does this hold a child value 
-            bool hasValue(GroupNode const& _aNode) const
-            { return m_xStrategy->hasValue(_aNode); }
-            
-            /// are defaults for this node available ?
-            bool areValueDefaultsAvailable(GroupNode const& _aNode) const
-            { return m_xStrategy->areValueDefaultsAvailable(_aNode); }
-
-            /// retrieve data for the child value of the given name
-            configuration::ValueMemberNode getValue(GroupNode const& _aNode, rtl::OUString const& _aName) const
-            { return m_xStrategy->getValue(_aNode,_aName); }
-
-            /// retrieve data for updating the child value of the given name
-            configuration::ValueMemberUpdate getValueForUpdate(GroupNode const & _aNode, rtl::OUString const& _aName) const
-            { return m_xStrategy->getValueForUpdate(_aNode,_aName); }
-
-        // set node specific operations
-        public:
-            /// does this set contain any elements (loads elements if needed)
-            bool isEmpty(SetNode const& _aNode) const
-            { return m_xStrategy->isEmpty(_aNode); }
-
-            /// does this set contain an element named <var>aName</var> (loads elements if needed)
-            configuration::SetEntry	findElement(SetNode const& _aNode, rtl::OUString const& aName) const
-            { return m_xStrategy->findElement(_aNode,aName); }
-
-            /// does this set contain an element named <var>aName</var> (and is that element loaded ?)
-            configuration::SetEntry	findAvailableElement(SetNode const& _aNode, rtl::OUString const& aName) const
-            { return m_xStrategy->findAvailableElement(_aNode,aName); }
-
-            /// insert a new entry into this set
-            void		insertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& aNewEntry)
-            { m_xStrategy->insertElement(_aNode,aName,aNewEntry); }
-
-            /// remove an existing entry into this set
-            void		removeElement(SetNode const& _aNode, rtl::OUString const& aName)
-            { m_xStrategy->removeElement(_aNode,aName); }
-
-            /** Create a Subtree change as 'diff' which allows transforming the set to its default state
-                (given that <var>_rDefaultTree</var> points to a default instance of this set)
-                <p>Ownership of added trees should be transferred to the SubtreeChange.</p>
-            */
-            std::auto_ptr<SubtreeChange> differenceToDefaultState(SetNode const& _aNode, ISubtree& _rDefaultTree)
-            { return m_xStrategy->differenceToDefaultState(_aNode,_rDefaultTree); }
-
-            /// Get the template that describes elements of this set
-            rtl::Reference<configuration::Template> getElementTemplate(SetNode const& _aNode) const 
-            { return m_xStrategy->getElementTemplate(_aNode); }
-
-            /// Get a template provider that can create new elements for this set
-            configuration::TemplateProvider getTemplateProvider(SetNode const& _aNode) const 
-            { return m_xStrategy->getTemplateProvider(_aNode); }
-
-        // changing state/strategy
-        public:
-            // replace m_xStrategy by a direct ViewStrategy (commiting changes to the data), if possible 
-         //   void makeDirect  ();
-
-        };
-    }
-}
-
-#endif // CONFIGMGR_VIEWACCESS_HXX_
diff --git a/configmgr/source/treemgr/viewfactory.hxx b/configmgr/source/treemgr/viewfactory.hxx
deleted file mode 100644
index e3a12fec39..0000000000
--- a/configmgr/source/treemgr/viewfactory.hxx
+++ /dev/null
@@ -1,56 +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: viewfactory.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 CONFIGMGR_VIEWBEHAVIORFACTORY_HXX_
-#define CONFIGMGR_VIEWBEHAVIORFACTORY_HXX_
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace data { class TreeSegment; }
-
-    namespace view 
-    { 
-    // Different standard (static) strategies
-    //---------------------------------------------------------------------
-        /// provides a factory for read-only node implementations
-        rtl::Reference<ViewStrategy> createReadOnlyStrategy();
-        /// provides a factory for nodes that cache changes temporarily
-        rtl::Reference<ViewStrategy> createDeferredChangeStrategy();
-        /// provides a factory for immediately commiting node implementations
-        rtl::Reference<ViewStrategy> createDirectAccessStrategy(rtl::Reference< data::TreeSegment > const & _aTreeSegment);
-    //---------------------------------------------------------------------
-    }
-
-//-----------------------------------------------------------------------------
-
-}
-
-#endif // CONFIGMGR_VIEWBEHAVIORFACTORY_HXX_
diff --git a/configmgr/source/treemgr/viewnode.cxx b/configmgr/source/treemgr/viewnode.cxx
deleted file mode 100644
index f0f387961e..0000000000
--- a/configmgr/source/treemgr/viewnode.cxx
+++ /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: viewnode.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_configmgr.hxx"
-
-#include "viewnode.hxx"
-#include "setnodeimpl.hxx"
-#include "groupnodeimpl.hxx"
-#include "valuenodeimpl.hxx"
-#include "tree.hxx"
-#include "viewstrategy.hxx"
-
-//-----------------------------------------------------------------------------
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-        rtl::Reference< view::ViewStrategy > getViewBehavior(configuration::Tree * _aTree)     
-        { 
-            return _aTree->getViewBehavior(); 
-        }
-
-//-----------------------------------------------------------------------------
-        static inline Node makeNode_(configuration::Tree * _aTree, unsigned int nOffset)
-        {
-            return Node(_aTree, _aTree->nodeData(nOffset));
-        }
-//-----------------------------------------------------------------------------
-        Node Node::getParent() const
-        {
-            configuration::Tree * pTreeData = this->tree();
-            return makeNode_(tree(), pTreeData->parent_(this->get_offset()));
-        }
-            
-//-----------------------------------------------------------------------------
-        Node GroupNode::findChild(rtl::OUString const& _aName) const
-        {
-            configuration::Tree * pTreeData = this->tree();
-            return makeNode_(tree(), pTreeData->findChild_(node().get_offset(), _aName));
-        }
-
-//-----------------------------------------------------------------------------
-        Node GroupNode::getFirstChild() const
-        {
-            configuration::Tree * pTreeData = this->tree();
-            return makeNode_(tree(), pTreeData->firstChild_(node().get_offset()));
-        }
-
-//-----------------------------------------------------------------------------
-        Node GroupNode::getNextChild(Node const& _aAfterNode) const
-        {
-            configuration::Tree * pTreeData = this->tree();
-            OSL_ASSERT(pTreeData->parent_(_aAfterNode.get_offset()) == this->node().get_offset());
-            return makeNode_(tree(), pTreeData->findNextChild_(node().get_offset(),_aAfterNode.get_offset()));
-        }
-
-//-----------------------------------------------------------------------------
-        sharable::Node * Node::getAccessRef() const
-        { 
-            return get_impl()->getOriginalNodeAccess();                 
-        }
-
-//-----------------------------------------------------------------------------
-        sharable::GroupNode * GroupNode::getAccess() const
-        { 
-            return get_impl()->getDataAccess();
-        }
-
-//-----------------------------------------------------------------------------
-        sharable::SetNode * SetNode::getAccess() const
-        { 
-            return get_impl()->getDataAccess();
-        }
-
-//-----------------------------------------------------------------------------
-    }
-}
-
diff --git a/configmgr/source/treemgr/viewnode.hxx b/configmgr/source/treemgr/viewnode.hxx
deleted file mode 100644
index 2b37f0b3bb..0000000000
--- a/configmgr/source/treemgr/viewnode.hxx
+++ /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: viewnode.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 CONFIGMGR_VIEWNODE_HXX_
-#define CONFIGMGR_VIEWNODE_HXX_
-
-#include "tree.hxx"
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-        struct ElementTreeData;
-    }
-    namespace sharable { struct GroupNode; }
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-    //-------------------------------------------------------------------------
-        struct Node  
-        {
-            Node(configuration::Tree * _tree, configuration::NodeData* _addr) 
-            : m_tree(_tree), m_addr(_addr) 
-            {}
-
-            Node(configuration::Tree * _tree, unsigned int _offs) 
-                : m_tree(_tree), m_addr( _tree->nodeData(_offs)) 
-            {}
-
-            bool is() const { return m_addr != 0; }
-
-            Node getParent() const;
-
-            bool isSetNode()    const { return is() && data().isSetNode(); }
-            bool isGroupNode()  const { return is() && data().isGroupNode(); }
-            bool isValueNode()  const { return is() && data().isValueElementNode(); }
-
-        // low-level access
-//            configuration::NodeImpl * operator->() const { return &data().nodeImpl(); }
-
-            configuration::NodeData& data() const { return *m_addr; }
-
-            configuration::NodeImpl * get_impl() const
-            { return is() ? &data().nodeImpl() : NULL; }
-
-            unsigned int get_offset() const
-            { return is() ? m_tree->nodeOffset( this->data() ) : 0; }
-
-            configuration::Tree * tree() const   // has a tree
-            { return m_tree; }
-
-            sharable::Node * getAccessRef() const;   // has a Node
-
-        private:
-            configuration::Tree *        m_tree;   // has a Tree + Accessor
-            configuration::NodeData*   m_addr;       // has a configuration::NodeImpl *
-        };
-    //-------------------------------------------------------------------------
-        struct ValueNode        // has/is a Node
-        {
-            Node m_node;
-
-            explicit
-            ValueNode(Node const& _node) 
-            : m_node(_node) 
-            {}
-
-            bool is() const { return m_node.isValueNode(); }
-
-        // low-level access
- //           configuration::ValueElementNodeImpl* operator->() const { return &m_node.data().valueElementImpl(); }
-
-            configuration::ValueElementNodeImpl* get_impl() const
-            { return is() ? &m_node.data().valueElementImpl() : NULL; }
-
-            Node node() const   // has a Node
-            { return m_node; }
-
-            configuration::Tree * tree() const   // has a tree
-            { return m_node.tree(); }
-        };
-    //-------------------------------------------------------------------------
-        struct GroupNode        // has/is a Node
-        {
-            Node m_node;
-
-            explicit
-            GroupNode(Node const& _node) 
-            : m_node(_node) 
-            {}
-
-            bool is() const { return m_node.isGroupNode(); }
-
-            Node findChild(rtl::OUString const& _aName) const;
-            Node getFirstChild() const;
-            Node getNextChild(Node const& _aAfterNode) const;
-
-//            configuration::GroupNodeImpl* operator->() const { return &m_node.data().groupImpl(); }
-
-            configuration::GroupNodeImpl* get_impl() const
-            { return is() ? &m_node.data().groupImpl() : NULL; }
-
-            Node node() const   // has a Node
-            { return m_node; }
-
-            configuration::Tree * tree() const   // has a tree
-            { return m_node.tree(); }
-
-            sharable::GroupNode * getAccess() const;   // has a GroupNode
-        };
-    //-------------------------------------------------------------------------
-        struct SetNode          // has/is a Node
-        {
-            Node m_node;
-
-            explicit
-            SetNode(Node const& _node) 
-            : m_node(_node) 
-            {}
-
-            bool is() const { return m_node.isSetNode(); }
-
-   //         configuration::SetNodeImpl* operator->() const  { return &m_node.data().setImpl(); }
-            
-            configuration::SetNodeImpl* get_impl() const
-            { return is() ? &m_node.data().setImpl() : 0; }
-
-            Node node() const   // has a Node
-            { return m_node; }
-
-            configuration::Tree * tree() const   // has a tree
-            { return m_node.tree(); }
-
-            sharable::SetNode * getAccess() const;   // has a SetNode
-        };
-    //-------------------------------------------------------------------------
-        inline 
-        Node getRootNode(configuration::Tree * _aTree) 
-        { 
-            return Node(_aTree,_aTree->nodeData(configuration::Tree::ROOT));
-        }
-            
-    //-------------------------------------------------------------------------
-        inline 
-        rtl::OUString getSimpleRootName(configuration::Tree * _aTree)
-        {
-            return _aTree->getSimpleRootName();
-        }
-
-    //-------------------------------------------------------------------------
-        inline 
-        bool isValidNode(Node const & _aNode) 
-        { 
-            configuration::Tree* pTreeData = _aNode.tree();
-            return pTreeData->isValidNode(_aNode.get_offset()); 
-        }
-            
-    //-------------------------------------------------------------------------
-        inline 
-        rtl::OUString getSimpleNodeName(Node const & _aNode)
-        {
-            configuration::Tree* pTreeData = _aNode.tree();
-            return pTreeData->getSimpleNodeName(_aNode.get_offset());
-        }
-
-    //-------------------------------------------------------------------------
-        extern
-        rtl::Reference< view::ViewStrategy > getViewBehavior(configuration::Tree * _aTree);  
-    //-------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-//-----------------------------------------------------------------------------
-
-#endif // CONFIGMGR_VIEWNODE_HXX_
diff --git a/configmgr/source/treemgr/viewstrategy.cxx b/configmgr/source/treemgr/viewstrategy.cxx
deleted file mode 100644
index 0b0fa04229..0000000000
--- a/configmgr/source/treemgr/viewstrategy.cxx
+++ /dev/null
@@ -1,623 +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: viewstrategy.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "viewstrategy.hxx"
-#include "valuenodeimpl.hxx"
-#include "groupnodeimpl.hxx"
-#include "setnodeimpl.hxx"
-#include "change.hxx"
-#include "nodevisitor.hxx"
-#include "nodechange.hxx"
-#include "nodechangeimpl.hxx"
-#include "nodeconverter.hxx"
-//-----------------------------------------------------------------------------
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-        static
-        inline
-        sharable::ValueNode * getMemberValueAccess( GroupNode const & _aGroupNode, rtl::OUString const & _aName )
-        {
-            configuration::GroupNodeImpl* pGroupData = _aGroupNode.get_impl();
-            return pGroupData->getOriginalValueNode(_aName);
-        }
-
-//-----------------------------------------------------------------------------
-        void ViewStrategy::checkInstance(configuration::Tree * tree) const
-        {
-            (void) tree; // avoid warnings
-            OSL_ENSURE( getViewBehavior(tree).get() == this,
-                        "Tree operation dispatched to wrong strategy instance");
-        }
-//-----------------------------------------------------------------------------
-        void ViewStrategy::collectChanges(configuration::Tree * tree, configuration::NodeChanges& rChanges)	const
-        { 
-            checkInstance(tree);
-            doCollectChanges( getRootNode(tree), rChanges ); 
-        }
-
-        bool ViewStrategy::hasChanges(configuration::Tree * tree) const	
-        { 
-            checkInstance(tree);
-            return hasChanges( getRootNode(tree) ); 
-        }
-
-        // mark the given node and all its ancestors (we can stop when we hit a node that already is marked)
-        void ViewStrategy::markChanged(Node const& _aNode)						
-        { 
-            configuration::Tree * tree = _aNode.tree();
-            checkInstance(tree);
-
-            Node aNode = _aNode;
-            if (aNode.is())
-            {
-                do
-                {	
-                    this->doMarkChanged(aNode);
-
-                    aNode = aNode.getParent();
-                }
-                while (aNode.is() && !this->hasChanges( aNode ));
-            }
-
-            if (!aNode.is()) // just marked the root
-            {
-                configuration::Tree* pContext = tree->getContextTree();
-                unsigned int nContext = tree->getContextNode();
-                if (pContext)
-                {
-                    OSL_ASSERT(pContext->isValidNode(nContext));
-
-                    view::Node aContextNode(pContext,nContext);
-                    pContext->getViewBehavior()->markChanged(aContextNode);
-                }
-            }
-        }
-
-//-----------------------------------------------------------------------------
-        std::auto_ptr<SubtreeChange> ViewStrategy::preCommitChanges(configuration::Tree * tree, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements)
-        { 
-            checkInstance(tree);
-            return doPreCommitChanges( tree, _rRemovedElements);
-        }
-
-        void ViewStrategy::finishCommit(configuration::Tree * tree, SubtreeChange& rRootChange)
-        { 
-            checkInstance(tree);
-            doFinishCommit(tree, rRootChange); 
-        }
-
-        void ViewStrategy::revertCommit(configuration::Tree * tree, SubtreeChange& rRootChange)
-        { 
-            checkInstance(tree);
-            doRevertCommit(tree, rRootChange); 
-        }
-
-        void ViewStrategy::recoverFailedCommit(configuration::Tree * tree, SubtreeChange& rRootChange)
-        { 
-            checkInstance(tree);
-            doFailedCommit(tree, rRootChange); 
-        }
-
-//-----------------------------------------------------------------------------
-        void ViewStrategy::adjustToChanges(configuration::NodeChangesInformation& rLocalChanges, Node const& _aNode, SubtreeChange const& aExternalChange)
-        { 
-            OSL_PRECOND( isValidNode(_aNode), "ERROR: Valid node required for adjusting to changes" );
-            OSL_PRECOND( getSimpleNodeName(_aNode) == aExternalChange.getNodeName(), "name of change does not match actual node" );
-
-            checkInstance(_aNode.tree());
-
-            configuration::Tree * pTreeData = _aNode.tree();
-
-            if (_aNode.isSetNode())
-            {
-                OSL_ENSURE(aExternalChange.isSetNodeChange(),"ERROR: Change type GROUP does not match set");
-
-                   unsigned int nDepth = pTreeData->getRemainingDepth(_aNode.get_offset());
-
-                implAdjustToElementChanges( rLocalChanges, SetNode(_aNode), aExternalChange, nDepth);
-            }
-            else if (_aNode.isGroupNode())
-            {
-                OSL_ENSURE(!aExternalChange.isSetNodeChange(),"ERROR: Change type SET does not match group");
-
-                GroupNode aGroupNode(_aNode);
-
-                implAdjustToValueChanges(rLocalChanges, aGroupNode, aExternalChange);
-                implAdjustToSubChanges(  rLocalChanges, aGroupNode, aExternalChange);
-            }
-            else // might occur on external change (?)
-            {
-                OSL_ENSURE(_aNode.isValueNode(), "Tree: Unknown node type to adjust to changes");
-
-                OSL_ENSURE(_aNode.get_offset() == configuration::Tree::ROOT, "Tree: Unexpected node type - non-root value element");
-
-                OSL_ENSURE(false,"ERROR: Change type does not match node: Trying to apply subtree change to value element.");
-            }
-        }
-
-//-----------------------------------------------------------------------------
-
-        void ViewStrategy::addLocalChangeHelper( configuration::NodeChangesInformation& rLocalChanges_, configuration::NodeChange const& aChange_)
-        {
-            aChange_.getChangeInfos(rLocalChanges_);
-        }
-
-//-----------------------------------------------------------------------------
-        // TO DO: create CommitAction class, which is returned by precommit (if applicable)
-
-        std::auto_ptr<SubtreeChange> ViewStrategy::doPreCommitChanges(configuration::Tree * tree, std::vector< rtl::Reference<configuration::ElementTree> >& )
-        {
-            (void) tree; // avoid warnings
-            OSL_ENSURE(!hasChanges(getRootNode(tree)),"Unexpected changes in View");
-            return std::auto_ptr<SubtreeChange>();
-        }
-
-        void ViewStrategy::doFinishCommit(configuration::Tree * tree, SubtreeChange& )
-        {
-            (void) tree; // avoid warnings
-            OSL_ENSURE(!hasChanges(getRootNode(tree)),"Unexpected changes in View");
-            OSL_ENSURE(false,"ERROR: Cannot finish commit for unexpected changes");
-        }
-        
-        void ViewStrategy::doRevertCommit(configuration::Tree * tree, SubtreeChange& )
-        {
-            (void) tree; // avoid warnings
-            OSL_ENSURE(!hasChanges(getRootNode(tree)),"Unexpected changes in View");
-            OSL_ENSURE(false,"ERROR: Cannot revert commit for unexpected changes");
-        }
-
-        void ViewStrategy::doFailedCommit(configuration::Tree * tree, SubtreeChange& )
-        {
-            (void) tree; // avoid warnings
-            OSL_ENSURE(!hasChanges(getRootNode(tree)),"Unexpected changes in View");
-            OSL_ENSURE(false,"ERROR: Cannot recover commit for unexpected changes");
-        }
-
-//-----------------------------------------------------------------------------
-        void ViewStrategy::implAdjustToElementChange(configuration::NodeChangesInformation& rLocalChanges, SetNode const& _aSetNode, Change const& rElementChange, unsigned int nDepth)
-        {
-            configuration::SetNodeImpl * pSetData = _aSetNode.get_impl();
-
-            OSL_ENSURE( pSetData->implHasLoadedElements() , "Unexpected call: Processing element change in uninitialized set");
-
-            rtl::OUString aName( rElementChange.getNodeName() );
-
-            configuration::SetElementChangeImpl* pThisChange = 0;
-            if (AddNode const * addNode = dynamic_cast< AddNode const *>(&rElementChange))
-            {
-                configuration::ElementTreeData aNewElement = pSetData->makeAdditionalElement(this, *addNode, nDepth);
-
-                pThisChange = pSetData->doAdjustToAddedElement(aName, *addNode, aNewElement);
-            }
-            else if (RemoveNode const * removeNode = dynamic_cast< RemoveNode const * >(&rElementChange))
-            {
-                pThisChange = pSetData->doAdjustToRemovedElement(aName, *removeNode);
-            }
-            else
-            {
-                if (nDepth > 0 || (NULL != pSetData->doFindElement(aName)) )// found even beyond nDepth ?
-                {
-                    pThisChange = pSetData->doAdjustChangedElement(rLocalChanges,aName, rElementChange);
-                }
-            }
-
-            if (pThisChange)
-            {
-                addLocalChangeHelper( rLocalChanges, configuration::NodeChange(pThisChange) );
-            }
-        }
-
-        void ViewStrategy::implAdjustToElementChanges(configuration::NodeChangesInformation& rLocalChanges, SetNode const& _aSetNode, SubtreeChange const& rExternalChanges, unsigned int nDepth)
-        {
- 
-            if (nDepth > 0)
-            {
-                configuration::SetNodeImpl * pSetData = _aSetNode.get_impl();
-
-                OSL_ENSURE( pSetData->getTemplateProvider().isValid(), "Cannot adjust SetNode to changes - node was never initialized" );
-                
-                if (pSetData->implHasLoadedElements())
-                {
-                    unsigned int const nElementDepth = configuration::childDepth(nDepth);
-                    for (SubtreeChange::ChildIterator it = rExternalChanges.begin(); it != rExternalChanges.end(); ++it)
-                    {
-                        this->implAdjustToElementChange(rLocalChanges, _aSetNode, *it, nElementDepth);
-                    }
-                }
-                else
-                {
-                    OSL_ENSURE( !hasChanges(_aSetNode.node()),"Cannot have changes to consider when no elements are loaded");
-
-                    pSetData->convertChanges( rLocalChanges, rExternalChanges, nDepth);
-                }
-            }
-        }
-
-        configuration::ValueChangeImpl* ViewStrategy::doAdjustToValueChange(GroupNode const& _aGroupNode, rtl::OUString const& _aName, ValueChange const& _rExternalChange) 
-        {
-            configuration::ValueChangeImpl* pChangeImpl = NULL;
-
-            sharable::ValueNode * localNode = getMemberValueAccess(_aGroupNode,_aName);
-            if (localNode != 0)
-            {
-                switch( _rExternalChange. getMode() )
-                {
-                case ValueChange::wasDefault: 
-                case ValueChange::changeValue: 
-                    pChangeImpl = new configuration::ValueReplaceImpl( _rExternalChange.getNewValue(), _rExternalChange.getOldValue() );
-                    break; 
-
-                case ValueChange::setToDefault: 
-                    pChangeImpl = new configuration::ValueResetImpl( _rExternalChange.getNewValue(), _rExternalChange.getOldValue() );
-                    break; 
-
-                default: OSL_ENSURE(false, "Unknown change mode");
-                    // fall thru to next case for somewhat meaningful return value	
-                case ValueChange::changeDefault: 
-                    {
-                        com::sun::star::uno::Any aLocalValue = localNode->getValue();
-
-                        pChangeImpl = new configuration::ValueReplaceImpl( aLocalValue, aLocalValue );
-                    }
-                    break; 
-                }
-                OSL_ASSERT( pChangeImpl );
-            }
-            else
-            {
-                OSL_ENSURE(false, "ERROR: Notification tries to change nonexistent value within group");
-            }
-
-            return pChangeImpl;
-        }
-
-        void ViewStrategy::implAdjustToValueChanges(configuration::NodeChangesInformation& rLocalChanges, GroupNode const& _aGroupNode, SubtreeChange const& rExternalChanges)
-        {
-            for (SubtreeChange::ChildIterator it = rExternalChanges.begin(); it != rExternalChanges.end(); ++it)
-            {
-                if (ValueChange const * valueChange = dynamic_cast< ValueChange const * >(&*it))
-                {
-                    rtl::OUString aValueName( valueChange->getNodeName() );
-
-                    if (configuration::ValueChangeImpl* pThisChange = doAdjustToValueChange(_aGroupNode, aValueName, *valueChange))
-                    {
-                        pThisChange->setTarget(_aGroupNode,aValueName);
-                        addLocalChangeHelper(rLocalChanges, configuration::NodeChange(pThisChange));
-                    }
-                    else 
-                        OSL_TRACE("WARNING: Configuration: derived class hides an external value member change from listeners");
-                }
-                else
-                    OSL_ENSURE(dynamic_cast< SubtreeChange const * >(&*it) != 0, "Unexpected change type within group");
-            }
-        }
-
-        void ViewStrategy::implAdjustToSubChanges(configuration::NodeChangesInformation& rLocalChanges, GroupNode const& _aGroupNode, SubtreeChange const& rExternalChanges)
-        {
-#if (OSL_DEBUG_LEVEL > 0)
-            configuration::Tree * pTreeData = _aGroupNode.tree();
-#endif
-            for(SubtreeChange::ChildIterator it = rExternalChanges.begin(); it != rExternalChanges.end(); ++it)
-            {
-                if (SubtreeChange const * subtreeChange = dynamic_cast< SubtreeChange const * >(&*it))
-                {
-                    Node aSubNode = _aGroupNode.findChild( it->getNodeName() );
-                    OSL_ENSURE( aSubNode.is() || pTreeData->depthTo(_aGroupNode.node().get_offset()) >= pTreeData->getAvailableDepth(), "Changed node not found in tree");
-
-                    if (aSubNode.is())
-                    {
-                        OSL_ENSURE( pTreeData->getRemainingDepth(_aGroupNode.node().get_offset()) > 0, "Depth is smaller than expected for tree");
-                        this->adjustToChanges(rLocalChanges, aSubNode, *subtreeChange);
-                    }
-                }
-                else
-                {
-                    OSL_ENSURE(dynamic_cast< ValueChange const * >(&*it) != 0, "Unexpected change type for child of group node; change is ignored");
-                    OSL_ENSURE( !_aGroupNode.findChild(it->getNodeName()).is(),
-                                "Found sub(tree) node where a value was expected");
-                }
-            }
-        }
-//-----------------------------------------------------------------------------
-        void ViewStrategy::doCollectChanges(Node const& _aNode, configuration::NodeChanges& ) const
-        {
-            { (void)_aNode; }
-            // no-op: there are no changes to collect
-            OSL_ENSURE(!hasChanges(_aNode),"Unexpected changes in View");
-        }
-
-
-//-----------------------------------------------------------------------------
-        com::sun::star::uno::Any	ViewStrategy::getValue(ValueNode const& _aNode) const
-        { 
-            checkInstance(_aNode.tree());
-            return _aNode.get_impl()->getValue(); 
-        }
-#if OSL_DEBUG_LEVEL > 0
-        com::sun::star::uno::Type ViewStrategy::getValueType(ValueNode const& _aNode)	const
-        { 
-            checkInstance(_aNode.tree());
-            return _aNode.get_impl()->getValueType(); 
-        }
-#endif
-//-----------------------------------------------------------------------------
-// group member access
-
-//-----------------------------------------------------------------------------
-    namespace { // helpers
-        struct GroupMemberDispatch : data::NodeVisitor
-        {
-            GroupMemberDispatch(ViewStrategy& _rStrategy, GroupNode const& _aGroup, configuration::GroupMemberVisitor& rVisitor)
-            : m_rStrategy(_rStrategy)
-            , m_aGroup(_aGroup)
-            , m_rVisitor(rVisitor)
-            {}
-
-            static bool mapResult(configuration::GroupMemberVisitor::Result _aResult) 
-            { 
-                return _aResult == configuration::GroupMemberVisitor::DONE;
-            }
-
-            static configuration::GroupMemberVisitor::Result unmapResult(bool done) 
-            { 
-                return done
-                    ? configuration::GroupMemberVisitor::DONE
-                    : configuration::GroupMemberVisitor::CONTINUE;
-            }
-
-            using NodeVisitor::handle;
-            virtual bool handle(sharable::Node * node);
-            virtual bool handle(sharable::ValueNode * node);
-#if (OSL_DEBUG_LEVEL > 0)
-            bool test_value(sharable::Node * node) const;
-#endif
-            ViewStrategy&       m_rStrategy;     
-            GroupNode           m_aGroup;
-            configuration::GroupMemberVisitor& m_rVisitor;
-
-            configuration::GroupMemberVisitor::Result m_aResult;
-        };
-    
-#if (OSL_DEBUG_LEVEL > 0)
-        bool GroupMemberDispatch::test_value(sharable::Node * node) const
-        {
-            return m_rStrategy.hasValue(m_aGroup, node->getName());
-        }
-#endif
-
-        bool GroupMemberDispatch::handle(sharable::ValueNode * node)
-        {
-            OSL_ENSURE( test_value(sharable::node(node)), "ERROR: Group MemberDispatch:Did not find a ValueMember for a value child.");
-
-            rtl::OUString aValueName = node->info.getName();
-
-            return mapResult( m_rVisitor.visit( m_rStrategy.getValue(m_aGroup,aValueName) ) );
-        }
-
-        bool GroupMemberDispatch::handle(sharable::Node * node)
-        {
-            (void) node; // avoid warnings
-            OSL_ENSURE( !test_value(node), "ERROR: Group MemberDispatch:Found a ValueMember for a subtree child.");
-
-            return false;
-        }
-    }
-//-----------------------------------------------------------------------------
-        configuration::ValueMemberNode ViewStrategy::doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool ) const
-        {
-            sharable::ValueNode * valueData = getMemberValueAccess(_aNode,_aName);
-            return _aNode.get_impl()->makeValueMember(valueData);
-        }
-
-        bool ViewStrategy::hasValue(GroupNode const& _aNode, rtl::OUString const& _aName) const
-        { 
-            checkInstance(_aNode.tree());
-            return getMemberValueAccess(_aNode,_aName) != 0;
-        }
-        
-        bool ViewStrategy::hasValue(GroupNode const& _aNode) const
-        {
-            checkInstance(_aNode.tree());
-            configuration::GroupNodeImpl* pGroupNode=_aNode.get_impl();
-            sharable::GroupNode * group = pGroupNode->getDataAccess();
-            return group->numDescendants > 0;
-        }
-        
-
-        bool ViewStrategy::areValueDefaultsAvailable(GroupNode const& _aNode) const
-        { 
-            checkInstance(_aNode.tree());
-
-            return  _aNode.get_impl()->areValueDefaultsAvailable();
-        }
-
-        configuration::ValueMemberNode ViewStrategy::getValue(GroupNode const& _aNode, rtl::OUString const& _aName) const
-        { 
-            checkInstance(_aNode.tree());
-            return doGetValueMember(_aNode,_aName,false); 
-        }
-
-        configuration::ValueMemberUpdate ViewStrategy::getValueForUpdate(GroupNode const & _aNode, rtl::OUString const& _aName)
-        { 
-            checkInstance(_aNode.tree());
-            return configuration::ValueMemberUpdate( doGetValueMember(_aNode,_aName,true), *this );
-        }
-
-        configuration::GroupMemberVisitor::Result ViewStrategy::dispatchToValues(GroupNode const& _aNode, configuration::GroupMemberVisitor& _aVisitor)
-        { 
-            checkInstance(_aNode.tree());
-
-            GroupMemberDispatch aDispatch(*this,_aNode,_aVisitor);
-
-            bool done = aDispatch.visitChildren( _aNode.getAccess() );
-
-            return aDispatch.unmapResult(done);
-        }
-
-//-----------------------------------------------------------------------------
-        configuration::ElementTreeData ViewStrategy::implMakeElement(SetNode const& _aNode, configuration::SetEntry const& anEntry) const
-        {
-            configuration::SetNodeImpl * pNodeData = _aNode.get_impl();
-            return pNodeData->implValidateElement(pNodeData->entryToElement(anEntry));
-        }
-//-----------------------------------------------------------------------------
-        configuration::SetEntry ViewStrategy::implFindElement(SetNode const& _aNode, rtl::OUString const& aName) const
-        {
-            configuration::SetNodeImpl * pNodeData = _aNode.get_impl();
-
-            OSL_ENSURE(pNodeData->implHasLoadedElements(),"Cannot find elements in set that is not loaded");
-            configuration::ElementTree * pElement = pNodeData->doFindElement(aName); 
-
-            return configuration::SetEntry(pElement);
-        }
-
-        configuration::SetEntry ViewStrategy::findElement(SetNode const& _aNode, rtl::OUString const& aName) const
-        { 
-            checkInstance(_aNode.tree());
-            _aNode.get_impl()->implEnsureElementsLoaded();
-            return implFindElement(_aNode,aName);
-        }
-
-        configuration::SetEntry ViewStrategy::findAvailableElement(SetNode const& _aNode, rtl::OUString const& aName) const
-        { 
-            checkInstance(_aNode.tree());
-            if (_aNode.get_impl()->implHasLoadedElements())
-                return implFindElement(_aNode,aName);
-            else
-                return configuration::SetEntry(0);
-        }
-
-        static 
-        inline 
-        std::auto_ptr<SubtreeChange> makeChangeToDefault(sharable::SetNode * setNode)
-        {
-            return std::auto_ptr<SubtreeChange>(
-                        new SubtreeChange(
-                            setNode->info.getName(),
-                            setNode->getElementTemplateName(),
-                            setNode->getElementTemplateModule(),
-                            sharable::node(setNode)->getAttributes(),
-                            true // to default
-                   )    );
-        }
-
-        std::auto_ptr<SubtreeChange> ViewStrategy::differenceToDefaultState(SetNode const& _aNode, ISubtree& _rDefaultTree) const
-        { 
-            checkInstance(_aNode.tree());
-            std::auto_ptr<SubtreeChange> aResult;
-
-            sharable::SetNode * originalSetNode = _aNode.getAccess();
-            OSL_ASSERT(originalSetNode != 0);
-            if (!originalSetNode->info.isDefault())
-            {
-                aResult = makeChangeToDefault(originalSetNode);
-
-                configuration::SetNodeImpl * pNodeData = _aNode.get_impl();
-                if (this->hasChanges(_aNode.node()))
-                {
-                    OSL_ENSURE(pNodeData->implHasLoadedElements(),"Unexpected: Found set with changes but elements are not loaded");
-                    pNodeData->doDifferenceToDefaultState(*aResult,_rDefaultTree);
-                }
-                else                        
-                    pNodeData->implDifferenceToDefaultState(*aResult,_rDefaultTree);
-            }
-            return aResult;
-        }
-
-        rtl::Reference<configuration::Template> ViewStrategy::getElementTemplate(SetNode const& _aNode) const 
-        { 
-            checkInstance(_aNode.tree());
-            return _aNode.get_impl()->getElementTemplate(); 
-        }
-
-        configuration::TemplateProvider ViewStrategy::getTemplateProvider(SetNode const& _aNode) const 
-        { 
-            checkInstance(_aNode.tree());
-            return _aNode.get_impl()->getTemplateProvider(); 
-        }
-
-        node::Attributes ViewStrategy::getNodeAttributes(Node const& _aNode) const
-        { 
-            checkInstance(_aNode.tree());
-            return _aNode.getAccessRef()->getAttributes(); 
-        }
-
-//-----------------------------------------------------------------------------
-        configuration::SetNodeVisitor::Result ViewStrategy::dispatchToElements(SetNode const& _aNode, configuration::SetNodeVisitor& _aVisitor)
-        { 
-            checkInstance(_aNode.tree());
-
-            configuration::SetNodeImpl * pNodeData = _aNode.get_impl();
-
-            if (pNodeData->implLoadElements())
-                return pNodeData->doDispatchToElements(_aVisitor); 
-
-            else
-                return configuration::SetNodeVisitor::CONTINUE;
-        }
-
-        bool ViewStrategy::isEmpty(SetNode const& _aNode) const
-        { 
-            checkInstance(_aNode.tree());
-
-            configuration::SetNodeImpl * pNodeData = _aNode.get_impl();
-
-            return !pNodeData->implLoadElements() || pNodeData->doIsEmpty(); 
-        }
-//-----------------------------------------------------------------------------
-
-        void ViewStrategy::insertElement(SetNode const& _aNode, rtl::OUString const& _aName, configuration::SetEntry const& _aNewEntry)
-        { 
-            // cannot insert, if we cannot check for collisions
-            checkInstance(_aNode.tree());
-            _aNode.get_impl()->implEnsureElementsLoaded();
-            doInsertElement(_aNode,_aName,_aNewEntry); 
-        }
-
-        void ViewStrategy::removeElement(SetNode const& _aNode, rtl::OUString const& _aName)
-        { 
-            // cannot remove, if we cannot check for existance
-            checkInstance(_aNode.tree());
-            _aNode.get_impl()->implEnsureElementsLoaded();
-            doRemoveElement(_aNode,_aName); 
-        }
-
-//-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
diff --git a/configmgr/source/treemgr/viewstrategy.hxx b/configmgr/source/treemgr/viewstrategy.hxx
deleted file mode 100644
index 8e77c0bf4a..0000000000
--- a/configmgr/source/treemgr/viewstrategy.hxx
+++ /dev/null
@@ -1,231 +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: viewstrategy.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_VIEWBEHAVIOR_HXX_
-#define CONFIGMGR_VIEWBEHAVIOR_HXX_
-
-#include "viewnode.hxx"
-#include "groupnodeimpl.hxx"
-#include "setnodeimpl.hxx"
-#include "utility.hxx"
-#include <rtl/ref.hxx>
-#include <salhelper/simplereferenceobject.hxx>
-
-namespace configmgr
-{
-//-----------------------------------------------------------------------------
-    namespace configuration
-    {
-        class SetElementChangeImpl;
-        class ValueChangeImpl;
-    }
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-        struct NodeFactory;
-//-----------------------------------------------------------------------------
-        class ViewStrategy : public salhelper::SimpleReferenceObject
-        {
-        // node attributes
-        public:
-            /// retrieve the attributes of the node
-            rtl::OUString getName(Node const& _aNode)	const;	
-
-            /// retrieve the attributes of the node
-            node::Attributes getAttributes(Node const& _aNode)	const;
-
-        // tracking pending changes
-        public:
-            void collectChanges(configuration::Tree * tree, configuration::NodeChanges& rChanges) const;
-
-            bool hasChanges(configuration::Tree * tree) const;
-
-            bool hasChanges(Node const& _aNode) const;
-
-            void markChanged(Node const& _aNode);
-
-        // commit protocol
-        public:
-            std::auto_ptr<SubtreeChange> preCommitChanges(configuration::Tree * tree, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements);
-
-            void finishCommit(configuration::Tree * tree, SubtreeChange& rRootChange);
-
-            void revertCommit(configuration::Tree * tree, SubtreeChange& rRootChange);
-
-            void recoverFailedCommit(configuration::Tree * tree, SubtreeChange& rRootChange);
-
-        // notification protocol
-        public:
-            /// Adjust the internal representation after external changes to the original data - build NodeChangeInformation objects for notification
-            void	adjustToChanges(configuration::NodeChangesInformation& rLocalChanges, Node const & _aNode, SubtreeChange const& aExternalChange);
-
-        // visitor dispatch
-        public:
-            configuration::GroupMemberVisitor::Result dispatchToValues(GroupNode const& _aNode, configuration::GroupMemberVisitor& _aVisitor);
-
-            /// Call <code>aVisitor.visit(aElement)</code> for each element in this set until SetNodeVisitor::DONE is returned. 
-            configuration::SetNodeVisitor::Result dispatchToElements(SetNode const& _aNode, configuration::SetNodeVisitor& _aVisitor);
-
-        // value (element) node specific operations
-        public:
-            /// Does this node assume its default value
-            /// retrieve the current value of this node
-            com::sun::star::uno::Any	getValue(ValueNode const& _aNode) const;
-#if OSL_DEBUG_LEVEL > 0
-            /// get the type of this value
-            com::sun::star::uno::Type	getValueType(ValueNode const& _aNode)	const;
-#endif
-
-        // group node specific operations
-        public:
-            /// does this hold a child value of the given name
-            bool hasValue(GroupNode const& _aNode, rtl::OUString const& _aName) const;
-
-            /// does this hold a child value 
-            bool hasValue(GroupNode const& _aNode) const;
-            
-            /// are defaults for this node available ?
-            bool areValueDefaultsAvailable(GroupNode const& _aNode) const;
-
-            /// retrieve data for the child value of the given name
-            configuration::ValueMemberNode getValue(GroupNode const& _aNode, rtl::OUString const& _aName) const;
-
-            /// retrieve data for updating the child value of the given name
-            configuration::ValueMemberUpdate getValueForUpdate(GroupNode const & _aNode, rtl::OUString const& _aName);
-
-        // set node specific operations
-        public:
-            /// does this set contain any elements (loads elements if needed)
-            bool isEmpty(SetNode const& _aNode) const;
-
-            /// does this set contain an element named <var>aName</var> (loads elements if needed)
-            configuration::SetEntry	findElement(SetNode const& _aNode, rtl::OUString const& aName) const;
-
-            /// does this set contain an element named <var>aName</var> (and is that element loaded ?)
-            configuration::SetEntry	findAvailableElement(SetNode const& _aNode, rtl::OUString const& aName) const;
-
-            /// insert a new entry into this set
-            void		insertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& aNewEntry);
-
-            /// remove an existing entry into this set
-            void		removeElement(SetNode const& _aNode, rtl::OUString const& aName);
-
-            /** Create a Subtree change as 'diff' which allows transforming the set to its default state
-                (given that <var>_rDefaultTree</var> points to a default instance of this set)
-                <p>Ownership of added trees should be transferred to the SubtreeChange.</p>
-            */
-            std::auto_ptr<SubtreeChange> differenceToDefaultState(SetNode const& _aNode, ISubtree& _rDefaultTree) const;
-
-            /// Get the template that describes elements of this set
-            rtl::Reference<configuration::Template> getElementTemplate(SetNode const& _aNode) const;
-
-            /// Get a template provider that can create new elements for this set
-            configuration::TemplateProvider getTemplateProvider(SetNode const& _aNode) const;
-
-            // create a configuration::Tree * from a configuration::SetEntry
-            configuration::Tree * extractTree(configuration::SetEntry const& _anEntry);
-
-        // creating/changing state/strategy
-        public:
-            NodeFactory& getNodeFactory();
-
-        // access to node innards
-        protected:
-            /// provide access to the address of the underlying node
-            sharable::Node * getNodeAddress(Node const& _aNode) const;
-
-            /// retrieve the attributes of the underlying node
-            node::Attributes getNodeAttributes(Node const& _aNode) const;
-
-        protected:
-            //helper for migration to new (info based) model for adjusting to changes
-            static void addLocalChangeHelper( configuration::NodeChangesInformation& rLocalChanges, configuration::NodeChange const& aChange);
-
-        private:
-            void implAdjustToValueChanges(configuration::NodeChangesInformation& rLocalChanges, GroupNode const& _aGroupNode, SubtreeChange const& rExternalChanges);
-            void implAdjustToSubChanges(configuration::NodeChangesInformation& rLocalChanges, GroupNode const & _aGroupNode, SubtreeChange const& rExternalChanges);
-            void implAdjustToElementChanges(configuration::NodeChangesInformation& rLocalChanges, SetNode const& _aNode, SubtreeChange const& rExternalChanges, unsigned int nDepth);
-            void implAdjustToElementChange (configuration::NodeChangesInformation& rLocalChanges, SetNode const& _aNode, Change const& rElementChange, unsigned int nElementDepth);
-            void implCommitDirectIn(sharable::TreeFragment * placeHolder, Node const& _aNode);
-
-        protected:
-            void            checkInstance(configuration::Tree * tree) const;
-            configuration::SetEntry    implFindElement(SetNode const& _aNode, rtl::OUString const& aName) const;
-            configuration::ElementTreeData  implMakeElement(SetNode const& _aNode, configuration::SetEntry const& anEntry) const;
-
-        // virtual interface - these functions must be provided
-        private:
-            // change handling
-            virtual bool doHasChanges(Node const& _aNode) const     = 0;
-            virtual void doMarkChanged(Node const& _aNode)          = 0;
-
-            virtual NodeFactory& doGetNodeFactory()  = 0;
-
-        // virtual interface - these functions all have default implementations without support for pending changes
-        protected:
-            // change handling
-            virtual void doCollectChanges(Node const& _aNode, configuration::NodeChanges& rChanges) const;
-
-            // commit protocol
-            virtual std::auto_ptr<SubtreeChange> doPreCommitChanges(configuration::Tree * tree, std::vector< rtl::Reference<configuration::ElementTree> >& _rRemovedElements);
-            virtual void doFailedCommit(configuration::Tree * tree, SubtreeChange& rChanges);
-            virtual void doFinishCommit(configuration::Tree * tree, SubtreeChange& rChanges);
-            virtual void doRevertCommit(configuration::Tree * tree, SubtreeChange& rChanges);
-
-            // notification protocol
-            virtual configuration::ValueChangeImpl* doAdjustToValueChange(GroupNode const& _aGroupNode, rtl::OUString const& aName, ValueChange const& rExternalChange);
-
-            // common attributes 
-            virtual node::Attributes doAdjustAttributes(node::Attributes const& _aAttributes) const = 0;
-
-            // group member access
-            virtual configuration::ValueMemberNode doGetValueMember(GroupNode const& _aNode, rtl::OUString const& _aName, bool _bForUpdate) const = 0;
-
-            // set element access
-            virtual void doInsertElement(SetNode const& _aNode, rtl::OUString const& aName, configuration::SetEntry const& aNewEntry) = 0;
-            virtual void doRemoveElement(SetNode const& _aNode, rtl::OUString const& aName) = 0;
-        };
-
-        inline node::Attributes ViewStrategy::getAttributes(Node const& _aNode)	const	
-        { return doAdjustAttributes(getNodeAttributes(_aNode)); }
-
-        inline bool ViewStrategy::hasChanges(Node const& _aNode) const	
-        { return doHasChanges(_aNode); }
-
-        inline NodeFactory& ViewStrategy::getNodeFactory()	
-        { return doGetNodeFactory(); }
-
-//-----------------------------------------------------------------------------
-    }
-//-----------------------------------------------------------------------------
-}
-
-#endif // CONFIGMGR_CONFIGNODEBEHAVIOR_HXX_
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
new file mode 100644
index 0000000000..e1b8a95859
--- /dev/null
+++ b/configmgr/source/type.cxx
@@ -0,0 +1,187 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/TypeClass.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppu/unotype.hxx"
+#include "osl/diagnose.h"
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "type.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+bool isListType(Type type) {
+    return type >= TYPE_BOOLEAN_LIST;
+}
+
+Type elementType(Type type) {
+    switch (type) {
+    case TYPE_BOOLEAN_LIST:
+        return TYPE_BOOLEAN;
+    case TYPE_SHORT_LIST:
+        return TYPE_SHORT;
+    case TYPE_INT_LIST:
+        return TYPE_INT;
+    case TYPE_LONG_LIST:
+        return TYPE_LONG;
+    case TYPE_DOUBLE_LIST:
+        return TYPE_DOUBLE;
+    case TYPE_STRING_LIST:
+        return TYPE_STRING;
+    case TYPE_HEXBINARY_LIST:
+        return TYPE_HEXBINARY;
+    default:
+        OSL_ASSERT(false);
+        throw css::uno::RuntimeException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+css::uno::Type mapType(Type type) {
+    switch (type) {
+    case TYPE_ANY:
+        return cppu::UnoType< css::uno::Any >::get();
+    case TYPE_BOOLEAN:
+        return cppu::UnoType< sal_Bool >::get();
+    case TYPE_SHORT:
+        return cppu::UnoType< sal_Int16 >::get();
+    case TYPE_INT:
+        return cppu::UnoType< sal_Int32 >::get();
+    case TYPE_LONG:
+        return cppu::UnoType< sal_Int64 >::get();
+    case TYPE_DOUBLE:
+        return cppu::UnoType< double >::get();
+    case TYPE_STRING:
+        return cppu::UnoType< rtl::OUString >::get();
+    case TYPE_HEXBINARY:
+        return cppu::UnoType< css::uno::Sequence< sal_Int8 > >::get();
+    case TYPE_BOOLEAN_LIST:
+        return cppu::UnoType< css::uno::Sequence< sal_Bool > >::get();
+    case TYPE_SHORT_LIST:
+        return cppu::UnoType< css::uno::Sequence< sal_Int16 > >::get();
+    case TYPE_INT_LIST:
+        return cppu::UnoType< css::uno::Sequence< sal_Int32 > >::get();
+    case TYPE_LONG_LIST:
+        return cppu::UnoType< css::uno::Sequence< sal_Int64 > >::get();
+    case TYPE_DOUBLE_LIST:
+        return cppu::UnoType< css::uno::Sequence< double > >::get();
+    case TYPE_STRING_LIST:
+        return cppu::UnoType< css::uno::Sequence< rtl::OUString > >::get();
+    case TYPE_HEXBINARY_LIST:
+        return cppu::UnoType<
+            css::uno::Sequence< css::uno::Sequence< sal_Int8 > > >::get();
+    default:
+        OSL_ASSERT(false);
+        throw css::uno::RuntimeException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+Type getDynamicType(css::uno::Any const & value) {
+    switch (value.getValueType().getTypeClass()) {
+    case css::uno::TypeClass_VOID:
+        return TYPE_NIL;
+    case css::uno::TypeClass_BOOLEAN:
+        return TYPE_BOOLEAN;
+    case css::uno::TypeClass_BYTE:
+        return TYPE_SHORT;
+    case css::uno::TypeClass_SHORT:
+        return TYPE_SHORT;
+    case css::uno::TypeClass_UNSIGNED_SHORT:
+        return value.has< sal_Int16 >() ? TYPE_SHORT : TYPE_INT;
+    case css::uno::TypeClass_LONG:
+        return TYPE_INT;
+    case css::uno::TypeClass_UNSIGNED_LONG:
+        return value.has< sal_Int32 >() ? TYPE_INT : TYPE_LONG;
+    case css::uno::TypeClass_HYPER:
+        return TYPE_LONG;
+    case css::uno::TypeClass_UNSIGNED_HYPER:
+        return value.has< sal_Int64 >() ? TYPE_LONG : TYPE_ERROR;
+    case css::uno::TypeClass_FLOAT:
+    case css::uno::TypeClass_DOUBLE:
+        return TYPE_DOUBLE;
+    case css::uno::TypeClass_STRING:
+        return TYPE_STRING;
+    case css::uno::TypeClass_SEQUENCE: //TODO
+        {
+            rtl::OUString name(value.getValueType().getTypeName());
+            if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]byte"))) {
+                return TYPE_HEXBINARY;
+            } else if (name.equalsAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("[]boolean")))
+            {
+                return TYPE_BOOLEAN_LIST;
+            } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]short")))
+            {
+                return TYPE_SHORT_LIST;
+            } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]long")))
+            {
+                return TYPE_INT_LIST;
+            } else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]hyper")))
+            {
+                return TYPE_LONG_LIST;
+            } else if (name.equalsAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("[]double")))
+            {
+                return TYPE_DOUBLE_LIST;
+            } else if (name.equalsAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("[]string")))
+            {
+                return TYPE_STRING_LIST;
+            } else if (name.equalsAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("[][]byte")))
+            {
+                return TYPE_HEXBINARY_LIST;
+            }
+        }
+        // fall through
+    default:
+        return TYPE_ERROR;
+    }
+}
+
+}
diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx
new file mode 100644
index 0000000000..85edc9b5e9
--- /dev/null
+++ b/configmgr/source/type.hxx
@@ -0,0 +1,56 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_TYPE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_TYPE_HXX
+
+#include "sal/config.h"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+    class Type;
+} } } }
+
+namespace configmgr {
+
+enum Type {
+    TYPE_ERROR, TYPE_NIL, TYPE_ANY, TYPE_BOOLEAN, TYPE_SHORT, TYPE_INT,
+    TYPE_LONG, TYPE_DOUBLE, TYPE_STRING, TYPE_HEXBINARY, TYPE_BOOLEAN_LIST,
+    TYPE_SHORT_LIST, TYPE_INT_LIST, TYPE_LONG_LIST, TYPE_DOUBLE_LIST,
+    TYPE_STRING_LIST, TYPE_HEXBINARY_LIST };
+
+bool isListType(Type type);
+
+Type elementType(Type type);
+
+com::sun::star::uno::Type mapType(Type type);
+
+Type getDynamicType(com::sun::star::uno::Any const & value);
+
+}
+
+#endif
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
new file mode 100644
index 0000000000..ab711c3bec
--- /dev/null
+++ b/configmgr/source/update.cxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "configmgr/update.hxx"
+#include "osl/mutex.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "broadcaster.hxx"
+#include "components.hxx"
+#include "lock.hxx"
+#include "modifications.hxx"
+#include "rootaccess.hxx"
+
+namespace configmgr {
+
+namespace update {
+
+void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri) {
+    osl::MutexGuard g(lock);
+    Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
+}
+
+void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri) {
+    Broadcaster bc;
+    {
+        osl::MutexGuard g(lock);
+        Modifications mods;
+        Components::getSingleton().insertExtensionXcuFile(
+            shared, fileUri, &mods);
+        Components::getSingleton().initGlobalBroadcaster(
+            mods, rtl::Reference< RootAccess >(), &bc);
+    }
+    bc.send();
+}
+
+}
+
+}
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
new file mode 100644
index 0000000000..f951aac5ca
--- /dev/null
+++ b/configmgr/source/valueparser.cxx
@@ -0,0 +1,476 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "comphelper/sequenceasvector.hxx"
+#include "osl/diagnose.h"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "localizedvaluenode.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "propertynode.hxx"
+#include "span.hxx"
+#include "type.hxx"
+#include "valueparser.hxx"
+#include "xmldata.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+bool parseHexDigit(char c, int * value) {
+    OSL_ASSERT(value != 0);
+    if (c >= '0' && c <= '9') {
+        *value = c - '0';
+        return true;
+    }
+    if (c >= 'A' && c <= 'F') {
+        *value = c - 'A' + 10;
+        return true;
+    }
+    if (c >= 'a' && c <= 'f') {
+        *value = c - 'a' + 10;
+        return true;
+    }
+    return false;
+}
+
+bool parseValue(Span const & text, sal_Bool * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("true")) ||
+        text.equals(RTL_CONSTASCII_STRINGPARAM("1")))
+    {
+        *value = true;
+        return true;
+    }
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("false")) ||
+        text.equals(RTL_CONSTASCII_STRINGPARAM("0")))
+    {
+        *value = false;
+        return true;
+    }
+    return false;
+}
+
+bool parseValue(Span const & text, sal_Int16 * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    // For backwards compatibility, support hexadecimal values:
+    sal_Int32 n =
+        rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
+            text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
+            RTL_CONSTASCII_LENGTH("0X")) == 0 ?
+        rtl::OString(
+            text.begin + RTL_CONSTASCII_LENGTH("0X"),
+            text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) :
+        rtl::OString(text.begin, text.length).toInt32();
+        //TODO: check valid lexical representation
+    if (n >= SAL_MIN_INT16 && n <= SAL_MAX_INT16) {
+        *value = static_cast< sal_Int16 >(n);
+        return true;
+    }
+    return false;
+}
+
+bool parseValue(Span const & text, sal_Int32 * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    // For backwards compatibility, support hexadecimal values:
+    *value =
+        rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
+            text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
+            RTL_CONSTASCII_LENGTH("0X")) == 0 ?
+        rtl::OString(
+            text.begin + RTL_CONSTASCII_LENGTH("0X"),
+            text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) :
+        rtl::OString(text.begin, text.length).toInt32();
+        //TODO: check valid lexical representation
+    return true;
+}
+
+bool parseValue(Span const & text, sal_Int64 * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    // For backwards compatibility, support hexadecimal values:
+    *value =
+        rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
+            text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
+            RTL_CONSTASCII_LENGTH("0X")) == 0 ?
+        rtl::OString(
+            text.begin + RTL_CONSTASCII_LENGTH("0X"),
+            text.length - RTL_CONSTASCII_LENGTH("0X")).toInt64(16) :
+        rtl::OString(text.begin, text.length).toInt64();
+        //TODO: check valid lexical representation
+    return true;
+}
+
+bool parseValue(Span const & text, double * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    *value = rtl::OString(text.begin, text.length).toDouble();
+        //TODO: check valid lexical representation
+    return true;
+}
+
+bool parseValue(Span const & text, rtl::OUString * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    *value = xmldata::convertFromUtf8(text);
+    return true;
+}
+
+bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) {
+    OSL_ASSERT(text.is() && value != 0);
+    if ((text.length & 1) != 0) {
+        return false;
+    }
+    comphelper::SequenceAsVector< sal_Int8 > seq;
+    for (sal_Int32 i = 0; i != text.length;) {
+        int n1;
+        int n2;
+        if (!parseHexDigit(text.begin[i++], &n1) ||
+            !parseHexDigit(text.begin[i++], &n2))
+        {
+            return false;
+        }
+        seq.push_back(static_cast< sal_Int8 >((n1 << 4) | n2));
+    }
+    *value = seq.getAsConstList();
+    return true;
+}
+
+template< typename T > css::uno::Any parseSingleValue(Span const & text) {
+    T val;
+    if (!parseValue(text, &val)) {
+        throw css::uno::RuntimeException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    return css::uno::makeAny(val);
+}
+
+template< typename T > css::uno::Any parseListValue(
+    rtl::OString const & separator, Span const & text)
+{
+    comphelper::SequenceAsVector< T > seq;
+    Span sep;
+    if (separator.getLength() == 0) {
+        sep = Span(RTL_CONSTASCII_STRINGPARAM(" "));
+    } else {
+        sep = Span(separator.getStr(), separator.getLength());
+    }
+    if (text.length != 0) {
+        for (Span t(text);;) {
+            sal_Int32 i = rtl_str_indexOfStr_WithLength(
+                t.begin, t.length, sep.begin, sep.length);
+            T val;
+            if (!parseValue(Span(t.begin, i == -1 ? t.length : i), &val)) {
+                throw css::uno::RuntimeException(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            seq.push_back(val);
+            if (i < 0) {
+                break;
+            }
+            t.begin += i + sep.length;
+            t.length -= i + sep.length;
+        }
+    }
+    return css::uno::makeAny(seq.getAsConstList());
+}
+
+css::uno::Any parseValue(
+    rtl::OString const & separator, Span const & text, Type type)
+{
+    switch (type) {
+    case TYPE_ANY:
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("invalid value of type any")),
+            css::uno::Reference< css::uno::XInterface >());
+    case TYPE_BOOLEAN:
+        return parseSingleValue< sal_Bool >(text);
+    case TYPE_SHORT:
+        return parseSingleValue< sal_Int16 >(text);
+    case TYPE_INT:
+        return parseSingleValue< sal_Int32 >(text);
+    case TYPE_LONG:
+        return parseSingleValue< sal_Int64 >(text);
+    case TYPE_DOUBLE:
+        return parseSingleValue< double >(text);
+    case TYPE_STRING:
+        return parseSingleValue< rtl::OUString >(text);
+    case TYPE_HEXBINARY:
+        return parseSingleValue< css::uno::Sequence< sal_Int8 > >(text);
+    case TYPE_BOOLEAN_LIST:
+        return parseListValue< sal_Bool >(separator, text);
+    case TYPE_SHORT_LIST:
+        return parseListValue< sal_Int16 >(separator, text);
+    case TYPE_INT_LIST:
+        return parseListValue< sal_Int32 >(separator, text);
+    case TYPE_LONG_LIST:
+        return parseListValue< sal_Int64 >(separator, text);
+    case TYPE_DOUBLE_LIST:
+        return parseListValue< double >(separator, text);
+    case TYPE_STRING_LIST:
+        return parseListValue< rtl::OUString >(separator, text);
+    case TYPE_HEXBINARY_LIST:
+        return parseListValue< css::uno::Sequence< sal_Int8 > >(
+            separator, text);
+    default:
+        OSL_ASSERT(false);
+        throw css::uno::RuntimeException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+}
+
+ValueParser::ValueParser(int layer): layer_(layer) {}
+
+ValueParser::~ValueParser() {}
+
+XmlReader::Text ValueParser::getTextMode() const {
+    if (node_.is()) {
+        switch (state_) {
+        case STATE_TEXT:
+        case STATE_IT:
+            return
+                (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
+                 separator_.getLength() != 0)
+                ? XmlReader::TEXT_RAW : XmlReader::TEXT_NORMALIZED;
+        default:
+            break;
+        }
+    }
+    return XmlReader::TEXT_NONE;
+}
+
+bool ValueParser::startElement(
+    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+{
+    if (!node_.is()) {
+        return false;
+    }
+    switch (state_) {
+    case STATE_TEXT:
+        if (ns == XmlReader::NAMESPACE_NONE &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&
+            isListType(type_) && separator_.getLength() == 0)
+        {
+            checkEmptyPad(reader);
+            state_ = STATE_IT;
+            return true;
+        }
+        // fall through
+    case STATE_IT:
+        if (ns == XmlReader::NAMESPACE_NONE &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("unicode")) &&
+            (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST))
+        {
+            sal_Int32 scalar = -1;
+            for (;;) {
+                XmlReader::Namespace attrNs;
+                Span attrLn;
+                if (!reader.nextAttribute(&attrNs, &attrLn)) {
+                    break;
+                }
+                if (attrNs == XmlReader::NAMESPACE_OOR &&
+                    attrLn.equals(RTL_CONSTASCII_STRINGPARAM("scalar")))
+                {
+                    if (!parseValue(reader.getAttributeValue(true), &scalar)) {
+                        scalar = -1;
+                    }
+                    break;
+                }
+            }
+            if (scalar >= 0 && scalar < 0x20 && scalar != 0x09 &&
+                scalar != 0x0A && scalar != 0x0D)
+            {
+                char c = static_cast< char >(scalar);
+                pad_.add(&c, 1);
+            } else if (scalar == 0xFFFE) {
+                pad_.add(RTL_CONSTASCII_STRINGPARAM("\xEF\xBF\xBE"));
+            } else if (scalar == 0xFFFF) {
+                pad_.add(RTL_CONSTASCII_STRINGPARAM("\xEF\xBF\xBF"));
+            } else {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad unicode scalar attribute in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            state_ = State(state_ + 1);
+            return true;
+        }
+        break;
+    default:
+        break;
+    }
+    throw css::uno::RuntimeException(
+        (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
+         xmldata::convertFromUtf8(name) +
+         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+bool ValueParser::endElement(XmlReader const & reader) {
+    if (!node_.is()) {
+        return false;
+    }
+    switch (state_) {
+    case STATE_TEXT:
+        {
+            css::uno::Any value;
+            if (items_.empty()) {
+                value = parseValue(separator_, pad_.get(), type_);
+                pad_.clear();
+            } else {
+                checkEmptyPad(reader);
+                switch (type_) {
+                case TYPE_BOOLEAN_LIST:
+                    value = convertItems< sal_Bool >();
+                    break;
+                case TYPE_SHORT_LIST:
+                    value = convertItems< sal_Int16 >();
+                    break;
+                case TYPE_INT_LIST:
+                    value = convertItems< sal_Int32 >();
+                    break;
+                case TYPE_LONG_LIST:
+                    value = convertItems< sal_Int64 >();
+                    break;
+                case TYPE_DOUBLE_LIST:
+                    value = convertItems< double >();
+                    break;
+                case TYPE_STRING_LIST:
+                    value = convertItems< rtl::OUString >();
+                    break;
+                case TYPE_HEXBINARY_LIST:
+                    value = convertItems< css::uno::Sequence< sal_Int8 > >();
+                    break;
+                default:
+                    OSL_ASSERT(false); // this cannot happen
+                    break;
+                }
+                items_.clear();
+            }
+            switch (node_->kind()) {
+            case Node::KIND_PROPERTY:
+                dynamic_cast< PropertyNode * >(node_.get())->setValue(
+                    layer_, value);
+                break;
+            case Node::KIND_LOCALIZED_PROPERTY:
+                {
+                    NodeMap::iterator i(
+                        node_->getMembers().find(localizedName_));
+                    if (i == node_->getMembers().end()) {
+                        node_->getMembers().insert(
+                            NodeMap::value_type(
+                                localizedName_,
+                                new LocalizedValueNode(layer_, value)));
+                    } else {
+                        dynamic_cast< LocalizedValueNode * >(i->second.get())->
+                            setValue(layer_, value);
+                    }
+                }
+                break;
+            default:
+                OSL_ASSERT(false); // this cannot happen
+                break;
+            }
+            separator_ = rtl::OString();
+            node_.clear();
+        }
+        break;
+    case STATE_TEXT_UNICODE:
+    case STATE_IT_UNICODE:
+        state_ = State(state_ - 1);
+        break;
+    case STATE_IT:
+        items_.push_back(
+            parseValue(rtl::OString(), pad_.get(), elementType(type_)));
+        pad_.clear();
+        state_ = STATE_TEXT;
+        break;
+    }
+    return true;
+}
+
+void ValueParser::characters(Span const & text) {
+    if (node_.is()) {
+        OSL_ASSERT(state_ == STATE_TEXT || state_ == STATE_IT);
+        pad_.add(text.begin, text.length);
+    }
+}
+
+void ValueParser::start(
+    rtl::Reference< Node > const & node, rtl::OUString const & localizedName)
+{
+    OSL_ASSERT(node.is() && !node_.is());
+    node_ = node;
+    localizedName_ = localizedName;
+    state_ = STATE_TEXT;
+}
+
+int ValueParser::getLayer() const {
+    return layer_;
+}
+
+void ValueParser::checkEmptyPad(XmlReader const & reader) const {
+    if (pad_.is()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "mixed text and <it> elements in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+template< typename T > css::uno::Any ValueParser::convertItems() {
+    css::uno::Sequence< T > seq(items_.size());
+    for (sal_Int32 i = 0; i < seq.getLength(); ++i) {
+        OSL_VERIFY(items_[i] >>= seq[i]);
+    }
+    return css::uno::makeAny(seq);
+}
+
+}
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
new file mode 100644
index 0000000000..c328fe7edd
--- /dev/null
+++ b/configmgr/source/valueparser.hxx
@@ -0,0 +1,94 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_VALUEPARSER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_VALUEPARSER_HXX
+
+#include "sal/config.h"
+
+#include <vector>
+
+#include "boost/noncopyable.hpp"
+#include "rtl/ref.hxx"
+#include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
+
+#include "pad.hxx"
+#include "type.hxx"
+#include "xmlreader.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+} } } }
+
+namespace configmgr {
+
+class Node;
+struct Span;
+
+class ValueParser: private boost::noncopyable {
+public:
+    ValueParser(int layer);
+
+    ~ValueParser();
+
+    XmlReader::Text getTextMode() const;
+
+    bool startElement(
+        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+
+    bool endElement(XmlReader const & reader);
+
+    void characters(Span const & text);
+
+    void start(
+        rtl::Reference< Node > const & property,
+        rtl::OUString const & localizedName = rtl::OUString());
+
+    int getLayer() const;
+
+    Type type_;
+    rtl::OString separator_;
+
+private:
+    void checkEmptyPad(XmlReader const & reader) const;
+
+    template< typename T > com::sun::star::uno::Any convertItems();
+
+    enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE };
+
+    int layer_;
+    rtl::Reference< Node > node_;
+    rtl::OUString localizedName_;
+    State state_;
+    Pad pad_;
+    std::vector< com::sun::star::uno::Any > items_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
new file mode 100644
index 0000000000..a8e0f77cbd
--- /dev/null
+++ b/configmgr/source/writemodfile.cxx
@@ -0,0 +1,631 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/file.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textcvt.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "data.hxx"
+#include "groupnode.hxx"
+#include "localizedpropertynode.hxx"
+#include "localizedvaluenode.hxx"
+#include "modifications.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "propertynode.hxx"
+#include "span.hxx"
+#include "type.hxx"
+#include "writemodfile.hxx"
+
+namespace configmgr {
+
+class Components;
+
+namespace {
+
+namespace css = com::sun::star;
+
+rtl::OString convertToUtf8(
+    rtl::OUString const & text, sal_Int32 offset, sal_Int32 length)
+{
+    OSL_ASSERT(
+        offset <= text.getLength() && text.getLength() - offset >= length);
+    rtl::OString s;
+    if (!rtl_convertUStringToString(
+            &s.pData, text.pData->buffer + offset, length,
+            RTL_TEXTENCODING_UTF8,
+            (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
+             RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
+    {
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot convert to UTF-8")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    return s;
+}
+
+struct TempFile: public boost::noncopyable {
+    rtl::OUString url;
+    oslFileHandle handle;
+    bool closed;
+
+    TempFile(): handle(0), closed(false) {}
+
+    ~TempFile();
+};
+
+TempFile::~TempFile() {
+    if (handle != 0) {
+        if (!closed) {
+            oslFileError e = osl_closeFile(handle);
+            if (e != osl_File_E_None) {
+                OSL_TRACE(
+                    "osl_closeFile failed with %ld", static_cast< long >(e));
+            }
+        }
+        osl::FileBase::RC e = osl::File::remove(url);
+        if (e != osl::FileBase::E_None) {
+            OSL_TRACE("osl_removeFile failed with %ld", static_cast< long >(e));
+        }
+    }
+}
+
+void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) {
+    OSL_ASSERT(length >= 0);
+    sal_uInt64 n;
+    if ((osl_writeFile(handle, begin, static_cast< sal_uInt32 >(length), &n) !=
+         osl_File_E_None) ||
+        n != static_cast< sal_uInt32 >(length))
+    {
+        throw css::uno::RuntimeException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("write failure")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+void writeData(oslFileHandle handle, rtl::OString const & text) {
+    writeData(handle, text.getStr(), text.getLength());
+}
+
+void writeAttributeValue(oslFileHandle handle, rtl::OUString const & value) {
+    sal_Int32 i = 0;
+    sal_Int32 j = i;
+    for (; j < value.getLength(); ++j) {
+        OSL_ASSERT(
+            value[j] == 0x0009 || value[j] == 0x000A || value[j] == 0x000D ||
+            (value[j] >= 0x0020 && value[j] != 0xFFFE && value[j] != 0xFFFF));
+        switch(value[j]) {
+        case '\x09':
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&#9;"));
+            i = j + 1;
+            break;
+        case '\x0A':
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&#xA;"));
+            i = j + 1;
+            break;
+        case '\x0D':
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&#xD;"));
+            i = j + 1;
+            break;
+        case '"':
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&quot;"));
+            i = j + 1;
+            break;
+        case '&':
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&amp;"));
+            i = j + 1;
+            break;
+        case '<':
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&lt;"));
+            i = j + 1;
+            break;
+        default:
+            break;
+        }
+    }
+    writeData(handle, convertToUtf8(value, i, j - i));
+}
+
+void writeValueContent(oslFileHandle handle, sal_Bool value) {
+    if (value) {
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("true"));
+    } else {
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("false"));
+    }
+}
+
+void writeValueContent(oslFileHandle handle, sal_Int16 value) {
+    writeData(handle, rtl::OString::valueOf(static_cast< sal_Int32 >(value)));
+}
+
+void writeValueContent(oslFileHandle handle, sal_Int32 value) {
+    writeData(handle, rtl::OString::valueOf(value));
+}
+
+void writeValueContent(oslFileHandle handle, sal_Int64 value) {
+    writeData(handle, rtl::OString::valueOf(value));
+}
+
+void writeValueContent(oslFileHandle handle, double value) {
+    writeData(handle, rtl::OString::valueOf(value));
+}
+
+void writeValueContent(oslFileHandle handle, rtl::OUString const & value) {
+    sal_Int32 i = 0;
+    sal_Int32 j = i;
+    for (; j < value.getLength(); ++j) {
+        sal_Unicode c = value[j];
+        if ((c < 0x0020 && c != 0x0009 && c != 0x000A && c != 0x000D) ||
+            c == 0xFFFE || c == 0xFFFF)
+        {
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(
+                handle, RTL_CONSTASCII_STRINGPARAM("<unicode oor:scalar=\""));
+            writeData(
+                handle, rtl::OString::valueOf(static_cast< sal_Int32 >(c)));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("\"/>"));
+            i = j + 1;
+        } else if (c == '\x0D') {
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&#xD;"));
+            i = j + 1;
+        } else if (c == '&') {
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&amp;"));
+            i = j + 1;
+        } else if (c == '<') {
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&lt;"));
+            i = j + 1;
+        } else if (c == '>') {
+            // "MUST, for compatibility, be escaped [...] when it appears in the
+            // string ']]>'":
+            writeData(handle, convertToUtf8(value, i, j - i));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("&gt;"));
+            i = j + 1;
+        }
+    }
+    writeData(handle, convertToUtf8(value, i, j - i));
+}
+
+void writeValueContent(
+    oslFileHandle handle, css::uno::Sequence< sal_Int8 > const & value)
+{
+    for (sal_Int32 i = 0; i < value.getLength(); ++i) {
+        static char const hexDigit[16] = {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
+            'D', 'E', 'F' };
+        writeData(handle, hexDigit + ((value[i] >> 4) & 0xF), 1);
+        writeData(handle, hexDigit + (value[i] & 0xF), 1);
+    }
+}
+
+template< typename T > void writeSingleValue(
+    oslFileHandle handle, css::uno::Any const & value)
+{
+    writeData(handle, RTL_CONSTASCII_STRINGPARAM(">"));
+    T val = T();
+    value >>= val;
+    writeValueContent(handle, val);
+    writeData(handle, RTL_CONSTASCII_STRINGPARAM("</value>"));
+}
+
+template< typename T > void writeListValue(
+    oslFileHandle handle, css::uno::Any const & value)
+{
+    writeData(handle, RTL_CONSTASCII_STRINGPARAM(">"));
+    css::uno::Sequence< T > val;
+    value >>= val;
+    for (sal_Int32 i = 0; i < val.getLength(); ++i) {
+        if (i != 0) {
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM(" "));
+        }
+        writeValueContent(handle, val[i]);
+    }
+    writeData(handle, RTL_CONSTASCII_STRINGPARAM("</value>"));
+}
+
+template< typename T > void writeItemListValue(
+    oslFileHandle handle, css::uno::Any const & value)
+{
+    writeData(handle, RTL_CONSTASCII_STRINGPARAM(">"));
+    css::uno::Sequence< T > val;
+    value >>= val;
+    for (sal_Int32 i = 0; i < val.getLength(); ++i) {
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("<it>"));
+        writeValueContent(handle, val[i]);
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("</it>"));
+    }
+    writeData(handle, RTL_CONSTASCII_STRINGPARAM("</value>"));
+}
+
+void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) {
+    switch (type) {
+    case TYPE_BOOLEAN:
+        writeSingleValue< sal_Bool >(handle, value);
+        break;
+    case TYPE_SHORT:
+        writeSingleValue< sal_Int16 >(handle, value);
+        break;
+    case TYPE_INT:
+        writeSingleValue< sal_Int32 >(handle, value);
+        break;
+    case TYPE_LONG:
+        writeSingleValue< sal_Int64 >(handle, value);
+        break;
+    case TYPE_DOUBLE:
+        writeSingleValue< double >(handle, value);
+        break;
+    case TYPE_STRING:
+        writeSingleValue< rtl::OUString >(handle, value);
+        break;
+    case TYPE_HEXBINARY:
+        writeSingleValue< css::uno::Sequence< sal_Int8 > >(handle, value);
+        break;
+    case TYPE_BOOLEAN_LIST:
+        writeListValue< sal_Bool >(handle, value);
+        break;
+    case TYPE_SHORT_LIST:
+        writeListValue< sal_Int16 >(handle, value);
+        break;
+    case TYPE_INT_LIST:
+        writeListValue< sal_Int32 >(handle, value);
+        break;
+    case TYPE_LONG_LIST:
+        writeListValue< sal_Int64 >(handle, value);
+        break;
+    case TYPE_DOUBLE_LIST:
+        writeListValue< double >(handle, value);
+        break;
+    case TYPE_STRING_LIST:
+        writeItemListValue< rtl::OUString >(handle, value);
+        break;
+    case TYPE_HEXBINARY_LIST:
+        writeItemListValue< css::uno::Sequence< sal_Int8 > >(handle, value);
+        break;
+    default: // TYPE_ERROR, TYPE_NIL, TYPE_ANY
+        OSL_ASSERT(false); // this cannot happen
+    }
+}
+
+void writeNode(
+    Components & components, oslFileHandle handle,
+    rtl::Reference< Node > const & parent, rtl::OUString const & name,
+    rtl::Reference< Node > const & node)
+{
+    static Span const typeNames[] = {
+        Span(), Span(), Span(), // TYPE_ERROR, TYPE_NIL, TYPE_ANY
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")),
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:short")),
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:int")),
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:long")),
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:double")),
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:string")),
+        Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")),
+        Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) };
+    switch (node->kind()) {
+    case Node::KIND_PROPERTY:
+        {
+            PropertyNode * prop = dynamic_cast< PropertyNode * >(node.get());
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<prop oor:name=\""));
+            writeAttributeValue(handle, name);
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"fuse\""));
+            Type type = prop->getStaticType();
+            Type dynType = getDynamicType(prop->getValue(components));
+            OSL_ASSERT(dynType != TYPE_ERROR);
+            if (type == TYPE_ANY) {
+                type = dynType;
+                if (type != TYPE_NIL) {
+                    writeData(
+                        handle, RTL_CONSTASCII_STRINGPARAM(" oor:type=\""));
+                    writeData(
+                        handle, typeNames[type].begin, typeNames[type].length);
+                    writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));
+                }
+            }
+            writeData(handle, "><value");
+            if (dynType == TYPE_NIL) {
+                writeData(
+                    handle, RTL_CONSTASCII_STRINGPARAM(" xsi:nil=\"true\"/>"));
+            } else {
+                writeValue(handle, type, prop->getValue(components));
+            }
+            writeData(handle, "</prop>");
+        }
+        break;
+    case Node::KIND_LOCALIZED_PROPERTY:
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("<prop oor:name=\""));
+        writeAttributeValue(handle, name);
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"fuse\">"));
+        for (NodeMap::iterator i(node->getMembers().begin());
+             i != node->getMembers().end(); ++i)
+        {
+            writeNode(components, handle, node, i->first, i->second);
+        }
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("</prop>"));
+        break;
+    case Node::KIND_LOCALIZED_VALUE:
+        {
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));
+            if (name.getLength() != 0) {
+                writeData(handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
+                writeAttributeValue(handle, name);
+                writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));
+            }
+            Type type = dynamic_cast< LocalizedPropertyNode * >(parent.get())->
+                getStaticType();
+            css::uno::Any value(
+                dynamic_cast< LocalizedValueNode * >(node.get())->getValue());
+            Type dynType = getDynamicType(value);
+            OSL_ASSERT(dynType != TYPE_ERROR);
+            if (type == TYPE_ANY) {
+                type = dynType;
+                if (type != TYPE_NIL) {
+                    writeData(
+                        handle, RTL_CONSTASCII_STRINGPARAM(" oor:type=\""));
+                    writeData(
+                        handle, typeNames[type].begin, typeNames[type].length);
+                    writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));
+                }
+            }
+            if (dynType == TYPE_NIL) {
+                writeData(
+                    handle, RTL_CONSTASCII_STRINGPARAM(" xsi:nil=\"true\"/>"));
+            } else {
+                writeValue(handle, type, value);
+            }
+        }
+        break;
+    case Node::KIND_GROUP:
+    case Node::KIND_SET:
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("<node oor:name=\""));
+        writeAttributeValue(handle, name);
+        if (node->getTemplateName().getLength() != 0) { // set member
+            writeData(
+                handle, RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"replace"));
+        }
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("\">"));
+        for (NodeMap::iterator i(node->getMembers().begin());
+             i != node->getMembers().end(); ++i)
+        {
+            writeNode(components, handle, node, i->first, i->second);
+        }
+        writeData(handle, RTL_CONSTASCII_STRINGPARAM("</node>"));
+        break;
+    }
+}
+
+void writeModifications(
+    Components & components, oslFileHandle handle,
+    rtl::OUString const & grandparentPathRepresentation,
+    rtl::OUString const & parentName, rtl::Reference< Node > const & parent,
+    rtl::OUString const & nodeName, rtl::Reference< Node > const & node,
+    Modifications::Node const & modifications)
+{
+    // It is never necessary to write oor:finalized or oor:mandatory attributes,
+    // as they cannot be set via the UNO API.
+    if (modifications.children.empty()) {
+        OSL_ASSERT(parent.is());
+            // components themselves have no parent but must have children
+        if (node.is()) {
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<item oor:path=\""));
+            writeAttributeValue(
+                handle,
+                (grandparentPathRepresentation +
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+                 Data::createSegment(parent->getTemplateName(), parentName)));
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("\">"));
+            writeNode(components, handle, parent, nodeName, node);
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("</item>"));
+        } else {
+            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<item oor:path=\""));
+            switch (parent->kind()) {
+            case Node::KIND_LOCALIZED_PROPERTY:
+                writeAttributeValue(handle, grandparentPathRepresentation);
+                writeData(
+                    handle, RTL_CONSTASCII_STRINGPARAM("\"><prop oor:name=\""));
+                writeAttributeValue(handle, parentName);
+                writeData(
+                    handle,
+                    RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"fuse\"><value"));
+                if (nodeName.getLength() != 0) {
+                    writeData(
+                        handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
+                    writeAttributeValue(handle, nodeName);
+                    writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));
+                }
+                writeData(
+                    handle,
+                    RTL_CONSTASCII_STRINGPARAM(
+                        " oor:op=\"remove\"/></prop></item>"));
+                break;
+            case Node::KIND_GROUP:
+                OSL_ASSERT(
+                    dynamic_cast< GroupNode * >(parent.get())->isExtensible());
+                writeAttributeValue(
+                    handle,
+                    (grandparentPathRepresentation +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+                     Data::createSegment(
+                         parent->getTemplateName(), parentName)));
+                writeData(
+                    handle, RTL_CONSTASCII_STRINGPARAM("\"><prop oor:name=\""));
+                writeAttributeValue(handle, nodeName);
+                writeData(
+                    handle,
+                    RTL_CONSTASCII_STRINGPARAM(
+                        "\" oor:op=\"remove\"/></item>"));
+                break;
+            case Node::KIND_SET:
+                writeAttributeValue(
+                    handle,
+                    (grandparentPathRepresentation +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+                     Data::createSegment(
+                         parent->getTemplateName(), parentName)));
+                writeData(
+                    handle, RTL_CONSTASCII_STRINGPARAM("\"><node oor:name=\""));
+                writeAttributeValue(handle, nodeName);
+                writeData(
+                    handle,
+                    RTL_CONSTASCII_STRINGPARAM(
+                        "\" oor:op=\"remove\"/></item>"));
+                break;
+            default:
+                OSL_ASSERT(false); // this cannot happen
+                break;
+            }
+        }
+    } else {
+        rtl::OUString parentPathRep;
+        if (parent.is()) { // components themselves have no parent
+            parentPathRep = grandparentPathRepresentation +
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+                Data::createSegment(parent->getTemplateName(), parentName);
+        }
+        OSL_ASSERT(node.is());
+        for (Modifications::Node::Children::const_iterator i(
+                 modifications.children.begin());
+             i != modifications.children.end(); ++i)
+        {
+            writeModifications(
+                components, handle, parentPathRep, nodeName, node, i->first,
+                node->getMember(i->first), i->second);
+        }
+    }
+}
+
+}
+
+void writeModFile(
+    Components & components, rtl::OUString const & url, Data const & data)
+{
+    sal_Int32 i = url.lastIndexOf('/');
+    OSL_ASSERT(i != -1);
+    rtl::OUString dir(url.copy(0, i));
+    switch (osl::Directory::createPath(dir)) {
+    case osl::FileBase::E_None:
+    case osl::FileBase::E_EXIST:
+        break;
+    case osl::FileBase::E_ACCES:
+        OSL_TRACE(
+            "cannot create registrymodifications.xcu path (E_ACCES); changes"
+            " will be lost");
+        return;
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot create directory ")) +
+             dir),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    TempFile tmp;
+    switch (osl::FileBase::createTempFile(&dir, &tmp.handle, &tmp.url)) {
+    case osl::FileBase::E_None:
+        break;
+    case osl::FileBase::E_ACCES:
+        OSL_TRACE(
+            "cannot create temp registrymodifications.xcu (E_ACCES); changes"
+            " will be lost");
+        return;
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "cannot create temporary file in ")) +
+             dir),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    writeData(
+        tmp.handle,
+        RTL_CONSTASCII_STRINGPARAM(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?><oor:items"
+            " xmlns:oor=\"http://openoffice.org/2001/registry\""
+            " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\""
+            " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"));
+    //TODO: Do not write back information about those removed items that did not
+    // come from the .xcs/.xcu files, anyway (but had been added dynamically
+    // instead):
+    for (Modifications::Node::Children::const_iterator j(
+             data.modifications.getRoot().children.begin());
+         j != data.modifications.getRoot().children.end(); ++j)
+    {
+        writeModifications(
+            components, tmp.handle, rtl::OUString(), rtl::OUString(),
+            rtl::Reference< Node >(), j->first,
+            Data::findNode(Data::NO_LAYER, data.components, j->first),
+            j->second);
+    }
+    writeData(tmp.handle, RTL_CONSTASCII_STRINGPARAM("</oor:items>"));
+    oslFileError e = osl_closeFile(tmp.handle);
+    tmp.closed = true;
+    if (e != osl_File_E_None) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot close ")) +
+             tmp.url),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (osl::File::move(tmp.url, url) != osl::FileBase::E_None) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot move ")) +
+             tmp.url),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    tmp.handle = 0;
+}
+
+}
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
new file mode 100644
index 0000000000..250edfd095
--- /dev/null
+++ b/configmgr/source/writemodfile.hxx
@@ -0,0 +1,45 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_WRITEMODFILE_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_WRITEMODFILE_HXX
+
+#include "sal/config.h"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class Components;
+struct Data;
+
+void writeModFile(
+    Components & components, rtl::OUString const & url, Data const & data);
+
+}
+
+#endif
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
new file mode 100644
index 0000000000..8306c692c3
--- /dev/null
+++ b/configmgr/source/xcdparser.cxx
@@ -0,0 +1,183 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <climits>
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.hxx"
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "span.hxx"
+#include "xcdparser.hxx"
+#include "xcsparser.hxx"
+#include "xcuparser.hxx"
+#include "xmldata.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+XcdParser::XcdParser(int layer, Dependencies const & dependencies, Data * data):
+    layer_(layer), dependencies_(dependencies), data_(data), state_(STATE_START)
+{}
+
+XcdParser::~XcdParser() {}
+
+XmlReader::Text XcdParser::getTextMode() {
+    return nestedParser_.is()
+        ? nestedParser_->getTextMode() : XmlReader::TEXT_NONE;
+}
+
+bool XcdParser::startElement(
+    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+{
+    if (nestedParser_.is()) {
+        OSL_ASSERT(nesting_ != LONG_MAX);
+        ++nesting_;
+        return nestedParser_->startElement(reader, ns, name);
+    }
+    switch (state_) {
+    case STATE_START:
+        if (ns == XmlReader::NAMESPACE_OOR &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("data")))
+        {
+            state_ = STATE_DEPENDENCIES;
+            return true;
+        }
+        break;
+    case STATE_DEPENDENCIES:
+        if (ns == XmlReader::NAMESPACE_NONE &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("dependency")))
+        {
+            if (dependency_.getLength() == 0) {
+                Span attrFile;
+                for (;;) {
+                    XmlReader::Namespace attrNs;
+                    Span attrLn;
+                    if (!reader.nextAttribute(&attrNs, &attrLn)) {
+                        break;
+                    }
+                    if (attrNs == XmlReader::NAMESPACE_NONE && //TODO: _OOR
+                        attrLn.equals(RTL_CONSTASCII_STRINGPARAM("file")))
+                    {
+                        attrFile = reader.getAttributeValue(false);
+                    }
+                }
+                if (!attrFile.is()) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "no dependency file attribute in ")) +
+                         reader.getUrl()),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+                dependency_ = xmldata::convertFromUtf8(attrFile);
+                if (dependency_.getLength() == 0) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "bad dependency file attribute in ")) +
+                         reader.getUrl()),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+            }
+            if (dependencies_.find(dependency_) == dependencies_.end()) {
+                return false;
+            }
+            state_ = STATE_DEPENDENCY;
+            dependency_ = rtl::OUString();
+            return true;
+        }
+        state_ = STATE_COMPONENTS;
+        // fall through
+    case STATE_COMPONENTS:
+        if (ns == XmlReader::NAMESPACE_OOR &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema")))
+        {
+            nestedParser_ = new XcsParser(layer_, data_);
+            nesting_ = 1;
+            return nestedParser_->startElement(reader, ns, name);
+        }
+        if (ns == XmlReader::NAMESPACE_OOR &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
+        {
+            nestedParser_ = new XcuParser(layer_ + 1, data_, 0);
+            nesting_ = 1;
+            return nestedParser_->startElement(reader, ns, name);
+        }
+        break;
+    default: // STATE_DEPENDENCY
+        OSL_ASSERT(false); // this cannot happen
+        break;
+    }
+    throw css::uno::RuntimeException(
+        (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
+         xmldata::convertFromUtf8(name) +
+         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+void XcdParser::endElement(XmlReader const & reader) {
+    if (nestedParser_.is()) {
+        nestedParser_->endElement(reader);
+        if (--nesting_ == 0) {
+            nestedParser_.clear();
+        }
+    } else {
+        switch (state_) {
+        case STATE_DEPENDENCY:
+            state_ = STATE_DEPENDENCIES;
+            break;
+        case STATE_DEPENDENCIES:
+        case STATE_COMPONENTS:
+            break;
+        default:
+            OSL_ASSERT(false); // this cannot happen
+            break;
+        }
+    }
+}
+
+void XcdParser::characters(Span const & text) {
+    if (nestedParser_.is()) {
+        nestedParser_->characters(text);
+    }
+}
+
+}
diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx
new file mode 100644
index 0000000000..2e35b3686e
--- /dev/null
+++ b/configmgr/source/xcdparser.hxx
@@ -0,0 +1,78 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_XCDPARSER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_XCDPARSER_HXX
+
+#include "sal/config.h"
+
+#include <set>
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "parser.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+struct Data;
+struct Span;
+
+class XcdParser: public Parser {
+public:
+    typedef std::set< rtl::OUString > Dependencies;
+
+    XcdParser(int layer, Dependencies const & dependencies, Data * data);
+
+private:
+    virtual ~XcdParser();
+
+    virtual XmlReader::Text getTextMode();
+
+    virtual bool startElement(
+        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+
+    virtual void endElement(XmlReader const & reader);
+
+    virtual void characters(Span const & text);
+
+    enum State {
+        STATE_START, STATE_DEPENDENCIES, STATE_DEPENDENCY, STATE_COMPONENTS };
+
+    int layer_;
+    Dependencies const & dependencies_;
+    Data * data_;
+    State state_;
+    rtl::OUString dependency_;
+    rtl::Reference< Parser > nestedParser_;
+    long nesting_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
new file mode 100644
index 0000000000..15141844a2
--- /dev/null
+++ b/configmgr/source/xcsparser.cxx
@@ -0,0 +1,598 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <cstddef>
+
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "rtl/ref.hxx"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "data.hxx"
+#include "localizedpropertynode.hxx"
+#include "groupnode.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "propertynode.hxx"
+#include "setnode.hxx"
+#include "span.hxx"
+#include "xcsparser.hxx"
+#include "xmldata.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+XcsParser::XcsParser(int layer, Data * data):
+    valueParser_(layer), data_(data), state_(STATE_START)
+{}
+
+XcsParser::~XcsParser() {}
+
+XmlReader::Text XcsParser::getTextMode() {
+    return valueParser_.getTextMode();
+}
+
+bool XcsParser::startElement(
+    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+{
+    if (valueParser_.startElement(reader, ns, name)) {
+        return true;
+    }
+    if (state_ == STATE_START) {
+        if (ns == XmlReader::NAMESPACE_OOR &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema"))) {
+            handleComponentSchema(reader);
+            state_ = STATE_COMPONENT_SCHEMA;
+            ignoring_ = 0;
+            return true;
+        }
+    } else {
+        //TODO: ignoring component-schema import, component-schema uses, and
+        // prop constraints; accepting all four at illegal places (and with
+        // illegal content):
+        if (ignoring_ > 0 ||
+            (ns == XmlReader::NAMESPACE_NONE &&
+             (name.equals(RTL_CONSTASCII_STRINGPARAM("info")) ||
+              name.equals(RTL_CONSTASCII_STRINGPARAM("import")) ||
+              name.equals(RTL_CONSTASCII_STRINGPARAM("uses")) ||
+              name.equals(RTL_CONSTASCII_STRINGPARAM("constraints")))))
+        {
+            OSL_ASSERT(ignoring_ < LONG_MAX);
+            ++ignoring_;
+            return true;
+        }
+        switch (state_) {
+        case STATE_COMPONENT_SCHEMA:
+            if (ns == XmlReader::NAMESPACE_NONE &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("templates")))
+            {
+                state_ = STATE_TEMPLATES;
+                return true;
+            }
+            // fall through
+        case STATE_TEMPLATES_DONE:
+            if (ns == XmlReader::NAMESPACE_NONE &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("component")))
+            {
+                state_ = STATE_COMPONENT;
+                OSL_ASSERT(elements_.empty());
+                elements_.push(
+                    Element(
+                        new GroupNode(
+                            valueParser_.getLayer(), false, rtl::OUString()),
+                        componentName_));
+                return true;
+            }
+            break;
+        case STATE_TEMPLATES:
+            if (elements_.empty()) {
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("group")))
+                {
+                    handleGroup(reader, true);
+                    return true;
+                }
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("set")))
+                {
+                    handleSet(reader, true);
+                    return true;
+                }
+                break;
+            }
+            // fall through
+        case STATE_COMPONENT:
+            OSL_ASSERT(!elements_.empty());
+            switch (elements_.top().node->kind()) {
+            case Node::KIND_PROPERTY:
+            case Node::KIND_LOCALIZED_PROPERTY:
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
+                {
+                    handlePropValue(reader, elements_.top().node);
+                    return true;
+                }
+                break;
+            case Node::KIND_GROUP:
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
+                {
+                    handleProp(reader);
+                    return true;
+                }
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("node-ref")))
+                {
+                    handleNodeRef(reader);
+                    return true;
+                }
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("group")))
+                {
+                    handleGroup(reader, false);
+                    return true;
+                }
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("set")))
+                {
+                    handleSet(reader, false);
+                    return true;
+                }
+                break;
+            case Node::KIND_SET:
+                if (ns == XmlReader::NAMESPACE_NONE &&
+                    name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
+                {
+                    handleSetItem(
+                        reader,
+                        dynamic_cast< SetNode * >(elements_.top().node.get()));
+                    return true;
+                }
+                break;
+            default: // Node::KIND_LOCALIZED_VALUE
+                OSL_ASSERT(false); // this cannot happen
+                break;
+            }
+            break;
+        case STATE_COMPONENT_DONE:
+            break;
+        default: // STATE_START
+            OSL_ASSERT(false); // this cannot happen
+            break;
+        }
+    }
+    throw css::uno::RuntimeException(
+        (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
+         xmldata::convertFromUtf8(name) +
+         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+void XcsParser::endElement(XmlReader const & reader) {
+    if (valueParser_.endElement(reader)) {
+        return;
+    }
+    if (ignoring_ > 0) {
+        --ignoring_;
+    } else if (!elements_.empty()) {
+        Element top(elements_.top());
+        elements_.pop();
+        if (top.node.is()) {
+            NodeMap * map;
+            if (elements_.empty()) {
+                switch (state_) {
+                case STATE_TEMPLATES:
+                    map = &data_->templates;
+                    break;
+                case STATE_COMPONENT:
+                    map = &data_->components;
+                    state_ = STATE_COMPONENT_DONE;
+                    break;
+                default:
+                    OSL_ASSERT(false);
+                    throw css::uno::RuntimeException(
+                        rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+            } else {
+                map = &elements_.top().node->getMembers();
+            }
+            if (!map->insert(NodeMap::value_type(top.name, top.node)).second) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("duplicate ")) +
+                     top.name +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+        }
+    } else {
+        switch (state_) {
+        case STATE_COMPONENT_SCHEMA:
+        case STATE_TEMPLATES_DONE:
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("no component element in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        case STATE_TEMPLATES:
+            state_ = STATE_TEMPLATES_DONE;
+            break;
+        case STATE_COMPONENT_DONE:
+            break;
+        default:
+            OSL_ASSERT(false); // this cannot happen
+        }
+    }
+}
+
+void XcsParser::characters(Span const & text) {
+    valueParser_.characters(text);
+}
+
+void XcsParser::handleComponentSchema(XmlReader & reader) {
+    //TODO: oor:version, xml:lang attributes
+    rtl::OStringBuffer buf;
+    buf.append('.');
+    bool hasPackage = false;
+    bool hasName = false;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package")))
+        {
+            if (hasPackage) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "multiple component-schema package attributes"
+                            " in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            hasPackage = true;
+            Span s(reader.getAttributeValue(false));
+            buf.insert(0, s.begin, s.length);
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            if (hasName) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "multiple component-schema name attributes in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            hasName = true;
+            Span s(reader.getAttributeValue(false));
+            buf.append(s.begin, s.length);
+        }
+    }
+    if (!hasPackage) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "no component-schema package attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "no component-schema name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    componentName_ = xmldata::convertFromUtf8(
+        Span(buf.getStr(), buf.getLength()));
+}
+
+void XcsParser::handleNodeRef(XmlReader & reader) {
+    bool hasName = false;
+    rtl::OUString name;
+    rtl::OUString component(componentName_);
+    bool hasNodeType = false;
+    rtl::OUString nodeType;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
+        {
+            component = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
+        {
+            hasNodeType = true;
+            nodeType = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no node-ref name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::Reference< Node > tmpl(
+        data_->getTemplate(
+            valueParser_.getLayer(),
+            xmldata::parseTemplateReference(
+                component, hasNodeType, nodeType, 0)));
+    if (!tmpl.is()) {
+        //TODO: this can erroneously happen as long as import/uses attributes
+        // are not correctly processed
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown node-ref ")) +
+             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::Reference< Node > node(tmpl->clone());
+    node->setLayer(valueParser_.getLayer());
+    elements_.push(Element(node, name));
+}
+
+void XcsParser::handleProp(XmlReader & reader) {
+    bool hasName = false;
+    rtl::OUString name;
+    valueParser_.type_ = TYPE_ERROR;
+    bool localized = false;
+    bool nillable = true;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
+        {
+            valueParser_.type_ = xmldata::parseType(
+                reader, reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("localized")))
+        {
+            localized = xmldata::parseBoolean(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nillable")))
+        {
+            nillable = xmldata::parseBoolean(reader.getAttributeValue(true));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no prop name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (valueParser_.type_ == TYPE_ERROR) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no prop type attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    elements_.push(
+        Element(
+            (localized
+             ? rtl::Reference< Node >(
+                 new LocalizedPropertyNode(
+                     valueParser_.getLayer(), valueParser_.type_, nillable))
+             : rtl::Reference< Node >(
+                 new PropertyNode(
+                     valueParser_.getLayer(), valueParser_.type_, nillable,
+                     css::uno::Any(), false))),
+            name));
+}
+
+void XcsParser::handlePropValue(
+    XmlReader & reader, rtl::Reference< Node > const & property)
+{
+    Span attrSeparator;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
+        {
+            attrSeparator = reader.getAttributeValue(false);
+            if (attrSeparator.length == 0) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad oor:separator attribute in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+        }
+    }
+    valueParser_.separator_ = rtl::OString(
+        attrSeparator.begin, attrSeparator.length);
+    valueParser_.start(property);
+}
+
+void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) {
+    bool hasName = false;
+    rtl::OUString name;
+    bool extensible = false;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("extensible")))
+        {
+            extensible = xmldata::parseBoolean(reader.getAttributeValue(true));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no group name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (isTemplate) {
+        name = Data::fullTemplateName(componentName_, name);
+    }
+    elements_.push(
+        Element(
+            new GroupNode(
+                valueParser_.getLayer(), extensible,
+                isTemplate ? name : rtl::OUString()),
+            name));
+}
+
+void XcsParser::handleSet(XmlReader & reader, bool isTemplate) {
+    bool hasName = false;
+    rtl::OUString name;
+    rtl::OUString component(componentName_);
+    bool hasNodeType = false;
+    rtl::OUString nodeType;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
+        {
+            component = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
+        {
+            hasNodeType = true;
+            nodeType = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no set name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (isTemplate) {
+        name = Data::fullTemplateName(componentName_, name);
+    }
+    elements_.push(
+        Element(
+            new SetNode(
+                valueParser_.getLayer(),
+                xmldata::parseTemplateReference(
+                    component, hasNodeType, nodeType, 0),
+                isTemplate ? name : rtl::OUString()),
+            name));
+}
+
+void XcsParser::handleSetItem(XmlReader & reader, SetNode * set) {
+    rtl::OUString component(componentName_);
+    bool hasNodeType = false;
+    rtl::OUString nodeType;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
+        {
+            component = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
+        {
+            hasNodeType = true;
+            nodeType = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        }
+    }
+    set->getAdditionalTemplateNames().push_back(
+        xmldata::parseTemplateReference(component, hasNodeType, nodeType, 0));
+    elements_.push(Element(rtl::Reference< Node >(), rtl::OUString()));
+}
+
+}
diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx
new file mode 100644
index 0000000000..21a124945a
--- /dev/null
+++ b/configmgr/source/xcsparser.hxx
@@ -0,0 +1,106 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_XCSPARSER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_XCSPARSER_HXX
+
+#include "sal/config.h"
+
+#include <stack>
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "node.hxx"
+#include "parser.hxx"
+#include "valueparser.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+class SetNode;
+struct Data;
+struct Span;
+
+class XcsParser: public Parser {
+public:
+    XcsParser(int layer, Data * data);
+
+private:
+    virtual ~XcsParser();
+
+    virtual XmlReader::Text getTextMode();
+
+    virtual bool startElement(
+        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+
+    virtual void endElement(XmlReader const & reader);
+
+    virtual void characters(Span const & text);
+
+    void handleComponentSchema(XmlReader & reader);
+
+    void handleNodeRef(XmlReader & reader);
+
+    void handleProp(XmlReader & reader);
+
+    void handlePropValue(
+        XmlReader & reader, rtl::Reference< Node > const & property);
+
+    void handleGroup(XmlReader & reader, bool isTemplate);
+
+    void handleSet(XmlReader & reader, bool isTemplate);
+
+    void handleSetItem(XmlReader & reader, SetNode * set);
+
+    enum State {
+        STATE_START, STATE_COMPONENT_SCHEMA, STATE_TEMPLATES,
+        STATE_TEMPLATES_DONE, STATE_COMPONENT, STATE_COMPONENT_DONE };
+
+    struct Element {
+        rtl::Reference< Node > node;
+        rtl::OUString name;
+
+        inline Element(
+            rtl::Reference< Node > const & theNode,
+            rtl::OUString const & theName):
+            node(theNode), name(theName) {}
+    };
+
+    typedef std::stack< Element > ElementStack;
+
+    ValueParser valueParser_;
+    Data * data_;
+    rtl::OUString componentName_;
+    State state_;
+    long ignoring_;
+    ElementStack elements_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
new file mode 100644
index 0000000000..220168c627
--- /dev/null
+++ b/configmgr/source/xcuparser.cxx
@@ -0,0 +1,1077 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <algorithm>
+
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "rtl/ref.hxx"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include "data.hxx"
+#include "localizedpropertynode.hxx"
+#include "localizedvaluenode.hxx"
+#include "groupnode.hxx"
+#include "modifications.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "path.hxx"
+#include "propertynode.hxx"
+#include "setnode.hxx"
+#include "span.hxx"
+#include "xcuparser.hxx"
+#include "xmldata.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+XcuParser::XcuParser(int layer, Data * data, Modifications * modifications):
+    valueParser_(layer), data_(data), modifications_(modifications)
+{
+    if (layer == Data::NO_LAYER) {
+        OSL_ASSERT(modifications_ == 0);
+        modifications_ = &data_->modifications;
+    }
+}
+
+XcuParser::~XcuParser() {}
+
+XmlReader::Text XcuParser::getTextMode() {
+    return valueParser_.getTextMode();
+}
+
+bool XcuParser::startElement(
+    XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+{
+    if (valueParser_.startElement(reader, ns, name)) {
+        return true;
+    }
+    if (state_.empty()) {
+        if (ns == XmlReader::NAMESPACE_OOR &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
+        {
+            handleComponentData(reader);
+        } else if (ns == XmlReader::NAMESPACE_OOR &&
+                   name.equals(RTL_CONSTASCII_STRINGPARAM("items")))
+        {
+            state_.push(State(rtl::Reference< Node >(), false));
+        } else {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("bad root element <")) +
+                 xmldata::convertFromUtf8(name) +
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+    } else if (state_.top().ignore) {
+        state_.push(state_.top());
+    } else if (!state_.top().node.is()) {
+        if (ns == XmlReader::NAMESPACE_NONE &&
+            name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
+        {
+            handleItem(reader);
+        } else {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("bad items node member <")) +
+                 xmldata::convertFromUtf8(name) +
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+    } else {
+        switch (state_.top().node->kind()) {
+        case Node::KIND_PROPERTY:
+            if (ns == XmlReader::NAMESPACE_NONE &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
+            {
+                handlePropValue(
+                    reader,
+                    dynamic_cast< PropertyNode * >(state_.top().node.get()));
+            } else {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad property node member <")) +
+                     xmldata::convertFromUtf8(name) +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            break;
+        case Node::KIND_LOCALIZED_PROPERTY:
+            if (ns == XmlReader::NAMESPACE_NONE &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
+            {
+                handleLocpropValue(
+                    reader,
+                    dynamic_cast< LocalizedPropertyNode * >(
+                        state_.top().node.get()));
+            } else {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad localized property node member <")) +
+                     xmldata::convertFromUtf8(name) +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            break;
+        case Node::KIND_LOCALIZED_VALUE:
+            throw css::uno::RuntimeException(
+                (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
+                 xmldata::convertFromUtf8(name) +
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        case Node::KIND_GROUP:
+            if (ns == XmlReader::NAMESPACE_NONE &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
+            {
+                handleGroupProp(
+                    reader,
+                    dynamic_cast< GroupNode * >(state_.top().node.get()));
+            } else if (ns == XmlReader::NAMESPACE_NONE &&
+                       name.equals(RTL_CONSTASCII_STRINGPARAM("node")))
+            {
+                handleGroupNode(reader, state_.top().node);
+            } else {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad group node member <")) +
+                     xmldata::convertFromUtf8(name) +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            break;
+        case Node::KIND_SET:
+            if (ns == XmlReader::NAMESPACE_NONE &&
+                name.equals(RTL_CONSTASCII_STRINGPARAM("node")))
+            {
+                handleSetNode(
+                    reader, dynamic_cast< SetNode * >(state_.top().node.get()));
+            } else {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM("bad set node member <")) +
+                     xmldata::convertFromUtf8(name) +
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            break;
+        }
+    }
+    return true;
+}
+
+void XcuParser::endElement(XmlReader const & reader) {
+    if (valueParser_.endElement(reader)) {
+        return;
+    }
+    OSL_ASSERT(!state_.empty());
+    bool ignore = state_.top().ignore;
+    rtl::Reference< Node > insert;
+    rtl::OUString name;
+    if (state_.top().insert) {
+        insert = state_.top().node;
+        OSL_ASSERT(insert.is());
+        name = state_.top().name;
+    }
+    state_.pop();
+    if (insert.is()) {
+        OSL_ASSERT(!state_.empty() && state_.top().node.is());
+        state_.top().node->getMembers()[name] = insert;
+    }
+    if (!ignore && !modificationPath_.empty()) {
+        modificationPath_.pop_back();
+            // </item> will pop less than <item> pushed, but that is harmless,
+            // as the next <item> will reset modificationPath_
+    }
+}
+
+void XcuParser::characters(Span const & text) {
+    valueParser_.characters(text);
+}
+
+XcuParser::Operation XcuParser::parseOperation(Span const & text) {
+    OSL_ASSERT(text.is());
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("modify"))) {
+        return OPERATION_MODIFY;
+    }
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("replace"))) {
+        return OPERATION_REPLACE;
+    }
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("fuse"))) {
+        return OPERATION_FUSE;
+    }
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("remove"))) {
+        return OPERATION_REMOVE;
+    }
+    throw css::uno::RuntimeException(
+        (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid op ")) +
+         xmldata::convertFromUtf8(text)),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+void XcuParser::handleComponentData(XmlReader & reader) {
+    rtl::OStringBuffer buf;
+    buf.append('.');
+    bool hasPackage = false;
+    bool hasName = false;
+    Operation op = OPERATION_MODIFY;
+    bool finalized = false;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package")))
+        {
+            if (hasPackage) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "multiple component-update package attributes"
+                            " in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            hasPackage = true;
+            Span s(reader.getAttributeValue(false));
+            buf.insert(0, s.begin, s.length);
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            if (hasName) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "multiple component-update name attributes in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            hasName = true;
+            Span s(reader.getAttributeValue(false));
+            buf.append(s.begin, s.length);
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
+        {
+            op = parseOperation(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
+        {
+            finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
+        }
+    }
+    if (!hasPackage) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "no component-data package attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "no component-data name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    componentName_ = xmldata::convertFromUtf8(
+        Span(buf.getStr(), buf.getLength()));
+    rtl::Reference< Node > node(
+        Data::findNode(
+            valueParser_.getLayer(), data_->components, componentName_));
+    if (!node.is()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown component ")) +
+             componentName_ +
+             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    switch (op) {
+    case OPERATION_MODIFY:
+    case OPERATION_FUSE:
+        break;
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "invalid operation on root node in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    int finalizedLayer = std::min(
+        finalized ? valueParser_.getLayer() : Data::NO_LAYER,
+        node->getFinalized());
+    node->setFinalized(finalizedLayer);
+    state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
+    if (modifications_ != 0) {
+        OSL_ASSERT(modificationPath_.empty());
+        modificationPath_.push_back(componentName_);
+    }
+}
+
+void XcuParser::handleItem(XmlReader & reader) {
+    Span attrPath;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("path")))
+        {
+            attrPath = reader.getAttributeValue(false);
+        }
+    }
+    if (!attrPath.is()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("missing path attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::OUString path(xmldata::convertFromUtf8(attrPath));
+    int finalizedLayer;
+    rtl::Reference< Node > node(
+        data_->resolvePathRepresentation(
+            path, &modificationPath_, &finalizedLayer));
+    if (!node.is()) {
+        //TODO: Within Components::parseModificationLayer (but only there) it
+        // can rightly happen that data is read that does not match a schema
+        // (that no schema exists, or that the schema specifies a different
+        // type), namely if the schema was brought along by an extension that
+        // has been removed or replaced; instead of taking care of that at all
+        // the relevant places, as a hack, only "top-level" <item>s (that only
+        // appear in modification layer data) with unknown path are filtered out
+        // here.
+        OSL_TRACE(
+            "configmgr unknown <item path=\"%s\">",
+            rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr());
+        state_.push(State()); // ignored
+        return;
+    }
+    OSL_ASSERT(!modificationPath_.empty());
+    componentName_ = modificationPath_.front();
+    if (modifications_ == 0) {
+        modificationPath_.clear();
+    }
+    state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
+}
+
+void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
+    bool nil = false;
+    rtl::OString separator;
+    rtl::OUString external;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_XSI &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil")))
+        {
+            nil = xmldata::parseBoolean(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
+        {
+            Type type = xmldata::parseType(
+                reader, reader.getAttributeValue(true));
+            if (valueParser_.type_ != TYPE_ANY && type != valueParser_.type_) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM("invalid value type in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            valueParser_.type_ = type;
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
+        {
+            Span s(reader.getAttributeValue(false));
+            if (s.length == 0) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad oor:separator attribute in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            separator = rtl::OString(s.begin, s.length);
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
+        {
+            external = xmldata::convertFromUtf8(reader.getAttributeValue(true));
+            if (external.getLength() == 0) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad oor:external attribute value in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+        }
+    }
+    if (nil) {
+        if (!prop->isNillable()) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "xsi:nil attribute for non-nillable prop in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        if (external.getLength() != 0) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "xsi:nil and oor:external attributes for prop in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        prop->setValue(valueParser_.getLayer(), css::uno::Any());
+        state_.push(State());
+    } else if (external.getLength() == 0) {
+        valueParser_.separator_ = separator;
+        valueParser_.start(prop);
+    } else {
+        prop->setExternal(valueParser_.getLayer(), external);
+        state_.push(State());
+    }
+}
+
+void XcuParser::handleLocpropValue(
+    XmlReader & reader, LocalizedPropertyNode * locprop)
+{
+    rtl::OUString name;
+    bool nil = false;
+    rtl::OString separator;
+    Operation op = OPERATION_FUSE;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_XML &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("lang")))
+        {
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_XSI &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil")))
+        {
+            nil = xmldata::parseBoolean(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
+        {
+            Type type = xmldata::parseType(
+                reader, reader.getAttributeValue(true));
+            if (valueParser_.type_ != TYPE_ANY && type != valueParser_.type_) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM("invalid value type in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            valueParser_.type_ = type;
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
+        {
+            Span s(reader.getAttributeValue(false));
+            if (s.length == 0) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "bad oor:separator attribute in ")) +
+                     reader.getUrl()),
+                    css::uno::Reference< css::uno::XInterface >());
+            }
+            separator = rtl::OString(s.begin, s.length);
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
+        {
+            op = parseOperation(reader.getAttributeValue(true));
+        }
+    }
+    NodeMap::iterator i(locprop->getMembers().find(name));
+    if (i != locprop->getMembers().end() &&
+        i->second->getLayer() > valueParser_.getLayer())
+    {
+        state_.push(State()); // ignored
+        return;
+    }
+    if (nil && !locprop->isNillable()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "xsi:nil attribute for non-nillable prop in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    switch (op) {
+    case OPERATION_FUSE:
+        if (nil) {
+            if (i == locprop->getMembers().end()) {
+                locprop->getMembers()[name] = new LocalizedValueNode(
+                    valueParser_.getLayer(), css::uno::Any());
+            } else {
+                dynamic_cast< LocalizedValueNode * >(i->second.get())->setValue(
+                    valueParser_.getLayer(), css::uno::Any());
+            }
+            state_.push(State());
+        } else {
+            valueParser_.separator_ = separator;
+            valueParser_.start(locprop, name);
+        }
+        if (modifications_ != 0) {
+            modificationPath_.push_back(name);
+            modifications_->add(modificationPath_);
+            modificationPath_.pop_back();
+        }
+        break;
+    case OPERATION_REMOVE:
+        //TODO: only allow if parent.op == OPERATION_FUSE
+        //TODO: disallow removing when e.g. lang=""?
+        if (i != locprop->getMembers().end()) {
+            locprop->getMembers().erase(i);
+        }
+        state_.push(State());
+        if (modifications_ != 0) {
+            modificationPath_.push_back(name);
+            modifications_->add(modificationPath_);
+            modificationPath_.pop_back();
+        }
+        break;
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "bad op attribute for value element in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) {
+    bool hasName = false;
+    rtl::OUString name;
+    Type type = TYPE_ERROR;
+    Operation op = OPERATION_MODIFY;
+    bool finalized = false;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
+        {
+            type = xmldata::parseType(reader, reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
+        {
+            op = parseOperation(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
+        {
+            finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no prop name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    NodeMap::iterator i(group->getMembers().find(name));
+    if (i == group->getMembers().end()) {
+        handleUnknownGroupProp(reader, group, name, type, op, finalized);
+    } else {
+        switch (i->second->kind()) {
+        case Node::KIND_PROPERTY:
+            handlePlainGroupProp(reader, group, i, name, type, op, finalized);
+            break;
+        case Node::KIND_LOCALIZED_PROPERTY:
+            handleLocalizedGroupProp(
+                reader,
+                dynamic_cast< LocalizedPropertyNode * >(i->second.get()), name,
+                type, op, finalized);
+            break;
+        default:
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("inappropriate prop ")) +
+                 name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+    }
+}
+
+void XcuParser::handleUnknownGroupProp(
+    XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
+    Type type, Operation operation, bool finalized)
+{
+    if (!group->isExtensible()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown prop ")) +
+             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    switch (operation) {
+    case OPERATION_REPLACE:
+    case OPERATION_FUSE:
+        {
+            if (type == TYPE_ERROR) {
+                throw css::uno::RuntimeException(
+                    (rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "missing type attribute for prop ")) +
+                 name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+            }
+            valueParser_.type_ = type;
+            rtl::Reference< Node > prop(
+                new PropertyNode(
+                    valueParser_.getLayer(), TYPE_ANY, true, css::uno::Any(),
+                    true));
+            if (finalized) {
+                prop->setFinalized(valueParser_.getLayer());
+            }
+            state_.push(State(prop, name, state_.top().locked));
+            if (modifications_ != 0) {
+                modificationPath_.push_back(name);
+                modifications_->add(modificationPath_);
+            }
+        }
+        break;
+    default:
+        OSL_TRACE(
+            "ignoring modify or remove of unknown (presumably extension)"
+            " property");
+        state_.push(State());
+        break;
+    }
+}
+
+void XcuParser::handlePlainGroupProp(
+    XmlReader const & reader, GroupNode * group,
+    NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
+    Type type, Operation operation, bool finalized)
+{
+    PropertyNode * property = dynamic_cast< PropertyNode * >(
+        propertyIndex->second.get());
+    if (property->getLayer() > valueParser_.getLayer()) {
+        state_.push(State()); // ignored
+        return;
+    }
+    int finalizedLayer = std::min(
+        finalized ? valueParser_.getLayer() : Data::NO_LAYER,
+        property->getFinalized());
+    property->setFinalized(finalizedLayer);
+    if (type != TYPE_ERROR && property->getStaticType() != TYPE_ANY &&
+        type != property->getStaticType())
+    {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("invalid type for prop ")) +
+             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    valueParser_.type_ = type == TYPE_ERROR ? property->getStaticType() : type;
+    switch (operation) {
+    case OPERATION_MODIFY:
+    case OPERATION_REPLACE:
+    case OPERATION_FUSE:
+        state_.push(
+            State(
+                property,
+                (state_.top().locked ||
+                 finalizedLayer < valueParser_.getLayer())));
+        if (modifications_ != 0) {
+            modificationPath_.push_back(name);
+            modifications_->add(modificationPath_);
+        }
+        break;
+    case OPERATION_REMOVE:
+        if (!property->isExtension()) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "invalid remove of non-extension prop ")) +
+                 name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+                 reader.getUrl()),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        group->getMembers().erase(propertyIndex);
+        state_.push(State()); // ignore children
+        if (modifications_ != 0) {
+            modificationPath_.push_back(name);
+            modifications_->add(modificationPath_);
+            modificationPath_.pop_back();
+        }
+        break;
+    }
+}
+
+void XcuParser::handleLocalizedGroupProp(
+    XmlReader const & reader, LocalizedPropertyNode * property,
+    rtl::OUString const & name, Type type, Operation operation, bool finalized)
+{
+    if (property->getLayer() > valueParser_.getLayer()) {
+        state_.push(State()); // ignored
+        return;
+    }
+    int finalizedLayer = std::min(
+        finalized ? valueParser_.getLayer() : Data::NO_LAYER,
+        property->getFinalized());
+    property->setFinalized(finalizedLayer);
+    if (type != TYPE_ERROR && property->getStaticType() != TYPE_ANY &&
+        type != property->getStaticType())
+    {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("invalid type for prop ")) +
+             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    valueParser_.type_ = type == TYPE_ERROR ? property->getStaticType() : type;
+    switch (operation) {
+    case OPERATION_MODIFY:
+    case OPERATION_FUSE:
+        state_.push(
+            State(
+                property,
+                (state_.top().locked ||
+                 finalizedLayer < valueParser_.getLayer())));
+        if (modifications_ != 0) {
+            modificationPath_.push_back(name);
+        }
+        break;
+    case OPERATION_REPLACE:
+        {
+            rtl::Reference< Node > replacement(
+                new LocalizedPropertyNode(
+                    valueParser_.getLayer(), property->getStaticType(),
+                    property->isNillable()));
+            replacement->setFinalized(property->getFinalized());
+            state_.push(
+                State(
+                    replacement, name,
+                    (state_.top().locked ||
+                     finalizedLayer < valueParser_.getLayer())));
+            if (modifications_ != 0) {
+                modificationPath_.push_back(name);
+                modifications_->add(modificationPath_);
+            }
+        }
+        break;
+    case OPERATION_REMOVE:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "invalid remove of non-extension prop ")) +
+             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+void XcuParser::handleGroupNode(
+    XmlReader & reader, rtl::Reference< Node > const & group)
+{
+    bool hasName = false;
+    rtl::OUString name;
+    Operation op = OPERATION_MODIFY;
+    bool finalized = false;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
+        {
+            op = parseOperation(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
+        {
+            finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no node name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::Reference< Node > child(
+        Data::findNode(valueParser_.getLayer(), group->getMembers(), name));
+    if (!child.is()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown node ")) +
+             name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    if (op != OPERATION_MODIFY && op != OPERATION_FUSE) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "invalid operation on group node in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    int finalizedLayer = std::min(
+        finalized ? valueParser_.getLayer() : Data::NO_LAYER,
+        child->getFinalized());
+    child->setFinalized(finalizedLayer);
+    state_.push(
+        State(
+            child,
+            state_.top().locked || finalizedLayer < valueParser_.getLayer()));
+    if (modifications_ != 0) {
+        modificationPath_.push_back(name);
+    }
+}
+
+void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
+    bool hasName = false;
+    rtl::OUString name;
+    rtl::OUString component(componentName_);
+    bool hasNodeType = false;
+    rtl::OUString nodeType;
+    Operation op = OPERATION_MODIFY;
+    bool finalized = false;
+    bool mandatory = false;
+    for (;;) {
+        XmlReader::Namespace attrNs;
+        Span attrLn;
+        if (!reader.nextAttribute(&attrNs, &attrLn)) {
+            break;
+        }
+        if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
+        {
+            hasName = true;
+            name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
+        {
+            component = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
+        {
+            hasNodeType = true;
+            nodeType = xmldata::convertFromUtf8(
+                reader.getAttributeValue(false));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
+        {
+            op = parseOperation(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
+        {
+            finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
+        } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+                   attrLn.equals(RTL_CONSTASCII_STRINGPARAM("mandatory")))
+        {
+            mandatory = xmldata::parseBoolean(reader.getAttributeValue(true));
+        }
+    }
+    if (!hasName) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("no node name attribute in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::OUString templateName(
+        xmldata::parseTemplateReference(
+            component, hasNodeType, nodeType, &set->getDefaultTemplateName()));
+    if (!set->isValidTemplate(templateName)) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("set member node ")) +
+             name +
+             rtl::OUString(
+                 RTL_CONSTASCII_USTRINGPARAM(" references invalid template ")) +
+             templateName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    rtl::Reference< Node > tmpl(
+        data_->getTemplate(valueParser_.getLayer(), templateName));
+    if (!tmpl.is()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("set member node ")) +
+             name +
+             rtl::OUString(
+                 RTL_CONSTASCII_USTRINGPARAM(
+                     " references undefined template ")) +
+             templateName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
+             reader.getUrl()),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    int finalizedLayer = finalized ? valueParser_.getLayer() : Data::NO_LAYER;
+    int mandatoryLayer = mandatory ? valueParser_.getLayer() : Data::NO_LAYER;
+    NodeMap::iterator i(set->getMembers().find(name));
+    if (i != set->getMembers().end()) {
+        finalizedLayer = std::min(finalizedLayer, i->second->getFinalized());
+        i->second->setFinalized(finalizedLayer);
+        mandatoryLayer = std::min(mandatoryLayer, i->second->getMandatory());
+        i->second->setMandatory(mandatoryLayer);
+        if (i->second->getLayer() > valueParser_.getLayer()) {
+            state_.push(State()); // ignored
+            return;
+        }
+    }
+    switch (op) {
+    case OPERATION_MODIFY:
+        if (i == set->getMembers().end()) {
+            OSL_TRACE("ignoring modify of unknown set member node");
+            state_.push(State());
+        } else {
+            state_.push(
+                State(
+                    i->second,
+                    (state_.top().locked ||
+                     finalizedLayer < valueParser_.getLayer())));
+            if (modifications_ != 0) {
+                modificationPath_.push_back(name);
+            }
+        }
+        break;
+    case OPERATION_REPLACE:
+        if (state_.top().locked || finalizedLayer < valueParser_.getLayer()) {
+            state_.push(State()); // ignored
+        } else {
+            rtl::Reference< Node > member(tmpl->clone());
+            member->setLayer(valueParser_.getLayer());
+            member->setFinalized(finalizedLayer);
+            member->setMandatory(mandatoryLayer);
+            state_.push(State(member, name, false));
+            if (modifications_ != 0) {
+                modificationPath_.push_back(name);
+                modifications_->add(modificationPath_);
+            }
+        }
+        break;
+    case OPERATION_FUSE:
+        if (i == set->getMembers().end()) {
+            if (state_.top().locked || finalizedLayer < valueParser_.getLayer())
+            {
+                state_.push(State()); // ignored
+            } else {
+                rtl::Reference< Node > member(tmpl->clone());
+                member->setLayer(valueParser_.getLayer());
+                member->setFinalized(finalizedLayer);
+                member->setMandatory(mandatoryLayer);
+                state_.push(State(member, name, false));
+                if (modifications_ != 0) {
+                    modificationPath_.push_back(name);
+                    modifications_->add(modificationPath_);
+                }
+            }
+        } else {
+            state_.push(
+                State(
+                    i->second,
+                    (state_.top().locked ||
+                     finalizedLayer < valueParser_.getLayer())));
+            if (modifications_ != 0) {
+                modificationPath_.push_back(name);
+            }
+        }
+        break;
+    case OPERATION_REMOVE:
+        // Ignore removal of unknown members, members finalized in a lower
+        // layer, and members made mandatory in this or a lower layer:
+        if (i != set->getMembers().end() && !state_.top().locked &&
+            finalizedLayer >= valueParser_.getLayer() &&
+            mandatoryLayer > valueParser_.getLayer())
+        {
+            set->getMembers().erase(i);
+        }
+        state_.push(State());
+        if (modifications_ != 0) {
+            modificationPath_.push_back(name);
+            modifications_->add(modificationPath_);
+            modificationPath_.pop_back();
+        }
+        break;
+    }
+}
+
+}
diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx
new file mode 100644
index 0000000000..21806edebe
--- /dev/null
+++ b/configmgr/source/xcuparser.hxx
@@ -0,0 +1,142 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_XCUPARSER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_XCUPARSER_HXX
+
+#include "sal/config.h"
+
+#include <stack>
+
+#include "rtl/ref.hxx"
+#include "rtl/ustring.hxx"
+
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "parser.hxx"
+#include "path.hxx"
+#include "type.hxx"
+#include "valueparser.hxx"
+#include "xmldata.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+class GroupNode;
+class LocalizedPropertyNode;
+class Modifications;
+class PropertyNode;
+class SetNode;
+struct Data;
+struct Span;
+
+class XcuParser: public Parser {
+public:
+    XcuParser(int layer, Data * data, Modifications * modifications);
+
+private:
+    virtual ~XcuParser();
+
+    virtual XmlReader::Text getTextMode();
+
+    virtual bool startElement(
+        XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+
+    virtual void endElement(XmlReader const & reader);
+
+    virtual void characters(Span const & span);
+
+    enum Operation {
+        OPERATION_MODIFY, OPERATION_REPLACE, OPERATION_FUSE, OPERATION_REMOVE };
+
+    static Operation parseOperation(Span const & text);
+
+    void handleComponentData(XmlReader & reader);
+
+    void handleItem(XmlReader & reader);
+
+    void handlePropValue(XmlReader & reader, PropertyNode * prop);
+
+    void handleLocpropValue(
+        XmlReader & reader, LocalizedPropertyNode * locprop);
+
+    void handleGroupProp(XmlReader & reader, GroupNode * group);
+
+    void handleUnknownGroupProp(
+        XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
+        Type type, Operation operation, bool finalized);
+
+    void handlePlainGroupProp(
+        XmlReader const & reader, GroupNode * group,
+        NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
+        Type type, Operation operation, bool finalized);
+
+    void handleLocalizedGroupProp(
+        XmlReader const & reader, LocalizedPropertyNode * property,
+        rtl::OUString const & name, Type type, Operation operation,
+        bool finalized);
+
+    void handleGroupNode(
+        XmlReader & reader, rtl::Reference< Node > const & group);
+
+    void handleSetNode(XmlReader & reader, SetNode * set);
+
+    struct State {
+        rtl::Reference< Node > node; // empty iff ignore or <items>
+        rtl::OUString name; // empty and ignored if !insert
+        bool ignore;
+        bool insert;
+        bool locked;
+
+        inline State(): ignore(true), insert(false), locked(false) {}
+
+        inline State(rtl::Reference< Node > const & theNode, bool theLocked):
+            node(theNode), ignore(false), insert(false), locked(theLocked)
+        {}
+
+        inline State(
+            rtl::Reference< Node > const & theNode,
+            rtl::OUString const & theName, bool theLocked):
+            node(theNode), name(theName), ignore(false), insert(true),
+            locked(theLocked)
+        {}
+    };
+
+    typedef std::stack< State > StateStack;
+
+    ValueParser valueParser_;
+    Data * data_;
+    Modifications * modifications_;
+    rtl::OUString componentName_;
+    StateStack state_;
+    Path modificationPath_;
+    rtl::OUString path_;
+};
+
+}
+
+#endif
diff --git a/configmgr/source/xml/basicparser.cxx b/configmgr/source/xml/basicparser.cxx
deleted file mode 100644
index fc30410dfa..0000000000
--- a/configmgr/source/xml/basicparser.cxx
+++ /dev/null
@@ -1,536 +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: basicparser.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_configmgr.hxx"
-
-#include "basicparser.hxx"
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include "valuetypeconverter.hxx"
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-namespace
-{
-    static inline
-    uno::Reference< script::XTypeConverter > createTCV(uno::Reference< uno::XComponentContext > const & _xContext)
-    {
-        OSL_ENSURE(_xContext.is(),"Cannot create Parser without a Context");
-
-        static const rtl::OUString k_sTCVService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"));
-
-        uno::Reference< lang::XMultiComponentFactory > xSvcFactory = _xContext->getServiceManager();
-        return uno::Reference< script::XTypeConverter >::query(xSvcFactory->createInstanceWithContext(k_sTCVService,_xContext));
-    }
-}
-// -----------------------------------------------------------------------------
-
-struct BasicParser::ValueData : ValueConverter
-{
-    rtl::OUString    content;
-    rtl::OUString    locale;
-    bool    isLocalized;
-
-    ValueData(uno::Type const& _aType, uno::Reference< script::XTypeConverter > const & _xTCV)
-    : ValueConverter(_aType, _xTCV)
-    , content()
-    , locale()
-    , isLocalized(false)
-    {
-    }
-
-    uno::Any convertToAny() const
-    {
-        return ValueConverter::convertToAny(this->content);
-    }
-
-    rtl::OUString toString() const
-    {
-        return this->content;
-    }
-
-    uno::Sequence<rtl::OUString> toStringList() const
-    {
-        return ValueConverter::splitStringList(this->content);
-    }
-
-    void setLocalized(rtl::OUString const & _aLocale)
-    {
-        isLocalized = true;
-        locale = _aLocale;
-    }
-};
-// -----------------------------------------------------------------------------
-
-BasicParser::BasicParser(uno::Reference< uno::XComponentContext > const & _xContext)
-: m_xTypeConverter( createTCV(_xContext) )
-, m_xLocator(NULL)
-, m_aDataParser(Logger(_xContext))
-, m_aNodes()
-, m_aValueType()
-, m_pValueData(NULL)
-, m_nSkipLevels(0)
-, m_bEmpty(true)
-, m_bInProperty(false)
-{
-    if (!m_xTypeConverter.is())
-        throw uno::RuntimeException();
-
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-}
-// -----------------------------------------------------------------------------
-
-BasicParser::~BasicParser()
-{
-    delete m_pValueData;
-}
-// -----------------------------------------------------------------------------
-
-#if OSL_DEBUG_LEVEL > 0
-void BasicParser::dbgUpdateLocation()
-{
-#ifndef DBG_UTIL
-    rtl::OUString  dbgPublicId,    dbgSystemId;
-    sal_Int32 dbgLineNo,      dbgColumnNo;
-#endif // OSL_DEBUG_LEVEL
-
-    if (m_xLocator.is())
-    {
-        dbgPublicId   = m_xLocator->getPublicId();
-        dbgSystemId   = m_xLocator->getSystemId();
-        dbgLineNo     = m_xLocator->getLineNumber();
-        dbgColumnNo   = m_xLocator->getColumnNumber();
-    }
-    else
-    {
-        dbgPublicId = dbgSystemId = rtl::OUString::createFromAscii("<<<unknown>>>");
-        dbgLineNo = dbgColumnNo = -1;
-    }
-}
-#endif
-// -----------------------------------------------------------------------------
-void SAL_CALL BasicParser::startDocument(  )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    m_aDataParser.reset();
-    m_aValueType    = uno::Type();
-    m_bInProperty   = false;
-    m_nSkipLevels   = 0;
-
-    delete m_pValueData, m_pValueData = NULL;
-
-    while (!m_aNodes.empty()) m_aNodes.pop();
-
-    m_bEmpty = true;
-
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicParser::endDocument(  ) throw (sax::SAXException, uno::RuntimeException)
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (!m_aNodes.empty() || isSkipping() || isInValueData())
-        raiseParseException( "Configuration XML Parser - Invalid XML: Unexpected end of document" );
-
-    m_xLocator.clear();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicParser::characters( const rtl::OUString& aChars )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (isInValueData())
-    {
-        m_pValueData->content += aChars;
-    }
-#ifdef CONFIG_XMLPARSER_VALIDATE_WHITESPACE
-    else
-        OSL_ENSURE( isSkipping() || aChars.trim().getLength() == 0, "Unexpected text content in configuration XML");
-#endif
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicParser::ignorableWhitespace( const rtl::OUString& aWhitespaces )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-    if (isInValueData())
-    {
-        OSL_ENSURE(false, "Configuration XML: Unexpected ignorable (!) whitespace instruction in value data");
-        if (!m_pValueData->isNull())
-            m_pValueData->content += aWhitespaces;
-    }
-#ifdef CONFIG_XMLPARSER_VALIDATE_WHITESPACE
-    else
-        OSL_ENSURE( aChars.trim().getLength() == 0, "Unexpected non-space content in ignorable whitespace");
-#endif
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicParser::processingInstruction( const rtl::OUString& /*aTarget*/, const rtl::OUString& /*aData*/ )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-    OSL_ENSURE(false, "Unexpected processing instruction in Configuration XML");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL BasicParser::setDocumentLocator( const uno::Reference< sax::XLocator >& xLocator )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    m_xLocator = xLocator;
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::startNode( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& /*xAttribs*/ )
-{
-    { (void)aInfo; }
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    OSL_ENSURE( !isSkipping(), "While skipping, call startSkipping() instead of startNode()");
-    OSL_ENSURE( aInfo.type != ElementType::property, "For properties, call startProperty() instead of startNode()");
-
-    if (isInProperty())
-        raiseParseException( "Configuration XML Parser - Invalid Data: Cannot have a node nested in a property" );
-
-    m_aNodes.push(aInfo);
-    m_bEmpty = (aInfo.flags != 0) || (aInfo.op > Operation::modify);
-
-    OSL_POSTCOND( isInNode(), "Could not start a node ");
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::endNode( )
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    OSL_ENSURE( !isSkipping(), "While skipping, honor wasSkipping() instead of calling endNode()");
-    OSL_ENSURE( !isInProperty(), "For properties, call endProperty() instead of endNode()" );
-
-    ensureInNode();
-
-    m_aNodes.pop();
-    m_bEmpty = false;
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::ensureInNode( )
-{
-    if (!isInNode())
-        raiseParseException("Unexpected endElement without matching startElement");
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isInNode( )
-{
-    return ! m_aNodes.empty();
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isEmptyNode( )
-{
-    return m_bEmpty;
-}
-// -----------------------------------------------------------------------------
-
-ElementInfo const & BasicParser::getActiveNodeInfo( )
-{
-    ensureInNode();
-
-    return m_aNodes.top();
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::startProperty( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    OSL_ENSURE( !isSkipping(), "While skipping, call startSkipping() instead of startProperty()");
-    OSL_ENSURE( aInfo.type == ElementType::property, "For non-property nodes, call startNode() instead of startProperty()");
-
-    if (isInProperty())
-        raiseParseException( "Configuration XML Parser - Invalid Data: Properties may not nest" );
-
-    try 
-    { 
-        m_aValueType = getDataParser().getPropertyValueType(xAttribs); 
-    }
-    catch (ElementParser::BadValueType & error) 
-    {
-        raiseParseException(error.message());
-    }
-
-    m_bInProperty = true;
-
-    m_aNodes.push(aInfo);
-    m_bEmpty = true;
-
-    OSL_POSTCOND( isInProperty(), "Could not get data to start a property" );
-    OSL_POSTCOND( isInUnhandledProperty(), "Could not mark property as unhandled");
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::endProperty( )
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    OSL_ENSURE( !isSkipping(), "While skipping, honor wasSkipping() instead of calling endProperty()");
-    OSL_ENSURE( isInProperty(), "For non-property nodes, call endNode() instead of endProperty()" );
-
-    ensureInNode();
-
-    m_aNodes.pop();
-    m_bEmpty = false;
-
-    m_aValueType = uno::Type();
-    m_bInProperty = false;
-
-    OSL_POSTCOND( !isInProperty(), "Could not get mark end of property" );
-}
-// -----------------------------------------------------------------------------
-
-uno::Type BasicParser::getActivePropertyType()
-{
-    return m_aValueType;
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isInProperty()
-{
-    return m_bInProperty;
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isInUnhandledProperty()
-{
-    return m_bEmpty && m_bInProperty;
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::startValueData(const uno::Reference< sax::XAttributeList >& xAttribs)
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (!isInProperty())
-        raiseParseException( "Configuration XML Parser - Invalid Data: A value may occur only within a property" );
-
-    if (m_aValueType.getTypeClass() == uno::TypeClass_ANY)
-        raiseParseException( "Configuration XML Parser - Invalid Data: Cannot have values for properties of type 'Any'" );
-
-    if (isInValueData())
-        raiseParseException( "Configuration XML Parser - Invalid Data: Unexpected element while parsing value data" );
-
-    m_pValueData = new ValueData(m_aValueType, m_xTypeConverter);
-
-    m_pValueData->setIsNull( getDataParser().isNull(xAttribs) );
-
-    m_pValueData->setSeparator( getDataParser().getSeparator(xAttribs) );
-
-    OSL_ENSURE( !m_pValueData->hasSeparator() ||
-                !m_pValueData->isTypeSet() ||
-                m_pValueData->isList(),
-                "Warning: Spurious oor:separator on value that is not a list");
-    OSL_ENSURE( !m_pValueData->hasSeparator() ||
-                !m_pValueData->isNull(),
-                "Warning: Spurious oor:separator on value that is not a list");
-
-    rtl::OUString aLocale;
-    if ( getDataParser().getLanguage(xAttribs,aLocale) )
-        m_pValueData->setLocalized( aLocale );
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isInValueData()
-{
-    return m_pValueData != NULL;
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isValueDataLocalized()
-{
-    OSL_ENSURE(isInValueData(), "There is no value data that could be localized");
-
-    return m_pValueData && m_pValueData->isLocalized;
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString BasicParser::getValueDataLocale()
-{
-    OSL_ENSURE(isValueDataLocalized(), "There is no value data or it is not localized");
-
-    return m_pValueData->locale;
-}
-// -----------------------------------------------------------------------------
-
-uno::Any BasicParser::getCurrentValue()
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    OSL_ASSERT( isInValueData() );
-
-    uno::Any aResult;
-
-    if (m_pValueData->isTypeSet())
-        try
-        {
-            aResult = m_pValueData->convertToAny();
-        }
-        catch (script::CannotConvertException & e)
-        {
-            this->raiseParseException(uno::makeAny(e),"Configuration XML Parser - Invalid Data: Cannot convert value to type of property" );
-        }
-    else if (m_pValueData->isNull())
-    {
-        // nothing to do
-    }
-    else if (m_pValueData->hasSeparator() || m_pValueData->isList())
-    {
-        aResult <<= m_pValueData->toStringList();
-    }
-    else
-    {
-        aResult <<= m_pValueData->toString();
-    }
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-/// end collecting data for a value
-void BasicParser::endValueData()
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    OSL_ASSERT( isInValueData() );
-
-    delete m_pValueData, m_pValueData = NULL;
-    m_bEmpty = false;
-
-    OSL_POSTCOND( !isInValueData(), "Could not end value data tag" );
-    OSL_POSTCOND( !isInUnhandledProperty(), "Could not mark property as handled" );
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::startSkipping( const rtl::OUString& aName, const uno::Reference< sax::XAttributeList >& /*xAttribs*/ )
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    m_aNodes.push( ElementInfo(aName) );
-    ++m_nSkipLevels;
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::wasSkipping( const rtl::OUString& aName )
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (m_nSkipLevels == 0) return false;
-
-    if (m_aNodes.empty())
-        raiseParseException( "Configuration XML Parser - Invalid XML: Unexpected end of element (while skipping data)" );
-
-    if (aName != m_aNodes.top().name)
-        raiseParseException( "Configuration XML Parser - Invalid XML: End tag does not match start tag (while skipping data)" );
-
-    --m_nSkipLevels;
-    m_aNodes.pop();
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-bool BasicParser::isSkipping( )
-{
-    return m_nSkipLevels != 0;
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::raiseParseException( uno::Any const & _aTargetException, sal_Char const * _pMsg )
-    SAL_THROW((sax::SAXException, uno::RuntimeException))
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (_pMsg == 0) _pMsg = "Configuration XML Parser: Invalid Data: ";
-
-    rtl::OUString sMessage = rtl::OUString::createFromAscii(_pMsg);
-
-    uno::Exception aEx;
-    if (_aTargetException >>= aEx)
-        sMessage += aEx.Message;
-
-    getLogger().error(sMessage,"parse","configuration::xml::BasicParser");
-    throw sax::SAXException( sMessage, *this, _aTargetException );
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::raiseParseException( sal_Char const * _pMsg )
-    SAL_THROW((sax::SAXException, uno::RuntimeException))
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (_pMsg == 0) _pMsg = "Configuration XML Parser: Invalid XML";
-
-    rtl::OUString const sMessage = rtl::OUString::createFromAscii(_pMsg);
-
-    getLogger().error(sMessage,"parse","configuration::xml::BasicParser");
-    throw sax::SAXException( sMessage, *this, uno::Any() );
-}
-// -----------------------------------------------------------------------------
-
-void BasicParser::raiseParseException( rtl::OUString const & sMessage )
-    SAL_THROW((sax::SAXException, uno::RuntimeException))
-{
-    OSL_DEBUG_ONLY( dbgUpdateLocation() );
-
-    if (sMessage.getLength() == 0) raiseParseException(NULL);
-
-    getLogger().error(sMessage,"parse","configuration::xml::BasicParser");
-    throw sax::SAXException( sMessage, *this, uno::Any() );
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/xml/basicparser.hxx b/configmgr/source/xml/basicparser.hxx
deleted file mode 100644
index f8bb218520..0000000000
--- a/configmgr/source/xml/basicparser.hxx
+++ /dev/null
@@ -1,178 +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: basicparser.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CONFIGMGR_XML_BASICPARSER_HXX
-#define CONFIGMGR_XML_BASICPARSER_HXX
-
-#include "elementparser.hxx"
-#include "utility.hxx"
-#include "stack.hxx"
-#ifndef CONFIGMGR_LOGGER_HXX_
-#include "logger.hxx"
-#endif
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-namespace com { namespace sun { namespace star { namespace script {
-    class XTypeConverter;
-} } } }
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno           = ::com::sun::star::uno;
-        namespace lang          = ::com::sun::star::lang;
-
-        namespace sax           = ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-        class BasicParser
-        :	public cppu::WeakImplHelper1<sax::XDocumentHandler>
-        {
-            struct ValueData;
-
-            uno::Reference< com::sun::star::script::XTypeConverter >
-                m_xTypeConverter;
-            uno::Reference< sax::XLocator > m_xLocator;
-            ElementParser                   m_aDataParser;
-            Stack< ElementInfo >            m_aNodes;
-            uno::Type                       m_aValueType;
-            ValueData *                     m_pValueData;
-            sal_uInt16                      m_nSkipLevels;
-            bool                            m_bEmpty;
-            bool                            m_bInProperty;
-
-#if OSL_DEBUG_LEVEL > 0
-#ifdef DBG_UTIL
-            rtl::OUString  dbgPublicId,    dbgSystemId;
-            sal_Int32 dbgLineNo,      dbgColumnNo;
-#endif // DBG_UTIL
-            void dbgUpdateLocation();
-#endif // OSL_DEBUG_LEVEL
-
-        public:
-            explicit BasicParser(uno::Reference< uno::XComponentContext > const & _xContext);
-            virtual ~BasicParser();
-
-        // XDocumentHandler
-        public:
-            virtual void SAL_CALL
-                startDocument(  )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL
-                endDocument(  ) throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL
-                characters( const rtl::OUString& aChars )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL
-                ignorableWhitespace( const rtl::OUString& aWhitespaces )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL
-                processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL
-                setDocumentLocator( const uno::Reference< sax::XLocator >& xLocator )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-        protected:
-            ElementParser const & getDataParser() const { return m_aDataParser; }
-
-            Logger const & getLogger() { return m_aDataParser.logger(); }
-
-            /// start an node
-            void startNode( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-            /// are we in the content of a  node ?
-            bool isInNode();
-            /// are we in the content of node for which no content was started yet ?
-            bool isEmptyNode();
-            /// make sure we are in the content of a  node ?
-            void ensureInNode();
-            /// get the info about of the node currently being processed
-            ElementInfo const & getActiveNodeInfo();
-            /// end a node
-            void endNode();
-
-            /// start a property
-            void startProperty( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-            /// are we in the content of a property node ?
-            bool isInProperty();
-            /// are we in the content of a property node (and there has been no value for that property) ?
-            bool isInUnhandledProperty();
-            /// get the data type of the active property ?
-            uno::Type getActivePropertyType();
-            /// end a property
-            void endProperty();
-
-            /// start collecting data for a value - returns the locale of the value (property must have been started)
-            void startValueData(const uno::Reference< sax::XAttributeList >& xAttribs);
-            /// are we in the content of a property node ?
-            bool isInValueData();
-            /// check if the current value data has a locale set
-            bool isValueDataLocalized();
-            /// get the locale of the current value data, if localized
-            rtl::OUString getValueDataLocale();
-            /// return the collected value
-            uno::Any getCurrentValue();
-            /// end collecting data for a value
-            void endValueData();
-
-            /// start a node to be skipped
-            void startSkipping( const rtl::OUString& aTag, const uno::Reference< sax::XAttributeList >& xAttribs );
-            /// are we inside a skipped node ?
-            bool isSkipping( );
-            /// ending a node: was this skipped ?
-            bool wasSkipping( const rtl::OUString& aTag );
-
-        protected:
-            void raiseParseException( uno::Any const & _aTargetException, sal_Char const * _pMsg = NULL)
-                SAL_THROW((sax::SAXException, uno::RuntimeException));
-            void raiseParseException( sal_Char const * _pMsg )
-                SAL_THROW((sax::SAXException, uno::RuntimeException));
-            void raiseParseException( rtl::OUString const & aMsg )
-                SAL_THROW((sax::SAXException, uno::RuntimeException));
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif
-
-
-
-
diff --git a/configmgr/source/xml/elementformatter.cxx b/configmgr/source/xml/elementformatter.cxx
deleted file mode 100644
index 3b0a48e9f0..0000000000
--- a/configmgr/source/xml/elementformatter.cxx
+++ /dev/null
@@ -1,324 +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: elementformatter.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_configmgr.hxx"
-
-#include "elementformatter.hxx"
-#include "xmlstrings.hxx" 
-#include "typeconverter.hxx"
-
-#include <comphelper/attributelist.hxx>
-
-#include <rtl/ustrbuf.hxx>
-
-#include <com/sun/star/configuration/backend/SchemaAttribute.hpp>
-#include <com/sun/star/configuration/backend/NodeAttribute.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-ElementFormatter::ElementFormatter()
-: m_aElementType(ElementType::unknown)
-, m_xAttributes()
-{
-}
-// -----------------------------------------------------------------------------
-
-ElementFormatter::~ElementFormatter()
-{
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::reset()
-{
-    m_aElementType = ElementType::unknown;
-    m_xAttributes.clear();
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addAttribute(rtl::OUString const & _anAttributeName, rtl::OUString const & _aValue)
-{
-    OSL_PRECOND(m_xAttributes.is(),"Trying to add an attribute to a non-existing list");
-
-    m_xAttributes->AddAttribute(_anAttributeName,
-                                XML_ATTRTYPE_CDATA,
-                                _aValue);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addAttribute(rtl::OUString const & _anAttributeName, bool _bValue)
-{
-    OSL_PRECOND(m_xAttributes.is(),"Trying to add an attribute to a non-existing list");
-
-    m_xAttributes->AddAttribute(_anAttributeName,
-                                XML_ATTRTYPE_CDATA,
-                                _bValue ? ATTR_VALUE_TRUE : ATTR_VALUE_FALSE);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addNamespaces()
-{
-    static rtl::OUString const sNamespaceDecl( RTL_CONSTASCII_USTRINGPARAM("xmlns:") );
-
-    addAttribute( sNamespaceDecl.concat(NS_PREFIX_OOR), static_cast<rtl::OUString const &>(NS_URI_OOR));
-    addAttribute( sNamespaceDecl.concat(NS_PREFIX_XS ), static_cast<rtl::OUString const &>(NS_URI_XS ));
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::prepareElement(ElementInfo const& _aInfo)
-{
-    if (!m_xAttributes.is())
-    {
-        m_xAttributes.set( new ::comphelper::AttributeList() );
-        addNamespaces();
-    }
-    else
-        m_xAttributes->Clear();
-
-    m_aElementType = _aInfo.type;
-
-    addName(_aInfo.name);
-    addNodeFlags(_aInfo.flags);
-    addOperation(_aInfo.op);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::prepareSimpleElement(ElementType::Enum _eType)
-{
-    if (!m_xAttributes.is())
-    {
-        m_xAttributes.set( new ::comphelper::AttributeList() );
-        addNamespaces();
-    }
-    else
-        m_xAttributes->Clear();
-
-    m_aElementType = _eType;
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addName(rtl::OUString const & _aName)
-{
-    if (_aName.getLength())
-    {
-        switch( m_aElementType )
-        {
-        case ElementType::schema:
-        case ElementType::layer: 
-            {
-                sal_Int32 nIndex = _aName.lastIndexOf('.');
-
-                rtl::OUString aNodeName = _aName.copy(nIndex + 1);
-                addAttribute(ATTR_NAME, aNodeName);
-
-                OSL_ENSURE(nIndex > 0,"Found component root element without a package part in its name");
-                if (nIndex > 0)
-                {
-                    rtl::OUString aPackage = _aName.copy(0, nIndex);
-                    addAttribute(ATTR_PACKAGE, aPackage);
-                }
-            }
-            break;
-
-        default:
-            addAttribute(ATTR_NAME, _aName);  
-            break;
-        }
-    }
-}
-// -----------------------------------------------------------------------------
-
-inline
-void ElementFormatter::maybeAddFlag(sal_Int16 _eFlags, sal_Int16 _eSelect, rtl::OUString const & _anAttributeName, bool _bValue)
-{
-    if (_eFlags & _eSelect) addAttribute(_anAttributeName,_bValue);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addNodeFlags(sal_Int16 _eFlags)
-{
-    maybeAddFlag(_eFlags,com::sun::star::configuration::backend::SchemaAttribute::REQUIRED,    ATTR_FLAG_NULLABLE, false);
-    maybeAddFlag(_eFlags,com::sun::star::configuration::backend::SchemaAttribute::LOCALIZED,   ATTR_FLAG_LOCALIZED);
-    maybeAddFlag(_eFlags,com::sun::star::configuration::backend::SchemaAttribute::EXTENSIBLE,  ATTR_FLAG_EXTENSIBLE);
-
-    maybeAddFlag(_eFlags,com::sun::star::configuration::backend::NodeAttribute::FINALIZED, ATTR_FLAG_FINALIZED);
-    maybeAddFlag(_eFlags,com::sun::star::configuration::backend::NodeAttribute::MANDATORY, ATTR_FLAG_MANDATORY);
-    maybeAddFlag(_eFlags,com::sun::star::configuration::backend::NodeAttribute::READONLY,  ATTR_FLAG_READONLY);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addOperation(Operation::Enum _eOp)
-{
-    switch (_eOp)
-    {
-    case Operation::none:       break;    
-    case Operation::modify:     break ; //addAttribute(ATTR_OPERATION, static_cast<rtl::OUString const &>(OPERATION_MODIFY));  break;
-    case Operation::clear:      OSL_ENSURE(false,"'clear' operation is not yet supported"); break ; 
-                                //addAttribute(ATTR_OPERATION, static_cast<rtl::OUString const &>(OPERATION_CLEAR));  break;
-    case Operation::replace:    addAttribute(ATTR_OPERATION, static_cast<rtl::OUString const &>(OPERATION_REPLACE)); break;
-    case Operation::fuse:       addAttribute(ATTR_OPERATION, static_cast<rtl::OUString const &>(OPERATION_FUSE));    break;
-    case Operation::remove:     addAttribute(ATTR_OPERATION, static_cast<rtl::OUString const &>(OPERATION_REMOVE));  break;
-
-    case Operation::unknown:
-        OSL_ENSURE(false, "ElementFormatter: Trying to add attribute for 'unknown' operation");
-        break; 
-    default:
-        OSL_ENSURE(false, "ElementFormatter: Trying to add attribute for invalid operation");
-        break; 
-    }
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addInstanceType(rtl::OUString const & /*_aElementType*/, rtl::OUString const & /*_aElementTypeModule*/)
-{
-}
-// -----------------------------------------------------------------------------
-
-static ::rtl::OUString toXmlTypeName(const uno::TypeClass& _rTypeClass)
-{
-    ::rtl::OUString aRet;
-    switch(_rTypeClass)
-    {
-    case uno::TypeClass_BOOLEAN:  aRet = VALUETYPE_BOOLEAN; break;
-    case uno::TypeClass_SHORT:    aRet = VALUETYPE_SHORT; break;
-    case uno::TypeClass_LONG:     aRet = VALUETYPE_INT; break;
-    case uno::TypeClass_HYPER:    aRet = VALUETYPE_LONG; break;
-    case uno::TypeClass_DOUBLE:   aRet = VALUETYPE_DOUBLE; break;
-    case uno::TypeClass_STRING:   aRet = VALUETYPE_STRING; break;
-    case uno::TypeClass_SEQUENCE: aRet = VALUETYPE_BINARY; break;
-    case uno::TypeClass_ANY:      aRet = VALUETYPE_ANY; break;
-    default:
-        OSL_ENSURE(false,"Cannot get type name: unknown typeclass");
-        break;
-    }
-    return aRet;
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addPropertyValueType(uno::Type const& _aType)
-{
-    if (_aType == uno::Type()) return;
-
-    bool bList = false;
-    uno::Type       aSimpleType         = getBasicType(_aType, bList);
-    uno::TypeClass  aSimpleTypeClass    = aSimpleType.getTypeClass();
-    rtl::OUString        aSimpleTypeName     = toXmlTypeName(aSimpleTypeClass);
-
-    rtl::OUString sNsPrefix = (bList || aSimpleTypeClass == uno::TypeClass_ANY) ? 
-                         rtl::OUString( NS_PREFIX_OOR ) : rtl::OUString( NS_PREFIX_XS );
-
-    rtl::OUStringBuffer aTypeNameBuf(sNsPrefix);
-
-    if (sNsPrefix.getLength()) 
-        aTypeNameBuf. append(k_NS_SEPARATOR); 
-
-    aTypeNameBuf. append(aSimpleTypeName);
-
-    if (bList) 
-        aTypeNameBuf. append(VALUETYPE_LIST_SUFFIX);
-        
-    addAttribute( ATTR_VALUETYPE, aTypeNameBuf.makeStringAndClear());
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addLanguage(rtl::OUString const & _sLanguage)
-{
-    OSL_ENSURE(_sLanguage.getLength(), "ElementFormatter: Trying to add empty language attribute");
-    addAttribute(EXT_ATTR_LANGUAGE, _sLanguage);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addIsNull(bool _bIsNull)
-{
-    addAttribute( EXT_ATTR_NULL, _bIsNull);
-}
-// -----------------------------------------------------------------------------
-
-void ElementFormatter::addSeparator(rtl::OUString const& _sSeparator)
-{
-    addAttribute( ATTR_VALUESEPARATOR, _sSeparator);
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString ElementFormatter::getElementTag() const
-{
-    switch (m_aElementType)
-    {
-    case ElementType::schema:    return rtl::OUString( TAG_SCHEMA );
-    case ElementType::layer:     return rtl::OUString( TAG_LAYER );
-    
-    case ElementType::component: return rtl::OUString( TAG_COMPONENT );
-    case ElementType::templates: return rtl::OUString( TAG_TEMPLATES );
-
-    case ElementType::property:  return rtl::OUString( TAG_PROP );
-    case ElementType::node:      return rtl::OUString( TAG_NODE );
-    case ElementType::group:     return rtl::OUString( TAG_GROUP );
-    case ElementType::set:       return rtl::OUString( TAG_SET );
-
-    case ElementType::import:    return rtl::OUString( TAG_IMPORT );
-    case ElementType::instance:  return rtl::OUString( TAG_INSTANCE );
-    case ElementType::item_type: return rtl::OUString( TAG_ITEMTYPE );
-    case ElementType::value:     return rtl::OUString( TAG_VALUE );
-    case ElementType::uses:      return rtl::OUString( TAG_USES );
-
-    case ElementType::unknown:   
-        OSL_ENSURE(false, "ElementFormatter: Trying to get Tag for 'unknown' element type");
-        break;
-    case ElementType::other:
-        OSL_ENSURE(false, "ElementFormatter: Trying to get Tag for 'other' element type");
-        break;
-    default:
-        OSL_ENSURE(false, "ElementFormatter: Trying to get Tag for invalid element type");
-        break;
-    }
-    return rtl::OUString();
-}
-// -----------------------------------------------------------------------------
-
-uno::Reference< sax::XAttributeList > ElementFormatter::getElementAttributes() const
-{
-    return m_xAttributes.get();
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-} // namespace
-} // namespace
-
diff --git a/configmgr/source/xml/elementformatter.hxx b/configmgr/source/xml/elementformatter.hxx
deleted file mode 100644
index 930aaaeb1c..0000000000
--- a/configmgr/source/xml/elementformatter.hxx
+++ /dev/null
@@ -1,118 +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: elementformatter.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 CONFIGMGR_XML_ELEMENTFORMATTER_HXX
-#define CONFIGMGR_XML_ELEMENTFORMATTER_HXX
-
-#include "elementinfo.hxx"
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
-#include <rtl/ref.hxx>
-
-namespace comphelper {
-    class AttributeList;
-}
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-
-// -----------------------------------------------------------------------------
-        class ElementFormatter
-        {
-        public:
-            ElementFormatter(); 
-            ~ElementFormatter(); 
-
-            /// reset the formatter for a new document
-            void reset();
-
-            /// resets the formatter for a new element type
-            void prepareElement(ElementInfo const& _aInfo);
-            
-            /// resets the formatter for a new element type
-            void prepareSimpleElement(ElementType::Enum _eType);
-            
-            /// sets the instantiated type of a set item, 
-            void addInstanceType(rtl::OUString const & _aElementType, rtl::OUString const & _aElementTypeModule);
-
-            /// retrieve element type and associated module name of a set, 
-            void addPropertyValueType(uno::Type const& _aType);
-
-            /// add a language for the current element
-            void addLanguage(rtl::OUString const & _sLanguage);
-
-            /// adds a value attribute to the attribute list
-            void addIsNull(bool _bIsNull = true);
-
-            /// adds a value attribute to the attribute list
-            void addSeparator(rtl::OUString const& _sSeparator);
-
-            /// retrieve the tag to use for the current element
-            rtl::OUString getElementTag() const;
-
-            /// retrieve the attributes to use for the current element
-            uno::Reference< sax::XAttributeList > getElementAttributes() const;
-
-            /// retrieve the attributes to use for an element with associated component
-        private:
-            void addNamespaces();
-            /// sets an attributes for a node
-            void addName(rtl::OUString const & _aName);
-            /// sets attributes for nodes from the flags
-            void addNodeFlags(sal_Int16 _eFlags);
-            /// sets attributes for nodes from the flags
-            void addOperation(Operation::Enum _eOp);
-            /// sets attributes for nodes from the flags
-            void maybeAddFlag(sal_Int16 _eFlags, sal_Int16 _eSelect, 
-                                rtl::OUString const & _anAttributeName, bool _bValue = true);
-
-            /// sets attributes for nodes 
-            void addAttribute(rtl::OUString const & _anAttributeName, rtl::OUString const & _aValue);
-            void addAttribute(rtl::OUString const & _anAttributeName, bool _bValue);
-
-        private:
-            ElementType::Enum                   m_aElementType;
-            rtl::Reference< ::comphelper::AttributeList>   m_xAttributes;
-        };
-// -----------------------------------------------------------------------------	
-
-// -----------------------------------------------------------------------------	
-    } // namespace xml
-// -----------------------------------------------------------------------------	
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/xml/elementinfo.hxx b/configmgr/source/xml/elementinfo.hxx
deleted file mode 100644
index 8bb00b49b8..0000000000
--- a/configmgr/source/xml/elementinfo.hxx
+++ /dev/null
@@ -1,119 +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: elementinfo.hxx,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.
- *
- ************************************************************************/
-
-/* PLEASE DON'T DELETE ANY COMMENT LINES, ALSO IT'S UNNECESSARY. */
-
-#ifndef CONFIGMGR_XML_ELEMENTINFO_HXX
-#define CONFIGMGR_XML_ELEMENTINFO_HXX
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace ElementType
-        {
-            enum Enum
-            {
-                unknown,
-
-                schema,
-                layer,
-
-                component,
-                templates,
-
-                property,
-                node,
-                group,
-                set,
-
-                import,
-                instance,
-                item_type,
-                value,
-                uses,
-
-                other
-            };
-        }
-// -----------------------------------------------------------------------------
-        namespace Operation
-        {
-            enum Enum
-            {
-                none,
-
-                modify,
-                clear,
-
-                replace,
-                fuse,
-                remove,
-
-                unknown
-            };
-        }
-// -----------------------------------------------------------------------------
-        struct ElementInfo
-        {
-            explicit
-            ElementInfo(ElementType::Enum _type = ElementType::unknown)
-            : name()
-            , type(_type)
-            , op(Operation::none)
-            , flags()
-            {}
-
-            explicit
-            ElementInfo(rtl::OUString const & _name, ElementType::Enum _type = ElementType::unknown)
-            : name(_name)
-            , type(_type)
-            , op(Operation::none)
-            , flags()
-            {}
-
-
-            rtl::OUString         name;
-            ElementType::Enum   type;
-            Operation::Enum     op;
-            sal_Int16           flags;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/xml/elementparser.cxx b/configmgr/source/xml/elementparser.cxx
deleted file mode 100644
index 12ea5dde5c..0000000000
--- a/configmgr/source/xml/elementparser.cxx
+++ /dev/null
@@ -1,585 +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: elementparser.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_configmgr.hxx"
-
-#include "elementparser.hxx"
-#include "xmlstrings.hxx" 
-#include "typeconverter.hxx"
-
-#include <com/sun/star/configuration/backend/SchemaAttribute.hpp>
-#include <com/sun/star/configuration/backend/NodeAttribute.hpp>
-
-#include <rtl/ustrbuf.hxx>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-static 
-inline 
-sal_Int16 impl_getIndexByName(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString const& aAttributeName)
-{
-    OSL_PRECOND( xAttribs.is(), "ERROR: NULL Attribute list");
-
-    sal_Int16 nIndex = xAttribs->getLength();
-
-    while (--nIndex >= 0)
-    {
-        if (xAttribs->getNameByIndex(nIndex).equals(aAttributeName))
-            break;
-    }
-    // nIndex == -1 if not found
-
-    return nIndex;
-}
-// -----------------------------------------------------------------------------
-static 
-inline 
-bool impl_maybeGetAttribute(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString const& aAttributeName, /* OUT */ rtl::OUString& rAttributeValue)
-{
-    OSL_PRECOND( xAttribs.is(), "ERROR: NULL Attribute list");
-    
-    rtl::OUString aValue = xAttribs->getValueByName(aAttributeName);
-    if( aValue.getLength()!=0)
-    {
-        rAttributeValue = aValue;
-        return true;
-    }
-    return false;
-}
-// -----------------------------------------------------------------------------
-
-/// retrieve the (almost) complete information for an element
-ElementInfo ElementParser::parseElementInfo(rtl::OUString const& _sTag, uno::Reference< sax::XAttributeList > const& _xAttribs) const
-{
-    ElementType::Enum aType = this->getNodeType(_sTag,_xAttribs);
-
-    ElementInfo aInfo( this->getName(_sTag,_xAttribs,aType), aType );
-
-    aInfo.op    = this->getOperation(_xAttribs,aType);
-    aInfo.flags = this->getNodeFlags(_xAttribs,aType);
-
-    return aInfo;
-}
-// -----------------------------------------------------------------------------
-
-ElementType::Enum ElementParser::getNodeType(rtl::OUString const& _sElementName, uno::Reference< sax::XAttributeList > const& _xAttribs) const
-{
-    { (void)_xAttribs; }
-    OSL_PRECOND( _xAttribs.is(), "ERROR: NULL Attribute list");
-
-  // todo: make this use a table, if necessary
-    ElementType::Enum eResult = ElementType::unknown;
-    if (_sElementName.equals(TAG_VALUE))
-        eResult = ElementType::value;
-
-    else if (_sElementName.equals(TAG_PROP))
-        eResult = ElementType::property;
-
-    else if (_sElementName.equals(TAG_NODE))
-        eResult = ElementType::node;
-
-    else if (_sElementName.equals(TAG_GROUP))
-        eResult = ElementType::group;
-
-    else if (_sElementName.equals(TAG_SET))
-        eResult = ElementType::set;
-
-    else if (_sElementName.equals(TAG_INSTANCE))
-        eResult = ElementType::instance;
-
-    else if (_sElementName.equals(TAG_ITEMTYPE))
-        eResult = ElementType::item_type;
-
-    else if (_sElementName.equals(TAG_IMPORT))
-        eResult = ElementType::import;
-
-    else if (_sElementName.equals(TAG_LAYER))
-        eResult = ElementType::layer;
-
-    else if (_sElementName.equals(TAG_SCHEMA))
-        eResult = ElementType::schema;
-
-    else if (_sElementName.equals(TAG_COMPONENT))
-        eResult = ElementType::component;
-
-    else if (_sElementName.equals(TAG_TEMPLATES))
-        eResult = ElementType::templates;
-
-    else if (_sElementName.equals(TAG_USES))
-        eResult = ElementType::uses;
-
-    // #109668# maintain support for old tag on load 
-    else if (_sElementName.equals(DEPRECATED_TAG_LAYER))
-    {
-        logger().warning("Layer starts with invalid root tag \"oor:node\". Use \"oor:component-data\" instead.",
-                         "getNodeType()","configmgr::xml::ElementParser");
-        eResult = ElementType::layer;
-    }
-
-    else 
-        eResult = ElementType::other;
-
-    return eResult;
-}
-// -----------------------------------------------------------------------------
-
-/// takes the node name from either an attribute or the element name
-rtl::OUString ElementParser::getName(rtl::OUString const& _sElementName, uno::Reference< sax::XAttributeList > const& _xAttribs, ElementType::Enum _eType) const
-{
-    rtl::OUString aName;
-    rtl::OUString aPackage;
-
-    bool bNameFound = this->maybeGetAttribute(_xAttribs, ATTR_NAME, aName);    
-    bool bPackage = false;    
-
-    switch (_eType)
-    {
-    case ElementType::schema:
-        bPackage = this->maybeGetAttribute(_xAttribs,ATTR_PACKAGE,aPackage);
-        OSL_ENSURE(bPackage, "configmgr::xml::ElementParser: Found schema without package.");
-        break;
-
-    case ElementType::layer: 
-        bPackage =  this->maybeGetAttribute(_xAttribs,ATTR_PACKAGE,aPackage);
-
-        if (!bPackage) // for compatibility we still support 'oor:context'
-        {  
-            bPackage =  this->maybeGetAttribute(_xAttribs,ATTR_CONTEXT,aPackage);
-
-            if (bPackage)
-            {
-                // TODO: log this
-                OSL_TRACE("configmgr::xml::ElementParser: Found obsolete layer attribute "
-                          "oor:context=\"%s\" in component \"%s\".\n", 
-                          rtl::OUStringToOString(aPackage,RTL_TEXTENCODING_ASCII_US).getStr(),
-                          rtl::OUStringToOString(aName,RTL_TEXTENCODING_ASCII_US).getStr());
-            }
-        }
-             
-        OSL_ENSURE(bPackage, "configmgr::xml::ElementParser: Found layer without package.");
-        break;
-
-    case ElementType::node:
-    case ElementType::set:
-    case ElementType::group:
-    case ElementType::instance:
-    case ElementType::property:
-        break;
-
-    // these have no name to speak of
-    case ElementType::value:    
-    case ElementType::item_type:
-    case ElementType::import:
-    case ElementType::uses:
-    case ElementType::templates:
-    case ElementType::component:
-        OSL_ENSURE(!bNameFound, "Configuration Parser: Unexpected name attribute is ignored\n");
-        return _sElementName;
-
-    // for unknown prefer name to 
-    case ElementType::unknown:  
-        if (!bNameFound) return _sElementName;
-
-        bPackage = this->maybeGetAttribute(_xAttribs,ATTR_PACKAGE,aPackage);
-        break;
-
-    default:
-        if (!bNameFound) return _sElementName;
-        break;
-    }
-
-    OSL_ENSURE(aName.getLength(),"Found empty name tag on element");
-
-    if (bPackage)
-    {
-        static const sal_Unicode chPackageSep = '.';
-
-        aName = aPackage.concat(rtl::OUString(&chPackageSep,1)).concat(aName);
-    }
-    else
-    {
-        OSL_ENSURE(!this->maybeGetAttribute(_xAttribs,ATTR_PACKAGE,aPackage),
-                   "configmgr::xml::ElementParser: Found unexpected 'oor:package' on inner or unknown node." );
-    }
-
-    return aName;
-}
-// -----------------------------------------------------------------------------
-
-Operation::Enum ElementParser::getOperation(uno::Reference< sax::XAttributeList > const& xAttribs,ElementType::Enum _eType) const
-{
-    rtl::OUString sOpName;
-    if ((_eType != ElementType::property) && (_eType !=ElementType::node))
-    {
-        return Operation::none;
-    }
-    
-    if ( !this->maybeGetAttribute(xAttribs,ATTR_OPERATION, sOpName) )
-        return Operation::none;
-
-    if (sOpName.equals(OPERATION_MODIFY))
-        return Operation::modify;
-
-    else if (sOpName.equals(OPERATION_REPLACE))
-        return Operation::replace;
-    else if (sOpName.equals(OPERATION_FUSE))
-        return Operation::fuse;
-
-    else if (sOpName.equals(OPERATION_REMOVE))
-        return Operation::remove;
-#if 0
-    else if (sOpName.equals(OPERATION_CLEAR))
-        return Operation::clear;
-#endif
-    else 
-        return Operation::unknown;
-}
-// -----------------------------------------------------------------------------
-
-
-/// retrieve the locale stored in the attribute list
-bool ElementParser::getLanguage(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString& _rsLanguage) const
-{
-    return this->maybeGetAttribute(xAttribs, EXT_ATTR_LANGUAGE, _rsLanguage);
-}
-// -----------------------------------------------------------------------------
-
-/// reads attributes for nodes from the attribute list
-sal_Int16 ElementParser::getNodeFlags(uno::Reference< sax::XAttributeList > const& xAttribs,ElementType::Enum _eType) const
-{
-    namespace NodeAttribute   = ::com::sun::star::configuration::backend::NodeAttribute;
-    namespace SchemaAttribute = ::com::sun::star::configuration::backend::SchemaAttribute;
-
-    bool bValue;
-
-    sal_Int16 aResult = 0;
-
-    switch(_eType)
-    {
-        case ElementType::property :
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_NULLABLE, bValue) && ! bValue) 
-                aResult |= SchemaAttribute::REQUIRED;
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_LOCALIZED, bValue) && bValue) 
-                aResult |= SchemaAttribute::LOCALIZED;
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_READONLY, bValue) && bValue) 
-                aResult |= NodeAttribute::READONLY;
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_FINALIZED, bValue) && bValue) 
-                aResult |= NodeAttribute::FINALIZED;
-            break;
-
-        case ElementType::node:
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_FINALIZED, bValue) && bValue) 
-                aResult |= NodeAttribute::FINALIZED;
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_MANDATORY, bValue) && bValue) 
-                aResult |= NodeAttribute::MANDATORY;
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_READONLY, bValue) && bValue) 
-                aResult |= NodeAttribute::READONLY;
-            break;
-
-        case ElementType::group:
-        case ElementType::set:	
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_EXTENSIBLE, bValue) && bValue) 
-                aResult |= SchemaAttribute::EXTENSIBLE;
-            break;
-        
-        case ElementType::layer:
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_READONLY, bValue) && bValue) 
-                aResult |= NodeAttribute::READONLY;
-            if (this->maybeGetAttribute(xAttribs, ATTR_FLAG_FINALIZED, bValue) && bValue) 
-                aResult |= NodeAttribute::FINALIZED;
-            break;
-
-        default:
-            break;
-            
-    }
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-static 
-void badValueType(Logger const & logger, sal_Char const * _pMsg, rtl::OUString const & _sType)
-{
-    rtl::OUStringBuffer sMessageBuf;
-    sMessageBuf.appendAscii( "Configuration XML parser: Bad value type attribute: " );
-    if (_pMsg) sMessageBuf.appendAscii(_pMsg);
-
-    const sal_Unicode kQuote = '"';
-    sMessageBuf.append(kQuote).append(_sType).append(kQuote);
-
-    rtl::OUString const sMessage = sMessageBuf.makeStringAndClear();
-    logger.error(sMessage);
-    throw ElementParser::BadValueType(sMessage);
-}
-// -----------------------------------------------------------------------------
-static 
-inline
-sal_Bool matchNsPrefix(rtl::OUString const & _sString, rtl::OUString const & _sPrefix)
-{
-    return _sString.match(_sPrefix) && 
-            _sString.getStr()[_sPrefix.getLength()] == k_NS_SEPARATOR;
-}
-// -----------------------------------------------------------------------------
-static 
-inline
-sal_Bool matchSuffix(rtl::OUString const & _sString, rtl::OUString const & _sSuffix)
-{
-    sal_Int32 nSuffixStart = _sString.getLength() - _sSuffix.getLength();
-    if (nSuffixStart < 0)
-        return false;
-
-    return _sString.match(_sSuffix,nSuffixStart);
-}
-// -----------------------------------------------------------------------------
-static 
-inline
-rtl::OUString stripNsPrefix(rtl::OUString const & _sString, rtl::OUString const & _sPrefix)
-{
-    OSL_ASSERT( matchNsPrefix(_sString,_sPrefix) );
-
-    return _sString.copy(_sPrefix.getLength() + 1);
-}
-// -----------------------------------------------------------------------------
-static 
-inline
-rtl::OUString stripSuffix(rtl::OUString const & _sString, rtl::OUString const & _sSuffix)
-{
-    OSL_ASSERT( matchSuffix(_sString,_sSuffix) );
-
-    sal_Int32 nSuffixStart = _sString.getLength() - _sSuffix.getLength();
-        
-    return _sString.copy(0,nSuffixStart);
-}
-// -----------------------------------------------------------------------------
-static 
-inline
-rtl::OUString stripTypeName(Logger const & logger, rtl::OUString const & _sString, rtl::OUString const & _sPrefix)
-{
-    if ( matchNsPrefix(_sString,_sPrefix))
-        return stripNsPrefix(_sString, _sPrefix);
-        
-    badValueType(logger, "Missing expected namespace prefix on type name: ", _sString);
-
-    return _sString;
-}
-// -----------------------------------------------------------------------------
-static
-uno::Type xmlToScalarType(const rtl::OUString& _rType)
-{
-    uno::Type aRet;
-
-    if     (_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_BOOLEAN))   
-        aRet = ::getBooleanCppuType();
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_SHORT))     
-        aRet = ::getCppuType(static_cast<sal_Int16 const*>(0));
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_INT))       
-        aRet = ::getCppuType(static_cast<sal_Int32 const*>(0));
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_LONG))      
-        aRet = ::getCppuType(static_cast<sal_Int64 const*>(0));
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_DOUBLE))    
-        aRet = ::getCppuType(static_cast< double  const*>(0));
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_STRING))    
-        aRet = ::getCppuType(static_cast<rtl::OUString const*>(0));
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_BINARY))    
-        aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int8> const*>(0));
-
-    else if(_rType.equalsIgnoreAsciiCaseAscii(VALUETYPE_ANY))       
-        aRet = ::getCppuType(static_cast<uno::Any const*>(0));
-
-    else
-        OSL_ENSURE(false,"Cannot parse: Unknown value type");
-
-    return aRet;
-}
-// -----------------------------------------------------------------------------
-uno::Type xmlToListType(const rtl::OUString& _aElementType)
-{
-    uno::Type aRet;
-
-    if     (_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_BOOLEAN)) 
-        aRet = ::getCppuType(static_cast<uno::Sequence<sal_Bool> const*>(0));
-
-    else if(_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_SHORT))	   
-        aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int16> const*>(0));
-
-    else if(_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_INT))	   
-        aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int32> const*>(0));
-
-    else if(_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_LONG))	   
-        aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int64> const*>(0));
-
-    else if(_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_DOUBLE))  
-        aRet = ::getCppuType(static_cast<uno::Sequence<double> const*>(0));
-
-    else if(_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_STRING))
-        aRet = ::getCppuType(static_cast<uno::Sequence<rtl::OUString> const*>(0));
-
-    else if(_aElementType.equalsIgnoreAsciiCaseAscii(VALUETYPE_BINARY))
-        aRet = ::getCppuType(static_cast<uno::Sequence<uno::Sequence<sal_Int8> > const*>(0));
-
-    else
-        OSL_ENSURE(false,"Cannot parse: Unknown list value type");
-
-    return aRet;
-}
-// -----------------------------------------------------------------------------
-/// retrieve data type of a property, 
-uno::Type ElementParser::getPropertyValueType(uno::Reference< sax::XAttributeList > const& xAttribs) const
-{
-    rtl::OUString sTypeName;
-    if (!this->maybeGetAttribute(xAttribs, ATTR_VALUETYPE, sTypeName))
-        return uno::Type(); // => VOID
-
-    uno::Type aType;
-
-    // valuetype names are either 'xs:<type>' or 'oor:<type>' or 'oor:<type>-list'
-    if (matchSuffix(sTypeName,VALUETYPE_LIST_SUFFIX))
-    {
-        rtl::OUString sBasicName = stripTypeName( mLogger, stripSuffix(sTypeName,VALUETYPE_LIST_SUFFIX), NS_PREFIX_OOR );
-
-        aType = xmlToListType(sBasicName);
-    }
-    else
-    {
-        rtl::OUString sPrefix = matchNsPrefix(sTypeName,NS_PREFIX_OOR) ? rtl::OUString( NS_PREFIX_OOR ) : rtl::OUString( NS_PREFIX_XS );
-
-        rtl::OUString sBasicName = stripTypeName( mLogger, sTypeName, sPrefix );
-
-        aType = xmlToScalarType(sBasicName);
-    }
-
-    if (aType == uno::Type())
-        badValueType(mLogger,"Unknown type name: ", sTypeName);
-
-    return aType;
-}
-// -----------------------------------------------------------------------------
-
-/// retrieve element type and associated module name of a set, 
-bool ElementParser::getSetElementType(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString& aElementType, rtl::OUString& aElementTypeModule) const
-{
-    if (!this->maybeGetAttribute(xAttribs, ATTR_ITEMTYPE, aElementType))
-        return false;
-
-    maybeGetAttribute(xAttribs, ATTR_ITEMTYPECOMPONENT, aElementTypeModule);
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-/// retrieve instance type and associated module name of a set, 
-bool ElementParser::getInstanceType(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString& aElementType, rtl::OUString& aElementTypeModule) const
-{
-    if (!this->maybeGetAttribute(xAttribs, ATTR_ITEMTYPE, aElementType))
-        return false;
-
-    maybeGetAttribute(xAttribs, ATTR_ITEMTYPECOMPONENT, aElementTypeModule);
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-/// retrieve the component for an import or uses element, 
-bool ElementParser::getImportComponent(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString& _rsComponent) const
-{
-    return this->maybeGetAttribute(xAttribs, ATTR_COMPONENT, _rsComponent);
-}
-// -----------------------------------------------------------------------------
-
-/// reads attributes for values from the attribute list
-bool ElementParser::isNull(uno::Reference< sax::XAttributeList > const& _xAttribs) const
-{
-    bool bNull;
-    return maybeGetAttribute(_xAttribs, EXT_ATTR_NULL, bNull) && bNull;
-}
-// -----------------------------------------------------------------------------
-
-/// reads attributes for values from the attribute list
-rtl::OUString ElementParser::getSeparator(uno::Reference< sax::XAttributeList > const& _xAttribs) const
-{
-    rtl::OUString aSeparator;
-    maybeGetAttribute(_xAttribs, ATTR_VALUESEPARATOR, aSeparator);
-    return aSeparator;
-}
-// -----------------------------------------------------------------------------
-
-// low-level internal methods
-/// checks for presence of a boolean attribute and assigns its value if it exists (and is a bool)
-bool ElementParser::maybeGetAttribute(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString const& aAttributeName, bool& rAttributeValue) const
-{
-    rtl::OUString sAttribute;
-    
-    if ( !this->maybeGetAttribute(xAttribs, aAttributeName, sAttribute) )
-    {
-        return false;
-    }
-
-    else if (sAttribute.equals(ATTR_VALUE_TRUE))
-        rAttributeValue = true; // will return true
-
-    else if (sAttribute.equals(ATTR_VALUE_FALSE))
-        rAttributeValue = false;  // will return true
-
-    else 
-    {
-        OSL_ENSURE(sAttribute.getLength() == 0, "Invalid text found in boolean attribute");
-        return false;
-    }
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-/// checks for presence of an attribute and assigns its value if it exists 
-bool ElementParser::maybeGetAttribute(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString const& aAttributeName, rtl::OUString& rAttributeValue) const
-{
-    return xAttribs.is() && impl_maybeGetAttribute(xAttribs, aAttributeName, rAttributeValue);
-}
-
-// -----------------------------------------------------------------------------
-} // namespace
-} // namespace
-
diff --git a/configmgr/source/xml/elementparser.hxx b/configmgr/source/xml/elementparser.hxx
deleted file mode 100644
index 9cbea22775..0000000000
--- a/configmgr/source/xml/elementparser.hxx
+++ /dev/null
@@ -1,125 +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: elementparser.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 CONFIGMGR_XML_ELEMENTPARSER_HXX
-#define CONFIGMGR_XML_ELEMENTPARSER_HXX
-
-#include "elementinfo.hxx"
-#include "logger.hxx"
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-
-// -----------------------------------------------------------------------------
-        class ElementParser
-        {
-            Logger mLogger;
-        public:
-            class BadValueType
-            {
-                rtl::OUString mMessage;
-            public:
-                BadValueType(rtl::OUString const & aMessage) : mMessage(aMessage) {}
-                
-                rtl::OUString message() const { return mMessage.getStr(); }
-            };
-        public:
-            explicit
-            ElementParser(Logger const & xLogger)
-            : mLogger(xLogger)
-            {}
-
-            Logger const & logger() const { return mLogger; }
-
-            /// reset the parser for a new document
-            void reset()
-            {}
-
-            /// retrieve the (almost) complete information for an element
-            ElementInfo parseElementInfo(rtl::OUString const& _sTag, uno::Reference< sax::XAttributeList > const& _xAttribs) const;
-
-            /// retrieve the node name for an element
-            ElementType::Enum getNodeType(rtl::OUString const& _sTag, uno::Reference< sax::XAttributeList > const& xAttribs) const;
-
-            /// retrieve the node name for an element
-            rtl::OUString getName(rtl::OUString const& _sTag, uno::Reference< sax::XAttributeList > const& xAttribs, ElementType::Enum eType = ElementType::unknown) const;
-
-            /// query whether the node has an operation
-            Operation::Enum getOperation(uno::Reference< sax::XAttributeList > const& xAttribs, ElementType::Enum _eType) const;
-
-            /// retrieve the language (if any) stored in the attribute list
-            bool getLanguage(uno::Reference< sax::XAttributeList > const& xAttribs, rtl::OUString & _rsLanguage) const;
-
-            /// reads attributes for nodes from the attribute list
-            sal_Int16 getNodeFlags(uno::Reference< sax::XAttributeList > const& xAttribs, ElementType::Enum _eType) const;
-
-            /// retrieve element type and associated module name of a set, 
-            bool getSetElementType(uno::Reference< sax::XAttributeList > const& _xAttribs, rtl::OUString& _rsElementType, rtl::OUString& _rsElementTypeModule) const;
-
-            /// retrieve the instance type and associated module name of a instance, 
-            bool getInstanceType(uno::Reference< sax::XAttributeList > const& _xAttribs, rtl::OUString& _rsElementType, rtl::OUString& _rsElementTypeModule) const;
-
-            /// retrieve the component for an import or uses element, 
-            bool getImportComponent(uno::Reference< sax::XAttributeList > const& _xAttribs, rtl::OUString& _rsComponent) const;
-
-            /// retrieve element type and associated module name of a set, 
-            uno::Type getPropertyValueType(uno::Reference< sax::XAttributeList > const& _xAttribs) const;
-                // throw( BadValueType )
-
-            /// reads a value attribute from the attribute list
-            bool isNull(uno::Reference< sax::XAttributeList > const& _xAttribs) const;
-
-            /// reads a value attribute from the attribute list
-            rtl::OUString getSeparator(uno::Reference< sax::XAttributeList > const& _xAttribs) const;
-
-        // low-level internal methods
-
-            /// checks for presence of a boolean attribute and assigns its value if it exists (and is a bool)
-            bool maybeGetAttribute(uno::Reference< sax::XAttributeList > const& _xAttribs, rtl::OUString const& _aAttributeName, bool& _rbAttributeValue) const;
-
-            /// checks for presence of an attribute and assigns its value if it exists 
-            bool maybeGetAttribute(uno::Reference< sax::XAttributeList > const& _xAttribs, rtl::OUString const& _aAttributeName, rtl::OUString& _rsAttributeValue) const;
-        };
-// -----------------------------------------------------------------------------	
-
-// -----------------------------------------------------------------------------	
-    } // namespace xml
-// -----------------------------------------------------------------------------	
-} // namespace configmgr
-
-#endif
-
diff --git a/configmgr/source/xml/layerparser.cxx b/configmgr/source/xml/layerparser.cxx
deleted file mode 100644
index 10797b5a34..0000000000
--- a/configmgr/source/xml/layerparser.cxx
+++ /dev/null
@@ -1,371 +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: layerparser.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "com/sun/star/configuration/backend/NodeAttribute.hpp"
-#include "layerparser.hxx"
-
-// -----------------------------------------------------------------------------
-#include "wrapexception.hxx"
-
-#define WRAP_PARSE_EXCEPTIONS()  \
-    PASS_EXCEPTION(sax::SAXException)       \
-    PASS_EXCEPTION(uno::RuntimeException)   \
-    WRAP_CONFIGDATA_EXCEPTIONS( raiseParseException )   \
-    WRAP_OTHER_EXCEPTIONS( raiseParseException )
-
-#define WRAP_PARSE_EXCEPTIONS_MSG( msg )  \
-    PASS_EXCEPTION(sax::SAXException)       \
-    PASS_EXCEPTION(uno::RuntimeException)   \
-    WRAP_CONFIGDATA_EXCEPTIONS1( raiseParseException, msg ) \
-    WRAP_OTHER_EXCEPTIONS1( raiseParseException, msg )
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-LayerParser::LayerParser(uno::Reference< uno::XComponentContext > const & _xContext, uno::Reference< backenduno::XLayerHandler > const & _xHandler)
-: BasicParser(_xContext)
-, m_xHandler(_xHandler)
-, m_bRemoved(false)
-, m_bNewProp(false)
-{
-    if (!m_xHandler.is())
-    {
-        rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Cannot create LayerParser: Unexpected NULL Handler"));
-        throw uno::RuntimeException(sMessage, NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-LayerParser::~LayerParser()
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerParser::startDocument(  ) 
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    BasicParser::startDocument();
-
-    try
-    {
-        OSL_ENSURE(isEmptyNode(), "BasicParser does not mark new document as empty");
-
-        m_xHandler->startLayer();
-        m_bRemoved = false;
-        m_bNewProp = false;
-    }
-    WRAP_PARSE_EXCEPTIONS_MSG("LayerParser - Starting layer")
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerParser::endDocument(  ) throw (sax::SAXException, uno::RuntimeException)
-{
-    if (isEmptyNode()) OSL_TRACE("Configuration Parser: XML layer document ended without any data");
-
-    BasicParser::endDocument();
-
-    try
-    {
-        m_xHandler->endLayer();
-    }
-    WRAP_PARSE_EXCEPTIONS_MSG("LayerParser - Ending layer")
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerParser::startElement( const rtl::OUString& aName, const uno::Reference< sax::XAttributeList >& xAttribs )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    if ( this->isSkipping() )
-    {
-        this->startSkipping( aName, xAttribs );
-        return;
-    }
-
-    ElementInfo aInfo = getDataParser().parseElementInfo(aName,xAttribs);
-
-    try
-    {
-        switch (aInfo.type)
-        {
-        case ElementType::group: case ElementType::set: 
-            OSL_ENSURE( false, "Layer XML parser - Unexpected: found group/set element (should be 'node')\n");
-            // fall thru
-        case ElementType::layer:
-        case ElementType::node:
-            this->startNode(aInfo,xAttribs);
-            OSL_ASSERT( this->isInNode() && !this->isInProperty() );
-            break;
-
-        case ElementType::property:
-            this->startProperty(aInfo,xAttribs);
-            OSL_ASSERT( this->isInUnhandledProperty() );
-            break;
-
-        case ElementType::value:
-            this->startValueData(xAttribs);
-            OSL_ASSERT( this->isInValueData() );
-            break;
-
-        default: // skip unknown elements
-            OSL_ENSURE( aInfo.type >= ElementType::other, "Layer XML parser - Unexpected: found schema element in layer data\n");
-            OSL_ENSURE( aInfo.type <  ElementType::other, "Layer XML parser - Warning: ignoring unknown element tag\n");
-            this->startSkipping( aName, xAttribs );
-            return;
-        }
-    }
-    WRAP_PARSE_EXCEPTIONS_MSG("LayerParser - Starting Element")
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL LayerParser::endElement( const rtl::OUString& aName ) 
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    if ( this->wasSkipping(aName) )
-        return;
-
-    try
-    {
-        if ( this->isInValueData())
-            this->endValueData();
-
-        else if (this->isInProperty())
-            this->endProperty();
-
-        else if (this->isInNode())
-            this->endNode();
-
-        else {
-            this->raiseParseException("Layer parser: Invalid XML: endElement without matching startElement");
-        }
-    }
-    WRAP_PARSE_EXCEPTIONS_MSG("LayerParser - Ending Element")
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-void LayerParser::startNode( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    this->checkNotRemoved();
-
-    BasicParser::startNode(aInfo,xAttribs);
-
-    switch (aInfo.op)
-    {
-    case Operation::none:
-    case Operation::modify:
-        m_xHandler->overrideNode(aInfo.name,aInfo.flags,false);
-        break;
-
-    case Operation::clear:
-        m_xHandler->overrideNode(aInfo.name,aInfo.flags,true);
-        break;
-
-    case Operation::replace:
-    case Operation::fuse:
-        {
-            backenduno::TemplateIdentifier aTemplate;
-            sal_Int16 flags = aInfo.flags;
-            if (aInfo.op == Operation::fuse) {
-                flags |=
-                    com::sun::star::configuration::backend::NodeAttribute::FUSE;
-            }
-            if (getDataParser().getInstanceType(xAttribs,aTemplate.Name,aTemplate.Component))
-                m_xHandler->addOrReplaceNodeFromTemplate(aInfo.name,aTemplate,flags);
-            else
-                m_xHandler->addOrReplaceNode(aInfo.name,flags);
-        }
-        break;
-
-    case Operation::remove:
-        m_xHandler->dropNode(aInfo.name);
-        m_bRemoved = true;
-        break;
-
-    default: OSL_ASSERT(false);
-    case Operation::unknown:
-        this->raiseParseException("Layer parser: Invalid Data: unknown operation");
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::endNode()
-{
-    if (!this->isInRemoved())
-        m_xHandler->endNode();
-    else
-        m_bRemoved = false;
-
-    BasicParser::endNode();
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::startProperty( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    this->checkNotRemoved();
-
-    BasicParser::startProperty(aInfo,xAttribs);
-
-    switch (aInfo.op)
-    {
-    case Operation::none:
-    case Operation::modify:
-        m_xHandler->overrideProperty(aInfo.name,aInfo.flags,getActivePropertyType(),false);
-        OSL_ASSERT(!m_bNewProp);
-        break;
-
-    case Operation::clear:
-        m_xHandler->overrideProperty(aInfo.name,aInfo.flags,getActivePropertyType(),true);
-        OSL_ASSERT(!m_bNewProp);
-        break;
-
-    case Operation::replace:
-        // defer to later
-        m_bNewProp = true;
-        break;
-
-    case Operation::fuse:
-        this->raiseParseException("Layer parser: Invalid Data: operation 'fuse' is not permitted for properties");
-
-    case Operation::remove:
-        this->raiseParseException("Layer parser: Invalid Data: operation 'remove' is not permitted for properties");
-
-    default: OSL_ASSERT(false);
-    case Operation::unknown:
-        this->raiseParseException("Layer parser: Invalid Data: unknown operation");
-    }
-    OSL_POSTCOND(this->isInUnhandledProperty(),"Error: Property not reckognized as unhandled");
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::addOrReplaceCurrentProperty(const uno::Any& aValue) 
-{
-    const ElementInfo& currentInfo = getActiveNodeInfo() ;
-
-    OSL_ASSERT(currentInfo.op == Operation::replace) ;
-
-    if (aValue.hasValue()) 
-    {
-        m_xHandler->addPropertyWithValue(currentInfo.name, 
-                                         currentInfo.flags, aValue) ;
-    }
-    else 
-    {
-        m_xHandler->addProperty(currentInfo.name, currentInfo.flags, 
-                                getActivePropertyType()) ;
-    }
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::endProperty()
-{
-    OSL_ASSERT(!this->isInRemoved());
-
-    if (m_bNewProp)
-    {
-        OSL_ASSERT(getActiveNodeInfo().op == Operation::replace);
-        if (this->isInUnhandledProperty())
-        {
-            // No value tag is treated as NULL 
-            addOrReplaceCurrentProperty( uno::Any() ) ;
-        }
-        m_bNewProp = false;
-    }
-    else
-    {
-        OSL_ASSERT(getActiveNodeInfo().op != Operation::replace);
-        m_xHandler->endProperty();
-    }
-
-    BasicParser::endProperty();
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::startValueData(const uno::Reference< sax::XAttributeList >& xAttribs)
-{
-    this->checkNotRemoved();
-
-    BasicParser::startValueData(xAttribs);
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::endValueData()
-{
-    uno::Any aValue = this->getCurrentValue();
-
-    if (m_bNewProp)
-    {
-        if (this->isValueDataLocalized())
-            getLogger().warning("Language attribute ignored for value of added property.",
-                                "endValueData()","configuration::xml::SchemaParser");
-
-        addOrReplaceCurrentProperty(aValue) ;
-    }
-    else if (this->isValueDataLocalized())
-    {
-        rtl::OUString aLocale = this->getValueDataLocale();
-
-        m_xHandler->setPropertyValueForLocale(aValue,aLocale);
-    }
-    else
-    {
-        m_xHandler->setPropertyValue(aValue);  
-    }
-
-    BasicParser::endValueData();
-
-    OSL_POSTCOND(!this->isInUnhandledProperty(),"Error: Property not reckognized as unhandled");
-}
-// -----------------------------------------------------------------------------
-
-void LayerParser::checkNotRemoved()
-{
-    if (m_bRemoved)
-        raiseParseException("Layer parser: Invalid Data: Data inside removed node.");
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/xml/layerparser.hxx b/configmgr/source/xml/layerparser.hxx
deleted file mode 100644
index f871fbf85f..0000000000
--- a/configmgr/source/xml/layerparser.hxx
+++ /dev/null
@@ -1,119 +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: layerparser.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 CONFIGMGR_XML_LAYERPARSER_HXX
-#define CONFIGMGR_XML_LAYERPARSER_HXX
-
-#include "basicparser.hxx"
-
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-
-        namespace sax           = ::com::sun::star::xml::sax;
-        namespace backenduno    = ::com::sun::star::configuration::backend;
-
-// -----------------------------------------------------------------------------
-
-
-        class LayerParser :	public BasicParser
-        {
-        public:
-            LayerParser(uno::Reference< uno::XComponentContext > const & _xContext, uno::Reference< backenduno::XLayerHandler > const & _xHandler);
-            virtual ~LayerParser();
-
-        // XDocumentHandler
-        public:
-            virtual void SAL_CALL 
-                startDocument(  ) 
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endDocument(  ) throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                startElement( const rtl::OUString& aName, const uno::Reference< sax::XAttributeList >& xAttribs )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endElement( const rtl::OUString& aName ) 
-                    throw (sax::SAXException, uno::RuntimeException);
-
-        private:
-            /// start an node
-            void startNode( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-           /// end a node
-            void endNode();
-
-            /// start a property
-            void startProperty( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-            /// end a property 
-            void endProperty();
-
-            /// start collecting data for a value - returns the locale of the value (property must have been started)
-            void startValueData(const uno::Reference< sax::XAttributeList >& xAttribs);
-            /// end collecting data for a value - returns the collected value
-            void endValueData();
-
-            /**
-              Forces the addition or replacement of a property.
-              As it is possible to "replace" an existing property,
-              even though this amounts to a modify, this method
-              first tries to add a new property and failing that,
-              to replace the value of an existing one.
-
-              @param aValue value to be set for the property
-              */
-            void addOrReplaceCurrentProperty(const uno::Any& aValue) ;
-
-            bool isInRemoved() const { return m_bRemoved; }
-            void checkNotRemoved();
-        private:
-            uno::Reference< backenduno::XLayerHandler >  m_xHandler; 
-            bool        m_bRemoved;
-            bool        m_bNewProp;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/xml/layerwriter.cxx b/configmgr/source/xml/layerwriter.cxx
deleted file mode 100644
index 8c47d0164f..0000000000
--- a/configmgr/source/xml/layerwriter.cxx
+++ /dev/null
@@ -1,544 +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: layerwriter.cxx,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.
- *
-************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "layerwriter.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include "valueformatter.hxx"
-#include <com/sun/star/beans/IllegalTypeException.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/ConnectionLostException.hpp>
-#include <com/sun/star/configuration/backend/NodeAttribute.hpp>
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace xml
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace io		= ::com::sun::star::io;
-        namespace sax		= ::com::sun::star::xml::sax;
-        // -----------------------------------------------------------------------------
-
-        uno::Reference< uno::XInterface > SAL_CALL instantiateLayerWriter
-            ( uno::Reference< uno::XComponentContext > const& xContext )
-        {
-            return * new LayerWriter(xContext);
-        }
-        // -----------------------------------------------------------------------------
-
-        namespace
-        {
-            static inline
-                uno::Reference< script::XTypeConverter > createTCV(uno::Reference< lang::XMultiServiceFactory > const & _xSvcFactory)
-            {
-                OSL_ENSURE(_xSvcFactory.is(),"Cannot create Write Formatter without a ServiceManager");
-
-                static const rtl::OUString k_sTCVService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"));
-
-                return uno::Reference< script::XTypeConverter >::query(_xSvcFactory->createInstance(k_sTCVService));
-            }
-        // -----------------------------------------------------------------------------
-            static
-            void translateSAXException( sax::SAXException & aSAXException,
-                                        backenduno::XLayerHandler * context)
-            {
-                rtl::OUString sMessage = aSAXException.Message;
-                
-                uno::Any const & aWrappedException = aSAXException.WrappedException;
-                if (aWrappedException.hasValue())
-                {
-                    if (aWrappedException.getValueTypeClass() != uno::TypeClass_EXCEPTION)
-                        OSL_ENSURE(false, "ERROR: WrappedException is not an exception");
-
-                    else if (sMessage.getLength() == 0)
-                        sMessage = static_cast<uno::Exception const *>(aWrappedException.getValue())->Message;
-
-                    // assume that a SAXException with WrappedException indicates a storage access error
-                    throw backenduno::BackendAccessException(sMessage,context,aWrappedException);
-                }
-                else
-                {
-                    // assume that a SAXException without WrappedException indicates non-well-formed data
-                    throw backenduno::MalformedDataException(sMessage,context,uno::makeAny(aSAXException));
-                }
-            }
-        // -----------------------------------------------------------------------------
-            static inline uno::Type getIOExceptionType() 
-            { 
-                io::IOException const * const ioexception = 0;
-                return ::getCppuType(ioexception);
-            }
-            static inline uno::Type getNotConnectedExceptionType() 
-            { 
-                io::NotConnectedException const * const ncexception = 0;
-                return ::getCppuType(ncexception);
-            }
-            static
-            void translateIOException(uno::Any const & anIOException,
-                                      backenduno::XLayerHandler * context)
-            {
-                OSL_ASSERT(anIOException.isExtractableTo(getIOExceptionType()));
-                io::IOException const * pException = static_cast<io::IOException const *>(anIOException.getValue());
-                rtl::OUString sMessage = pException->Message;
-                
-                if (anIOException.isExtractableTo(getNotConnectedExceptionType()))
-                {
-                    throw backenduno::ConnectionLostException(sMessage,context,anIOException);
-                }
-                else
-                {
-                    throw backenduno::BackendAccessException(sMessage,context,anIOException);
-                }
-            }
-        // -----------------------------------------------------------------------------
-        }
-        // -----------------------------------------------------------------------------
-
-        LayerWriter::LayerWriter(uno::Reference< uno::XComponentContext > const & _xContext)
-            : WriterService< ::com::sun::star::configuration::backend::XLayerHandler >(_xContext)
-            , m_xTCV( createTCV( WriterService< ::com::sun::star::configuration::backend::XLayerHandler >::getServiceFactory() ) )
-            , m_bInProperty(false)
-            , m_bStartedDocument(false)
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        LayerWriter::~LayerWriter()
-        {
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::startLayer(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            m_aFormatter.reset();
-            m_bInProperty = false;
-            m_bStartedDocument = false;
-
-            checkInElement(false);
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::endLayer(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(false);
-            try
-            {
-                if (!m_bStartedDocument)
-                {
-                    uno::Reference< io::XOutputStream > aStream = this->getOutputStream(  );
-                    aStream->closeOutput();
-                }
-                else
-                {
-                    getWriteHandler()->endDocument();
-                    m_aFormatter.reset();
-                    m_bStartedDocument = false;
-                }
-            }
-            catch (sax::SAXException & xe)                  { translateSAXException(xe,this); }
-            catch (io::NotConnectedException & ioe)         { translateIOException(uno::makeAny(ioe),this); }
-            catch (io::BufferSizeExceededException & ioe)   { translateIOException(uno::makeAny(ioe),this); }
-            catch (io::IOException & ioe)                   { translateIOException(uno::makeAny(ioe),this); }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            try
-            {
-                if (!m_bStartedDocument)
-                {
-                    getWriteHandler()->startDocument();
-                    m_bStartedDocument = true;
-                }
-                ElementInfo aInfo(aName, this->isInElement() ? ElementType::node : ElementType::layer);
-                aInfo.flags = aAttributes;
-                aInfo.op = bClear ? Operation::clear : Operation::modify;
-
-                m_aFormatter.prepareElement(aInfo);
-
-                this->startNode();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::prepareAddOrReplaceElement(
-            rtl::OUString const & name, sal_Int16 attributes)
-        {
-            ElementInfo info(name, ElementType::node);
-            info.flags = attributes &
-                ~com::sun::star::configuration::backend::NodeAttribute::FUSE;
-            info.op =
-                (attributes &
-                 com::sun::star::configuration::backend::NodeAttribute::FUSE)
-                == 0
-                ? Operation::replace : Operation::fuse;
-            m_aFormatter.prepareElement(info);
-        }
-
-        void SAL_CALL LayerWriter::addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-
-            try
-            {
-                prepareAddOrReplaceElement(aName, aAttributes);
-
-                this->startNode();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-
-            try
-            {
-                prepareAddOrReplaceElement(aName, aAttributes);
-                m_aFormatter.addInstanceType(aTemplate.Name,aTemplate.Component);
-
-                this->startNode();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::endNode(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-            try
-            {
-                this->endElement();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::dropNode( const rtl::OUString& aName ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-
-            try
-            {
-                ElementInfo aInfo(aName, ElementType::node);
-                aInfo.flags = 0;
-                aInfo.op = Operation::remove;
-
-                m_aFormatter.prepareElement(aInfo);
-
-                this->startNode();
-                this->endElement();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-       }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType )
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-
-            try
-            {
-                ElementInfo aInfo(aName, ElementType::property);
-                aInfo.flags = aAttributes;
-                aInfo.op = Operation::replace;
-
-                m_aFormatter.prepareElement(aInfo);
-
-                this->startProp(aType, true);
-                this->writeValue(uno::Any());
-                this->endElement();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-
-            try
-            {
-                ElementInfo aInfo(aName, ElementType::property);
-                aInfo.flags = aAttributes;
-                aInfo.op = Operation::replace;
-
-                m_aFormatter.prepareElement(aInfo);
-
-                this->startProp(aValue.getValueType(), true);
-                this->writeValue(aValue);
-                this->endElement();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            checkInElement(true);
-
-            try
-            {
-                ElementInfo aInfo(aName, ElementType::property);
-                aInfo.flags = aAttributes;
-                aInfo.op = bClear ? Operation::modify : Operation::modify;
-
-                m_aFormatter.prepareElement(aInfo);
-
-                this->startProp(aType, aType.getTypeClass() != uno::TypeClass_VOID);
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::endProperty(  ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            try
-            {
-                checkInElement(true,true);
-                this->endElement();
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::setPropertyValue( const uno::Any& aValue ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            try
-            {
-                checkInElement(true,true);
-                this->writeValue(aValue);
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void SAL_CALL LayerWriter::setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale ) 
-            throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                   uno::RuntimeException)
-        {
-            try
-            {
-                checkInElement(true,true);
-                this->writeValue(aValue,aLocale);
-            }
-            catch (sax::SAXException & xe)                  
-            { 
-                translateSAXException(xe,this); 
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::raiseMalformedDataException(sal_Char const * pMsg)
-        {
-            OSL_ASSERT(pMsg);
-            rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-
-            throw backenduno::MalformedDataException( sMsg, *this, uno::Any() );
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::raiseIllegalTypeException(sal_Char const * pMsg)
-        {
-            OSL_ASSERT(pMsg);
-            rtl::OUString sMsg = rtl::OUString::createFromAscii(pMsg);
-
-            com::sun::star::beans::IllegalTypeException e( sMsg, *this );
-            throw backenduno::MalformedDataException( sMsg, *this, uno::makeAny(e) );
-        }
-        // -----------------------------------------------------------------------------
-
-        bool LayerWriter::isInElement() const
-        {
-            return !m_aTagStack.empty();
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::checkInElement(bool bInElement, bool bInProperty)
-        {
-            if (bInElement != this->isInElement())
-            {
-                sal_Char const * pMsg = bInElement ?
-                    "LayerWriter: Illegal Data: Operation requires a started node" :
-                "LayerWriter: Illegal Data: There is a started node already" ;
-                raiseMalformedDataException(pMsg);
-            }
-
-            if (bInProperty != m_bInProperty)
-            {
-                sal_Char const * pMsg = bInProperty ?
-                    "LayerWriter: Illegal Data: Operation requires a started property" :
-                "LayerWriter: Illegal Data: There is a started property already" ;
-                raiseMalformedDataException(pMsg);
-            }
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::startNode()
-        {
-            rtl::OUString sTag = m_aFormatter.getElementTag();
-            getWriteHandler()->startElement(sTag,m_aFormatter.getElementAttributes());
-            getWriteHandler()->ignorableWhitespace(rtl::OUString());
-            m_aTagStack.push(sTag);
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::startProp(uno::Type const & _aType, bool bNeedType)
-        {
-            if (bNeedType && _aType == uno::Type())
-                raiseIllegalTypeException("LayerWriter: Illegal Data: Cannot add VOID property");
-
-            m_aFormatter.addPropertyValueType(_aType);
-
-            startNode();
-
-            m_aPropertyType = _aType;
-            m_bInProperty = true;
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::endElement()
-        {
-            OSL_ASSERT(!m_aTagStack.empty()); // checks done elsewhere
-
-            getWriteHandler()->endElement(m_aTagStack.top());
-            getWriteHandler()->ignorableWhitespace(rtl::OUString());
-
-            m_aTagStack.pop();
-            m_bInProperty = false;
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::writeValue(uno::Any const & _aValue)
-        {
-            m_aFormatter.prepareSimpleElement( ElementType::value );
-            outputValue(_aValue);
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::writeValue(uno::Any const & _aValue, rtl::OUString const & _aLocale)
-        {
-            m_aFormatter.prepareSimpleElement( ElementType::value );
-            m_aFormatter.addLanguage(_aLocale);
-            outputValue(_aValue);
-        }
-        // -----------------------------------------------------------------------------
-
-        void LayerWriter::outputValue(uno::Any const & _aValue)
-        {
-            ValueFormatter aValueFormatter(_aValue);
-
-            aValueFormatter.addValueAttributes(m_aFormatter);
-
-            rtl::OUString sTag       = m_aFormatter.getElementTag();
-            rtl::OUString sContent   = aValueFormatter.getContent( this->m_xTCV );
-
-            uno::Reference< sax::XDocumentHandler > xOut = getWriteHandler();
-            xOut->startElement(sTag, m_aFormatter.getElementAttributes());
-
-            if (sContent.getLength()) xOut->characters(sContent);
-
-            xOut->endElement(sTag);
-            xOut->ignorableWhitespace(rtl::OUString());
-        }
-        // -----------------------------------------------------------------------------
-
-        // -----------------------------------------------------------------------------
-        // -----------------------------------------------------------------------------
-    } // namespace
-
-    // -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/xml/layerwriter.hxx b/configmgr/source/xml/layerwriter.hxx
deleted file mode 100644
index f05c004146..0000000000
--- a/configmgr/source/xml/layerwriter.hxx
+++ /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: layerwriter.hxx,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.
- *
-************************************************************************/
-
-#ifndef CONFIGMGR_XML_LAYERWRITER_HXX
-#define CONFIGMGR_XML_LAYERWRITER_HXX
-
-#include "writersvc.hxx"
-#include "elementformatter.hxx"
-#include "stack.hxx"
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-
-namespace com { namespace sun { namespace star { namespace script {
-    class XTypeConverter;
-} } } }
-
-namespace configmgr
-{
-    // -----------------------------------------------------------------------------
-    namespace xml
-    {
-        // -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-
-        namespace sax           = ::com::sun::star::xml::sax;
-        namespace backenduno    = ::com::sun::star::configuration::backend;
-
-        // -----------------------------------------------------------------------------
-
-
-        class LayerWriter :	public WriterService< ::com::sun::star::configuration::backend::XLayerHandler >
-        {
-        public:
-            explicit
-                LayerWriter(uno::Reference< uno::XComponentContext > const & _xContext);
-            virtual ~LayerWriter();
-
-            // XLayerHandler
-        public:
-            virtual void SAL_CALL 
-                startLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endLayer(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideNode( const rtl::OUString& aName, sal_Int16 aAttributes, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNode( const rtl::OUString& aName, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const backenduno::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endNode(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                dropNode( const rtl::OUString& aName ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Type& aType )
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endProperty(  ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setPropertyValue( const uno::Any& aValue ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                setPropertyValueForLocale( const uno::Any& aValue, const rtl::OUString& aLocale ) 
-                    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-                           uno::RuntimeException);
-
-        private:
-            bool isInElement() const;
-            void checkInElement(bool bInElement, bool bInProperty = false);
-
-            void startNode();
-            void startProp(uno::Type const & _aType, bool bNeedType);
-
-            void endElement();
-
-            void writeValue(uno::Any const & _aValue);
-            void writeValue(uno::Any const & _aValue, rtl::OUString const & _aLocale);
-
-            void outputValue(uno::Any const & _aValue);
-
-            void raiseMalformedDataException(sal_Char const * pMsg);
-            void raiseIllegalTypeException(sal_Char const * pMsg);
-
-            void prepareAddOrReplaceElement(
-                rtl::OUString const & name, sal_Int16 attributes);
-
-        private:
-            uno::Reference< com::sun::star::script::XTypeConverter > m_xTCV;
-            Stack< rtl::OUString >            m_aTagStack;
-            ElementFormatter    m_aFormatter;
-            uno::Type           m_aPropertyType;
-            bool                m_bInProperty;
-            bool                m_bStartedDocument;
-        };
-        // -----------------------------------------------------------------------------
-    } // namespace xml
-    // -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-
-
diff --git a/configmgr/source/xml/makefile.mk b/configmgr/source/xml/makefile.mk
deleted file mode 100644
index 61d3ac6557..0000000000
--- a/configmgr/source/xml/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.27 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General 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=..$/..
-
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=xml
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-CFLAGSCXX+=-instances=static
-.ENDIF
-
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/matchlocale.obj \
-    $(SLO)$/typeconverter.obj \
-    $(SLO)$/simpletypehelper.obj \
-    $(SLO)$/valueconverter.obj \
-    $(SLO)$/elementparser.obj \
-    $(SLO)$/elementformatter.obj \
-    $(SLO)$/basicparser.obj \
-    $(SLO)$/layerparser.obj \
-    $(SLO)$/schemaparser.obj \
-    $(SLO)$/parsersvc.obj \
-    $(SLO)$/writersvc.obj \
-    $(SLO)$/layerwriter.obj \
-    $(SLO)$/valueformatter.obj \
-    $(SLO)$/xmlstrings.obj \
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/source/xml/matchlocale.cxx b/configmgr/source/xml/matchlocale.cxx
deleted file mode 100644
index 1e8f400811..0000000000
--- a/configmgr/source/xml/matchlocale.cxx
+++ /dev/null
@@ -1,387 +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: matchlocale.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_configmgr.hxx"
-#include "matchlocale.hxx"
-
-#include <rtl/ustrbuf.hxx>
-
-#include <algorithm>
-#include <iterator>
-
-namespace configmgr 
-{
-// -----------------------------------------------------------------------------
-    namespace localehelper
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace lang		= ::com::sun::star::lang;
-
-#define ARRAYSIZE( arr ) (sizeof(arr) / sizeof 0[arr] )
-// -----------------------------------------------------------------------------
-    struct StaticLocale
-    {
-        char const * aLanguage;
-        char const * aCountry;
-    };
-
-    char const * const c_sAnyLanguage = "*";            // exported !
-    char const * const c_sDefLanguage = "x-default";    // exported !
-
-    char const * const c_sNoCountry = "";
-
-    char const * const c_sLanguageEnglish = "en";
-    char const * const c_sCountryUS = "US";
-
-    StaticLocale const c_aFallbackLocales[] =
-    {
-        { c_sLanguageEnglish,	c_sCountryUS }, // english [cannot make 'en' better than 'en-US' :-(]
-        { c_sAnyLanguage,		c_sNoCountry }  // just take the first you find
-    };
-    std::vector< com::sun::star::lang::Locale >::size_type const c_nFallbackLocales = ARRAYSIZE(c_aFallbackLocales);
-
-// -----------------------------------------------------------------------------
-    bool isAnyLanguage(rtl::OUString const & _sLanguage)
-    {
-        return !!_sLanguage.equalsAscii(c_sAnyLanguage);
-    }
-
-// -----------------------------------------------------------------------------
-    bool isDefaultLanguage(rtl::OUString const & _sLanguage)
-    {
-        return !!_sLanguage.equalsAscii(c_sDefLanguage);
-    }
-
-// -----------------------------------------------------------------------------
-    rtl::OUString getAnyLanguage()
-    {
-        return rtl::OUString::createFromAscii( c_sAnyLanguage );
-    }
-
-// -----------------------------------------------------------------------------
-    rtl::OUString getDefaultLanguage()
-    {
-        return rtl::OUString::createFromAscii( c_sDefLanguage );
-    }
-
-// -----------------------------------------------------------------------------
-    com::sun::star::lang::Locale getAnyLocale()
-    {
-        return com::sun::star::lang::Locale( getAnyLanguage(), rtl::OUString(), rtl::OUString() );
-    }
-
-// -----------------------------------------------------------------------------
-    com::sun::star::lang::Locale getDefaultLocale()
-    {
-        return com::sun::star::lang::Locale( getDefaultLanguage(), rtl::OUString(), rtl::OUString() );
-    }
-
-// -----------------------------------------------------------------------------
-    static inline sal_Int32 countrySeparatorPos(rtl::OUString const& aLocaleName_)
-    {
-        sal_Int32 pos = aLocaleName_.indexOf('-');
-        if (pos == 1) // allow for x-LL or i-LL
-            pos = aLocaleName_.indexOf('-',pos+1);
-
-        if (pos < 0) 
-            pos = aLocaleName_.indexOf('_');
-
-        return pos;
-    }
-    // -------------------------------------------------------------------------
-    static inline sal_Int32 countryLength(rtl::OUString const& aLocaleName_, sal_Int32 nCountryPos)
-    {
-        sal_Int32 pos1 = aLocaleName_.indexOf('.',nCountryPos);
-        sal_Int32 pos2 = aLocaleName_.indexOf('_',nCountryPos);
-
-        if (pos1 < 0) pos1 = aLocaleName_.getLength();
-        
-        if (pos2 < 0 || pos1 < pos2) 
-            return pos1 - nCountryPos;
-
-        else 
-            return pos2 - nCountryPos;
-    }
-    // -------------------------------------------------------------------------
-    static inline void splitLocaleString(rtl::OUString const& aLocaleName_, rtl::OUString& rLanguage_, rtl::OUString& rCountry_)
-    {
-        sal_Int32 nCountryPos = countrySeparatorPos(aLocaleName_);
-        if (nCountryPos >= 0)
-        {
-            rLanguage_ = aLocaleName_.copy(0,nCountryPos).toAsciiLowerCase();
-
-            ++nCountryPos; // advance past separator
-            sal_Int32 nCountryLength = countryLength(aLocaleName_, nCountryPos);
-
-            rCountry_  = aLocaleName_.copy(nCountryPos,nCountryLength).toAsciiUpperCase();
-        }
-        else
-        {
-            rLanguage_ = aLocaleName_.toAsciiLowerCase();
-            rCountry_  = rtl::OUString();
-        }
-    }
-// -----------------------------------------------------------------------------
-        
-// -----------------------------------------------------------------------------
-// conversion helpers
-com::sun::star::lang::Locale makeLocale(rtl::OUString const& sLocaleName_)
-{
-    com::sun::star::lang::Locale aResult;
-    splitLocaleString(sLocaleName_, aResult.Language, aResult.Country);
-    return aResult;
-}
-rtl::OUString makeIsoLocale(com::sun::star::lang::Locale const& aUnoLocale_)
-{
-    rtl::OUStringBuffer aResult(aUnoLocale_.Language.toAsciiLowerCase());
-    if (aUnoLocale_.Country.getLength())
-    {
-        aResult.append( sal_Unicode('-') ).append(aUnoLocale_.Country.toAsciiUpperCase());
-    }
-    return aResult.makeStringAndClear();
-}
-static
-com::sun::star::lang::Locale makeLocale(StaticLocale const& aConstLocale_)
-{
-    com::sun::star::lang::Locale aResult;
-    aResult.Language = rtl::OUString::createFromAscii(aConstLocale_.aLanguage);
-    aResult.Country  = rtl::OUString::createFromAscii(aConstLocale_.aCountry);
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-template <class T>
-inline
-void addLocaleSeq_impl(T const* first, T const* last, std::vector< com::sun::star::lang::Locale >& rSeq)
-{
-    com::sun::star::lang::Locale (* const xlate)(T const&) = &makeLocale;
-
-    std::transform(first, last, std::back_inserter(rSeq), xlate);
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-template <class T>
-inline
-std::vector< com::sun::star::lang::Locale > makeLocaleSeq_impl(uno::Sequence< T > const& aLocales_)
-{
-    sal_Int32 const nLocaleCount = aLocales_.getLength();
-
-    T const* pLocaleBegin = aLocales_.getConstArray();
-
-    std::vector< com::sun::star::lang::Locale > aResult;
-    aResult.reserve( nLocaleCount + c_nFallbackLocales ); // make room for fallback stuff as well
-
-    addLocaleSeq_impl(pLocaleBegin, pLocaleBegin + nLocaleCount, aResult);
-
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-void addFallbackLocales(std::vector< com::sun::star::lang::Locale >& aTargetList_)
-{
-    addLocaleSeq_impl(c_aFallbackLocales, c_aFallbackLocales + c_nFallbackLocales, aTargetList_);
-}
-// -----------------------------------------------------------------------------
-
-std::vector< com::sun::star::lang::Locale > makeLocaleSequence(uno::Sequence<rtl::OUString> const& sLocaleNames_)
-{
-    return makeLocaleSeq_impl(sLocaleNames_);
-}
-// -----------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> makeIsoSequence(std::vector< com::sun::star::lang::Locale > const& aLocales_)
-{
-    std::vector< com::sun::star::lang::Locale >::size_type const nLocaleCount = aLocales_.size();
-    sal_Int32 const nSeqSize = sal_Int32(nLocaleCount);
-    OSL_ASSERT( nSeqSize >= 0 && sal_uInt32(nSeqSize) == nLocaleCount );
-
-    uno::Sequence<rtl::OUString> aResult(nSeqSize);
-    std::transform(aLocales_.begin(), aLocales_.end(), aResult.getArray(), &makeIsoLocale);
-
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-bool designatesAllLocales(com::sun::star::lang::Locale const& aLocale_)
-{
-    return aLocale_.Language.equalsAscii(c_sAnyLanguage);
-}
-bool designatesAllLocales(std::vector< com::sun::star::lang::Locale > const& aLocales_)
-{
-    return	aLocales_.size() <= 1 && 
-            (aLocales_.size() == 0 || designatesAllLocales(aLocales_));
-}
-// -----------------------------------------------------------------------------
-
-MatchQuality match(com::sun::star::lang::Locale const& aLocale_, com::sun::star::lang::Locale const& aTarget_)
-{
-    // check language
-    if (!aLocale_.Language.equals(aTarget_.Language)) 
-    {
-        // can we accept any language
-        if (aTarget_.Language.equalsAscii(c_sAnyLanguage))
-            return MATCH_LANGUAGE;
-
-        return MISMATCH;
-    }
-
-    // check for exact match
-    else if (aLocale_.Country.equals(aTarget_.Country)) 
-        return MATCH_LOCALE;
-
-    // check for plain language
-    else if (aLocale_.Country.getLength() == 0) 
-        return MATCH_LANGUAGE_PLAIN;
-
-    // so we are left with the wrong country
-    else 
-        return MATCH_LANGUAGE;
-}
-
-// -----------------------------------------------------------------------------
-
-/// check the given position and quality, if they are an improvement
-bool MatchResult::improve(std::vector< com::sun::star::lang::Locale >::size_type nPos_, MatchQuality eQuality_)
-{
-    // is this a match at all ?
-    if (eQuality_ == MISMATCH) 
-        return false;
-
-    // is the position worse ?
-    if (nPos_ > m_nPos ) 
-        return false;
-
-    // is this just a non-positive quality change ?
-    if (nPos_ == m_nPos && eQuality_ <= m_eQuality) 
-        return false;
-
-    // Improvement found
-    m_nPos		= nPos_;
-    m_eQuality	= eQuality_;
-
-    return true;
-}
-
-// -----------------------------------------------------------------------------
-
-bool isMatch(com::sun::star::lang::Locale const& aLocale_, std::vector< com::sun::star::lang::Locale > const& aTarget_, MatchQuality eRequiredQuality_)
-{
-    std::vector< com::sun::star::lang::Locale >::size_type const nEnd = aTarget_.size();
-
-    for (std::vector< com::sun::star::lang::Locale >::size_type nPos = 0; nPos < nEnd; ++nPos)
-    {
-        MatchQuality eQuality = match(aLocale_, aTarget_[nPos]);
-        if (eQuality >= eRequiredQuality_)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-// -----------------------------------------------------------------------------
-
-static 
-inline
-std::vector< com::sun::star::lang::Locale >::size_type getSearchLimitPosition(MatchResult const& aPrevMatch_,std::vector< com::sun::star::lang::Locale > const& aTarget_)
-{
-    std::vector< com::sun::star::lang::Locale >::size_type nSize = aTarget_.size();
-
-    if (aPrevMatch_.isMatch())
-    {
-        std::vector< com::sun::star::lang::Locale >::size_type nMatchPos = aPrevMatch_.position();
-
-        OSL_ENSURE(nMatchPos < nSize,"localehelper::getSearchLimitPosition: ERROR - previous position is out-of-bounds");
-
-        if (nMatchPos < nSize)
-        {
-            return nMatchPos + 1;
-        }
-    }
-    return nSize;
-}
-// -----------------------------------------------------------------------------
-
-bool improveMatch(MatchResult& rMatch_, com::sun::star::lang::Locale const& aLocale_, std::vector< com::sun::star::lang::Locale > const& aTarget_)
-{
-    std::vector< com::sun::star::lang::Locale >::size_type const nEnd = getSearchLimitPosition(rMatch_,aTarget_);
-
-    for (std::vector< com::sun::star::lang::Locale >::size_type nPos = 0; nPos < nEnd; ++nPos)
-    {
-        if (rMatch_.improve(nPos, match(aLocale_, aTarget_[nPos])))
-        {
-            return true;
-        }
-    }
-    return false;
-}
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-// class FindBestLocale
-// -----------------------------------------------------------------------------
-
-inline
-void FindBestLocale::implSetTarget(std::vector< com::sun::star::lang::Locale > const& aTarget_)
-{
-    m_aTarget = aTarget_;
-    addFallbackLocales(m_aTarget);
-}
-// -----------------------------------------------------------------------------
-
-FindBestLocale::FindBestLocale(com::sun::star::lang::Locale const& aTarget_)
-{
-    std::vector< com::sun::star::lang::Locale > aSeq(1,aTarget_);
-    implSetTarget( aSeq );
-}
-// -----------------------------------------------------------------------------
-
-bool FindBestLocale::accept(com::sun::star::lang::Locale const& aLocale_)
-{
-    return improveMatch(m_aResult, aLocale_, m_aTarget);
-}
-// -----------------------------------------------------------------------------
-
-void FindBestLocale::reset(bool bNeedLocale_)
-{
-    if (bNeedLocale_)
-        m_aResult.reset();
-
-    else // mark as best match already (no improvement possible)
-        m_aResult = m_aResult.best();
-}
-// -----------------------------------------------------------------------------
-    
-    } // namespace locale helper
-// -----------------------------------------------------------------------------
-
-} // namespace
-
-
diff --git a/configmgr/source/xml/parsersvc.cxx b/configmgr/source/xml/parsersvc.cxx
deleted file mode 100644
index 9337d1700c..0000000000
--- a/configmgr/source/xml/parsersvc.cxx
+++ /dev/null
@@ -1,385 +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: parsersvc.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_configmgr.hxx"
-
-#include "parsersvc.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include "schemaparser.hxx"
-#include "layerparser.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <com/sun/star/configuration/backend/XSchema.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/configuration/backend/MalformedDataException.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace io    = ::com::sun::star::io;
-        namespace sax   = ::com::sun::star::xml::sax;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-struct ParserServiceTraits;
-// -----------------------------------------------------------------------------
-static inline void clear(rtl::OUString & _rs) { _rs = rtl::OUString(); }
-
-// -----------------------------------------------------------------------------
-template <class BackendInterface>
-ParserService<BackendInterface>::ParserService(uno::Reference< uno::XComponentContext > const & _xContext)
-: m_xContext(_xContext)
-, m_aInputSource()
-{
-    if (!m_xContext.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration Parser: NULL Context"));
-        throw uno::RuntimeException(sMessage,NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-// XInitialization
-template <class BackendInterface>
-void SAL_CALL 
-    ParserService<BackendInterface>::initialize( const uno::Sequence< uno::Any >& aArguments ) 
-        throw (uno::Exception, uno::RuntimeException)
-{
-    switch(aArguments.getLength())
-    {
-    case 0: 
-        break;
-
-    case 1:
-        if (aArguments[0] >>= m_aInputSource) 
-            break;
-
-        if (aArguments[0] >>= m_aInputSource.aInputStream) 
-            break;
-
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Cannot use argument to initialize a Configuration Parser"
-                                                            "- InputSource or XInputStream expected"));
-            throw lang::IllegalArgumentException(sMessage,*this,1);
-        }
-    default:
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Too many arguments to initialize a Configuration Parser"));
-            throw lang::IllegalArgumentException(sMessage,*this,0);
-        }
-    }
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-inline
-ServiceInfoHelper ParserService<BackendInterface>::getServiceInfo()
-{
-    return ParserServiceTraits<BackendInterface>::getServiceInfo();
-}
-// -----------------------------------------------------------------------------
-
-// XServiceInfo
-template <class BackendInterface>
-::rtl::OUString SAL_CALL 
-    ParserService<BackendInterface>::getImplementationName(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getImplementationName();
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-sal_Bool SAL_CALL 
-    ParserService<BackendInterface>::supportsService( const ::rtl::OUString& ServiceName ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().supportsService( ServiceName );
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-uno::Sequence< ::rtl::OUString > SAL_CALL 
-    ParserService<BackendInterface>::getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getSupportedServiceNames( );
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-void SAL_CALL 
-    ParserService<BackendInterface>::setInputStream( const uno::Reference< io::XInputStream >& aStream ) 
-        throw (uno::RuntimeException)
-{
-    clear( m_aInputSource.sEncoding ); 
-    clear( m_aInputSource.sSystemId ); 
-    // clear( m_aInputSource.sPublicId ); 
-    m_aInputSource.aInputStream = aStream;
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-uno::Reference< io::XInputStream > SAL_CALL 
-    ParserService<BackendInterface>::getInputStream(  ) 
-        throw (uno::RuntimeException)
-{
-    return m_aInputSource.aInputStream;
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-void ParserService<BackendInterface>::parse(uno::Reference< sax::XDocumentHandler > const & _xHandler)
-//    throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException)
-{
-    OSL_PRECOND( _xHandler.is(), "ParserService: No SAX handler to parse to");
-
-    rtl::OUString const k_sSaxParserService( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")); 
-    
-    uno::Reference< lang::XMultiComponentFactory > xServiceFactory = m_xContext->getServiceManager();
-
-    uno::Reference< sax::XParser > xParser = uno::Reference< sax::XParser >::query( xServiceFactory->createInstanceWithContext(k_sSaxParserService,m_xContext) );
-
-    if (!xParser.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration Parser: Cannot create SAX Parser"));
-        throw uno::RuntimeException(sMessage,*this);
-    }
-
-    try
-    {
-        xParser->setDocumentHandler(_xHandler);
-        
-        sax::InputSource aInputSourceCopy = m_aInputSource;
-        //Set the sax input stream to null, an input stream can only be parsed once
-        m_aInputSource.aInputStream = NULL;
-        xParser->parseStream( aInputSourceCopy );
-    }
-    catch (sax::SAXException & e)
-    {
-        uno::Any aWrapped = e.WrappedException.hasValue() ? e.WrappedException : uno::makeAny( e );
-        rtl::OUString sSAXMessage = e.Message;
-
-        // Expatwrap SAX service doubly wraps its errors ??
-        sax::SAXException eInner;
-        if (aWrapped >>= eInner)
-        {
-            if (eInner.WrappedException.hasValue()) aWrapped = eInner.WrappedException;
-
-            rtl::OUStringBuffer sMsgBuf(eInner.Message);
-            sMsgBuf.appendAscii("- {Parser Error: ").append(sSAXMessage).appendAscii(" }.");
-            sSAXMessage = sMsgBuf.makeStringAndClear();
-        }
-
-        static backenduno::MalformedDataException const * const forDataError = 0;
-        static lang::WrappedTargetException const * const forWrappedError = 0;
-        if (aWrapped.isExtractableTo(getCppuType(forDataError)) ||
-            aWrapped.isExtractableTo(getCppuType(forWrappedError)))
-        {
-            cppu::throwException(aWrapped);
-
-            OSL_ASSERT(!"not reached");
-        }
-
-        rtl::OUStringBuffer sMessageBuf;
-        sMessageBuf.appendAscii("Configuration Parser: a ").append( aWrapped.getValueTypeName() );
-        sMessageBuf.appendAscii(" occurred while parsing: ");
-        sMessageBuf.append(sSAXMessage);
-        
-        throw lang::WrappedTargetException(sMessageBuf.makeStringAndClear(),*this,aWrapped);
-    }
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-sal_Char const * const aSchemaParserServices[] = 
-{
-    "com.sun.star.configuration.backend.xml.SchemaParser",
-    0
-};
-const ServiceImplementationInfo aSchemaParserSI =
-{
-    "com.sun.star.comp.configuration.backend.xml.SchemaParser",
-    aSchemaParserServices,
-    0
-};
-// -----------------------------------------------------------------------------
-sal_Char const * const aLayerParserServices[] = 
-{
-    "com.sun.star.configuration.backend.xml.LayerParser",
-    0
-};
-const ServiceImplementationInfo aLayerParserSI =
-{
-    "com.sun.star.comp.configuration.backend.xml.LayerParser",
-    aLayerParserServices,
-    0
-};
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-template <>
-struct ParserServiceTraits< backenduno::XSchema >
-{
-    static ServiceImplementationInfo const * getServiceInfo() 
-    { return & aSchemaParserSI; }
-};
-// -----------------------------------------------------------------------------
-template <>
-struct ParserServiceTraits< backenduno::XLayer >
-{
-    static ServiceImplementationInfo const * getServiceInfo() 
-    { return & aLayerParserSI; }
-};
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-class SchemaParserService : public ParserService< backenduno::XSchema >
-{
-public:
-    SchemaParserService(uno::Reference< uno::XComponentContext > const & _xContext) 
-    : ParserService< backenduno::XSchema >(_xContext)
-    {
-    }
-
-    virtual void SAL_CALL readSchema( uno::Reference< backenduno::XSchemaHandler > const & aHandler ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-               lang::NullPointerException, uno::RuntimeException);
-
-    virtual void SAL_CALL readComponent( uno::Reference< backenduno::XSchemaHandler > const & aHandler ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-               lang::NullPointerException, uno::RuntimeException);
-
-    virtual void SAL_CALL readTemplates( uno::Reference< backenduno::XSchemaHandler > const & aHandler ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-               lang::NullPointerException, uno::RuntimeException);
-};
-// -----------------------------------------------------------------------------
-
-class LayerParserService : public ParserService< backenduno::XLayer >
-{
-public:
-    LayerParserService(uno::Reference< uno::XComponentContext > const & _xContext) 
-    : ParserService< backenduno::XLayer >(_xContext)
-    {
-    }
-
-    virtual void SAL_CALL readData( uno::Reference< backenduno::XLayerHandler > const & aHandler ) 
-        throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-               lang::NullPointerException, uno::RuntimeException);
-};
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-uno::Reference< uno::XInterface > SAL_CALL instantiateSchemaParser( uno::Reference< uno::XComponentContext > const& xContext )
-{
-    return * new SchemaParserService(xContext);
-}
-uno::Reference< uno::XInterface > SAL_CALL instantiateLayerParser( uno::Reference< uno::XComponentContext > const& xContext )
-{
-    return * new LayerParserService(xContext);
-}
-// -----------------------------------------------------------------------------
-const ServiceRegistrationInfo* getSchemaParserServiceInfo() 
-{ return getRegistrationInfo(& aSchemaParserSI); }
-const ServiceRegistrationInfo* getLayerParserServiceInfo()
-{ return getRegistrationInfo(& aLayerParserSI); }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-static rtl::OUString nullHandlerMessage(char const * where)
-{
-    OSL_ASSERT(where);
-    rtl::OUString msg = rtl::OUString::createFromAscii(where);
-    return msg.concat(rtl::OUString::createFromAscii(": Error - NULL handler passed."));
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL SchemaParserService::readSchema( uno::Reference< backenduno::XSchemaHandler > const & aHandler ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-           lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aHandler.is())
-        throw lang::NullPointerException(nullHandlerMessage("SchemaParserService::readSchema"),*this);
-
-    uno::Reference< sax::XDocumentHandler > xHandler = new SchemaParser(this->getContext(),aHandler, SchemaParser::selectAll);
-    this->parse( xHandler );
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL SchemaParserService::readComponent( uno::Reference< backenduno::XSchemaHandler > const & aHandler ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-           lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aHandler.is())
-        throw lang::NullPointerException(nullHandlerMessage("SchemaParserService::readComponent"),*this);
-
-    uno::Reference< sax::XDocumentHandler > xHandler = new SchemaParser(this->getContext(),aHandler, SchemaParser::selectComponent);
-    this->parse( xHandler );
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL SchemaParserService::readTemplates( uno::Reference< backenduno::XSchemaHandler > const & aHandler ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-           lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aHandler.is())
-        throw lang::NullPointerException(nullHandlerMessage("SchemaParserService::readTemplates"),*this);
-
-    uno::Reference< sax::XDocumentHandler > xHandler = new SchemaParser(this->getContext(),aHandler, SchemaParser::selectTemplates);
-    this->parse( xHandler );
-}
-// -----------------------------------------------------------------------------
-void SAL_CALL LayerParserService::readData( uno::Reference< backenduno::XLayerHandler > const & aHandler ) 
-    throw (backenduno::MalformedDataException, lang::WrappedTargetException, 
-           lang::NullPointerException, uno::RuntimeException)
-{
-    if (!aHandler.is())
-        throw lang::NullPointerException(nullHandlerMessage("LayerParserService::readData"),*this);
-
-    uno::Reference< sax::XDocumentHandler > xHandler = new LayerParser(this->getContext(),aHandler);
-    this->parse( xHandler );
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/xml/parsersvc.hxx b/configmgr/source/xml/parsersvc.hxx
deleted file mode 100644
index 99afeae76f..0000000000
--- a/configmgr/source/xml/parsersvc.hxx
+++ /dev/null
@@ -1,117 +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: parsersvc.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 CONFIGMGR_XML_PARSERSVC_HXX
-#define CONFIGMGR_XML_PARSERSVC_HXX
-
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/implbase4.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace io    = ::com::sun::star::io;
-        namespace sax   = ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-        template <class BackendInterface>
-        class ParserService : public ::cppu::WeakImplHelper4< 
-                                            lang::XInitialization,
-                                            lang::XServiceInfo,  
-                                            io::XActiveDataSink,
-                                            BackendInterface          
-                                        > 
-        {
-        public:
-            explicit
-            ParserService(uno::Reference< uno::XComponentContext > const & _xContext);
-
-            // XInitialization
-            virtual void SAL_CALL 
-                initialize( const uno::Sequence< uno::Any >& aArguments ) 
-                    throw (uno::Exception, uno::RuntimeException);
-
-            // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL 
-                getImplementationName(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual sal_Bool SAL_CALL 
-                supportsService( const ::rtl::OUString& ServiceName ) 
-                    throw (uno::RuntimeException);
-
-            virtual uno::Sequence< ::rtl::OUString > SAL_CALL 
-                getSupportedServiceNames(  ) 
-                    throw (uno::RuntimeException);
-    
-            // XActiveDataSink
-            virtual void SAL_CALL 
-                setInputStream( const uno::Reference< io::XInputStream >& aStream ) 
-                    throw (uno::RuntimeException);
-    
-            virtual uno::Reference< io::XInputStream > SAL_CALL 
-                getInputStream(  ) 
-                    throw (uno::RuntimeException);
-
-        protected:
-            uno::Reference< uno::XComponentContext > getContext() const 
-            { return m_xContext; }
-
-            void parse(uno::Reference< sax::XDocumentHandler > const & _xHandler);
-            // throw (backenduno::MalformedDataException, lang::WrappedTargetException, uno::RuntimeException);
-
-        private:
-            uno::Reference< uno::XComponentContext >   m_xContext;
-            sax::InputSource m_aInputSource;
-
-            static ServiceInfoHelper getServiceInfo();
-        };
-
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/xml/schemaparser.cxx b/configmgr/source/xml/schemaparser.cxx
deleted file mode 100644
index 83d7efa766..0000000000
--- a/configmgr/source/xml/schemaparser.cxx
+++ /dev/null
@@ -1,409 +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: schemaparser.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-
-#include "schemaparser.hxx"
-
-// -----------------------------------------------------------------------------
-#include "wrapexception.hxx"
-
-#define WRAP_PARSE_EXCEPTIONS()  \
-    PASS_EXCEPTION(sax::SAXException)       \
-    PASS_EXCEPTION(uno::RuntimeException)   \
-    WRAP_CONFIGDATA_EXCEPTIONS( raiseParseException )   \
-    WRAP_OTHER_EXCEPTIONS( raiseParseException )
-
-#define WRAP_PARSE_EXCEPTIONS_MSG( msg )  \
-    PASS_EXCEPTION(sax::SAXException)       \
-    PASS_EXCEPTION(uno::RuntimeException)   \
-    WRAP_CONFIGDATA_EXCEPTIONS1( raiseParseException, msg ) \
-    WRAP_OTHER_EXCEPTIONS1( raiseParseException, msg )
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno		= ::com::sun::star::uno;
-        namespace sax		= ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-SchemaParser::SchemaParser(uno::Reference< uno::XComponentContext > const & _xContext, uno::Reference< backenduno::XSchemaHandler > const & _xHandler, Select _selector)
-: BasicParser(_xContext)
-, m_xHandler(_xHandler)
-, m_sComponent()
-, m_selector(_selector)
-, m_selected(selectNone)
-{
-    if (!m_xHandler.is())
-    {
-        rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Cannot create SchemaParser: Unexpected NULL Handler"));
-        throw uno::RuntimeException(sMessage, *this);
-    }
-    OSL_ENSURE(m_selector != selectNone, "Warning: Schema handler will handle no part of the schema");
-}
-// -----------------------------------------------------------------------------
-
-SchemaParser::~SchemaParser()
-{
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaParser::startDocument(  ) 
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    BasicParser::startDocument();
-
-    OSL_ENSURE(isEmptyNode(), "BasicParser does not mark new document as empty");
-
-    m_sComponent = rtl::OUString();
-    m_selected = selectNone;
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaParser::endDocument(  ) throw (sax::SAXException, uno::RuntimeException)
-{
-    if (isSelected())
-        raiseParseException("Schema XML Parser: Invalid XML: Document ends while section is open");
-
-    if (isEmptyNode()) OSL_TRACE("Configuration Parser: XML schema document ended without any data");
-
-    BasicParser::endDocument();
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaParser::startElement( const rtl::OUString& aName, const uno::Reference< sax::XAttributeList >& xAttribs )
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    if ( this->isSkipping() )
-    {
-        this->startSkipping( aName, xAttribs );
-        return;
-    }
-
-    ElementInfo aInfo = getDataParser().parseElementInfo(aName,xAttribs);
-
-    try
-    {
-        switch (aInfo.type)
-        {
-        case ElementType::schema:
-            this->startSchema(aInfo,xAttribs);
-            break;
-
-        case ElementType::component:
-            this->startSection(selectComponent, aInfo, xAttribs);
-            break;
-
-        case ElementType::templates:
-            this->startSection(selectTemplates, aInfo, xAttribs);
-            break;
-
-        case ElementType::import:
-            this->handleImport(aInfo,xAttribs);
-            this->startSkipping( aName, xAttribs );
-            break;
-
-        case ElementType::uses:
-            this->startSkipping( aName, xAttribs );
-            break;
-
-        case ElementType::instance:
-            this->handleInstance(aInfo,xAttribs);
-            this->startSkipping( aName, xAttribs );
-            break;
-
-        case ElementType::item_type:
-            this->handleItemType(aInfo,xAttribs);
-            this->startSkipping( aName, xAttribs );
-            break;
-
-        case ElementType::layer:
-        case ElementType::node:
-            raiseParseException( "Schema XML parser - Invalid data: found unspecified 'node' element.\n");
-            // fall thru
-        case ElementType::group: case ElementType::set: 
-            this->startNode(aInfo,xAttribs);
-            OSL_ASSERT( this->isInNode()  );
-            break;
-
-        case ElementType::property:
-            this->startProperty(aInfo,xAttribs);
-            OSL_ASSERT( this->isInUnhandledProperty() );
-            break;
-
-        case ElementType::value:
-            this->startValueData(xAttribs);
-            OSL_ASSERT( this->isInValueData() );
-            break;
-
-        default: // skip unknown elements
-            OSL_ENSURE( aInfo.type <= ElementType::other, "Schema XML parser - Error: invalid element type value\n");
-            OSL_ENSURE( aInfo.type >= ElementType::other, "Schema XML parser - Unexpected: found layer element in schema data\n");
-        // accept (and skip) unknown (ElementType::other) tags in schema to allow documentation and constraints to pass without assertion
-          //OSL_ENSURE( aInfo.type <  ElementType::other, "Schema XML parser - Warning: ignoring unknown element tag\n");
-
-            this->startSkipping( aName, xAttribs );
-            OSL_ASSERT( this->isSkipping() );
-            return;
-        }
-    }
-    WRAP_PARSE_EXCEPTIONS_MSG("LayerParser - Starting Element")
-
-    OSL_ENSURE(aInfo.op == Operation::none || this->isSkipping(),
-                "Schema Parser: The 'op' attribute is not supported in a schema");
-}
-// -----------------------------------------------------------------------------
-
-void SAL_CALL SchemaParser::endElement( const rtl::OUString& aName ) 
-        throw (sax::SAXException, uno::RuntimeException)
-{
-    if ( this->wasSkipping(aName) )
-        return;
-
-    try
-    {
-        if ( this->isInValueData())
-            this->endValueData();
-
-        else if (this->isInProperty())
-            this->endProperty();
-
-        else if (this->isInNode())
-            this->endNode();
-
-        else if (this->isSelected())
-            this->endSection();
-
-        else 
-            this->endSchema();
-    }
-    WRAP_PARSE_EXCEPTIONS_MSG("LayerParser - Ending Element")
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-void SchemaParser::startSchema( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& /*xAttribs*/ )
-{
-    m_sComponent = aInfo.name;
-    m_xHandler->startSchema();
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::endSchema( )
-{
-    m_xHandler->endSchema();
-    m_sComponent = rtl::OUString();
-}
-// -----------------------------------------------------------------------------
-
-bool SchemaParser::select(Select _select)
-{
-    if (isSelected())
-        raiseParseException("Schema XML parser - Invalid data: found start of section while a section is still open.\n");
-
-    m_selected = static_cast<Select>(m_selector & _select);
-
-    return m_selected != 0;
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::startSection( Select _select, ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    if (this->select(_select))
-    {
-        if (_select == selectComponent)
-        {
-            m_xHandler->startComponent(m_sComponent);
-        }
-    }
-    else
-        startSkipping(aInfo.name,xAttribs);
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::endSection( )
-{
-    if (m_selected == selectComponent)
-    {
-        m_xHandler->endComponent();
-    }
-    m_selected = selectNone;
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::handleImport( ElementInfo const & /*aInfo*/, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    rtl::OUString aComponent;
-    if (getDataParser().getImportComponent(xAttribs,aComponent))
-        m_xHandler->importComponent(aComponent);
-
-    else
-        raiseParseException("Schema XML parser - Invalid data: Missing component attribute for import directive.\n");
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::handleInstance( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    backenduno::TemplateIdentifier aTemplate;
-    if (getDataParser().getInstanceType(xAttribs, aTemplate.Name, aTemplate.Component))
-        m_xHandler->addInstance(aInfo.name, aTemplate);
-
-    else
-        raiseParseException("Schema XML parser - Invalid data: Missing type information for instantiation directive.\n");
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::handleItemType( ElementInfo const & /*aInfo*/, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    backenduno::TemplateIdentifier aTemplate;
-    if (getDataParser().getInstanceType(xAttribs, aTemplate.Name, aTemplate.Component))
-        m_xHandler->addItemType(aTemplate);
-
-    else
-        raiseParseException("Schema XML parser - Invalid data: Missing type information for instantiation directive.\n");
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::startNode( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    bool bStartTemplate = ( !isInNode() && m_selected == selectTemplates );
-
-    BasicParser::startNode(aInfo,xAttribs);
-
-    OSL_ASSERT(aInfo.type == ElementType::set || aInfo.type == ElementType::group);
-
-    if (aInfo.type == ElementType::group)
-    {
-        if (bStartTemplate)
-            m_xHandler->startGroupTemplate( backenduno::TemplateIdentifier(aInfo.name,m_sComponent), aInfo.flags );
-
-        else
-            m_xHandler->startGroup( aInfo.name, aInfo.flags );
-    }
-    else
-    {
-        backenduno::TemplateIdentifier aItemType;
-
-        if (!getDataParser().getSetElementType(xAttribs, aItemType.Name, aItemType.Component))
-            raiseParseException("Schema XML parser - Invalid data: Missing item-type information for set node.\n");
-
-        if (bStartTemplate)
-            m_xHandler->startSetTemplate( backenduno::TemplateIdentifier(aInfo.name,m_sComponent), aInfo.flags, aItemType );
-
-        else
-            m_xHandler->startSet( aInfo.name, aInfo.flags, aItemType );
-    }
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::endNode()
-{
-    BasicParser::endNode();
-
-    bool bEndedTemplate = ( !isInNode() && m_selected == selectTemplates );
-
-    if (bEndedTemplate)
-        m_xHandler->endTemplate();
-
-    else
-        m_xHandler->endNode();
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::startProperty( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs )
-{
-    BasicParser::startProperty(aInfo,xAttribs);
-
-    OSL_ENSURE( isInUnhandledProperty(), "Property not recognizable as unhandled");
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::endProperty()
-{
-    if (isInUnhandledProperty())
-    {
-        ElementInfo const & aInfo = this->getActiveNodeInfo(); 
-
-        m_xHandler->addProperty(aInfo.name,
-                                aInfo.flags,
-                                getActivePropertyType());
-    }
-
-    BasicParser::endProperty();
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::startValueData(const uno::Reference< sax::XAttributeList >& xAttribs)
-{
-    OSL_ENSURE( this->isInUnhandledProperty(),"Schema XML parser - multiple values in property are not permitted in the schema.\n");
-
-    BasicParser::startValueData(xAttribs);
-
-    if (this->isValueDataLocalized())
-        getLogger().warning("Language attributes on values are ignored in the schema.",
-                            "endValueData()","configuration::xml::SchemaParser");
-}
-// -----------------------------------------------------------------------------
-
-void SchemaParser::endValueData()
-{
-    uno::Any aValue = this->getCurrentValue();
-
-    ElementInfo const & aInfo = this->getActiveNodeInfo(); 
-
-    if (aValue.hasValue())
-    {
-        m_xHandler->addPropertyWithDefault(aInfo.name,aInfo.flags,aValue);
-    }        
-    else
-    {
-        getLogger().warning("Found deprecated explicit NIL value in schema data.",
-                            "endValueData()","configuration::xml::SchemaParser");
-        m_xHandler->addProperty(aInfo.name,aInfo.flags,getActivePropertyType());
-    }
-
-    BasicParser::endValueData();
-
-    OSL_ENSURE( !isInUnhandledProperty(), "Property not recognizable as handled");
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/xml/schemaparser.hxx b/configmgr/source/xml/schemaparser.hxx
deleted file mode 100644
index 0c6e1ec999..0000000000
--- a/configmgr/source/xml/schemaparser.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: schemaparser.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 CONFIGMGR_XML_SCHEMAPARSER_HXX
-#define CONFIGMGR_XML_SCHEMAPARSER_HXX
-
-#include "basicparser.hxx"
-
-#include <com/sun/star/configuration/backend/XSchemaHandler.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno       = ::com::sun::star::uno;
-        namespace lang      = ::com::sun::star::lang;
-
-        namespace sax           = ::com::sun::star::xml::sax;
-        namespace backenduno    = ::com::sun::star::configuration::backend;
-
-// -----------------------------------------------------------------------------
-
-
-        class SchemaParser :	public BasicParser
-        {
-        public:
-            enum Select { 
-                selectNone = 0, 
-                selectComponent = 0x01, 
-                selectTemplates = 0x02,
-                selectAll = 0x03
-            };
-
-        public:
-            SchemaParser(uno::Reference< uno::XComponentContext > const & _xContext, uno::Reference< backenduno::XSchemaHandler > const & _xHandler, Select _selector);
-            virtual ~SchemaParser();
-
-        // XDocumentHandler
-        public:
-            virtual void SAL_CALL 
-                startDocument(  ) 
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endDocument(  ) throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                startElement( const rtl::OUString& aName, const uno::Reference< sax::XAttributeList >& xAttribs )
-                    throw (sax::SAXException, uno::RuntimeException);
-
-            virtual void SAL_CALL 
-                endElement( const rtl::OUString& aName ) 
-                    throw (sax::SAXException, uno::RuntimeException);
-
-        private:
-            /// start the schema
-            void startSchema( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-           /// end the schema
-            void endSchema();
-
-            /// start a section (components or templates)
-            void startSection( Select _select, ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-           /// end the current section
-            void endSection();
-
-            /// handle a import directive element
-            void handleImport( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-
-            /// start an node
-            void startNode( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-           /// end a node
-            void endNode();
-
-            /// start a property
-            void startProperty( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-            /// end a property 
-            void endProperty();
-
-            /// start collecting data for a value - returns the locale of the value (property must have been started)
-            void startValueData(const uno::Reference< sax::XAttributeList >& xAttribs);
-            /// end collecting data for a value - returns the collected value
-            void endValueData();
-
-            /// handle a instance ref element
-            void handleInstance( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-            /// handle a item-type declaration element
-            void handleItemType( ElementInfo const & aInfo, const uno::Reference< sax::XAttributeList >& xAttribs );
-
-            bool isSelected()   const { return m_selected != selectNone; }
-            bool select(Select _select);
-        private:
-            uno::Reference< backenduno::XSchemaHandler >  m_xHandler; 
-            rtl::OUString    m_sComponent;
-            Select      m_selector;
-            Select      m_selected;
-        };
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/xml/simpletypehelper.cxx b/configmgr/source/xml/simpletypehelper.cxx
deleted file mode 100644
index d106cae453..0000000000
--- a/configmgr/source/xml/simpletypehelper.cxx
+++ /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: simpletypehelper.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_configmgr.hxx"
-
-#include "simpletypehelper.hxx"
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Any.hxx>
-
-namespace configmgr
-{
-    namespace uno = com::sun::star::uno;
-    namespace SimpleTypeHelper
-    {
-        
-        uno::Type getBooleanType() { return ::getBooleanCppuType(); }
-        
-        uno::Type getShortType()		{ return ::getCppuType(static_cast<sal_Int16 const*>(0)); }
-        uno::Type getIntType()		{ return ::getCppuType(static_cast<sal_Int32 const*>(0)); }
-        uno::Type getLongType()		{ return ::getCppuType(static_cast<sal_Int64 const*>(0)); }
-        
-        uno::Type getDoubleType()	{ return ::getCppuType(static_cast<double const*>(0)); }
-        
-        uno::Type getStringType()	{ return ::getCppuType(static_cast<rtl::OUString const*>(0)); }
-        
-        uno::Type getBinaryType()	{ return ::getCppuType(static_cast<uno::Sequence<sal_Int8> const*>(0)); }
-        uno::Type getAnyType()		{ return ::getCppuType(static_cast<uno::Any const*>(0)); }
-    }
-}
diff --git a/configmgr/source/xml/typeconverter.cxx b/configmgr/source/xml/typeconverter.cxx
deleted file mode 100644
index a422073a0d..0000000000
--- a/configmgr/source/xml/typeconverter.cxx
+++ /dev/null
@@ -1,354 +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: typeconverter.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-#include "typeconverter.hxx"
-#include "utility.hxx"
-#include "simpletypehelper.hxx"
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/script/FailReason.hpp>
-#include <com/sun/star/uno/Type.hxx>
-#include <strdecl.hxx>
-#include <typelib/typedescription.hxx>
-
-
-#include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
-
-namespace uno = ::com::sun::star::uno;
-namespace script = ::com::sun::star::script;
-namespace lang = ::com::sun::star::lang;
-    
-namespace configmgr
-{
-    
-//--------------------------------------------------------------------------------------------------
-    rtl::OUString toString(const uno::Reference< script::XTypeConverter >& xTypeConverter, const uno::Any& rValue) 
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-    {
-        rtl::OUString aRes;
-        uno::TypeClass aDestinationClass = rValue.getValueType().getTypeClass();	
-
-        switch (aDestinationClass)
-        {
-        case uno::TypeClass_BOOLEAN:		
-        case uno::TypeClass_CHAR:			
-        case uno::TypeClass_BYTE:			
-        case uno::TypeClass_SHORT:			
-        case uno::TypeClass_LONG:			
-        case uno::TypeClass_HYPER:			
-        case uno::TypeClass_FLOAT:			
-        case uno::TypeClass_DOUBLE:
-            if (!xTypeConverter.is())
-            {
-                throw script::CannotConvertException( 
-                                ::rtl::OUString::createFromAscii("Missing Converter Service!"), 
-                                uno::Reference< uno::XInterface > (),
-                                aDestinationClass, 
-                                script::FailReason::UNKNOWN, 0 
-                            );
-            }
-            xTypeConverter->convertToSimpleType(rValue, uno::TypeClass_STRING) >>= aRes;
-            break;	
-            
-        case ::uno::TypeClass_STRING:
-            rValue >>= aRes;			
-            break;	
-            
-        default:					   
-            throw script::CannotConvertException(
-                                ::rtl::OUString::createFromAscii("Unsupported type: ") + rValue.getValueType().getTypeName(),
-                                uno::Reference< uno::XInterface > (),
-                                aDestinationClass,
-                                script::FailReason::TYPE_NOT_SUPPORTED, 0
-                            );
-
-        }
-        return aRes;
-    }
-
-    uno::Any toAny(const uno::Reference< script::XTypeConverter >& xTypeConverter, const ::rtl::OUString& _rValue,const uno::TypeClass& _rTypeClass) 
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-    {
-        uno::Any aRes;
-
-        if (uno::TypeClass_STRING == _rTypeClass)
-        {
-            aRes <<= _rValue;
-        }
-        else if (!xTypeConverter.is())
-        {
-            throw script::CannotConvertException( 
-                            ::rtl::OUString::createFromAscii("Missing Converter Service!"), 
-                            uno::Reference< uno::XInterface > (),
-                            _rTypeClass, 
-                            script::FailReason::UNKNOWN, 0 
-                        );
-        }
-        else try
-        {
-            aRes = xTypeConverter->convertToSimpleType(uno::makeAny(_rValue), _rTypeClass);
-        }
-        catch (script::CannotConvertException& )
-        {
-            // ok, next try with trim()
-            ::rtl::OUString const sTrimmed = _rValue.trim();
-            if (sTrimmed.getLength() != 0)
-            {
-                try
-                {
-                    aRes = xTypeConverter->convertToSimpleType(uno::makeAny(sTrimmed), _rTypeClass);
-
-                    OSL_ENSURE(aRes.hasValue(),"Converted non-empty string to NULL\n");
-                }
-                catch (script::CannotConvertException&)
-                {
-                    OSL_ASSERT(!aRes.hasValue());
-                }
-                catch (uno::Exception&)
-                {
-                    OSL_ENSURE(false,"Unexpected exception from XTypeConverter::convertToSimpleType()\n");
-                    OSL_ASSERT(!aRes.hasValue());
-                }
-
-                if (!aRes.hasValue()) throw;
-            }
-        }
-        catch (lang::IllegalArgumentException& iae)
-        {
-            OSL_ENSURE(sal_False, "Illegal argument for typeconverter. Maybe invalid typeclass ?");
-            throw script::CannotConvertException( 
-                            ::rtl::OUString::createFromAscii("Invalid Converter Argument:") + iae.Message, 
-                            uno::Reference< uno::XInterface > (),
-                            _rTypeClass, 
-                            script::FailReason::UNKNOWN, 0 
-                        );
-        }
-        catch (uno::Exception& e)
-        {
-            OSL_ENSURE(false,"Unexpected exception from XTypeConverter::convertToSimpleType()\n");
-            throw script::CannotConvertException( 
-                            ::rtl::OUString::createFromAscii("Unexpected TypeConverter Failure:") + e.Message, 
-                            uno::Reference< uno::XInterface > (),
-                            _rTypeClass, 
-                            script::FailReason::UNKNOWN, 0 
-                        );
-        }
-        return aRes;
-    }
-
-    ::rtl::OUString toTypeName(const uno::TypeClass& _rTypeClass)
-    {
-        ::rtl::OUString aRet;
-        switch(_rTypeClass)
-        {
-        case uno::TypeClass_BOOLEAN:  aRet = TYPE_BOOLEAN; break;
-        case uno::TypeClass_SHORT:    aRet = TYPE_SHORT; break;
-        case uno::TypeClass_LONG:     aRet = TYPE_INT; break;
-        case uno::TypeClass_HYPER:    aRet = TYPE_LONG; break;
-        case uno::TypeClass_DOUBLE:   aRet = TYPE_DOUBLE; break;
-        case uno::TypeClass_STRING:   aRet = TYPE_STRING; break;
-        case uno::TypeClass_SEQUENCE: aRet = TYPE_BINARY; break;
-        case uno::TypeClass_ANY: aRet = TYPE_ANY; break;
-        default:
-        {
-            ::rtl::OString aStr("Wrong typeclass! ");
-            aStr += ::rtl::OString::valueOf((sal_Int32)_rTypeClass);
-            OSL_ENSURE(0,aStr.getStr());
-        }
-        }
-        return aRet;
-    }
-
-// *************************************************************************
-    uno::Type toType(const ::rtl::OUString& _rType)
-    {
-        uno::Type aRet;
-
-        if     (_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("boolean")))  aRet = SimpleTypeHelper::getBooleanType();
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("short")))	   aRet = SimpleTypeHelper::getShortType();
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("int")))	   aRet = SimpleTypeHelper::getIntType();
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("integer")))  aRet = SimpleTypeHelper::getIntType();
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("long")))	   aRet = SimpleTypeHelper::getLongType();
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("double")))   aRet = SimpleTypeHelper::getDoubleType();
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("string")))   aRet = SimpleTypeHelper::getStringType();
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("binary")))   aRet = SimpleTypeHelper::getBinaryType();
-//	else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("sequence"))) aRet = uno::TypeClass_SEQUENCE;
-
-        else if(_rType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("any")))   aRet = SimpleTypeHelper::getAnyType();
-        else
-        {
-            ::rtl::OString aStr("Unknown type! ");
-            aStr += rtl::OUStringToOString(_rType,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSURE(0,aStr.getStr());
-        }
-
-        return aRet;
-    }
-    uno::Type toListType(const ::rtl::OUString& _rsElementType)
-    {
-        uno::Type aRet;
-
-        if     (_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("boolean")))  
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Bool> const*>(0));
-
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("short")))	   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int16> const*>(0));
-
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("int")))	   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int32> const*>(0));
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("integer")))  
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int32> const*>(0));
-
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("long")))	   
-            aRet = ::getCppuType(static_cast<uno::Sequence<sal_Int64> const*>(0));
-
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("double")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<double> const*>(0));
-
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("string")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<rtl::OUString> const*>(0));
-
-        else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("binary")))   
-            aRet = ::getCppuType(static_cast<uno::Sequence<uno::Sequence<sal_Int8> > const*>(0));
-
-//	else if(_rsElementType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("sequence"))) aRet = uno::TypeClass_SEQUENCE;
-        else
-        {
-            ::rtl::OString aStr("Unknown type! ");
-            aStr += rtl::OUStringToOString(_rsElementType,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSURE(0,aStr.getStr());
-        }
-
-        return aRet;
-    }
-
-    uno::Type getSequenceElementType(uno::Type const& rSequenceType)
-    {
-        OSL_ENSURE(rSequenceType.getTypeClass() == uno::TypeClass_SEQUENCE, 
-                    "getSequenceElementType() must be called with a  sequence type");
-
-        if (!(rSequenceType.getTypeClass() == uno::TypeClass_SEQUENCE))
-            return uno::Type();
-
-        uno::TypeDescription aTD(rSequenceType);
-        typelib_IndirectTypeDescription* pSequenceTD = 
-            reinterpret_cast< typelib_IndirectTypeDescription* >(aTD.get());
-
-        OSL_ASSERT(pSequenceTD);
-        OSL_ASSERT(pSequenceTD->pType);
-
-        if ( pSequenceTD && pSequenceTD->pType )
-        {
-            return uno::Type(pSequenceTD->pType);
-        } //if
-        
-        return uno::Type();
-    }
-    uno::Type getBasicType(uno::Type const& rType, bool& bSequence)
-    {
-        bSequence = rType.getTypeClass() == uno::TypeClass_SEQUENCE &&
-                    rType != SimpleTypeHelper::getBinaryType();
-
-        if (!bSequence)
-            return rType;
-
-        return getSequenceElementType(rType);
-    }
-
-
-    // template names
-// *************************************************************************
-    ::rtl::OUString toTemplateName(const uno::Type& _rType)
-    {
-        bool bList;
-        uno::Type aBaseType = getBasicType(_rType,bList);
-        return toTemplateName(aBaseType.getTypeClass(), bList);
-    }
-
-    ::rtl::OUString toTemplateName(const uno::TypeClass& _rBasicType, bool bList)
-    {
-        return  toTemplateName(toTypeName(_rBasicType), bList);
-    }
-
-// *************************************************************************
-    uno::Type parseTemplateName(::rtl::OUString const& sTypeName)
-    {
-        uno::Type aRet;
-
-        ::rtl::OUString sBasicTypeName;
-        bool bList;
-        if (parseTemplateName(sTypeName, sBasicTypeName,bList))
-            aRet = toType(sBasicTypeName,bList);
-        // else leave as void
-
-        return aRet;
-    }
-
-// *************************************************************************
-    ::rtl::OUString toTemplateName(const ::rtl::OUString& _rBasicTypeName, bool bList)
-    {
-        ::rtl::OUString sName = TEMPLATE_MODULE_NATIVE_PREFIX + _rBasicTypeName;
-        if (bList)
-            sName += TEMPLATE_LIST_SUFFIX;
-
-
-        return sName;
-    }
-
-    bool parseTemplateName(::rtl::OUString const& sTypeName, ::rtl::OUString& _rBasicName, bool& bList)
-    {
-        ::rtl::OUString const sSuffix( TEMPLATE_LIST_SUFFIX );
-
-        sal_Int32 nIndex = sTypeName.lastIndexOf(sSuffix);
-        if (nIndex >= 0 && nIndex + sSuffix.getLength() == sTypeName.getLength())
-        {
-            bList = true;
-            _rBasicName = sTypeName.copy(0,nIndex);
-        }
-        else
-        {
-            bList = false;
-            _rBasicName = sTypeName;
-        }
-        // erase the default prefix 'cfg:'
-        if (_rBasicName.indexOf(TEMPLATE_MODULE_NATIVE_PREFIX) == 0)
-            _rBasicName = _rBasicName.copy(TEMPLATE_MODULE_NATIVE_PREFIX.m_nLen);
-
-        return true;
-
-    }
-// *************************************************************************
-
-} // namespace configmgr
diff --git a/configmgr/source/xml/valueconverter.cxx b/configmgr/source/xml/valueconverter.cxx
deleted file mode 100644
index 7143dd6260..0000000000
--- a/configmgr/source/xml/valueconverter.cxx
+++ /dev/null
@@ -1,504 +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: valueconverter.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_configmgr.hxx"
-
-#include "valuetypeconverter.hxx"
-#include "typeconverter.hxx"
-
-inline sal_Bool rtl_ascii_isWhitespace( sal_Unicode ch )
-{
-    return ch <= 0x20 && ch;
-}
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-static
-void throwConversionError(sal_Char const* pErrorMsg) SAL_THROW((script::CannotConvertException))
-{
-    OSL_ENSURE(false, pErrorMsg);	
-
-    script::CannotConvertException error;
-    error.Message = rtl::OUString::createFromAscii(pErrorMsg);
-    throw error;
-}
-// -----------------------------------------------------------------------------
-template <class Char>
-inline
-bool charInRange(Char ch, char from, char to) throw()
-{
-    return Char(from) <= ch && ch <= Char(to);
-}
-
-// -----------------------------------------------------------------------------
-static
-inline
-unsigned makeHexNibble(unsigned char ch) SAL_THROW((script::CannotConvertException))
-{
-    unsigned nRet = 0;
-
-         if (charInRange(ch, '0', '9')) nRet = ch - unsigned('0');
-
-    else if (charInRange(ch, 'a', 'f')) nRet = ch - unsigned('a' - 10u);
-
-    else if (charInRange(ch, 'A', 'F')) nRet = ch - unsigned('A' - 10u);
-    
-    else throwConversionError("Invalid Hex Character in binary value");
-
-    return nRet; 
-}
-
-// -----------------------------------------------------------------------------
-static
-inline
-unsigned readHexNibble(sal_Unicode ch) SAL_THROW((script::CannotConvertException))
-{
-    if (!charInRange(ch, 0, 127)) throwConversionError("Non-Ascii Character in binary value");
-
-    return makeHexNibble(static_cast<unsigned char>(ch));
-}
-
-// -----------------------------------------------------------------------------
-static
-inline
-unsigned int readHexByte(sal_Unicode const*& pStr) SAL_THROW((script::CannotConvertException))
-{
-    register unsigned int nHigh = readHexNibble(*pStr++);
-    register unsigned int nLow =  readHexNibble(*pStr++);
-    return (nHigh << 4) | nLow;
-}
-
-// -----------------------------------------------------------------------------
-static 
-void parseHexBinary(rtl::OUString const& aHexString_, uno::Sequence<sal_Int8>& rBinarySeq_)
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException)) 
-{
-    // PRE: aBinaryString with HexCode
-    // POST: rBinarySeq with the to Hex converted String
-
-    sal_uInt32 nCount = aHexString_.getLength();
-    sal_Unicode const * pHex = aHexString_.getStr(); 
-
-    if (nCount % 2) throwConversionError("Hex string has odd number of characters");
-    nCount /= 2;
-
-    rBinarySeq_.realloc(nCount);
-    sal_Int8 * pBinary = rBinarySeq_.getArray(); 
-
-    while (nCount--)
-    {
-            *pBinary++ = static_cast<sal_Int8>(readHexByte(pHex));
-    }
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-uno::Sequence<sal_Int8> ValueConverter::parseBinary(rtl::OUString const& aBinaryString_) const
-        SAL_THROW((script::CannotConvertException, com::sun::star::uno::RuntimeException))
-{
-    uno::Sequence<sal_Int8> aResultSeq;
-
-    parseHexBinary(aBinaryString_,aResultSeq);
-
-    return aResultSeq;
-}
-
-// -----------------------------------------------------------------------------
-static inline
-uno::Type getBinaryType() 
-{
-    uno::Sequence<sal_Int8> const * const for_binary = 0;
-    return ::getCppuType(for_binary);
-}
-
-// -----------------------------------------------------------------------------
-bool ValueConverter::isList() const
-{
-    return  m_aType.getTypeClass() == uno::TypeClass_SEQUENCE &&
-            m_aType != getBinaryType();
-}
-
-// -----------------------------------------------------------------------------
-uno::Any ValueConverter::convertToAny(rtl::OUString const& aContent) const
-        SAL_THROW((script::CannotConvertException, com::sun::star::uno::RuntimeException))
-{
-    uno::Any aValue;
-
-    if (this->isNull())
-    {
-        OSL_ENSURE(aContent.trim().getLength() == 0, "ValueConverter: Non-empty Null Value - ignoring content");
-        OSL_ASSERT(!aValue.hasValue());
-    }
-
-    else if (this->isList())
-    {
-        std::vector< rtl::OUString > aContentList;
-        splitListData(aContent, aContentList);
-        convertListToAny(aContentList, aValue);
-    }
-
-    else
-    {
-        convertScalarToAny(aContent, aValue);
-    }
-
-    return aValue;
-}
-
-// -----------------------------------------------------------------------------
-bool ValueConverter::convertScalarToAny(rtl::OUString const& aContent, uno::Any& rValue) const
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(!this->isNull(),"ValueConverter::convertScalarToAny - check for NULL before calling");
-    OSL_ENSURE(m_aType.getTypeClass() != uno::TypeClass_ANY,"'Any' values must be NULL");
-
-    // check for Binary
-    if (m_aType == getBinaryType())
-    {
-        com::sun::star::uno::Sequence<sal_Int8> aBinarySeq = parseBinary(aContent);
-        rValue <<= aBinarySeq;
-    }
-
-    else 
-    {
-        rValue = toAny(m_xTypeConverter, aContent, m_aType.getTypeClass());
-    }
-
-    return !! rValue.hasValue();
-}
-
-// -----------------------------------------------------------------------------
-template <class T>
-bool convertListToSequence(std::vector< rtl::OUString > const& aStringList, uno::Sequence< T >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& rConverter)
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-{
-    OSL_ASSERT(aElementTypeClass == ::getCppuType(static_cast<T const*>(0)).getTypeClass());
-
-    rSequence.realloc(aStringList.size()); 
-
-    sal_uInt32 nPos = 0;
-
-    for(std::vector< rtl::OUString >::const_iterator it = aStringList.begin();
-        it != aStringList.end();
-        ++it)
-    {
-        uno::Any aValueAny = toAny(rConverter.getTypeConverter(), *it, aElementTypeClass);
-
-        if (aValueAny >>= rSequence[nPos])
-            ++nPos;
-
-        else if (!aValueAny.hasValue())
-            OSL_ENSURE(false,"UNEXPECTED: Found NULL value in List - ignoring value !");
-
-        else 
-            OSL_ENSURE(false,"ERROR: Cannot extract converted value into List - skipping value !");
-    } 
-
-    bool bOK = (nPos == aStringList.size());
-    
-    if (!bOK)
-    {
-        OSL_ASSERT(nPos < aStringList.size());
-        rSequence.realloc(nPos); 
-    }
-    return bOK;
-}
-
-// -----------------------------------------------------------------------------
-// special conversion for string sequence
-
-static
-inline
-void stringListToSequence(uno::Sequence< rtl::OUString > & rSequence, std::vector< rtl::OUString > const & aStringList)
-{
-    rSequence .realloc( aStringList.size() ); 
-
-    std::copy( aStringList.begin(), aStringList.end(), rSequence.getArray() );
-}
-// -----------------------------------------------------------------------------
-
-static
-inline
-std::vector< rtl::OUString > sequenceToStringList(uno::Sequence< rtl::OUString > const & aSequence)
-{
-    rtl::OUString const * const pBegin = aSequence.getConstArray();
-    rtl::OUString const * const pEnd = pBegin + aSequence.getLength();
-
-    return std::vector< rtl::OUString >(pBegin,pEnd);
-}
-// -----------------------------------------------------------------------------
-
-uno::Sequence< rtl::OUString > ValueConverter::splitStringList(rtl::OUString const& aContent) const
-{
-    std::vector< rtl::OUString > aList;
-    splitListData(aContent, aList);
-
-    uno::Sequence< rtl::OUString > aResult;
-    stringListToSequence(aResult,aList);
-
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-uno::Any ValueConverter::convertListToAny(uno::Sequence< rtl::OUString > const& aContentList) const
-    SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-{
-    uno::Any aResult;
-    std::vector< rtl::OUString > const aStringList = sequenceToStringList(aContentList);
-    convertListToAny(aStringList,aResult);
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-// special overload for binary sequence
-
-// template<> // use an explicit specialization
-bool convertListToSequence(std::vector< rtl::OUString > const& aStringList, uno::Sequence< uno::Sequence<sal_Int8> >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& rParser )
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-{
-    { (void)aElementTypeClass; }
-    OSL_ASSERT(aElementTypeClass == uno::TypeClass_SEQUENCE);
-
-    rSequence.realloc(aStringList.size()); 
-
-    sal_uInt32 nPos = 0;
-
-    for(std::vector< rtl::OUString >::const_iterator it = aStringList.begin();
-        it != aStringList.end();
-        ++it)
-    {
-        rSequence[nPos++] = rParser.parseBinary(*it);
-    } 
-    return true;
-}
-
-// -----------------------------------------------------------------------------
-// special overload for string sequence
-
-// template<> // use an explicit specialization
-bool convertListToSequence(std::vector< rtl::OUString > const& aStringList, uno::Sequence< rtl::OUString >& rSequence, uno::TypeClass aElementTypeClass, ValueConverter const& /*rParser*/ )
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-{
-    { (void)aElementTypeClass; }
-    OSL_ASSERT(aElementTypeClass == uno::TypeClass_STRING);
-
-    stringListToSequence(rSequence, aStringList); 
-
-    return true;
-}
-
-// -----------------------------------------------------------------------------
-
-#define MAYBE_EXTRACT_SEQUENCE( type ) \
-    if (aElementType == ::getCppuType( (type const *)0))    \
-    {                                                       \
-        com::sun::star::uno::Sequence< type > aSequence;                         \
-        convertListToSequence(aContentList,aSequence,aElementTypeClass, *this); \
-        rValue <<= aSequence;                               \
-    }
-
-bool ValueConverter::convertListToAny(std::vector< rtl::OUString > const& aContentList, uno::Any& rValue) const
-        SAL_THROW((script::CannotConvertException , com::sun::star::uno::RuntimeException))
-{
-    OSL_PRECOND(!this->isNull(),"ValueConverter::convertListToAny - check for NULL before calling");
-    OSL_ENSURE(m_aType.getTypeClass() == uno::TypeClass_SEQUENCE,"'Any' not allowed for lists");
-
-    uno::Type       aElementType        = getSequenceElementType(m_aType);
-    uno::TypeClass  aElementTypeClass   = aElementType.getTypeClass();
-
-    OSL_ENSURE(aElementTypeClass != uno::TypeClass_ANY,"'Any' not allowed for list elements");
-
-    MAYBE_EXTRACT_SEQUENCE( rtl::OUString )
-    else
-    MAYBE_EXTRACT_SEQUENCE( sal_Bool )
-    else
-    MAYBE_EXTRACT_SEQUENCE( sal_Int16 )
-    else
-    MAYBE_EXTRACT_SEQUENCE( sal_Int32 )
-    else
-    MAYBE_EXTRACT_SEQUENCE( sal_Int64 )
-    else
-    MAYBE_EXTRACT_SEQUENCE( double )
-    else
-    MAYBE_EXTRACT_SEQUENCE( com::sun::star::uno::Sequence<sal_Int8> )
-    else
-    {
-        OSL_ENSURE(false, "Unknown element type in list");
-        throwConversionError("Invalid value-type found in list value");
-    }
-
-    return !! rValue.hasValue();
-}
-#undef MAYBE_EXTRACT_SEQUENCE
-    
-// -----------------------------------------------------------------------------
-namespace 
-{
-    sal_Int32 const NO_MORE_TOKENS = -1;
-    struct OTokenizeByWhitespace
-    {
-
-        static inline bool isWhitespace(sal_Unicode ch)
-        {
-            // note: for definition of whitescape see also
-            //   canUseWhitespace(rtl::OUString const&)
-            // in xmlformater.cxx
-            // -----------------------------------------------------------------------------
-            return rtl_ascii_isWhitespace(ch) ? true : false;
-        }
-
-        sal_Int32 findFirstTokenStart(rtl::OUString const& sText) const SAL_THROW(())
-        {
-            return findNextTokenStart(sText,0);
-        }
-
-        sal_Int32 findNextTokenStart(rtl::OUString const& sText, sal_Int32 nPrevTokenEnd) const  SAL_THROW(())
-        {
-            sal_Int32 const nEnd = sText.getLength();
-            sal_Int32 nPos = nPrevTokenEnd;
-
-            OSL_PRECOND( nPos == 0 || (0 < nPos && nPos < nEnd && isWhitespace(sText[nPos])) || nPos == nEnd,
-                         "Invalid nPrevTokenEnd");
-
-            while (nPos < nEnd && isWhitespace(sText[nPos]))
-            {
-                ++nPos;
-            }
-
-            if (nPos < nEnd)
-                return nPos;
-            else
-                return NO_MORE_TOKENS;
-        }
-
-        sal_Int32 findTokenEnd(rtl::OUString const& sText, sal_Int32 nTokenStart) const SAL_THROW(())
-        {
-            sal_Int32 const nEnd = sText.getLength();
-            sal_Int32 nPos = nTokenStart;
-
-            OSL_PRECOND( 0 <= nPos && nPos < nEnd && !isWhitespace(sText[nPos]),
-                         "Invalid nTokenStart");
-
-            while (nPos < nEnd && !isWhitespace(sText[nPos]))
-            {
-                ++nPos;
-            }
-
-            return nPos;
-        }
-    };
-// -----------------------------------------------------------------------------
-    struct OTokenizeBySeparator
-    {
-        rtl::OUString const sSeparator;
-        OTokenizeBySeparator(rtl::OUString const& _sSeparator) SAL_THROW(())
-            : sSeparator(_sSeparator)
-        {
-            OSL_PRECOND(sSeparator.trim().getLength() > 0, "Invalid empty separator string");
-        }
-
-            sal_Int32 findFirstTokenStart(rtl::OUString const& /*sText*/) const SAL_THROW(())
-        {
-            return 0;
-        }
-        sal_Int32 findNextTokenStart(rtl::OUString const& sText, sal_Int32 nPrevTokenEnd) const SAL_THROW(())
-        {
-            sal_Int32 const nEnd = sText.getLength();
-            sal_Int32 nPos = nPrevTokenEnd;
-            OSL_PRECOND( nPos == nEnd || (0 <= nPos && nPos < nEnd && sText.indexOf(sSeparator, nPos) == nPos),
-                         "Invalid nPrevTokenEnd");
-
-            if (nPos < nEnd)
-                return nPos + sSeparator.getLength();
-            else
-                return NO_MORE_TOKENS;
-        }
-        sal_Int32 findTokenEnd(rtl::OUString const& sText, sal_Int32 nTokenStart) const SAL_THROW(())
-        {
-            sal_Int32 const nEnd = sText.getLength();
-            OSL_PRECOND( 0 <= nTokenStart && nTokenStart <= nEnd ,
-                         "Invalid nTokenStart");
-
-            sal_Int32 nPos = sText.indexOf(sSeparator,nTokenStart);
-
-            if (nPos >= 0)
-                return nPos;
-            else
-                return nEnd;
-        }
-    };
-// -----------------------------------------------------------------------------
-    template <class Tokenizer>
-    void tokenizeListData(Tokenizer const& aTokenizer, rtl::OUString const& aContent, std::vector< rtl::OUString >& rContentList)
-            SAL_THROW(())
-    {
-        sal_Int32 nTokenPos = aTokenizer.findFirstTokenStart(aContent);
-
-        while(nTokenPos != NO_MORE_TOKENS)
-        {
-            sal_Int32 nTokenEnd = aTokenizer.findTokenEnd(aContent, nTokenPos);
-            
-            // this is what the tokenizer must provide
-            OSL_ASSERT(0 <= nTokenPos && nTokenPos <= nTokenEnd && nTokenEnd <= aContent.getLength());
-
-            rContentList.push_back( aContent.copy(nTokenPos, nTokenEnd-nTokenPos) );
-
-            nTokenPos= aTokenizer.findNextTokenStart(aContent, nTokenEnd);
-        }
-    }
-// -----------------------------------------------------------------------------
-}
-// -----------------------------------------------------------------------------
-void ValueConverter::splitListData(rtl::OUString const& aContent, std::vector< rtl::OUString >& rContentList) const
-    SAL_THROW(())
-{
-    rtl::OUString sSeparator = m_sSeparator;
-
-    bool bSeparateByWhitespace = (sSeparator.trim().getLength() == 0);
-
-    if (bSeparateByWhitespace)
-    {
-        OSL_ENSURE( sSeparator.getLength()==0 || sSeparator.equalsAscii(" "),
-                    "Unexpected whitespace-only separator");
-
-        tokenizeListData( OTokenizeByWhitespace(), aContent, rContentList );
-    }
-    else
-    {
-        OSL_ENSURE( sSeparator.trim()==sSeparator,
-                    "Unexpected whitespace in separator");
-
-        tokenizeListData( OTokenizeBySeparator(sSeparator), aContent, rContentList );
-    }
-}
-// -----------------------------------------------------------------------------
-    
-} // namespace
diff --git a/configmgr/source/xml/valueformatter.cxx b/configmgr/source/xml/valueformatter.cxx
deleted file mode 100644
index 6ff1a3b10f..0000000000
--- a/configmgr/source/xml/valueformatter.cxx
+++ /dev/null
@@ -1,498 +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: valueformatter.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_configmgr.hxx"
-
-#include "valueformatter.hxx"
-#include "elementformatter.hxx"
-#include "xmlstrings.hxx"
-#include "typeconverter.hxx"
-#include "simpletypehelper.hxx"
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#ifndef INCLUDED_ALGORITHM
-#include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
-
-namespace configmgr
-{
-    namespace uno = com::sun::star::uno;
-
-    namespace xml
-    {
-
-//==========================================================================
-//= Helper
-//==========================================================================
-
-// -----------------------------------------------------------------------------
-namespace
-{
-// -----------------------------------------------------------------------------
-
-static 
-inline 
-bool isWhitespaceCharacter( sal_Unicode ch )
-{
-    return ch <= 0x20 && ch;
-}
-// -----------------------------------------------------------------------------
-
-static
-inline
-bool isWhitespaceString(rtl::OUString const & aStr)
-{
-    sal_Unicode const * const pBegin = aStr.getStr();
-    sal_Unicode const * const pEnd   = pBegin + aStr.getLength();
-
-    // BACK: true, if any whitespace in string or string is empty
-    if (pBegin == pEnd)
-        return true;
-
-    sal_Unicode const * const pSpace = std::find_if(pBegin,pEnd,isWhitespaceCharacter);
-
-    return pSpace != pEnd;
-}
-// -----------------------------------------------------------------------------
-
-static
-bool hasWhitespaceString( uno::Sequence< rtl::OUString > const & aSeq)
-{
-    // BACK: true, if whitespace Separator is ok, (no whitespace in Strings, no empty strings)
-    rtl::OUString const * const pBegin = aSeq.getConstArray();
-    rtl::OUString const * const pEnd   = pBegin + aSeq.getLength();
-    
-    rtl::OUString const * const pSpace = std::find_if(pBegin,pEnd,isWhitespaceString);
-
-    return pSpace != pEnd;
-}
-// -----------------------------------------------------------------------------
-
-struct HasSubString
-{
-    HasSubString(rtl::OUString const & _aSubStr)
-    : m_aSubStr(_aSubStr) 
-    {}
-
-    bool operator()(rtl::OUString const & _aStr)
-    { return _aStr.indexOf(m_aSubStr) >= 0; }
-
-    rtl::OUString const m_aSubStr;
-};
-// -----------------------------------------------------------------------------
-
-static 
-bool hasStringWithSubstring(const uno::Sequence< rtl::OUString > &aSeq, rtl::OUString const & _aSubStr)
-{
-    rtl::OUString const * const pBegin = aSeq.getConstArray();
-    rtl::OUString const * const pEnd   = pBegin + aSeq.getLength();
-    
-    rtl::OUString const * const pSpace = std::find_if(pBegin,pEnd,HasSubString(_aSubStr));
-
-    return pSpace != pEnd;
-}
-// -----------------------------------------------------------------------------
-
-
-template <class Element_>
-struct IsEmptySequence
-{
-    bool operator()(uno::Sequence<Element_> const & aSeq) const
-    {
-        return aSeq.getLength() == 0;
-    }
-};
-// -----------------------------------------------------------------------------
-
-template <class Element_>
-bool hasEmptySequence(uno::Sequence< uno::Sequence<Element_> > const & aSeqSeq)
-{
-    // BACK: true, if whitespace Separator is ok, (no whitespace in Strings, no empty strings)
-    uno::Sequence<Element_> const * const pBegin = aSeqSeq.getConstArray();
-    uno::Sequence<Element_> const * const pEnd   = pBegin + aSeqSeq.getLength();
-    
-    uno::Sequence<Element_> const * const pEmpty = std::find_if(pBegin, pEnd, IsEmptySequence<Element_>() );
-
-    return pEmpty != pEnd;
-}
-// -----------------------------------------------------------------------------
-
-inline
-bool canUseSeparator(uno::Sequence< rtl::OUString > const & aSeq, rtl::OUString const & aSeparator)
-{
-    return ! hasStringWithSubstring(aSeq,aSeparator);
-}
-// -----------------------------------------------------------------------------
-
-inline
-bool canUseWhitespaceSeparator(uno::Sequence< rtl::OUString > const & aSeq)
-{
-    return ! hasWhitespaceString(aSeq);
-}
-// -----------------------------------------------------------------------------
-
-template <class Element_>
-inline
-bool canUseWhitespaceSeparator(const uno::Sequence< uno::Sequence<Element_> > &aSeq)
-{
-    return ! hasEmptySequence(aSeq);
-}
-// -----------------------------------------------------------------------------
-
-class Separator
-{
-    rtl::OUString m_sValue;
-public:
-    // -----------------------------------------------------------------------------
-    Separator() : m_sValue() {}
-    // -----------------------------------------------------------------------------
-    bool isDefault() const { return m_sValue.getLength() == 0; }
-    // -----------------------------------------------------------------------------
-    rtl::OUString value() const { return isDefault() ? static_cast<rtl::OUString>(SEPARATOR_WHITESPACE) : m_sValue; }
-    // -----------------------------------------------------------------------------
-
-    bool check(const uno::Sequence<rtl::OUString> &aSeq) const
-    {
-        return isDefault() ? canUseWhitespaceSeparator(aSeq) : canUseSeparator(aSeq, m_sValue);
-    }
-
-    // -----------------------------------------------------------------------------
-    bool trySeparator(rtl::OUString const& sSep, const uno::Sequence<rtl::OUString> & aSeq)
-    {
-        OSL_ENSURE( ! isWhitespaceString(sSep), "There should be no spaces in non-default separators");
-        // BACK: true, if Separator is ok, not in Strings
-        if (!canUseSeparator(aSeq, sSep))
-            return false;
-        this->setSeparator(sSep);
-        return true;
-    }
-    // -----------------------------------------------------------------------------
-    void setSeparator(rtl::OUString const& sSep)
-    {
-        m_sValue = sSep;
-    }
-    // -----------------------------------------------------------------------------
-};
-// -----------------------------------------------------------------------------
-#define ASCII( STRING_LIT_ ) ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STRING_LIT_ ) ) )
-// -----------------------------------------------------------------------------
-static
-Separator createSeparator(const uno::Any& aAny)
-{
-    Separator aResult;
-
-    // create a Separator which isn't in any value
-    if (aAny.getValueTypeClass() == uno::TypeClass_SEQUENCE)
-    {
-        uno::Type aElementType = configmgr::getSequenceElementType(aAny.getValueType());
-        if (aElementType.getTypeClass() == uno::TypeClass_STRING)
-        {
-            // only in strings we need to search a separator
-            uno::Sequence<rtl::OUString> aSeq;
-
-            OSL_VERIFY (aAny >>= aSeq);
-
-            bool bValidSeparator =
-                    canUseWhitespaceSeparator(aSeq) || 
-                    aResult.trySeparator(ASCII(","), aSeq) || 
-                    aResult.trySeparator(ASCII(";"), aSeq) || 
-                    aResult.trySeparator(ASCII(":"), aSeq) || 
-                    aResult.trySeparator(ASCII("|"), aSeq) || 
-                    aResult.trySeparator(ASCII("#"), aSeq) || 
-                    aResult.trySeparator(ASCII("-#*=+#-"), aSeq);
-
-            if (!bValidSeparator) 
-            {
-                OSL_TRACE("ERROR: configuration formatter: Could not create Separator for string list");
-                OSL_ENSURE(false, "ERROR: Could not create Separator for string list");
-            }
-            else
-            {
-                // maybe the whitespace test was invalid ?
-                OSL_ENSURE(aResult.check(aSeq), "Found Separator does not pass check ?!");
-            }
-        }
-        else if (aElementType == SimpleTypeHelper::getBinaryType())
-        {
-            // only in strings we need to search a separator
-            uno::Sequence< uno::Sequence<sal_Int8> > aSeq;
-            OSL_VERIFY(aAny >>= aSeq);
-
-            if (!canUseWhitespaceSeparator(aSeq)) 
-            {
-                aResult.setSeparator( ASCII(":") );
-            }					
-        }
-    }
-    
-    // DefaultSeparator
-    return aResult;
-}
-#undef ASCII
-// -----------------------------------------------------------------------------
-static
-inline
-sal_Unicode hexNibble(sal_uInt8 _nNibble)
-{
-    OSL_ASSERT(_nNibble <= 0x0F);
-
-    const sal_uInt8 cDecOffset = sal_uInt8('0');
-    const sal_uInt8 cHexOffset = sal_uInt8('a') - 10;
-
-    return _nNibble + (_nNibble<10 ? cDecOffset : cHexOffset);
-}
-
-// -----------------------------------------------------------------------------
-static
-inline
-void appendHex(rtl::OUStringBuffer& rBuff, sal_uInt8 _nByte)
-{
-    rBuff.append( hexNibble(_nByte >> 4) );
-    rBuff.append( hexNibble(_nByte & 0x0f) );
-}
-
-// -----------------------------------------------------------------------------
-static
-rtl::OUString binaryToHex(const uno::Sequence<sal_Int8>& _aBinarySeq)
-{
-    sal_Int32 const nLength = _aBinarySeq.getLength();
-
-    rtl::OUStringBuffer sHex(2*nLength);
-
-    for (sal_Int32 nPos = 0;nPos < nLength; ++nPos) 
-    {
-        appendHex( sHex, _aBinarySeq[nPos] );
-    }
-
-    OSL_ASSERT(sHex.getLength() == 2*nLength);
-    return sHex.makeStringAndClear();;
-}
-// -----------------------------------------------------------------------------
-rtl::OUString formatSimpleValue(uno::Any const & _aValue, uno::Reference< script::XTypeConverter > const & _xTCV)
-{
-    rtl::OUString sResult;
-
-    if (_aValue.hasValue())
-    {
-        if (_aValue .getValueType() == SimpleTypeHelper::getBinaryType())
-        {
-            uno::Sequence<sal_Int8> aBinarySeq;
-
-            OSL_VERIFY(_aValue >>= aBinarySeq);
-                
-            sResult = binaryToHex(aBinarySeq);
-        }
-        else
-        {
-            // cannot have nested any
-            OSL_ASSERT(_aValue.getValueTypeClass() != uno::TypeClass_ANY);
-
-            sResult = toString(_xTCV, _aValue);
-        }
-    }		
-    return sResult;
-}
-
-// -----------------------------------------------------------------------------
-template <class Element_>
-rtl::OUString formatSequence(uno::Sequence< Element_ > const& aSequence, rtl::OUString const& sSeparator, uno::Reference< script::XTypeConverter > const & _xTCV)
-{
-    rtl::OUStringBuffer aResult;
-
-    if (sal_Int32 const nLength = aSequence.getLength())
-    {
-        Element_ const * pSeq = aSequence.getConstArray();
-
-        aResult = formatSimpleValue( uno::makeAny(pSeq[0]),_xTCV);
-
-        for(sal_Int32 i=1; i<nLength; ++i) 
-        {
-            aResult.append( sSeparator );
-            aResult.append( formatSimpleValue(uno::makeAny(pSeq[i]),_xTCV) );
-        } 
-    }
-
-    return aResult.makeStringAndClear();
-}
-// -----------------------------------------------------------------------------
-// template <> // optimized overload for String
-rtl::OUString formatSequence(uno::Sequence< rtl::OUString > const& aSequence, rtl::OUString const& sSeparator, uno::Reference< script::XTypeConverter > const & )
-{
-    rtl::OUStringBuffer aResult;
-
-    if (sal_Int32 const nLength = aSequence.getLength())
-    {
-        rtl::OUString const * pSeq = aSequence.getConstArray();
-
-        aResult = pSeq[0];
-
-        for(sal_Int32 i=1; i<nLength; ++i) 
-        {
-            aResult.append( sSeparator ).append( pSeq[i] );
-        } 
-    }
-
-    return aResult.makeStringAndClear();
-}
-
-// -----------------------------------------------------------------------------
-
-#define CASE_WRITE_SEQUENCE(TYPE_CLASS, DATA_TYPE)	\
-    case TYPE_CLASS:								\
-    {												\
-        uno::Sequence< DATA_TYPE > aData;				\
-        OSL_ENSURE( ::getCppuType(static_cast< DATA_TYPE const*>(0)).getTypeClass() == (TYPE_CLASS),    \
-                    "Usage Error for CASE_WRITE_SEQUENCE: Type extracted does not match type class");   \
-        OSL_VERIFY( _aValue >>= aData );										\
-        aResult = formatSequence(aData,sSeparator,xTCV);						\
-    }	break																	\
-
-rtl::OUString formatSequenceValue(uno::Any const& _aValue, rtl::OUString const& sSeparator, uno::Reference< script::XTypeConverter > const & xTCV)
-{
-    rtl::OUString aResult;
-
-    uno::Type aElementType = getSequenceElementType( _aValue.getValueType() );
-
-    switch(aElementType.getTypeClass())
-    {
-        CASE_WRITE_SEQUENCE( uno::TypeClass_BOOLEAN, sal_Bool );
-
-    CASE_WRITE_SEQUENCE( uno::TypeClass_SHORT, sal_Int16 );
-
-    CASE_WRITE_SEQUENCE( uno::TypeClass_LONG, sal_Int32 );
-
-    CASE_WRITE_SEQUENCE( uno::TypeClass_HYPER, sal_Int64 );
-
-    CASE_WRITE_SEQUENCE( uno::TypeClass_DOUBLE, double );
-
-    CASE_WRITE_SEQUENCE( uno::TypeClass_STRING, rtl::OUString );
-
-    CASE_WRITE_SEQUENCE( uno::TypeClass_SEQUENCE, uno::Sequence<sal_Int8> );
-
-    default: 
-        OSL_ENSURE(false, "Unexpected typeclass for sequence elements");
-        break;
-    }
-
-    return aResult;
-}
-
-#undef CASE_WRITE_SEQUENCE
-// -----------------------------------------------------------------------------
-} // anonymous namspace
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-static inline bool isListVal(uno::Any const & _aValue)
-{
-    bool bList = false;
-    if (_aValue.hasValue())
-    {
-        getBasicType(_aValue.getValueType(),bList);
-    }
-    return bList;
-}
-// -----------------------------------------------------------------------------
-void ValueFormatter::makeSeparator()
-{
-    if (isListVal(m_aValue))
-    {
-        Separator aSeparator = createSeparator(m_aValue);
-
-        m_sSeparator = aSeparator.value();
-        m_bUseSeparator = !aSeparator.isDefault();
-
-        OSL_POSTCOND( this->isList() , "ValueFormatter: Could not mark as list");
-    }
-    else
-    {
-        m_sSeparator = rtl::OUString();
-        m_bUseSeparator = false;
-
-        OSL_POSTCOND( !this->isList(), "ValueFormatter: Could not mark as non-list");
-    }
-}
-// -----------------------------------------------------------------------------
-
-rtl::OUString ValueFormatter::getContent(uno::Reference< script::XTypeConverter > const & _xTCV) const
-{
-    rtl::OUString aResult;
-    try
-    {
-        if (this->isList())
-        {		
-            aResult = formatSequenceValue(m_aValue, m_sSeparator, _xTCV);		
-        }
-        else
-        {
-            aResult = formatSimpleValue(m_aValue, _xTCV);		
-        }
-    }
-    catch (script::CannotConvertException& cce)
-    {
-        rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM("Configuration: Could not convert value to XML representation: "));
-        throw uno::RuntimeException(sMessage + cce.Message, cce.Context);
-    }
-        
-    return aResult;
-}
-// -----------------------------------------------------------------------------
-
-bool ValueFormatter::addValueAttributes(ElementFormatter & _rFormatter) const
-{
-    // do we have a NULL value	
-    if (!m_aValue.hasValue())
-    {
-        _rFormatter.addIsNull();
-        return false;
-    }
-    
-    // create a sequence separator
-    if (m_bUseSeparator)
-    {
-        OSL_ASSERT(this->isList());
-        _rFormatter.addSeparator(m_sSeparator);
-    }
-
-    return true;
-}
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-} // namespace xml
-
-// -----------------------------------------------------------------------------
-} // namespace configmgr
-
-
diff --git a/configmgr/source/xml/valueformatter.hxx b/configmgr/source/xml/valueformatter.hxx
deleted file mode 100644
index 9ca61bf815..0000000000
--- a/configmgr/source/xml/valueformatter.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: valueformatter.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 CONFIGMGR_XML_VALUEFORMATTER_HXX
-#define CONFIGMGR_XML_VALUEFORMATTER_HXX
-
-#include <com/sun/star/script/XTypeConverter.hpp>
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace script= ::com::sun::star::script;
-// -----------------------------------------------------------------------------
-        class ElementFormatter;
-// -----------------------------------------------------------------------------
-        
-        // Value to XML (String) conversions
-        class ValueFormatter
-        {
-        public:
-            explicit
-            ValueFormatter(uno::Any const & _aValue)	
-            : m_aValue(_aValue)
-            {
-                makeSeparator();
-            }
-
-            void reset(uno::Any const & _aValue)
-            { m_aValue = _aValue; makeSeparator(); }
-
-            bool addValueAttributes(ElementFormatter & _rFormatter) const;
-
-            bool hasContent() const;
-
-            rtl::OUString getContent(uno::Reference< script::XTypeConverter > const & _xTCV) const;
-
-        private:
-            bool isList() const { return m_sSeparator.getLength() != 0; }
-            void makeSeparator();
-
-            uno::Any m_aValue;
-            rtl::OUString m_sSeparator;
-            bool     m_bUseSeparator;
-        };
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-    }
-// -----------------------------------------------------------------------------
-} // namespace
-
-#endif
diff --git a/configmgr/source/xml/writersvc.cxx b/configmgr/source/xml/writersvc.cxx
deleted file mode 100644
index c68334c2e1..0000000000
--- a/configmgr/source/xml/writersvc.cxx
+++ /dev/null
@@ -1,261 +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: writersvc.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_configmgr.hxx"
-
-#include "writersvc.hxx"
-
-#ifndef CONFIGMGR_API_FACTORY_HXX_
-#include "confapifactory.hxx"
-#endif
-#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace io    = ::com::sun::star::io;
-        namespace sax   = ::com::sun::star::xml::sax;
-        namespace backenduno = ::com::sun::star::configuration::backend;
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-struct WriterServiceTraits;
-// -----------------------------------------------------------------------------
-static inline void clear(rtl::OUString & _rs) { _rs = rtl::OUString(); }
-
-// -----------------------------------------------------------------------------
-template <class BackendInterface>
-WriterService<BackendInterface>::WriterService(uno::Reference< uno::XComponentContext > const & _xContext)
-: m_xServiceFactory(_xContext->getServiceManager(), uno::UNO_QUERY)
-, m_xWriter()
-{
-    if (!m_xServiceFactory.is())
-    {
-        rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration XML Writer: Context has no service manager"));
-        throw uno::RuntimeException(sMessage,NULL);
-    }
-}
-// -----------------------------------------------------------------------------
-
-// XInitialization
-template <class BackendInterface>
-void SAL_CALL 
-    WriterService<BackendInterface>::initialize( const uno::Sequence< uno::Any >& aArguments ) 
-        throw (uno::Exception, uno::RuntimeException)
-{
-    switch(aArguments.getLength())
-    {
-    case 0: 
-        {
-           break;
-        }
-
-    case 1:
-        {
-            if (aArguments[0] >>= m_xWriter) 
-                break;
-
-            uno::Reference< io::XOutputStream > xStream;
-
-            if (aArguments[0] >>= xStream) 
-            {
-                this->setOutputStream(xStream);
-                break;
-            }
-
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Cannot use argument to initialize a Configuration XML Writer"
-                                                            "- SAX XDocumentHandler or XOutputStream expected"));
-            throw lang::IllegalArgumentException(sMessage,*this,1);
-        }
-    default:
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Too many arguments to initialize a Configuration Parser"));
-            throw lang::IllegalArgumentException(sMessage,*this,0);
-        }
-    }
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-inline
-ServiceInfoHelper WriterService<BackendInterface>::getServiceInfo()
-{
-    return WriterServiceTraits<BackendInterface>::getServiceInfo();
-}
-// -----------------------------------------------------------------------------
-
-// XServiceInfo
-template <class BackendInterface>
-::rtl::OUString SAL_CALL 
-    WriterService<BackendInterface>::getImplementationName(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getImplementationName( );
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-sal_Bool SAL_CALL 
-    WriterService<BackendInterface>::supportsService( const ::rtl::OUString& ServiceName ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().supportsService( ServiceName );
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-uno::Sequence< ::rtl::OUString > SAL_CALL 
-    WriterService<BackendInterface>::getSupportedServiceNames(  ) 
-        throw (uno::RuntimeException)
-{
-    return getServiceInfo().getSupportedServiceNames( );
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-void SAL_CALL 
-    WriterService<BackendInterface>::setOutputStream( const uno::Reference< io::XOutputStream >& aStream ) 
-        throw (uno::RuntimeException)
-{
-    uno::Reference< io::XActiveDataSource > xDS( m_xWriter, uno::UNO_QUERY ); 
-
-    if (xDS.is())
-    {
-        xDS->setOutputStream(aStream);
-    }
-    else
-    {
-        uno::Reference< sax::XDocumentHandler > xNewHandler = this->createHandler();
-
-        xDS.set( xNewHandler, uno::UNO_QUERY );
-        if (!xDS.is())
-        {
-            rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM("Configuration XML Writer: Cannot set output stream to sax.Writer - missing interface XActiveDataSource."));
-            throw uno::RuntimeException(sMessage,*this);
-        }
-        xDS->setOutputStream(aStream);
-
-        m_xWriter = xNewHandler;
-    }
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-uno::Reference< io::XOutputStream > SAL_CALL 
-    WriterService<BackendInterface>::getOutputStream(  ) 
-        throw (uno::RuntimeException)
-{
-    uno::Reference< io::XActiveDataSource > xDS( m_xWriter, uno::UNO_QUERY ); 
-    
-    return xDS.is()? xDS->getOutputStream() : uno::Reference< io::XOutputStream >();
-}
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-uno::Reference< sax::XDocumentHandler > WriterService<BackendInterface>::getWriteHandler()
-    throw (uno::RuntimeException)
-{
-    if (!m_xWriter.is())
-        m_xWriter = this->createHandler();
-
-    return m_xWriter;
-}
-
-// -----------------------------------------------------------------------------
-
-template <class BackendInterface>
-uno::Reference< sax::XDocumentHandler > WriterService<BackendInterface>::createHandler() const
-    throw (uno::RuntimeException)
-{
-    try
-    {
-        static rtl::OUString const k_sSaxWriterSvc( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") );
-
-        return uno::Reference< sax::XDocumentHandler >::query( getServiceFactory()->createInstance(k_sSaxWriterSvc) );
-    }
-    catch (uno::RuntimeException& ) { throw; }
-    catch (uno::Exception& e) 
-    { 
-        lang::XInitialization * const pThis = const_cast<WriterService *>(this);
-        throw lang::WrappedTargetRuntimeException(e.Message, pThis, uno::makeAny(e));
-    }
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-sal_Char const * const aLayerWriterServices[] = 
-{
-    "com.sun.star.configuration.backend.xml.LayerWriter",
-    0
-};
-extern // needed by SunCC 5.2, if used from template
-const ServiceImplementationInfo aLayerWriterSI =
-{
-    "com.sun.star.comp.configuration.backend.xml.LayerWriter",
-    aLayerWriterServices,
-    0
-};
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-template <>
-struct WriterServiceTraits< backenduno::XLayerHandler >
-{
-    static ServiceImplementationInfo const * getServiceInfo() 
-    { return & aLayerWriterSI; }
-};
-// -----------------------------------------------------------------------------
-
-const ServiceRegistrationInfo* getLayerWriterServiceInfo()
-{ return getRegistrationInfo(& aLayerWriterSI); }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-// instantiate here !
-template class WriterService< backenduno::XLayerHandler >;
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-    } // namespace
-
-// -----------------------------------------------------------------------------
-} // namespace
-
diff --git a/configmgr/source/xml/writersvc.hxx b/configmgr/source/xml/writersvc.hxx
deleted file mode 100644
index f42fe0f21b..0000000000
--- a/configmgr/source/xml/writersvc.hxx
+++ /dev/null
@@ -1,124 +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: writersvc.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 CONFIGMGR_XML_WRITERSVC_HXX
-#define CONFIGMGR_XML_WRITERSVC_HXX
-
-#include "serviceinfohelper.hxx"
-#include <cppuhelper/implbase4.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-
-// -----------------------------------------------------------------------------
-
-namespace com { namespace sun { namespace star { namespace configuration { namespace backend {
-    class XLayerHandler;
-} } } } }
-
-// -----------------------------------------------------------------------------
-
-namespace configmgr
-{
-// -----------------------------------------------------------------------------
-    namespace xml
-    {
-// -----------------------------------------------------------------------------
-        namespace uno   = ::com::sun::star::uno;
-        namespace lang  = ::com::sun::star::lang;
-        namespace io    = ::com::sun::star::io;
-        namespace sax   = ::com::sun::star::xml::sax;
-// -----------------------------------------------------------------------------
-
-        template <class BackendInterface>
-        class WriterService : public ::cppu::WeakImplHelper4< 
-                                            lang::XInitialization,
-                                            lang::XServiceInfo,  
-                                            io::XActiveDataSource,
-                                            BackendInterface          
-                                        > 
-        {
-        public:
-            explicit
-            WriterService(uno::Reference< uno::XComponentContext > const & _xContext);
-
-            // XInitialization
-            virtual void SAL_CALL 
-                initialize( const uno::Sequence< uno::Any >& aArguments ) 
-                    throw (uno::Exception, uno::RuntimeException);
-
-            // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL 
-                getImplementationName(  ) 
-                    throw (uno::RuntimeException);
-
-            virtual sal_Bool SAL_CALL 
-                supportsService( const ::rtl::OUString& ServiceName ) 
-                    throw (uno::RuntimeException);
-
-            virtual uno::Sequence< ::rtl::OUString > SAL_CALL 
-                getSupportedServiceNames(  ) 
-                    throw (uno::RuntimeException);
-    
-            // XActiveDataSink
-            virtual void SAL_CALL 
-                setOutputStream( const uno::Reference< io::XOutputStream >& aStream ) 
-                    throw (uno::RuntimeException);
-    
-            virtual uno::Reference< io::XOutputStream > SAL_CALL 
-                getOutputStream(  ) 
-                    throw (uno::RuntimeException);
-
-        protected:
-            uno::Reference< lang::XMultiServiceFactory > getServiceFactory() const 
-            { return m_xServiceFactory; }
-
-            uno::Reference< sax::XDocumentHandler > getWriteHandler() throw (uno::RuntimeException);
-        private:
-            uno::Reference< lang::XMultiServiceFactory >      m_xServiceFactory;
-            uno::Reference< sax::XDocumentHandler >          m_xWriter;
-
-            uno::Reference< sax::XDocumentHandler > createHandler() const throw (uno::RuntimeException);
-
-            static ServiceInfoHelper getServiceInfo();
-        };
-
-// -----------------------------------------------------------------------------
-    } // namespace xml
-// -----------------------------------------------------------------------------
-
-} // namespace configmgr
-#endif 
-
-
-    
-    
diff --git a/configmgr/source/xml/xmlstrings.cxx b/configmgr/source/xml/xmlstrings.cxx
deleted file mode 100644
index 83de183fca..0000000000
--- a/configmgr/source/xml/xmlstrings.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: xmlstrings.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_configmgr.hxx"
-
-#include "xmlstrings.hxx"
-
-//.........................................................................
-namespace configmgr
-{
-//.........................................................................
-
-    namespace xml
-    {
-//----------------------------------------------------------------------------
-// For now: Include the fixed OOR prefix into (most) attribute names
-#define OOR_PREFIX_ "oor:"
-// ... but not into (most) tag names
-#define OOR_TAG_PREFIX_ 
-// ... but into root tag names
-#define OOR_ROOTTAG_PREFIX_ OOR_PREFIX_
-//----------------------------------------------------------------------------
-    // extern declaration for strings used in the XML format
-        // namespace prefixes
-        IMPLEMENT_CONSTASCII_USTRING(NS_PREFIX_OOR, "oor");
-        IMPLEMENT_CONSTASCII_USTRING(NS_PREFIX_XS,  "xs");
-
-        // namespace urls
-        IMPLEMENT_CONSTASCII_USTRING(NS_URI_OOR,"http://openoffice.org/2001/registry");
-        IMPLEMENT_CONSTASCII_USTRING(NS_URI_XS, "http://www.w3.org/2001/XMLSchema");
-
-        // tag names
-        IMPLEMENT_CONSTASCII_USTRING(TAG_SCHEMA,    OOR_ROOTTAG_PREFIX_"component-schema");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_LAYER,     OOR_ROOTTAG_PREFIX_"component-data");
-        IMPLEMENT_CONSTASCII_USTRING(DEPRECATED_TAG_LAYER, OOR_ROOTTAG_PREFIX_"node");
-
-        IMPLEMENT_CONSTASCII_USTRING(TAG_COMPONENT, OOR_TAG_PREFIX_"component");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_TEMPLATES, OOR_TAG_PREFIX_"templates");
-
-        IMPLEMENT_CONSTASCII_USTRING(TAG_NODE,      OOR_TAG_PREFIX_"node");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_GROUP,     OOR_TAG_PREFIX_"group");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_SET,       OOR_TAG_PREFIX_"set");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_PROP,      OOR_TAG_PREFIX_"prop");
-
-        IMPLEMENT_CONSTASCII_USTRING(TAG_VALUE,     OOR_TAG_PREFIX_"value");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_IMPORT,    OOR_TAG_PREFIX_"import");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_INSTANCE,  OOR_TAG_PREFIX_"node-ref");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_ITEMTYPE,  OOR_TAG_PREFIX_"item");
-        IMPLEMENT_CONSTASCII_USTRING(TAG_USES,      OOR_TAG_PREFIX_"uses");
-
-        // attribute names
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_NAME,     OOR_PREFIX_"name");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_CONTEXT,  OOR_PREFIX_"context");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_PACKAGE,  OOR_PREFIX_"package");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_COMPONENT,OOR_PREFIX_"component");
-
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_ITEMTYPE,         OOR_PREFIX_"node-type");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_ITEMTYPECOMPONENT,OOR_PREFIX_"component");
-
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_VALUETYPE,        OOR_PREFIX_"type");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_VALUESEPARATOR,   OOR_PREFIX_"separator");
-
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_FLAG_EXTENSIBLE,  OOR_PREFIX_"extensible");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_FLAG_FINALIZED,   OOR_PREFIX_"finalized");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_FLAG_READONLY,    OOR_PREFIX_"readonly");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_FLAG_MANDATORY,   OOR_PREFIX_"mandatory");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_FLAG_NULLABLE,    OOR_PREFIX_"nillable");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_FLAG_LOCALIZED,   OOR_PREFIX_"localized");
-
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_OPERATION,        OOR_PREFIX_"op");
-
-    // attributes defined elsewhere
-        IMPLEMENT_CONSTASCII_USTRING(EXT_ATTR_LANGUAGE,     "xml:lang");
-        IMPLEMENT_CONSTASCII_USTRING(EXT_ATTR_NULL,         "xsi:nil");
-
-    // attribute contents
-        // boolean constants
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_VALUE_TRUE,       "true");
-        IMPLEMENT_CONSTASCII_USTRING(ATTR_VALUE_FALSE,      "false");
-
-        // simple types names
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_BOOLEAN,     "boolean");
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_SHORT,       "short");
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_INT,         "int");	
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_LONG,        "long");
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_DOUBLE,      "double");
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_STRING,      "string");
-        // Type: Sequence<bytes>
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_BINARY,      "hexBinary");
-        // Universal type: Any
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_ANY,         "any");
-
-        // modifier suffix for list types
-        IMPLEMENT_CONSTASCII_USTRING(VALUETYPE_LIST_SUFFIX, "-list");
-
-        // States for update actions
-        IMPLEMENT_CONSTASCII_USTRING(OPERATION_MODIFY,      "modify");
-        IMPLEMENT_CONSTASCII_USTRING(OPERATION_REPLACE,     "replace");
-        IMPLEMENT_CONSTASCII_USTRING(OPERATION_FUSE,        "fuse");
-        IMPLEMENT_CONSTASCII_USTRING(OPERATION_REMOVE,      "remove");
-
-        // the default separator for strings
-        IMPLEMENT_CONSTASCII_USTRING(SEPARATOR_WHITESPACE,  " ");
-
-        // Needed for building attribute lists
-        IMPLEMENT_CONSTASCII_USTRING(XML_ATTRTYPE_CDATA,    "CDATA");
-
-    } // namespace xml
-
-} // namespace configmgr
-
-
diff --git a/configmgr/source/xml/xmlstrings.hxx b/configmgr/source/xml/xmlstrings.hxx
deleted file mode 100644
index 3f70697332..0000000000
--- a/configmgr/source/xml/xmlstrings.hxx
+++ /dev/null
@@ -1,134 +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: xmlstrings.hxx,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.
- *
- ************************************************************************/
-#ifndef CONFIGMGR_XML_STRINGS_HXX_
-#define CONFIGMGR_XML_STRINGS_HXX_
-
-#include "strings.hxx"
-
-//.........................................................................
-namespace configmgr
-{
-//.........................................................................
-
-    namespace xml
-    {
-    // extern declaration for strings used in the XML format
-        // namespace prefixes
-        DECLARE_CONSTASCII_USTRING(NS_PREFIX_OOR);
-        DECLARE_CONSTASCII_USTRING(NS_PREFIX_XS);
-
-        const sal_Unicode k_NS_SEPARATOR(':');
-
-        // namespace urls
-        DECLARE_CONSTASCII_USTRING(NS_URI_OOR);
-        DECLARE_CONSTASCII_USTRING(NS_URI_XS);
-        DECLARE_CONSTASCII_USTRING(NS_URI_XSI);
-
-        // tag names
-        DECLARE_CONSTASCII_USTRING(TAG_SCHEMA);
-        DECLARE_CONSTASCII_USTRING(TAG_LAYER);
-        DECLARE_CONSTASCII_USTRING(DEPRECATED_TAG_LAYER);
-
-        DECLARE_CONSTASCII_USTRING(TAG_COMPONENT);
-        DECLARE_CONSTASCII_USTRING(TAG_TEMPLATES);
-
-        DECLARE_CONSTASCII_USTRING(TAG_NODE);
-        DECLARE_CONSTASCII_USTRING(TAG_GROUP);
-        DECLARE_CONSTASCII_USTRING(TAG_SET);
-        DECLARE_CONSTASCII_USTRING(TAG_PROP);
-
-        DECLARE_CONSTASCII_USTRING(TAG_IMPORT);
-        DECLARE_CONSTASCII_USTRING(TAG_INSTANCE);
-        DECLARE_CONSTASCII_USTRING(TAG_ITEMTYPE);
-        DECLARE_CONSTASCII_USTRING(TAG_VALUE);
-        DECLARE_CONSTASCII_USTRING(TAG_USES);
-
-        // attribute names
-        DECLARE_CONSTASCII_USTRING(ATTR_NAME);
-        DECLARE_CONSTASCII_USTRING(ATTR_CONTEXT);
-        DECLARE_CONSTASCII_USTRING(ATTR_PACKAGE);
-        DECLARE_CONSTASCII_USTRING(ATTR_COMPONENT);
-
-        DECLARE_CONSTASCII_USTRING(ATTR_ITEMTYPE);
-        DECLARE_CONSTASCII_USTRING(ATTR_ITEMTYPECOMPONENT);
-
-        DECLARE_CONSTASCII_USTRING(ATTR_VALUETYPE);
-        DECLARE_CONSTASCII_USTRING(ATTR_VALUESEPARATOR);
-
-        DECLARE_CONSTASCII_USTRING(ATTR_FLAG_EXTENSIBLE);
-        DECLARE_CONSTASCII_USTRING(ATTR_FLAG_FINALIZED);
-        DECLARE_CONSTASCII_USTRING(ATTR_FLAG_READONLY);
-        DECLARE_CONSTASCII_USTRING(ATTR_FLAG_MANDATORY);
-        DECLARE_CONSTASCII_USTRING(ATTR_FLAG_NULLABLE);
-        DECLARE_CONSTASCII_USTRING(ATTR_FLAG_LOCALIZED);
-
-        DECLARE_CONSTASCII_USTRING(ATTR_OPERATION);
-
-    // attributes defined elsewhere
-        DECLARE_CONSTASCII_USTRING(EXT_ATTR_LANGUAGE);
-        DECLARE_CONSTASCII_USTRING(EXT_ATTR_NULL);
-
-    // attribute contents
-        // boolean constants
-        DECLARE_CONSTASCII_USTRING(ATTR_VALUE_TRUE);
-        DECLARE_CONSTASCII_USTRING(ATTR_VALUE_FALSE);
-
-        // simple types names
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_BOOLEAN);
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_SHORT);
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_INT);	
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_LONG);
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_DOUBLE);
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_STRING);
-        // Type: Sequence<bytes>
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_BINARY);
-        // Universal type: Any
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_ANY);
-
-        // modifier suffix for list types
-        DECLARE_CONSTASCII_USTRING(VALUETYPE_LIST_SUFFIX);
-
-        // States for update actions
-        DECLARE_CONSTASCII_USTRING(OPERATION_MODIFY);
-        DECLARE_CONSTASCII_USTRING(OPERATION_REPLACE);
-        DECLARE_CONSTASCII_USTRING(OPERATION_FUSE);
-        DECLARE_CONSTASCII_USTRING(OPERATION_REMOVE);
-
-        // the default separator for strings
-        DECLARE_CONSTASCII_USTRING(SEPARATOR_WHITESPACE);
-
-        // Needed for building attribute lists
-        DECLARE_CONSTASCII_USTRING(XML_ATTRTYPE_CDATA);
-
-    } // namespace xml
-
-} // namespace configmgr
-#endif
-
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
new file mode 100644
index 0000000000..07ad4d17a3
--- /dev/null
+++ b/configmgr/source/xmldata.cxx
@@ -0,0 +1,204 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <climits>
+#include <stack>
+
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "osl/file.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/textcvt.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "data.hxx"
+#include "groupnode.hxx"
+#include "localizedpropertynode.hxx"
+#include "localizedvaluenode.hxx"
+#include "node.hxx"
+#include "nodemap.hxx"
+#include "parsemanager.hxx"
+#include "parser.hxx"
+#include "propertynode.hxx"
+#include "setnode.hxx"
+#include "span.hxx"
+#include "type.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace xmldata {
+
+namespace {
+
+namespace css = com::sun::star;
+
+}
+
+rtl::OUString convertFromUtf8(Span const & text) {
+    OSL_ASSERT(text.is());
+    rtl_uString * s = 0;
+    if (!rtl_convertStringToUString(
+            &s, text.begin, text.length, RTL_TEXTENCODING_UTF8,
+            (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
+             RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
+             RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
+    {
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("cannot convert from UTF-8")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    return rtl::OUString(s, SAL_NO_ACQUIRE);
+}
+
+Type parseType(XmlReader const & reader, Span const & text) {
+    OSL_ASSERT(text.is());
+    sal_Int32 i = rtl_str_indexOfChar_WithLength(text.begin, text.length, ':');
+    if (i >= 0) {
+        switch (reader.getNamespace(Span(text.begin, i))) {
+        case XmlReader::NAMESPACE_OOR:
+            if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                    RTL_CONSTASCII_STRINGPARAM("any")))
+            {
+                return TYPE_ANY;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("boolean-list")))
+            {
+                return TYPE_BOOLEAN_LIST;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("short-list")))
+            {
+                return TYPE_SHORT_LIST;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("int-list")))
+            {
+                return TYPE_INT_LIST;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("long-list")))
+            {
+                return TYPE_LONG_LIST;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("double-list")))
+            {
+                return TYPE_DOUBLE_LIST;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("string-list")))
+            {
+                return TYPE_STRING_LIST;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("hexBinary-list")))
+            {
+                return TYPE_HEXBINARY_LIST;
+            }
+            break;
+        case XmlReader::NAMESPACE_XS:
+            if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                    RTL_CONSTASCII_STRINGPARAM("boolean")))
+            {
+                return TYPE_BOOLEAN;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("short")))
+            {
+                return TYPE_SHORT;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("int")))
+            {
+                return TYPE_INT;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("long")))
+            {
+                return TYPE_LONG;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("double")))
+            {
+                return TYPE_DOUBLE;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("string")))
+            {
+                return TYPE_STRING;
+            } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
+                           RTL_CONSTASCII_STRINGPARAM("hexBinary")))
+            {
+                return TYPE_HEXBINARY;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    throw css::uno::RuntimeException(
+        (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid type ")) +
+         convertFromUtf8(text)),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+bool parseBoolean(Span const & text) {
+    OSL_ASSERT(text.is());
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("true"))) {
+        return true;
+    }
+    if (text.equals(RTL_CONSTASCII_STRINGPARAM("false"))) {
+        return false;
+    }
+    throw css::uno::RuntimeException(
+        (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid boolean ")) +
+         convertFromUtf8(text)),
+        css::uno::Reference< css::uno::XInterface >());
+}
+
+rtl::OUString parseTemplateReference(
+    rtl::OUString const & component, bool hasNodeType,
+    rtl::OUString const & nodeType, rtl::OUString const * defaultTemplateName)
+{
+    if (!hasNodeType) {
+        if (defaultTemplateName != 0) {
+            return *defaultTemplateName;
+        }
+        throw css::uno::RuntimeException(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("missing node-type attribute")),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    return Data::fullTemplateName(component, nodeType);
+}
+
+}
+
+}
diff --git a/configmgr/source/xmldata.hxx b/configmgr/source/xmldata.hxx
new file mode 100644
index 0000000000..15a0a36336
--- /dev/null
+++ b/configmgr/source/xmldata.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_XMLDATA_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_XMLDATA_HXX
+
+#include "sal/config.h"
+
+#include "type.hxx"
+
+namespace rtl { class OUString; }
+
+namespace configmgr {
+
+class XmlReader;
+struct Span;
+
+namespace xmldata {
+
+rtl::OUString convertFromUtf8(Span const & text);
+
+Type parseType(XmlReader const & reader, Span const & text);
+
+bool parseBoolean(Span const & text);
+
+rtl::OUString parseTemplateReference(
+    rtl::OUString const & component, bool hasNodeType,
+    rtl::OUString const & nodeType, rtl::OUString const * defaultTemplateName);
+
+}
+
+}
+
+#endif
diff --git a/configmgr/source/xmlreader.cxx b/configmgr/source/xmlreader.cxx
new file mode 100644
index 0000000000..ac6a08d186
--- /dev/null
+++ b/configmgr/source/xmlreader.cxx
@@ -0,0 +1,1054 @@
+/*************************************************************************
+*
+* 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_configmgr.hxx"
+#include "sal/config.h"
+
+#include <cstddef>
+
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "pad.hxx"
+#include "span.hxx"
+#include "xmlreader.hxx"
+
+namespace configmgr {
+
+namespace {
+
+namespace css = com::sun::star;
+
+bool isSpace(char c) {
+    switch (c) {
+    case '\x09':
+    case '\x0A':
+    case '\x0D':
+    case ' ':
+        return true;
+    default:
+        return false;
+    }
+}
+
+}
+
+XmlReader::XmlReader(rtl::OUString const & fileUrl)
+    SAL_THROW((
+        css::container::NoSuchElementException, css::uno::RuntimeException)):
+    fileUrl_(fileUrl)
+{
+    switch (osl_openFile(fileUrl_.pData, &fileHandle_, osl_File_OpenFlag_Read))
+    {
+    case osl_File_E_None:
+        break;
+    case osl_File_E_NOENT:
+        throw css::container::NoSuchElementException(
+            fileUrl_, css::uno::Reference< css::uno::XInterface >());
+    default:
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot open ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    oslFileError e = osl_getFileSize(fileHandle_, &fileSize_);
+    if (e == osl_File_E_None) {
+        e = osl_mapFile(
+            fileHandle_, &fileAddress_, fileSize_, 0,
+            osl_File_MapFlag_WillNeed);
+    }
+    if (e != osl_File_E_None) {
+        e = osl_closeFile(fileHandle_);
+        if (e != osl_File_E_None) {
+            OSL_TRACE("osl_closeFile failed with %ld", static_cast< long >(e));
+        }
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot mmap ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    namespaces_.push_back(
+        NamespaceData(Span(RTL_CONSTASCII_STRINGPARAM("xml")), NAMESPACE_XML));
+    namespaces_.push_back(
+        NamespaceData(Span(RTL_CONSTASCII_STRINGPARAM("xsi")), NAMESPACE_XSI));
+        // old user layer .xcu files used the xsi namespace prefix without
+        // declaring a corresponding namespace binding, see issue 77174; reading
+        // those files during migration would fail without this hack that can be
+        // removed once migration is no longer relevant (see
+        // Components::parseModificationLayer)
+    pos_ = static_cast< char * >(fileAddress_);
+    end_ = pos_ + fileSize_;
+    state_ = STATE_CONTENT;
+}
+
+XmlReader::~XmlReader() {
+    oslFileError e = osl_unmapFile(fileAddress_, fileSize_);
+    if (e != osl_File_E_None) {
+        OSL_TRACE("osl_unmapFile failed with %ld", static_cast< long >(e));
+    }
+    e = osl_closeFile(fileHandle_);
+    if (e != osl_File_E_None) {
+        OSL_TRACE("osl_closeFile failed with %ld", static_cast< long >(e));
+    }
+}
+
+XmlReader::Result XmlReader::nextItem(
+    Text reportText, Span * data, Namespace * ns)
+{
+    switch (state_) {
+    case STATE_CONTENT:
+        switch (reportText) {
+        case TEXT_NONE:
+            return handleSkippedText(data, ns);
+        case TEXT_RAW:
+            return handleRawText(data);
+        case TEXT_NORMALIZED:
+            return handleNormalizedText(data);
+        }
+    case STATE_START_TAG:
+        return handleStartTag(ns, data);
+    case STATE_END_TAG:
+        return handleEndTag();
+    case STATE_EMPTY_ELEMENT_TAG:
+        handleElementEnd();
+        return RESULT_END;
+    default: // STATE_DONE
+        return RESULT_DONE;
+    }
+}
+
+bool XmlReader::nextAttribute(Namespace * ns, Span * localName) {
+    OSL_ASSERT(ns != 0 && localName != 0);
+    if (firstAttribute_) {
+        currentAttribute_ = attributes_.begin();
+        firstAttribute_ = false;
+    } else {
+        ++currentAttribute_;
+    }
+    if (currentAttribute_ == attributes_.end()) {
+        return false;
+    }
+    if (currentAttribute_->nameColon == 0) {
+        *ns = NAMESPACE_NONE;
+        *localName = Span(
+            currentAttribute_->nameBegin,
+            currentAttribute_->nameEnd - currentAttribute_->nameBegin);
+    } else {
+        *ns = getNamespace(
+            Span(
+                currentAttribute_->nameBegin,
+                currentAttribute_->nameColon - currentAttribute_->nameBegin));
+        *localName = Span(
+            currentAttribute_->nameColon + 1,
+            currentAttribute_->nameEnd - (currentAttribute_->nameColon + 1));
+    }
+    return true;
+}
+
+Span XmlReader::getAttributeValue(bool fullyNormalize) {
+    return handleAttributeValue(
+        currentAttribute_->valueBegin, currentAttribute_->valueEnd,
+        fullyNormalize);
+}
+
+XmlReader::Namespace XmlReader::getNamespace(Span const & prefix) const {
+    for (NamespaceList::const_reverse_iterator i(namespaces_.rbegin());
+         i != namespaces_.rend(); ++i)
+    {
+        if (prefix.equals(i->prefix)) {
+            return i->ns;
+        }
+    }
+    return NAMESPACE_OTHER;
+}
+
+rtl::OUString XmlReader::getUrl() const {
+    return fileUrl_;
+}
+
+void XmlReader::normalizeLineEnds(Span const & text) {
+    char const * p = text.begin;
+    sal_Int32 n = text.length;
+    for (;;) {
+        sal_Int32 i = rtl_str_indexOfChar_WithLength(p, n, '\x0D');
+        if (i < 0) {
+            break;
+        }
+        pad_.add(p, i);
+        p += i + 1;
+        n -= i + 1;
+        if (n == 0 || *p != '\x0A') {
+            pad_.add(RTL_CONSTASCII_STRINGPARAM("\x0A"));
+        }
+    }
+    pad_.add(p, n);
+}
+
+void XmlReader::skipSpace() {
+    while (isSpace(peek())) {
+        ++pos_;
+    }
+}
+
+bool XmlReader::skipComment() {
+    if (rtl_str_shortenedCompare_WithLength(
+            pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("--"),
+            RTL_CONSTASCII_LENGTH("--")) !=
+        0)
+    {
+        return false;
+    }
+    pos_ += RTL_CONSTASCII_LENGTH("--");
+    sal_Int32 i = rtl_str_indexOfStr_WithLength(
+        pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("--"));
+    if (i < 0) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "premature end (within comment) of ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    pos_ += i + RTL_CONSTASCII_LENGTH("--");
+    if (read() != '>') {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "illegal \"--\" within comment in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    return true;
+}
+
+void XmlReader::skipProcessingInstruction() {
+    sal_Int32 i = rtl_str_indexOfStr_WithLength(
+        pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("?>"));
+    if (i < 0) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad '<?' in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    pos_ += i + RTL_CONSTASCII_LENGTH("?>");
+}
+
+void XmlReader::skipDocumentTypeDeclaration() {
+    // Neither is it checked that the doctypedecl is at the correct position in
+    // the document, nor that it is well-formed:
+    for (;;) {
+        char c = read();
+        switch (c) {
+        case '\0': // i.e., EOF
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "premature end (within DTD) of ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        case '"':
+        case '\'':
+            {
+                sal_Int32 i = rtl_str_indexOfChar_WithLength(
+                    pos_, end_ - pos_, c);
+                if (i < 0) {
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "premature end (within DTD) of ")) +
+                         fileUrl_),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+                pos_ += i + 1;
+            }
+            break;
+        case '>':
+            return;
+        case '[':
+            for (;;) {
+                c = read();
+                switch (c) {
+                case '\0': // i.e., EOF
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "premature end (within DTD) of ")) +
+                         fileUrl_),
+                        css::uno::Reference< css::uno::XInterface >());
+                case '"':
+                case '\'':
+                    {
+                        sal_Int32 i = rtl_str_indexOfChar_WithLength(
+                            pos_, end_ - pos_, c);
+                        if (i < 0) {
+                            throw css::uno::RuntimeException(
+                            (rtl::OUString(
+                                RTL_CONSTASCII_USTRINGPARAM(
+                                    "premature end (within DTD) of ")) +
+                             fileUrl_),
+                            css::uno::Reference< css::uno::XInterface >());
+                        }
+                        pos_ += i + 1;
+                    }
+                    break;
+                case '<':
+                    switch (read()) {
+                    case '\0': // i.e., EOF
+                        throw css::uno::RuntimeException(
+                            (rtl::OUString(
+                                RTL_CONSTASCII_USTRINGPARAM(
+                                    "premature end (within DTD) of ")) +
+                             fileUrl_),
+                            css::uno::Reference< css::uno::XInterface >());
+                    case '!':
+                        skipComment();
+                        break;
+                    case '?':
+                        skipProcessingInstruction();
+                        break;
+                    default:
+                        break;
+                    }
+                    break;
+                case ']':
+                    skipSpace();
+                    if (read() != '>') {
+                        throw css::uno::RuntimeException(
+                            (rtl::OUString(
+                                RTL_CONSTASCII_USTRINGPARAM(
+                                    "missing \">\" of DTD in ")) +
+                             fileUrl_),
+                            css::uno::Reference< css::uno::XInterface >());
+                    }
+                    return;
+                default:
+                    break;
+                }
+            }
+        default:
+            break;
+        }
+    }
+}
+
+Span XmlReader::scanCdataSection() {
+    if (rtl_str_shortenedCompare_WithLength(
+            pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("[CDATA["),
+            RTL_CONSTASCII_LENGTH("[CDATA[")) !=
+        0)
+    {
+        return Span();
+    }
+    pos_ += RTL_CONSTASCII_LENGTH("[CDATA[");
+    char const * begin = pos_;
+    sal_Int32 i = rtl_str_indexOfStr_WithLength(
+        pos_, end_ - pos_, RTL_CONSTASCII_STRINGPARAM("]]>"));
+    if (i < 0) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "premature end (within CDATA section) of ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    pos_ += i + RTL_CONSTASCII_LENGTH("]]>");
+    return Span(begin, i);
+}
+
+bool XmlReader::scanName(char const ** nameColon) {
+    OSL_ASSERT(nameColon != 0 && *nameColon == 0);
+    for (char const * begin = pos_;; ++pos_) {
+        switch (peek()) {
+        case '\0': // i.e., EOF
+        case '\x09':
+        case '\x0A':
+        case '\x0D':
+        case ' ':
+        case '/':
+        case '=':
+        case '>':
+            return pos_ != begin;
+        case ':':
+            *nameColon = pos_;
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+XmlReader::Namespace XmlReader::scanNamespaceIri(
+    char const * begin, char const * end)
+{
+    OSL_ASSERT(begin != 0 && begin <= end);
+    Span iri(handleAttributeValue(begin, end, false));
+    struct Iri {
+        char const * begin;
+        sal_Int32 length;
+        XmlReader::Namespace ns;
+    };
+    static Iri const iris[] = {
+        { RTL_CONSTASCII_STRINGPARAM("http://openoffice.org/2001/registry"),
+          XmlReader::NAMESPACE_OOR },
+        { RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/2001/XMLSchema"),
+          XmlReader::NAMESPACE_XS },
+        { RTL_CONSTASCII_STRINGPARAM(
+                "http://www.w3.org/2001/XMLSchema-instance"),
+          XmlReader::NAMESPACE_XSI },
+        { RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/XML/1998/namespace"),
+          XmlReader::NAMESPACE_XML } };
+    for (std::size_t i = 0; i < sizeof iris / sizeof iris[0]; ++i) {
+        if (rtl_str_compare_WithLength(
+                iri.begin, iri.length, iris[i].begin, iris[i].length) ==
+            0)
+        {
+            return iris[i].ns;
+        }
+    }
+    return XmlReader::NAMESPACE_OTHER;
+}
+
+char const * XmlReader::handleReference(char const * position, char const * end)
+{
+    OSL_ASSERT(position != 0 && *position == '&' && position < end);
+    ++position;
+    if (*position == '#') {
+        ++position;
+        sal_Int32 val = 0;
+        char const * p;
+        if (*position == 'x') {
+            ++position;
+            p = position;
+            for (;; ++position) {
+                char c = *position;
+                if (c >= '0' && c <= '9') {
+                    val = 16 * val + (c - '0');
+                } else if (c >= 'A' && c <= 'F') {
+                    val = 16 * val + (c - 'A') + 10;
+                } else if (c >= 'a' && c <= 'f') {
+                    val = 16 * val + (c - 'a') + 10;
+                } else {
+                    break;
+                }
+                if (val > 0x10FFFF) { // avoid overflow
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "'&#x...' too large in ")) +
+                         fileUrl_),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+            }
+        } else {
+            p = position;
+            for (;; ++position) {
+                char c = *position;
+                if (c >= '0' && c <= '9') {
+                    val = 10 * val + (c - '0');
+                } else {
+                    break;
+                }
+                if (val > 0x10FFFF) { // avoid overflow
+                    throw css::uno::RuntimeException(
+                        (rtl::OUString(
+                            RTL_CONSTASCII_USTRINGPARAM(
+                                "'&#...' too large in ")) +
+                         fileUrl_),
+                        css::uno::Reference< css::uno::XInterface >());
+                }
+            }
+        }
+        if (position == p || *position++ != ';') {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("'&#...' missing ';' in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        OSL_ASSERT(val >= 0 && val <= 0x10FFFF);
+        if ((val < 0x20 && val != 0x9 && val != 0xA && val != 0xD) ||
+            (val >= 0xD800 && val <= 0xDFFF) || val == 0xFFFE || val == 0xFFFF)
+        {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "character reference denoting invalid character in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        char buf[4];
+        sal_Int32 len;
+        if (val < 0x80) {
+            buf[0] = static_cast< char >(val);
+            len = 1;
+        } else if (val < 0x800) {
+            buf[0] = static_cast< char >((val >> 6) | 0xC0);
+            buf[1] = static_cast< char >((val & 0x3F) | 0x80);
+            len = 2;
+        } else if (val < 0x10000) {
+            buf[0] = static_cast< char >((val >> 12) | 0xE0);
+            buf[1] = static_cast< char >(((val >> 6) & 0x3F) | 0x80);
+            buf[2] = static_cast< char >((val & 0x3F) | 0x80);
+            len = 3;
+        } else {
+            buf[0] = static_cast< char >((val >> 18) | 0xF0);
+            buf[1] = static_cast< char >(((val >> 12) & 0x3F) | 0x80);
+            buf[2] = static_cast< char >(((val >> 6) & 0x3F) | 0x80);
+            buf[3] = static_cast< char >((val & 0x3F) | 0x80);
+            len = 4;
+        }
+        pad_.addEphemeral(buf, len);
+        return position;
+    } else {
+        struct EntityRef {
+            char const * inBegin;
+            sal_Int32 inLength;
+            char const * outBegin;
+            sal_Int32 outLength;
+        };
+        static EntityRef const refs[] = {
+            { RTL_CONSTASCII_STRINGPARAM("amp;"),
+              RTL_CONSTASCII_STRINGPARAM("&") },
+            { RTL_CONSTASCII_STRINGPARAM("lt;"),
+              RTL_CONSTASCII_STRINGPARAM("<") },
+            { RTL_CONSTASCII_STRINGPARAM("gt;"),
+              RTL_CONSTASCII_STRINGPARAM(">") },
+            { RTL_CONSTASCII_STRINGPARAM("apos;"),
+              RTL_CONSTASCII_STRINGPARAM("'") },
+            { RTL_CONSTASCII_STRINGPARAM("quot;"),
+              RTL_CONSTASCII_STRINGPARAM("\"") } };
+        for (std::size_t i = 0; i < sizeof refs / sizeof refs[0]; ++i) {
+            if (rtl_str_shortenedCompare_WithLength(
+                    position, end - position, refs[i].inBegin, refs[i].inLength,
+                    refs[i].inLength) ==
+                0)
+            {
+                position += refs[i].inLength;
+                pad_.add(refs[i].outBegin, refs[i].outLength);
+                return position;
+            }
+        }
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("unknown entity reference in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+}
+
+Span XmlReader::handleAttributeValue(
+    char const * begin, char const * end, bool fullyNormalize)
+{
+    pad_.clear();
+    if (fullyNormalize) {
+        while (begin != end && isSpace(*begin)) {
+            ++begin;
+        }
+        while (end != begin && isSpace(end[-1])) {
+            --end;
+        }
+        char const * p = begin;
+        enum Space { SPACE_NONE, SPACE_SPAN, SPACE_BREAK };
+            // a single true space character can go into the current span,
+            // everything else breaks the span
+        Space space = SPACE_NONE;
+        while (p != end) {
+            switch (*p) {
+            case '\x09':
+            case '\x0A':
+            case '\x0D':
+                switch (space) {
+                case SPACE_NONE:
+                    pad_.add(begin, p - begin);
+                    pad_.add(RTL_CONSTASCII_STRINGPARAM(" "));
+                    space = SPACE_BREAK;
+                    break;
+                case SPACE_SPAN:
+                    pad_.add(begin, p - begin);
+                    space = SPACE_BREAK;
+                    break;
+                case SPACE_BREAK:
+                    break;
+                }
+                begin = ++p;
+                break;
+            case ' ':
+                switch (space) {
+                case SPACE_NONE:
+                    ++p;
+                    space = SPACE_SPAN;
+                    break;
+                case SPACE_SPAN:
+                    pad_.add(begin, p - begin);
+                    begin = ++p;
+                    space = SPACE_BREAK;
+                    break;
+                case SPACE_BREAK:
+                    begin = ++p;
+                    break;
+                }
+                break;
+            case '&':
+                pad_.add(begin, p - begin);
+                p = handleReference(p, end);
+                begin = p;
+                space = SPACE_NONE;
+                break;
+            default:
+                ++p;
+                space = SPACE_NONE;
+                break;
+            }
+        }
+        pad_.add(begin, p - begin);
+    } else {
+        char const * p = begin;
+        while (p != end) {
+            switch (*p) {
+            case '\x09':
+            case '\x0A':
+                pad_.add(begin, p - begin);
+                begin = ++p;
+                pad_.add(RTL_CONSTASCII_STRINGPARAM(" "));
+                break;
+            case '\x0D':
+                pad_.add(begin, p - begin);
+                ++p;
+                if (peek() == '\x0A') {
+                    ++p;
+                }
+                begin = p;
+                pad_.add(RTL_CONSTASCII_STRINGPARAM(" "));
+                break;
+            case '&':
+                pad_.add(begin, p - begin);
+                p = handleReference(p, end);
+                begin = p;
+                break;
+            default:
+                ++p;
+                break;
+            }
+        }
+        pad_.add(begin, p - begin);
+    }
+    return pad_.get();
+}
+
+XmlReader::Result XmlReader::handleStartTag(Namespace * ns, Span * localName) {
+    OSL_ASSERT(ns != 0 && localName);
+    char const * nameBegin = pos_;
+    char const * nameColon = 0;
+    if (!scanName(&nameColon)) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad tag name in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    char const * nameEnd = pos_;
+    NamespaceList::size_type inheritedNamespaces = namespaces_.size();
+    bool hasDefaultNs = false;
+    Namespace defaultNs = NAMESPACE_NONE;
+    attributes_.clear();
+    for (;;) {
+        char const * p = pos_;
+        skipSpace();
+        if (peek() == '/' || peek() == '>') {
+            break;
+        }
+        if (pos_ == p) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "missing whitespace before attribute in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        char const * attrNameBegin = pos_;
+        char const * attrNameColon = 0;
+        if (!scanName(&attrNameColon)) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("bad attribute name in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        char const * attrNameEnd = pos_;
+        skipSpace();
+        if (read() != '=') {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '=' in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        skipSpace();
+        char del = read();
+        if (del != '\'' && del != '"') {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("bad attribute value in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        char const * valueBegin = pos_;
+        sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, del);
+        if (i < 0) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "unterminated attribute value in ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        char const * valueEnd = pos_ + i;
+        pos_ += i + 1;
+        if (attrNameColon == 0 &&
+            Span(attrNameBegin, attrNameEnd - attrNameBegin).equals(
+                RTL_CONSTASCII_STRINGPARAM("xmlns")))
+        {
+            hasDefaultNs = true;
+            defaultNs = scanNamespaceIri(valueBegin, valueEnd);
+        } else if (attrNameColon != 0 &&
+                   Span(attrNameBegin, attrNameColon - attrNameBegin).equals(
+                       RTL_CONSTASCII_STRINGPARAM("xmlns")))
+        {
+            namespaces_.push_back(
+                NamespaceData(
+                    Span(attrNameColon + 1, attrNameEnd - (attrNameColon + 1)),
+                    scanNamespaceIri(valueBegin, valueEnd)));
+        } else {
+            attributes_.push_back(
+                AttributeData(
+                    attrNameBegin, attrNameEnd, attrNameColon, valueBegin,
+                    valueEnd));
+        }
+    }
+    if (!hasDefaultNs && !elements_.empty()) {
+        defaultNs = elements_.top().defaultNamespace;
+    }
+    firstAttribute_ = true;
+    if (peek() == '/') {
+        state_ = STATE_EMPTY_ELEMENT_TAG;
+        ++pos_;
+    } else {
+        state_ = STATE_CONTENT;
+    }
+    if (peek() != '>') {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '>' in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    ++pos_;
+    elements_.push(
+        ElementData(
+            Span(nameBegin, nameEnd - nameBegin), inheritedNamespaces,
+            defaultNs));
+    if (nameColon == 0) {
+        *ns = defaultNs;
+        *localName = Span(nameBegin, nameEnd - nameBegin);
+    } else {
+        *ns = getNamespace(Span(nameBegin, nameColon - nameBegin));
+        *localName = Span(nameColon + 1, nameEnd - (nameColon + 1));
+    }
+    return RESULT_BEGIN;
+}
+
+XmlReader::Result XmlReader::handleEndTag() {
+    if (elements_.empty()) {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("spurious end tag in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    char const * nameBegin = pos_;
+    char const * nameColon = 0;
+    if (!scanName(&nameColon) ||
+        !elements_.top().name.equals(nameBegin, pos_ - nameBegin))
+    {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tag mismatch in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    handleElementEnd();
+    skipSpace();
+    if (peek() != '>') {
+        throw css::uno::RuntimeException(
+            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("missing '>' in ")) +
+             fileUrl_),
+            css::uno::Reference< css::uno::XInterface >());
+    }
+    ++pos_;
+    return RESULT_END;
+}
+
+void XmlReader::handleElementEnd() {
+    OSL_ASSERT(!elements_.empty());
+    namespaces_.resize(elements_.top().inheritedNamespaces);
+    elements_.pop();
+    state_ = elements_.empty() ? STATE_DONE : STATE_CONTENT;
+}
+
+XmlReader::Result XmlReader::handleSkippedText(Span * data, Namespace * ns) {
+    for (;;) {
+        sal_Int32 i = rtl_str_indexOfChar_WithLength(pos_, end_ - pos_, '<');
+        if (i < 0) {
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("premature end of ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        }
+        pos_ += i + 1;
+        switch (peek()) {
+        case '!':
+            ++pos_;
+            if (!skipComment() && !scanCdataSection().is()) {
+                skipDocumentTypeDeclaration();
+            }
+            break;
+        case '/':
+            ++pos_;
+            return handleEndTag();
+        case '?':
+            ++pos_;
+            skipProcessingInstruction();
+            break;
+        default:
+            return handleStartTag(ns, data);
+        }
+    }
+}
+
+XmlReader::Result XmlReader::handleRawText(Span * text) {
+    pad_.clear();
+    for (char const * begin = pos_;;) {
+        switch (peek()) {
+        case '\0': // i.e., EOF
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("premature end of ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        case '\x0D':
+            pad_.add(begin, pos_ - begin);
+            ++pos_;
+            if (peek() != '\x0A') {
+                pad_.add(RTL_CONSTASCII_STRINGPARAM("\x0A"));
+            }
+            begin = pos_;
+            break;
+        case '&':
+            pad_.add(begin, pos_ - begin);
+            pos_ = handleReference(pos_, end_);
+            begin = pos_;
+            break;
+        case '<':
+            pad_.add(begin, pos_ - begin);
+            ++pos_;
+            switch (peek()) {
+            case '!':
+                ++pos_;
+                if (!skipComment()) {
+                    Span cdata(scanCdataSection());
+                    if (cdata.is()) {
+                        normalizeLineEnds(cdata);
+                    } else {
+                        skipDocumentTypeDeclaration();
+                    }
+                }
+                begin = pos_;
+                break;
+            case '/':
+                *text = pad_.get();
+                ++pos_;
+                state_ = STATE_END_TAG;
+                return RESULT_TEXT;
+            case '?':
+                ++pos_;
+                skipProcessingInstruction();
+                begin = pos_;
+                break;
+            default:
+                *text = pad_.get();
+                state_ = STATE_START_TAG;
+                return RESULT_TEXT;
+            }
+            break;
+        default:
+            ++pos_;
+            break;
+        }
+    }
+}
+
+XmlReader::Result XmlReader::handleNormalizedText(Span * text) {
+    pad_.clear();
+    char const * flowBegin = pos_;
+    char const * flowEnd = pos_;
+    enum Space { SPACE_START, SPACE_NONE, SPACE_SPAN, SPACE_BREAK };
+        // a single true space character can go into the current flow,
+        // everything else breaks the flow
+    Space space = SPACE_START;
+    for (;;) {
+        switch (peek()) {
+        case '\0': // i.e., EOF
+            throw css::uno::RuntimeException(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM("premature end of ")) +
+                 fileUrl_),
+                css::uno::Reference< css::uno::XInterface >());
+        case '\x09':
+        case '\x0A':
+        case '\x0D':
+            switch (space) {
+            case SPACE_START:
+            case SPACE_BREAK:
+                break;
+            case SPACE_NONE:
+            case SPACE_SPAN:
+                space = SPACE_BREAK;
+                break;
+            }
+            ++pos_;
+            break;
+        case ' ':
+            switch (space) {
+            case SPACE_START:
+            case SPACE_BREAK:
+                break;
+            case SPACE_NONE:
+                space = SPACE_SPAN;
+                break;
+            case SPACE_SPAN:
+                space = SPACE_BREAK;
+                break;
+            }
+            ++pos_;
+            break;
+        case '&':
+            switch (space) {
+            case SPACE_START:
+                break;
+            case SPACE_NONE:
+            case SPACE_SPAN:
+                pad_.add(flowBegin, pos_ - flowBegin);
+                break;
+            case SPACE_BREAK:
+                pad_.add(flowBegin, flowEnd - flowBegin);
+                pad_.add(RTL_CONSTASCII_STRINGPARAM(" "));
+                break;
+            }
+            pos_ = handleReference(pos_, end_);
+            flowBegin = pos_;
+            flowEnd = pos_;
+            space = SPACE_NONE;
+            break;
+        case '<':
+            ++pos_;
+            switch (peek()) {
+            case '!':
+                ++pos_;
+                if (skipComment()) {
+                    space = SPACE_BREAK;
+                } else {
+                    Span cdata(scanCdataSection());
+                    if (cdata.is()) {
+                        // CDATA is not normalized (similar to character
+                        // references; it keeps the code simple), but it might
+                        // arguably be better to normalize it:
+                        switch (space) {
+                        case SPACE_START:
+                            break;
+                        case SPACE_NONE:
+                        case SPACE_SPAN:
+                            pad_.add(flowBegin, pos_ - flowBegin);
+                            break;
+                        case SPACE_BREAK:
+                            pad_.add(flowBegin, flowEnd - flowBegin);
+                            pad_.add(RTL_CONSTASCII_STRINGPARAM(" "));
+                            break;
+                        }
+                        normalizeLineEnds(cdata);
+                        flowBegin = pos_;
+                        flowEnd = pos_;
+                        space = SPACE_NONE;
+                    } else {
+                        skipDocumentTypeDeclaration();
+                    }
+                }
+                break;
+            case '/':
+                ++pos_;
+                pad_.add(flowBegin, flowEnd - flowBegin);
+                *text = pad_.get();
+                state_ = STATE_END_TAG;
+                return RESULT_TEXT;
+            case '?':
+                ++pos_;
+                skipProcessingInstruction();
+                space = SPACE_BREAK;
+                break;
+            default:
+                pad_.add(flowBegin, flowEnd - flowBegin);
+                *text = pad_.get();
+                state_ = STATE_START_TAG;
+                return RESULT_TEXT;
+            }
+            break;
+        default:
+            switch (space) {
+            case SPACE_START:
+                flowBegin = pos_;
+                break;
+            case SPACE_NONE:
+            case SPACE_SPAN:
+                break;
+            case SPACE_BREAK:
+                pad_.add(flowBegin, flowEnd - flowBegin);
+                pad_.add(RTL_CONSTASCII_STRINGPARAM(" "));
+                flowBegin = pos_;
+                break;
+            }
+            flowEnd = ++pos_;
+            space = SPACE_NONE;
+            break;
+        }
+    }
+}
+
+}
diff --git a/configmgr/source/xmlreader.hxx b/configmgr/source/xmlreader.hxx
new file mode 100644
index 0000000000..83ccac148c
--- /dev/null
+++ b/configmgr/source/xmlreader.hxx
@@ -0,0 +1,186 @@
+/*************************************************************************
+*
+* 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_CONFIGMGR_SOURCE_XMLREADER_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_XMLREADER_HXX
+
+#include "sal/config.h"
+
+#include <stack>
+#include <vector>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "osl/file.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#include "pad.hxx"
+#include "span.hxx"
+
+namespace configmgr {
+
+class XmlReader: private boost::noncopyable {
+public:
+    explicit XmlReader(rtl::OUString const & fileUrl)
+        SAL_THROW((
+            com::sun::star::container::NoSuchElementException,
+            com::sun::star::uno::RuntimeException));
+
+    ~XmlReader();
+
+    enum Namespace {
+        NAMESPACE_NONE, NAMESPACE_XML, NAMESPACE_OOR, NAMESPACE_XS,
+        NAMESPACE_XSI, NAMESPACE_OTHER };
+
+    enum Text { TEXT_NONE, TEXT_RAW, TEXT_NORMALIZED };
+
+    enum Result { RESULT_BEGIN, RESULT_END, RESULT_TEXT, RESULT_DONE };
+
+    // RESULT_BEGIN: data = localName, ns = ns
+    // RESULT_END: data, ns unused
+    // RESULT_TEXT: data = text, ns unused
+    Result nextItem(Text reportText, Span * data, Namespace * ns);
+
+    bool nextAttribute(Namespace * ns, Span * localName);
+
+    // the span returned by getAttributeValue is only valid until the next call
+    // to nextItem or getAttributeValue
+    Span getAttributeValue(bool fullyNormalize);
+
+    Namespace getNamespace(Span const & prefix) const;
+
+    rtl::OUString getUrl() const;
+
+private:
+    inline char read() { return pos_ == end_ ? '\0' : *pos_++; }
+
+    inline char peek() { return pos_ == end_ ? '\0' : *pos_; }
+
+    void normalizeLineEnds(Span const & text);
+
+    void skipSpace();
+
+    bool skipComment();
+
+    void skipProcessingInstruction();
+
+    void skipDocumentTypeDeclaration();
+
+    Span scanCdataSection();
+
+    bool scanName(char const ** nameColon);
+
+    Namespace scanNamespaceIri(char const * begin, char const * end);
+
+    char const * handleReference(char const * position, char const * end);
+
+    Span handleAttributeValue(
+        char const * begin, char const * end, bool fullyNormalize);
+
+    Result handleStartTag(Namespace * ns, Span * localName);
+
+    Result handleEndTag();
+
+    void handleElementEnd();
+
+    Result handleSkippedText(Span * data, Namespace * ns);
+
+    Result handleRawText(Span * text);
+
+    Result handleNormalizedText(Span * text);
+
+    struct NamespaceData {
+        Span prefix;
+        Namespace ns;
+
+        NamespaceData() {}
+
+        NamespaceData(Span const & thePrefix, Namespace theNs):
+            prefix(thePrefix), ns(theNs) {}
+    };
+
+    typedef std::vector< NamespaceData > NamespaceList;
+
+    struct ElementData {
+        Span name;
+        NamespaceList::size_type inheritedNamespaces;
+        Namespace defaultNamespace;
+
+        ElementData(
+            Span const & theName,
+            NamespaceList::size_type theInheritedNamespaces,
+            Namespace theDefaultNamespace):
+            name(theName), inheritedNamespaces(theInheritedNamespaces),
+            defaultNamespace(theDefaultNamespace)
+        {}
+    };
+
+    typedef std::stack< ElementData > ElementStack;
+
+    struct AttributeData {
+        char const * nameBegin;
+        char const * nameEnd;
+        char const * nameColon;
+        char const * valueBegin;
+        char const * valueEnd;
+
+        AttributeData(
+            char const * theNameBegin, char const * theNameEnd,
+            char const * theNameColon, char const * theValueBegin,
+            char const * theValueEnd):
+            nameBegin(theNameBegin), nameEnd(theNameEnd),
+            nameColon(theNameColon), valueBegin(theValueBegin),
+            valueEnd(theValueEnd)
+        {}
+    };
+
+    typedef std::vector< AttributeData > Attributes;
+
+    enum State {
+        STATE_CONTENT, STATE_START_TAG, STATE_END_TAG, STATE_EMPTY_ELEMENT_TAG,
+        STATE_DONE };
+
+    rtl::OUString fileUrl_;
+    oslFileHandle fileHandle_;
+    sal_uInt64 fileSize_;
+    void * fileAddress_;
+    NamespaceList namespaces_;
+    ElementStack elements_;
+    char const * pos_;
+    char const * end_;
+    State state_;
+    Attributes attributes_;
+    Attributes::iterator currentAttribute_;
+    bool firstAttribute_;
+    Pad pad_;
+};
+
+}
+
+#endif
diff --git a/configmgr/util/cfgmgr.mxp.map b/configmgr/util/cfgmgr.mxp.map
deleted file mode 100644
index 2bf8e6c7f9..0000000000
--- a/configmgr/util/cfgmgr.mxp.map
+++ /dev/null
@@ -1,4 +0,0 @@
-# Global symbols
-_component_getImplementationEnvironment
-_component_writeInfo
-_component_getFactory
diff --git a/configmgr/util/configmgr2.uno.xml b/configmgr/util/configmgr2.uno.xml
deleted file mode 100644
index 489c134d37..0000000000
--- a/configmgr/util/configmgr2.uno.xml
+++ /dev/null
@@ -1,582 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>configmgr2</module-name>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ConfigurationProvider</name>
-        <description>
-The configuration service provides access to a hierarchical database of configuration and preference data.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationProvider   </supported-service>
-        <service-dependency> com.sun.star.script.Converter			</service-dependency>
-        <service-dependency> com.sun.star.io.DataOutputStream		</service-dependency>
-        <type>	com.sun.star.configuration.MissingBootstrapFileException	</type>
-        <type>	com.sun.star.configuration.InvalidBootstrapFileException	</type>
-        <type>	com.sun.star.configuration.InstallationIncompleteException	</type>
-        <type>	com.sun.star.beans.PropertyValue				</type>
-        <type>	com.sun.star.beans.NamedValue					</type>
-        <type>	com.sun.star.lang.Locale						</type>
-        <type>	com.sun.star.lang.XUnoTunnel					</type>
-        <type>	com.sun.star.lang.ServiceNotRegisteredException	</type>
-        <type>	com.sun.star.lang.DisposedException				</type>
-        <type>	com.sun.star.script.XTypeConverter				</type>
-        <type>	com.sun.star.util.XCancellable					</type>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.AdministrationProvider</name>
-        <description>
-The configuration service provides access to a hierarchical database of configuration and preference data.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.AdministrationProvider      </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationProvider       </supported-service>
-        <service-dependency> com.sun.star.configuration.ConfigurationUpdateAccess   </service-dependency>
-        <service-dependency> com.sun.star.configuration.ConfigurationAccess		    </service-dependency>
-        <service-dependency> com.sun.star.script.Converter			</service-dependency>
-        <type>	com.sun.star.configuration.MissingBootstrapFileException	</type>
-        <type>	com.sun.star.configuration.InvalidBootstrapFileException	</type>
-        <type>	com.sun.star.configuration.InstallationIncompleteException	</type>
-        <type>	com.sun.star.beans.PropertyValue				</type>
-        <type>	com.sun.star.beans.NamedValue					</type>
-        <type>	com.sun.star.lang.Locale						</type>
-        <type>	com.sun.star.lang.XUnoTunnel					</type>
-        <type>	com.sun.star.lang.ServiceNotRegisteredException	</type>
-        <type>	com.sun.star.lang.DisposedException				</type>
-        <type>	com.sun.star.script.XTypeConverter				</type>
-        <type>	com.sun.star.util.XCancellable					</type>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ConfigurationProviderWrapper</name>
-        <description>
-Is a configuration provider that forwards its requests to a DefaultProvider.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationProvider   </supported-service>
-        <service-dependency> com.sun.star.configuration.DefaultProvider			</service-dependency>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ORootElementGroupInfoAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupAccess         </supported-service>
-        <supported-service>  com.sun.star.configuration.PropertyHierarchy   </supported-service>
-        <supported-service>  com.sun.star.configuration.AccessRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ORootElementGroupUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess  </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupUpdate         </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupAccess         </supported-service>
-        <supported-service>  com.sun.star.configuration.PropertyHierarchy   </supported-service>
-        <supported-service>  com.sun.star.configuration.UpdateRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.AccessRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ORootElementSetInfoAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.AccessRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ORootElementTreeSetUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetUpdate           </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetUpdate     </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.UpdateRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.AccessRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.ORootElementValueSetUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetUpdate           </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetUpdate     </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.UpdateRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.AccessRootElement   </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OSetElementGroupInfoAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupAccess         </supported-service>
-        <supported-service>  com.sun.star.configuration.PropertyHierarchy   </supported-service>
-        <supported-service>  com.sun.star.configuration.SetElement          </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OSetElementGroupUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess  </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupUpdate         </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupAccess         </supported-service>
-        <supported-service>  com.sun.star.configuration.PropertyHierarchy   </supported-service>
-        <supported-service>  com.sun.star.configuration.SetElement          </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OSetElementSetInfoAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetElement          </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OSetElementTreeSetUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetUpdate           </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetUpdate     </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetElement          </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OSetElementValueSetUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetUpdate           </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetUpdate     </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetElement          </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OInnerGroupInfoAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupAccess         </supported-service>
-        <supported-service>  com.sun.star.configuration.PropertyHierarchy   </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupElement        </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OInnerGroupUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess  </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupUpdate         </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupAccess         </supported-service>
-        <supported-service>  com.sun.star.configuration.PropertyHierarchy   </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupElement        </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OInnerSetInfoAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupElement        </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OInnerTreeSetUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetUpdate           </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetUpdate     </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupElement        </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.OInnerValueSetUpdateAccess</name>
-        <description>
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.ConfigurationUpdateAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.ConfigurationAccess </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.SetUpdate           </supported-service>
-        <supported-service>  com.sun.star.configuration.SetAccess           </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetUpdate     </supported-service>
-        <supported-service>  com.sun.star.configuration.SimpleSetAccess     </supported-service>
-        <supported-service>  com.sun.star.configuration.GroupElement        </supported-service>
-        <supported-service>  com.sun.star.configuration.HierarchyElement    </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.bootstrap.BootstrapContext</name>
-        <description>Context containing configuration bootstrap data merged with environment settings.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.bootstrap.BootstrapContext </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.SingleBackendAdapter</name>
-        <description>Backend using a SingleBackend for data access.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.SingleBackendAdapter </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.OnlineBackend </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.Backend </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.LayerUpdateMerger</name>
-        <description>Merges updates into layer data.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.LayerUpdateMerger </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.MergeImporter</name>
-        <description>Importer for layer data.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.MergeImporter </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.Importer </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.CopyImporter</name>
-        <description>Importer for layer data.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.CopyImporter </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.Importer </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.xml.SchemaParser</name>
-        <description>Parser for OOR Schema XML.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.xml.SchemaParser </supported-service>
-        <service-dependency> com.sun.star.xml.sax.Parser			</service-dependency>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.xml.LayerParser</name>
-        <description>Parser for OOR Layer/Update XML.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.xml.LayerParser </supported-service>
-        <service-dependency> com.sun.star.xml.sax.Parser			</service-dependency>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.xml.LayerWriter</name>
-        <description>Service for writing layer data to the OOR Layer/Update XML format.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.xml.LayerWriter </supported-service>
-        <service-dependency> com.sun.star.xml.sax.Writer			</service-dependency>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.LocalSingleBackend</name>
-        <description>SingleBackend for accessing locally stored configuration data.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.LocalSingleBackend </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.SingleBackend </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.LocalDataImporter</name>
-        <description>Component for importing layer data from local files.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.LocalDataImporter </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.DataImporter </supported-service>
-    </component-description>
-    <component-description>
-        <author>Joerg Barfurth</author>
-        <name>	com.sun.star.comp.configuration.backend.LocalHierarchyBrowser</name>
-        <description>Component for retrieving available componets from a local configuration data repository.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.LocalHierarchyBrowser </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.HierarchyBrowser </supported-service>
-    </component-description>
-        <component-description>
-        <author>Sarah Smith</author>
-        <name>	com.sun.star.comp.configuration.backend.LocalSchemaSupplier</name>
-        <description>Component for accessing locally stored schema files</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.LocalSchemaSupplier </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.SchemaSupplier </supported-service>
-    </component-description>
-    <component-description>
-        <author>Sarah Smith</author>
-        <name>	com.sun.star.comp.configuration.backend.LocalSingleStratum</name>
-        <description>Component for accessing locally stored configuration data</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.LocalSingleStratum </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.SingleLayerStratum </supported-service>
-    </component-description>
-    <component-description>
-        <author>Sarah Smith</author>
-        <name>	com.sun.star.comp.configuration.backend.MultiStratumBackend</name>
-        <description>Component for co-ordinating access to multiple storage backends</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>  com.sun.star.configuration.backend.MultiStratumBackend </supported-service>
-        <supported-service>  com.sun.star.configuration.backend.Backend </supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schoenheit</author>
-        <name>	com.sun.star.comp.configuration.OConfigurationRegistry</name>
-        <description>
-The configuration registry service is an adapter, that provides a SimpleRegistry interface to the configuration service.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>	c++	</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.configuration.ConfigurationRegistry</supported-service>
-        <supported-service>com.sun.star.registry.SimpleRegistry</supported-service>
-        <service-dependency>com.sun.star.configuration.ConfigurationProvider</service-dependency>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.registry.XSimpleRegistry</type>
-        <type>	com.sun.star.lang.ServiceNotRegisteredException	</type>
-        <type>	com.sun.star.util.XFlushable					</type>
-    </component-description>
-    <type>com.sun.star.uno.XAggregation</type>
-    <type>com.sun.star.uno.XCurrentContext</type>
-    <type>com.sun.star.uno.XWeak</type>
-    <type>com.sun.star.uno.TypeClass</type>
-    <type>com.sun.star.beans.XExactName</type>
-    <type>com.sun.star.beans.XHierarchicalPropertySet</type>
-    <type>com.sun.star.beans.XFastPropertySet</type>
-    <type>com.sun.star.beans.XMultiHierarchicalPropertySet</type>
-    <type>com.sun.star.beans.XMultiPropertySet</type>
-    <type>com.sun.star.beans.XProperty</type>
-    <type>com.sun.star.beans.XPropertyWithState</type>
-    <type>com.sun.star.beans.XPropertyState</type>
-    <type>com.sun.star.beans.XMultiPropertyStates</type>
-    <type>com.sun.star.beans.XPropertySet</type>
-    <type>com.sun.star.beans.PropertyValue</type>
-    <type>com.sun.star.beans.Property</type>
-    <type>com.sun.star.beans.PropertyAttribute</type>
-    <type>com.sun.star.configuration.XTemplateContainer</type>
-    <type>com.sun.star.configuration.XTemplateInstance</type>
-    <type>com.sun.star.configuration.backend.TemplateIdentifier</type>
-    <type>com.sun.star.configuration.backend.SchemaAttribute</type>
-    <type>com.sun.star.configuration.backend.NodeAttribute</type>
-    <type>com.sun.star.configuration.backend.XSchemaHandler</type>
-    <type>com.sun.star.configuration.backend.XLayerHandler</type>
-    <type>com.sun.star.configuration.backend.XUpdateHandler</type>
-    <type>com.sun.star.configuration.backend.XUpdatableLayer</type>
-    <type>com.sun.star.configuration.backend.XCompositeLayer</type>
-    <type>com.sun.star.configuration.backend.XLayerImporter</type>
-    <type>com.sun.star.configuration.backend.XBackend</type>
-    <type>com.sun.star.configuration.backend.XBackendEntities</type>
-    <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-    <type>com.sun.star.configuration.backend.XMultiLayerStratum</type>
-    <type>com.sun.star.configuration.backend.XSchemaSupplier</type>
-    <type>com.sun.star.configuration.backend.XSchema</type>
-    <type>com.sun.star.configuration.backend.XLayer</type>
-    <type>com.sun.star.configuration.backend.MalformedDataException</type>
-    <type>com.sun.star.configuration.backend.BackendAccessException</type>
-    <type>com.sun.star.configuration.backend.BackendSetupException</type>
-    <type>com.sun.star.configuration.backend.AuthenticationFailedException</type>
-    <type>com.sun.star.configuration.backend.InvalidAuthenticationMechanismException</type>
-    <type>com.sun.star.configuration.backend.CannotConnectException</type>
-    <type>com.sun.star.configuration.backend.InsufficientAccessRightsException</type>
-    <type>com.sun.star.configuration.backend.ConnectionLostException</type>
-    <type>com.sun.star.configuration.MissingBootstrapFileException</type>
-    <type>com.sun.star.configuration.InvalidBootstrapFileException</type>
-    <type>com.sun.star.configuration.InstallationIncompleteException</type>
-    <type>com.sun.star.container.XNamed</type>
-    <type>com.sun.star.container.XHierarchicalName</type>
-    <type>com.sun.star.container.XChild</type>
-    <type>com.sun.star.container.XNameAccess</type>
-    <type>com.sun.star.container.XNameReplace</type>
-    <type>com.sun.star.container.XNameContainer</type>
-    <type>com.sun.star.container.XHierarchicalNameAccess</type>
-    <type>com.sun.star.container.XElementAccess</type>
-    <type>com.sun.star.container.XContainer</type>
-    <type>com.sun.star.container.NoSuchElementException</type>
-    <type>com.sun.star.io.XActiveDataSink</type>
-    <type>com.sun.star.io.XActiveDataSource</type>
-    <type>com.sun.star.io.XInputStream</type>
-    <type>com.sun.star.io.XOutputStream</type>
-    <type>com.sun.star.io.XDataInputStream</type>
-    <type>com.sun.star.io.XDataOutputStream</type>
-    <type>com.sun.star.io.UnexpectedEOFException</type>
-    <type>com.sun.star.io.WrongFormatException</type>
-    <type>com.sun.star.lang.XComponent</type>
-    <type>com.sun.star.lang.XEventListener</type>
-    <type>com.sun.star.lang.XInitialization</type>
-    <type>com.sun.star.lang.XLocalizable</type>
-    <type>com.sun.star.lang.XMultiComponentFactory</type>
-    <type>com.sun.star.lang.XMultiServiceFactory</type>
-    <type>com.sun.star.lang.XSingleComponentFactory</type>
-    <type>com.sun.star.lang.XSingleServiceFactory</type>
-    <type>com.sun.star.lang.XServiceInfo</type>
-    <type>com.sun.star.lang.XTypeProvider</type>
-    <type>com.sun.star.lang.XUnoTunnel</type>
-    <type>com.sun.star.lang.EventObject</type>
-    <type>com.sun.star.lang.ServiceNotRegisteredException</type>
-    <type>com.sun.star.lang.IllegalArgumentException</type>
-    <type>com.sun.star.lang.WrappedTargetException</type>
-    <type>com.sun.star.lang.WrappedTargetRuntimeException</type>
-    <type>com.sun.star.lang.DisposedException</type>
-    <type>com.sun.star.script.XTypeConverter</type>
-    <type>com.sun.star.script.FailReason</type>
-    <type>com.sun.star.task.XJob</type>
-    <type>com.sun.star.util.XCancellable</type>
-    <type>com.sun.star.util.XChangesBatch</type>
-    <type>com.sun.star.util.XChangesListener</type>
-    <type>com.sun.star.util.XChangesNotifier</type>
-    <type>com.sun.star.util.XFlushable</type>
-    <type>com.sun.star.util.XStringEscape</type>
-    <type>com.sun.star.util.XTimeStamped</type>
-    <type>com.sun.star.util.Date</type>
-    <type>com.sun.star.util.Time</type>
-    <type>com.sun.star.util.DateTime</type>
-    <type>com.sun.star.xml.sax.XAttributeList</type>
-    <type>com.sun.star.xml.sax.XDocumentHandler</type>
-    <type>com.sun.star.xml.sax.XExtendedDocumentHandler</type>
-    <type>com.sun.star.xml.sax.XParser</type>
-    <type>com.sun.star.xml.sax.SAXParseException</type>
-    <project-build-dependency>	comphelper	</project-build-dependency>
-    <project-build-dependency>	vos			</project-build-dependency>
-    <project-build-dependency>	cppuhelper	</project-build-dependency>
-    <project-build-dependency>	salhelper	</project-build-dependency>
-    <project-build-dependency>	cppu		</project-build-dependency>
-    <project-build-dependency>	sal			</project-build-dependency>
-    <runtime-module-dependency>	comphelp2$(COM)		</runtime-module-dependency>
-    <runtime-module-dependency>	vos2$(COM)			</runtime-module-dependency>
-    <runtime-module-dependency>	cppuhelper3$(COM)	</runtime-module-dependency>
-    <runtime-module-dependency>	salhelper3$(COM)	</runtime-module-dependency>
-    <runtime-module-dependency>	cppu3		</runtime-module-dependency>
-    <runtime-module-dependency>	sal3		</runtime-module-dependency>
-</module-description>
diff --git a/configmgr/util/configmgrl.map b/configmgr/util/configmgrl.map
deleted file mode 100644
index ad92fbe03e..0000000000
--- a/configmgr/util/configmgrl.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CFGMGR_2_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/configmgr/util/exports.dxp b/configmgr/util/exports.dxp
deleted file mode 100644
index 9630d7e067..0000000000
--- a/configmgr/util/exports.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getImplementationEnvironment
-component_writeInfo
-component_getFactory
diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk
deleted file mode 100644
index eaea5d3435..0000000000
--- a/configmgr/util/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.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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=configmgr
-TARGET=configmgr
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE :  $(PRJ)$/version.mk
-DLLPRE = 
-
-# --- Library -----------------------------------
-
-SHL1TARGET=	$(CFGMGR_TARGET)$(CFGMGR_MAJOR).uno
-SHL1VERSIONMAP= $(TARGET).map
-
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
-    $(COMPHELPERLIB)			\
-    $(CPPULIB)					\
-    $(CPPUHELPERLIB)			\
-    $(VOSLIB)					\
-    $(SALHELPERLIB)				\
-    $(SALLIB)                   \
-    $(TOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1LIBS=	$(SLB)$/registry.lib	\
-            $(SLB)$/treecache.lib	\
-            $(SLB)$/misc.lib		\
-            $(SLB)$/backend.lib		\
-            $(SLB)$/localbe.lib		\
-            $(SLB)$/xml.lib			\
-            $(SLB)$/treemgr.lib		\
-            $(SLB)$/api2.lib		\
-            $(SLB)$/api.lib			\
-            $(SLB)$/data.lib		\
-            $(SLB)$/cm.lib
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-# --- Targets ----------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/workben/apitest/cfgadduser.cxx b/configmgr/workben/apitest/cfgadduser.cxx
deleted file mode 100644
index 38539074d2..0000000000
--- a/configmgr/workben/apitest/cfgadduser.cxx
+++ /dev/null
@@ -1,358 +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: cfgadduser.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_configmgr.hxx"
-
-#include <stdio.h>
-#include <string.h>
-#include <comphelper/stl_types.hxx>
-#include <cppuhelper/extract.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/servicefactory.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::container;
-
-#define ASCII_STRING(rtlOUString)	::rtl::OString((rtlOUString).getStr(), (rtlOUString).getLength(), RTL_TEXTENCODING_ASCII_US).getStr()
-
-//=============================================================================
-void explain(sal_Bool _bVerbose)
-{
-    cout << "cfgadduser - adding users to a registry server\n";
-    cout << "\nusage :\n";
-    cout << "cfgadduser [-s <server> -p <port>] [-portal] [-r <registry>] [-a <sysaccount>]";
-    cout << "           [-h <homedirbase>] [-pwd] <user> [<user>]*\n";
-    cout << "\nparameters\n";
-    cout << "  <server>      - machine where the registry server is running\n";
-    cout << "  <port>        - port the registry server is listening at\n";
-    cout << "  <registry>    - registry file to use to instantiate services. Defaulted to\n";
-    cout << "                  applicat.rdb\n";
-    cout << "  <sysaccount>  - system account to use for the newly created user(s)\n";
-    cout << "  <homedirbase> - home directory base. The concret home dir of a user will\n";
-    cout << "                  be built by appending the the user name to the base dir.\n";
-    cout << "  <user>        - user name to add\n";
-    cout << "  -portal       - specify that the program should connect to a running portal,\n";
-    cout << "                  not directly to the registry server (you need a ";
-#ifdef WIN32
-    cout << "portal.dll\n";
-#else
-    cout << "libportal.so\n";
-#endif
-    cout << "                  for this)\n";
-    cout << "                  In this case, <server> and <port> specify the location where\n";
-    cout << "                  StarPortal is running\n";
-    cout << "\n";
-    cout << "If no server is specified, the configuration proxy will try to bootstrap from\n";
-    cout << "the initialization file (";
-#ifdef WIN32
-    cout << "sregistry.ini";
-#else
-    cout << "sregistryrc";
-#endif
-    cout << ")\n\n";
-    cout.flush();
-}
-
-//=============================================================================
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    sal_Char* pPort = NULL;
-    sal_Char* pServer = NULL;
-    sal_Char* pRegistry = NULL;
-    sal_Char* pSysAccount = NULL;
-    sal_Char* pHomeDirBase = NULL;
-    sal_Bool bPortal = sal_False;
-
-    ::std::vector< sal_Char* > aUsers;
-
-    // collect some parameters
-    sal_Char** pArgs = argv + 1;
-    for (sal_Int32 i=1; i<argc; ++i, ++pArgs)
-    {
-        sal_Char* pCurArg = *pArgs;
-        sal_Int32 nLen = strlen(pCurArg);
-        sal_Bool bInvalidArg = sal_True;
-        if (nLen && ('-' == *pCurArg))
-        {	// it's a switch
-            sal_Char* pSwitch = pCurArg + 1;
-            switch (nLen)
-            {
-                case 2:
-                    switch (*pSwitch)
-                    {
-                        case '?':
-                            explain(sal_True);
-                            return 1;
-                        case 'h':
-                            pHomeDirBase = *++pArgs;
-                            ++i;
-                            bInvalidArg = sal_False;
-                            break;
-                        case 'a':
-                            pSysAccount = *++pArgs;
-                            ++i;
-                            bInvalidArg = sal_False;
-                            break;
-                        case 'p':
-                            pPort = *++pArgs;
-                            ++i;
-                            bInvalidArg = sal_False;
-                            break;
-                        case 's':
-                            pServer = *++pArgs;
-                            ++i;
-                            bInvalidArg = sal_False;
-                            break;
-                        case 'r':
-                            pRegistry = *++pArgs;
-                            ++i;
-                            bInvalidArg = sal_False;
-                            break;
-                    }
-                    break;
-                case 7:
-                    if (0 == strncmp(pSwitch, "portal", 6))
-                    {
-                        bInvalidArg = sal_False;
-                        bPortal = sal_True;
-                    }
-                    break;
-            }
-        }
-        else
-        {
-            if ((1 == nLen) && ('?' == *pCurArg))
-            {
-                explain(sal_True);
-                return 1;
-            }
-            else
-            {
-                bInvalidArg = sal_False;
-                aUsers.push_back(pCurArg);
-            }
-        }
-        if (bInvalidArg)
-        {
-            explain(sal_False);
-            return 1;
-        }
-    }
-
-    if ((!pServer && pPort) || (!pPort && pServer))
-    {
-        explain(sal_False);
-        return 1;
-    }
-
-    if (0 == aUsers.size())
-    {
-        explain(sal_False);
-        return 1;
-    }
-
-    // refine some params
-    ::rtl::OUString sHomeDirBase, sSystemAccountName;
-    if (pHomeDirBase)
-    {
-        sHomeDirBase = ::rtl::OUString::createFromAscii(pHomeDirBase);
-        if (!sHomeDirBase.getLength() || ('/' != sHomeDirBase.getStr()[sHomeDirBase.getLength() - 1]))
-            sHomeDirBase += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    }
-    if (pSysAccount)
-        sSystemAccountName = ::rtl::OUString::createFromAscii(pSysAccount);
-
-    try
-    {
-        ::rtl::OUString const sServiceRegistry = ::rtl::OUString::createFromAscii( pRegistry ? pRegistry : "applicat.rdb" );
-        Reference< XMultiServiceFactory > xORB = ::cppu::createRegistryServiceFactory(
-            sServiceRegistry,
-            ::rtl::OUString()
-            );
-        if (!xORB.is())
-        {
-            cerr << "Could not create the service factory !\n\n";
-            return 1;
-        }
-
-        // collect the params for the config provider
-        Sequence< Any > aProviderArgs(3 + (pServer ? 2 : 0));
-        aProviderArgs[0] = makeAny(PropertyValue(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("servertype")),
-                0,
-                makeAny(::rtl::OUString::createFromAscii(bPortal ? "portal" : "remote")),
-                PropertyState_DIRECT_VALUE
-                ));
-        aProviderArgs[1] = makeAny(PropertyValue(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")),
-                0,
-                makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Administrator"))),
-                PropertyState_DIRECT_VALUE
-                ));
-        aProviderArgs[2] = makeAny(PropertyValue(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")),
-                0,
-                makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unused"))),
-                PropertyState_DIRECT_VALUE
-                ));
-        if (pServer)
-        {
-            aProviderArgs[3] = makeAny(PropertyValue(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("server")),
-                    0,
-                    makeAny(::rtl::OUString::createFromAscii(pServer)),
-                    PropertyState_DIRECT_VALUE
-                    ));
-
-            sal_Int32 nPort = ::rtl::OUString::createFromAscii(pPort).toInt32();
-            aProviderArgs[4] = makeAny(PropertyValue(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("port")),
-                    0,
-                    makeAny(nPort),
-                    PropertyState_DIRECT_VALUE
-                    ));
-        }
-
-        Reference< XMultiServiceFactory > xCfgProvider(
-            xORB->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
-            aProviderArgs),
-            UNO_QUERY);
-        if (!xCfgProvider.is())
-        {
-            cerr << "Could not create the configuration provider !\n\n";
-            return 3;
-        }
-
-        Reference< XInterface > xIFace = xCfgProvider->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.configuration.UserAdministration"));
-        if (!xIFace.is())
-        {
-            cerr << "Could not create the configuration provider !\n\n";
-            return 4;
-        }
-
-        Reference< XChangesBatch > xUserChanges(xIFace, UNO_QUERY);
-        Reference< XNameContainer > xUserContainer(xIFace, UNO_QUERY);
-        Reference< XSingleServiceFactory> xUserFactory(xIFace, UNO_QUERY);
-        if (!xUserChanges.is() || !xUserContainer.is() || !xUserFactory.is())
-        {
-            cerr << "the user admin access does not provide the necessary interfaces !\n\n";
-            return 5;
-        }
-
-        cout << "going to add the users ..." << endl << endl;
-        for (	::std::vector< sal_Char* >::const_iterator aUserLoop = aUsers.begin();
-                aUserLoop != aUsers.end();
-                ++aUserLoop
-            )
-        {
-            cout << *aUserLoop << " ... ";
-            sal_Bool bHadLinebreak = sal_False;
-            try
-            {
-                Reference< XInterface > xNewUser = xUserFactory->createInstance();
-
-                // the user name as unicode string use more than once)
-                ::rtl::OUString sUserName = ::rtl::OUString::createFromAscii(*aUserLoop);
-
-                // the XNameContainer access to the Security node in the user profile data
-                Reference< XNameReplace > xSecurityDataAccess;
-                Reference< XNameAccess > xUserDataAccess(xNewUser, UNO_QUERY);
-                if (xUserDataAccess.is())
-                {
-                    Any aSecurity = xUserDataAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Security")));
-                    ::cppu::extractInterface(xSecurityDataAccess, aSecurity);
-                }
-
-                if (!xSecurityDataAccess.is())
-                    throw Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The user administration service did not provide a valid user template.")), NULL);
-
-                // set the home directory
-                if (sHomeDirBase.getLength())
-                {
-                    ::rtl::OUString sHomeDir(sHomeDirBase);
-                    sHomeDir += sUserName;
-                    xSecurityDataAccess->replaceByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeDirectory")), makeAny(sHomeDir));
-                    cout << "\n\thome dir      : " << ASCII_STRING(sHomeDir) << " ... ";
-                    cout.flush();
-                    bHadLinebreak = sal_True;
-                }
-
-                if (sSystemAccountName.getLength())
-                {
-                    xSecurityDataAccess->replaceByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemAccount")), makeAny(sSystemAccountName));
-                    cout << "\n\tsystem account: " << ASCII_STRING(sSystemAccountName) << " ... ";
-                    cout.flush();
-                    bHadLinebreak = sal_True;
-                }
-
-                xUserContainer->insertByName(sUserName, makeAny(xNewUser));
-                xUserChanges->commitChanges();
-                if (bHadLinebreak)
-                    cout << "\n";
-                cout << "done.\n";
-                cout.flush();
-            }
-            catch(Exception& e)
-            {
-                cout << "\n";
-                if (!bHadLinebreak)
-                    cout << "\t";
-                cerr << "unable to add the user named " << *aUserLoop << endl;
-                if (!bHadLinebreak)
-                    cout << "\t";
-                cerr << "(exception message: " << ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US).getStr() << ")" << endl;
-            }
-            cout << "\n";
-        }
-    }
-    catch(Exception& e)
-    {
-        cerr << "Caught exception: " << ASCII_STRING(e.Message) << endl;
-        return 2;
-    }
-
-    return 0;
-}
diff --git a/configmgr/workben/apitest/cfgadmin.cxx b/configmgr/workben/apitest/cfgadmin.cxx
deleted file mode 100644
index 0be8d861a0..0000000000
--- a/configmgr/workben/apitest/cfgadmin.cxx
+++ /dev/null
@@ -1,520 +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: cfgadmin.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_configmgr.hxx"
-#define _PRIVATE_TEST_
-
-#include <iostream>
-using namespace std;
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
-#include <com/sun/star/beans/XHierarchicalPropertySet.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Any.h>
-
-#include "createpropertyvalue.hxx"
-
-#include "typeconverter.hxx"
-#include <osl/time.h>
-
-// #include <com/sun/star/configuration/XConfigurationSync.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-//using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-//using namespace ::configmgr;
-
-using namespace ::cppu;
-
-#define ASCII(x) ::rtl::OUString::createFromAscii(x)
-
-ostream& operator << (ostream& out, rtl::OUString const& aStr)
-{
-    sal_Unicode const* const pStr = aStr.getStr();
-    sal_Unicode const* const pEnd = pStr + aStr.getLength();
-    for (sal_Unicode const* p = pStr; p < pEnd; ++p)
-        if (0 < *p && *p < 127) // ASCII
-            out << char(*p);
-        else
-            out << "[\\u" << hex << *p << "]";
-    return out;
-}
-
-void showSequence(const Sequence<OUString> &aSeq)
-{
-    OUString aArray;
-    const OUString *pStr = aSeq.getConstArray();
-    for (int i=0;i<aSeq.getLength();i++)
-    {
-        OUString aStr = pStr[i];
-        // aArray += aStr + ASCII(", ");
-        cout << aStr << endl;
-    }
-    volatile int dummy = 0;
-}
-
-//=============================================================================
-//=============================================================================
-void test_read_access(Reference< XInterface >& xIface, Reference< XMultiServiceFactory > &xMSF);
-//=============================================================================
-struct prompt_and_wait
-{
-    char const* myText;
-    prompt_and_wait(char const* text = "") : myText(text) {}
-    ~prompt_and_wait() 
-    {
-        cout << myText << ">" << endl;
-        int const mx = int( (+0u - +1u) >> 1);
-
-        char c=0; 
-        if (cin.get(c) && c != '\n')
-            cin.ignore(mx,'\n'); 
-    }
-}; 
-static prompt_and_wait exit_prompt("Quitting\nQ");
-
-
-// -----------------------------------------------------------------------------
-Sequence<Any> createSequence(const OUString &sUser, const OUString &sPasswd)
-{
-    Sequence< Any > aCPArgs;
-        
-    if (sUser.getLength() > 0)
-    {
-        aCPArgs.realloc(1);
-        aCPArgs[0] <<= configmgr::createPropertyValue(ASCII("user"), sUser);
-    }
-    if (sPasswd.getLength() > 0)
-    {
-        aCPArgs.realloc(2);
-        aCPArgs[1] <<= configmgr::createPropertyValue(ASCII("password"), sPasswd);
-    }
-    return aCPArgs;
-}
-
-//=============================================================================
-#include <string.h>
-#if (defined UNX) || (defined OS2)
-#else
-#include <conio.h>
-#endif
-
-OString input(const char* pDefaultText, char cEcho)
-{
-    // PRE: a Default Text would be shown, cEcho is a Value which will show if a key is pressed.
-    const int MAX_INPUT_LEN = 500;
-    char aBuffer[MAX_INPUT_LEN];
-
-    strcpy(aBuffer, pDefaultText);
-    int nLen = strlen(aBuffer);
-
-#ifdef WNT
-    char ch = '\0';
-
-    cout << aBuffer;
-    cout.flush();
-
-    while(ch != 13)
-    {
-        ch = getch();
-        if (ch == 8)
-        {
-            if (nLen > 0)
-            {
-                cout << "\b \b";
-                cout.flush();
-                --nLen;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-        else if (ch != 13)
-        {
-            if (nLen < MAX_INPUT_LEN)
-            {
-                if (cEcho == 0)
-                {
-                    cout << ch;
-                }
-                else
-                {
-                    cout << cEcho;
-                }
-                cout.flush();
-                aBuffer[nLen++] = ch;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-    }
-#else
-    if (!cin.getline(aBuffer,sizeof aBuffer))
-        return OString();
-#endif
-    return OString(aBuffer);
-}
-
-// -----------------------------------------------------------------------------
-rtl::OUString enterValue(const char* _aStr, const char* _aDefault, bool _bIsAPassword)
-{
-    cout << _aStr;
-    cout.flush();
-    OString aTxt = input(_aDefault, _bIsAPassword ? '*' : 0);
-
-    OUString sValue = OUString::createFromAscii(aTxt);
-    return sValue;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void write(Reference<XNameAccess  >& xAccess)
-{
-        if (xAccess.is())
-        {
-            Sequence<OUString> aNames( xAccess->getElementNames() );
-
-            cout << "Element Names: (" << aNames.getLength() << ")";
-            for (int i = 0; i < aNames.getLength(); ++i)
-                cout << "\n[" << i << "] -\t" << aNames[i];
-            cout << endl;
-        }
-        else
-            cout << "BUG: XNameAccess not available";
-        cout << endl;
-}
-// -----------------------------------------------------------------------------
-void write(Reference< XChild >& xChild)
-{
-        if (xChild.is())
-            cout << "\n[ P ] -\tParent";
-        else
-            cout << "BUG: Parent not available (no XChild)";
-        cout << endl;
-}
-
-// -----------------------------------------------------------------------------
-void displayTree(Reference< XNameAccess > xIFace){
-    
-    write(Reference< XNameAccess >(xIFace));
-}
-
-
-// -----------------------------------------------------------------------------
-void displayGroups(Reference< XNameAccess > xGroupAccess)
-{
-
-    cout << "Currently available groups    !\n---------------------------------------------------------------" << endl;
-    write(xGroupAccess);
-}
-
-// -----------------------------------------------------------------------------
-OUString insertGroup(Reference< XNameAccess > xGroupAccess)
-{
-    OUString sGroup =   enterValue("    Enter a new group to create: ", "", true);
-
-    Reference< XSingleServiceFactory > xFactory(xGroupAccess, UNO_QUERY);
-    Reference< XNameAccess > xNewGroup(xFactory->createInstance(), UNO_QUERY);		
-
-    cout << "Group data:			    !\n---------------------------------------------------------------" << endl;
-    write(xNewGroup);
-    Any aGroup;
-    aGroup <<= xNewGroup;
-    Reference< XNameContainer >(xGroupAccess, UNO_QUERY)->insertByName(sGroup, aGroup);
-    return sGroup;
-}
-
-// -----------------------------------------------------------------------------
-void deleteGroup(Reference< XNameAccess > xGroupAccess, OUString sGroup)
-{
-    if (!sGroup.getLength())
-        sGroup =   enterValue("    Enter a group to delete: ", "", true);
-    cout << "deleting group          !\n---------------------------------------------------------------" << endl;
-    Reference< XNameContainer >(xGroupAccess, UNO_QUERY)->removeByName(sGroup);		
-}
-
-// -----------------------------------------------------------------------------
-void displayUsers(Reference< XNameAccess > xUserAccess)
-{
-    cout << "Currently available users    !\n---------------------------------------------------------------" << endl;
-    write(xUserAccess);
-}
-
-// -----------------------------------------------------------------------------
-OUString insertUser(Reference< XNameAccess > xUserAccess, OUString aGroup)
-{
-    OUString sUser =   enterValue("    Enter a new User to create: ", "", true);
-    Reference< XSingleServiceFactory > xFactory(xUserAccess, UNO_QUERY);
-
-    Sequence< Any > aArgs(1);				
-    aArgs[0] <<= configmgr::createPropertyValue(ASCII("group"), aGroup);		
-    Reference< XNameAccess > xNewUser(xFactory->createInstanceWithArguments(aArgs), UNO_QUERY);	
-    
-    cout << "User data:			    !\n---------------------------------------------------------------" << endl;
-    write(xNewUser);				
-        
-    Any aValue;
-    aValue <<= ASCII("MyCompany");
-
-    // now do some updates for the user
-    Reference< XHierarchicalPropertySet > xUpdate(xNewUser, UNO_QUERY);
-    xUpdate->setHierarchicalPropertyValue(ASCII("Data/Company"),aValue);
-    
-    Any aUser;
-    aUser <<= xNewUser;
-    Reference< XNameContainer >(xUserAccess, UNO_QUERY)->insertByName(sUser, aUser);
-
-    return sUser;
-}
-
-// -----------------------------------------------------------------------------
-void deleteUser(Reference< XNameAccess > xUserAccess, OUString sUser)
-{
-    if (!sUser.getLength())
-        sUser =   enterValue("    Enter a User to delete: ", "", true);
-    cout << "deleting User          !\n---------------------------------------------------------------" << endl;
-    Reference< XNameContainer >(xUserAccess, UNO_QUERY)->removeByName(sUser);		
-}
-
-// -----------------------------------------------------------------------------
-Reference< XNameAccess > beginChanges(Reference< XMultiServiceFactory > xFactory, OUString sPath, OUString& sUser)
-{
-    if (!sUser.getLength())
-        sUser =   enterValue("    Enter a User: ", "", true);	
-    
-    Sequence< Any > aArgs(2);
-    aArgs[0] <<= configmgr::createPropertyValue(ASCII("user"), sUser);
-    aArgs[1] <<= configmgr::createPropertyValue(ASCII("nodepath"),sPath);		
-
-    cout << "starting update for node:" << sPath << endl;	
-
-    Reference< XNameAccess > xTree(xFactory->createInstanceWithArguments(OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
-            aArgs), UNO_QUERY);
-
-    return xTree;
-}
-
-template <class Type>
-// -----------------------------------------------------------------------------
-void update(Reference< XInterface > xIFace, OUString sRelPath, Type sValue)
-{
-    Reference< XHierarchicalPropertySet > xTree(xIFace, UNO_QUERY);	
-    Any aValue;
-    aValue <<= sValue;
-
-    cout << "updating node:" << sRelPath << endl;
-    xTree->setHierarchicalPropertyValue(sRelPath, aValue);
-}
-
-// -----------------------------------------------------------------------------
-Reference< XHierarchicalPropertySet > insertTree(Reference< XInterface > xIFace, OUString aName)
-{
-    if (!aName.getLength())
-        aName =   enterValue("/nEnter a Tree to insert: ", "", false);	
-    
-    Reference< XSingleServiceFactory > xFactory(xIFace, UNO_QUERY);
-    Reference< XHierarchicalPropertySet > xNewElement(xFactory->createInstance(), UNO_QUERY);		
-
-    cout << "inserting new tree element:" << aName << endl;
-    
-    Any aTree;
-    aTree <<= xNewElement;
-    Reference< XNameContainer >(xFactory, UNO_QUERY)->insertByName(aName, aTree);		
-
-    return xNewElement;
-}
-
-// -----------------------------------------------------------------------------
-void removeTree(Reference< XInterface > xIFace, OUString aName)
-{
-    if (!aName.getLength())
-        aName =   enterValue("/nEnter a Tree to remove: ", "", false);	
-    
-    cout << "removing new tree element:" << aName << endl;
-    
-    Reference< XNameContainer >(xIFace, UNO_QUERY)->removeByName(aName);			
-}
-
-// -----------------------------------------------------------------------------
-void commitChanges(Reference< XInterface > xIFace)
-{
-    cout << "committing changes:" << endl;
-    
-    Reference< XChangesBatch > xChangesBatch(xIFace, UNO_QUERY);
-    xChangesBatch->commitChanges();	
-}
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- M A I N ----------------------------------
-// -----------------------------------------------------------------------------
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    // cout << "    Please insert Text: ";
-    // cout.flush();
-    // OString aTxt = input("Der Text", 0);
-    // cout << endl << "You inserted: " << aTxt.getStr() << endl;
-    // 
-    // cout << "Please insert Password: ";
-    // cout.flush();
-    // OString aPasswd = input("", '*');
-    // cout << endl << "You inserted: " << aPasswd.getStr() << endl;
-
-    try
-    {
-        OUString const sServiceRegistry = OUString::createFromAscii( argc > 1 ? argv[1] : "applicat.rdb" );
-        Reference< XMultiServiceFactory > xORB = createRegistryServiceFactory(
-            sServiceRegistry,
-            ::rtl::OUString()
-            );
-        if (!xORB.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the service factory !\n\n";
-            return 1;
-        }
-        cout << "Service factory created !\n---------------------------------------------------------------" << endl;		
-        
-        Sequence< Any > aCPArgs = createSequence(OUString::createFromAscii("Administrator"), OUString());		
-
-        Reference< XMultiServiceFactory > xCfgProvider(
-            xORB->createInstanceWithArguments(
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.AdministrationProvider"),
-                aCPArgs),
-            UNO_QUERY);		
-        
-        if (!xCfgProvider.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the configuration provider !\n\n";
-            return 3;
-        }
-
-        cout << "Configuration Provider created !\n---------------------------------------------------------------" << endl;
-        
-        Reference< XNameAccess > xUpdateAccess;
-        Reference< XNameAccess > xGroupAccess(xCfgProvider->createInstance(OUString::createFromAscii("com.sun.star.configuration.GroupAccess")),UNO_QUERY);		
-        Reference< XNameAccess > xUserAccess(xCfgProvider->createInstance(OUString::createFromAscii("com.sun.star.configuration.UserAccess")),UNO_QUERY);		
-
-        displayGroups(xGroupAccess);		
-        displayUsers(xUserAccess);		
-        
-// create a group
-        OUString sGroupName = insertGroup(xGroupAccess);		
-// create a user
-        OUString sUserName;
-        sUserName = insertUser(xUserAccess, sGroupName);
-
-// now do updates for the user
-        xUpdateAccess = beginChanges(xCfgProvider, OUString::createFromAscii("org.openoffice.Inet"), sUserName);
-    
-        update(xUpdateAccess, OUString::createFromAscii("Proxy/FTP/Port"), sal_Int32(12));
-        update(xUpdateAccess, OUString::createFromAscii("Proxy/FTP/Name"), OUString::createFromAscii("demo"));
-        update(xUpdateAccess, OUString::createFromAscii("DNS/IP_Address"), OUString::createFromAscii("demo1"));		
-
-        xUpdateAccess = beginChanges(xCfgProvider, OUString::createFromAscii("org.openoffice.Office.Common"), sUserName);		
-        update(xUpdateAccess, OUString::createFromAscii("_3D_Engine/Dithering"), sal_Bool(sal_False));
-        commitChanges(xUpdateAccess);
-
-// now do updates with inserting and removing of nodes
-        
-        xUpdateAccess = beginChanges(xCfgProvider, OUString::createFromAscii("org.openoffice.Security/MountPoints"), sUserName);
-        displayTree(xUpdateAccess);
-
-        Reference< XHierarchicalPropertySet > xTree = insertTree(xUpdateAccess, OUString());		
-        update(xUpdateAccess, OUString::createFromAscii("InstallationDirectory/Directory"), OUString::createFromAscii("Test1"));
-        removeTree(xUpdateAccess, OUString());		
-        commitChanges(xUpdateAccess);
-
-
-/*		deleteUser(xUserAccess, sUserName);
-        deleteGroup(xGroupAccess, sGroupName);		*/
-
-        displayGroups(xGroupAccess);		
-        displayUsers(xUserAccess);		
-    }
-    catch (Exception& e) 
-    {
-        ::flush(cout);
-        cerr << "Caught exception: " << e.Message << endl;
-        return 1;
-    }
-/*
-    catch (...) 
-    {
-        flush(cout);
-        cerr << "BUG: Caught UNKNOWN exception (?) " << endl;
-    }
-*/
-    return 0;
-}
-
-
-
-
diff --git a/configmgr/workben/apitest/cfgapi.cxx b/configmgr/workben/apitest/cfgapi.cxx
deleted file mode 100644
index f774027c9c..0000000000
--- a/configmgr/workben/apitest/cfgapi.cxx
+++ /dev/null
@@ -1,868 +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: cfgapi.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_configmgr.hxx"
-#define _PRIVATE_TEST_
-
-#include <iostream>
-using namespace std;
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Any.h>
-#include <osl/profile.hxx>
-#include <osl/process.h>
-#include <osl/file.h>
-
-#include "createpropertyvalue.hxx"
-
-#include "typeconverter.hxx"
-
-// #include <com/sun/star/configuration/XConfigurationSync.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-//using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-//using namespace ::configmgr;
-
-using namespace ::cppu;
-
-#define ASCII(x) ::rtl::OUString::createFromAscii(x)
-
-ostream& operator << (ostream& out, rtl::OUString const& aStr)
-{
-    sal_Unicode const* const pStr = aStr.getStr();
-    sal_Unicode const* const pEnd = pStr + aStr.getLength();
-    for (sal_Unicode const* p = pStr; p < pEnd; ++p)
-        if (0 < *p && *p < 127) // ASCII
-            out << char(*p);
-        else
-            out << "[\\u" << hex << *p << "]";
-    return out;
-}
-
-void showSequence(const Sequence<OUString> &aSeq)
-{
-    OUString aArray;
-    const OUString *pStr = aSeq.getConstArray();
-    for (int i=0;i<aSeq.getLength();i++)
-    {
-        OUString aStr = pStr[i];
-        // aArray += aStr + ASCII(", ");
-        cout << aStr << endl;
-    }
-    volatile int dummy = 0;
-}
-
-//=============================================================================
-
-inline void operator <<= (::rtl::OUString& _rUnicodeString, const sal_Char* _pAsciiString)
-{
-    _rUnicodeString = ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (::rtl::OUString& _rUnicodeString, const ::rtl::OString& _rAsciiString)
-{
-    _rUnicodeString <<= _rAsciiString.getStr();
-}
-
-inline void operator <<= (Any& _rUnoValue, const sal_Char* _pAsciiString)
-{
-    _rUnoValue <<= ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (Any& _rUnoValue, const ::rtl::OString& _rAsciiString)
-{
-    _rUnoValue <<= _rAsciiString.getStr();
-}
-
-//=============================================================================
-void test_read_access(Reference< XInterface >& xIface, Reference< XMultiServiceFactory > &xMSF);
-//=============================================================================
-struct prompt_and_wait
-{
-    char const* myText;
-    prompt_and_wait(char const* text = "") : myText(text) {}
-    ~prompt_and_wait() 
-    {
-        cout << myText << ">" << endl;
-        int const mx = int( (+0u - +1u) >> 1);
-
-        char c=0; 
-        if (cin.get(c) && c != '\n')
-            cin.ignore(mx,'\n'); 
-    }
-}; 
-static prompt_and_wait exit_prompt("Quitting\nQ");
-
-
-Reference< XChangesBatch > xChangesBatch = NULL;
-void commit()
-{
-    if (xChangesBatch.is())
-    {
-        xChangesBatch->commitChanges();
-    }
-}
-
-// -----------------------------------------------------------------------------
-static sal_Bool				s_bInitialized	=	sal_False;
-#ifdef LLA_PRIVAT_DEBUG
-static const sal_Char*		s_pSourcePath	=	"l:/src625/configmgr/workben/local_io/share";
-static const sal_Char*		s_pUpdatePath	=	"l:/src625/configmgr/workben/local_io/user";
-static const sal_Char*		s_pRootNode		=	"org.openoffice.ucb.Hierarchy"; // "org.openoffice.test";
-static const sal_Char*		s_pServerType	=	"local";
-static const sal_Char*		s_pLocale		=	"de-DE";
-static const sal_Char*		s_pServer		=	"";
-static const sal_Char*		s_pUser			=	"";
-static const sal_Char*		s_pPassword		=	"";
-#else
-static const sal_Char*		s_pSourcePath	=	"g:/src/configmgr/workben/local_io/share";
-static const sal_Char*		s_pUpdatePath	=	"g:/src/configmgr/workben/local_io/user";
-static const sal_Char*		s_pRootNode		=	"org.openoffice.Office.TypeDetection";
-static const sal_Char*		s_pServerType	=	"setup";
-static const sal_Char*		s_pLocale		=	"de-DE";
-static const sal_Char*		s_pServer		=	"lautrec-3108:19205";
-static const sal_Char*		s_pUser			=	"lars";
-static const sal_Char*		s_pPassword		=	"";
-#endif
-
-
-// -----------------------------------------------------------------------------
-static void loadDefaults()
-{
-    if (s_bInitialized)
-        return;
-
-    s_bInitialized = sal_True;
-
-    try
-    {
-        // the executable file name
-        ::rtl::OUString sExecutable;
-        osl_getExecutableFile(&sExecutable.pData);
-        // cut the name, add a cfgapi.ini to the path
-        sal_Int32 nLastSep = sExecutable.lastIndexOf('/');
-        if (-1 != nLastSep)
-            sExecutable = sExecutable.copy(0, nLastSep + 1);
-#ifdef UNX
-        sExecutable += ::rtl::OUString::createFromAscii("cfgapirc");
-#else
-        sExecutable += ::rtl::OUString::createFromAscii("cfgapi.ini");
-#endif
-        ::rtl::OUString sNormalized;
-        sNormalized = sExecutable;
-        if (1)
-        {
-            ::osl::Profile aProfile(sNormalized);
-
-            static ::rtl::OString	sSection("defaults");
-            static ::rtl::OString	sSourcePath("sourcepath");
-            static ::rtl::OString	sUpdatePath("updatepath");
-            static ::rtl::OString	sRootNode("rootnode");
-            static ::rtl::OString	sServerType("servertype");
-            static ::rtl::OString	sLocale("Locale");
-            static ::rtl::OString	sServer("Server");
-            static ::rtl::OString	sUser("User");
-            static ::rtl::OString	sPassword("Password");
-
-            // read some strings.
-            // Do this static because we want to redirect the global static character pointers to the buffers.
-            static ::rtl::OString s_sSourcePath	= aProfile.readString(sSection, sSourcePath, s_pSourcePath);
-            static ::rtl::OString s_sUpdatePath	= aProfile.readString(sSection, sUpdatePath, s_pUpdatePath);
-            static ::rtl::OString s_sRootNode	= aProfile.readString(sSection, sRootNode, s_pRootNode);
-            static ::rtl::OString s_sServerType	= aProfile.readString(sSection, sServerType, s_pServerType);
-            static ::rtl::OString s_sLocale		= aProfile.readString(sSection, sLocale, s_pLocale);
-            static ::rtl::OString s_sServer		= aProfile.readString(sSection, sServer, s_pServer);
-            static ::rtl::OString s_sUser		= aProfile.readString(sSection, sUser, s_pUser);
-            static ::rtl::OString s_sPassword	= aProfile.readString(sSection, sPassword, s_pPassword);
-
-            // do this redirection
-            s_pSourcePath	=	s_sSourcePath.getStr();
-            s_pUpdatePath	=	s_sUpdatePath.getStr();
-            s_pRootNode		=	s_sRootNode.getStr();
-            s_pServerType	=	s_sServerType.getStr();
-            s_pLocale		=	s_sLocale.getStr();
-            s_pServer		=	s_sServer.getStr();
-            s_pUser			=	s_sUser.getStr();
-            s_pPassword		=	s_sPassword.getStr();
-        }
-    }
-    catch(std::exception& e)
-    {
-        e.what();	// silence warnings
-    }
-}
-
-// -----------------------------------------------------------------------------
-Sequence<Any> createSequence(const OUString &sUser, const OUString &sPasswd)
-{
-    Sequence< Any > aCPArgs;
-        
-    if (sUser.getLength() > 0)
-    {
-        aCPArgs.realloc(1);
-        aCPArgs[0] <<= configmgr::createPropertyValue(ASCII("user"), sUser);
-    }
-    if (sPasswd.getLength() > 0)
-    {
-        aCPArgs.realloc(2);
-        aCPArgs[1] <<= configmgr::createPropertyValue(ASCII("password"), sPasswd);
-    }
-    return aCPArgs;
-}
-
-//=============================================================================
-#include <string.h>
-#if (defined UNX) || (defined OS2)
-#else
-#include <conio.h>
-#endif
-
-OString input(const char* pDefaultText, char cEcho)
-{
-    // PRE: a Default Text would be shown, cEcho is a Value which will show if a key is pressed.
-    const int MAX_INPUT_LEN = 500;
-    char aBuffer[MAX_INPUT_LEN];
-
-    strcpy(aBuffer, pDefaultText);
-    int nLen = strlen(aBuffer);
-
-#ifdef WNT
-    char ch = '\0';
-
-    cout << aBuffer;
-    cout.flush();
-
-    while(ch != 13)
-    {
-        ch = getch();
-        if (ch == 8)
-        {
-            if (nLen > 0)
-            {
-                cout << "\b \b";
-                cout.flush();
-                --nLen;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-        else if (ch != 13)
-        {
-            if (nLen < MAX_INPUT_LEN)
-            {
-                if (cEcho == 0)
-                {
-                    cout << ch;
-                }
-                else
-                {
-                    cout << cEcho;
-                }
-                cout.flush();
-                aBuffer[nLen++] = ch;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-    }
-#else
-    if (!cin.getline(aBuffer,sizeof aBuffer))
-        return OString();
-#endif
-    return OString(aBuffer);
-}
-
-// -----------------------------------------------------------------------------
-rtl::OUString enterValue(const char* _aStr, const char* _aDefault, bool _bIsAPassword)
-{
-    cout << _aStr;
-    cout.flush();
-
-    OUString sValue;
-    sValue <<= input(_aDefault, _bIsAPassword ? '*' : 0);
-    return sValue;
-}
-
-
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- M A I N ----------------------------------
-// -----------------------------------------------------------------------------
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    // cout << "    Please insert Text: ";
-    // cout.flush();
-    // OString aTxt = input("Der Text", 0);
-    // cout << endl << "You inserted: " << aTxt.getStr() << endl;
-    // 
-    // cout << "Please insert Password: ";
-    // cout.flush();
-    // OString aPasswd = input("", '*');
-    // cout << endl << "You inserted: " << aPasswd.getStr() << endl;
-
-    loadDefaults();
-
-    try
-    {
-        OUString const sServiceRegistry = OUString::createFromAscii( argc > 1 ? argv[1] : "applicat.rdb" );
-        Reference< XMultiServiceFactory > xORB = createRegistryServiceFactory(
-            sServiceRegistry,
-            ::rtl::OUString()
-            );
-        if (!xORB.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the service factory !\n\n";
-            return 1;
-        }
-        cout << "Service factory created !\n---------------------------------------------------------------" << endl;
-
-        Sequence< Any > aCPArgs;
-
-        OUString sServerType = enterValue("servertype: ", s_pServerType, false);
-        cout << endl;
-
-
-        rtl::OUString sUser;
-
-        bool bLocal = sServerType.equalsIgnoreAsciiCase(ASCII("local")) || sServerType.equalsIgnoreAsciiCase(ASCII("setup"));
-        if (!bLocal)
-        {
-            rtl::OUString sServer;
-            sServer =			enterValue("server  : ", s_pServer,false);
-            cout << endl;
-
-            sUser =				enterValue("user    : ", s_pUser, false);
-            cout << endl;
-            
-            OUString sPasswd =	enterValue("password: ", s_pPassword, true);
-            cout << endl;
-
-            aCPArgs = createSequence(sUser, sPasswd);
-
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("server"), sServer);
-
-            OUString sTimeout = ASCII("10000");
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("timeout"), sTimeout);
-
-        }
-        else
-        {
-            rtl::OUString sSharePath, sUserPath;
-            sSharePath =		enterValue("share path: ", s_pSourcePath, false);
-            cout << endl;
-            sUserPath =			enterValue("user path : ", s_pUpdatePath, false);
-            cout << endl;
-
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            sal_Int32 nCount = aCPArgs.getLength() - 1;
-            Any *pAny = &aCPArgs[nCount];
-            *pAny <<= configmgr::createPropertyValue(ASCII("sourcepath"), sSharePath);
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("updatepath"), sUserPath);
-        }
-        
-        aCPArgs.realloc(aCPArgs.getLength() + 1);
-        aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("servertype"), sServerType);
-
-        Reference< XMultiServiceFactory > xCfgProvider(
-            xORB->createInstanceWithArguments(
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
-                aCPArgs),
-            UNO_QUERY);
-        if (!xCfgProvider.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the configuration provider !\n\n";
-            return 3;
-        }
-
-
-
-
-        char aPath[300] =			"/";
-        int nStart = sizeof(	"/"	) - 1;
-
-        cout << "---------------------------------------------------------------\n Configuration Provider created !\n---------------------------------------------------------------" << endl;
-
-        Sequence< Any > aArgs;
-        aArgs = createSequence(sUser, ASCII(""));
-
-        OUString sPath =	enterValue("nodepath: ", s_pRootNode, false);
-        cout << endl;
-
-        aArgs.realloc(aArgs.getLength() + 1);
-        aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("nodepath"), sPath);
-
-        if (!bLocal)
-        {
-            OUString sLocale =	enterValue("locale  : ", s_pLocale, false);
-            cout << endl;
-            aArgs.realloc(aArgs.getLength() + 1);
-            aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("locale"), sLocale);
-        }
-/*
-#else
-        OUString aStr = ASCII("String");
-        sal_Int32 nDepth = 10;
-        Sequence< Any > aArgs(2);
-        
-        aArgs[0] <<= aStr;
-        aArgs[1] <<= nDepth;
-#endif
-*/
-        Reference< XInterface > xIFace = xCfgProvider->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
-            aArgs);
-        cout << "---------------------------------------------------------------\n Configuration Read/Write Access created !\n---------------------------------------------------------------" << endl;
-
-        xChangesBatch = Reference< XChangesBatch >(xIFace, UNO_QUERY);
-
-        Sequence<OUString> aSeq = xCfgProvider->getAvailableServiceNames();
-        showSequence(aSeq);
-        
-        test_read_access(xIFace, xCfgProvider);
-    }
-    catch (Exception& e) 
-    {
-        ::flush(cout);
-        cerr << "Caught exception: " << e.Message << endl;
-    }
-/*
-    catch (...) 
-    {
-        flush(cout);
-        cerr << "BUG: Caught UNKNOWN exception (?) " << endl;
-    }
-*/
-    return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void test(Reference< XHierarchicalName >& xAccessName)
-{
-        if (xAccessName.is())
-            cout << "Accessing Node: " << xAccessName->getHierarchicalName();
-        else
-            cout << "BUG: XHierarchicalName not available";
-        cout << endl;
-}
-void test(Reference< XNamed >& xAccess)
-{
-        if (xAccess.is())
-            cout << "Node is named: " << xAccess->getName();
-        else
-            cout << "BUG: XNamed not available";
-        cout << endl;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void write(Reference<XNameAccess  >& xAccess)
-{
-        if (xAccess.is())
-        {
-            Sequence<OUString> aNames( xAccess->getElementNames() );
-
-            cout << "Element Names: (" << aNames.getLength() << ")";
-            for (int i = 0; i < aNames.getLength(); ++i)
-                cout << "\n[" << i << "] -\t" << aNames[i];
-            cout << endl;
-        }
-        else
-            cout << "BUG: XNameAccess not available";
-        cout << endl;
-}
-void write(Reference< XChild >& xChild)
-{
-        if (xChild.is())
-            cout << "\n[ P ] -\tParent";
-        else
-            cout << "BUG: Parent not available (no XChild)";
-        cout << endl;
-}
-///////////////////////////////////////////////////////////////////////////////////////////
-
-bool ask(Reference< XInterface >& xIface, Reference<XMultiServiceFactory> &);
-
-void test_read_access(Reference< XInterface >& xIface, Reference< XMultiServiceFactory > &xMSF)
-{
-    using com::sun::star::uno::UNO_QUERY;
-    do
-    {
-        cout << "\n\n---------------------------------------------------------------" << endl;
-        Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-        Reference< XChild > xChild(xIface, UNO_QUERY);
-        Reference< XHierarchicalName > xAccessPath(xIface,UNO_QUERY);
-        Reference< XNamed > xAccessName(xIface,UNO_QUERY);
-//		Reference< XHierarchicalNameAccess >& xAccess(xIface, UNO_QUERY);
-
-        test(xAccessPath);
-        test(xAccessName);
-        write(xAccess);
-        write(xChild);
-    }
-    while (ask(xIface, xMSF));
-}
-
-bool ask(Reference< XInterface >& xIface, Reference< XMultiServiceFactory > &xMSF)
-{
-    cout << "\n[ Q ] -> <Quit>";
-    cout << "\n[ S ] -> <SetValue> ";
-    cout << endl;
-
-    cout << "\n:> " << flush;
-    char buf[200] = {0};
-    try
-    {
-        bool bHandled = false;
-        bool bInserted = false;
-
-        if (cin.getline(buf,sizeof buf))  
-        {
-            Reference< XInterface > xNext;
-            if ((buf[0] == 'q' || buf[0] == 'Q') && (0 == buf[1]))
-            {
-                return false;
-            }
-            else if (buf[0] == 0)
-            {
-                return true;
-            }
-            else if((buf[0] == 0 || buf[0] == 'o' || buf[0] == 'O') && (0 == buf[1]))
-            {
-/*
-                cout << "work Offline" << endl;
-                Reference<com::sun::star::configuration::XConfigurationSync> xSync(xMSF, UNO_QUERY);
-
-                Sequence< Any > aArgs2(5);
-                sal_Int32 n=0;
-                aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Setup"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.Common"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.Java"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.Writer"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.ucb.Hierarchy"));
-                xSync->offline(aArgs2);
-                bHandled = true;
-*/
-            }
-            else if((buf[0] == 0 || buf[0] == 's' || buf[0] == 'S') && (0 == buf[1]))
-            {
-                // Replace a Value
-                Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-                
-                cout << "SetMode, insert a Number" << endl;
-                cin.getline(buf,sizeof buf);
-                bInserted = true;
-            }
-
-            else if ((buf[0] == 'p' || buf[0] == 'P') && (0 == buf[1]))
-            {
-                Reference< XChild > xChild(xIface, UNO_QUERY);
-                if (xChild.is())
-                    xNext = xChild->getParent();
-                bHandled = true;
-            }
-
-            if (bHandled == false)
-            {
-                Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-                Reference< XHierarchicalNameAccess > xDeepAccess(xIface, UNO_QUERY);
-                Reference< XExactName > xExactName(xIface, UNO_QUERY);
-
-                if (xAccess.is() || xDeepAccess.is())
-                {
-                    OUString aName;
-                    OUString aInput = OUString::createFromAscii(buf);
-
-                    if (xExactName.is())
-                    {
-                        ::rtl::OUString sTemp = xExactName->getExactName(aInput);
-                        if (sTemp.getLength())
-                            aInput = sTemp;
-                    }
-
-                    if (xAccess.is() && xAccess->hasByName(aInput))
-                    {
-                        aName = aInput;
-                    }
-                    else if (xDeepAccess.is() && xDeepAccess->hasByHierarchicalName(aInput))
-                    {
-                        aName = aInput;
-                    }
-                    else if ('0' <= buf[0] && buf[0] <= '9' && xAccess.is())
-                    {
-                        unsigned int n = unsigned(atoi(buf));
-                        Sequence<OUString> aNames = xAccess->getElementNames();
-                        if (n < aNames.getLength())
-                            aName = aNames[n];
-                    }
-
-                    if (aName.getLength())
-                    { 
-                        bool bNest = aInput.indexOf(sal_Unicode('/')) >= 0;
-
-                        Any aElement = bNest	? ( xDeepAccess.is() ? xDeepAccess->getByHierarchicalName(aName) : Any()) 
-                                                : ( xAccess.    is() ? xAccess->    getByName(aName)             : Any() );
-
-                        while (aElement.getValueTypeClass() == TypeClass_ANY)
-                        {
-                            Any aWrap(aElement);
-                            aWrap >>= aElement;
-                        }
-                        sal_Bool bValue = true;
-                        sal_Bool bValueOk = false;
-
-                        switch (aElement.getValueTypeClass() )
-                        {
-                        case TypeClass_INTERFACE: bValue = false; break;
-                        case TypeClass_BOOLEAN:
-                            {
-                                sal_Bool* pVal = (sal_Bool*)aElement.getValue();
-                                bValueOk = (pVal != 0);
-
-                                cout << "VALUE '" << aName << "' is a BOOLEAN = ";
-                                if (!bValueOk)
-                                    cout << "NULL (error!!)";
-                                else if (*pVal)
-                                    cout << "'TRUE'";
-                                else
-                                    cout << "'FALSE'";
-
-                                cout << endl;
-                            }
-                            break;
-                        case TypeClass_SHORT:
-                            {
-                                sal_Int16 aValue;
-                                cout << "VALUE '" << aName << "' is a SHORT (16 bit) = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                    cout << aValue;
-                                else
-                                    cout << "ERROR RETRIEVING VALUE";
-                                cout << endl;
-                            }
-                            break;
-                        case TypeClass_LONG:
-                            {
-
-                                sal_Int32 aValue;
-                                cout << "VALUE '" << aName << "' is a INT (32 bit) = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                    cout << aValue;
-                                else
-                                    cout << "ERROR RETRIEVING VALUE";
-                                cout << endl;
-                            }
-                            break;
-                        case TypeClass_HYPER:
-                            {
-                                sal_Int64 aValue;
-                                cout << "VALUE '" << aName << "' is a LONG (64 bit) = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                    cout << double(aValue);
-                                else
-                                    cout << "ERROR RETRIEVING VALUE";
-                                cout << endl;
-                            }
-                            break;
-                        case TypeClass_DOUBLE:
-                            {
-                                double aValue;
-                                cout << "VALUE '" << aName << "' is a DOUBLE = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                    cout << aValue;
-                                else
-                                    cout << "ERROR RETRIEVING VALUE";
-                                cout << endl;
-                            }
-                            break;
-                        case TypeClass_STRING:
-                            {
-                                OUString aValue;
-                                cout << "VALUE '" << aName << "' is a STRING = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                    cout << "\"" << aValue << "\"";
-                                else
-                                    cout << "ERROR RETRIEVING VALUE";
-                                cout << endl;
-                            }
-                            break;
-                        case TypeClass_SEQUENCE:
-                            {
-                                cout << "VALUE '" << aName << "' is a SEQUENCE or BINARY" << endl;
-
-                                Type aTypeS = configmgr::getSequenceElementType(aElement.getValueType());
-                                OUString sType = configmgr::toTypeName(aTypeS.getTypeClass());
-                                cout << "Real type is Sequence<" << sType << ">" << endl;
-                                bValueOk = true;
-                            }
-                            break;
-                        case TypeClass_VOID:
-                            cout << "ELEMENT '" << aName << "' is NULL and VOID " << endl;
-                            bValueOk = true;
-                            break;
-                        default:
-                                cout << "Error: ELEMENT '" << aName << "' is of unknown or unrecognized type" << endl;
-                            break;
-                        }
-                        if (bValue)
-                        {
-                            if (bInserted)
-                            {
-                                if (aElement.getValueTypeClass() == TypeClass_BOOLEAN || 
-                                    aElement.getValueTypeClass() == TypeClass_VOID)
-                                {
-                                    cout << "Set Value (Type=BOOL) to :";
-                                    cout.flush();
-                                    cin.getline(buf,sizeof buf);
-                                    OUString aInput = OUString::createFromAscii(buf);
-                                    sal_Bool bValue = false;
-                                    if (aInput.equalsIgnoreAsciiCase(ASCII("true")))
-                                        bValue = true;
-
-                                    OUString aStr = ASCII("false");
-                                    Any aValueAny;
-                                    aValueAny <<= bValue;
-                                    
-                                    Reference< XNameReplace > xNameReplace(xAccess, UNO_QUERY);
-                                    if (xNameReplace.is())
-                                    {
-                                        xNameReplace->replaceByName(aName, aValueAny);
-                                        commit();
-                                    }
-                                    bInserted = false;
-                                }
-                                else if (aElement.getValueTypeClass() == TypeClass_STRING)
-                                {
-                                    cout << "set value (type = string) to : ";
-                                    cout.flush();
-                                    cin.getline(buf,sizeof buf);
-                                    Any aValue;
-                                    aValue <<= buf;
-
-                                    Reference< XNameReplace > xNameReplace(xAccess, UNO_QUERY);
-                                    if (xNameReplace.is())
-                                    {
-                                        xNameReplace->replaceByName(aName, aValue);
-                                        commit();
-                                    }
-                                    bInserted = false;
-                                }
-                                else
-                                {
-                                    cout << "Sorry, only BOOLEAN Values can changed today." << endl;
-                                }
-                            }
-                            prompt_and_wait();
-                            return bValueOk ? true : false;
-                        }
-
-                        if (aElement >>= xNext)
-                            cout << "Got an Interface for '" << aName << "'" << endl;
-                        else
-                            cout << "Error: Cannot get an Interface for '" << aName << "'" << endl;
-                    }
-                    else
-                    {
-                        cout << "Error: No element \"" << aInput << "\" found." <<endl;
-                    }
-                }
-
-            }
-            if (xNext.is())
-            {
-                xIface = xNext;
-                return true;
-            }
-            cout << "Error: could not obtain the requested Object " << endl;
-        }
-        else
-        {
-            cout << "Input Error " << endl;
-            return true;
-        }
-    } 
-    catch (Exception& e)
-    {
-        cout << "An Exception occurred: " << e.Message << endl;
-        
-    }
-    catch (...)
-    {
-        cout << "An UNKNOWN Exception occurred !" << endl;
-    }
-
-    prompt_and_wait();
-    return true;
-}
diff --git a/configmgr/workben/apitest/cfgapi_timetest.cxx b/configmgr/workben/apitest/cfgapi_timetest.cxx
deleted file mode 100644
index c7d32eb783..0000000000
--- a/configmgr/workben/apitest/cfgapi_timetest.cxx
+++ /dev/null
@@ -1,960 +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: cfgapi_timetest.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_configmgr.hxx"
-#define _PRIVATE_TEST_
-
-#include <iostream>
-using namespace std;
-
-#include <vector>
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Any.h>
-#include <osl/profile.hxx>
-#include <osl/process.h>
-#include <osl/file.h>
-
-#include "createpropertyvalue.hxx"
-
-#include "typeconverter.hxx"
-
-// #include <com/sun/star/configuration/XConfigurationSync.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-//using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-//using namespace ::configmgr;
-
-using namespace ::cppu;
-
-#define ASCII(x) ::rtl::OUString::createFromAscii(x)
-
-bool m_bInteractive = false;
-
-#define COUT if(m_bInteractive) cout
-
-ostream& operator << (ostream& out, rtl::OUString const& aStr)
-{
-    sal_Unicode const* const pStr = aStr.getStr();
-    sal_Unicode const* const pEnd = pStr + aStr.getLength();
-    for (sal_Unicode const* p = pStr; p < pEnd; ++p)
-        if (0 < *p && *p < 127) // ASCII
-            out << char(*p);
-        else
-            out << "[\\u" << hex << *p << "]";
-    return out;
-}
-
-void showSequence(const Sequence<OUString> &aSeq)
-{
-    OUString aArray;
-    const OUString *pStr = aSeq.getConstArray();
-    for (int i=0;i<aSeq.getLength();i++)
-    {
-        OUString aStr = pStr[i];
-        // aArray += aStr + ASCII(", ");
-        COUT << aStr << endl;
-    }
-    volatile int dummy = 0;
-}
-
-//=============================================================================
-
-inline void operator <<= (::rtl::OUString& _rUnicodeString, const sal_Char* _pAsciiString)
-{
-    _rUnicodeString = ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (::rtl::OUString& _rUnicodeString, const ::rtl::OString& _rAsciiString)
-{
-    _rUnicodeString <<= _rAsciiString.getStr();
-}
-
-inline void operator <<= (Any& _rUnoValue, const sal_Char* _pAsciiString)
-{
-    _rUnoValue <<= ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (Any& _rUnoValue, const ::rtl::OString& _rAsciiString)
-{
-    _rUnoValue <<= _rAsciiString.getStr();
-}
-
-//=============================================================================
-void test_read_access(Reference< XInterface >& xIface, const Reference< XMultiServiceFactory > &xMSF);
-//=============================================================================
-
-// -----------------------------------------------------------------------------
-struct prompt_and_wait
-{
-    char const* myText;
-    prompt_and_wait(char const* text = "") : myText(text) {}
-    ~prompt_and_wait() 
-    {
-        if (m_bInteractive)
-        {
-            COUT << myText << ">" << endl;
-            int const mx = int( (+0u - +1u) >> 1);
-            
-            char c=0; 
-            if (cin.get(c) && c != '\n')
-                cin.ignore(mx,'\n'); 
-        }
-    }
-};
-static prompt_and_wait exit_prompt("Quitting\nQ");
-
-
-Reference< XChangesBatch > xChangesBatch = NULL;
-void commit()
-{
-    if (xChangesBatch.is())
-    {
-        xChangesBatch->commitChanges();
-    }
-}
-
-// -----------------------------------------------------------------------------
-static sal_Bool				s_bInitialized	=	sal_False;
-static const sal_Char*		s_pSourcePath	=	"f:/office60_623/share/config/registry";
-static const sal_Char*		s_pUpdatePath	=	"f:/office60_623/user/config/registry";
-static const sal_Char*		s_pRootNode		=	"org.openoffice.Office.Common";
-static const sal_Char*		s_pServerType	=	"local";
-static const sal_Char*		s_pLocale		=	"de-DE";
-static const sal_Char*		s_pServer		=	"lautrec-3108:19205";
-static const sal_Char*		s_pUser			=	"lars";
-static const sal_Char*		s_pPassword		=	"";
-
-std::vector<rtl::OString> m_sNodes;
-
-// -----------------------------------------------------------------------------
-static void loadDefaults()
-{
-    if (s_bInitialized)
-        return;
-
-    s_bInitialized = sal_True;
-
-    try
-    {
-        // the executable file name
-        ::rtl::OUString sExecutable;
-        osl_getExecutableFile(&sExecutable.pData);
-        // cut the name, add a cfgapi.ini to the path
-        sal_Int32 nLastSep = sExecutable.lastIndexOf('/');
-        if (-1 != nLastSep)
-            sExecutable = sExecutable.copy(0, nLastSep + 1);
-#ifdef UNX
-        sExecutable += ::rtl::OUString::createFromAscii("cfgapirc");
-#else
-        sExecutable += ::rtl::OUString::createFromAscii("cfgapi.ini");
-#endif
-        ::rtl::OUString sSystem;
-        if (osl_File_E_None == osl_getSystemPathFromFileURL(sExecutable.pData, &sSystem.pData))
-        {
-            ::osl::Profile aProfile(sExecutable);
-
-            static ::rtl::OString	sSection("defaults");
-            static ::rtl::OString	sSourcePath("sourcepath");
-            static ::rtl::OString	sUpdatePath("updatepath");
-            static ::rtl::OString	sRootNode("rootnode");
-            static ::rtl::OString	sServerType("servertype");
-            static ::rtl::OString	sLocale("Locale");
-            static ::rtl::OString	sServer("Server");
-            static ::rtl::OString	sUser("User");
-            static ::rtl::OString	sPassword("Password");
-
-            // read some strings.
-            // Do this static because we want to redirect the global static character pointers to the buffers.
-            static ::rtl::OString s_sSourcePath	= aProfile.readString(sSection, sSourcePath, s_pSourcePath);
-            static ::rtl::OString s_sUpdatePath	= aProfile.readString(sSection, sUpdatePath, s_pUpdatePath);
-            static ::rtl::OString s_sRootNode	= aProfile.readString(sSection, sRootNode, s_pRootNode);
-            static ::rtl::OString s_sServerType	= aProfile.readString(sSection, sServerType, s_pServerType);
-            static ::rtl::OString s_sLocale		= aProfile.readString(sSection, sLocale, s_pLocale);
-            static ::rtl::OString s_sServer		= aProfile.readString(sSection, sServer, s_pServer);
-            static ::rtl::OString s_sUser		= aProfile.readString(sSection, sUser, s_pUser);
-            static ::rtl::OString s_sPassword	= aProfile.readString(sSection, sPassword, s_pPassword);
-
-            // do this redirection
-            s_pSourcePath	=	s_sSourcePath.getStr();
-            s_pUpdatePath	=	s_sUpdatePath.getStr();
-            s_pRootNode		=	s_sRootNode.getStr();
-            s_pServerType	=	s_sServerType.getStr();
-            s_pLocale		=	s_sLocale.getStr();
-            s_pServer		=	s_sServer.getStr();
-            s_pUser			=	s_sUser.getStr();
-            s_pPassword		=	s_sPassword.getStr();
-
-            static ::rtl::OString	sNodeSection("nodes");
-            static ::rtl::OString	sCount("count");
-            rtl::OUString sCountValue;
-            sCountValue <<= aProfile.readString(sNodeSection, sCount, "0");
-            sal_Int32 nCount = sCountValue.toInt32();
-            for (sal_Int32 i=0;i<nCount;i++)
-            {
-                ::rtl::OString sNodeName("node");
-                sNodeName += OString::valueOf(i);
-                ::rtl::OString sNode = aProfile.readString(sNodeSection, sNodeName, "");
-                m_sNodes.push_back(sNode);
-            }
-        }
-    }
-    catch(std::exception& e)
-    {
-        e.what();	// silence warnings
-    }
-}
-
-// -----------------------------------------------------------------------------
-Sequence<Any> createSequence(const OUString &sUser, const OUString &sPasswd)
-{
-    Sequence< Any > aCPArgs;
-        
-    if (sUser.getLength() > 0)
-    {
-        aCPArgs.realloc(1);
-        aCPArgs[0] <<= configmgr::createPropertyValue(ASCII("user"), sUser);
-    }
-    if (sPasswd.getLength() > 0)
-    {
-        aCPArgs.realloc(2);
-        aCPArgs[1] <<= configmgr::createPropertyValue(ASCII("password"), sPasswd);
-    }
-    return aCPArgs;
-}
-
-//=============================================================================
-#include <string.h>
-#if (defined UNX) || (defined OS2)
-#else
-#include <conio.h>
-#endif
-
-OString input(const char* pDefaultText, char cEcho)
-{
-    // PRE: a Default Text would be shown, cEcho is a Value which will show if a key is pressed.
-    const int MAX_INPUT_LEN = 500;
-    char aBuffer[MAX_INPUT_LEN];
-
-    strcpy(aBuffer, pDefaultText);
-    int nLen = strlen(aBuffer);
-
-#ifdef WNT
-    char ch = '\0';
-
-    COUT << aBuffer;
-    cout.flush();
-
-    while(ch != 13)
-    {
-        ch = getch();
-        if (ch == 8)
-        {
-            if (nLen > 0)
-            {
-                COUT << "\b \b";
-                cout.flush();
-                --nLen;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                COUT << "\a";
-                cout.flush();
-            }
-        }
-        else if (ch != 13)
-        {
-            if (nLen < MAX_INPUT_LEN)
-            {
-                if (cEcho == 0)
-                {
-                    COUT << ch;
-                }
-                else
-                {
-                    COUT << cEcho;
-                }
-                cout.flush();
-                aBuffer[nLen++] = ch;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                COUT << "\a";
-                cout.flush();
-            }
-        }
-    }
-#else
-    if (!cin.getline(aBuffer,sizeof aBuffer))
-        return OString();
-#endif
-    return OString(aBuffer);
-}
-
-
-// -----------------------------------------------------------------------------
-rtl::OUString enterValue(const char* _aStr, const char* _aDefault, bool _bIsAPassword)
-{
-    COUT << _aStr;
-    cout.flush();
-
-    OUString sValue;
-    if (m_bInteractive)
-    {
-        sValue <<= input(_aDefault, _bIsAPassword ? '*' : 0);
-    }
-    else
-    {
-        sValue <<= _aDefault;
-    }
-    return sValue;
-}
-
-
-
-void ask_for_a_node_and_test_it(const Reference< XMultiServiceFactory > &xCfgProvider, 
-                                const OUString& sUser, const OUString &sPasswd, 
-                                const OUString& sPath, bool bLocal, const OUString &sLocale);
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- M A I N ----------------------------------
-// -----------------------------------------------------------------------------
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    // COUT << "    Please insert Text: ";
-    // cout.flush();
-    // OString aTxt = input("Der Text", 0);
-    // COUT << endl << "You inserted: " << aTxt.getStr() << endl;
-    // 
-    // COUT << "Please insert Password: ";
-    // cout.flush();
-    // OString aPasswd = input("", '*');
-    // COUT << endl << "You inserted: " << aPasswd.getStr() << endl;
-
-    loadDefaults();
-
-    m_bInteractive = false;
-    //if (argc > 1)
-    //{
-    //	OString aParam(argv[1]);
-    //	if (aParam.equals("ask"))
-    //	{
-    //		m_bInteractive = true;
-    //	}
-    //}
-
-    try
-    {
-        OUString const sServiceRegistry = OUString::createFromAscii( argc > 1 ? argv[1] : "applicat.rdb" );
-        Reference< XMultiServiceFactory > xORB = createRegistryServiceFactory(
-            sServiceRegistry,
-            ::rtl::OUString()
-            );
-        if (!xORB.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the service factory !\n\n";
-            return 1;
-        }
-        COUT << "Service factory created !\n---------------------------------------------------------------" << endl;
-
-        Sequence< Any > aCPArgs;
-
-        OUString sServerType = enterValue("servertype: ", s_pServerType, false);
-        COUT << endl;
-
-
-        rtl::OUString sUser, sPasswd;
-        
-        bool bLocal = sServerType.equalsIgnoreAsciiCase(ASCII("local")) || sServerType.equalsIgnoreAsciiCase(ASCII("setup"));
-        if (!bLocal)
-        {
-            rtl::OUString sServer;
-            sServer =			enterValue("server  : ", s_pServer,false);
-            COUT << endl;
-
-            sUser =				enterValue("user    : ", s_pUser, false);
-            COUT << endl;
-            
-            sPasswd = enterValue("password: ", s_pPassword, true);
-            COUT << endl;
-
-            aCPArgs = createSequence(sUser, sPasswd);
-
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("server"), sServer);
-
-            long nTimeout = 10000;
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("timeout"), nTimeout);
-
-            long nPort = 9205;
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("port"), nPort);
-        }
-        else
-        {
-            rtl::OUString sSharePath, sUserPath;
-            sSharePath =		enterValue("share path: ", s_pSourcePath, false);
-            COUT << endl;
-            sUserPath =			enterValue("user path : ", s_pUpdatePath, false);
-            COUT << endl;
-
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            Any* pAny;
-            pAny = &aCPArgs[aCPArgs.getLength() - 1];
-            *pAny <<= configmgr::createPropertyValue(ASCII("sourcepath"), sSharePath);
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("updatepath"), sUserPath);
-        }
-        
-        aCPArgs.realloc(aCPArgs.getLength() + 1);
-        aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("servertype"), sServerType);
-
-        Reference< XMultiServiceFactory > xCfgProvider(
-            xORB->createInstanceWithArguments(
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
-                aCPArgs),
-            UNO_QUERY);
-        if (!xCfgProvider.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the configuration provider !\n\n";
-            return 3;
-        }
-
-        cout << "---------------------------------------------------------------\n Configuration Provider created !\n---------------------------------------------------------------" << endl;
-
-        OUString sPath;
-        sPath <<= s_pRootNode;
-        OUString sLocale;
-        sLocale <<= s_pLocale;
-
-        if (m_bInteractive)
-        {
-            sPath = enterValue("nodepath: ", s_pRootNode, false);
-            COUT << endl;
-            if (bLocal)
-            {
-                sLocale = enterValue("locale  : ", s_pLocale, false);
-                COUT << endl;
-            }
-            ask_for_a_node_and_test_it(xCfgProvider, sUser, sPasswd, sPath, bLocal, sLocale);
-        }
-        else
-        {
-            sUser <<= "";
-            for(std::vector<OString>::const_iterator it = m_sNodes.begin();
-                it != m_sNodes.end();
-                ++it)
-            {
-                OUString sPath;
-                sPath <<= *it;
-                if (sPath.getLength() > 0)
-                    ask_for_a_node_and_test_it(xCfgProvider, sUser, sPasswd, sPath, bLocal, sLocale);
-            }
-        }
-    }
-    catch (Exception& e) 
-    {
-        ::flush(cout);
-        cerr << "Caught exception: " << e.Message << endl;
-        return 1;
-    }
-    return 0;
-}
-
-// -----------------------------------------------------------------------------
-void ask_for_a_node_and_test_it(const Reference< XMultiServiceFactory > &xCfgProvider, 
-                                const OUString& sUser, const OUString &sPasswd, 
-                                const OUString& sPath, bool bLocal, const OUString &sLocale)
-{
-    try
-    {
-        Sequence< Any > aArgs;
-        aArgs = createSequence(sUser, sPasswd);
-
-        aArgs.realloc(aArgs.getLength() + 1);
-        aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("nodepath"), sPath);
-
-        if (!bLocal)
-        {
-            aArgs.realloc(aArgs.getLength() + 1);
-            aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("locale"), sLocale);
-        }
-
-        Reference< XInterface > xIFace = xCfgProvider->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
-            aArgs);
-        cout << "Configuration Read/Write Access created for :" << sPath << endl;
-
-        xChangesBatch = Reference< XChangesBatch >(xIFace, UNO_QUERY);
-
-        Sequence<OUString> aSeq = xCfgProvider->getAvailableServiceNames();
-        showSequence(aSeq);
-        
-        test_read_access(xIFace, xCfgProvider);
-    }
-    catch (Exception& e) 
-    {
-        ::flush(cout);
-        cerr << "Caught exception: " << e.Message << endl;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void test(Reference< XHierarchicalName >& xAccessName)
-{
-        if (xAccessName.is())
-        {
-            COUT << "Accessing Node: " << xAccessName->getHierarchicalName() << endl;
-        }
-        else
-        {
-            cerr << "BUG: XHierarchicalName not available" << endl;
-        }
-}
-// -----------------------------------------------------------------------------
-void test(Reference< XNamed >& xAccess)
-{
-        if (xAccess.is())
-        {
-            COUT << "Node is named: " << xAccess->getName() << endl;
-        }
-        else
-            cerr << "BUG: XNamed not available" << endl;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void write(Reference<XNameAccess  >& xAccess)
-{
-        if (xAccess.is())
-        {
-            Sequence<OUString> aNames( xAccess->getElementNames() );
-
-            COUT << "Element Names: (" << aNames.getLength() << ")";
-            for (int i = 0; i < aNames.getLength(); ++i)
-            {
-                COUT << "\n[" << i << "] -\t" << aNames[i];
-            }
-            COUT << endl;
-        }
-        else
-            cerr << "BUG: XNameAccess not available" << endl;
-}
-// -----------------------------------------------------------------------------
-void write(Reference< XChild >& xChild)
-{
-        if (xChild.is())
-        {
-            COUT << "\n[ P ] -\tParent" << endl;
-        }
-        else
-            cerr << "BUG: Parent not available (no XChild)" << endl;
-}
-///////////////////////////////////////////////////////////////////////////////////////////
-
-bool ask(Reference< XInterface >& xIface, const Reference<XMultiServiceFactory> &);
-
-void test_read_access(Reference< XInterface >& xIface, const Reference< XMultiServiceFactory > &xMSF)
-{
-    using com::sun::star::uno::UNO_QUERY;
-    do
-    {
-        COUT << "\n\n---------------------------------------------------------------" << endl;
-        Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-        Reference< XChild > xChild(xIface, UNO_QUERY);
-        Reference< XHierarchicalName > xAccessPath(xIface,UNO_QUERY);
-        Reference< XNamed > xAccessName(xIface,UNO_QUERY);
-//		Reference< XHierarchicalNameAccess >& xAccess(xIface, UNO_QUERY);
-
-        test(xAccessPath);
-        test(xAccessName);
-        write(xAccess);
-        write(xChild);
-
-        if (!m_bInteractive) break;
-    }
-    while (ask(xIface, xMSF));
-}
-
-bool ask(Reference< XInterface >& xIface, const Reference< XMultiServiceFactory > &xMSF)
-{
-    COUT << "\n[ Q ] -> <Quit>";
-    COUT << "\n[ S ] -> <SetValue> ";
-    COUT << endl;
-
-    COUT << "\n:> " << flush;
-    char buf[200] = {0};
-    try
-    {
-        bool bHandled = false;
-        bool bInserted = false;
-
-        if (cin.getline(buf,sizeof buf))  
-        {
-            Reference< XInterface > xNext;
-            if ((buf[0] == 'q' || buf[0] == 'Q') && (0 == buf[1]))
-            {
-                return false;
-            }
-            else if (buf[0] == 0)
-            {
-                return true;
-            }
-            else if((buf[0] == 0 || buf[0] == 'o' || buf[0] == 'O') && (0 == buf[1]))
-            {
-/*
-                COUT << "work Offline" << endl;
-                Reference<com::sun::star::configuration::XConfigurationSync> xSync(xMSF, UNO_QUERY);
-
-                Sequence< Any > aArgs2(5);
-                sal_Int32 n=0;
-                aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Setup"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.Common"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.Java"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.Writer"));
-                // aArgs2[n++] <<= configmgr::createPropertyValue(ASCII("path"), ASCII("org.openoffice.Office.ucb.Hierarchy"));
-                xSync->offline(aArgs2);
-                bHandled = true;
-*/
-            }
-            else if((buf[0] == 0 || buf[0] == 's' || buf[0] == 'S') && (0 == buf[1]))
-            {
-                // Replace a Value
-                Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-                
-                COUT << "SetMode, insert a Number" << endl;
-                cin.getline(buf,sizeof buf);
-                bInserted = true;
-            }
-
-            else if ((buf[0] == 'p' || buf[0] == 'P') && (0 == buf[1]))
-            {
-                Reference< XChild > xChild(xIface, UNO_QUERY);
-                if (xChild.is())
-                    xNext = xChild->getParent();
-                bHandled = true;
-            }
-
-            if (bHandled == false)
-            {
-                Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-                Reference< XHierarchicalNameAccess > xDeepAccess(xIface, UNO_QUERY);
-                Reference< XExactName > xExactName(xIface, UNO_QUERY);
-
-                if (xAccess.is() || xDeepAccess.is())
-                {
-                    OUString aName;
-                    OUString aInput = OUString::createFromAscii(buf);
-
-                    if (xExactName.is())
-                    {
-                        ::rtl::OUString sTemp = xExactName->getExactName(aInput);
-                        if (sTemp.getLength())
-                            aInput = sTemp;
-                    }
-
-                    if (xAccess.is() && xAccess->hasByName(aInput))
-                    {
-                        aName = aInput;
-                    }
-                    else if (xDeepAccess.is() && xDeepAccess->hasByHierarchicalName(aInput))
-                    {
-                        aName = aInput;
-                    }
-                    else if ('0' <= buf[0] && buf[0] <= '9' && xAccess.is())
-                    {
-                        unsigned int n = unsigned(atoi(buf));
-                        Sequence<OUString> aNames = xAccess->getElementNames();
-                        if (n < aNames.getLength())
-                            aName = aNames[n];
-                    }
-
-                    if (aName.getLength())
-                    { 
-                        bool bNest = aInput.indexOf(sal_Unicode('/')) >= 0;
-
-                        Any aElement = bNest	? ( xDeepAccess.is() ? xDeepAccess->getByHierarchicalName(aName) : Any()) 
-                                                : ( xAccess.    is() ? xAccess->    getByName(aName)             : Any() );
-
-                        while (aElement.getValueTypeClass() == TypeClass_ANY)
-                        {
-                            Any aWrap(aElement);
-                            aWrap >>= aElement;
-                        }
-                        sal_Bool bValue = true;
-                        sal_Bool bValueOk = false;
-
-                        switch (aElement.getValueTypeClass() )
-                        {
-                        case TypeClass_INTERFACE: bValue = false; break;
-                        case TypeClass_BOOLEAN:
-                            {
-                                sal_Bool* pVal = (sal_Bool*)aElement.getValue();
-                                bValueOk = (pVal != 0);
-
-                                COUT << "VALUE '" << aName << "' is a BOOLEAN = ";
-                                if (!bValueOk)
-                                {
-                                    COUT << "NULL (error!!)";
-                                }
-                                else if (*pVal)
-                                {
-                                    COUT << "'TRUE'";
-                                }
-                                else
-                                {
-                                    COUT << "'FALSE'";
-                                }
-                                COUT << endl;
-                            }
-                            break;
-                        case TypeClass_SHORT:
-                            {
-                                sal_Int16 aValue;
-                                COUT << "VALUE '" << aName << "' is a SHORT (16 bit) = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                {
-                                    COUT << aValue;
-                                }
-                                else
-                                    cerr << "ERROR RETRIEVING VALUE";
-                                COUT << endl;
-                            }
-                            break;
-                        case TypeClass_LONG:
-                            {
-
-                                sal_Int32 aValue;
-                                COUT << "VALUE '" << aName << "' is a INT (32 bit) = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                {
-                                    COUT << aValue;
-                                }
-                                else
-                                    cerr << "ERROR RETRIEVING VALUE";
-                                COUT << endl;
-                            }
-                            break;
-                        case TypeClass_HYPER:
-                            {
-                                sal_Int64 aValue;
-                                COUT << "VALUE '" << aName << "' is a LONG (64 bit) = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                {
-                                    COUT << double(aValue);
-                                }
-                                else
-                                    cerr << "ERROR RETRIEVING VALUE";
-                                COUT << endl;
-                            }
-                            break;
-                        case TypeClass_DOUBLE:
-                            {
-                                double aValue;
-                                COUT << "VALUE '" << aName << "' is a DOUBLE = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                {
-                                    COUT << aValue;
-                                }
-                                else
-                                    cerr << "ERROR RETRIEVING VALUE";
-                                COUT << endl;
-                            }
-                            break;
-                        case TypeClass_STRING:
-                            {
-                                OUString aValue;
-                                COUT << "VALUE '" << aName << "' is a STRING = ";
-                                if (bValueOk = (aElement >>= aValue))
-                                {
-                                    COUT << "\"" << aValue << "\"";
-                                }
-                                else
-                                    cerr << "ERROR RETRIEVING VALUE";
-                                COUT << endl;
-                            }
-                            break;
-                        case TypeClass_SEQUENCE:
-                            {
-                                COUT << "VALUE '" << aName << "' is a SEQUENCE or BINARY" << endl;
-
-                                Type aTypeS = configmgr::getSequenceElementType(aElement.getValueType());
-                                OUString sType = configmgr::toTypeName(aTypeS.getTypeClass());
-                                COUT << "Real type is Sequence<" << sType << ">" << endl;
-                                bValueOk = true;
-                            }
-                            break;
-                        case TypeClass_VOID:
-                            COUT << "ELEMENT '" << aName << "' is NULL and VOID " << endl;
-                            bValueOk = true;
-                            break;
-                        default:
-                                cerr << "Error: ELEMENT '" << aName << "' is of unknown or unrecognized type" << endl;
-                            break;
-                        }
-                        if (bValue)
-                        {
-                            if (bInserted)
-                            {
-                                if (aElement.getValueTypeClass() == TypeClass_BOOLEAN || 
-                                    aElement.getValueTypeClass() == TypeClass_VOID)
-                                {
-                                    COUT << "Set Value (Type=BOOL) to :";
-                                    cout.flush();
-                                    cin.getline(buf,sizeof buf);
-                                    OUString aInput = OUString::createFromAscii(buf);
-                                    sal_Bool bValue = false;
-
-                                    Any aValueAny;
-                                    if (aInput.equalsIgnoreAsciiCase(ASCII("true")))
-                                    {
-                                        bValue = true;
-                                        aValueAny <<= bValue;
-                                    }
-                                    else if (aInput.equalsIgnoreAsciiCase(ASCII("false")))
-                                    {
-                                        bValue = false;
-                                        aValueAny <<= bValue;
-                                    }
-                                    else if (aInput.equalsIgnoreAsciiCase(ASCII("null")))
-                                    {
-                                    }
-                                    
-                                    Reference< XNameReplace > xNameReplace(xAccess, UNO_QUERY);
-                                    if (xNameReplace.is())
-                                    {
-                                        xNameReplace->replaceByName(aName, aValueAny);
-                                        commit();
-                                    }
-                                    bInserted = false;
-                                }
-                                else if (aElement.getValueTypeClass() == TypeClass_STRING)
-                                {
-                                    COUT << "set value (type = string) to : ";
-                                    cout.flush();
-                                    cin.getline(buf,sizeof buf);
-                                    Any aValue;
-                                    aValue <<= buf;
-
-                                    Reference< XNameReplace > xNameReplace(xAccess, UNO_QUERY);
-                                    if (xNameReplace.is())
-                                    {
-                                        xNameReplace->replaceByName(aName, aValue);
-                                        commit();
-                                    }
-                                    bInserted = false;
-                                }
-                                else
-                                {
-                                    cerr << "Sorry, only BOOLEAN Values can changed today." << endl;
-                                }
-                            }
-                            prompt_and_wait();
-                            return bValueOk ? true : false;
-                        }
-
-                        if (aElement >>= xNext)
-                        {
-                            COUT << "Got an Interface for '" << aName << "'" << endl;
-                        }
-                        else
-                            cerr << "Error: Cannot get an Interface for '" << aName << "'" << endl;
-                    }
-                    else
-                    {
-                        cerr << "Error: No element \"" << aInput << "\" found." <<endl;
-                    }
-                }
-
-            }
-            if (xNext.is())
-            {
-                xIface = xNext;
-                return true;
-            }
-            cerr << "Error: could not obtain the requested Object " << endl;
-        }
-        else
-        {
-            COUT << "Input Error " << endl;
-            return true;
-        }
-    } 
-    catch (Exception& e)
-    {
-        cerr << "An Exception occurred: " << e.Message << endl;
-        
-    }
-    catch (...)
-    {
-        cerr << "An UNKNOWN Exception occurred !" << endl;
-    }
-
-    prompt_and_wait();
-    return true;
-}
diff --git a/configmgr/workben/apitest/cfgregistry.cxx b/configmgr/workben/apitest/cfgregistry.cxx
deleted file mode 100644
index a1f26c25cc..0000000000
--- a/configmgr/workben/apitest/cfgregistry.cxx
+++ /dev/null
@@ -1,172 +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: cfgregistry.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_configmgr.hxx"
-#include <memory.h>
-#include <stdio.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/util/XFlushable.hpp>
-#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#ifndef _CPPUHELPER_EXTRACT_HXX_
-#include <cppuhelper/extract.hxx>
-#endif
-#include <vos/conditn.hxx>
-#include <osl/diagnose.h>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::xml;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::registry;
-using namespace ::vos;
-using namespace ::cppu;
-//using namespace ::configmgr;
-
-//=============================================================================
-//= a dirty littly class for printing ascii characters
-//=============================================================================
-class OAsciiOutput
-{
-protected:
-    sal_Char*	m_pCharacters;
-
-public:
-    OAsciiOutput(const ::rtl::OUString& _rUnicodeChars);
-    ~OAsciiOutput() { delete m_pCharacters; }
-
-    const sal_Char* getCharacters() const { return m_pCharacters; }
-};
-
-//-----------------------------------------------------------------------------
-OAsciiOutput::OAsciiOutput(const ::rtl::OUString& _rUnicodeChars)
-{
-    sal_Int32 nLen = _rUnicodeChars.getLength();
-    m_pCharacters = new sal_Char[nLen + 1];
-    sal_Char* pFillPtr = m_pCharacters;
-    const sal_Unicode* pSourcePtr = _rUnicodeChars.getStr();
-#if OSL_DEBUG_LEVEL > 1
-    sal_Bool bAsserted = sal_False;
-#endif
-    for (sal_Int32 i=0; i<nLen; ++i, ++pFillPtr, ++pSourcePtr)
-    {
-        OSL_ENSURE(bAsserted || !(bAsserted = (*pSourcePtr >= 0x80)),
-            "OAsciiOutput::OAsciiOutput : non-ascii character found !");
-        *pFillPtr = *reinterpret_cast<const sal_Char*>(pSourcePtr);
-    }
-    *pFillPtr = 0;
-}
-
-#define ASCII_STRING(rtlOUString)	OAsciiOutput(rtlOUString).getCharacters()
-#define UNI_STRING(asciiString)		::rtl::OUString::createFromAscii(asciiString)
-
-//=============================================================================
-//=============================================================================
-
-#if (defined UNX) || (defined OS2)
-void main( int argc, char * argv[] )
-#else
-void _cdecl main( int argc, char * argv[] )
-#endif
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    Reference< XMultiServiceFactory > xORB = createRegistryServiceFactory(
-        ::rtl::OUString::createFromAscii("l:\\bin.a\\applicat.rdb"),
-        ::rtl::OUString()
-        );
-    if (!xORB.is())
-    {
-        fprintf(stdout, "could not create the service factory !\n\n");
-        return;
-    }
-
-    try
-    {
-        Reference< XSimpleRegistry > xConfigurationRegistry;
-        printf("instantiating the configuration registry access\n\r");
-        xConfigurationRegistry = xConfigurationRegistry.query(
-                xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationRegistry"))
-            );
-
-        const sal_Char* pLayoutNode = "com.sun.star.Inet";
-        printf("opening the registry access to %s\n\r", pLayoutNode);
-        xConfigurationRegistry->open(UNI_STRING(pLayoutNode), sal_False, sal_False);
-
-        printf("retrieving the root key, enumerating elements\n\r");
-        Reference< XRegistryKey > xRoot = xConfigurationRegistry->getRootKey();
-        Sequence< ::rtl::OUString > aKeyNames = xRoot->getKeyNames();
-        const ::rtl::OUString* pKeyNames = aKeyNames.getConstArray();
-        for (sal_Int32 i=0; i<aKeyNames.getLength(); ++i, ++pKeyNames)
-            printf("\t%i\t%s\n\r", i, ASCII_STRING(*pKeyNames));
-
-        const sal_Char* pUpdateKey = "Proxy/NoProxy";
-        printf("retrieving the key for %s\n\r", pUpdateKey);
-        Reference< XRegistryKey > xTabStopsKey = xRoot->openKey(UNI_STRING(pUpdateKey));
-
-/*		xTabStopsKey->createKey(UNI_STRING("blupp"));
-
-        Sequence< ::rtl::OUString > sLanguages = xTabStopsKey->getStringListValue();
-        sLanguages.realloc(sLanguages.getLength() + 1);
-        sLanguages[sLanguages.getLength() - 1] = UNI_STRING("ru");
-        xTabStopsKey->setStringListValue(sLanguages);
-*/
-
-        ::rtl::OUString sTest = xTabStopsKey->getStringValue();
-        xTabStopsKey->setStringValue(UNI_STRING("blimp"));
-
-        printf("flushing the changes\n\r");
-        Reference< XFlushable > xCommit(xConfigurationRegistry, UNO_QUERY);
-        xCommit->flush();
-    }
-    catch(RuntimeException& e)
-    {
-        printf("\n\r\n\rcaught an RuntimeException :\n\r");
-        printf("    exception message : %s\n\r", ASCII_STRING(e.Message));
-        return;
-    }
-    catch(Exception& e)
-    {
-        printf("\n\r\n\rcaught an Exception :\n\r");
-        printf("    exception message : %s\n\r", ASCII_STRING(e.Message));
-        return;
-    }
-}
diff --git a/configmgr/workben/apitest/cfgupdate.cxx b/configmgr/workben/apitest/cfgupdate.cxx
deleted file mode 100644
index 54722c0617..0000000000
--- a/configmgr/workben/apitest/cfgupdate.cxx
+++ /dev/null
@@ -1,435 +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: cfgupdate.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_configmgr.hxx"
-#define _PRIVATE_TEST_
-
-#include <iostream>
-using namespace std;
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/beans/XHierarchicalPropertySet.hpp>
-
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <osl/time.h>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Any.h>
-
-#include "createpropertyvalue.hxx"
-
-#include "typeconverter.hxx"
-
-// #include <com/sun/star/configuration/XConfigurationSync.hpp>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-//using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-//using namespace ::configmgr;
-
-using namespace ::cppu;
-
-#define ASCII(x) ::rtl::OUString::createFromAscii(x)
-
-ostream& operator << (ostream& out, rtl::OUString const& aStr)
-{
-    sal_Unicode const* const pStr = aStr.getStr();
-    sal_Unicode const* const pEnd = pStr + aStr.getLength();
-    for (sal_Unicode const* p = pStr; p < pEnd; ++p)
-        if (0 < *p && *p < 127) // ASCII
-            out << char(*p);
-        else
-            out << "[\\u" << hex << *p << "]";
-    return out;
-}
-
-void showSequence(const Sequence<OUString> &aSeq)
-{
-    OUString aArray;
-    const OUString *pStr = aSeq.getConstArray();
-    for (int i=0;i<aSeq.getLength();i++)
-    {
-        OUString aStr = pStr[i];
-        // aArray += aStr + ASCII(", ");
-        cout << aStr << endl;
-    }
-    volatile int dummy = 0;
-}
-
-//=============================================================================
-//=============================================================================
-void test_read_access(Reference< XInterface >& xIface, Reference< XMultiServiceFactory > &xMSF);
-//=============================================================================
-struct prompt_and_wait
-{
-    char const* myText;
-    prompt_and_wait(char const* text = "") : myText(text) {}
-    ~prompt_and_wait() 
-    {
-        cout << myText << ">" << endl;
-        int const mx = int( (+0u - +1u) >> 1);
-
-        char c=0; 
-        if (cin.get(c) && c != '\n')
-            cin.ignore(mx,'\n'); 
-    }
-}; 
-static prompt_and_wait exit_prompt("Quitting\nQ");
-
-
-// -----------------------------------------------------------------------------
-Sequence<Any> createSequence(const OUString &sUser, const OUString &sPasswd)
-{
-    Sequence< Any > aCPArgs;
-        
-    if (sUser.getLength() > 0)
-    {
-        aCPArgs.realloc(1);
-        aCPArgs[0] <<= configmgr::createPropertyValue(ASCII("user"), sUser);
-    }
-    if (sPasswd.getLength() > 0)
-    {
-        aCPArgs.realloc(2);
-        aCPArgs[1] <<= configmgr::createPropertyValue(ASCII("password"), sPasswd);
-    }
-    return aCPArgs;
-}
-
-//=============================================================================
-#include <string.h>
-#if (defined UNX) || (defined OS2)
-#else
-#include <conio.h>
-#endif
-
-OString input(const char* pDefaultText, char cEcho)
-{
-    // PRE: a Default Text would be shown, cEcho is a Value which will show if a key is pressed.
-    const int MAX_INPUT_LEN = 500;
-    char aBuffer[MAX_INPUT_LEN];
-
-    strcpy(aBuffer, pDefaultText);
-    int nLen = strlen(aBuffer);
-
-#ifdef WNT
-    char ch = '\0';
-
-    cout << aBuffer;
-    cout.flush();
-
-    while(ch != 13)
-    {
-        ch = getch();
-        if (ch == 8)
-        {
-            if (nLen > 0)
-            {
-                cout << "\b \b";
-                cout.flush();
-                --nLen;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-        else if (ch != 13)
-        {
-            if (nLen < MAX_INPUT_LEN)
-            {
-                if (cEcho == 0)
-                {
-                    cout << ch;
-                }
-                else
-                {
-                    cout << cEcho;
-                }
-                cout.flush();
-                aBuffer[nLen++] = ch;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-    }
-#else
-    if (!cin.getline(aBuffer,sizeof aBuffer))
-        return OString();
-#endif
-    return OString(aBuffer);
-}
-
-// -----------------------------------------------------------------------------
-rtl::OUString enterValue(const char* _aStr, const char* _aDefault, bool _bIsAPassword)
-{
-    cout << _aStr;
-    cout.flush();
-    OString aTxt = input(_aDefault, _bIsAPassword ? '*' : 0);
-
-    OUString sValue = OUString::createFromAscii(aTxt);
-    return sValue;
-}
-
-// -----------------------------------------------------------------------------
-Reference< XNameAccess > beginChanges(Reference< XMultiServiceFactory > xFactory, OUString sPath)
-{
-    Sequence< Any > aArgs(1);
-    aArgs[0] <<= configmgr::createPropertyValue(ASCII("nodepath"),sPath);		
-
-    cout << "starting update for node:" << sPath << endl;	
-
-    Reference< XNameAccess > xTree(xFactory->createInstanceWithArguments(OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
-            aArgs), UNO_QUERY);
-
-    return xTree;
-}
-
-template <class Type>
-// -----------------------------------------------------------------------------
-void update(Reference< XInterface > xIFace, OUString sRelPath, Type sValue)
-{
-    Reference< XHierarchicalPropertySet > xTree(xIFace, UNO_QUERY);	
-    Any aValue;
-    aValue <<= sValue;
-
-    cout << "updating node:" << sRelPath << endl;
-    xTree->setHierarchicalPropertyValue(sRelPath, aValue);
-}
-
-// -----------------------------------------------------------------------------
-Reference< XHierarchicalPropertySet > insertTree(Reference< XInterface > xIFace, OUString aName)
-{
-    if (!aName.getLength())
-        aName =   enterValue("/nEnter a Tree to insert: ", "", false);	
-    
-    Reference< XSingleServiceFactory > xFactory(xIFace, UNO_QUERY);
-    Reference< XHierarchicalPropertySet > xNewElement(xFactory->createInstance(), UNO_QUERY);		
-
-    cout << "inserting new tree element:" << aName << endl;
-    
-    Any aTree;
-    aTree <<= xNewElement;
-    Reference< XNameContainer >(xFactory, UNO_QUERY)->insertByName(aName, aTree);		
-
-    return xNewElement;
-}
-
-// -----------------------------------------------------------------------------
-void removeTree(Reference< XInterface > xIFace, OUString aName)
-{
-    if (!aName.getLength())
-        aName =   enterValue("/nEnter a Tree to remove: ", "", false);	
-    
-    cout << "removing new tree element:" << aName << endl;
-    
-    Reference< XNameContainer >(xIFace, UNO_QUERY)->removeByName(aName);			
-}
-
-// -----------------------------------------------------------------------------
-void commitChanges(Reference< XInterface > xIFace)
-{
-    cout << "committing changes:" << endl;
-    
-    Reference< XChangesBatch > xChangesBatch(xIFace, UNO_QUERY);
-    xChangesBatch->commitChanges();	
-}
-
-// -----------------------------------------------------------------------------
-void displayTree(Reference< XNameAccess > xIFace, sal_Int32 nLevel)
-{
-    const char* pTab = "  ";
-    Sequence<OUString> aNames( xIFace->getElementNames() );
-    for (int i = 0; i < aNames.getLength(); ++i)
-    {
-        Any aElement = xIFace->getByName(aNames[i]);
-        Reference< XNameAccess > xAccess;			
-        Reference< XSingleServiceFactory > xFactory;			
-        aElement >>= xFactory;
-        aElement >>= xAccess;
-
-        cout << endl;
-        for (int j = 0; j < nLevel; j++)
-            cout << "  ";		
-
-        if (xAccess.is())
-        {
-            OUString sType;
-            if (xFactory.is())
-                sType = OUString::createFromAscii(" type = 'set' " );
-
-            cout << "<" << aNames[i] << sType << ">";
-            displayTree(xAccess, nLevel + 1);
-            cout << endl << "</" << aNames[i] << ">";
-        }
-        else
-            cout << "<" << aNames[i] << "/>";
-
-    }
-    ::flush(cout);
-}
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- M A I N ----------------------------------
-// -----------------------------------------------------------------------------
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    // cout << "    Please insert Text: ";
-    // cout.flush();
-    // OString aTxt = input("Der Text", 0);
-    // cout << endl << "You inserted: " << aTxt.getStr() << endl;
-    // 
-    // cout << "Please insert Password: ";
-    // cout.flush();
-    // OString aPasswd = input("", '*');
-    // cout << endl << "You inserted: " << aPasswd.getStr() << endl;
-
-    try
-    {
-        OUString const sServiceRegistry = OUString::createFromAscii( argc > 1 ? argv[1] : "applicat.rdb" );
-        Reference< XMultiServiceFactory > xORB = createRegistryServiceFactory(
-            sServiceRegistry,
-            ::rtl::OUString()
-            );
-        if (!xORB.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the service factory !\n\n";
-            return 1;
-        }
-        cout << "Service factory created !\n---------------------------------------------------------------" << endl;
-
-        Sequence< Any > aCPArgs;
-
-        /*OUString sServerType = enterValue("Enter Servertype: ", "remote", false);
-        cout << endl;*/
-
-
-        rtl::OUString sFilePath;
-        rtl::OUString sPort;
-        rtl::OUString sUser;
-
-        sUser =   enterValue("Enter User: ", "user1", false);
-        cout << endl;
-
-        OUString sPasswd;// = enterValue("Enter Password: ", "", true);
-        cout << endl;
-
-        aCPArgs = createSequence(sUser, sPasswd);		
-
-        Reference< XMultiServiceFactory > xCfgProvider(
-            xORB->createInstanceWithArguments(
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
-                aCPArgs),
-            UNO_QUERY);
-        if (!xCfgProvider.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the configuration provider !\n\n";
-            return 3;
-        }
-
-        Reference< XNameAccess > xUpdateAccess;				
-
-// now do updates for the user
-        xUpdateAccess = beginChanges(xCfgProvider, OUString::createFromAscii("org.openoffice.Security"));
-        displayTree(xUpdateAccess, 0);		
-        
-        update(xUpdateAccess, OUString::createFromAscii("_3D_Engine/Dithering"), sal_Bool(sal_False));
-
-/*		xUpdateAccess = beginChanges(xCfgProvider, OUString::createFromAscii("org.openoffice.Inet"));
-        
-        update(xUpdateAccess, OUString::createFromAscii("Proxy/FTP/Port"), sal_Int32(11));
-        update(xUpdateAccess, OUString::createFromAscii("Proxy/FTP/Name"), OUString::createFromAscii("Test3"));
-        update(xUpdateAccess, OUString::createFromAscii("DNS/IP_Address"), OUString::createFromAscii("Test4"));		
-*/
-        commitChanges(xUpdateAccess);
-
-// now do updates with inserting and removing of nodes
-        
-        xUpdateAccess = beginChanges(xCfgProvider, OUString::createFromAscii("org.openoffice.Security/MountPoints"));
-        displayTree(xUpdateAccess, 0);
-
-        Reference< XHierarchicalPropertySet > xTree = insertTree(xUpdateAccess, OUString());		
-        update(xUpdateAccess, OUString::createFromAscii("InstallationDirectory/Directory"), OUString::createFromAscii("Test1"));
-        removeTree(xUpdateAccess, OUString());		
-        commitChanges(xUpdateAccess);
-    }
-    catch (Exception& e) 
-    {
-        ::flush(cout);
-        cerr << "Caught exception: " << e.Message << endl;
-    }
-/*
-    catch (...) 
-    {
-        ::flush(cout);
-        cerr << "BUG: Caught UNKNOWN exception (?) " << endl;
-    }
-*/
-    return 0;
-}
-
diff --git a/configmgr/workben/apitest/makefile.mk b/configmgr/workben/apitest/makefile.mk
deleted file mode 100644
index 08b46a53f8..0000000000
--- a/configmgr/workben/apitest/makefile.mk
+++ /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: 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=..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=configmgr
-
-TARGET=cfgapi
-TARGET2=cfgreg
-TARGET3=cfgadduser
-TARGET4=cfgadmin
-TARGET5=cfgupdate
-TARGET6=cfgapi_timetest
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-# ... common for all test executables ..............................
-APPSTDLIBS=\
-            $(SALLIB) \
-            $(VOSLIB) \
-            $(CPPULIB)	\
-            $(CPPUHELPERLIB)
-
-# ... cfgapi ..............................
-APP1STDLIBS = $(APPSTDLIBS)
-
-APP1STDLIBS+=$(STDLIBCPP)
-
-APP1TARGET= $(TARGET)
-APP1OBJS=	\
-    $(SLO)$/cfgapi.obj	\
-    $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj \
-    $(SLO)$/simpletypehelper.obj \
-
-# ... cfgapi_timetest ..............................
-APP6STDLIBS = $(APPSTDLIBS)
-
-APP6STDLIBS+=$(STDLIBCPP)
-
-APP6TARGET= $(TARGET6)
-APP6OBJS=	\
-    $(SLO)$/cfgapi_timetest.obj	\
-    $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj \
-    $(SLO)$/simpletypehelper.obj \
-
-# ... cfgreg ..............................
-APP2STDLIBS = $(APPSTDLIBS)
-
-APP2STDLIBS+=$(STDLIBCPP)
-
-APP2TARGET= $(TARGET2)
-APP2OBJS=	\
-    $(SLO)$/cfgregistry.obj	\
-
-# ... cfgadduser ..............................
-APP3STDLIBS = $(APPSTDLIBS)
-
-APP3STDLIBS+=$(STDLIBCPP)
-
-APP3TARGET= $(TARGET3)
-APP3OBJS=	\
-    $(SLO)$/cfgadduser.obj	\
-
-# ... cfgadmin ..............................
-APP4STDLIBS = $(APPSTDLIBS)
-
-APP4STDLIBS+=$(STDLIBCPP)
-
-APP4TARGET= $(TARGET4)
-APP4OBJS=	\
-    $(SLO)$/cfgadmin.obj	\
-    $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj \
-    $(SLO)$/simpletypehelper.obj \
-
-# ... cfgupdate ..............................
-APP5STDLIBS = $(APPSTDLIBS)
-
-APP5STDLIBS+=$(STDLIBCPP)
-
-APP5TARGET= $(TARGET5)
-APP5OBJS=	\
-    $(SLO)$/cfgupdate.obj	\
-    $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj \
-    $(SLO)$/simpletypehelper.obj \
-
-.INCLUDE :  target.mk
-
-
diff --git a/configmgr/workben/apitest/sregistry b/configmgr/workben/apitest/sregistry
deleted file mode 100644
index f4f353181f..0000000000
--- a/configmgr/workben/apitest/sregistry
+++ /dev/null
@@ -1,8 +0,0 @@
-[configuration]
-servertype=remote
-[RemoteRegistry]
-Server=munch-11072:100
-Timeout=2500
-[LocalRegistry]
-rootpath="G:\Configuration"
-
diff --git a/configmgr/workben/local_io/cfgfile.cxx b/configmgr/workben/local_io/cfgfile.cxx
deleted file mode 100644
index b5c60ecb7b..0000000000
--- a/configmgr/workben/local_io/cfgfile.cxx
+++ /dev/null
@@ -1,97 +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: cfgfile.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_configmgr.hxx"
-
-
-// -----------------------------------------------------------------------------
-// ------------------------------------ main ------------------------------------
-// -----------------------------------------------------------------------------
-
-/*
-  OUString operator+(const OUString &a, const OUString &b)
-  {
-  OUString c = a;
-  c += b;
-  return c;
-  }
-*/
-
-namespace configmgr
-{
-    void simpleMappingTest();
-
-    void importTest();
-    void exportTest();
-
-    void hierarchyTest();
-    //void simpleTest();
-    void speedTest();
-    void stringTest();
-    void classTest();
-    void hash_test();
-    void testRefs();
-    void ConfigName();
-
-    void oslTest();
-}
-
-
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-    int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    
-//	configmgr::hierarchyTest();
-
-
-//	configmgr::importTest();
-//	configmgr::exportTest();
-//	configmgr::speedTest();
-//	configmgr::simpleTest();
-
-//	configmgr::simpleMappingTest();
-//	configmgr::stringTest();
-//	configmgr::classTest();
-
-//	configmgr::hash_test();
-
-    // configmgr::testRefs();
-    // configmgr::ConfigName();
-
-    configmgr::oslTest();
-    return 0;
-}
-
-
diff --git a/configmgr/workben/local_io/cfglocal.cxx b/configmgr/workben/local_io/cfglocal.cxx
deleted file mode 100644
index c5de94c03f..0000000000
--- a/configmgr/workben/local_io/cfglocal.cxx
+++ /dev/null
@@ -1,623 +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: cfglocal.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_configmgr.hxx"
-#define _PRIVATE_TEST_
-
-#include <memory.h>
-#include <string.h>
-#include <stdio.h>
-#include <vos/socket.hxx>
-#include "attributes.hxx"
-
-#ifndef _CONFIGMGR_SESSION_REMOTESESSION_HXX_
-#include "remotesession.hxx"
-#endif
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <vos/conditn.hxx>
-
-#include <osl/time.h>
-
-#include "localsession.hxx"
-#include "confname.hxx"
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::xml;
-using namespace ::vos;
-using namespace ::cppu;
-using namespace ::configmgr;
-using namespace rtl;
-
-// #define USE_LAYOUT_NODE
-
-//=============================================================================
-//= a dirty littly class for printing ascii characters
-//=============================================================================
-class OAsciiOutput
-{
-protected:
-    sal_Char*	m_pCharacters;
-
-public:
-    OAsciiOutput(const ::rtl::OUString& _rUnicodeChars);
-    ~OAsciiOutput() { delete m_pCharacters; }
-
-    const sal_Char* getCharacters() const { return m_pCharacters; }
-};
-
-//-----------------------------------------------------------------------------
-OAsciiOutput::OAsciiOutput(const ::rtl::OUString& _rUnicodeChars)
-{
-    sal_Int32 nLen = _rUnicodeChars.getLength();
-    m_pCharacters = new sal_Char[nLen + 1];
-    sal_Char* pFillPtr = m_pCharacters;
-    const sal_Unicode* pSourcePtr = _rUnicodeChars.getStr();
-#ifdef DBG_UTIL
-    sal_Bool bAsserted = sal_False;
-#endif
-    for (sal_Int32 i=0; i<nLen; ++i, ++pFillPtr, ++pSourcePtr)
-    {
-        OSL_ENSURE(bAsserted || !(bAsserted = (*pSourcePtr >= 0x80)),
-            "OAsciiOutput::OAsciiOutput : non-ascii character found !");
-        *pFillPtr = *reinterpret_cast<const sal_Char*>(pSourcePtr);
-    }
-    *pFillPtr = 0;
-}
-
-#define ASCII_STRING(rtlOUString)	OAsciiOutput(rtlOUString).getCharacters()
-#define UNI_STRING(salCharPtr)		::rtl::OUString::createFromAscii(salCharPtr)
-
-//=============================================================================
-//= OOpenNodeCallback
-//=============================================================================
-typedef ::cppu::WeakImplHelper1< sax::XDocumentHandler > OOpenNodeCallback_Base;
-class OOpenNodeCallback : public IOpenObjectCallback, public OOpenNodeCallback_Base
-{
-protected:
-    OUString				m_sNodeId;
-    ::vos::OCondition&		m_rFinishCondition;
-
-    enum ACTION	{ STARTELEMENT, CHARACTERS, ENDELEMENT };
-    ACTION					m_eLastAction;
-    sal_Int32				m_nLevel;
-    sal_Bool				m_bCloseStartTag;
-
-protected:
-    ~OOpenNodeCallback()
-    {
-    }
-
-public:
-    OOpenNodeCallback(::vos::OCondition& _rFinishCond) : m_rFinishCondition(_rFinishCond),  m_nLevel(0), m_eLastAction(ENDELEMENT), m_bCloseStartTag(sal_False) { }
-
-    OUString getNodeId() const { return m_sNodeId; }
-
-    // IOpenObjectCallback
-    virtual	void	gotObjectId(const OUString &aName);
-
-    // IDataRequestCallback
-    virtual		Reference< sax::XDocumentHandler > getDataReader() { return static_cast< sax::XDocumentHandler* >(this); }
-
-    // IRequestCallback
-    virtual		void acknowledged(sal_Int32 _nTransId);
-    virtual		void failed(sal_Int32 _nErrorCode);
-    virtual		void done(const StatusInfo& _rStatus);
-
-    // IInterface
-    virtual void SAL_CALL acquire(  ) throw (::com::sun::star::uno::RuntimeException) { OOpenNodeCallback_Base::acquire(); }
-    virtual void SAL_CALL release(  ) throw (::com::sun::star::uno::RuntimeException) { OOpenNodeCallback_Base::release(); }
-
-    // XDocumentHandler
-    virtual void SAL_CALL startDocument(  ) throw(sax::SAXException, RuntimeException) { }
-    virtual void SAL_CALL endDocument(  ) throw(sax::SAXException, RuntimeException) { }
-    virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const Reference< sax::XAttributeList >& xAttribs ) throw(sax::SAXException, RuntimeException);
-    virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw(sax::SAXException, RuntimeException);
-    virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw(sax::SAXException, RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw(sax::SAXException, RuntimeException) { }
-    virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw(sax::SAXException, RuntimeException) { }
-    virtual void SAL_CALL setDocumentLocator( const Reference< sax::XLocator >& xLocator ) throw(sax::SAXException, RuntimeException) { }
-};
-
-//.............................................................................
-inline void linefeed()
-{
-    // printf("\n");
-}
-
-//.............................................................................
-void printTabs(sal_Int32 _nCount)
-{
-    sal_Char* pBuffer = new sal_Char[2 * _nCount + 1];
-    memset(pBuffer, ' ', 2 * _nCount);
-    pBuffer[2 * _nCount] = 0;
-    // printf(pBuffer);
-}
-
-//-----------------------------------------------------------------------------
-void SAL_CALL OOpenNodeCallback::startElement( const ::rtl::OUString& _rName, const Reference< sax::XAttributeList >& xAttribs ) throw(sax::SAXException, RuntimeException)
-{
-    switch (m_eLastAction)
-    {
-        case STARTELEMENT:
-            if (m_bCloseStartTag)
-            {
-                // printf(">");
-            }
-            
-            m_bCloseStartTag = sal_False;
-            // no break
-        case CHARACTERS:
-        case ENDELEMENT:
-            linefeed();
-            printTabs(m_nLevel);
-            break;
-    }
-    m_eLastAction = STARTELEMENT;
-    ++m_nLevel;
-    // printf("<%s", ASCII_STRING(_rName));
-    m_bCloseStartTag = sal_True;
-}
-
-//-----------------------------------------------------------------------------
-void SAL_CALL OOpenNodeCallback::endElement( const ::rtl::OUString& _rName ) throw(sax::SAXException, RuntimeException)
-{
-    --m_nLevel;
-    switch (m_eLastAction)
-    {
-        case STARTELEMENT:
-            if (m_bCloseStartTag)
-            {
-                // printf("/>");
-            }
-            
-            m_bCloseStartTag = sal_False;
-            break;
-        case ENDELEMENT:
-            linefeed();
-            printTabs(m_nLevel);
-            // dont break
-        case CHARACTERS:
-            // printf("</%s>", ASCII_STRING(_rName));
-            break;
-    }
-    m_eLastAction = ENDELEMENT;
-}
-
-//-----------------------------------------------------------------------------
-void SAL_CALL OOpenNodeCallback::characters( const ::rtl::OUString& _rChars ) throw(sax::SAXException, RuntimeException)
-{
-    if (STARTELEMENT == m_eLastAction)
-    {
-        if (m_bCloseStartTag && _rChars.trim().getLength())
-        {
-            // printf(">");
-            m_bCloseStartTag = sal_False;
-        }
-    }
-    if (_rChars.trim().getLength() != 0)
-    {
-        // printf("%s", ASCII_STRING(_rChars));
-        m_eLastAction = CHARACTERS;
-    }
-}
-
-//-----------------------------------------------------------------------------
-void OOpenNodeCallback::gotObjectId(const OUString &_nId)
-{
-    m_sNodeId = _nId;
-    // printf("object id %i\n", m_nNodeId);
-}
-
-//-----------------------------------------------------------------------------
-void OOpenNodeCallback::acknowledged(sal_Int32 _nTransId)
-{
-    // printf("acknowledged, transaction id : %i\n", _nTransId);
-}
-
-//-----------------------------------------------------------------------------
-void OOpenNodeCallback::failed(sal_Int32 _nErrorCode)
-{
-    // printf("failed because of a connection error (%i)\n", _nErrorCode);
-    m_rFinishCondition.set();
-}
-
-//-----------------------------------------------------------------------------
-void OOpenNodeCallback::done(const StatusInfo& _rStatus)
-{
-    if (_rStatus.nCode)
-    {
-        printf("\n\ndone, but had an error : %s\n", ASCII_STRING(_rStatus.sMessage));
-    }
-    else
-    {
-        // printf("\n\nsuccessfully done\n", ASCII_STRING(_rStatus.sMessage));
-    }
-    
-    m_rFinishCondition.set();
-}
-
-//=============================================================================
-//= ONodeUpdater
-//=============================================================================
-class ONodeUpdater : public IDOMNodeDataProvider
-{
-    sal_Bool			m_bWriterLevel;
-    sal_Bool m_bAdd;
-public:
-    ONodeUpdater(sal_Bool _bStartAtWriterLevel, sal_Bool bAdd) : m_bWriterLevel(_bStartAtWriterLevel), m_bAdd(bAdd) { }
-
-    virtual void	writeNodeData(const Reference< sax::XDocumentHandler >& _rHandler);
-};
-
-//-----------------------------------------------------------------------------
-void ONodeUpdater::writeNodeData(const Reference< sax::XDocumentHandler >& _rHandler)
-{
-    AttributeListImpl *pAttr = new AttributeListImpl;
-    Reference< sax::XAttributeList > xEmptyAttrList = pAttr;
-
-    pAttr = new AttributeListImpl;
-    pAttr->addAttribute(UNI_STRING("type"),UNI_STRING("CDATA"),UNI_STRING("string"));
-    Reference< sax::XAttributeList > xStringAttrList = pAttr;
-
-    if (m_bWriterLevel)
-        _rHandler->startElement(UNI_STRING("Writer"), xEmptyAttrList);
-#ifdef USE_LAYOUT_NODE
-    _rHandler->startElement(UNI_STRING("Layout"), xEmptyAttrList);
-    _rHandler->startElement(UNI_STRING("TabStops"), xEmptyAttrList);
-    if (m_bAdd)
-        _rHandler->characters(UNI_STRING("0.90"));
-    else
-        _rHandler->characters(UNI_STRING("99.99"));
-
-    _rHandler->endElement(UNI_STRING("TabStops"));
-    _rHandler->endElement(UNI_STRING("Layout"));
-#else
-    // _rHandler->startElement(UNI_STRING("com.sun.star.office.Setup"), xEmptyAttrList);
-    _rHandler->startElement(UNI_STRING("Modules"), xEmptyAttrList);
-    _rHandler->startElement(UNI_STRING("StandFonts"), xEmptyAttrList);
-    _rHandler->startElement(UNI_STRING("Standard"), xStringAttrList);
-    _rHandler->startElement(UNI_STRING("value"), xEmptyAttrList);
-    if (m_bAdd)
-        _rHandler->characters(UNI_STRING("Arial"));
-    else
-        _rHandler->characters(UNI_STRING("Courier"));
-
-    _rHandler->endElement(UNI_STRING("value"));
-    _rHandler->endElement(UNI_STRING("Standard"));
-    _rHandler->endElement(UNI_STRING("StandFonts"));
-    _rHandler->endElement(UNI_STRING("Modules"));
-    // _rHandler->endElement(UNI_STRING("com.sun.star.office.Setup"));
-
-    _rHandler->ignorableWhitespace(OUString());
-#endif
-    if (m_bWriterLevel)
-        _rHandler->endElement(UNI_STRING("Writer"));
-}
-
-//=============================================================================
-//= OSessionListener
-//=============================================================================
-class OSessionListener : public ISessionListener
-{
-protected:
-    oslInterlockedCount		m_refCount;
-
-public:
-    // ISessionListener
-    virtual void	nodeUpdated(const ::rtl::OUString& _rNodePath);
-    virtual void	nodeDeleted(const ::rtl::OUString& _rNodePath);
-    virtual void	nodeAdded(const ::rtl::OUString& _rNodePath);
-
-    // IInterface
-    virtual void SAL_CALL acquire(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL release(  ) throw (::com::sun::star::uno::RuntimeException);
-};
-
-//-----------------------------------------------------------------------------
-void OSessionListener::nodeUpdated(const ::rtl::OUString& _rNodePath)
-{
-    // printf("[listener] : a node was updated, node path : %s\n", ASCII_STRING(_rNodePath));
-}
-
-//-----------------------------------------------------------------------------
-void OSessionListener::nodeDeleted(const ::rtl::OUString& _rNodePath)
-{
-    // printf("[listener] : a node was deleted, node path : %s\n", ASCII_STRING(_rNodePath));
-}
-
-//-----------------------------------------------------------------------------
-void OSessionListener::nodeAdded(const ::rtl::OUString& _rNodePath)
-{
-    // printf("\n[listener] : a node was added, node path : %s", ASCII_STRING(_rNodePath));
-}
-
-//-----------------------------------------------------------------------------
-void SAL_CALL OSessionListener::acquire(  ) throw (::com::sun::star::uno::RuntimeException)
-{
-    osl_incrementInterlockedCount(&m_refCount);
-}
-
-//-----------------------------------------------------------------------------
-void SAL_CALL OSessionListener::release(  ) throw (::com::sun::star::uno::RuntimeException)
-{
-    if (!osl_decrementInterlockedCount(&m_refCount))
-        delete this;
-}
-
-//=============================================================================
-//=============================================================================
-
-//=============================================================================
-static ::rtl::OUString	sHost;
-static sal_Int32		nPort;
-static ::rtl::OUString	sRegistry = ::rtl::OUString::createFromAscii("applicat.rdb");
-
-//=============================================================================
-sal_Bool collectArgs(int argc, char * argv[])
-{
-    if (argc > 1)
-    {
-        sal_Char* pConnectTo = argv[1];
-        sal_Char* pSeparator = strchr(pConnectTo, ':');
-        if (pSeparator && (0 != *(pSeparator + 1)))
-        {
-            sHost = ::rtl::OUString(pConnectTo, pSeparator - pConnectTo, RTL_TEXTENCODING_ASCII_US);
-            nPort = ::rtl::OUString::createFromAscii(pSeparator + 1).toInt32();
-
-            if (argc > 2)
-                sRegistry = ::rtl::OUString::createFromAscii(argv[2]);
-            return sal_True;
-        }
-    }
-
-    printf("cfgclient - registry server client test ...\n\r\n\r");
-    printf("usage :\n\r");
-    printf("    cfgclient <server>:<port> [<registry file>]\n\r\n\r");
-    printf("    <server>        : machine to connect to\n\r");
-    printf("    <port>          : port to connect to\n\r");
-    printf("    <registry file> : (optional) registry to bootstrap from. defaulted to \"applicat.rdb\"\n\r\n\r");
-    return sal_False;
-}
-
-//=============================================================================
-
-#if (defined UNX) || (defined OS2)
-void main( int argc, char * argv[] )
-#else
-void _cdecl main( int argc, char * argv[] )
-#endif
-{
-    Reference< XMultiServiceFactory > xORB;
-    try
-    {
-        xORB = createRegistryServiceFactory(sRegistry, ::rtl::OUString());
-    }
-    catch (Exception& e)
-    {
-        printf("could not bootstrap the services from %s\n\r", ASCII_STRING(sRegistry));
-        printf("    (error message : %s)", ASCII_STRING(e.Message));
-    }
-
-    if (!xORB.is())
-    {
-        fprintf(stdout, "could not create the service factory !");
-        return;
-    }
-
-    ORef< OSessionListener > xListener = new OSessionListener;
-    {
-/*
-        ORemoteSession aSession(xORB);
-        // --------- connect ----------
-        sal_Bool bSuccess = aSession.connect(sHost, nPort, &aTimeout);
-        if (!bSuccess)
-        {
-            printf("could not connect to the server (error : %i) ...", aSession.getConnectionError());
-            return;
-        }
-*/
-        
-        void testSession(const Reference< XMultiServiceFactory > &xORB, bool bPrint);
-
-        for (int i=0;i<100;i++)
-        {
-            TimeValue aStartTime, aEndTime;
-            osl_getSystemTime(&aStartTime);
-            testSession(xORB, false);
-            osl_getSystemTime(&aEndTime);
-
-            sal_Int32 nSeconds = aEndTime.Seconds - aStartTime.Seconds;
-            sal_Int32 nNanoSec = aEndTime.Nanosec - aStartTime.Nanosec;
-            if (nNanoSec < 0)
-            {
-                nNanoSec = 1000000000 - nNanoSec;
-                nSeconds++;
-            }
-            
-            cout << "Time: " << nSeconds << ". " << nNanoSec << endl;
-        }
-    }
-}
-
-void testSession(const Reference< XMultiServiceFactory > &xORB, bool bPrint)
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    
-    // create it .. and connect
-    LocalSession aSession(xORB);
-    
-    // --------- openSession ----------
-    
-    OUString aRootPath = OUString::createFromAscii("f:/local/SRC598/configmgr/workben/local_io");
-    // f:/local/SRC595/configmgr/workben/local_io);
-    aSession.open(aRootPath);
-    
-    if (aSession.isOpen())
-    {
-        if (bPrint) printf("\nopened the session ...");
-    }
-    else
-    {
-        printf("\ncould not open the session ... exiting\n\n");
-        return;
-    }
-    
-    // aSession.setListener(xListener.getBodyPtr());
-    
-    OCondition aWaitForSomething;
-    aWaitForSomething.reset();
-    
-    // --------- openNode ----------
-    char* pWriterNode = "com.sun.star.Setup/Modules";
-    if (bPrint) printf("\nsending an openNode request for %s ...\n", pWriterNode);
-    ORef< OOpenNodeCallback > xOpenCallback = new OOpenNodeCallback(aWaitForSomething);
-    aSession.openNode(UNI_STRING(pWriterNode), 2, xOpenCallback.getBodyPtr());
-    
-    aTimeout.Seconds = 30;
-    switch (aWaitForSomething.wait(&aTimeout))
-    {
-    case ICondition::result_error:
-        printf("error while waiting for the callback ... exiting\n\n");
-        return;
-    case ICondition::result_timeout:
-        if (bPrint) printf("timed out ... exiting\n\n");
-        return;
-    }
-
-    OUString sOpenedNode = xOpenCallback->getNodeId();
-
-// 		   aSession.getNode(UNI_STRING("com.sun.star.Spreadsheet"), NULL);
-// 
-// 		   // --------- getNode (1) ----------
-//#ifdef USE_LAYOUT_NODE
-//	char* pLayoutNode = "com.sun.star.office.Setup/Modules";
-//#else
-    char* pLayoutNode = "com.sun.star.Setup/Modules";
-//#endif
-// 		   printf("\nsending an getNode request for %s ...\n", pLayoutNode);
-// 		   aWaitForSomething.reset();
-// 		   aSession.getNode(UNI_STRING(pLayoutNode), new OOpenNodeCallback(aWaitForSomething));
-// 
-// 		   switch (aWaitForSomething.wait(&aTimeout))
-// 		   {
-// 			   case ICondition::result_error:
-// 				   printf("error while waiting for the callback ... exiting\n\n");
-// 				   return;
-// 			   case ICondition::result_timeout:
-// 				   printf("timed out ... exiting\n\n");
-// 				   return;
-// 		   }
-
-        // --------- addNode ----------
-    if (bPrint) printf("\n\naddNode ....");
-    ONodeUpdater aAddTabstops(sal_False, true);	 // true = WRITER LEVEL
-    aWaitForSomething.reset();
-    aSession.addNode(sOpenedNode, UNI_STRING(pLayoutNode), &aAddTabstops, new OOpenNodeCallback(aWaitForSomething));
-    switch (aWaitForSomething.wait(&aTimeout))
-    {
-    case ICondition::result_error:
-        printf("error while waiting for the callback ... exiting\n\n");
-        return;
-    case ICondition::result_timeout:
-        if (bPrint) printf("timed out ... exiting\n\n");
-        return;
-    }
-        
-    // --------- updateNode ----------
-    if (bPrint) printf("\n\nokay, let's try an update ....\n");
-
-    ONodeUpdater aUpdateWriter(sal_False, false);
-    aWaitForSomething.reset();
-    aSession.updateNode(sOpenedNode, UNI_STRING(pLayoutNode), &aUpdateWriter, new OOpenNodeCallback(aWaitForSomething));
-
-    switch (aWaitForSomething.wait(&aTimeout))
-    {
-    case ICondition::result_error:
-        printf("error while waiting for the callback ... exiting\n\n");
-        return;
-    case ICondition::result_timeout:
-        if (bPrint) printf("timed out ... exiting\n\n");
-        return;
-    }
-
-    // --------- deleteNode ----------
-    char* pLayoutNode2 = "com.sun.star.Setup/Modules/StandFonts";
-
-    if (bPrint) printf("\n\ndeleteNode ....");
-    aWaitForSomething.reset();
-    aSession.deleteNode(sOpenedNode, UNI_STRING(pLayoutNode2), new OOpenNodeCallback(aWaitForSomething));
-    switch (aWaitForSomething.wait(&aTimeout))
-    {
-    case ICondition::result_error:
-        printf("error while waiting for the callback ... exiting\n\n");
-        return;
-    case ICondition::result_timeout:
-        if (bPrint) printf("timed out ... exiting\n\n");
-        return;
-    }
-        
-/*
-  // --------- startListening ----------
-  printf("\n\nadding a listener for the Layout node\n");
-  Sequence< ::rtl::OUString > aNodesToListen(1);
-  aNodesToListen[0] = UNI_STRING(pLayoutNode);
-  aSession.startListening(aNodesToListen, NULL);
-
-  printf("waiting 10 seconds ....\n\n");
-  aWaitForSomething.reset();
-  aTimeout.Seconds = 10;
-  aWaitForSomething.wait(&aTimeout);
-*/
-    // --------- getNode (2) ----------
-// 		   printf("\ndoing a new getNode for the Layout node ...\n");
-// 		   aWaitForSomething.reset();
-// 		   aSession.getNode(UNI_STRING(pLayoutNode), new OOpenNodeCallback(aWaitForSomething));
-// 		   switch (aWaitForSomething.wait(&aTimeout))
-// 		   {
-// 			   case ICondition::result_error:
-// 				   printf("error while waiting for the callback ... exiting\n\n");
-// 				   return;
-// 			   case ICondition::result_timeout:
-// 				   printf("timed out ... exiting\n\n");
-// 				   return;
-// 		   }
-
-    aSession.closeNode(sOpenedNode, NULL);
-    aSession.close(NULL);
-
-}
-
diff --git a/configmgr/workben/local_io/com.sun.star.office.Setup.xml b/configmgr/workben/local_io/com.sun.star.office.Setup.xml
deleted file mode 100644
index 4018ab3b8d..0000000000
--- a/configmgr/workben/local_io/com.sun.star.office.Setup.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<com.sun.star.office.Setup>
-    <Language>
-        <Language_ID Type="string"><value>1033</value></Language_ID>
-    </Language>
-    <Modules>
-        <SCalc Type="boolean">
-            <value>true</value>
-        </SCalc>
-        <SChart Type="boolean">
-            <value>true</value>
-        </SChart>
-        <SDraw Type="boolean">
-            <value>true</value>
-        </SDraw>
-        <SImage Type="boolean">
-            <value>true</value>
-        </SImage>
-        <SImpress Type="boolean">
-            <value>true</value>
-        </SImpress>
-        <SMath Type="boolean">
-            <value>true</value>
-        </SMath>
-        <SWriter Type="boolean">
-            <value>true</value>
-        </SWriter>
- </Modules>
-</com.sun.star.office.Setup>
\ No newline at end of file
diff --git a/configmgr/workben/local_io/filetest.cxx b/configmgr/workben/local_io/filetest.cxx
deleted file mode 100644
index 52ecdf555e..0000000000
--- a/configmgr/workben/local_io/filetest.cxx
+++ /dev/null
@@ -1,93 +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: filetest.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_configmgr.hxx"
-#include <iostream>
-#include<osl/file.hxx>
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-// -----------------------------------------------------------------------------
-// --------------------------------- namespaces ---------------------------------
-// -----------------------------------------------------------------------------
-using namespace com::sun::star::uno;
-
-using ::rtl::OUString;
-using ::osl::File;
-// -----------------------------------------------------------------------------
-// ---------------------------------- defines ----------------------------------
-// -----------------------------------------------------------------------------
-#define ASCII(x) OUString::createFromAscii(x)
-
-
-// -----------------------------------------------------------------------------
-// ------------------------------------ main ------------------------------------
-// -----------------------------------------------------------------------------
-
-/*
-OUString operator+(const OUString &a, const OUString &b)
-{
-    OUString c = a;
-    c += b;
-    return c;
-}
-*/
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    OUString aPath = ASCII("f:/local/SRC598/configmgr/workben/local_io");
-    OUString aFilename = ASCII("com.sun.star.office.Setup");
-    OUString aExtension = ASCII("xml");
-
-    OUString aFullname = aPath + ASCII("/") + aFilename + ASCII(".") + aExtension;
-
-    // Filename convertieren
-    OUString aURL;
-    File aConvert(ASCII(""));
-    aConvert.normalizePath(aFullname, aURL);
-
-    // File oeffnen
-    File aFile(aURL);
-    aFile.open(osl_File_OpenFlag_Read);
-
-    sal_uInt64 nBytesRead;
-    Sequence< sal_Int8 > aBufferSeq(2000);
-    sal_Int8 *pBuff = aBufferSeq.getArray();
-    aFile.read(pBuff, 2000, nBytesRead);
-
-    aFile.close();
-    return 0;
-}
diff --git a/configmgr/workben/local_io/makefile.mk b/configmgr/workben/local_io/makefile.mk
deleted file mode 100644
index 9b839d0fd7..0000000000
--- a/configmgr/workben/local_io/makefile.mk
+++ /dev/null
@@ -1,114 +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=..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=configmgr
-
-TARGET=cfgfile
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-# ... common for all test executables ..............................
-APPSTDLIBS=\
-            $(SALLIB) \
-         $(VOSLIB) \
-            $(CPPULIB)	\
-        $(UNOTOOLSLIB) \
-            $(CPPUHELPERLIB) \
-
-
-# ... FileTests .....................................................
-APP1STDLIBS = $(APPSTDLIBS) \
-    $(STDLIBCPP) \
-
-APP1STDLIBS+=$(STDLIBCPP)
-
-APP1TARGET= $(TARGET)
-
-APP1OBJS=	\
-    $(SLO)$/cfgfile.obj \
-    $(SLO)$/oslstream.obj \
-    $(SLO)$/filehelper.obj \
-    $(SLO)$/simpletest.obj \
-    $(SLO)$/strimpl.obj \
-    $(SLO)$/confname.obj \
-
-#	$(SLO)$/xmlexport.obj \
-#	$(SLO)$/xmlimport.obj \
-
-# 	  $(SLO)$/xmltreebuilder.obj \
-# 	  $(SLO)$/cmtree.obj \
-# 	  $(SLO)$/cmtreemodel.obj \
-# 	  $(SLO)$/typeconverter.obj \
-# 	  $(SLO)$/changes.obj \
-# 	  $(SLO)$/xmlformater.obj \
-# 	  $(SLO)$/attributes.obj \
-# 	  $(SLO)$/tracer.obj \
-
-
-# ... common for all test executables ..............................
-# APP2STDLIBS = $(APPSTDLIBS)
-# 
-# APP2STDLIBS+=$(STDLIBCPP)
-# 
-# APP2TARGET= cfglocal
-# APP2OBJS=	\
-# 	  $(SLO)$/cfglocal.obj	\
-# 	  $(SLO)$/receivethread.obj	\
-# 	  $(SLO)$/redirector.obj	\
-# 	  $(SLO)$/socketstream.obj	\
-# 	  $(SLO)$/attributes.obj	\
-# 	  $(SLO)$/localsession.obj \
-# 	  $(SLO)$/saxtools.obj \
-# 	  $(SLO)$/mergeupdates.obj \
-# 	  $(SLO)$/oslstream.obj \
-# 	  $(SLO)$/configsession.obj \
-# 	  $(SLO)$/confname.obj \
-# 	  $(SLO)$/sessionstream.obj \
-# 	  $(SLO)$/filehelper.obj \
-# 	  $(SLO)$/tracer.obj \
-# 	  $(SLO)$/updatedom.obj \
-# 	  $(SLO)$/strconverter.obj \
-# 	  $(SLO)$/strimpl.obj \
-# 
-
-.INCLUDE :  target.mk
-
-
diff --git a/configmgr/workben/local_io/org.openoffice.test.xml b/configmgr/workben/local_io/org.openoffice.test.xml
deleted file mode 100644
index b0c76cbf86..0000000000
--- a/configmgr/workben/local_io/org.openoffice.test.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<org.openoffice.test
-xmlns="http://openoffice.org/2000/registry/components/org.openoffice.Inet"
-xmlns:cfg="http://openoffice.org/2000/registry/instance"
-xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance" xml:lang="en-US">
-
-<!-- long -->
-    <Long cfg:type="long">100000000000000</Long>
-    <LongList cfg:type="long" cfg:derivedBy="list">1     2		3
-
- 4 5
-
-
-
-
-    6 7 8 9</LongList>
-    <LongList2 cfg:type="long" cfg:derivedBy="list" cfg:separator=".">1.2.3.4.5.6.7.8.9</LongList2>
-
-<!-- double -->
-    <DoubleWithDot cfg:type="double">.787564</DoubleWithDot>
-    <EuroDM cfg:type="double">1.95583</EuroDM>
-    <ZeroDotZeroZeroOne cfg:type="double">0.001</ZeroDotZeroZeroOne>
-    <ZeroDotOne cfg:type="double">0.1</ZeroDotOne>
-    <NZeroDotOne cfg:type="double">-0.1</NZeroDotOne>
-
-<!-- binary -->
-    <Binary  cfg:type="binary" cfg:nullable="true" xsi:null="true"/>
-    <Binary2 cfg:type="binary" xsi:null="true"/>
-    <Binary3 cfg:type="binary" >010203040506070809</Binary3>
-    <Binary4 cfg:type="binary" cfg:nullable="true">000102030405060708090a</Binary4>
-
-<!-- Strings -->
-    <NullString cfg:type="string" xsi:null="true"/>
-    <String cfg:type="string">Identifier</String>
-    <StringList cfg:type="string" cfg:derivedBy="list">file:/ private:explorer private:help private:newmenu private:schedule private:searchfolder private:user</StringList>
-    <List cfg:type="string" cfg:derivedBy="list">NULL</List>
-    <PathAutoCorrect cfg:type="string" cfg:separator=":" cfg:derivedBy="list">$(inst)/share/autocorr:$(user)/autocorr</PathAutoCorrect>
-    <List2 cfg:type="string" cfg:derivedBy="list" cfg:separator="stupid" >NULLstupidFIRSTstupidSECONDstupid</List2>
-    <SeparatorKiller cfg:type="string" cfg:derivedBy="list" cfg:separator="." > .,.;.:.#.|.a._.!.$.%./.(.)=.?.+.*.#.~.'.\.{.}._</SeparatorKiller>
-
-<!-- localized -->
-    <LocaleString cfg:type="string" cfg:localized="true">
-        <cfg:value xml:lang="en-US">This is a string</cfg:value>
-        <cfg:value xml:lang="de-DE">Dies ist ein String</cfg:value>
-    </LocaleString>
-
-<!-- boolean -->
-    <BoolFalse cfg:type="boolean">false</BoolFalse>
-    <BoolTrue cfg:type="boolean">true</BoolTrue>
-    <BoolList cfg:type="boolean" cfg:derivedBy="list">true true false</BoolList>
-    <BoolNULL cfg:type="boolean" xsi:null="true"/>
-
-<!-- int -->
-    <Integer cfg:type="int">3</Integer>
-    <IntegerNullWithXsi cfg:type="int" xsi:null="true">10</IntegerNullWithXsi>
-    <IntegerNull cfg:type="int"/>
-
-    <IntList cfg:type="int" cfg:derivedBy="list">1 2 3 4 5 6 7 8 224 226 222 223 5</IntList>
-
-<!-- short -->
-    <Short cfg:type="short">100</Short>
-
-    <Inner>
-        <Inner2>
-            <IntList cfg:type="int" cfg:derivedBy="list">224 226 222 223 5</IntList>
-        </Inner2>
-    </Inner>
-
-</org.openoffice.test>
diff --git a/configmgr/workben/local_io/simpletest.cxx b/configmgr/workben/local_io/simpletest.cxx
deleted file mode 100644
index 8a69ed9e3b..0000000000
--- a/configmgr/workben/local_io/simpletest.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: simpletest.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_configmgr.hxx"
-
-#include <memory>
-#include <vector>
-#include <stack>
-#include<osl/file.hxx>
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/servicefactory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
-#include <com/sun/star/lang/XComponent.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HDL_
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASINK_HDL_
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATACONTROL_HDL_
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XDATATRANSFEREVENTLISTENER_HDL_
-#include <com/sun/star/io/XDataTransferEventListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XDATAIMPORTER_HDL_
-#include <com/sun/star/io/XDataImporter.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HDL_
-#include <com/sun/star/io/XInputStream.hpp>
-#endif
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <vos/thread.hxx>
-
-#include <vos/pipe.hxx>
-#include <osl/diagnose.h>
-#include "oslstream.hxx"
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <osl/conditn.hxx>
-
-#include "xmltreebuilder.hxx"
-
-#include "dataimport.hxx"
-
-#include "createpropertyvalue.hxx"
-#include "strdecl.hxx"
-
-#include "confname.hxx"
-
-#include "FileHelper.hxx"
-
-// -----------------------------------------------------------------------------
-// --------------------------------- namespaces ---------------------------------
-// -----------------------------------------------------------------------------
-namespace uno = com::sun::star::uno;
-namespace lang = com::sun::star::lang;
-namespace io = com::sun::star::io;
-namespace sax = com::sun::star::xml::sax;
-namespace script = com::sun::star::script;
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::io;
-using namespace rtl;
-using namespace osl;
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- defines ----------------------------------
-// -----------------------------------------------------------------------------
-#ifndef ASCII
-#define ASCII(x) OUString::createFromAscii(x)
-#endif
-
-ostream& operator << (ostream& out, rtl::OUString const& aStr)
-{
-    sal_Unicode const* const pStr = aStr.getStr();
-    sal_Unicode const* const pEnd = pStr + aStr.getLength();
-    for (sal_Unicode const* p = pStr; p < pEnd; ++p)
-        if (0 < *p && *p < 127) // ASCII
-            out << char(*p);
-        else
-            out << "[\\u" << hex << *p << "]";
-    return out;
-}
-
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- a Class ----------------------------------
-// -----------------------------------------------------------------------------
-// <Name a="xyz" b="bar">
-
-//==========================================================================
-//= Visitors
-//==========================================================================
-
-
-namespace configmgr
-{
-    
-    class XMLSimpleDocHandler : public ::cppu::WeakImplHelper1<sax::XDocumentHandler>
-    {
-        // uno::Reference< sax::XDocumentHandler > m_xWriter;         // the service object for writing XML code
-
-        sal_Int32 m_nElementDepth;
-        sal_Int32 m_nIgnoreLevel;
-    public:
-        XMLSimpleDocHandler::XMLSimpleDocHandler()
-            {}
-        
-
-        // DECLARE_UNO3_DEFAULTS(XMLReadFilter, CmDocumentHandler_BASE);
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-            throw (sax::SAXException, uno::RuntimeException)
-            {
-            }
-        
-        virtual void SAL_CALL endDocument(void)
-            throw(sax::SAXException, uno::RuntimeException)
-            {
-            }
-        
-        virtual void SAL_CALL startElement(const rtl::OUString& aName,
-                                           const uno::Reference< sax::XAttributeList > &_xAttrList)
-            throw(sax::SAXException, uno::RuntimeException)
-            {
-                sal_Int16 nAttrCount = _xAttrList.is() ? _xAttrList->getLength() : 0;
-                for( sal_Int16 i=0; i < nAttrCount; i++ )
-                {
-                    OUString aParamName( _xAttrList->getNameByIndex( i ) );
-                    OUString aParamValue( _xAttrList->getValueByIndex( i ) );
-                    volatile int dummy = 0;
-                }
-            }
-        
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-            throw(sax::SAXException, uno::RuntimeException)
-            {
-            }
-        
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-            throw(sax::SAXException, uno::RuntimeException)
-            {}
-        
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-            throw(sax::SAXException, uno::RuntimeException)
-            {}
-        
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-            throw(sax::SAXException, uno::RuntimeException)
-            {}
-        
-        virtual void SAL_CALL setDocumentLocator(const uno::Reference< sax::XLocator > &xLocator)
-            throw(sax::SAXException, uno::RuntimeException)
-            {}
-    };
-
-// -----------------------------------------------------------------------------
-// ------------------------------------ Test ------------------------------------
-// -----------------------------------------------------------------------------
-#define ASCII_STRING(rtlOUString)	rtl::OUStringToOString(rtlOUString, RTL_TEXTENCODING_ASCII_US).getStr()
-    static ::rtl::OUString	sRegistry = ::rtl::OUString::createFromAscii("applicat.rdb");
-    
-    void simpleTest()
-    {
-        uno::Reference< lang::XMultiServiceFactory > xMSF;
-        try
-        {
-            xMSF = cppu::createRegistryServiceFactory(sRegistry, ::rtl::OUString());
-        }
-        catch (uno::Exception& e)
-        {
-            cout << "could not bootstrap the services from " << ASCII_STRING(sRegistry) << endl ;
-            cout << "    (error message : " << ASCII_STRING(e.Message) << ")" << endl;
-        }
-        
-        if (!xMSF.is())
-        {
-            cerr << "could not create the service factory !" << endl;
-            return;
-        }
-        
-        OUString aPath = ASCII("e:/temp/Test");
-        OUString aFilename = ASCII("calc");
-        OUString aExtension = ASCII("xml");
-        
-        OUString aFullname = aPath + ASCII("/") + aFilename + ASCII(".") + aExtension;
-        
-        // Filename convertieren
-        OUString aURL;
-        File aConvert(ASCII(""));
-        aConvert.normalizePath(aFullname, aURL);
-        
-        // File oeffnen
-        File aFile(aURL);
-        aFile.open(osl_File_OpenFlag_Read);
-        
-        uno::Reference<io::XInputStream> xInputStream =
-            new configmgr::OSLInputStreamWrapper(aFile);
-        
-        // connect stream to input stream to the parser
-        InputSource aInputSource;
-        Reference<XInputStream> xPipeInput( xInputStream, UNO_QUERY );
-        aInputSource.aInputStream = xPipeInput;
-        
-        Reference< sax::XParser > xParser;
-        xParser = Reference< sax::XParser > (
-            xMSF->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser")), UNO_QUERY);
-        
-        XMLSimpleDocHandler *pTest = new XMLSimpleDocHandler();
-
-        // get filter
-        Reference<XDocumentHandler> xFilter = pTest;
-        
-        // connect parser and filter
-        xParser->setDocumentHandler( xFilter );
-
-        // parse
-        sal_Int16 nRet = 0;
-        OUString sError;
-        try
-        {
-            xParser->parseStream( aInputSource );
-        }
-        catch( SAXParseException &e )
-        {
-            OUString sLine = OUString::valueOf(e.LineNumber);
-            OUString aStr = ASCII("SAXParseException occured in ");
-            sError = aStr + ASCII(" Line: (") + sLine + ASCII(")");
-
-            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
-            nRet = 3;
-        }
-        catch( SAXException &e )
-        {
-            sError = e.Message;
-            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
-            nRet = 4;
-        }
-        catch( IOException &e )
-        {
-            sError = e.Message;
-            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
-            nRet = 5;
-        }
-    }
-    
-
-#include <osl/time.h>
-#include <rtl/string.hxx>
-
-class TimeTest
-{
-    TimeValue m_aStartTime, m_aEndTime;
-    bool m_bStarted;
-public:
-    TimeTest()
-        :m_bStarted(false)
-        {
-        }
-    
-    void start() 
-        {
-            m_bStarted = true;
-            osl_getSystemTime(&m_aStartTime);
-        }
-    void stop()
-        {
-            osl_getSystemTime(&m_aEndTime);
-            OSL_ENSURE(m_bStarted, "Not Started.");
-            m_bStarted = false;
-        }
-    void  showTime(const rtl::OString & aWhatStr)
-        {
-            OSL_ENSURE(!m_bStarted, "Not Stopped.");
-
-            sal_Int32 nSeconds = m_aEndTime.Seconds - m_aStartTime.Seconds;
-            sal_Int32 nNanoSec = m_aEndTime.Nanosec - m_aStartTime.Nanosec;
-            if (nNanoSec < 0)
-            {
-                nNanoSec = 1000000000 - nNanoSec;
-                nSeconds++;
-            }
-            rtl::OString aStr = "Time for ";
-            aStr += aWhatStr;
-            aStr += " : ";
-            aStr += rtl::OString::valueOf(nSeconds);
-            aStr += ".";
-            aStr += rtl::OString::valueOf(nNanoSec);
-            
-            cout << aStr.getStr() << endl;
-        }
-    
-};
-
-// -----------------------------------------------------------------------------
-// -------------------------------- Mapping Test --------------------------------
-// -----------------------------------------------------------------------------
-// Simple Map created with a stl::vector
-
-typedef ::std::pair< rtl::OUString, rtl::OUString > Assoc;
-// typedef ::std::set<Assoc, ltNode> MappingTable;
-typedef std::vector<Assoc> MappingTable;
-
-rtl::OUString mapTo(const rtl::OUString& aFrom, bool bToNew)
-{
-    static MappingTable aMap;
-    if (aMap.empty())
-    {
-        // Fill Map old, new
-
-        aMap.push_back(Assoc(ASCII("value"),    TAG_VALUE));
-        aMap.push_back(Assoc(ASCII("type"),     ATTR_TYPE));
-        aMap.push_back(Assoc(ASCII("instance"), ATTR_INSTANCE));
-    }
-    if (bToNew)
-    {
-        // check, if we should convert first to second
-        for (std::vector<Assoc>::const_iterator it = aMap.begin();it != aMap.end();++it)
-        {
-            if ((*it).first.equals(aFrom))
-                return (*it).second;
-        }
-    }
-    else
-    {
-        // check if we should convert second to first
-        for (std::vector<Assoc>::const_iterator it = aMap.begin();it != aMap.end();++it)
-        {
-            if ((*it).second.equals(aFrom))
-                return (*it).first;
-        }
-    }
-    
-    // do nothing!
-    return aFrom;
-}
-// -----------------------------------------------------------------------------
-void simpleMappingTest()
-{
-    OUString aValue = ASCII("value");
-    OUString aNew;
-
-    aNew = mapTo(aValue, true);					 // true for ToNew
-    aNew = mapTo(aNew, false);
-    aNew = mapTo(aNew, false);
-
-    volatile int dummy = 0;
-}
-
-// -----------------------------------------------------------------------------
-    void speedTest()
-    {
-        // check speed of:
-        // ASCII("value")
-        // TAG_VALUE
-        // ...
-
-        sal_Int32 nCount = 1000 * 1000 * 100;
-        sal_Int32 n;
-
-        cout << "Starting Timetest" << endl;
-        TimeTest tt;
-        tt.start();
-        for(n=0;n<nCount;n++)
-        {
-        }
-        tt.stop();
-        tt.showTime("Leere Schleife: ");
-
-
-        nCount = 1000 * 1000 * 5;
-        rtl::OUString aStr;
-
-        tt.start();
-        for(n=0;n<nCount;n++)
-        {
-            aStr = ASCII("value");
-        }
-        tt.stop();
-        tt.showTime("ASCII() ");
-
-
-        OUString aValue = ASCII("value");
-        tt.start();
-        for(n=0;n<nCount;n++)
-        {
-            aStr = TAG_VALUE;
-        }
-        tt.stop();
-        tt.showTime("TAG_VALUE: ");
-
-    }
-    
-OUString changeToComSunStarPath(const OUString &aPath)
-{
-    static OUString aOO  = ASCII("org.OpenOffice");
-    static OUString aCSS = ASCII("com.sun.star");
-    OUString aNewPath;
-
-    // compare
-    if (aPath.compareTo( aOO, aOO.getLength() ) == 0)
-    {
-        aNewPath = aCSS;
-        aNewPath += aPath.copy(aOO.getLength());
-        return aNewPath;
-    }
-    return aPath;
-}
-
-void stringTest2()
-{
-    OUString aPath = ASCII("org.OpenOffice.Setup/blah/blub");
-
-    OUString aNewPath = changeToComSunStarPath(aPath);
-    volatile int dummy = 0;
-}
-
-/*
-
-class A
-{
-public:
-    static void run() {
-        cout << "This is A::run();" << endl;
-    }
-    
-};
-
-class B : public A
-{
-public:
-    
-    static void run() {
-        cout << "This is B::run();" << endl;
-    }
-};
-
-void classTest()
-{
-    A a;
-    B b;
-    B::run();
-}
-*/
-
-// -----------------------------------------------------------------------------
-// ------------------------------------ Map ------------------------------------
-// -----------------------------------------------------------------------------
-struct ltstr
-{
-    bool operator()(const rtl::OUString &s1, const rtl::OUString &s2) const
-        {
-            return s1.compareTo(s2) < 0 ? true : false;
-        }
-};
-
-void stringTest()
-{
-    map<const OUString, int, ltstr> months;
-  
-    months[ASCII("january")] = 31;
-    months[ASCII("february")] = 28;
-    months[ASCII("march")] = 31;
-    months[ASCII("april")] = 30;
-    months[ASCII("may")] = 31;
-    months[ASCII("june")] = 30;
-    months[ASCII("july")] = 31;
-    months[ASCII("august")] = 31;
-    months[ASCII("september")] = 30;
-    months[ASCII("october")] = 31;
-    months[ASCII("november")] = 30;
-    months[ASCII("december")] = 31;
-    
-    cout << "june -> " << months[ASCII("june")] << endl;
-    map<const OUString, int, ltstr>::iterator cur  = months.find(ASCII("april"));
-    // map<const OUString, int, ltstr>::iterator prev = cur;
-    map<const OUString, int, ltstr>::iterator next = cur;    
-    // ++next;
-    // --prev;
-    // cout << "Previous (in alphabetical order) is " << (*prev).first << endl;
-    for(int i=0;i<12;i++)
-    {
-        cout << "Next (in alphabetical order) is " << (*next).first << " days " << (*next).second << endl;
-        ++next;
-    }
-}
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- HashMap ----------------------------------
-// -----------------------------------------------------------------------------
-#include <hash_map>
-
-
-namespace test {
-    
-struct eqstr
-{
-    bool operator()(const rtl::OUString &s1, const rtl::OUString &s2) const
-        {
-            return s1.equals(s2) == sal_True ? true : false;
-        }
-};
-
-struct hash_oustring
-{
-    // This hash funktion is a copy of hash<char*> from SGI-STL
-    size_t operator()(const rtl::OUString &_s) const
-        {
-            sal_Int64 nStrLen = _s.getLength();
-            const sal_Unicode *pStr = _s.getStr();
-            unsigned long h = 0; 
-            for (sal_Int64 i=0;i<nStrLen; ++i)
-                h = 5*h + *pStr++;
-            
-            return size_t(h);
-        }
-};
-
-void hash_test()
-{
-    hash_map<const rtl::OUString, rtl::OUString, hash_oustring, eqstr> months;
-    
-    rtl::OUString sJanuary = ASCII("january");
-    months[sJanuary]   = ASCII("31");
-    months[ASCII("february")]  = ASCII("28");
-    months[ASCII("march")] 	   = ASCII("31");
-    months[ASCII("april")] 	   = ASCII("30");
-    months[ASCII("may")]  	   = ASCII("31");
-    months[ASCII("june")] 	   = ASCII("30");
-    months[ASCII("july")] 	   = ASCII("31");
-    months[ASCII("august")]    = ASCII("31");
-    months[ASCII("september")] = ASCII("30");
-    months[ASCII("october")]   = ASCII("31");
-    months[ASCII("november")]  = ASCII("30");
-    months[ASCII("december")]  = ASCII("31");
-    
-    cout << "september -> " << months[ASCII("september")] << endl;
-    cout << "april     -> " << months[ASCII("april")] << endl;
-    cout << "june      -> " << months[ASCII("june")] << endl;
-    cout << "november  -> " << months[ASCII("november")] << endl;
-}
-}
-
-
-// -----------------------------------------------------------------------------
-// Fri Nov 10 15:10:45 2000
-// -----------------------------------------------------------------------------
-
-#include <vos/ref.hxx>
-
-class Options : public vos::OReference
-{
-    int m_aValue;
-public:
-    int getValue() {return m_aValue;}
-    void setValue(int _aValue) {m_aValue = _aValue;}
-
-
-};
-
-class A
-{
-    vos::ORef<Options> m_aOptions;
-public:
-    
-    vos::ORef<Options> getOptions() {return m_aOptions;}
-    void setOptions(vos::ORef<Options>& _aOptions) {
-        m_aOptions = _aOptions;
-    }
-};
-
-void testRefs()
-{
-    vos::ORef<Options> aO = new Options;
-    aO->setValue(10);
-
-    A a,b;
-    a.setOptions(aO);
-    b.setOptions(aO);
-    cout << "Options from a : " << a.getOptions()->getValue() << endl;
-    cout << "Options from b : " << b.getOptions()->getValue() << endl;
-
-    aO->setValue(20);
-    cout << "Options from a : " << a.getOptions()->getValue() << endl;
-    cout << "Options from b : " << b.getOptions()->getValue() << endl;
-}
-
-
-
-void ConfigName()
-{
-    // OUString aSubtreePath = ASCII("/org.openoffice.office.common/path/blah/blub");
-    OUString aSubtreePath = ASCII("/org.openoffice.office.common");
-    ConfigurationName aName(aSubtreePath);
-    OUString a = aName.localName();
-    OUString b = aName.fullName();
-    OUString c = aName.moduleName();
-    ConfigurationName aParentName(aName.getParentName());
-    OUString d = aParentName.fullName();
-    
-
-    {
-        ConfigurationName aName( ASCII("/" ));
-        
-        std::stack< rtl::OUString, std::vector<rtl::OUString> > m_aStringStack;
-        
-        if (aName.localName().getLength() != 0)
-        {
-            for (ConfigurationName::Iterator it = aName.begin();
-                 it != aName.end();
-                 ++it)
-            {
-                rtl::OUString aName = *it;
-                m_aStringStack.push(aName);
-                // m_xHandler->startElement(*it, rList);
-                volatile int dummy = 0;
-            }
-        }
-        
-        // bBack = writeChanges();
-        
-        while(!m_aStringStack.empty())
-        {
-            OUString aName = m_aStringStack.top();
-            m_aStringStack.pop();
-        }
-    }
-} 
-
-void ConfigName2()
-{
-    OUString aSubtreePath = ASCII("/org.openoffice.office.common/path/blah/blub");
-    ConfigurationName aName(aSubtreePath);
-    ConfigurationName aParent = aName.getParentName();
-
-    for (ConfigurationName::Iterator it = aName.begin();
-         it != aName.end();
-         ++it)
-    {
-        rtl::OUString aName = *it;
-        volatile int dummy = 0;
-    }
-}
-
-// -----------------------------------------------------------------------------
-inline void operator <<= (rtl::OUString& _rUnicodeString, const sal_Char* _pAsciiString)
-{
-    _rUnicodeString = ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (rtl::OUString& _rUnicodeString, const rtl::OString& _rAsciiString)
-{
-    _rUnicodeString <<= _rAsciiString.getStr();
-}
-
-inline void operator <<= (rtl::OString& _rAsciiString, const rtl::OUString& _rUnicodeString)
-{
-    _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US);
-}
-
-// -----------------------------------------------------------------------------
-bool isBTimeGreaterATime(TimeValue const& A, TimeValue const& B)
-{
-    if (B.Seconds > A.Seconds) return true;
-    if (B.Nanosec > A.Nanosec) return true;
-
-    // lower or equal
-    return false;
-}
-
-// -----------------------------------------------------------------------------
-
-void oslTest()
-{
-    
-    OUString aDirectory(FileHelper::convertFilenameToFileURL(ASCII("c:/temp/file.out.1")));
-    TimeValue a = FileHelper::getFileModificationStamp(aDirectory);
-
-    OUString aDirectory2(FileHelper::convertFilenameToFileURL(ASCII("c:/temp/file.out.2")));
-    TimeValue b = FileHelper::getFileModificationStamp(aDirectory2);
-
-    if (isBTimeGreaterATime(a,b))
-    {
-        OSL_ENSURE(false, "FileB ist neuer als FileA");
-    }
-    
-    
-/*
-    OUString aDirectory(FileHelper::convertFilenameToFileURL(ASCII("c:/temp/dies")));
-    osl::FileBase::RC eError = osl::Directory::create(aDirectory);
-    if (eError != osl::FileBase::E_None)
-    {
-        OUString aUStr = FileHelper::createOSLErrorString(eError);
-        OString aStr;
-        aStr <<= aUStr;
-        OSL_ENSURE(false, aStr.getStr());
-    }
-*/
-}
-
-} // namespace configmgr
diff --git a/configmgr/workben/local_io/xmlexport.cxx b/configmgr/workben/local_io/xmlexport.cxx
deleted file mode 100644
index 8118b775f5..0000000000
--- a/configmgr/workben/local_io/xmlexport.cxx
+++ /dev/null
@@ -1,239 +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: xmlexport.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_configmgr.hxx"
-
-#include<iostream>
-#include<osl/file.hxx>
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/servicefactory.hxx>
-/*
-#include <cppuhelper/implbase1.hxx>
-*/
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
-#include <com/sun/star/lang/XComponent.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XDATATRANSFEREVENTLISTENER_HDL_
-#include <com/sun/star/io/XDataTransferEventListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XDATAIMPORTER_HDL_
-#include <com/sun/star/io/XDataExporter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HDL_
-#include <com/sun/star/io/XOutputStream.hpp>
-#endif
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <osl/diagnose.h>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
-#include "oslstream.hxx"
-#include "attributes.hxx"
-#include "typeconverter.hxx"
-#include "xmlformater.hxx"
-#include "filehelper.hxx"
-
-
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-#include "createpropertyvalue.hxx"
-// -----------------------------------------------------------------------------
-// --------------------------------- namespaces ---------------------------------
-// -----------------------------------------------------------------------------
-namespace configmgr 
-{
-    
-    namespace uno = com::sun::star::uno;
-    namespace lang = com::sun::star::lang;
-    namespace io = com::sun::star::io;
-    namespace sax = com::sun::star::xml::sax;
-    namespace beans = com::sun::star::beans;
-
-    using ::rtl::OUString;
-    using ::osl::File;
-
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::lang;
-    using namespace ::com::sun::star::container;
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- defines ----------------------------------
-// -----------------------------------------------------------------------------
-#define ASCII(x) OUString::createFromAscii(x)
-
-// -----------------------------------------------------------------------------
-    class Listener : public ::cppu::WeakImplHelper1<io::XDataTransferEventListener>
-    {
-        virtual void SAL_CALL disposing( const lang::EventObject& Source )
-            throw(::com::sun::star::uno::RuntimeException)
-            {
-                OSL_ENSURE(0, "disposing");
-            }
-    
-
-        virtual void SAL_CALL finished( const io::DataTransferEvent& aEvent ) 
-            throw(uno::RuntimeException)
-            {
-                OSL_ENSURE(0, "finished");
-            }
-    
-        virtual void SAL_CALL cancelled( const io::DataTransferEvent& aEvent )
-            throw(uno::RuntimeException)
-            {
-                OSL_ENSURE(0, "cancelled");
-            }
-    };
-
-    class Component: public ::cppu::WeakImplHelper1<lang::XComponent>
-    {
-        virtual void SAL_CALL dispose(  )
-            throw(uno::RuntimeException)
-            {
-                OSL_ENSURE(0, "dispose");
-
-            }
-        virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-            throw(uno::RuntimeException)
-            {
-                OSL_ENSURE(0, "addEventListener");
-            }
-        virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
-            throw(uno::RuntimeException)
-            {
-                OSL_ENSURE(0, "removeEventListener");
-            }
-    };
-
-
-
-
-
-#define ASCII_STRING(rtlOUString)	rtl::OUStringToOString(rtlOUString, RTL_TEXTENCODING_ASCII_US).getStr()
-    static ::rtl::OUString	sRegistry = ::rtl::OUString::createFromAscii("applicat.rdb");
-
-
-
-
-
-
-
-
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-    void exportTest()
-    {
-        uno::Reference< lang::XMultiServiceFactory > xMSF;
-        try
-        {
-            xMSF = cppu::createRegistryServiceFactory(sRegistry, ::rtl::OUString());
-        }
-        catch (uno::Exception& e)
-        {
-            cout << "could not bootstrap the services from " << ASCII_STRING(sRegistry) << endl ;
-            cout << "    (error message : " << ASCII_STRING(e.Message) << ")" << endl;
-        }
-        
-        if (!xMSF.is())
-        {
-            cerr << "could not create the service factory !" << endl;
-            return;
-        }
-        
-        OUString aPath = ASCII("l:/SRC601/configmgr/workben/local_io");
-        OUString sFilename = ASCII("exported_config");
-        OUString aExtension = ASCII("xml");
-
-        OUString aFullname = aPath + ASCII("/") + sFilename + ASCII(".") + aExtension;
-        
-        // Filename convertieren
-        OUString aURL;
-        File aConvert(ASCII(""));
-        aConvert.normalizePath(aFullname, aURL);
-        
-        FileHelper::tryToRemoveFile(aURL);
-
-        rtl::OUString sError;
-
-        // File oeffnen
-        File aFile(aURL);
-        osl::FileBase::RC eError = aFile.open(OpenFlag_Write | OpenFlag_Create);
-
-        if (eError != osl_File_E_None)
-        {
-            sError = ASCII("XMLExportTest:");
-            rtl::OString aStr = rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSURE(0, aStr.getStr());
-            return;
-        }
-        
-        // create an outputstream
-        uno::Reference<io::XOutputStream> xOutputStream = new configmgr::OSLOutputStreamWrapper(aFile);
-
-        // Listener & Component
-        uno::Reference<io::XDataTransferEventListener>  rListener = new Listener();
-        uno::Reference<lang::XComponent> rComponent = new Component();
-
-
-        OUString sPath = ASCII("com.sun.star.ucb.Hierarchy");
-
-        // Create a TypeConverter
-        uno::Reference<script::XTypeConverter> aConverter;
-        aConverter = aConverter.query(xMSF->createInstance(ASCII( "com.sun.star.script.Converter" )) );
-
-        // prepare parameters for DataExport
-        Sequence< uno::Any > aArgs(4);
-        aArgs[0] <<= createPropertyValue(ASCII("PackageName"), sFilename);
-        aArgs[1] <<= createPropertyValue(ASCII("Path"), sPath);	// multiple occur possible
-        aArgs[2] <<= createPropertyValue(ASCII("TypeConverter"), aConverter); // optional
-        aArgs[3] <<= createPropertyValue(ASCII("Path"), ASCII("com.sun.star.office.Setup"));	// multiple occur possible
-
-        // important: createInstanceWithArguments will throw an IllegalArgumentException() if
-        // parameters are wrong...
-        Reference< XInterface > xDataExport = xMSF->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.DataExport"),
-            aArgs);
-    
-        uno::Reference<io::XDataExporter>  rExporter(xDataExport, UNO_QUERY);
-
-        // Export Data
-        rExporter->exportData(xOutputStream, rComponent, rListener);
-    }
-
-} // namespace configmgr
diff --git a/configmgr/workben/local_io/xmlimport.cxx b/configmgr/workben/local_io/xmlimport.cxx
deleted file mode 100644
index f206490fda..0000000000
--- a/configmgr/workben/local_io/xmlimport.cxx
+++ /dev/null
@@ -1,472 +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: xmlimport.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_configmgr.hxx"
-
-#include <memory>
-#include <vector>
-#include <stack>
-#include<osl/file.hxx>
-
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/servicefactory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
-#include <com/sun/star/lang/XComponent.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HDL_
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASINK_HDL_
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATACONTROL_HDL_
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XDATATRANSFEREVENTLISTENER_HDL_
-#include <com/sun/star/io/XDataTransferEventListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_IO_XDATAIMPORTER_HDL_
-#include <com/sun/star/io/XDataImporter.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HDL_
-#include <com/sun/star/io/XInputStream.hpp>
-#endif
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <vos/thread.hxx>
-
-#include <vos/pipe.hxx>
-#include <osl/diagnose.h>
-#include "oslstream.hxx"
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <osl/conditn.hxx>
-
-#include "xmltreebuilder.hxx"
-
-#include "dataimport.hxx"
-
-#include "createpropertyvalue.hxx"
-// -----------------------------------------------------------------------------
-// --------------------------------- namespaces ---------------------------------
-// -----------------------------------------------------------------------------
-namespace uno = com::sun::star::uno;
-namespace lang = com::sun::star::lang;
-namespace io = com::sun::star::io;
-namespace sax = com::sun::star::xml::sax;
-namespace script = com::sun::star::script;
-
-using ::rtl::OUString;
-using ::osl::File;
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- defines ----------------------------------
-// -----------------------------------------------------------------------------
-#ifndef ASCII
-#define ASCII(x) OUString::createFromAscii(x)
-#endif
-
-
-// -----------------------------------------------------------------------------
-// ---------------------------------- a Class ----------------------------------
-// -----------------------------------------------------------------------------
-// <Name a="xyz" b="bar">
-
-//==========================================================================
-//= Visitors
-//==========================================================================
-
-
-// -----------------------------------------------------------------------------
-class Listener : public ::cppu::WeakImplHelper1<io::XDataTransferEventListener>
-{
-    osl::Condition m_aCondition;
-public:
-    Listener()
-        {
-            m_aCondition.reset();				 // will block
-        }
-    
-    virtual void SAL_CALL disposing( const lang::EventObject& Source )
-        throw(::com::sun::star::uno::RuntimeException)
-        {
-            OSL_ENSURE(0, "disposing");
-            m_aCondition.set();				 // will not block
-        }
-    
-    virtual void SAL_CALL finished( const io::DataTransferEvent& aEvent ) 
-        throw(uno::RuntimeException)
-        {
-            OSL_ENSURE(0, "finished");
-            m_aCondition.set();				 // will not block
-        }
-    
-    virtual void SAL_CALL cancelled( const io::DataTransferEvent& aEvent )
-        throw(uno::RuntimeException)
-        {
-            OSL_ENSURE(0, "cancelled");
-            m_aCondition.set();				 // will not block
-        }
-public:
-    void wait()
-        {
-            m_aCondition.wait();
-        }
-};
-
-class Component: public ::cppu::WeakImplHelper1<lang::XComponent>
-{
-    virtual void SAL_CALL dispose(  )
-        throw(uno::RuntimeException)
-        {
-            OSL_ENSURE(0, "dispose");
-
-        }
-    virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw(uno::RuntimeException)
-        {
-            OSL_ENSURE(0, "addEventListener");
-        }
-    virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
-        throw(uno::RuntimeException)
-        {
-            OSL_ENSURE(0, "removeEventListener");
-        }
-};
-
-
-
-namespace configmgr
-{
-    
-// -----------------------------------------------------------------------------
-// ------------------------------------ Test ------------------------------------
-// -----------------------------------------------------------------------------
-#define ASCII_STRING(rtlOUString)	rtl::OUStringToOString(rtlOUString, RTL_TEXTENCODING_ASCII_US).getStr()
-    static ::rtl::OUString	sRegistry = ::rtl::OUString::createFromAscii("applicat.rdb");
-    
-    void importTest()
-    {
-        uno::Reference< lang::XMultiServiceFactory > xMSF;
-        try
-        {
-            xMSF = cppu::createRegistryServiceFactory(sRegistry, ::rtl::OUString());
-        }
-        catch (uno::Exception& e)
-        {
-            cout << "could not bootstrap the services from " << ASCII_STRING(sRegistry) << endl ;
-            cout << "    (error message : " << ASCII_STRING(e.Message) << ")" << endl;
-        }
-        
-        if (!xMSF.is())
-        {
-            cerr << "could not create the service factory !" << endl;
-            return;
-        }
-        
-        OUString aPath = ASCII("l:/SRC601/configmgr/workben/local_io");
-        OUString aFilename = ASCII("hierarchy");
-        OUString aExtension = ASCII("xml");
-        
-        OUString aFullname = aPath + ASCII("/") + aFilename + ASCII(".") + aExtension;
-        
-        // Filename convertieren
-        OUString aURL;
-        File aConvert(ASCII(""));
-        aConvert.normalizePath(aFullname, aURL);
-        
-        // File oeffnen
-        File aFile(aURL);
-        aFile.open(osl_File_OpenFlag_Read);
-        
-        // sal_uInt64 nBytesRead;
-        // uno::Sequence< sal_Int8 > aBufferSeq(2000);
-        // sal_Int8 *pBuff = aBufferSeq.getArray();
-        // aFile.read(pBuff, 2000, nBytesRead);
-        // 	   
-        // aFile.close();
-        
-        uno::Reference<io::XInputStream> xInputStream = new configmgr::OSLInputStreamWrapper(aFile);
-        
-        uno::Reference <uno::XInterface> xPump = xMSF->createInstance( L"com.sun.star.io.Pump" );
-        OSL_ENSURE(xPump.is(), "there is no pump");
-        
-        uno::Reference<io::XActiveDataSink> xPumpSink(xPump, uno::UNO_QUERY);
-        xPumpSink->setInputStream(xInputStream);
-        
-        uno::Reference<io::XActiveDataSource> xPumpSource(xPump, uno::UNO_QUERY);
-        
-        Listener *pListener = new Listener();
-        uno::Reference<io::XDataTransferEventListener>  rListener = pListener;
-        uno::Reference<lang::XComponent> rComponent = new Component();
-        
-        // Create a TypeConverter
-        uno::Reference<script::XTypeConverter> aConverter;
-        aConverter = aConverter.query(xMSF->createInstance(ASCII( "com.sun.star.script.Converter" )) );
-        
-        Sequence< uno::Any > aArgs(1);			 // optional arg.
-        aArgs[0] <<= configmgr::createPropertyValue(ASCII("TypeConverter"), aConverter);
-        
-        Reference< XInterface > xDataImport = xMSF->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.DataImport"),
-            aArgs);
-        
-        if (xDataImport.is())
-        {
-            uno::Reference<io::XDataImporter>  rImporter(xDataImport, UNO_QUERY);
-            
-            // Import Data
-            rImporter->importData(xPumpSource, rComponent, rListener);
-            
-            // lets pump
-            uno::Reference<io::XActiveDataControl> xControl(xPump, uno::UNO_QUERY);
-            xControl->start();
-            
-            // TEST:
-            // rImporter->cancel();
-            
-            // pImporter->wait();
-            // Wait until the listener send ready
-            pListener->wait();
-        }
-        return;
-    }
-
-// -----------------------------------------------------------------------------
-// -------------------------------- Import Test --------------------------------
-// -----------------------------------------------------------------------------
-
-    // ----------- TEST ReadAccess ----------- 
-    void showSequence(const Sequence<OUString> &aSeq);
-
-void hierarchyTest()
-{
-
-    uno::Reference< lang::XMultiServiceFactory > xMSF;
-    try
-    {
-        xMSF = cppu::createRegistryServiceFactory(sRegistry, ::rtl::OUString());
-    }
-    catch (uno::Exception& e)
-    {
-        cout << "could not bootstrap the services from " << ASCII_STRING(sRegistry) << endl ;
-        cout << "    (error message : " << ASCII_STRING(e.Message) << ")" << endl;
-    }
-    
-    if (!xMSF.is())
-    {
-        cerr << "could not create the service factory !" << endl;
-        return;
-    }
-        
-
-    Reference< XMultiServiceFactory > xCfgProvider( xMSF->createInstance(
-        ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
-                                                    UNO_QUERY);
-    
-    if (!xCfgProvider.is())
-    {
-        OSL_ENSURE(0, "No Configuration Provider");
-    }
-    
-    OUString sPath = ASCII("com.sun.star.ucb.Hierarchy");
-    
-    Sequence< Any > aArgs(1);
-    aArgs[0] <<= sPath;
-
-    Reference< XInterface > xCfgUpdt = xCfgProvider->createInstanceWithArguments(
-        OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
-        aArgs);
-
-    Reference< XNameAccess > xNameAccess(xCfgUpdt, UNO_QUERY);
-
-    // which Names are exist?
-    showSequence(xNameAccess->getElementNames());
-
-    OUString aNamePath = ASCII("Root");
-    if (xNameAccess->hasByName(aNamePath))
-    {
-        Any aAny;
-        aAny = xNameAccess->getByName(aNamePath);
-        TypeClass aTypeClass = aAny.getValueTypeClass();
-        if (aAny.getValueTypeClass() == TypeClass_INTERFACE)
-        {
-            Reference< XInterface > xInterface;
-            aAny >>= xInterface;
-            Reference< XNameAccess > xNameAccess2(xInterface, UNO_QUERY);
-            if (xNameAccess.is())
-            {
-                Sequence<OUString> aSeq = xNameAccess2->getElementNames();
-                showSequence(aSeq);
-
-                // insert a new set
-/*
-                Reference<XHierarchicalName> xHierarchical(xNameAccess, UNO_QUERY);
-                OUString aHierachicalName = xHierarchical->getHierarchicalName();
-
-                Sequence< Any > aArgs(2);
-                aArgs[0] <<= aHierachicalName;
-                sal_Int32 nLevels=1;
-                aArgs[1] <<= nLevels;
-
-                Reference< XInterface > xCfgNewUpdt = xCfgProvider->createInstanceWithArguments(
-                    OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
-                    aArgs);
-*/				
-                Reference< lang::XSingleServiceFactory > xChildFactory(xNameAccess2, UNO_QUERY);
-                if (xChildFactory.is())
-                {
-                    Reference< XInterface > xChild = xChildFactory->createInstance();
-                    if (xChild.is())
-                    {
-                        Reference<XNameAccess> xObjectOnTheMedow(xChild, UNO_QUERY);
-                        
-
-
-
-                        // which Names are exist?
-                        showSequence(xObjectOnTheMedow->getElementNames());
-
-                        OUString aChildren = ASCII("Children");
-                        if (xObjectOnTheMedow->hasByName(aChildren))
-                        {
-                            Any aAny;
-                            aAny = xObjectOnTheMedow->getByName(aChildren);
-                            TypeClass aTypeClass = aAny.getValueTypeClass();
-                            if (aAny.getValueTypeClass() == TypeClass_INTERFACE)
-                            {
-                                Reference< XInterface > xInterface;
-                                aAny >>= xInterface;
-                                Reference< XNameAccess > xChildFromOOM(xInterface, UNO_QUERY);
-
-                                if (xChildFromOOM.is())
-                                {
-                                    // insert a new Object in the new Object
-
-                                    Reference< lang::XSingleServiceFactory > xChildFactory(xChildFromOOM, UNO_QUERY);
-                                    if (xChildFactory.is())
-                                    {
-                                        Reference< XInterface > xChild = xChildFactory->createInstance();
-                                        if (xChild.is())
-                                        {
-                                            Reference<XNameContainer> xNameContainer(xChildFromOOM, UNO_QUERY);
-                                            if (xNameContainer.is())
-                                            {
-                                                xNameContainer->insertByName(ASCII("Test2"), makeAny(xChild));
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        
-
-                        Reference<XNameContainer> xNameContainer(xNameAccess2, UNO_QUERY);
-                        if (xNameContainer.is())
-                        {
-                            xNameContainer->insertByName(ASCII("Test"), makeAny(xObjectOnTheMedow));
-                        }
-                    }
-
-                    // commit changes
-                    Reference< XChangesBatch > xChangesBatch(xCfgUpdt, UNO_QUERY);
-                    if (xChangesBatch.is())
-                    {
-                        xChangesBatch->commitChanges();
-                    }
-                }
-
-                Sequence<OUString> aSeq2 = xNameAccess2->getElementNames();
-                showSequence(aSeq2);
-
-/*
-                OUString *pStr = aSeq.getArray();
-                for (int i=0;i<aSeq.getLength();i++)
-                {
-                    OUString aStr = pStr[i];
-                    Any aAny;
-                    aAny = xNameAccess->getByName(aStr);
-                    TypeClass aTypeClass = aAny.getValueTypeClass();
-
-                    Reference< XNameReplace > xNameReplace(xNameAccess, UNO_QUERY);
-
-                    Any aNewAny;
-                    sal_Bool bValue = false;
-                    aNewAny <<= bValue;
-                    xNameReplace->replaceByName(aStr, aNewAny);
-
-                    volatile int dummy = 0;
-                }
-*/
-            }
-        }
-        volatile int dummy = 0;
-    }
-}
-
-// ------------------------------ Helperfunctions ------------------------------
-
-    void showSequence(const Sequence<OUString> &aSeq)
-    {
-        OUString aArray;
-        const OUString *pStr = aSeq.getConstArray();
-        for (int i=0;i<aSeq.getLength();i++)
-        {
-            OUString aStr = pStr[i];
-            aArray += aStr + ASCII(", ");
-        }
-        volatile int dummy = 0;
-    }
-    
-} // namespace configmgr
diff --git a/configmgr/workben/logger/exports.dxp b/configmgr/workben/logger/exports.dxp
deleted file mode 100644
index 9630d7e067..0000000000
--- a/configmgr/workben/logger/exports.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getImplementationEnvironment
-component_writeInfo
-component_getFactory
diff --git a/configmgr/workben/logger/loggerdfn.cxx b/configmgr/workben/logger/loggerdfn.cxx
deleted file mode 100644
index ae8931435b..0000000000
--- a/configmgr/workben/logger/loggerdfn.cxx
+++ /dev/null
@@ -1,154 +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: loggerdfn.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_configmgr.hxx"
-
-#include "simplelogger.hxx"
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <cppuhelper/implementationentry.hxx>
-#endif
-#include <rtl/ustrbuf.hxx>
-
-namespace cssuno = com::sun::star::uno;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
-//==============================================================================
-
-static cssuno::Reference<cssuno::XInterface> SAL_CALL 
-    createSimpleLogger( const cssuno::Reference<cssuno::XComponentContext>& aContext) 
-{
-    return * new logger::SimpleLogger(aContext,"configuration.log") ;
-}
-//==============================================================================
-
-// adapted from the corresponding cppuhelper function
-static sal_Bool component_writeInfoHelper_withSingleton(
-    void *pServiceManager, void *pRegistryKey , 
-    const cppu::ImplementationEntry entries[],
-    char const * const singletons[])
-{
-    using namespace com::sun::star::registry;
-    using rtl::OUString;
-
-    sal_Bool bRet = sal_False;
-    try
-    {
-        if( pRegistryKey )
-        {
-            for( sal_Int32 i = 0; entries[i].create ; i ++ )
-            {
-                rtl::OUStringBuffer buf( 124 );
-                buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("/") );
-                buf.append( entries[i].getImplementationName() );
-                buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( "/UNO/SERVICES" ) );
-                cssuno::Reference< XRegistryKey > xNewKey(
-                    static_cast< XRegistryKey * >( pRegistryKey )->createKey( buf.makeStringAndClear()  ) );
-
-                cssuno::Sequence< OUString > const seq = entries[i].getSupportedServiceNames();
-                for ( sal_Int32 nPos = 0 ; nPos < seq.getLength(); nPos ++ )
-                    xNewKey->createKey( seq[nPos] );
-
-                if (singletons[i])
-                {
-                    rtl::OUStringBuffer buf( 124 );
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("/") );
-                    buf.append( entries[i].getImplementationName() );
-                    buf.appendAscii(RTL_CONSTASCII_STRINGPARAM( "/UNO/SINGLETONS/" ) );
-                    buf.appendAscii(singletons[i]);
-                    cssuno::Reference< XRegistryKey > xNewKey(
-                        static_cast< XRegistryKey * >( pRegistryKey )->createKey( buf.makeStringAndClear()  ) );
-
-                    xNewKey->setStringValue(entries[i].getImplementationName());
-                }
-            }
-            bRet = sal_True;
-        }
-    }
-    catch ( InvalidRegistryException & )
-    {
-        OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-    }
-    catch ( cssuno::Exception & )
-    {
-        OSL_ENSURE( sal_False, "### Unexpected UNO Exception!" );
-    }
-    return bRet;
-}
-
-//------------------------------------------------------------------------------
-
-static const cppu::ImplementationEntry kImplementations_entries[] = 
-{
-    {
-        createSimpleLogger,
-        logger::SimpleLogger::getImplementationName_static,
-        logger::SimpleLogger::getSupportedServiceNames_static,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL }
-} ;
-static const char * const kSingleton_names[] = 
-{  
-    "com.sun.star.configuration.theLogger", 
-    NULL 
-};
-
-//------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-                                            const sal_Char **aEnvTypeName,
-                                            uno_Environment **aEnvironment) {
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-//------------------------------------------------------------------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager,
-                                                 void *aRegistryKey) {
-    return component_writeInfoHelper_withSingleton( aServiceManager, 
-                                                    aRegistryKey,
-                                                    kImplementations_entries,
-                                                    kSingleton_names) ;
-}
-//------------------------------------------------------------------------------
-
-extern "C" void *component_getFactory(const sal_Char *aImplementationName,
-                                      void *aServiceManager,
-                                      void *aRegistryKey) {
-    return cppu::component_getFactoryHelper(aImplementationName,
-                                            aServiceManager,
-                                            aRegistryKey,
-                                            kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
diff --git a/configmgr/workben/logger/makefile.mk b/configmgr/workben/logger/makefile.mk
deleted file mode 100644
index a7d37cb002..0000000000
--- a/configmgr/workben/logger/makefile.mk
+++ /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: 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=..$/..
-
-PRJINC=$(PRJ)$/source
-PRJNAME=configmgr
-TARGET=simplelogger
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-SYSMGR_MAJOR=1
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/simplelogger.obj \
-    $(SLO)$/loggerdfn.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib        
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(SYSMGR_MAJOR).uno   
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp    
-DEF1DES=Configuration: Simple Logger
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
diff --git a/configmgr/workben/logger/simplelogger.cxx b/configmgr/workben/logger/simplelogger.cxx
deleted file mode 100644
index 2fb8de0937..0000000000
--- a/configmgr/workben/logger/simplelogger.cxx
+++ /dev/null
@@ -1,177 +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: simplelogger.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_configmgr.hxx"
-
-#include "simplelogger.hxx"
-#include <com/sun/star/util/logging/LogLevel.hpp>
-
-#include <osl/thread.h>
-#include <stdlib.h> // for getenv
-
-namespace logger 
-{
-
-    namespace LogLevel = com::sun::star::util::logging::LogLevel;
-
-//==============================================================================
-static rtl::OString level2str(sal_Int32 nLevel)
-{
-   return rtl::OString::valueOf(nLevel);
-}
-
-sal_Int32 str2level(rtl::OString const & str)
-{
-    return str.toInt32();
-}
-
-//------------------------------------------------------------------------------
-SimpleLogger::SimpleLogger( const uno::Reference<uno::XComponentContext>& xContext, char const * name) 
-: mContext(xContext)
-, mName( OUString::createFromAscii(name) )
-, mOutput(stderr)
-, mLevel(LogLevel::INFO)
-{
-    if (char const * fname = getenv("CFG_LOGFILE"))
-    {
-        mOutput = fopen(fname,"a+");
-        OSL_ENSURE(mOutput,"ERROR: could not open logfile\n");
-    }
-
-    if (char const * level = getenv("CFG_LOGLEVEL"))
-    {
-        mLevel = str2level(level);
-    }
-}
-//------------------------------------------------------------------------------
-SimpleLogger::~SimpleLogger()
-{   
-}
-//------------------------------------------------------------------------------
-uno::Reference< logging::XLogger > SAL_CALL 
-    SimpleLogger::getLogger( const OUString& name )
-        throw (uno::RuntimeException)
-{
-    if (name == mName) return this;
-
-    // try whatever
-    uno::Reference< logging::XLogger > xNamedLogger;
-    if (mContext.is())
-    {
-        OUString const singleton(RTL_CONSTASCII_USTRINGPARAM("/singletons/"));
-        mContext->getValueByName(singleton.concat(name)) >>= xNamedLogger;
-    }
-    return xNamedLogger;
-}
-
-//------------------------------------------------------------------------------
-sal_Int32 SAL_CALL SimpleLogger::getLevel(  ) throw (uno::RuntimeException)
-{
-    return mLevel;
-}
-
-//------------------------------------------------------------------------------
-OUString SAL_CALL SimpleLogger::getName(  ) throw (uno::RuntimeException)
-{
-    return mName;
-}
-
-//------------------------------------------------------------------------------
-sal_Bool SAL_CALL SimpleLogger::isLoggable( sal_Int32 level ) throw (uno::RuntimeException)
-{
-    return mOutput && level >= mLevel;
-}
-
-//------------------------------------------------------------------------------
-#define OU2OUT( ustr ) ( rtl::OUStringToOString( ustr, enc ).getStr() )
-
-void SAL_CALL SimpleLogger::logp( sal_Int32 level, const OUString& sourceClass, const OUString& sourceMethod, const OUString& msg ) 
-        throw (uno::RuntimeException)
-{
-    rtl_TextEncoding enc = osl_getThreadTextEncoding();
-    if (mOutput && level > mLevel)
-    {
-        fprintf( mOutput, "%s {%s.%s}: [%s] %s\n", OU2OUT(mName), 
-                            OU2OUT(sourceClass) , OU2OUT(sourceMethod),
-                            level2str(level).getStr(), OU2OUT(msg) );
-    }
-}
-    
-//------------------------------------------------------------------------------
-
-OUString SAL_CALL SimpleLogger::getImplementationName_static() 
-{
-    static const char kImplementationName[] = "com.sun.star.comp.configmgr.logging.SimpleLogger";
-
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(kImplementationName)) ;
-}
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL SimpleLogger::getImplementationName() 
-    throw (uno::RuntimeException) 
-{
-    return getImplementationName_static() ;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL SimpleLogger::getSupportedServiceNames_static() 
-{
-    uno::Sequence<rtl::OUString> aServices(2) ;
-    aServices[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.logging.SimpleLogger")) ;
-    aServices[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.logging.Logger")) ;
-            
-    return aServices ;
-}
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL SimpleLogger::supportsService(
-    const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException)
-{
-    uno::Sequence< rtl::OUString > const svc = getSupportedServiceNames_static();
-
-    for(sal_Int32 i = 0; i < svc.getLength(); ++i )
-        if(svc[i] == aServiceName)
-            return true;
-    return false;
-}
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> 
-SAL_CALL SimpleLogger::getSupportedServiceNames() 
-    throw (uno::RuntimeException)
-{
-    return getSupportedServiceNames_static() ;
-}
-//------------------------------------------------------------------------------
-
-
-} // namespace logger
diff --git a/configmgr/workben/logger/simplelogger.hxx b/configmgr/workben/logger/simplelogger.hxx
deleted file mode 100644
index aa711a8d68..0000000000
--- a/configmgr/workben/logger/simplelogger.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef CONFIGMGR_SIMPLELOGGER_HXX_
-#define CONFIGMGR_SIMPLELOGGER_HXX_
-
-#include "simplelogger.hxx"
-#include <com/sun/star/util/logging/XLogger.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-#include <stdio.h>
-
-namespace logger {
-
-namespace uno = com::sun::star::uno ;
-namespace lang = com::sun::star::lang ;
-namespace logging = com::sun::star::util::logging ;
-using rtl::OUString;
-
-typedef cppu::WeakImplHelper2< logging::XLogger,
-                               lang::XServiceInfo> LoggerBase ;
-
-
-/** 
-  Class implementing the Logger service
-  */
-class SimpleLogger : public LoggerBase 
-{
-public :
-    /**
-      Service constructor from a service factory.
-
-      @param xContext   component context
-      */
-    explicit 
-    SimpleLogger( const uno::Reference<uno::XComponentContext>& xContext, char const * name) ;
-
-    /** Destructor  */
-    ~SimpleLogger() ;
-
-   // XLogger
-    virtual uno::Reference< logging::XLogger > SAL_CALL 
-        getLogger( const OUString& name )
-            throw (uno::RuntimeException);
-    
-    virtual sal_Int32 SAL_CALL getLevel(  ) throw (uno::RuntimeException);
-    virtual OUString SAL_CALL getName(  ) throw (uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isLoggable( sal_Int32 level ) throw (uno::RuntimeException);
-    
-    virtual void SAL_CALL 
-        logp( sal_Int32 level, const OUString& sourceClass, const OUString& sourceMethod, const OUString& msg ) 
-            throw (uno::RuntimeException);
-    
-   // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() 
-        throw (uno::RuntimeException) ;
-
-    virtual sal_Bool SAL_CALL supportsService( const OUString& aServiceName) 
-        throw (uno::RuntimeException) ;
-    
-    virtual uno::Sequence<OUString> SAL_CALL 
-        getSupportedServiceNames(void) throw (uno::RuntimeException) ;
-    
-     /**
-      Provides the implementation name.
-
-      @return   implementation name
-      */
-    static OUString SAL_CALL getImplementationName_static() ;
-    /**
-      Provides the list of supported services.
-
-      @return   list of service names
-      */
-    static uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_static() ;
-
-private:
-    /** Component Context */
-    uno::Reference<uno::XComponentContext> mContext ;
-    OUString mName;
-    FILE * mOutput;
-    sal_Int32 mLevel;
-} ;
-
-}  // namespace logger
-
-#endif 
diff --git a/configmgr/workben/memory/logmechanism.hxx b/configmgr/workben/memory/logmechanism.hxx
deleted file mode 100644
index a3e4dde7f9..0000000000
--- a/configmgr/workben/memory/logmechanism.hxx
+++ /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: logmechanism.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 __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_
-#define __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_
-
-//*****************************************************************************************************************
-//	generic macros for logging
-//*****************************************************************************************************************
-
-#ifdef	ENABLE_LOGMECHANISM
-
-    //_____________________________________________________________________________________________________________
-    //	includes
-    //_____________________________________________________________________________________________________________
-
-    #ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-    #endif
-
-    #include <stdio.h>
-
-    /*_____________________________________________________________________________________________________________
-        WRITE_LOGFILE( SFILENAME, STEXT )
-
-        Log any information in file. We append any information at file and don't clear it anymore.
-        ( Use new scope in macro to declare pFile more then on time in same "parentscope"!
-            Don't control pFile before access! What will you doing if its not valid? Log an error ...
-              An error and an error is an error ... )
-
-        Attention:  You must use "%s" and STEXT as parameter ... because otherwise encoded strings (they include e.g. %...)
-                    are handled wrong.
-    _____________________________________________________________________________________________________________*/
-
-    #define	WRITE_LOGFILE( SFILENAME, STEXT )																	\
-                {																								\
-                    ::rtl::OString	_swriteLogfileFileName	( SFILENAME	);										\
-                    ::rtl::OString	_swriteLogfileText		( STEXT		);										\
-                    FILE* pFile = fopen( _swriteLogfileFileName.getStr(), "a" );								\
-                    fprintf( pFile, "%s", _swriteLogfileText.getStr() );                                        \
-                    fclose ( pFile                                    );                                        \
-                }
-
-    /*_____________________________________________________________________________________________________________
-        LOGTYPE
-
-        For other debug macros we need information about the output mode. If user forget to set this information we
-        do it for him. Valid values are:	LOGTYPE_FILECONTINUE
-                                            LOGTYPE_FILEEXIT
-                                            LOGTYPE_MESSAGEBOX
-        The normal case is LOGTYPE_MESSAGEBOX to show assertions in normal manner!
-    _____________________________________________________________________________________________________________*/
-
-    #define	LOGTYPE_MESSAGEBOX		1
-    #define	LOGTYPE_FILECONTINUE	2
-    #define	LOGTYPE_FILEEXIT		3
-
-    #ifndef	LOGTYPE
-        #define	LOGTYPE																							\
-                    LOGTYPE_MESSAGEBOX
-    #endif
-
-#else	// #ifdef ENABLE_LOGMECHANISM
-
-    /*_____________________________________________________________________________________________________________
-        If right testmode is'nt set - implements these macro empty!
-    _____________________________________________________________________________________________________________*/
-
-    #define	WRITE_LOGFILE( SFILENAME, STEXT )
-    #undef	LOGTYPE
-
-#endif	// #ifdef ENABLE_LOGMECHANISM
-
-//*****************************************************************************************************************
-//	end of file
-//*****************************************************************************************************************
-
-#endif	// #ifndef __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_
diff --git a/configmgr/workben/memory/main.cxx b/configmgr/workben/memory/main.cxx
deleted file mode 100644
index f87267478e..0000000000
--- a/configmgr/workben/memory/main.cxx
+++ /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: main.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_configmgr.hxx"
-#include <iostream>
-using namespace std;
-
-#define ENABLE_MEMORYMEASURE
-#define ENABLE_LOGMECHANISM
-
-// If you wish to enable this memory measure macros ... you need "windows.h"
-// But it's not agood idea to include it in your header!!! Because it's not compatible to VCL header .-(
-// So you must include it here ... in cxx, where you whish to use it.
-#ifdef ENABLE_MEMORYMEASURE
-    #define VCL_NEED_BASETSD
-    #include <tools/presys.h>
-    #include <windows.h>
-    #include <tools/postsys.h>
-    #undef  VCL_NEED_BASETSD
-#endif
-#include "memorymeasure.hxx"
-
-#include "logmechanism.hxx"
-// -----------------------------------------------------------------------------
-// ---------------------------------- M A I N ----------------------------------
-// -----------------------------------------------------------------------------
-
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-
-    START_MEMORYMEASURE( aMemoryInfo );
-        
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "first start" );
-        
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "1" );
-
-    sal_Char* pTest = new sal_Char[1000 * 1000 * 50];
-    sal_Char* pTest1 = new sal_Char[1000 * 1000 * 50];
-    sal_Char* pTest2 = new sal_Char[1000 * 1000 * 50];
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "2" );
-
-    LOG_MEMORYMEASURE( "FirstTest_of_memusage", "Values of memory access for standard filters.", aMemoryInfo );
-
-    return 0;
-}
-
diff --git a/configmgr/workben/memory/makefile.mk b/configmgr/workben/memory/makefile.mk
deleted file mode 100644
index cad7b533e6..0000000000
--- a/configmgr/workben/memory/makefile.mk
+++ /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: 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General 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=..$/..
-PRJINC=$(PRJ)$/source
-
-PRJNAME=configmgr
-
-TARGET=memorytest
-TARGET2=memorytesthack
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-# ... common for all test executables ..............................
-APPSTDLIBS=\
-            $(SALLIB) \
-            $(VOSLIB) \
-            $(CPPULIB)	\
-            $(CPPUHELPERLIB)	\
-            $(COMPHELPERLIB)	\
-
-# ... cfgapi ..............................
-# APP1STDLIBS = $(APPSTDLIBS)
-# 
-# APP1STDLIBS+=$(STDLIBCPP)
-# 
-# APP1TARGET= $(TARGET)
-# APP1OBJS=	\
-# 	  $(SLO)$/cfgapi2.obj	\
-# 	  $(SLO)$/strimpl.obj \
-# 	  $(SLO)$/typeconverter.obj \
-# 	  $(SLO)$/simpletypehelper.obj \
-# 	  $(SLO)$/memory.obj \
-
-# ... cfgapi ..............................
-APP2STDLIBS = $(APPSTDLIBS)
-
-APP2STDLIBS+= $(STDLIBCPP)
-
-# CFLAGS+=-DWITHOUTAPI
-
-APP2TARGET= $(TARGET2)
-APP2OBJS=	\
-    $(SLO)$/memorytests.obj	\
-    $(SLO)$/testmodules.obj	\
-    $(SLO)$/treeload.obj \
-    $(SLO)$/accessimpl.obj \
-    $(SLO)$/adminproviderimpl.obj \
-    $(SLO)$/apiaccessobj.obj \
-    $(SLO)$/apifactory.obj \
-    $(SLO)$/apifactoryimpl.obj \
-    $(SLO)$/apinodeaccess.obj \
-    $(SLO)$/apinodeupdate.obj \
-    $(SLO)$/apinotifierimpl.obj \
-    $(SLO)$/apiserviceinfo.obj \
-    $(SLO)$/apitreeaccess.obj \
-    $(SLO)$/apitreeimplobj.obj \
-    $(SLO)$/attributelist.obj \
-    $(SLO)$/attributeparser.obj \
-    $(SLO)$/binarybasereader.obj \
-    $(SLO)$/binarydecide.obj \
-    $(SLO)$/binaryreader.obj \
-    $(SLO)$/binarywritehandler.obj \
-    $(SLO)$/binarywriter.obj \
-    $(SLO)$/bootstrap.obj \
-    $(SLO)$/broadcaster.obj \
-    $(SLO)$/cachewritescheduler.obj \
-    $(SLO)$/changes.obj \
-    $(SLO)$/cmtree.obj \
-    $(SLO)$/cmtreemodel.obj \
-    $(SLO)$/collectchanges.obj \
-    $(SLO)$/committer.obj \
-    $(SLO)$/confeventhelpers.obj \
-    $(SLO)$/confevents.obj \
-    $(SLO)$/configexcept.obj \
-    $(SLO)$/configgroup.obj \
-    $(SLO)$/confignotifier.obj \
-    $(SLO)$/configpath.obj \
-    $(SLO)$/configsession.obj \
-    $(SLO)$/configset.obj \
-    $(SLO)$/confname.obj \
-    $(SLO)$/confprovider2.obj \
-    $(SLO)$/confproviderimpl2.obj \
-    $(SLO)$/confsvccomponent.obj \
-    $(SLO)$/disposetimer.obj \
-    $(SLO)$/elementaccess.obj \
-    $(SLO)$/elementimpl.obj \
-    $(SLO)$/encodename.obj \
-    $(SLO)$/filehelper.obj \
-    $(SLO)$/generatecache.obj \
-    $(SLO)$/groupaccess.obj \
-    $(SLO)$/groupimpl.obj \
-    $(SLO)$/groupobjects.obj \
-    $(SLO)$/groupupdate.obj \
-    $(SLO)$/invalidatetree.obj \
-    $(SLO)$/listenercontainer.obj \
-    $(SLO)$/loader.obj \
-    $(SLO)$/localizednodebuilder.obj \
-    $(SLO)$/localizedtreeactions.obj \
-    $(SLO)$/localsession.obj \
-    $(SLO)$/matchlocale.obj \
-    $(SLO)$/mergechange.obj \
-    $(SLO)$/namehelper.obj \
-    $(SLO)$/nodechange.obj \
-    $(SLO)$/nodechangeimpl.obj \
-    $(SLO)$/nodechangeinfo.obj \
-    $(SLO)$/nodefactory.obj \
-    $(SLO)$/nodeimpl.obj \
-    $(SLO)$/nodeimplobj.obj \
-    $(SLO)$/noderef.obj \
-    $(SLO)$/notifycallback.obj \
-    $(SLO)$/oslstream.obj \
-    $(SLO)$/pathhelper.obj \
-    $(SLO)$/portalstream.obj \
-    $(SLO)$/propertiesfilterednotifier.obj \
-    $(SLO)$/propertyinfohelper.obj \
-    $(SLO)$/propertysetaccess.obj \
-    $(SLO)$/propsetaccessimpl.obj \
-    $(SLO)$/provider.obj \
-    $(SLO)$/providerfactory.obj \
-    $(SLO)$/providerimpl.obj \
-    $(SLO)$/receivethread.obj \
-    $(SLO)$/redirector.obj \
-    $(SLO)$/remotesession.obj \
-    $(SLO)$/roottree.obj \
-    $(SLO)$/saxadapter.obj \
-    $(SLO)$/saxtools.obj \
-    $(SLO)$/sessionfactory.obj \
-    $(SLO)$/sessionstream.obj \
-    $(SLO)$/setaccess.obj \
-    $(SLO)$/setnodeimpl.obj \
-    $(SLO)$/setobjects.obj \
-    $(SLO)$/setupdate.obj \
-    $(SLO)$/simpletypehelper.obj \
-    $(SLO)$/socketstream.obj \
-    $(SLO)$/strimpl.obj \
-    $(SLO)$/synchronize.obj \
-    $(SLO)$/template.obj \
-    $(SLO)$/templateimpl.obj \
-    $(SLO)$/timestamp.obj \
-    $(SLO)$/tracer.obj \
-    $(SLO)$/translatechanges.obj \
-    $(SLO)$/treeactions.obj \
-    $(SLO)$/treebuildercallback.obj \
-    $(SLO)$/treecache.obj \
-    $(SLO)$/treedata.obj \
-    $(SLO)$/treeimpl.obj \
-    $(SLO)$/treeiterators.obj \
-    $(SLO)$/treenodefactory.obj \
-    $(SLO)$/trivialbufferedfile.obj \
-    $(SLO)$/typeconverter.obj \
-    $(SLO)$/updatehandler.obj \
-    $(SLO)$/updateimpl.obj \
-    $(SLO)$/updatetree.obj \
-    $(SLO)$/userimpl.obj \
-    $(SLO)$/valueconverter.obj \
-    $(SLO)$/valuehandler.obj \
-    $(SLO)$/valuenodebuilder.obj \
-    $(SLO)$/writesubtreeasbinaryhandler.obj \
-    $(SLO)$/xmlformater.obj \
-    $(SLO)$/xmltreebuilder.obj \
-    $(SLO)$/valuemembernode.obj \
-    $(SLO)$/anypair.obj \
-
-#	$(SLO)$/memory.obj \
-
-
-# 	  $(SLO)$/strimpl.obj \
-# 	  $(SLO)$/typeconverter.obj \
-# 	  $(SLO)$/simpletypehelper.obj \
-# 	  $(SLO)$/memory.obj \
-# 	  $(SLO)$/loadwithtreemanager.obj \
-# 	  $(SLO)$/localsession.obj \
-# 	  $(SLO)$/configsession.obj \
-# 	  $(SLO)$/confname.obj \
-# 	  $(SLO)$/tracer.obj \
-# 	  $(SLO)$/generatecache.obj \
-# 	  $(SLO)$/treeactions.obj \
-# 	  $(SLO)$/cmtreemodel.obj \
-# 	  $(SLO)$/cmtree.obj \
-# 	  $(SLO)$/xmltreebuilder.obj \
-# 	  $(SLO)$/xmlformater.obj \
-# 	  $(SLO)$/binaryreader.obj \
-# 	  $(SLO)$/binarybasereader.obj \
-# 	  $(SLO)$/binarywriter.obj \
-# 	  $(SLO)$/binarywritehandler.obj \
-# 	  $(SLO)$/binarydecide.obj \
-# 	  $(SLO)$/writesubtreeasbinaryhandler.obj \
-# 	  $(SLO)$/oslstream.obj \
-# 	  $(SLO)$/pathhelper.obj \
-# 	  $(SLO)$/treecache.obj \
-# 	  $(SLO)$/updatetree.obj \
-# 	  $(SLO)$/attributeparser.obj \
-# 	  $(SLO)$/updatehandler.obj \
-# 	  $(SLO)$/synchronize.obj \
-# 	  $(SLO)$/filehelper.obj \
-# 	  $(SLO)$/mergechange.obj \
-# 	  $(SLO)$/providerimpl.obj \
-# 	  $(SLO)$/bootstrap.obj \
-# 	  $(SLO)$/matchlocale.obj \
-# 	  $(SLO)$/changes.obj \
-# 	  $(SLO)$/configexcept.obj \
-# 	  $(SLO)$/valuehandler.obj \
-# 	  $(SLO)$/treenodefactory.obj \
-# 	  $(SLO)$/attributelist.obj \
-# 	  $(SLO)$/namehelper.obj \
-# 	  $(SLO)$/localizedtreeactions.obj \
-# 	  $(SLO)$/trivialbufferedfile.obj \
-# 	  $(SLO)$/cachewritescheduler.obj \
-# 	  $(SLO)$/disposetimer.obj \
-# 	  $(SLO)$/noderef.obj \
-# 	  $(SLO)$/treedata.obj \
-# 	  $(SLO)$/confevents.obj \
-# 	  $(SLO)$/treebuildercallback.obj \
-# 	  $(SLO)$/loader.obj \
-# 	  $(SLO)$/apifactoryimpl.obj \
-# 	  $(SLO)$/apitreeimplobj.obj \
-
-#	$(SLO)$/.obj \
-
-
-.INCLUDE :  target.mk
-
-
diff --git a/configmgr/workben/memory/memorymeasure.hxx b/configmgr/workben/memory/memorymeasure.hxx
deleted file mode 100644
index 963af50468..0000000000
--- a/configmgr/workben/memory/memorymeasure.hxx
+++ /dev/null
@@ -1,228 +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: memorymeasure.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 __FRAMEWORK_MACROS_DEBUG_MEMORYMEASURE_HXX_
-#define __FRAMEWORK_MACROS_DEBUG_MEMORYMEASURE_HXX_
-
-// *************************************************************************************************************
-//  special macros for time measures
-//  1) LOGFILE_MEMORYMEASURE                  used it to define log file for this operations (default will be set automaticly)
-//  2) MAKE_MEMORY_SNAPSHOT                   make snapshot of currently set memory informations of OS
-//  3) LOG_MEMORYMEASURE                      write measured time to logfile
-// *************************************************************************************************************
-
-#ifdef ENABLE_MEMORYMEASURE
-
-#if !defined( WIN ) && !defined( WNT )
-#error "Macros to measure memory access not available under platforms different from windows!"
-#endif
-
-//_________________________________________________________________________________________________________________
-//	includes
-//_________________________________________________________________________________________________________________
-
-#include <rtl/strbuf.hxx>
-
-#ifndef __SGI_STL_VECTOR
-#include <vector>
-#endif
-
-/*_____________________________________________________________________________________________________________
-  LOGFILE_MEMORYMEASURE
-  
-  For follow macros we need a special log file. If user forget to specify anyone, we must do it for him!
-  _____________________________________________________________________________________________________________*/
-
-#ifndef LOGFILE_MEMORYMEASURE
-#define LOGFILE_MEMORYMEASURE "memorymeasure.log"
-#endif
-
-/*_____________________________________________________________________________________________________________
-  class MemoryMeasure
-  
-  We use this baseclass to collect all snapshots in one object and analyze this information at one point.
-  Macros of this file are used to enable using of this class by special compile-parameter only!
-  _____________________________________________________________________________________________________________*/
-
-class _DBGMemoryMeasure
-{
-    //---------------------------------------------------------------------------------------------------------
-private:
-    struct _MemoryInfo
-    {
-        MEMORYSTATUS        aStatus     ;
-        ::rtl::OString      sComment    ;
-    };
-    
-    //---------------------------------------------------------------------------------------------------------
-public:
-    //_____________________________________________________________________________________________________
-    inline _DBGMemoryMeasure()
-        {
-            makeSnapshot("Initializing Data");
-        }
-    //_____________________________________________________________________________________________________
-    inline _DBGMemoryMeasure(const ::rtl::OString& sComment)
-        {
-            makeSnapshot(sComment);
-        }
-    
-    //_____________________________________________________________________________________________________
-    // clear used container!
-    inline ~_DBGMemoryMeasure()
-        {
-            ::std::vector< _MemoryInfo >().swap( m_lSnapshots );
-        }
-
-    //_____________________________________________________________________________________________________
-    inline void makeSnapshot( const ::rtl::OString& sComment )
-        {
-            _MemoryInfo aInfo;
-            aInfo.sComment = sComment;
-            GlobalMemoryStatus    ( &(aInfo.aStatus) );
-            m_lSnapshots.push_back( aInfo            );
-        }
-
-    //_____________________________________________________________________________________________________
-    inline ::rtl::OString getLog()
-        {
-            ::rtl::OStringBuffer sBuffer( 10000 );
-
-            if( m_lSnapshots.size() > 0 )
-            {
-                // Write informations to return buffer
-                ::std::vector< _MemoryInfo >::const_iterator pItem1;
-                ::std::vector< _MemoryInfo >::const_iterator pItem2;
-
-                pItem1 = m_lSnapshots.begin();
-                pItem2 = pItem1;
-                ++pItem2;
-
-                while( pItem1!=m_lSnapshots.end() )
-                {
-                    sBuffer.append( "snap [ "                                   );
-                    sBuffer.append( pItem1->sComment                            );
-                    sBuffer.append( " ]\n\tavail phys\t=\t"                     );
-                    sBuffer.append( (sal_Int32)pItem1->aStatus.dwAvailPhys      );
-                    sBuffer.append( "\n\tavail page\t=\t"                       );
-                    sBuffer.append( (sal_Int32)pItem1->aStatus.dwAvailPageFile  );
-                    sBuffer.append( "\n\tavail virt\t=\t"                       );
-                    sBuffer.append( (sal_Int32)pItem1->aStatus.dwAvailVirtual   );
-
-                    if( pItem1 == m_lSnapshots.begin() )
-                    {
-                        sBuffer.append( "\n\t[initial values]\n\n" );
-                    }
-                    else if( pItem2 != m_lSnapshots.end() )
-                    {
-                        sBuffer.append( "\n\tdifference\t=\t[ "                     );
-                        sBuffer.append( (sal_Int32)(pItem2->aStatus.dwAvailPhys     - pItem1->aStatus.dwAvailPhys       ) );
-                        sBuffer.append( ", "                                                                              );
-                        sBuffer.append( (sal_Int32)(pItem2->aStatus.dwAvailPageFile - pItem1->aStatus.dwAvailPageFile   ) );
-                        sBuffer.append( ", "                                                                              );
-                        sBuffer.append( (sal_Int32)(pItem2->aStatus.dwAvailVirtual  - pItem1->aStatus.dwAvailVirtual    ) );
-                        sBuffer.append( " ]\n\n"                                                                          );
-                    }
-                    else
-                    {
-                        sBuffer.append( "\n\t[final values]\n\n" );
-                    }
-                    if( pItem1!=m_lSnapshots.end() ) ++pItem1;
-                    if( pItem2!=m_lSnapshots.end() ) ++pItem2;
-                }
-                // clear current list ... make it empty for further snapshots!
-                ::std::vector< _MemoryInfo >().swap( m_lSnapshots );
-            }
-
-            return sBuffer.makeStringAndClear();
-        }
-
-    //---------------------------------------------------------------------------------------------------------
-private:
-    ::std::vector< _MemoryInfo > m_lSnapshots;
-};
-
-/*_____________________________________________________________________________________________________________
-        START_MEMORY_MEASURE
-
-        Create new object to measure memory access.
-    _____________________________________________________________________________________________________________*/
-
-#define START_MEMORYMEASURE( AOBJECT )                                                                      \
-                _DBGMemoryMeasure AOBJECT;
-
-#define START_MEMORYMEASURE_FOR( AOBJECT, SCOMMENT )                                                                      \
-                _DBGMemoryMeasure AOBJECT( SCOMMENT );
-
-    /*_____________________________________________________________________________________________________________
-        MAKE_MEMORY_SNAPSHOT
-
-        Make snapshot of currently set memory informations of OS.
-        see _DBGMemoryMeasure for further informations
-    _____________________________________________________________________________________________________________*/
-
-#define MAKE_MEMORY_SNAPSHOT( AOBJECT, SCOMMENT )                                                           \
-                AOBJECT.makeSnapshot( SCOMMENT );
-
-    /*_____________________________________________________________________________________________________________
-        LOG_MEMORYMEASURE( SOPERATION, SCOMMENT, AOBJECT )
-
-        Write measured values to logfile.
-    _____________________________________________________________________________________________________________*/
-
-#define LOG_MEMORYMEASURE( SOPERATION, SCOMMENT, AOBJECT )                                                  \
-                {                                                                                               \
-                    ::rtl::OStringBuffer _sBuffer( 256 );                                                       \
-                    _sBuffer.append( SOPERATION         );                                                      \
-                    _sBuffer.append( "\n"               );                                                      \
-                    _sBuffer.append( SCOMMENT           );                                                      \
-                    _sBuffer.append( "\n\n"             );                                                      \
-                    _sBuffer.append( AOBJECT.getLog()   );                                                      \
-                    WRITE_LOGFILE( LOGFILE_MEMORYMEASURE, _sBuffer.makeStringAndClear() )                       \
-                }
-
-#else   // #ifdef ENABLE_MEMORYMEASURE
-
-/*_____________________________________________________________________________________________________________
-        If right testmode is'nt set - implements these macros empty!
-    _____________________________________________________________________________________________________________*/
-
-#undef  LOGFILE_MEMORYMEASURE
-#define START_MEMORYMEASURE( AOBJECT )
-#define MAKE_MEMORY_SNAPSHOT( AOBJECT, SCOMMENT )
-#define LOG_MEMORYMEASURE( SOPERATION, SCOMMENT, AOBJECT )
-
-#endif  // #ifdef ENABLE_MEMORYMEASURE
-
-//*****************************************************************************************************************
-//	end of file
-//*****************************************************************************************************************
-
-#endif  // #ifndef __FRAMEWORK_MACROS_DEBUG_MEMORYMEASURE_HXX_
diff --git a/configmgr/workben/memory/memorytests.cxx b/configmgr/workben/memory/memorytests.cxx
deleted file mode 100644
index 263bd7186d..0000000000
--- a/configmgr/workben/memory/memorytests.cxx
+++ /dev/null
@@ -1,1244 +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: memorytests.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_configmgr.hxx"
-#define _PRIVATE_TEST_
-
-#include <iostream>
-#include <vector>
-#include "treeload.hxx"
-
-#include <fstream>
-
-#define ENABLE_MEMORYMEASURE
-#define ENABLE_LOGMECHANISM
-
-// If you wish to enable this memory measure macros ... you need "windows.h"
-// But it's not agood idea to include it in your header!!! Because it's not compatible to VCL header .-(
-// So you must include it here ... in cxx, where you whish to use it.
-#ifdef ENABLE_MEMORYMEASURE
-    #define VCL_NEED_BASETSD
-    #include <tools/presys.h>
-    #include <windows.h>
-    #include <tools/postsys.h>
-    #undef  VCL_NEED_BASETSD
-#endif
-#include "memorymeasure.hxx"
-
-#include "logmechanism.hxx"
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/beans/XExactName.hpp>
-#include <com/sun/star/util/XChangesBatch.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-
-#include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/uno/Any.h>
-#include <osl/profile.hxx>
-#include <osl/process.h>
-#include <osl/file.h>
-
-#include <conio.h>
-
-#include "createpropertyvalue.hxx"
-
-#include "typeconverter.hxx"
-
-#include "testmodules.hxx"
-
-#include "valuenode.hxx"
-
-namespace configmgr
-{
-    
-using namespace std;
-
-namespace css = com::sun::star;
-namespace uno = css::uno;
-namespace lang = css::lang;
-
-using namespace uno;
-using namespace lang;
-
-using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::util;
-
-using ::rtl::OUString;
-using ::rtl::OString;
-
-using namespace ::cppu;
-
-#define ASCII(x) ::rtl::OUString::createFromAscii(x)
-
-ostream& operator << (ostream& out, rtl::OUString const& aStr)
-{
-    sal_Unicode const* const pStr = aStr.getStr();
-    sal_Unicode const* const pEnd = pStr + aStr.getLength();
-    for (sal_Unicode const* p = pStr; p < pEnd; ++p)
-        if (0 < *p && *p < 127) // ASCII
-            out << char(*p);
-        else
-            out << "[\\u" << hex << *p << "]";
-    return out;
-}
-
-void showSequence(const Sequence<OUString> &aSeq)
-{
-    OUString aArray;
-    const OUString *pStr = aSeq.getConstArray();
-    for (int i=0;i<aSeq.getLength();i++)
-    {
-        OUString aStr = pStr[i];
-        // aArray += aStr + ASCII(", ");
-        cout << aStr << endl;
-    }
-    volatile int dummy = 0;
-}
-
-//=============================================================================
-
-inline void operator <<= (::rtl::OUString& _rUnicodeString, const sal_Char* _pAsciiString)
-{
-    _rUnicodeString = ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (::rtl::OUString& _rUnicodeString, const ::rtl::OString& _rAsciiString)
-{
-    _rUnicodeString <<= _rAsciiString.getStr();
-}
-
-inline void operator <<= (Any& _rUnoValue, const sal_Char* _pAsciiString)
-{
-    _rUnoValue <<= ::rtl::OUString::createFromAscii(_pAsciiString);
-}
-
-inline void operator <<= (Any& _rUnoValue, const ::rtl::OString& _rAsciiString)
-{
-    _rUnoValue <<= _rAsciiString.getStr();
-}
-
-inline void operator <<= (::rtl::OString& _rAsciiString, ::rtl::OUString const& _rUnicodeString )
-{
-    _rAsciiString = rtl::OUStringToOString(_rUnicodeString, RTL_TEXTENCODING_ASCII_US).getStr();
-}
-
-// -----------------------------------------------------------------------------
-
-rtl::OString input(const char* pDefaultText, char cEcho)
-{
-    // PRE: a Default Text would be shown, cEcho is a Value which will show if a key is pressed.
-    const int MAX_INPUT_LEN = 500;
-    char aBuffer[MAX_INPUT_LEN];
-
-    strcpy(aBuffer, pDefaultText);
-    int nLen = strlen(aBuffer);
-
-#ifdef WNT
-    char ch = '\0';
-
-    cout << aBuffer;
-    cout.flush();
-
-    while(ch != 13)
-    {
-        ch = getch();
-        if (ch == 8)
-        {
-            if (nLen > 0)
-            {
-                cout << "\b \b";
-                cout.flush();
-                --nLen;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-        else if (ch != 13)
-        {
-            if (nLen < MAX_INPUT_LEN)
-            {
-                if (cEcho == 0)
-                {
-                    cout << ch;
-                }
-                else
-                {
-                    cout << cEcho;
-                }
-                cout.flush();
-                aBuffer[nLen++] = ch;
-                aBuffer[nLen] = '\0';
-            }
-            else
-            {
-                cout << "\a";
-                cout.flush();
-            }
-        }
-    }
-#else
-    if (!cin.getline(aBuffer,sizeof aBuffer))
-        return OString();
-#endif
-    return rtl::OString(aBuffer);
-}
-
-// -----------------------------------------------------------------------------
-rtl::OUString enterValue(const char* _aStr, const char* _aDefault, bool _bIsAPassword)
-{
-    cout << _aStr;
-    cout.flush();
-
-    rtl::OUString sValue;
-    sValue <<= input(_aDefault, _bIsAPassword ? '*' : 0);
-    return sValue;
-}
-//=============================================================================
-    
-uno::Reference< lang::XMultiServiceFactory > getORB();
-// -----------------------------------------------------------------------------
-
-
-Reference< XChangesBatch > xChangesBatch = NULL;
-void commit()
-{
-    if (xChangesBatch.is())
-    {
-        xChangesBatch->commitChanges();
-    }
-}
-
-// -----------------------------------------------------------------------------
-static sal_Bool				s_bInitialized	=	sal_False;
-#ifdef LLA_PRIVAT_DEBUG
-// static const sal_Char*		s_pSourcePath	=	"//./l|/src632/configmgr/workben/local_io/share";
-// static const sal_Char*		s_pUpdatePath	=	"//./l|/src632/configmgr/workben/local_io/user";
-static const sal_Char*		s_pSourcePath	=	"file:///f:/office60_633/share/config/registry";
-static const sal_Char*		s_pUpdatePath	=	"file:///f:/office60_633/user/config/registry";
-static const sal_Char*		s_pRootNode		=	"org.openoffice.test";
-static const sal_Char*		s_pServerType	=	"local";
-static const sal_Char*		s_pLocale		=	"de-DE";
-static const sal_Char*		s_pServer		=	"";
-static const sal_Char*		s_pUser			=	"";
-static const sal_Char*		s_pPassword		=	"";
-#else
-static const sal_Char*		s_pSourcePath	=	"file:///g:/src/configmgr/workben/local_io/share";
-static const sal_Char*		s_pUpdatePath	=	"file:///g:/src/configmgr/workben/local_io/user";
-static const sal_Char*		s_pRootNode		=	"org.openoffice.test";
-static const sal_Char*		s_pServerType	=	"local";
-static const sal_Char*		s_pLocale		=	"de-DE";
-static const sal_Char*		s_pServer		=	"lautrec-3108:19205";
-static const sal_Char*		s_pUser			=	"lars";
-static const sal_Char*		s_pPassword		=	"";
-#endif
-
-static bool m_bChange = false;
-// -----------------------------------------------------------------------------
-static void loadDefaults()
-{
-    if (s_bInitialized)
-        return;
-
-    s_bInitialized = sal_True;
-
-    try
-    {
-        // the executable file name
-        ::rtl::OUString sExecutable;
-        osl_getExecutableFile(&sExecutable.pData);
-        // cut the name, add a cfgapi.ini to the path
-        sal_Int32 nLastSep = sExecutable.lastIndexOf('/');
-        if (-1 != nLastSep)
-            sExecutable = sExecutable.copy(0, nLastSep + 1);
-#ifdef UNX
-        sExecutable += ::rtl::OUString::createFromAscii("cfgapirc");
-#else
-        sExecutable += ::rtl::OUString::createFromAscii("cfgapi.ini");
-#endif
-        ::rtl::OUString sNormalized;
-        sNormalized = sExecutable;
-        if (1) // osl_File_E_None == osl_normalizePath(sExecutable.pData, &sNormalized.pData))
-        {
-            ::osl::Profile aProfile(sNormalized);
-
-            static ::rtl::OString	sSection("defaults");
-            static ::rtl::OString	sSourcePath("sourcepath");
-            static ::rtl::OString	sUpdatePath("updatepath");
-            static ::rtl::OString	sRootNode("rootnode");
-            static ::rtl::OString	sServerType("servertype");
-            static ::rtl::OString	sLocale("Locale");
-            static ::rtl::OString	sServer("Server");
-            static ::rtl::OString	sUser("User");
-            static ::rtl::OString	sPassword("Password");
-
-            // read some strings.
-            // Do this static because we want to redirect the global static character pointers to the buffers.
-            static ::rtl::OString s_sSourcePath	= aProfile.readString(sSection, sSourcePath, s_pSourcePath);
-            static ::rtl::OString s_sUpdatePath	= aProfile.readString(sSection, sUpdatePath, s_pUpdatePath);
-            static ::rtl::OString s_sRootNode	= aProfile.readString(sSection, sRootNode, s_pRootNode);
-            static ::rtl::OString s_sServerType	= aProfile.readString(sSection, sServerType, s_pServerType);
-            static ::rtl::OString s_sLocale		= aProfile.readString(sSection, sLocale, s_pLocale);
-            static ::rtl::OString s_sServer		= aProfile.readString(sSection, sServer, s_pServer);
-            static ::rtl::OString s_sUser		= aProfile.readString(sSection, sUser, s_pUser);
-            static ::rtl::OString s_sPassword	= aProfile.readString(sSection, sPassword, s_pPassword);
-
-            // do this redirection
-            s_pSourcePath	=	s_sSourcePath.getStr();
-            s_pUpdatePath	=	s_sUpdatePath.getStr();
-            s_pRootNode		=	s_sRootNode.getStr();
-            s_pServerType	=	s_sServerType.getStr();
-            s_pLocale		=	s_sLocale.getStr();
-            s_pServer		=	s_sServer.getStr();
-            s_pUser			=	s_sUser.getStr();
-            s_pPassword		=	s_sPassword.getStr();
-        }
-    }
-    catch(std::exception& e)
-    {
-        e.what();	// silence warnings
-    }
-}
-
-// -----------------------------------------------------------------------------
-Sequence<Any> createSequence(const OUString &sUser, const OUString &sPasswd)
-{
-    Sequence< Any > aCPArgs;
-        
-    if (sUser.getLength() > 0)
-    {
-        aCPArgs.realloc(1);
-        aCPArgs[0] <<= configmgr::createPropertyValue(ASCII("user"), sUser);
-    }
-    if (sPasswd.getLength() > 0)
-    {
-        aCPArgs.realloc(2);
-        aCPArgs[1] <<= configmgr::createPropertyValue(ASCII("password"), sPasswd);
-    }
-    return aCPArgs;
-}
-
-//=============================================================================
-#include <string.h>
-#if (defined UNX) || (defined OS2)
-#else
-#include <conio.h>
-#endif
-
-// -----------------------------------------------------------------------------
-
-void test_configuration_provider(uno::Reference<lang::XMultiServiceFactory> _xCfgProvider, 
-                                 rtl::OUString const& _sUser, bool _bLocal, sal_Int32 _nCount);
-
-
-// -----------------------------------------------------------------------------
-
-uno::Reference<lang::XMultiServiceFactory> 
-getProvider(
-    uno::Reference< lang::XMultiServiceFactory > _xServiceRegistry,
-    rtl::OUString const& _sServerType,
-    rtl::OUString const& _sSharePath, rtl::OUString const& _sUserPath,
-    bool &_bLocal)
-{
-    try
-    {
-        Sequence< Any > aCPArgs;
-
-        OUString sServerType = _sServerType; // enterValue("servertype: ", s_pServerType, false);
-
-        rtl::OUString sUser;
-
-        _bLocal = sServerType.equalsIgnoreAsciiCase(ASCII("local")) || sServerType.equalsIgnoreAsciiCase(ASCII("setup"));
-        if (!_bLocal)
-        {
-            rtl::OUString sServer;
-            sServer =			enterValue("server  : ", s_pServer,false);
-            cout << endl;
-
-            sUser =				enterValue("user    : ", s_pUser, false);
-            cout << endl;
-            
-            OUString sPasswd =	enterValue("password: ", s_pPassword, true);
-            cout << endl;
-
-            aCPArgs = createSequence(sUser, sPasswd);
-
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("server"), sServer);
-
-            OUString sTimeout = ASCII("10000");
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("timeout"), sTimeout);
-
-        }
-        else
-        {
-            rtl::OUString sSharePath, sUserPath;
-            sSharePath = _sSharePath;//		enterValue("share path: ", s_pSourcePath, false);
-            // cout << endl;
-            sUserPath =	_sUserPath; //		enterValue("user path : ", s_pUpdatePath, false);
-            // cout << endl;
-
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            sal_Int32 nCount = aCPArgs.getLength() - 1;
-            Any *pAny = &aCPArgs[nCount];
-            *pAny <<= configmgr::createPropertyValue(ASCII("sourcepath"), sSharePath);
-            aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("updatepath"), sUserPath);
-        }
-        
-        aCPArgs.realloc(aCPArgs.getLength() + 1);
-        aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("servertype"), sServerType);
-
-        Reference< XMultiServiceFactory > xCfgProvider(
-            _xServiceRegistry->createInstanceWithArguments(
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
-                aCPArgs),
-            UNO_QUERY);
-        if (!xCfgProvider.is())
-        {
-            ::flush(cout);
-            cerr << "Could not create the configuration provider !\n\n";
-            return 0;
-        }
-// -----------------------------------------------------------------------------
-        return xCfgProvider;
-    }
-    catch (Exception& e) 
-    {
-        ::flush(cout);
-        cerr << "Caught exception: " << e.Message << endl;
-    }
-    return 0;
-}
-
-// -----------------------------------------------------------------------------
-sal_Int32 m_nCount = 0;
-
-void test(uno::Reference<lang::XMultiServiceFactory> _xORB, rtl::OUString const& _sSharePath,
-          rtl::OUString const& _sUserPath)
-{
-    
-    rtl::OUString sUser;
-    bool bLocal;
-    cout << ++m_nCount << ". start test with  new provider\n";
- {
-     START_MEMORYMEASURE_FOR( aMemoryInfo, "*** API Test Execution ***" );
-    
-     MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "initialisierungs-check" );
-        
-     MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- Erzeuge Provider" );
-     
-     uno::Reference<lang::XMultiServiceFactory>xCfgProvider =
-         getProvider(_xORB, ASCII("local"), _sSharePath, _sUserPath,
-                     bLocal);
-        
-     MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- Habe Provider, starte Test" );
-     
-     test_configuration_provider(xCfgProvider, sUser, bLocal, 0); // xml
-
-     MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- Test gelaufen, starte erneut" );
-
-     test_configuration_provider(xCfgProvider, sUser, bLocal, 0); // xml
-
-     MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- Test gelaufen, entsorge Provider" );
-
-     uno::Reference<lang::XComponent>xComponent(xCfgProvider,UNO_QUERY);
-     xComponent->dispose();
-
-     MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- Provider disposed" );
-        
-     LOG_MEMORYMEASURE( "---------------- API Memory Test 2-----------------------------", "- Test memory traces.", aMemoryInfo );
- }
-
- cout << "finish provider test\n";
-
- // Test Version 1 and 3, it MUST be equal
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-static rtl::OUString makeFileURL(OUString const& sMaybeURL)
-{
-    rtl::OUString const fileURLStart(RTL_CONSTASCII_USTRINGPARAM("file:/"));
-
-    if ( 0 != fileURLStart.compareTo(sMaybeURL, fileURLStart.getLength()) )
-    {
-        OUString sURL;
-        if (!osl_getFileURLFromSystemPath(sMaybeURL.pData, &sURL.pData))
-            return sURL;
-    }
-   
-    return sMaybeURL;
-}
-// -----------------------------------------------------------------------------
-static rtl::OUString makeSystemPath(OUString const& sMaybeURL)
-{
-    rtl::OUString const fileURLStart(RTL_CONSTASCII_USTRINGPARAM("file:/"));
-
-    if ( 0 == fileURLStart.compareTo(sMaybeURL, fileURLStart.getLength()) )
-    {
-        OUString sSysPath;
-        if (!osl_getSystemPathFromFileURL(sMaybeURL.pData, &sSysPath.pData))
-            return sSysPath;
-    }
-   
-    return sMaybeURL;
-}
-// -----------------------------------------------------------------------------
-// ---------------------------------- M A I N ----------------------------------
-// -----------------------------------------------------------------------------
-
-int main( int argc, char * argv[] )
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    sal_Int32 nSizeISubtree = sizeof(ISubtree);
-    sal_Int32 nSizeINode = sizeof(INode);
-    sal_Int32 nSizeIValueNode = sizeof(ValueNode);
-    {
-        loadDefaults();
-        
-        Reference< XMultiServiceFactory > xORB = getORB();
-        
-        rtl::OUString sSharePath =  makeSystemPath(enterValue("share path: ", s_pSourcePath, false));
-        cout << endl;
-        rtl::OUString sUserPath =	 makeSystemPath(enterValue("user path : ", s_pUpdatePath, false));
-        cout << endl;
-        
-        // test(xORB, sSharePath, sUserPath, ASCII("org.openoffice.test"));
-        
-        // char* pMem = new char[1000 * 1000 * 10];
-        // showMemoryStatistic();
-
-//		test(xORB, sSharePath, sUserPath, ASCII("org.openoffice.Office.Views"));
-
-        START_MEMORYMEASURE_FOR( aMemoryInfo, "*** API Test Main ***" );
-        
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "initialisierungs-check" );
-
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "starte test !" );
-        
-        test(xORB, sSharePath, sUserPath);		
-        
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "tests beendet !" );
-
-        // stop the programm clear.
-        Reference< XComponent > xComponent(xORB, UNO_QUERY);
-        xComponent->dispose();
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "ORB disposed." );
-        
-        LOG_MEMORYMEASURE( "---------------- API Memory Test-------------------------------", "Outer memory traces.", aMemoryInfo );
-    }
-    return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void test(Reference< XHierarchicalName >& xAccessName)
-{
-        if (xAccessName.is())
-        {
-            // cout << "Accessing Node: " << xAccessName->getHierarchicalName();
-        } 
-        else
-        {
-            // cout << "BUG: XHierarchicalName not available";
-        }
-        // cout << endl;
-}
-void test(Reference< XNamed >& xAccess)
-{
-        if (xAccess.is())
-        {
-            // cout << "Node is named: " << xAccess->getName();
-        }
-        else
-        {
-            // cout << "BUG: XNamed not available";
-        }
-        // cout << endl;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-void fillAllNames(Reference<XNameAccess  >& xAccess, Sequence<OUString>& _aSeq)
-{
-        if (xAccess.is())
-        {
-            _aSeq = Sequence <OUString>(xAccess->getElementNames());
-
-            // cout << "Element Names: (" << _aSeq.getLength() << ")";
-            // for (int i = 0; i < _aSeq.getLength(); ++i)
-            //	cout << "\n[" << i << "] -\t" << _aSeq[i];
-            //cout << endl;
-        }
-        else
-        {
-            // cout << "BUG: XNameAccess not available";
-        }
-        // cout << endl;
-}
-void write(Reference< XChild >& xChild)
-{
-        if (xChild.is())
-        {
-            // cout << "\n[ P ] -\tParent";
-        }
-        else
-        {
-            // cout << "BUG: Parent not available (no XChild)";
-        }
-        // cout << endl;
-}
-///////////////////////////////////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-Reference< XInterface > readaccess(uno::Reference< lang::XMultiServiceFactory > &xMSF, 
-                                   uno::Reference< uno::XInterface > const& xIface,
-                                   rtl::OString const& buf, 
-                                   ostream& outStream)
-{
-    Reference< XInterface > xNext;
-    try
-    {
-        Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-        Reference< XHierarchicalNameAccess > xDeepAccess(xIface, UNO_QUERY);
-        Reference< XExactName > xExactName(xIface, UNO_QUERY);
-            
-        if (xAccess.is() || xDeepAccess.is())
-        {
-            OUString aName;
-            OUString aInput = OUString::createFromAscii(buf);
-            
-            if (xExactName.is())
-            {
-                ::rtl::OUString sTemp = xExactName->getExactName(aInput);
-                if (sTemp.getLength())
-                    aInput = sTemp;
-            }
-                
-            if (xAccess.is() && xAccess->hasByName(aInput))
-            {
-                aName = aInput;
-            }
-            else if (xDeepAccess.is() && xDeepAccess->hasByHierarchicalName(aInput))
-            {
-                aName = aInput;
-            }
-            else if ('0' <= buf[0] && buf[0] <= '9' && xAccess.is())
-            {
-                int n = atoi(buf);
-                Sequence<OUString> aNames = xAccess->getElementNames();
-                if (0 <= n && n < aNames.getLength())
-                    aName = aNames[n];
-            }
-            
-            if (aName.getLength())
-            { 
-                bool bNest = aInput.indexOf(sal_Unicode('/')) >= 0;
-                
-                Any aElement = bNest ?
-                    ( xDeepAccess.is() ?
-                      xDeepAccess->getByHierarchicalName(aName) : Any()
-                      ) :
-                    ( xAccess.is() ? 
-                      xAccess->getByName(aName) : Any()
-                      );
-                
-                while (aElement.getValueTypeClass() == TypeClass_ANY)
-                {
-                    Any aWrap(aElement);
-                    aWrap >>= aElement;
-                }
-                sal_Bool bValue = true;
-                sal_Bool bValueOk = false;
-                
-                switch (aElement.getValueTypeClass() )
-                {
-                case TypeClass_INTERFACE:
-                    bValue = false;
-                    if (aElement >>= xNext)
-                    {
-                        outStream << "Group: " << aName << endl;
-                    }
-                    else
-                    {
-                        outStream << "ERROR: can't get the interface" << endl;
-                    }
-                    break;
-                case TypeClass_BOOLEAN:
-                {
-                    sal_Bool* pVal = (sal_Bool*)aElement.getValue();
-                    bValueOk = (pVal != 0);
-                    
-                    outStream << "VALUE '" << aName << "' is a BOOLEAN = ";
-                    if (!bValueOk)
-                        outStream << "NULL (error!!)";
-                    else if (*pVal)
-                        outStream << "'TRUE'";
-                    else
-                        outStream << "'FALSE'";
-                    
-                    outStream << endl;
-
-                    // tryToChange(xAccess, aName, pVal);
-                    break;
-                }
-                case TypeClass_SHORT:
-                {
-                    sal_Int16 aValue;
-                    outStream << "VALUE '" << aName << "' is a SHORT (16 bit) = ";
-                    if (bValueOk = (aElement >>= aValue))
-                    {
-                        outStream << aValue;
-                        // tryToChange(xAccess, aName, aValue);
-                    }
-                    else
-                    {
-                        outStream << "ERROR RETRIEVING VALUE";
-                    }
-                    outStream << endl;
-
-                    break;
-                }
-                case TypeClass_LONG:
-                {
-                    
-                    sal_Int32 aValue;
-                    outStream << "VALUE '" << aName << "' is a INT (32 bit) = ";
-                    if (bValueOk = (aElement >>= aValue))
-                    {
-                        outStream << aValue;
-                        // tryToChange(xAccess, aName, aValue);
-                    }
-                    else
-                    {
-                        outStream << "ERROR RETRIEVING VALUE";
-                    }
-                    outStream << endl;
-                    break;
-                }
-                case TypeClass_HYPER:
-                {
-                    sal_Int64 aValue;
-                    outStream << "VALUE '" << aName << "' is a LONG (64 bit) = ";
-                    if (bValueOk = (aElement >>= aValue))
-                    {
-                        outStream << double(aValue);
-                        // tryToChange(xAccess, aName, aValue);
-                    }
-                    else
-                    {
-                        outStream << "ERROR RETRIEVING VALUE";
-                    }
-                    outStream << endl;
-                    break;
-                }
-                case TypeClass_DOUBLE:
-                {
-                    double aValue;
-                    outStream << "VALUE '" << aName << "' is a DOUBLE = ";
-                    if (bValueOk = (aElement >>= aValue))
-                    {
-                        outStream << aValue;
-                    }
-                    else
-                    {
-                        outStream << "ERROR RETRIEVING VALUE";
-                    }
-                    outStream << endl;
-                    break;
-                }
-                case TypeClass_STRING:
-                {
-                    OUString aValue;
-                    outStream << "VALUE '" << aName << "' is a STRING = ";
-                    if (bValueOk = (aElement >>= aValue))
-                    {
-                        outStream << "\"" << aValue << "\"";
-                        // tryToChange(xAccess, aName, aValue);
-                    }
-                    else
-                    {
-                        outStream << "ERROR RETRIEVING VALUE";
-                    }
-                    outStream << endl;
-                    break;
-                }
-                case TypeClass_SEQUENCE:
-                {
-                    outStream << "VALUE '" << aName << "' is a SEQUENCE or BINARY" << endl;
-                    
-                    Type aTypeS = configmgr::getSequenceElementType(aElement.getValueType());
-                    OUString sType = configmgr::toTypeName(aTypeS.getTypeClass());
-                    outStream << "UNO type is " << aElement.getValueType().getTypeName()  << endl;
-                    outStream << "Real type is Sequence<" << sType << ">" << endl;
-                    // outSequence(aElement, aTypeS, outStream);
-                    bValueOk = true;
-                    break;
-                }
-                case TypeClass_VOID:
-                    outStream << "ELEMENT '" << aName << "' is NULL and VOID " << endl;
-                    bValueOk = true;
-                    break;
-                default:
-                    outStream << "Error: ELEMENT '" << aName << "' is of unknown or unrecognized type" << endl;
-                    break;
-                }
-                
-            }
-            else
-            {
-                outStream << "Error: No element \"" << aInput << "\" found." <<endl;
-            }
-        }
-    } 
-    catch (Exception& e)
-    {
-        outStream << "An Exception occurred: " << e.Message << endl;
-    }
-    catch (...)
-    {
-        outStream << "An UNKNOWN Exception occurred !" << endl;
-    }
-
-    return xNext;
-}
-
-
-
-
-// -----------------------------------------------------------------------------
-void test_read_access( uno::Reference< lang::XMultiServiceFactory > &xMSF, 
-                       uno::Reference< uno::XInterface >& xIface,
-                       ofstream & out)
-{
-    Sequence<OUString> aAllNames;
- 
-    using com::sun::star::uno::UNO_QUERY;
-
-    // cout << "\n\n---------------------------------------------------------------" << endl;
-    Reference< XNameAccess > xAccess(xIface, UNO_QUERY);
-    Reference< XChild > xChild(xIface, UNO_QUERY);
-    Reference< XHierarchicalName > xAccessPath(xIface,UNO_QUERY);
-    Reference< XNamed > xAccessName(xIface,UNO_QUERY);
-//		Reference< XHierarchicalNameAccess >& xAccess(xIface, UNO_QUERY);
-    
-    test(xAccessPath);
-    test(xAccessName);
-    fillAllNames(xAccess, aAllNames);
-    write(xChild);
-    
-    for (sal_Int32 i=0;i<aAllNames.getLength();i++)
-    {
-        OString aValue;
-        aValue <<= aAllNames[i];
-        uno::Reference<uno::XInterface> xFace = readaccess(xMSF, xIface, aValue, out);
-        if (xFace.is())
-        {
-            test_read_access(xMSF, xFace, out);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------------
-void test_read_access( uno::Reference< lang::XMultiServiceFactory > &xMSF, 
-                       uno::Reference< uno::XInterface >& xIface,
-                       rtl::OString aFilename)
-{
-    ofstream out(aFilename.getStr());
-    test_read_access(xMSF, xIface, out);
-}
-
-// -----------------------------------------------------------------------------
-void test_configuration_provider(uno::Reference<lang::XMultiServiceFactory> _xCfgProvider, 
-                                 rtl::OUString const& _sUser, bool _bLocal,
-                                 sal_Int32 _nCount)
-{
-    START_MEMORYMEASURE_FOR( aMemoryInfo, "*** Configuration Provider Loop Test ***" );
-    START_MEMORYMEASURE_FOR( aInnerMemoryInfo, "*** Configuration Provider Module Details ***" );
-    
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "initialisierungs-check" );
-    MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "initialisierungs-check" );
-
-    std::vector< Reference< XInterface > > aLoadedModules;
-    aLoadedModules.reserve(configtest::s_nTestModules);
-
-    Sequence< Any > aArgs;
-    aArgs = createSequence(_sUser, ASCII(""));
-    
-    if (!_bLocal)
-    {
-        OUString sLocale =	enterValue("locale  : ", s_pLocale, false);
-        cout << endl;
-        aArgs.realloc(aArgs.getLength() + 1);
-        aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("locale"), sLocale);
-    }
-    
-#if 0
-    sal_Bool bLazyWrite = true;
-    aArgs.realloc(aArgs.getLength() + 1);
-    aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("lazywrite"), bLazyWrite);
-#else
-    sal_Bool bNoCache = true;
-    aArgs.realloc(aArgs.getLength() + 1);
-    aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("nocache"), bNoCache);
-#endif
-
-    sal_Int32 nPathIdx = aArgs.getLength();
-    aArgs.realloc(nPathIdx + 1);
-
-    const OString sInnerInfoText("- - - Loading module: ");
-    MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "- - - Before Loading Modules" );
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- - Prepared Arguments - Lade Module" );
-
-    for (char const * const * ppTestModule = configtest::s_aTestModules; *ppTestModule; ++ppTestModule)
-    {
-        OUString sPath = OUString::createFromAscii(*ppTestModule);
-        cout << "\t" << ++_nCount << ". test with node: " << sPath << endl;
-
-        aArgs[nPathIdx] <<= configmgr::createPropertyValue(ASCII("nodepath"), sPath);
-    
-        MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, sInnerInfoText.concat(*ppTestModule) );
-        Reference< XInterface > xIFace = _xCfgProvider->createInstanceWithArguments(
-            /* OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), */
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
-            aArgs);
-        // cout << "---------------------------------------------------------------\n Configuration Read/Write Access created !\n---------------------------------------------------------------" << endl;
-        
-        aLoadedModules.push_back(xIFace);
-    /*
-        xChangesBatch = Reference< XChangesBatch >(xIFace, UNO_QUERY);
-        
-        Sequence<OUString> aSeq = _xCfgProvider->getAvailableServiceNames();
-        
-        OString sPath;
-        sPath <<= _sPath;
-
-        OString aFilename = "c:\\temp\\fileout_";
-        aFilename += sPath;
-        aFilename += OString::valueOf(_nCount);
-        aFilename += ".txt";
-        test_read_access(_xCfgProvider, xIFace, aFilename);
-    */
-    }
-    MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "- - - Done Loading modules" );
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- - Alle Module geladen" );
-
-    aLoadedModules.clear();
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "- - Module released" );
-
-    LOG_MEMORYMEASURE( "---------------- API Memory Test 3 -----------------------------", "- - Provider memory traces.", aMemoryInfo );
-    LOG_MEMORYMEASURE( "---------------- API Memory Test 4 -----------------------------", "- - - Module memory traces.", aInnerMemoryInfo );
-
-}
-
- 
-// -----------------------------------------------------------------------------
-// ----------------------------------- Main 2 -----------------------------------
-// -----------------------------------------------------------------------------
-
-int requestTest( int argc, char * argv[] )
-{
-    TimeValue aTimeout;
-    aTimeout.Seconds = 5;
-    aTimeout.Nanosec = 0;
-
-    sal_Int32 nSizeISubtree = sizeof(ISubtree);
-    sal_Int32 nSizeINode = sizeof(INode);
-    sal_Int32 nSizeIValueNode = sizeof(ValueNode);
-    {
-        loadDefaults();
-        
-        Reference< XMultiServiceFactory > xORB = getORB();
-        
-        rtl::OUString sSharePath = makeFileURL(enterValue("share path: ", s_pSourcePath, false));
-        cout << endl;
-        rtl::OUString sUserPath =	makeFileURL(enterValue("user path : ", s_pUpdatePath, false));
-        cout << endl;
-        
-        START_MEMORYMEASURE_FOR( aMemoryInfo, "*** Request Tree Test ***" );
-        
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "initialisierungs-check" );
-
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "create tree manager" );
-
-        OTreeLoad aTreeLoad(xORB, sSharePath, sUserPath);
-        sal_Int32 nIdx = 0;
-
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "created tree manager" );
-
-        OString const sInnerInfoText("- Loading module: ");
-
-        START_MEMORYMEASURE_FOR( aInnerMemoryInfo, "*** Request Tree Test Details ***" );
-        MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "initialisierungs-check" );
-
-        MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "- before loading modules" );
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "request subtrees" );
-
-        for (char const * const * ppRequestModule = configtest::s_aTestModules; *ppRequestModule; ++ppRequestModule)
-        {
-            MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, sInnerInfoText.concat(*ppRequestModule) );
-            aTreeLoad.requestSubtree( OUString::createFromAscii(*ppRequestModule));
-        }
-
-        MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "- loaded all modules" );
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "release subtrees" );
-
-        for (char const * const * ppReleaseModule = configtest::s_aTestModules; *ppReleaseModule; ++ppReleaseModule)
-            aTreeLoad.releaseSubtree( OUString::createFromAscii(*ppReleaseModule));
-
-        MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "ich habe fertig." );
-        LOG_MEMORYMEASURE( "---------------- Request Memory Test ---------------------------", "Direct Cache Access memory traces.", aMemoryInfo );
-        LOG_MEMORYMEASURE( "---------------- Request Memory Detail -------------------------", "Module request memory traces.", aInnerMemoryInfo );
-    }
-    return 0;
-}
-
-// -----------------------------------------------------------------------------
-// --------------------------------- Trust Test ---------------------------------
-// -----------------------------------------------------------------------------
-
-int trust( int argc, char * argv[] )
-{
-    Reference< XMultiServiceFactory > xORB = getORB();
-
-    std::vector<char*> aMemHolder;
-    aMemHolder.reserve(1024);
-
-    START_MEMORYMEASURE_FOR( aMemoryInfo, "Allocator check" );
-    
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "initialisierungs-check" );
-    
-    sal_Int32 const total_alloc = 8 * 1024 * 1024;
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "get 8 MB" );
-
-    char* pChar = new char[total_alloc];
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "free 8 MB" );
-
-    delete [] pChar;
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "deleted 8 MB" );
-
-    sal_Int32 const chunk = 8 * 1024;
-    sal_Int32 const alloc_count = total_alloc/chunk;
-
-    sal_Int32 const msg_count = 16;
-    sal_Int32 const loop_count = alloc_count/msg_count;
-    sal_Int32 const loop_allocation = loop_count * chunk;
-
-    OString const sPieces = OString::valueOf(alloc_count).concat(" pieces"); 
-    OString const sInnerMessage = OString("Allocating ").concat(OString::valueOf(loop_count))
-                                  .concat(" chunks [").concat(OString::valueOf(loop_allocation)).concat(" Bytes].");
-
-    START_MEMORYMEASURE( aInnerMemoryInfo );	
-    MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "initialisierungs-check" );
-    
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, OString("get 8 MB as ").concat(sPieces) );
-
-    for (sal_Int32 i=0;i<alloc_count/loop_count;i++)
-    {
-        MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, sInnerMessage );
-        for (sal_Int32 j=0;j<loop_count;j++)
-        {
-
-            pChar = new char[8 * 1024];
-            aMemHolder.push_back(pChar);
-        }
-    }
-    MAKE_MEMORY_SNAPSHOT( aInnerMemoryInfo, "last allocation done" );
-    
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "free pieces" );
-
-    pChar = NULL;
-    for (std::vector<char*>::iterator it = aMemHolder.begin();
-         it != aMemHolder.end();
-         it++)
-    {
-        pChar = *it;
-        delete []pChar;
-    }
-    aMemHolder.clear();
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, OString("get another 8 MB as ").concat(sPieces) );
-
-
-    for (sal_Int32 j=0;j<alloc_count;j++)
-    {
-        pChar = new char[8 * 1024];
-        aMemHolder.push_back(pChar);
-    }
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "free second set of pieces" );
-
-    pChar = NULL;
-    for (std::vector<char*>::iterator jt = aMemHolder.begin();
-         jt != aMemHolder.end();
-         jt++)
-    {
-        pChar = *jt;
-        delete []pChar;
-    }
-    aMemHolder.clear();
-
-    MAKE_MEMORY_SNAPSHOT( aMemoryInfo, "ich habe fertig." );
-    LOG_MEMORYMEASURE( "---------------- Trust Memory Test ----------------------------", "Cross-checked memory traces.", aMemoryInfo );
-    LOG_MEMORYMEASURE( "---------------- Small Allocation Loop ------------------------", "Allocation Loop Detail memory traces.", aInnerMemoryInfo );
-    
-    return 0;
-}
-
-// -----------------------------------------------------------------------------
-static uno::Reference< lang::XMultiServiceFactory > g_xORB;
-static void createORB(char const* pRegistry)
-{
-    if (!g_xORB.is())
-        try
-        {
-            rtl::OUString const sServiceRegistry = OUString::createFromAscii(pRegistry);
-
-            g_xORB = createRegistryServiceFactory( sServiceRegistry, ::rtl::OUString() );
-
-        }
-        catch (uno::Exception &e)
-        {
-            cerr << "Exception creating the service factory: " << e.Message << "\n";
-        }
-    else
-        cerr << "Trying to recreate the service factory\n";
-
-    if (!g_xORB.is())
-    {
-        ::flush(cout);
-        cerr << "Could not create the service factory '" << pRegistry << "' !\n";
-        exit(-2);
-    }
-}
-uno::Reference< lang::XMultiServiceFactory > getORB()
-{
-    if (!g_xORB.is()) 
-    {
-        createORB( "applicat.rdb" );
-    }
-    return g_xORB;
-}
-// -----------------------------------------------------------------------------
-
-
-} // namespace configmgr
-// -----------------------------------------------------------------------------
-void usage()
-{
-    cerr << "Wrong or missing parameters.\nUsage:\n" 
-            "\tmemorytest [-r <registry.rdb>] (all | trust | request | api)+ [clear] [(+<module>|-<module>)+]\n";
-
-    exit(-1);
-}
-
-// -----------------------------------------------------------------------------
-// ------------------------------------ Main ------------------------------------
-// -----------------------------------------------------------------------------
-#if (defined UNX) || (defined OS2)
-int main( int argc, char * argv[] )
-#else
-int _cdecl main( int argc, char * argv[] )
-#endif
-{
-    if (argc > 1 && !::rtl_str_compare(argv[1], "-r"  ) )
-    {
-        if (!argv[2]) usage();
-
-        configmgr::createORB(argv[2]);
-
-        argv += 2;
-        argc -= 2;
-    }
-    configmgr::getORB(); // ensures there is one
-
-    enum TestSelect { TEST_TRUST = 01, TEST_REQUEST = 02, TEST_API = 04, TEST_ALL = 07 };
-
-    unsigned nSelect = 0;
-    while (argc >= 1 && argv[1] != NULL)
-    {
-             if ( !::rtl_str_compareIgnoreAsciiCase(argv[1], "trust"  ) ) nSelect |= TEST_TRUST;
-        else if ( !::rtl_str_compareIgnoreAsciiCase(argv[1], "request") ) nSelect |= TEST_REQUEST;
-        else if ( !::rtl_str_compareIgnoreAsciiCase(argv[1], "api"    ) ) nSelect |= TEST_API;
-        else if ( !::rtl_str_compareIgnoreAsciiCase(argv[1], "all"    ) ) nSelect |= TEST_ALL;
-        else break;
-
-        // here we found a known selector, so look on
-        ++argv;
-        --argc;
-    }
-
-    if (nSelect == 0) usage();
-
-//--------------------
-#define DO_TEST( test, func )   \
-    if (nSelect & TEST_##test)   \
-    {                           \
-        char const * const test_name = #test;   \
-        if (int nRet = func(argc, argv))        \
-            cerr << "Test: " << test_name << " returned with error code " << nRet << endl;  \
-        else                                                                                \
-            cerr << "Test: " << test_name << " finished without error !\n" ;                  \
-    } else // to allow a semicolon
-//--------------------
-
-    DO_TEST( TRUST   , configmgr::trust );
-    DO_TEST( REQUEST , configmgr::requestTest );
-    DO_TEST( API     , configmgr::main );
-
-    return 0;
-}
-
diff --git a/configmgr/workben/memory/testmodules.cxx b/configmgr/workben/memory/testmodules.cxx
deleted file mode 100644
index 612333e656..0000000000
--- a/configmgr/workben/memory/testmodules.cxx
+++ /dev/null
@@ -1,87 +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: testmodules.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_configmgr.hxx"
-
-#include "testmodules.hxx"
-
-
-namespace configtest
-{
-    #if 0 // more modules
-            +"org.openoffice.Office.Common",
-            +"org.openoffice.Office.Linguistic",
-            x"org.openoffice.Office.TypeDetection",
-            x"org.openoffice.Setup",
-            -"org.openoffice.UserProfile",
-            +"org.openoffice.Inet",
-            -"org.openoffice.Office.Calc",
-            -"org.openoffice.Office.Chart",
-            -"org.openoffice.Office.DataAccess",
-            -"org.openoffice.Office.Draw",
-            -"org.openoffice.Office.Impress",
-            -"org.openoffice.Office.Java",
-            -"org.openoffice.Office.Labels",
-            -"org.openoffice.Office.Math",
-            +"org.openoffice.Office.Views",
-            +"org.openoffice.Office.Writer",
-            +"org.openoffice.Office.WriterWeb",
-            +"org.openoffice.ucb.Configuration",
-            -"org.openoffice.ucb.Hierarchy",
-            x"org.openoffice.ucb.Store",
-    #endif
-
-    char const * const s_aTestModules[] =
-        {
-            "org.openoffice.Office.Common",
-            "org.openoffice.Setup/CJK/Enable",
-            "org.openoffice.Setup/Office/Modules",
-            "org.openoffice.Inet",
-            "org.openoffice.Office.Views",
-            "org.openoffice.Setup/Product",
-            "org.openoffice.ucb.Configuration",
-            "org.openoffice.ucb.Store/ContentProperties",
-            "org.openoffice.Office.TypeDetection",
-            "org.openoffice.Office.Writer",
-            "org.openoffice.Office.WriterWeb",
-            "org.openoffice.Office.Linguistic", 
-            NULL // end marker
-        };
-    unsigned int const s_nTestModules = sizeof s_aTestModules/sizeof 0[s_aTestModules];
-            
-    std::vector<char const *> listTestModules(int argc, char* argv[])
-    {
-        std::vector<char const *> aModuleList( s_aTestModules, s_aTestModules + s_nTestModules);
-        return aModuleList;
-    }
-}
-
-
diff --git a/configmgr/workben/memory/treeload.cxx b/configmgr/workben/memory/treeload.cxx
deleted file mode 100644
index 5de5d4ca9b..0000000000
--- a/configmgr/workben/memory/treeload.cxx
+++ /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: treeload.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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <localsession.hxx>
-#include <treecache.hxx>
-#include <options.hxx>
-#include <rtl/ustring.hxx>
-#include "treeload.hxx"
-
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-    namespace uno	= ::com::sun::star::uno;
-    namespace lang	= ::com::sun::star::lang;
-    
-#define ASCII(x) ::rtl::OUString::createFromAscii(x)
-
-// -----------------------------------------------------------------------------
-// ------------------------- requestSubtree without API -------------------------
-// -----------------------------------------------------------------------------
-
-    OTreeLoad::OTreeLoad(uno::Reference<lang::XMultiServiceFactory> const& _xServiceProvider,
-                         rtl::OUString const& _sSourceDirectory, rtl::OUString const& _sUpdateDirectory) throw (uno::Exception)
-            :m_xServiceProvider(_xServiceProvider)
-{
-    // Create a TypeConverter
-    uno::Reference<script::XTypeConverter>		xConverter;
-    xConverter = xConverter.query(m_xServiceProvider->createInstance(ASCII( "com.sun.star.script.Converter" )) );
-
-    m_xDefaultOptions = new OOptions(xConverter);
-    m_xDefaultOptions->setNoCache(true);
-
-    // create it .. and connect
-    std::auto_ptr<LocalSession> pLocal( new LocalSession(m_xServiceProvider) );
-    sal_Bool bOpen = pLocal->open(_sSourceDirectory, _sUpdateDirectory);
-
-    IConfigSession* pConfigSession = pLocal.release();
-
-    m_pTreeMgr = new TreeManager(pConfigSession, m_xDefaultOptions);
-}
-// -----------------------------------------------------------------------------
-ISubtree* OTreeLoad::requestSubtree( OUString const& aSubtreePath) throw (uno::Exception)
-{
-    return m_pTreeMgr->requestSubtree(aSubtreePath, m_xDefaultOptions, /* MinLevel */ -1);
-}
-// -----------------------------------------------------------------------------
-void OTreeLoad::releaseSubtree( OUString const& aSubtreePath) throw (uno::Exception)
-{
-    m_pTreeMgr->releaseSubtree(aSubtreePath, m_xDefaultOptions);
-}
-
-// -----------------------------------------------------------------------------
-} // namespace
diff --git a/configmgr/workben/memory/treeload.hxx b/configmgr/workben/memory/treeload.hxx
deleted file mode 100644
index 7889bd80f0..0000000000
--- a/configmgr/workben/memory/treeload.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef CONFIGMGR_TREELOAD_HXX
-#define CONFIGMGR_TREELOAD_HXX
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-#ifndef _CONFIGMGR_LOCAL_LOCAL_HXX_
-#include <localsession.hxx>
-#endif
-
-#ifndef _CONFIGMGR_TREECACHE_HXX_
-#include <treecache.hxx>
-#endif
-#include <options.hxx>
-#include <rtl/ustring.hxx>
-
-// -----------------------------------------------------------------------------
-namespace configmgr
-{
-    namespace uno	= ::com::sun::star::uno;
-    namespace lang	= ::com::sun::star::lang;
-    
-// -----------------------------------------------------------------------------
-class OTreeLoad
-{
-    // LocalSession* m_pLocalSession; // in TreeMgr
-    TreeManager* m_pTreeMgr;
-    ::vos::ORef<OOptions>		m_xDefaultOptions;
-    uno::Reference<lang::XMultiServiceFactory> m_xServiceProvider;
-
-public:
-
-    OTreeLoad(uno::Reference<lang::XMultiServiceFactory> const& _xServiceProvider,
-             rtl::OUString const& _sSourceDirectory, rtl::OUString const& _sUpdateDirectory);
-
-    ISubtree* requestSubtree(rtl::OUString const& aSubtreePath);
-    void releaseSubtree(rtl::OUString const& aSubtreePath);
-};
- 
-} // namespace
-
-#endif
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
index f8ae5ac94a..a10f07dbc4 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.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: FileSystemRuntimeException.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/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
index 53a83c4425..214f8fd5ec 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.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: StorageFileAccess.java,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/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 5750ac8417..11ab3e61c5 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.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: NativeLibraries.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index a3dac8f4e2..6e2bc1099d 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.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: NativeStorageAccess.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/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 7c1fcc6ccb..52d4035916 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.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: StorageAccess.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/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index ca5ce4dcb9..536e72d0c8 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.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: StorageFileAccess.java,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/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
index 38caa8bd96..f72d397ba8 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.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: StorageFileAccess.java,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/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
index 3977a4869e..4976a7d607 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
@@ -2,14 +2,10 @@
 # 
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/dbtools.pmk b/connectivity/dbtools.pmk
index 89a56d1321..df10209932 100644
--- a/connectivity/dbtools.pmk
+++ b/connectivity/dbtools.pmk
@@ -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: $
-#
-# $Revision: $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx
index 10142513ed..015fdfdc7c 100644
--- a/connectivity/inc/connectivity/BlobHelper.hxx
+++ b/connectivity/inc/connectivity/BlobHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FValue.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/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index 82988422d0..fa13c0eac2 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CommonTools.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/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx
index af1fa6e954..8486fb5e6f 100644
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ConnectionWrapper.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/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx
index 0cc168f322..4540ee128d 100644
--- a/connectivity/inc/connectivity/DateConversion.hxx
+++ b/connectivity/inc/connectivity/DateConversion.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DateConversion.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/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index ceff42f48a..fc310c094c 100755
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: makefile,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 #ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 8bcfa0eaed..6dedb99fc3 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FValue.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/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx
index b90ea0dd69..d0f2061e40 100644
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/connectivity/inc/connectivity/IParseContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IParseContext.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/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 1afb8934da..20754b5a04 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PColumn.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/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx
index a26c8b12e2..16778cf969 100644
--- a/connectivity/inc/connectivity/ParameterCont.hxx
+++ b/connectivity/inc/connectivity/ParameterCont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ParameterCont.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx
index 5ec117c4f1..9d9e985bc8 100644
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/connectivity/inc/connectivity/StdTypeDefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StdTypeDefs.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx
index 934a326cea..d865751a80 100644
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/connectivity/inc/connectivity/TColumnsHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TColumnsHelper.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/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx
index 6a2ce04ea9..02e45fc129 100644
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/connectivity/inc/connectivity/TIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TIndex.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index 779905b2c5..2f4f32767c 100644
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TIndexColumns.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/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index 284aac5bc4..850f5f3906 100644
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TIndexes.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/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx
index 995351620f..fe1091f490 100644
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/connectivity/inc/connectivity/TKey.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKey.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx
index 0b0d148eb6..5eba446c13 100644
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/connectivity/TKeyColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKeyColumns.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/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx
index 8e4b7b7dcc..f33356f3ff 100644
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/connectivity/inc/connectivity/TKeys.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKeys.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/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index bef9ce7240..db220ffe1a 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TTableHelper.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/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx
index c31aab57d5..d72137cdff 100644
--- a/connectivity/inc/connectivity/conncleanup.hxx
+++ b/connectivity/inc/connectivity/conncleanup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conncleanup.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/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx
index 481933326e..39b33d6b5e 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbcharset.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/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index a19d76f3f2..f0508a4f32 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbconversion.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/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx
index 682a6d9976..3f04e0bea8 100644
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/connectivity/inc/connectivity/dbexception.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbexception.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/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index a09b698e8c..6c68a03e64 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbmetadata.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/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 2f3b808089..829a0ff774 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtools.hxx,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/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
index 23cadc513a..0e90962bc0 100644
--- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx
+++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: $
-*
-* $Revision: $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index f46d27043b..a1b0d92ae0 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtermanager.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index 1b3ef1060b..0d146f953c 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formattedcolumnvalue.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 00fa851aad..e076c28efa 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parameters.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index ad7fb4fc56..474b0adcc6 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paramwrapper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx
index a3488a8b3c..fd6ca6dc39 100644
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/connectivity/inc/connectivity/predicateinput.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: predicateinput.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/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
index 981905f937..ce02d5b8d1 100644
--- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IRefreshable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 840cfb49cf..180dc1c509 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VCatalog.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/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 462815ea53..8c2a494788 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VCollection.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/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index 8f9495998b..4bfea950fe 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VColumn.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/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
index bc8bc7c9dd..43e6212a68 100644
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VDescriptor.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/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index de022acc40..3fca7c9bb4 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VGroup.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/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 8f3145b305..40ac1dfe81 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VIndex.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/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
index e6dc7b1cf8..08680ba0f8 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VIndexColumn.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/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index 1eee05742e..e984800ba0 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VKey.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/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
index 5266986011..280586b03b 100644
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VKeyColumn.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/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index f90446b421..7b306f06a8 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VTable.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/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
index cf6e211bf5..2266624d5b 100644
--- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VTypeDef.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index 348102c902..caff7747cd 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VUser.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/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 0537c27316..1bbb91c7a0 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VView.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/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index ed7110a9f0..e3c682cf65 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlerror.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index ea11a64c7e..7394444a9c 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqliterator.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/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index 637fb1a8f3..37a3a72007 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlnode.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 6518a81933..964b64e0f8 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlparse.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/connectivity/inc/connectivity/standardsqlstate.hxx
index b9c9d549d0..7957136e56 100644
--- a/connectivity/inc/connectivity/standardsqlstate.hxx
+++ b/connectivity/inc/connectivity/standardsqlstate.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: standardsqlstate.hxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef CONNECTIVITY_STANDARD_SQL_STATE_HXX
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index 03015ceff8..a20dc73d00 100644
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statementcomposer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx
index a2d8bd1e31..eadf84a61e 100644
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/connectivity/inc/connectivity/virtualdbtools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: virtualdbtools.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/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
index a2cfdb3fe9..3643185752 100644
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk
index 4b830c25ff..51a3f225b3 100644
--- a/connectivity/inc/makefile.mk
+++ b/connectivity/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/connectivity/inc/pch/precompiled_connectivity.cxx b/connectivity/inc/pch/precompiled_connectivity.cxx
index 0a6febcce7..8033a4b71f 100644
--- a/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/connectivity/inc/pch/precompiled_connectivity.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_connectivity.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/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index ae486e9b3b..dd15bc3c63 100644
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_connectivity.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/makefile.pmk b/connectivity/makefile.pmk
index ede06e49d3..fe56884dba 100755
--- a/connectivity/makefile.pmk
+++ b/connectivity/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/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 87e1791ba7..dd386c7c71 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -28,5 +28,5 @@ cn  connectivity\source\parse                       nmake   -   all cn_parse cn_
 cn  connectivity\source\simpledbt                   nmake   -   all cn_simpledbt cn_cmtools cn_inc NULL
 cn  connectivity\source\dbtools                     nmake   -   all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
 cn  connectivity\qa\connectivity\tools              nmake   -   all cn_qa_tools cn_inc NULL
-cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb NULL
+cn  connectivity\util                               nmake   -   all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
 
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 728c8fef03..e116ee5740 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -30,4 +30,4 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
 #..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
 ..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
 ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
\ No newline at end of file
+..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
diff --git a/connectivity/qa/connectivity/GeneralTest.java b/connectivity/qa/connectivity/GeneralTest.java
index 29c8dc15fb..374f76cf73 100644
--- a/connectivity/qa/connectivity/GeneralTest.java
+++ b/connectivity/qa/connectivity/GeneralTest.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: GeneralTest.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/connectivity/qa/connectivity/makefile.mk b/connectivity/qa/connectivity/makefile.mk
index 9dd5daf4e9..785f20692d 100644
--- a/connectivity/qa/connectivity/makefile.mk
+++ b/connectivity/qa/connectivity/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.60.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index fca1e60b41..0137dbc9ab 100755
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RowSetEventListener.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index 3b840f3deb..e197d53d9f 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.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: CRMDatabase.java,v $
- * $Revision: 1.6.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index df43ee5eee..3c2d2ff5c2 100644
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.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: DataSource.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/DatabaseAccess.java b/connectivity/qa/connectivity/tools/DatabaseAccess.java
index 78608063e6..b86866202b 100755
--- a/connectivity/qa/connectivity/tools/DatabaseAccess.java
+++ b/connectivity/qa/connectivity/tools/DatabaseAccess.java
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RowSetEventListener.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index c97d7804df..63c8acb118 100755
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.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: DbaseDatabase.java,v $
- * $Revision: 1.4.50.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index 2fbbe7b694..824f7ebd2f 100644
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.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: HsqlColumnDescriptor.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index b3fd724c17..d39a322f2f 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.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: HsqlDatabase.java,v $
- * $Revision: 1.4.50.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
index 4b900c7056..b4d1f656dc 100644
--- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.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: HsqlTableDescriptor.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java
index e2aa4fcfc3..4ca3ca0ef2 100644
--- a/connectivity/qa/connectivity/tools/QueryDefinition.java
+++ b/connectivity/qa/connectivity/tools/QueryDefinition.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: QueryDefinition.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/connectivity/qa/connectivity/tools/RowSet.java b/connectivity/qa/connectivity/tools/RowSet.java
index 9fbba57b6d..7581804e33 100644
--- a/connectivity/qa/connectivity/tools/RowSet.java
+++ b/connectivity/qa/connectivity/tools/RowSet.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: RowSet.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/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index 32aa94c773..0f3c9c84b9 100644
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/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.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/connectivity/qa/drivers/dbase/DBaseDateFunctions.java b/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
index 1c0ff72b34..52605d324f 100644
--- a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
+++ b/connectivity/qa/drivers/dbase/DBaseDateFunctions.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: DBaseDateFunctions.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/connectivity/qa/drivers/dbase/DBaseDriverTest.java b/connectivity/qa/drivers/dbase/DBaseDriverTest.java
index f25d02f122..a12a6a4cdd 100644
--- a/connectivity/qa/drivers/dbase/DBaseDriverTest.java
+++ b/connectivity/qa/drivers/dbase/DBaseDriverTest.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: DBaseDriverTest.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/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java b/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
index d76456536a..2a32179da0 100644
--- a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
+++ b/connectivity/qa/drivers/dbase/DBaseNumericFunctions.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: DBaseNumericFunctions.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/connectivity/qa/drivers/dbase/DBaseSqlTests.java b/connectivity/qa/drivers/dbase/DBaseSqlTests.java
index c60352636f..37fca35439 100755
--- a/connectivity/qa/drivers/dbase/DBaseSqlTests.java
+++ b/connectivity/qa/drivers/dbase/DBaseSqlTests.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: DBaseStringFunctions.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/connectivity/qa/drivers/dbase/DBaseStringFunctions.java b/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
index f6a35dafc7..1cc576b1e7 100644
--- a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
+++ b/connectivity/qa/drivers/dbase/DBaseStringFunctions.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: DBaseStringFunctions.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/connectivity/qa/drivers/dbase/makefile.mk b/connectivity/qa/drivers/dbase/makefile.mk
index 4544b2a2bc..d71670d674 100644
--- a/connectivity/qa/drivers/dbase/makefile.mk
+++ b/connectivity/qa/drivers/dbase/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.60.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/drivers/hsqldb/DriverTest.java b/connectivity/qa/drivers/hsqldb/DriverTest.java
index 5e0c91d2cb..be9fa42e09 100644
--- a/connectivity/qa/drivers/hsqldb/DriverTest.java
+++ b/connectivity/qa/drivers/hsqldb/DriverTest.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: DriverTest.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/qa/drivers/jdbc/LongVarCharTest.java b/connectivity/qa/drivers/jdbc/LongVarCharTest.java
index 1d354b087c..86de0b3409 100644
--- a/connectivity/qa/drivers/jdbc/LongVarCharTest.java
+++ b/connectivity/qa/drivers/jdbc/LongVarCharTest.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: LongVarCharTest.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/connectivity/qa/drivers/jdbc/makefile.mk b/connectivity/qa/drivers/jdbc/makefile.mk
index 1e641bdd62..e9f03ce1be 100644
--- a/connectivity/qa/drivers/jdbc/makefile.mk
+++ b/connectivity/qa/drivers/jdbc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 3b611dd6b1..0cba1b6b4f 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AutoRetrievingBase.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/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index ba6aaf2715..2713d23927 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FValue.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/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 63d8594cdd..b026cc772e 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CommonTools.cxx,v $
- * $Revision: 1.26.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index d417c33163..d9a7e8f1f1 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ConnectionWrapper.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/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index bee1b9a69e..886ba2b723 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DateConversion.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/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index b4cee320dc..75c3ecbd00 100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: makefile,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 #include "connectivity/DriversConfig.hxx"
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 17fe520b1d..a5f0797ac2 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaDataResultSet.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -764,7 +761,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
                                 break;
                             case TypeClass_BYTE:
                                 {
-                                    sal_Int8 nValue;
+                                    sal_Int8 nValue(0);
                                     *pRowIter >>= nValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
                                 }
@@ -772,7 +769,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
                             case TypeClass_SHORT:
                             case TypeClass_UNSIGNED_SHORT:
                                 {
-                                    sal_Int16 nValue;
+                                    sal_Int16 nValue(0);
                                     *pRowIter >>= nValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
                                 }
@@ -780,7 +777,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
                             case TypeClass_LONG:
                             case TypeClass_UNSIGNED_LONG:
                                 {
-                                    sal_Int32 nValue;
+                                    sal_Int32 nValue(0);
                                     *pRowIter >>= nValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
                                 }
@@ -788,21 +785,21 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
                             case TypeClass_HYPER:
                             case TypeClass_UNSIGNED_HYPER:
                                 {
-                                    sal_Int64 nValue;
+                                    sal_Int64 nValue(0);
                                     *pRowIter >>= nValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
                                 }
                                 break;
                             case TypeClass_FLOAT:
                                 {
-                                    float nValue;
+                                    float nValue(0.0);
                                     *pRowIter >>= nValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
                                 }
                                 break;
                             case TypeClass_DOUBLE:
                                 {
-                                    double nValue;
+                                    double nValue(0.0);
                                     *pRowIter >>= nValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(nValue));
                                 }
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index fa2789c29a..004c5d3c72 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaDataResultSetMetaData.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/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 0ffe2e57e5..9f1afe1e93 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FValue.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2136,35 +2133,35 @@ void ORowSetValue::fill(const Any& _rValue)
         }
         case TypeClass_FLOAT:
         {
-            float aDummy;
+            float aDummy(0.0);
             _rValue >>= aDummy;
             (*this) = aDummy;
             break;
         }
         case TypeClass_DOUBLE:
         {
-            double aDummy;
+            double aDummy(0.0);
             _rValue >>= aDummy;
             (*this) = aDummy;
             break;
         }
         case TypeClass_BYTE:
         {
-            sal_Int8 aDummy;
+            sal_Int8 aDummy(0);
             _rValue >>= aDummy;
             (*this) = aDummy;
             break;
         }
         case TypeClass_SHORT:
         {
-            sal_Int16 aDummy;
+            sal_Int16 aDummy(0);
             _rValue >>= aDummy;
             (*this) = aDummy;
             break;
         }
         case TypeClass_LONG:
         {
-            sal_Int32 aDummy;
+            sal_Int32 aDummy(0);
             _rValue >>= aDummy;
             (*this) = aDummy;
             break;
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 0628e4a392..82bc8d02f8 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaDataResultSet.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/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index fe814821e5..dc6ee18cea 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RowFunctionParser.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/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 032d859575..f1b51b9d40 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TColumnsHelper.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/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index 36b5c8a315..0fe11ae40a 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TConnection.cxx,v $
- * $Revision: 1.9.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 0fb5336bba..9047bd58f8 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TDatabaseMetaDataBase.cxx,v $
- * $Revision: 1.8.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index bfb1cb4c60..cc9a93230f 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TIndex.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/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 1f10f853e9..706a026675 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TIndexColumns.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/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index d0fb9289ac..e979262e8c 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TIndexes.cxx,v $
- * $Revision: 1.12.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 5f7605c255..ebbd780296 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKey.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/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 1c0be35d9d..424f858e9d 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKeyColumns.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/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index ae7e8d6df9..865e51ae03 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKeys.cxx,v $
- * $Revision: 1.13.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 2752aa4d4b..8478a21b5d 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TPrivilegesResultSet.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/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 931beb7254..5c887b94fa 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TSkipDeletedSet.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/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 5809d8e59e..e6a524b070 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TSortIndex.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/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index fcee5f57fa..0be2c930a2 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TTableHelper.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/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 30a6fe239b..ae75bafbda 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: conncleanup.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/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 70b4cc8758..a124334166 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbcharset.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/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index d2682adf7b..f017ac2c49 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbconversion.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/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index abf83ac7c9..b70f11744d 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbexception.cxx,v $
- * $Revision: 1.23.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 13ff267071..8187e7dde3 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbmetadata.cxx,v $
- * $Revision: 1.10.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 22966a6e03..7011665ab3 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtools.cxx,v $
- * $Revision: 1.74.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 6c798efdf6..3a9f97f0d0 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtools2.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/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 4091f9088d..0888af7324 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtermanager.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/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index a0874572e2..90bb97ac1d 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formattedcolumnvalue.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/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index 1cc6cf4949..cab2160922 100644
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 9114f20e12..97ed694c22 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parameters.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/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 36b20b7f50..e5af0901d8 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paramwrapper.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/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 8bb6b79974..a5d5ce7539 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: predicateinput.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/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 0ca98181cc..b33fcb9fba 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyids.cxx,v $
- * $Revision: 1.7.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 0b8710c495..238b0213c8 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlerror.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/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index dfb02c33f5..04213f7de8 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statementcomposer.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/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index f2c8156e0c..d45c33e8b5 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index d40aeccda0..d9c02b74c1 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZConnectionPool.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/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 7ccc9cd5bf..284beb968e 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZConnectionPool.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/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index 94ea1be0be..9c001f0c60 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZConnectionWrapper.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/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 85f8ee9677..63ad15cec6 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZConnectionWrapper.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/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 61509638c6..be622d8e44 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZDriverWrapper.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/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index cb56638035..d23490d750 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZDriverWrapper.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/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 679ea8d611..32344afb30 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZPoolCollection.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/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index ddef9e317f..38309128a3 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZPoolCollection.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/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 64293811d5..bb40ebd296 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZPooledConnection.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/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 17c272ea84..29ff29ab0f 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ZPooledConnection.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 4cf9705d97..efe1dc8a0d 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Zregistration.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/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 056e5c1617..124e7b574d 100644
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 060ff6c554..af4ac13e54 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx
index 22fbe61f4f..d25fd61676 100644
--- a/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/connectivity/source/drivers/adabas/BCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BCatalog.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/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index f36b27cb3c..f9ee9b6646 100644
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BColumns.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/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 151b886fd7..70d763c1c6 100644
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BConnection.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/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index f448a97140..d254a1cabb 100644
--- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BDatabaseMetaData.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/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index bcdd09cb7e..c39ac718f7 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BDriver.cxx,v $
- * $Revision: 1.24.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index d805241bb7..5c65e4e477 100644
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BFunctions.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/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 8dc7c2f1e3..37fd53cfaa 100644
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BGroup.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/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index 49afc6e3a8..57667327a8 100644
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BGroups.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/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx
index 4834f6af50..5236ffb27e 100644
--- a/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/connectivity/source/drivers/adabas/BIndex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndex.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/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 26b94897f2..70e23c3ea6 100644
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndexColumns.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/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index 89bfeae5ec..df3fbbc8c5 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndexes.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/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 2d5ff14759..59c6ba18b7 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BKeys.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/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index 3b398c8044..0e936d696d 100644
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BPreparedStatement.cxx,v $
- * $Revision: 1.9.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx
index 8ec829303a..b35d9eaf27 100644
--- a/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/connectivity/source/drivers/adabas/BResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BResultSet.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/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index 210ec76b56..226c21a078 100644
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BResultSetMetaData.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/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx
index f58cebfa3e..1467d42c1e 100644
--- a/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/connectivity/source/drivers/adabas/BStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BStatement.cxx,v $
- * $Revision: 1.9.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index bfd598929c..1dc9d04935 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BTable.cxx,v $
- * $Revision: 1.36.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index 0d16aeba65..15e216f9fa 100644
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BTables.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/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index a672cf906e..51707bf037 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BUser.cxx,v $
- * $Revision: 1.17.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index 6062b63854..2905680cc3 100644
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BUsers.cxx,v $
- * $Revision: 1.19.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index b62f0d12ca..796e145440 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BViews.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/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index fd70bcb2a1..3b974687f3 100644
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Bservices.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/connectivity/source/drivers/adabas/adabas.xcu b/connectivity/source/drivers/adabas/adabas.xcu
index e20ef1d3f7..9ed2e69d4f 100755
--- a/connectivity/source/drivers/adabas/adabas.xcu
+++ b/connectivity/source/drivers/adabas/adabas.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index 5b3483ed57..e3e9d76ac2 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.30 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 6f15fdba76..7320570839 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ACallableStatement.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/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index 7c01de3732..c618783caa 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ACatalog.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/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 9b25535c31..d3bccf849e 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AColumn.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/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 4889a256f2..89e20c62d4 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AColumns.cxx,v $
- * $Revision: 1.22.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 4193a6985f..0e2915b46b 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AConnection.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index cd4538d834..5d07fa9efe 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaData.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/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 1480b52fd4..f12f491f65 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaDataImpl.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/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 783707b8e0..17ae0ef212 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaDataResultSet.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/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 6a9d640b91..4077eda93f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaDataResultSetMetaData.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/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 6ff8dedcf7..bed410d180 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADriver.cxx,v $
- * $Revision: 1.19.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 2cd579f7d9..09a56aa686 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AGroup.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/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 5e366825f1..a31b8552a6 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AGroups.cxx,v $
- * $Revision: 1.12.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 0e49c6e8e6..c39b84360c 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AIndex.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/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 0246348e58..811ae89881 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AIndexes.cxx,v $
- * $Revision: 1.17.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 129705426f..1504bbcad5 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKey.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/connectivity/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx
index 3e5773bdef..a8d0bea208 100644
--- a/connectivity/source/drivers/ado/AKeyColumn.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKeyColumn.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/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx
index aa293ca0a5..3e6ad9c46c 100644
--- a/connectivity/source/drivers/ado/AKeyColumns.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKeyColumns.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/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index abe6bb3113..ce58462fcf 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKeys.cxx,v $
- * $Revision: 1.20.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 3958f2e843..a6b5b811b8 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: APreparedStatement.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/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 142286adca..b71601cd65 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AResultSet.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/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 071172d77e..dbb0024e68 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AResultSetMetaData.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/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 2c95b70914..b4497d27e3 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AStatement.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index 96a5bc38b7..a464a7b006 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ATable.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/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 384607bdef..e5e04b3e88 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ATables.cxx,v $
- * $Revision: 1.21.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 1bf8da983f..a0a0144fa6 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AUser.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/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index bf66d1d6f8..57c9ee68b6 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AUsers.cxx,v $
- * $Revision: 1.12.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 98c5d5a333..06f73fe7d9 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AView.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/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index ed95efea6c..fba4a75cf4 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AViews.cxx,v $
- * $Revision: 1.17.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index b98cf943f5..ac4c0a15a4 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Aolevariant.cxx,v $
- * $Revision: 1.15.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 00ae2a249b..00254201fc 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Aservices.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/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 155e4a0fed..07c4d096df 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Awrapado.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/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index 89ac9b1e5a..63da80f5ef 100755
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/drivers/ado/ado_post_sys_include.h
index 5ce4beade1..4091b4aeda 100644
--- a/connectivity/source/drivers/ado/ado_post_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_post_sys_include.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ado_post_sys_include.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/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h
index fd1617d99e..7c6d6f35fb 100644
--- a/connectivity/source/drivers/ado/ado_pre_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ado_pre_sys_include.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/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index def609be32..893bdb1824 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adoimp.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/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index b453c528e1..33e4706482 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index b26beb6c5c..086f3147df 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CCatalog.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/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 266d458b92..1be6e2d0c4 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CColumns.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/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index b4a1a71410..d7995fde20 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CConnection.cxx,v $
- * $Revision: 1.18.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index b89a2bfc5a..b521c0aee5 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CDatabaseMetaData.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/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 937cdc542e..7c1e9d1805 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CDriver.cxx,v $
- * $Revision: 1.9.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index 83fc3d7731..d252e756aa 100644
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CPreparedStatement.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/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index e9a977ccc9..692c4e05d9 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CResultSet.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/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index c8b6d957c6..f688481845 100644
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CStatement.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/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 84d7054c71..65505495cd 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CTable.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/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 77057abd11..be99db708c 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CTables.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/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index c80fc28bbc..75f69d0d21 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Cservices.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/connectivity/source/drivers/calc/calc.xcu b/connectivity/source/drivers/calc/calc.xcu
index 5ca6c81b60..ec71ed3caf 100755
--- a/connectivity/source/drivers/calc/calc.xcu
+++ b/connectivity/source/drivers/calc/calc.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index f4019564ed..452e9a92b3 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index c402bf7642..43692bc891 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DCatalog.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/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 2291db703d..69b7742359 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DCode.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/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index e5ccfd669f..6c98f8fc52 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DColumns.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/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index 49bb15fe5e..25285b84c2 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DConnection.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/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 2cecb7bce8..e859117889 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DDatabaseMetaData.cxx,v $
- * $Revision: 1.35.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 3a2139bdb9..ca4f67248a 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DDriver.cxx,v $
- * $Revision: 1.11.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 9d25b18e00..30bd56b6f8 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndex.cxx,v $
- * $Revision: 1.43.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 305252cb71..a3bc0e3415 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexColumns.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/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 364d4daafc..4070060ae4 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexIter.cxx,v $
- * $Revision: 1.9.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index f494a04654..cc4eaec12c 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexes.cxx,v $
- * $Revision: 1.18.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 3554efc4d2..d8a449589b 100644
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DNoException.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/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 70554ef19a..5b9fd1ed26 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DPreparedStatement.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/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 0182f152b0..4c674918be 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DResultSet.cxx,v $
- * $Revision: 1.25.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index c4e48b1966..68c4f37fd5 100644
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DStatement.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/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 171f10ccdb..c8fadc05e6 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DTable.cxx,v $
- * $Revision: 1.107.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 988a98f0bd..3d2a7f0419 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DTables.cxx,v $
- * $Revision: 1.27.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 62beb8f828..e3a295452c 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Dservices.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/connectivity/source/drivers/dbase/dbase.xcu b/connectivity/source/drivers/dbase/dbase.xcu
index 4c8a0413ef..ade141098c 100755
--- a/connectivity/source/drivers/dbase/dbase.xcu
+++ b/connectivity/source/drivers/dbase/dbase.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index f8bf4dd7b4..c094251c6c 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dindexnode.cxx,v $
- * $Revision: 1.21.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 37a88ef476..dded9086bc 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index eda89dd6f8..cae0a861db 100644
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LCatalog.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/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
index 92d78d44b8..f0e2e86858 100644
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ b/connectivity/source/drivers/evoab/LCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LCatalog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index c59404389c..bf2564e9d1 100644
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LColumnAlias.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/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
index 3803a39be5..57257f7069 100644
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LColumnAlias.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index 4837c1406b..87cd192f75 100644
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LColumns.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/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
index 865d4500f4..57ee63dacb 100644
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ b/connectivity/source/drivers/evoab/LColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LColumns.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/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index a7441cb0da..28a1a05f0d 100644
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LConfigAccess.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/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx
index 883af23001..9844108e59 100644
--- a/connectivity/source/drivers/evoab/LConfigAccess.hxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LConfigAccess.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 60107d6dbb..05abca56ba 100644
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LConnection.cxx,v $
- * $Revision: 1.12.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx
index 05191d923a..492056c355 100644
--- a/connectivity/source/drivers/evoab/LConnection.hxx
+++ b/connectivity/source/drivers/evoab/LConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LConnection.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/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index fbcf6826e3..e0cb7b86fb 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LDatabaseMetaData.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/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
index 7e60ece946..dc8155d5c4 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LDatabaseMetaData.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/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx
index 0d0fd4ea8f..c284deb60e 100644
--- a/connectivity/source/drivers/evoab/LDebug.cxx
+++ b/connectivity/source/drivers/evoab/LDebug.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LDebug.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/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx
index 10138f73e8..0cfc8f31c1 100644
--- a/connectivity/source/drivers/evoab/LDebug.hxx
+++ b/connectivity/source/drivers/evoab/LDebug.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LDebug.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/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index bc11ee5395..192cf9c286 100644
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LDriver.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
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index b3c5df824d..87eb6e1b03 100644
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LDriver.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/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 91dc6eb310..6847be0ddb 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LFolderList.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/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index 690c3bb140..e28a58a661 100644
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LFolderList.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/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index b1cd94cd86..298fa15756 100644
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LNoException.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/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
index c2f010d415..4d389ffd69 100644
--- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LPreparedStatement.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/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
index 5fa43b72d0..9e39e26e1e 100644
--- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LPreparedStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 2caecef296..5bd832dd0d 100644
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LResultSet.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/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx
index a9506ac267..e3539470d2 100644
--- a/connectivity/source/drivers/evoab/LResultSet.hxx
+++ b/connectivity/source/drivers/evoab/LResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LResultSet.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index 7993ca1691..08a3c5fae8 100644
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LServices.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/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx
index b71df43747..67133bb0aa 100644
--- a/connectivity/source/drivers/evoab/LStatement.cxx
+++ b/connectivity/source/drivers/evoab/LStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LStatement.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/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx
index 0d2c26b7f3..2f6ca19429 100644
--- a/connectivity/source/drivers/evoab/LStatement.hxx
+++ b/connectivity/source/drivers/evoab/LStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 959980492e..2f385fe480 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LTable.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/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx
index 20a65dba16..f607791d14 100644
--- a/connectivity/source/drivers/evoab/LTable.hxx
+++ b/connectivity/source/drivers/evoab/LTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LTable.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/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index 11ece8210a..c9dcc19c72 100644
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LTables.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/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx
index 656607193d..1bb8601884 100644
--- a/connectivity/source/drivers/evoab/LTables.hxx
+++ b/connectivity/source/drivers/evoab/LTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LTables.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/connectivity/source/drivers/evoab/evoab.xcu b/connectivity/source/drivers/evoab/evoab.xcu
index 947c639bc6..4c8e3cc43a 100755
--- a/connectivity/source/drivers/evoab/evoab.xcu
+++ b/connectivity/source/drivers/evoab/evoab.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 8982322513..31d654fd26 100644
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index 767bfdb3c5..7f0c2ae343 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EApi.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/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h
index 9ed2a42598..7a4b01b47f 100644
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EApi.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/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index 71e11c240f..5befa896a7 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NCatalog.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/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index 48f54f9a0e..8d5b7b3ad1 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NCatalog.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/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 88f14cfcf5..38b0f78261 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NColumns.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/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index c68f4a436d..0af2b73340 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NColumns.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 1f4d4a10dc..2f72f03dae 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NConnection.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/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 241109c08a..117f0c5d9a 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NConnection.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/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 879d52a2d9..d7c3a360c9 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 85050216d8..e991084d7a 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx
index 3371b4fd53..acc433dcbf 100644
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/connectivity/source/drivers/evoab2/NDebug.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NDebug.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/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx
index 3e7b77c4a2..ab37a5f476 100644
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ b/connectivity/source/drivers/evoab2/NDebug.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NDebug.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 2324ec7a7d..d27af4e24d 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NDriver.cxx,v $
- * $Revision: 1.6.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 9a8bb60f3f..b91e03b67f 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NDriver.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 3efcdc740e..09e64517d4 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index 965d9f2022..90f0bb0bbb 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index b227b0c232..8bd587b891 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -1,8 +1,8 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 3fbd7a730d..75c70745cb 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NResultSet.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 390d607a92..b76bafc426 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 2ead27743d..443b2a8db6 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NResultSetMetaData.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/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 8a38bc4689..b898b3e626 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 120ceb5248..b0a92dc609 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index b89973efa7..a2bac2fbcf 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -1,14 +1,11 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 7ffb161d2f..537ebff281 100644
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NTable.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/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx
index 84ecfed7ad..661fce5fca 100644
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NTable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 0109d9f126..cd719afd12 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NTables.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/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index dc3a8b268c..d828aff37a 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NTables.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/evoab2/evoab2.xcu b/connectivity/source/drivers/evoab2/evoab2.xcu
index e1adbab087..bda1fb8648 100755
--- a/connectivity/source/drivers/evoab2/evoab2.xcu
+++ b/connectivity/source/drivers/evoab2/evoab2.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 6d7ca92fbd..43600a379f 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/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/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 8dba811f7a..c5ffb03cd3 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FCatalog.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/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 2b5fd63ab8..8b1549d5fd 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FColumns.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/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 5ec55bd4ee..42df0d09b9 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FConnection.cxx,v $
- * $Revision: 1.51.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index d4a8b0d196..26c430a742 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaData.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/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index 337bc5e99b..7090fc1cbd 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDateFunctions.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/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 399ac16105..7f13e6be9e 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDriver.cxx,v $
- * $Revision: 1.14.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index 89fe915c4c..cca2ad604b 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FNoException.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/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 84e5ca0809..d37f46ffc9 100644
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FNumericFunctions.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/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 914dddc59e..91f8589db4 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPreparedStatement.cxx,v $
- * $Revision: 1.42.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 2a373922d6..ef0ae138a2 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FResultSet.cxx,v $
- * $Revision: 1.102.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 6c8f899575..0509f3e7db 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FResultSetMetaData.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/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 652d41d886..1776fba624 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FStatement.cxx,v $
- * $Revision: 1.44.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index c5a9429340..7958498303 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FStringFunctions.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/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 5f975fd0c3..a61aed913b 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FTable.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/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index b9233eb8b0..4e4bd90006 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FTables.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/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 0755988258..9d37b51d9a 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fanalyzer.cxx,v $
- * $Revision: 1.26.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index f970646455..32d90cd0c7 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fcode.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/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 81c4fc052c..c74f89cc1f 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fcomp.cxx,v $
- * $Revision: 1.30.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index b2a3097c40..6cc615a0cc 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index e35c3c0caf..9ad0504873 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: quotedstring.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/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 8a2699c66e..2588214724 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ECatalog.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/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index cf782340dd..c79c083b59 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EColumns.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/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 7f531bf41d..c06aa8c8b9 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EConnection.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/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 0edb3cd569..097037e9b6 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EDatabaseMetaData.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/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index b493c53aad..fa009c287e 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EDriver.cxx,v $
- * $Revision: 1.10.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 02d02e9f67..9a62a01395 100644
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EPreparedStatement.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/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index f88467cb08..25308942ec 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EResultSet.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/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index ec1da9f3cb..8b6a7de7e6 100644
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EStatement.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/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index eac86a5a41..2e6750f65b 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ETable.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/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index c0a1b0819b..74f86c6bd3 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ETables.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/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 67ff8afbe3..57a923667f 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Eservices.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/connectivity/source/drivers/flat/flat.xcu b/connectivity/source/drivers/flat/flat.xcu
index 6a22ed8662..ed29028ea9 100755
--- a/connectivity/source/drivers/flat/flat.xcu
+++ b/connectivity/source/drivers/flat/flat.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 071c8c0cc9..312e6d6c94 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 6935030925..14598940f6 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HCatalog.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/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index af044e3b04..b2e9f3fd0a 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HColumns.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/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 37eda3922d..06add41c54 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HConnection.cxx,v $
- * $Revision: 1.11.56.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index e00cb38da2..e3fbc313f9 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HDriver.cxx,v $
- * $Revision: 1.28.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx
index 8ed377d5cc..7232158f8f 100644
--- a/connectivity/source/drivers/hsqldb/HStorage.hxx
+++ b/connectivity/source/drivers/hsqldb/HStorage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HStorage.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index df209ff418..1849a40078 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HStorageAccess.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/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 712c38eea0..c6af914682 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HStorageMap.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/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index baed33e43c..0229841889 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTable.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/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 9b3c08aa28..5bb8f31eb4 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTables.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/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 4af3fc4ce3..7e9e47a9dd 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTerminateListener.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/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index fedf74a3ff..7f31387fee 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTerminateListener.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/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 23eb183ac4..a13a0a422d 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTools.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/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 41a97c0942..7a2fe0ed8e 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HUser.cxx,v $
- * $Revision: 1.6.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index a0501ba9ec..0ef8efcccc 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HUsers.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/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index b16eabc31e..aa98cd6997 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HView.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/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 9c20fc0404..890ab526dc 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HViews.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/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index bf1d5829f1..5f98d0da5b 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Hservices.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/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 6a43c9a86f..5f5115ef11 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageFileAccess.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/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 9eef51caa6..64c37796ce 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageNativeInputStream.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/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index a19aa44033..25395c35d9 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageNativeOutputStream.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/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 73d341f49f..eb0a6506a5 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: accesslog.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/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index e3f0655d60..b132321b29 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: accesslog.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/connectivity/source/drivers/hsqldb/hsqldb.xcu b/connectivity/source/drivers/hsqldb/hsqldb.xcu
index befa202f4c..8b24a28f92 100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.xcu
+++ b/connectivity/source/drivers/hsqldb/hsqldb.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index 7d0108fc54..052b603a72 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.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: hsqlui.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/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 027bfdeaeb..0e0189c5e2 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.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: hsqlui.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/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index c61e4b297b..e1a953055c 100644
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 10f1ebd4f7..09c120bbf8 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Array.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/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index e94e50ebf3..276943bb97 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Blob.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/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index c9f222827b..5018770aab 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Boolean.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/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 94cf7f58ea..149e0f964e 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CallableStatement.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/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index 0349e79303..6dddd2129c 100644
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Class.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/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index a1bbc0710a..4a64e71085 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Clob.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/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 531cc308f9..d20d41b80b 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ConnectionLog.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/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 7a13c7ed96..f06f884d10 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ContextClassLoader.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/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 55c8b69838..56f995eee5 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DatabaseMetaData.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/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index fa2e48d087..49acf2a320 100644
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 5134ffd775..ec160e579d 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DriverPropertyInfo.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/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 00029691ed..7e743bcb6d 100644
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Exception.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/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 17c9b54152..041567a94c 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: InputStream.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/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index c6809eb6cf..1b104840f2 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: JBigDecimal.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/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 17e8d2dbbe..fe6942b064 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: JConnection.cxx,v $
- * $Revision: 1.13.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index e1066776a5..5812f16541 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: JDriver.cxx,v $
- * $Revision: 1.43.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 049274c489..a94fa523d0 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: JStatement.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/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 72f3731f5a..d2e88e8397 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/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.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 7639357a41..15c30bdc41 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PreparedStatement.cxx,v $
- * $Revision: 1.24.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 73e77a658b..51803f142a 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Reader.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/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 18c8e3a434..dcb1404a3b 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/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.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 144ee27c7c..b6ccb8e5a4 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/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.36.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 6db88459b0..bcb4b3943d 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/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.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 09b477b060..f88bb1d5d7 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SQLException.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/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 516d743a4e..5ea7027946 100644
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SQLWarning.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/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index f11e6684a6..edae1d78ee 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/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.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index de6c3fe0a5..74f41d587c 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Throwable.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/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index fe66e881a7..2689ff9005 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Timestamp.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/connectivity/source/drivers/jdbc/jdbc.xcu b/connectivity/source/drivers/jdbc/jdbc.xcu
index 56dfcbc8cb..a8421f23f6 100755
--- a/connectivity/source/drivers/jdbc/jdbc.xcu
+++ b/connectivity/source/drivers/jdbc/jdbc.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 2f9875b6ec..28506fc34c 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jservices.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/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index fb37a30777..2de63f2c03 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index e4a79817f3..70384b7d71 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/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.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index a86eba5ab2..67cefc6d75 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KCatalog.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/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index ead590a28d..9146edd448 100644
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KCatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index 866c53d5c5..8eab989fb3 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KColumns.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/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index c7179a7b29..1fed6872bf 100644
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KColumns.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 94efe2ff8d..a7c740a8e1 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KConnection.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/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index fde955d2f1..dee40b1000 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KConnection.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index f36ad59a41..3c2e00a238 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KDEInit.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/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index feb57a3b58..5a98391bf4 100644
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KDEInit.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/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 2d0ee99d4f..0acbefff6d 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KDatabaseMetaData.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/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 5801980f03..376b9c598f 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KDatabaseMetaData.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 59398f2c14..cb916e3fad 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KDriver.cxx,v $
- * $Revision: 1.10.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index 049381a9e4..f4cd5a4508 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KDriver.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index f26b06d120..347b4a0e0c 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KPreparedStatement.cxx,v $
- * $Revision: 1.6.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index 65466545d9..a7e9fd48f0 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KPreparedStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 91ef3f6cae..eec8489941 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KResultSet.cxx,v $
- * $Revision: 1.9.46.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 151d8606a4..c98fc0e50e 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KResultSet.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/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 89175ade1a..2885fef265 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KResultSetMetaData.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/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index d01d62cd9b..555431d168 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KResultSetMetaData.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index afbb97a970..8bb3b96ad7 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KServices.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/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index d612b77976..72d840132c 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KStatement.cxx,v $
- * $Revision: 1.8.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index 7f6dc9adc2..512ca076dc 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index b529eaea1a..ef18190987 100644
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KTable.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/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx
index fa9849f3e1..4ecf2b082b 100644
--- a/connectivity/source/drivers/kab/KTable.hxx
+++ b/connectivity/source/drivers/kab/KTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KTable.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 82131b8538..95affd3c5e 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KTables.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/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index 0dd0901de6..2ed1afb08d 100644
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: KTables.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/kab.xcu b/connectivity/source/drivers/kab/kab.xcu
index c4bb50bb83..0cc515e4ee 100755
--- a/connectivity/source/drivers/kab/kab.xcu
+++ b/connectivity/source/drivers/kab/kab.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index 0bcf5f9dcc..bc074a1eab 100644
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kcondition.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/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index bc7700adfa..ee6a5b14d9 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kcondition.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/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index 6e5eaa378b..b4dfcd94dc 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kfields.cxx,v $
- * $Revision: 1.5.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index 5c65ea5114..43d8f1cd31 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kfields.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/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index 35c0cddd43..a4a580e23e 100644
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: korder.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/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index a990e67f99..d02a07c3f8 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: korder.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/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 2c0a86f856..98148a29e9 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 3305675c7a..f2e55f01b9 100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabAddressBook.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/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index 8360d57f2c..3fecf2d1af 100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabAddressBook.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 17b8e014cf..166bd21018 100755
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabCatalog.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/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index a73e7b83d9..2fe97df124 100755
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabCatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 3a80439ee9..1663d0d92d 100755
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabColumns.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/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
index f21d63908b..b484edcc82 100755
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabColumns.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index e70a5a7f56..0762879506 100755
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabConnection.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/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 437bbfddfd..9654a0035c 100755
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabConnection.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 95cf98cbd4..9a05f41a1d 100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabDatabaseMetaData.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/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 48d779623f..152ff3d1bd 100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabDatabaseMetaData.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 46b8ffcbe5..285767998f 100755
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabDriver.cxx,v $
- * $Revision: 1.4.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 030b57b246..5e83926552 100755
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabDriver.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index 48d6163173..e815142483 100644
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabGroup.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/connectivity/source/drivers/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx
index a252d4cd6b..0d9453a185 100644
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabGroup.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 2efd06665d..0fc2ef957b 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabHeader.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/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index ba9248025e..caa52a9a11 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabHeader.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 3f15250961..cc6ae0e8f0 100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabPreparedStatement.cxx,v $
- * $Revision: 1.3.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index 75330436f7..735c9f40a4 100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabPreparedStatement.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index 8b019726b6..3a9354721a 100755
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabRecord.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/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
index 72029582d0..fd40d3f442 100755
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabRecord.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 4d5c64b51d..09cb1f2f52 100755
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabRecords.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/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index 8e5d9c3ab2..f66282199e 100755
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabRecords.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 5a5d660c60..07a0e43bad 100755
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabResultSet.cxx,v $
- * $Revision: 1.3.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 37af9507c2..be83d81efc 100755
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabResultSet.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 60bdcdcc13..f4cb052354 100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabResultSetMetaData.cxx,v $
- * $Revision: 1.3.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index 4ce92a77d4..e3755910e2 100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabResultSetMetaData.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 4541df29b9..84bba28bb9 100755
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabServices.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/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 29c8477234..c04d4ff3f7 100755
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabStatement.cxx,v $
- * $Revision: 1.3.56.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 6d2966a60c..42d941f21e 100755
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabStatement.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index 0b40917851..37a11b9a9f 100755
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabTable.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/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index 8b8bc955c3..f1b3a9b47c 100755
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabTable.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 7fa211ad76..6c86e2d704 100755
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabTables.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/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
index 01a309a624..5e3ea2be9c 100755
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MacabTables.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/macab.xcu b/connectivity/source/drivers/macab/macab.xcu
index ead6b5fb23..2418698c3d 100755
--- a/connectivity/source/drivers/macab/macab.xcu
+++ b/connectivity/source/drivers/macab/macab.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 78771cdfe2..14c58222f7 100755
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macabcondition.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/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 2a03483dc2..89dda9c787 100755
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macabcondition.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index 7cce344c95..f1b1bf9822 100755
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macaborder.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/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
index e46cd87497..c4bf067839 100755
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macaborder.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 7d89e0aba0..0975505e6a 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macabutilities.hxx,v $
- * $Revision: 1.3.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 8edc8951fa..811f1fabb1 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index 0ac15a904e..10c46d90f9 100644
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MCatalog.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/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx
index ad9cef4818..b4dd3f865b 100644
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MCatalog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 3eb6d449bb..9be306bd31 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MColumnAlias.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/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index e98a398a95..f4566eb2c6 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MColumnAlias.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index 9e6df941e3..f056c86ab1 100644
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MColumns.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/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx
index 9d92cda829..e791c510ac 100644
--- a/connectivity/source/drivers/mozab/MColumns.hxx
+++ b/connectivity/source/drivers/mozab/MColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MColumns.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/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 22d196e3c9..ea17856b9f 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MConfigAccess.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/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx
index 15fab613fb..6d642deb82 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MConfigAccess.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/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index f84b150e86..163a102a9f 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MConnection.cxx,v $
- * $Revision: 1.28.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 9fcaa1b126..494c7798ff 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MConnection.hxx,v $
- * $Revision: 1.18.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,18 +27,18 @@
 #ifndef CONNECTIVITY_SCONNECTION_HXX
 #define CONNECTIVITY_SCONNECTION_HXX
 
-#include "connectivity/CommonTools.hxx"

-

-#include "MCatalog.hxx"

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

-#include "TConnection.hxx"

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

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

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

+
 #include <cppuhelper/weakref.hxx>
 
 #include <memory>
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index ecfe0ea9c3..e67e1faa68 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MDatabaseMetaData.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/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
index 32cbec4b1e..f5dd170838 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MDatabaseMetaData.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/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 340e6ed385..ac4e3be969 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MDriver.cxx,v $
- * $Revision: 1.19.56.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index d7f68ff7bc..36646c1106 100644
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MDriver.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/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
index d2303ede6c..bcb1233b82 100644
--- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MExtConfigAccess.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index 07e7551a8a..59d3657edd 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MPreparedStatement.cxx,v $
- * $Revision: 1.14.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index d1d835c5ac..72d349590f 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MPreparedStatement.hxx,v $
- * $Revision: 1.8.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 081ff8369f..932e191f0c 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MResultSet.cxx,v $
- * $Revision: 1.33.22.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index d93a723213..1d1e0f7433 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MResultSet.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/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index a4d468d795..073d29b7d6 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MResultSetMetaData.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/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index e525ad3599..018df117c0 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MResultSetMetaData.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/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 212becb2b9..7845c79e4b 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MServices.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/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 19f32d0cb5..acc55c7b9c 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MStatement.cxx,v $
- * $Revision: 1.18.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 97ae08aa70..f19668e2f1 100644
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MStatement.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/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx
index 29aadaac50..2b2d23bc03 100644
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MTable.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/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx
index f2e928f085..0fee248f39 100644
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MTable.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/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index c6bac0f566..31ecb8d9a6 100644
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MTables.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/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx
index 8d6eb5a419..dfdbfae3d8 100644
--- a/connectivity/source/drivers/mozab/MTables.hxx
+++ b/connectivity/source/drivers/mozab/MTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MTables.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/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index d504f75224..c07547ebef 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MMozillaBootstrap.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/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 7f0f8be410..17d2387df7 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MMozillaBootstrap.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 973ae1ddff..5948ac028c 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSFolders.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/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index 1bc4b9c2c2..8c3c21bf62 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSFolders.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/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index bd4bfddb5f..7c1deacce2 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSINIParser.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/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 13cc611350..7c2c5b88af 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSINIParser.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/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index f929108dd1..764c3ecc28 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSInit.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/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index deccb2f398..3c30780c21 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSInit.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/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index f33cc519b9..7a77917502 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfile.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/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
index 64614a666d..8e3a710d51 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfile.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/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index 370b02cc1c..6d6fa728ae 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfileDirServiceProvider.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/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
index 803234b4ba..579e0f1f80 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfileDirServiceProvider.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/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 26fab98748..9bea0e73f2 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfileDiscover.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/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 8ae8b1caab..0f57d1b940 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfileDiscover.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/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
index 67d405915e..cf1b92bafc 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfileManager.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/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 0f0bc24f40..755a98b426 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSProfileManager.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/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index fce47b0d26..8fac0312bc 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSRunnable.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/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index a1c994a3f9..8af30915c2 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSRunnable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 00f76ddeb8..78c1e39578 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index 75614c952e..f052bbd0d1 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mozilla_nsinit.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/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 7733dd9add..652152aa6f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mozilla_nsprofile.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/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index 7e973769d2..51ea672456 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mozilla_nsprofiledirserviceprovider.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/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index ac1d351937..2d89962ed3 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mozilla_profile_discover.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/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 61d90e1d34..76006b74d0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mozilla_profilemanager.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/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
index 640c59e123..4c225fd510 100644
--- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: post_include_windows.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/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
index e60182e112..c274a1b611 100644
--- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pre_include_windows.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/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 76161dc321..ffcc41af75 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
index 28b56ec2a8..bf1ed5b8ae 100644
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ b/connectivity/source/drivers/mozab/makefile_mozab.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/connectivity/source/drivers/mozab/mozab.xcu b/connectivity/source/drivers/mozab/mozab.xcu
index 7d3b78e3fe..837e180ba5 100755
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/mozab/mozab2.xcu b/connectivity/source/drivers/mozab/mozab2.xcu
index 33e0bebcd4..898c099fc7 100755
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index f7e8d7750b..04ff7a4ca2 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MDatabaseMetaDataHelper.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/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 48ffc83ef8..610d2d2a0a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MDatabaseMetaDataHelper.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/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
index 04f276e70e..3db2603230 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MErrorResource.hxx,v $
- * $Revision: 1.3.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index ba6abb3f17..da7944910a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -1,32 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-                    { NULL, NULL, NULL, NULL }

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

-

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

-    {

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

-

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

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

-

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

-        {

-            _retval.SetIsVoid( PR_TRUE );

-        }

-        else

-        {

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

-        }

-

-        return NS_OK;

-    }

-

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

-    {

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

-        (void)aProperty;

-        (void)aCount;

-        (void)aAttrs;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

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

-    {

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

-

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

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

-

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

-        {

-            _retval.SetIsVoid( PR_TRUE );

-        }

-        else

-        {

-            sal_Int32 tokenPos(0);

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

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

-        }

-

-        return NS_OK;

-    }

-

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

-    {

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

-        (void)aProperty;

-        (void)aAttributeList;

-        (void)allowInconsistencies;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

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

-    {

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

-        (void)aAttribute;

-        (void)_retval;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

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

-    {

-        const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );

-

-        ::rtl::OStringBuffer aAllAttributes;

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

-                loop != rPropertyMap.end();

-                ++loop

-            )

-        {

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

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

-                aAllAttributes.append( ',' );

-        }

-

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

-        return NS_OK;

-    }

-

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

-    {

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

-        return NS_OK;

-    }

-

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

-    {

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

-        (void)aPrefBranchName;

-        return NS_ERROR_NOT_IMPLEMENTED;

-    }

-

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

-    {

-        NS_ENSURE_ARG_POINTER( aMessage );

-        NS_ENSURE_ARG_POINTER( aCard );

-

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

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

-

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

-                // retrieve the values for the current attribute

-                PRUint32 valueCount = 0;

-                PRUnichar** values = NULL;

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

-                if ( NS_FAILED( rv ) )

-                    // try the next attribute

-                    continue;

-

-                if ( valueCount )

-                {

-                    CardPropertySetter propSetter = prop->second.PropSetter;

-                    OSL_ENSURE( propSetter,

-                        "MLdapAttributeMap::SetCardPropertiesFromLDAPMessage: "

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

-                    if ( propSetter )

-                    {

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

-                    }

-

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

-                    // map to it

-                    break;

-                }

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

-        return NS_OK;

-    }

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

-

-        ::rtl::OUString resultValue;

-

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

-            if ( propSetter )

-            {

-        // PRUnichar != sal_Unicode in mingw

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

-            }

-            else

-            {

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

-                {

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

-                else

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

-            }

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

-            if ( propGetter )

-            {

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

-

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

-            else

-            {

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

-                {

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

-                else

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

-            }

-

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

+
 #ifndef CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
 #define CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
index 6941f85b23..a5ce050ba3 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSDeclares.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/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index 57eec5adb7..e94c44662d 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSInclude.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/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 42f0821d86..f2d17b531a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSMozabProxy.cxx,v $
- * $Revision: 1.10.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index 3b6ccf94a1..b9a6142172 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSMozabProxy.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/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index 9d5239b8e9..3b572a8e0d 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSTerminateListener.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/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
index 792f246943..647bb2486c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNSTerminateListener.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index 3e8c63d467..e55ef5a2cb 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNameMapper.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/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
index 167e8bdb7c..0f16e5c330 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MNameMapper.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/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index f50ad7d4a8..ffc7851ae1 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MQuery.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/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 685f8e3152..c5d3a7bc91 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MQuery.hxx,v $
- * $Revision: 1.16.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 08830ee3a1..a1eeec5e31 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MQueryHelper.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/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index a33fe7f5ca..cd4f31e047 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MQueryHelper.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/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 43c6d38728..e1671c3b22 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MTypeConverter.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/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index 9b2264ff57..f0fe0285c9 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MTypeConverter.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index 1e5b39e0f1..4c3e5380f4 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index 544e927b6f..d3c5dbc6dd 100644
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: post_include_mozilla.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/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index 29da16b718..5321259993 100644
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pre_include_mozilla.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/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 703cdc7b58..a531648905 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YCatalog.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/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index efbabbe473..3891c0262a 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YColumns.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/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index a9ed1c9c8d..2343a3adc4 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YDriver.cxx,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/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 5e4cff3459..8b91207002 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YTable.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/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 9af4b9f630..d147a66793 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YTables.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/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index a79d486b9e..e74dd7525a 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YUser.cxx,v $
- * $Revision: 1.6.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index 00786e4fd3..e02e6320cf 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YUsers.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/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 3a2e133421..b850f4cc3f 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YViews.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/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index bea4162a69..5262fa400a 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Yservices.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/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index 0d46f0c35d..af486c2938 100644
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/mysql/mysql.xcu b/connectivity/source/drivers/mysql/mysql.xcu
index 7ea033d7e4..21c5795db0 100755
--- a/connectivity/source/drivers/mysql/mysql.xcu
+++ b/connectivity/source/drivers/mysql/mysql.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 7a3cef288b..d693a9a298 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OFunctions.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/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index f99ce7a383..cfbf1161c1 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ORealDriver.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/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index beabeae1da..82df491e50 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.4 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_OREALDRIVER_HXX
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index 8f37b6185d..09052f9d77 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/drivers/odbc/odbc.xcu b/connectivity/source/drivers/odbc/odbc.xcu
index 5c8d8c07d5..f8efe2eed4 100755
--- a/connectivity/source/drivers/odbc/odbc.xcu
+++ b/connectivity/source/drivers/odbc/odbc.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 0bd66dbe06..2d2b468bb2 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oservices.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/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 23fac14a35..69d944c1b3 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OConnection.cxx,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 6874e4e69f..f90462572a 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODatabaseMetaData.cxx,v $
- * $Revision: 1.35.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 20e705ba0e..727238c372 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODatabaseMetaDataResultSet.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/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 4f1f2d4cca..1cd3aa05af 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODriver.cxx,v $
- * $Revision: 1.18.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 1fe1e3525e..5ed46566e5 100644
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OPreparedStatement.cxx,v $
- * $Revision: 1.49.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 2544d08b8f..84d57eae9a 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OResultSet.cxx,v $
- * $Revision: 1.66 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 26fa1e13a0..8345fb2edd 100644
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OResultSetMetaData.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/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 914363be48..92db3d375a 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OStatement.cxx,v $
- * $Revision: 1.40.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index c5506533ae..bf4bfa65e9 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OTools.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/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 64ffd1f72f..798517c8f9 100644
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx
index 9f19338184..b2d962adb3 100644
--- a/connectivity/source/inc/AutoRetrievingBase.hxx
+++ b/connectivity/source/inc/AutoRetrievingBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AutoRetrievingBase.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index b42280117f..531f0b02e7 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaDataResultSet.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/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index c640b19c08..a5a2e05a63 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaDataResultSetMetaData.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/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index e915df56df..46b3177bc7 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OColumn.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/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
index dd6150f4eb..cec0a6a843 100644
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/source/inc/OSubComponent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OSubComponent.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/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 5840322787..e8d508ee1b 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OTypeInfo.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/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index 1fa59178df..53e8b073bf 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaDataResultSet.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/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index e966722a24..84d351e75c 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RowFunctionParser.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 23923292bb..7b7bddebed 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TConnection.hxx,v $
- * $Revision: 1.13.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 3e6d151be5..72b28b8ffd 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TDatabaseMetaDataBase.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/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 2432b9ff58..1a8d9245fc 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TKeyValue.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/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx
index 34ee3a5b40..6f91c44bad 100644
--- a/connectivity/source/inc/TPrivilegesResultSet.hxx
+++ b/connectivity/source/inc/TPrivilegesResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TPrivilegesResultSet.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx
index 642d3fff06..e9f0c07788 100644
--- a/connectivity/source/inc/TResultSetHelper.hxx
+++ b/connectivity/source/inc/TResultSetHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TResultSetHelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 0897440d9a..a9864d8111 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TSkipDeletedSet.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/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index e5614edbaa..c7a7cefd85 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TSortIndex.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/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx
index 5aa4ceb134..4956c0cc29 100644
--- a/connectivity/source/inc/UStringDescription_Impl.hxx
+++ b/connectivity/source/inc/UStringDescription_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: UStringDescription_Impl.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/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx
index fdfce1c0bc..03e6461cbf 100644
--- a/connectivity/source/inc/adabas/BCatalog.hxx
+++ b/connectivity/source/inc/adabas/BCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BCatalog.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/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx
index f153bee7f8..be4e7b1177 100644
--- a/connectivity/source/inc/adabas/BColumn.hxx
+++ b/connectivity/source/inc/adabas/BColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BColumn.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx
index b9ab2b0b58..95200bb911 100644
--- a/connectivity/source/inc/adabas/BColumns.hxx
+++ b/connectivity/source/inc/adabas/BColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BColumns.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/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx
index dfc7f24806..b714394d29 100644
--- a/connectivity/source/inc/adabas/BConnection.hxx
+++ b/connectivity/source/inc/adabas/BConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BConnection.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/connectivity/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
index 3cf5961afc..420fb91ea5 100644
--- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
+++ b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BDatabaseMetaData.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/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 794c6122f6..34f6f43233 100644
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BDriver.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/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx
index a2a38346b9..00d988447d 100644
--- a/connectivity/source/inc/adabas/BGroup.hxx
+++ b/connectivity/source/inc/adabas/BGroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BGroup.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx
index 97b3db5b58..27834518d7 100644
--- a/connectivity/source/inc/adabas/BGroups.hxx
+++ b/connectivity/source/inc/adabas/BGroups.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BGroups.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/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx
index 04e99e6c9a..309cbc2db4 100644
--- a/connectivity/source/inc/adabas/BIndex.hxx
+++ b/connectivity/source/inc/adabas/BIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndex.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/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx
index 48fc651c37..faac8baa19 100644
--- a/connectivity/source/inc/adabas/BIndexColumn.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndexColumn.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx
index 4e07f39878..eee745d45b 100644
--- a/connectivity/source/inc/adabas/BIndexColumns.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndexColumns.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/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx
index 41ada50221..de9c362b89 100644
--- a/connectivity/source/inc/adabas/BIndexes.hxx
+++ b/connectivity/source/inc/adabas/BIndexes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BIndexes.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/connectivity/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx
index 738fc1602a..469ed88616 100644
--- a/connectivity/source/inc/adabas/BKeys.hxx
+++ b/connectivity/source/inc/adabas/BKeys.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BKeys.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/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index a9a863eeda..4be9678e5a 100644
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BPreparedStatement.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/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx
index a7f977b1d7..d8c33bc25f 100644
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BResultSet.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/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
index 7973774627..6b4ec5042c 100644
--- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BResultSetMetaData.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/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 765aefdbff..1d141a47ac 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BStatement.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/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx
index 8357d96bfd..e83d7a0647 100644
--- a/connectivity/source/inc/adabas/BTable.hxx
+++ b/connectivity/source/inc/adabas/BTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BTable.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/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx
index 05dc236ae8..3ce57eb933 100644
--- a/connectivity/source/inc/adabas/BTables.hxx
+++ b/connectivity/source/inc/adabas/BTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BTables.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/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx
index ee768786af..1cfb7162df 100644
--- a/connectivity/source/inc/adabas/BUser.hxx
+++ b/connectivity/source/inc/adabas/BUser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BUser.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/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx
index df7f4a45df..72f244d93c 100644
--- a/connectivity/source/inc/adabas/BUsers.hxx
+++ b/connectivity/source/inc/adabas/BUsers.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BUsers.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/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx
index 91630c76d0..df1c233958 100644
--- a/connectivity/source/inc/adabas/BViews.hxx
+++ b/connectivity/source/inc/adabas/BViews.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BViews.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/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 7a9c9db5fc..da6f836b3a 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ACallableStatement.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/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index 7422683b11..bd6f5bee70 100644
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ACatalog.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/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx
index 98c2a7f83c..25b9844ba3 100644
--- a/connectivity/source/inc/ado/ACollection.hxx
+++ b/connectivity/source/inc/ado/ACollection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ACollection.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/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index a5bdbdc422..f630112767 100644
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AColumn.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/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index e069b5325c..8a41b5e883 100644
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AColumns.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/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 4a5ee92dba..84a1839022 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AConnection.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/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 917c65e971..4f8c4421ae 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaData.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/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 4c99835f62..8bf019237e 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaDataResultSet.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/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 089ac711cb..7f7c1c80fa 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADatabaseMetaDataResultSetMetaData.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/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 3305d65beb..234c2a549a 100644
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ADriver.hxx,v $
- * $Revision: 1.4.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index 1de05e18f9..8707d81ca6 100644
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AGroup.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/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index 65c572b074..c6f9990fc9 100644
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AGroups.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/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index f33cc499f0..525bace0c2 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AIndex.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/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx
index 0bd6ec2b92..a15950cee4 100644
--- a/connectivity/source/inc/ado/AIndexColumn.hxx
+++ b/connectivity/source/inc/ado/AIndexColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AIndexColumn.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx
index a2059031db..6d0194da2f 100644
--- a/connectivity/source/inc/ado/AIndexColumns.hxx
+++ b/connectivity/source/inc/ado/AIndexColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AIndexColumns.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/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index cb36275e26..ac949c4e03 100644
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AIndexes.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/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index d1611f30d5..e8649c6671 100644
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKey.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/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx
index 2a050e0560..2d316016c3 100644
--- a/connectivity/source/inc/ado/AKeyColumn.hxx
+++ b/connectivity/source/inc/ado/AKeyColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKeyColumn.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx
index 5e10725d63..1743509afc 100644
--- a/connectivity/source/inc/ado/AKeyColumns.hxx
+++ b/connectivity/source/inc/ado/AKeyColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKeyColumns.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/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index 87c91a46a1..c78c32d22c 100644
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AKeys.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/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 8f0750b863..c4a104bb2f 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: APreparedStatement.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/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index bf28aecc70..a44abe4b56 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AResultSet.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/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 39872c598e..92acfae638 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AResultSetMetaData.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/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 251ad6e754..a3cab417f3 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AStatement.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/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index 77501ee1b8..ede98fd31e 100644
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ATable.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/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 68f36c7d3a..d5cd8bacda 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ATables.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/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 6d55de9b9f..179eac6d22 100644
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AUser.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/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index d9b26973f6..23cf72672c 100644
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AUsers.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/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index 6df64d1196..4d17ef325f 100644
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AView.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/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 15d7c368fb..51954745b9 100644
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AViews.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/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index f53985d007..76ff697a09 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Aolevariant.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/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 5453fc508a..77363553e9 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Aolewrap.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/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 453f1ae4b3..8154975bb8 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Awrapado.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/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 4c5de413ab..4d356c60d3 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Awrapadox.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/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 164e93d5c0..8fe2499db6 100644
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WrapCatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index 2bb200f4e7..6401310777 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WrapColumn.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/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index c1bc619cbb..fbc49ea97c 100644
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WrapIndex.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 0966fb5752..4df533d265 100644
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WrapKey.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 55caac3547..5549c611d6 100644
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WrapTable.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx
index 1628f0c78a..d41841d040 100644
--- a/connectivity/source/inc/ado/WrapTypeDefs.hxx
+++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WrapTypeDefs.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index e198ba54b0..e040089eb5 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adoimp.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/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index 9be1cabaa4..536b89daa5 100644
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CCatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx
index 94b62870ae..91f2c77bad 100644
--- a/connectivity/source/inc/calc/CColumns.hxx
+++ b/connectivity/source/inc/calc/CColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CColumns.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/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index a6e2d71ed9..1b443a8b16 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CConnection.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index b140b94599..9e45dad128 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CDatabaseMetaData.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index de32e4b257..c1ab1163cb 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CDriver.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx
index 8523c0f6d0..b1b6a0b7af 100644
--- a/connectivity/source/inc/calc/CPreparedStatement.hxx
+++ b/connectivity/source/inc/calc/CPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CPreparedStatement.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/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx
index dc4f19194a..241a9d2213 100644
--- a/connectivity/source/inc/calc/CResultSet.hxx
+++ b/connectivity/source/inc/calc/CResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CResultSet.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/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx
index 5ed5c39e33..43e8288160 100644
--- a/connectivity/source/inc/calc/CStatement.hxx
+++ b/connectivity/source/inc/calc/CStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 373afc0926..34dfb1d733 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CTable.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/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 0c7618033e..47b6b56d00 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CTables.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/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index d93e84007b..ad9bff46dc 100644
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DCatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index 499157db8b..6e9ffb781d 100644
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DCode.hxx,v $
- * $Revision: 1.3.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index e98c96a567..d5129be6a1 100644
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DColumns.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/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 7c100a0655..2a167ca5e2 100644
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DConnection.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/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index e7a9d25baa..c74a92e8e6 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DDatabaseMetaData.hxx,v $
- * $Revision: 1.10.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index f2f6f682b7..45b459202e 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DDatabaseMetaDataResultSet.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/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
index 270c7ba2fe..e0a2e57e72 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DDatabaseMetaDataResultSetMetaData.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/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index e1c44c82fe..7459356d17 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DDriver.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index af245cc3fb..c2501235a2 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndex.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/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 193a214a16..5685013ebe 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexColumns.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/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 3faf2a730b..92dc2349bf 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexIter.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 9bbbee0e0d..561d779fb6 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexPage.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index e5929518b2..39b093eac6 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DIndexes.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/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 98d2b893ac..d851641bdb 100644
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DPreparedStatement.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/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index f2a3dd6424..e45a5cac37 100644
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DResultSet.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/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index 9f2a46198f..4306cab1aa 100644
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 9f76e2d03e..dba75ba0d9 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DTable.hxx,v $
- * $Revision: 1.41.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 092ee1b744..115bd46315 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DTables.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/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index deb67e1d0e..a6bbe82b93 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dindexnode.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/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h
index 51e69a41a6..5d4e4243a1 100644
--- a/connectivity/source/inc/diagnose_ex.h
+++ b/connectivity/source/inc/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index e8146596a8..62788b975a 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FCatalog.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/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 4562a9b839..a378c2436f 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FColumns.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/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 774979e898..0879a8f6de 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FConnection.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index c0dd0fe8cd..39e9aed64a 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDatabaseMetaData.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/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index a02cfac29c..6264f61a37 100644
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDateFunctions.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index eb563a40e9..7f0cf85ca4 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FDriver.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/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index 6ba79cc279..b3fd41122b 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FNumericFunctions.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index dbb66b1127..cf53848458 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPreparedStatement.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/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index bfabd3d730..ebd76a8f7d 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FResultSet.hxx,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/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 966fbb3614..ef29ec0196 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FResultSetMetaData.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/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index a398225bd8..a4baff55eb 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FStatement.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index b1831bb608..ab68e575b8 100644
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FStringFunctions.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 5fa3af288e..c58d540164 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FTable.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/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index 150d36a732..29ff1c8820 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FTables.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/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 747c78f08a..e56dc8c649 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fanalyzer.hxx,v $
- * $Revision: 1.13.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index de07555d40..ea64cb0081 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fcode.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/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 5ac2f92902..11049767a7 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fcomp.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/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx
index 42f7da2958..032cfd61e3 100644
--- a/connectivity/source/inc/file/filedllapi.hxx
+++ b/connectivity/source/inc/file/filedllapi.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: $
-*
-* $Revision: $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FILEDLLAPI_HXX
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 1ad9c3ec26..c7c44913b5 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: quotedstring.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx
index 27c1f69bd8..b0d0c1d914 100644
--- a/connectivity/source/inc/flat/ECatalog.hxx
+++ b/connectivity/source/inc/flat/ECatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ECatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx
index a21c47078a..8bf58a2b97 100644
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EColumns.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/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 92330eb259..b67677ad52 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EConnection.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/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index 2a4eca1715..4e94cc5f6d 100644
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EDatabaseMetaData.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/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 9c87e9c624..ffb39521d7 100644
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EDriver.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index f3b9830328..13f85dbf44 100644
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EPreparedStatement.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/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index a8e2391e21..c63d857503 100644
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EResultSet.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/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index bb03158414..b4d8e5f79f 100644
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 24c0b150a0..85bdf2d86e 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ETable.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/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index ecd864a481..5d5a2511dd 100644
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ETables.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/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 22bca59017..5708ac539c 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HCatalog.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/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index f2d6b56ad7..14d9698e00 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HColumns.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/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index c97a0dac6b..2cb6cd5238 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HConnection.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/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 9448d925b5..0bb158f07c 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HDriver.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/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 8303d6aeae..51421e86bc 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HStorageAccess.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index b540d95005..c54afce3e6 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HStorageMap.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/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index 9bf144b19c..4102b78878 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTable.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/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 96d33975ef..df572bd9f9 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTables.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/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index f11daee8a1..a5e55b8b8e 100644
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HTools.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index de8bf04d35..a33258c6f9 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HUser.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/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 89a54a4334..1f1d69906b 100644
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HUsers.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/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 4e820fe2d3..3efb5febbc 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HView.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index 41cab0a46c..6bd3d3d539 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HViews.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/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx
index 4fbf85963e..9f10e6164f 100644
--- a/connectivity/source/inc/internalnode.hxx
+++ b/connectivity/source/inc/internalnode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: internalnode.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index a84c81cb62..4770053d25 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ContextClassLoader.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index af3b968a57..e8ed863b3b 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GlobalRef.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index de6e11e250..34eae94759 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LocalRef.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 368b48fa2f..918ca7678b 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: InputStream.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index c8f68c5acc..584de41c45 100644
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Reader.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 8a4cacdc63..a63b1ed72e 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Boolean.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index 77a8015bc8..cbf46ad3a7 100644
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Class.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index 15c2df6089..9619b28216 100644
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Exception.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 95fa5b9f71..95e464e592 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/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.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 1c8443e736..157a4d474e 100644
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/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 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 360d1aa7d3..aa96d89fb4 100644
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Throwable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 00f5673e4a..a2f7c7be5b 100644
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BigDecimal.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index a6d1cf695b..ec044db382 100644
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Array.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index 87375866b1..c0a257028a 100644
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Blob.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index 5be7d02577..dab15e6c01 100644
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CallableStatement.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/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index bcb040f49e..86323b0287 100644
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Clob.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 713433d842..b388c5838e 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Connection.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/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 7c3d10df2b..31de60bf5f 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ConnectionLog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index 90420ba6f5..c1a918ba15 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DatabaseMetaData.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/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 925f657f73..5921c4e9dd 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Driver.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/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 3301672f8a..6a76135459 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DriverPropertyInfo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index 1f675ffe1a..e3b1bb354b 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: JStatement.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 2a1429bb9d..6cae07fadb 100644
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PreparedStatement.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/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index e52e4dc971..b8b9a53398 100644
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/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/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index f1b2d7857d..be6774db09 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/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.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 84b799628b..e923ae833a 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index f867394c45..19c8a12b6b 100644
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SQLException.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index 0606befa89..a5591b525f 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SQLWarning.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index 83e6a728f9..1944dc4aa8 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Timestamp.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/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 897a5ac572..b917c0dd0c 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/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.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index 201784aa72..524b13359e 100644
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index ba3af22952..bada9d0d23 100644
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/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/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index 3a91802657..c4867676f3 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YCatalog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 882f710a9e..e51ae3bc40 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YColumns.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/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 45d2fb8ab8..5081e75a98 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YDriver.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/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 15bddc212a..7fafdd2883 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YTable.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/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index c17358dd4a..93c05658b0 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YTables.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/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index e9f5fab811..ff79d2699c 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YUser.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index f173c55d4b..f073de9aae 100644
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YUsers.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/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 2a7fde449b..a8083f764f 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: YViews.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/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index a2b5a4cceb..a405f40134 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OBoundParam.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/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 1b0339a742..1629339898 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OConnection.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 114c515737..46c412c279 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODatabaseMetaData.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/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 596ebaad9d..7dddc9af81 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODatabaseMetaDataResultSet.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/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx
index 251ddccd1d..c6c88e0c2c 100644
--- a/connectivity/source/inc/odbc/ODefs3.hxx
+++ b/connectivity/source/inc/odbc/ODefs3.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODefs3.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index b395b022b9..5568b5eb27 100644
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ODriver.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/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 89bf5ba34e..0cff012b5e 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OFunctiondefs.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/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index 9a6d07c505..c862541abf 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OFunctions.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/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index e3b3592773..1e2c9cb46a 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OPreparedStatement.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/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index b5b41aeb14..a2b01c802e 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OResultSet.hxx,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/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 7b936a3de1..77843a83ca 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OResultSetMetaData.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/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 4e3547e79b..379170a56d 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OStatement.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/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 1f81538d6d..bc4ac1cfbb 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OTools.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/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
index 5d716c2ca0..1b12dbb369 100644
--- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx
+++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: $
-*
-* $Revision: $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 8bdaf5b3b6..282b3cac1f 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyids.hxx,v $
- * $Revision: 1.20.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc
index d8956e6f46..edceb2658c 100644
--- a/connectivity/source/inc/resource/adabas_res.hrc
+++ b/connectivity/source/inc/resource/adabas_res.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: adabas_res.hrc,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
index d24afa3829..115936ea37 100644
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ b/connectivity/source/inc/resource/ado_res.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: ado_res.hrc,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index 9487dd585c..fbb86e5fa4 100644
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.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: calc_res.hrc,v $
- * $Revision: 1.3.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index bccdc70ce1..543231c4e1 100644
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.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: common_res.hrc,v $
- * $Revision: 1.3.56.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 83f5b7ed8c..45f8399259 100644
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.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: conn_shared_res.hrc,v $
- * $Revision: 1.5.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index c191451ffc..698f31dd7a 100644
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.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: dbase_res.hrc,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
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
index 2950cbc0d5..73f6214c24 100644
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ b/connectivity/source/inc/resource/evoab2_res.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: evoab2_res.hrc,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
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
index 1cc1c857eb..b5b7b98073 100644
--- a/connectivity/source/inc/resource/file_res.hrc
+++ b/connectivity/source/inc/resource/file_res.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: file_res.hrc,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index e649cd9786..c2b1f07769 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.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: hsqldb_res.hrc,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/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
index 0919378e34..e12e91516a 100644
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ b/connectivity/source/inc/resource/jdbc_log.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: jdbc_log.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/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
index e041b08c2f..789d4a832d 100644
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ b/connectivity/source/inc/resource/kab_res.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: kab_res.hrc,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
index e53ff50826..fca426111c 100644
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ b/connectivity/source/inc/resource/macab_res.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: macab_res.hrc,v $
- * $Revision: 1.1.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index 1cc6a66a93..30aaa791f7 100644
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.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: mozab_res.hrc,v $
- * $Revision: 1.3.56.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index e315808c59..e20fccc453 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sharedresources.hxx,v $
- * $Revision: 1.3.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index a2afa33fe8..661aae42ae 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlscan.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/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index 7cb514cd36..e72dfc78bc 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index a305d18e4b..353605e478 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mdrivermanager.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/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index ba5dbb795b..d4fbe6f46e 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mdrivermanager.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index d6a3562564..464015f937 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mregistration.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/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 8eca29dfb5..3b62210f52 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PColumn.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/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 8ef9498008..f65548eb92 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: internalnode.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/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk
index bd84092f9c..98eb468590 100644
--- a/connectivity/source/parse/makefile.mk
+++ b/connectivity/source/parse/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,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/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 1680516e8d..4151314d36 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -3,14 +3,10 @@
 //
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 // 
-// Copyright 2008 by Sun Microsystems, Inc.
+// Copyright 2000, 2010 Oracle and/or its affiliates.
 //
 // OpenOffice.org - a multi-platform office productivity suite
 //
-// $RCSfile: sqlbison.y,v $
-//
-// $Revision: 1.66.6.5 $
-//
 // This file is part of OpenOffice.org.
 //
 // OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index e365fdec1e..77544ece30 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -4,14 +4,10 @@
 //
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 // 
-// Copyright 2008 by Sun Microsystems, Inc.
+// Copyright 2000, 2010 Oracle and/or its affiliates.
 //
 // OpenOffice.org - a multi-platform office productivity suite
 //
-// $RCSfile: sqlflex.l,v $
-//
-// $Revision: 1.35 $
-//
 // This file is part of OpenOffice.org.
 //
 // OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 3cb4b821cd..a1a2fee732 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqliterator.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/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 568b8bd78c..8b6b507638 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlnode.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/connectivity/source/parse/wrap_sqlbison.cxx b/connectivity/source/parse/wrap_sqlbison.cxx
index 554beadad3..5a24a439e9 100644
--- a/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/connectivity/source/parse/wrap_sqlbison.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrap_sqlbison.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/connectivity/source/parse/wrap_sqlflex.cxx b/connectivity/source/parse/wrap_sqlflex.cxx
index e713abad02..b72ffdc886 100644
--- a/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/connectivity/source/parse/wrap_sqlflex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrap_sqlflex.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/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
index b4c7380c1a..ed1211d897 100644
--- a/connectivity/source/resource/conn_error_message.src
+++ b/connectivity/source/resource/conn_error_message.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: conn_error_message.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/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
index bdc896f6ac..5c380c880e 100644
--- a/connectivity/source/resource/conn_log_res.src
+++ b/connectivity/source/resource/conn_log_res.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: conn_log_res.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/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index bfa1b29c6d..faccf586a0 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.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: conn_shared_res.src,v $
- * $Revision: 1.9.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk
index 1b01093aec..3ccb8ffd16 100644
--- a/connectivity/source/resource/makefile.mk
+++ b/connectivity/source/resource/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 7d2a5a0002..6ba614e9e1 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sharedresources.cxx,v $
- * $Revision: 1.4.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 5e33c7e4c7..0f657ec416 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VCatalog.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/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index bf10269535..067c0d9cc3 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VCollection.cxx,v $
- * $Revision: 1.43.56.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 3af4714e4b..93cf17f5ae 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VColumn.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/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index b1a47fe380..a9facc9a17 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VDescriptor.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/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index b79f30aaa3..d3422f1ae0 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VGroup.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/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index d0d130dcf8..5cb6be6919 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VIndex.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/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 7e4880f000..514b7b4db9 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VIndexColumn.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/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 553dc9f21f..d55d6a768d 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VKey.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/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 1b01ed0730..90896f79cd 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VKeyColumn.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/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index f610be3e65..f675c14117 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VTable.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/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index beabb301fe..755b723e9c 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VUser.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/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 8f221b1c70..fd36f8ca57 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VView.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/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index 0d791ee235..c036e83db5 100644
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 9dd04fefa9..c27637e9ac 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charset_s.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/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index babf5ada45..9c251c57a3 100644
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charset_s.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index 0880804027..d592a6fd6b 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtfactory.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/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index cfadea23d4..10b98b9866 100644
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtfactory.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/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk
index 9354a1c7e4..49409e2f86 100644
--- a/connectivity/source/simpledbt/makefile.mk
+++ b/connectivity/source/simpledbt/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 4f0a8571a9..462de4ba59 100644
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parsenode_s.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/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 35b0a6bcd5..b228da30c9 100644
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parsenode_s.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/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index af158dd79f..55aefdfb34 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_s.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/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index 5389bd9155..ec8ae05988 100644
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_s.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/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 9ea9f7337e..4f216cac04 100644
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refbase.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/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 9d11875b38..b86a75c2a5 100644
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refbase.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 464971bfcb..25bb960e24 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: staticdbtools_s.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/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index cb1928a5c3..0197a1edf0 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: staticdbtools_s.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/connectivity/target.pmk b/connectivity/target.pmk
index 97ef318b5f..e6e240a1ba 100755
--- a/connectivity/target.pmk
+++ b/connectivity/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: 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/connectivity/util/langfilter.xsl b/connectivity/util/langfilter.xsl
deleted file mode 100755
index 76cfcff20a..0000000000
--- a/connectivity/util/langfilter.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oor="http://openoffice.org/2001/registry">
-<xsl:output method="xml" indent="yes" omit-xml-declaration="no" version="1.0" encoding="UTF-8"/>
-<xsl:param name="lang"/>
-<xsl:template match="*">
-    <xsl:if test="count(.//*[@xml:lang=$lang])&gt;0">
-    <xsl:copy>
-        <xsl:apply-templates select="*|@*"/>
-    </xsl:copy>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="@*">
-    <xsl:copy>
-        <xsl:apply-templates select="*|@*"/>
-    </xsl:copy>
-</xsl:template>
-
-<xsl:template match="value">
-    <xsl:if test="@xml:lang=$lang">
-    <xsl:copy>
-        <xsl:apply-templates select="@*|text()"/>
-    </xsl:copy>
-    </xsl:if>
-</xsl:template>
- 
-<xsl:template match="text()">
-    <xsl:if test="../@xml:lang=$lang">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|text()"/>
-        </xsl:copy>
-    </xsl:if>
-</xsl:template>
-
-
-</xsl:stylesheet>
-
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 805aa0110f..d92fe00bba 100755
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.22 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -27,54 +23,40 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
+#***********************************************************************/
 
-PRJ     = ..
-TARGET  = connectivity
+PRJ = ..
 PRJNAME = connectivity
+TARGET = connectivity
 
-# -----------------------------------------------------------------------------
-# include global settings
-# -----------------------------------------------------------------------------
+.INCLUDE : settings.mk
+.INCLUDE : target.mk
 
-.INCLUDE :  settings.mk
+# For any given platform, for each driver .xcu (in $(MY_XCUS)) built on that
+# platform (in $(MISC)/registry/data/org/openoffice/Office/DataAccess) there are
+# corresponding language-specific .xcu files (in
+# $(MISC)/registry/res/%/org/openoffice/Office/DataAccess).  For each language,
+# all language-specific .xcu files for that language are assembled into
+# $(BIN)$/fcfg_drivers_%.zip.  To meet the requirements of dmake percent rules,
+# the first item from $(MY_XCUS) is arbitrarily taken to be the main
+# prerequisite while all the items from $(MY_XCUS) are made into indirect
+# prerequisites (harmlessly doubling the first item).
 
-DIR_FILTERCFGOUT := $(MISC)$/drivers
-DIR_LANGPACK     := $(DIR_FILTERCFGOUT)
-.IF "$(WITH_LANG)"!=""
-DIR_LANG_SOURCE  := $(MISC)$/merge
-.ELSE
-DIR_LANG_SOURCE  := $(MISC)$/registry$/data
-.ENDIF
-DRIVER_MERGE_XCU := $(shell -@$(FIND) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess -name "*.xcu")
-   
-REALFILTERPACKAGES_FILTERS_UI_LANGPACKS = \
-    $(foreach,i,$(alllangiso) $(foreach,j,$(DRIVER_MERGE_XCU) $(DIR_LANGPACK)$/$i$/org$/openoffice$/Office$/DataAccess$/$(j:f)))
-
-.INCLUDE: target.mk
+MY_XCUS := \
+    $(shell cd $(MISC)/registry/data/org/openoffice/Office/DataAccess && \
+    ls *.xcu)
 
-PACKLANG := $(XSLTPROC) --nonet
-PACKLANG_IN :=
-PACKLANG_PARAM := --stringparam
-PACKLANG_XSL :=
-    
-$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 

-      @echo ===================================================================

-      @echo Building language package for driver $(@:b:s/Filter_//) 

-      @echo ===================================================================

-      +-$(MKDIRHIER) $(@:d)

-      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@

+.IF "$(MY_XCUS)" != ""
 
-$(MISC)$/$(TARGET)_delzip :
-    -$(RM) $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip	
+ALLTAR : $(BIN)/fcfg_drivers_{$(alllangiso)}.zip
 
-$(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
-    cd $(DIR_FILTERCFGOUT)$/$(@:b:s/fcfg_drivers_//) && zip -ru ..$/..$/..$/bin$/fcfg_drivers_$(@:b:s/fcfg_drivers_//).zip org/*
-.IF "$(USE_SHELL)"!="4nt"
-    $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
+$(BIN)/fcfg_drivers_{$(alllangiso)}.zip : \
+        $(MISC)/registry/res/$$(@:b:s/fcfg_drivers_//)/org/openoffice/Office/DataAccess/{$(MY_XCUS)}
 
-ALLTAR: \
-    $(MISC)$/$(TARGET)_delzip \
-    $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip
+$(BIN)/fcfg_drivers_%.zip : \
+        $(MISC)/registry/res/%/org/openoffice/Office/DataAccess/$(MY_XCUS:1)
+    zip -j $@ \
+        $(foreach,i,$(MY_XCUS) \
+            $(MISC)/registry/res/$*/org/openoffice/Office/DataAccess/$i)
 
+.ENDIF
diff --git a/connectivity/version.mk b/connectivity/version.mk
index 07b8806295..fd2235cfd1 100644
--- a/connectivity/version.mk
+++ b/connectivity/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.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/workben/TT/StartTest.java b/connectivity/workben/TT/StartTest.java
index 7ffecc539b..827e85d2f2 100644
--- a/connectivity/workben/TT/StartTest.java
+++ b/connectivity/workben/TT/StartTest.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: StartTest.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/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index a65788eba9..7d409c7ac8 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.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/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
index 4e4adc2556..c1caaecf67 100644
--- a/connectivity/workben/iniParser/makefile.mk
+++ b/connectivity/workben/iniParser/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index a821721f86..13b40c859c 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.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/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk
index e0122e42a2..5d3d6516f3 100644
--- a/connectivity/workben/little/makefile.mk
+++ b/connectivity/workben/little/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index f432a76d36..b8e9947170 100644
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SResultSet.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx
index f42dd89c66..293398269a 100644
--- a/connectivity/workben/testmoz/initUNO.cxx
+++ b/connectivity/workben/testmoz/initUNO.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: initUNO.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/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index b96eeb1713..dec8349dc9 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: main.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/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
index 70fa9b80fe..387d2e4a20 100644
--- a/connectivity/workben/testmoz/makefile.mk
+++ b/connectivity/workben/testmoz/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index bab014cb97..c7b86cd899 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mozthread.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 8315658d45..2eef01f08e 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.hxx,v $
- * $Revision: 1.37.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index bd5a3d8892..73440bbe0a 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -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/desktop/inc/makefile.mk b/desktop/inc/makefile.mk
index 5e64fbff98..8715d81427 100644
--- a/desktop/inc/makefile.mk
+++ b/desktop/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/desktop/inc/pch/precompiled_desktop.cxx b/desktop/inc/pch/precompiled_desktop.cxx
index 1971148d41..767998a4c8 100644
--- a/desktop/inc/pch/precompiled_desktop.cxx
+++ b/desktop/inc/pch/precompiled_desktop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_desktop.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/desktop/inc/pch/precompiled_desktop.hxx b/desktop/inc/pch/precompiled_desktop.hxx
index 017531b5cf..de5990c02c 100644
--- a/desktop/inc/pch/precompiled_desktop.hxx
+++ b/desktop/inc/pch/precompiled_desktop.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_desktop.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx
index 7586b18f33..bbbc4936cd 100644
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.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/desktop/os2/source/applauncher/makefile.mk b/desktop/os2/source/applauncher/makefile.mk
index 3ffff92250..bf71b57c2f 100644
--- a/desktop/os2/source/applauncher/makefile.mk
+++ b/desktop/os2/source/applauncher/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/prj/build.lst b/desktop/prj/build.lst
index d9213aed12..9253b4e82b 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
+dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg configmgr NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index f673f27e49..556df1a623 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 728ed52c37..5640335990 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: test_dp_version.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/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map
index 7a9493e61e..f313c44bd7 100644
--- a/desktop/qa/deployment_misc/version.map
+++ b/desktop/qa/deployment_misc/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/desktop/registry/data/org/openoffice/Office/Jobs.xcu b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
index b613e86eb2..f0d2783833 100644
--- a/desktop/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
@@ -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: Jobs.xcu,v $
- *
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/registry/data/org/openoffice/Office/makefile.mk b/desktop/registry/data/org/openoffice/Office/makefile.mk
index 651c731fa4..2ad8441ea3 100644
--- a/desktop/registry/data/org/openoffice/Office/makefile.mk
+++ b/desktop/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk
index 001ead3519..5c412f8187 100644
--- a/desktop/scripts/makefile.mk
+++ b/desktop/scripts/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 87f8fb4bb3..8c25257873 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.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: soffice.sh,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/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index f49f139e6f..3af17625a6 100644
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -2,15 +2,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: unoinfo.sh,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index f144994876..491b706b58 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.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: unopkg.sh,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/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 658212ec1d..5d7e2c72ef 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1,13 +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: app.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 1c8a1ed877..90818009e1 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appfirststart.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 94bd3c55b3..c15ef44a4f 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appinit.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/desktop/source/app/appinit.hxx b/desktop/source/app/appinit.hxx
index 3886f0100e..2f3842b676 100644
--- a/desktop/source/app/appinit.hxx
+++ b/desktop/source/app/appinit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appinit.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/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index 65130cb675..0c26e694b5 100644
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appsys.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx
index 8e64263bae..309f67d308 100644
--- a/desktop/source/app/appsys.hxx
+++ b/desktop/source/app/appsys.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appsys.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index f61f577694..5ca1db7c31 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2009 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
index acdd15a0c8..7a0e61d1b0 100644
--- a/desktop/source/app/checkinstall.cxx
+++ b/desktop/source/app/checkinstall.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checkinstall.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/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx
index b1be908bcc..ee33b69898 100644
--- a/desktop/source/app/checkinstall.hxx
+++ b/desktop/source/app/checkinstall.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checkinstall.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index e2a8558372..758d797fd4 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdlineargs.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/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index db4619151f..fda4ab77cb 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdlineargs.hxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index c5069d1a8c..8af72e63ec 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdlinehelp.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index e8f48b89a8..b5162158e0 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configinit.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/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 0a67c2017f..035318b4d7 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.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: desktop.hrc,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/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 4b382be9b5..f172efb309 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.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: desktop.src,v $
- * $Revision: 1.74 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 76abc028a8..27d81924f1 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index 9cf29dc385..0339ea4841 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
index d709fe6b5b..a4aa77cc31 100644
--- a/desktop/source/app/desktopresid.cxx
+++ b/desktop/source/app/desktopresid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: desktopresid.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx
index ddd9a0f0d0..2271145f71 100644
--- a/desktop/source/app/desktopresid.hxx
+++ b/desktop/source/app/desktopresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: desktopresid.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/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index c3886299d3..e6383e32bd 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchwatcher.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/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index ef62dc2614..f7de7ae0df 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchwatcher.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/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index e8b50cdd29..62b3c89922 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langselect.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -149,7 +146,7 @@ bool LanguageSelection::prepareLanguage()
             xProp->getPropertyValue(OUString::createFromAscii("ooSetupSystemLocale")) >>= sLocale;
             if ( sLocale.getLength() )
             {
-                loc = LanguageSelection::IsoStringToLocale(aLocaleString);
+                loc = LanguageSelection::IsoStringToLocale(sLocale);
                 MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) );
             }
             else
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 7d233c2d58..8d94b28b32 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langselect.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/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index e27613d2f4..099412c133 100644
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lockfile.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx
index 290f02d6fd..ad971cac00 100644
--- a/desktop/source/app/lockfile.hxx
+++ b/desktop/source/app/lockfile.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lockfile.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/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index f03271f957..fdeb99f630 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lockfile2.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index a855f9e066..2705326c3e 100644
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.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: main.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/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index ffaf68c0fb..d9db7c1634 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/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.42.40.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 650a73ea3f..0bd9db40de 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeipcthread.cxx,v $
- * $Revision: 1.62.44.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index a2949b9742..92a35a5ff7 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeipcthread.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/omutexmember.hxx b/desktop/source/app/omutexmember.hxx
index 9d2b6708e4..30433c3ccd 100644
--- a/desktop/source/app/omutexmember.hxx
+++ b/desktop/source/app/omutexmember.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: omutexmember.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 3bc6fdde11..7b615dcb6e 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sofficemain.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/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h
index 618d66172d..977043ef83 100644
--- a/desktop/source/app/sofficemain.h
+++ b/desktop/source/app/sofficemain.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sofficemain.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/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index ccdeadbd7c..f72d13834e 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userinstall.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -246,7 +243,7 @@ namespace desktop {
             return UserInstall::E_InvalidBaseinstall;
 
         // create the user directory
-        FileBase::RC rc = Directory::create(aUserPath);
+        FileBase::RC rc = Directory::createPath(aUserPath);
         if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST)) return UserInstall::E_Creation;
 
             // copy data from shared data directory of base installation
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 35aae8cb74..2f6ee193ef 100644
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: userinstall.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/desktop/source/app/version.map b/desktop/source/app/version.map
index 0e1b5cb619..e2d9026465 100644
--- a/desktop/source/app/version.map
+++ b/desktop/source/app/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/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index a3e29bdac3..0f6a26ee88 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_log.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/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 04f3f19d2e..dc4d8eeb5e 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_persmap.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,19 +78,6 @@ PersistentMap::~PersistentMap()
 }
 
 //______________________________________________________________________________
-void PersistentMap::flush() const
-{
-    try {
-        int err = m_db.sync(0);
-        if (err != 0)
-            throw_rtexc(err);
-    }
-    catch (DbException & exc) {
-        throw_rtexc( exc.get_errno(), exc.what() );
-    }
-}
-
-//______________________________________________________________________________
 PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
     : m_db( 0, 0 )
 {
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index d981533382..7788e3d745 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_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: dp_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/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 02d23b240c..a935ca1113 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_xml.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/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index e2a05050dc..4898aecc03 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: descedit.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/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index cfb47e5876..6e98a1233a 100644
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: descedit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index cf4bcb9343..57f471b7c3 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui.h,v $
- * $Revision: 1.24.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,6 @@
 
 #include "dp_gui_updatedata.hxx"
 #include "dp_misc.h"
-#include "dp_gui_updatability.hxx"
 #include "dp_gui.hrc"
 #include "rtl/ref.hxx"
 #include "rtl/instance.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 9a3e294c04..428b1b4679 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -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/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index dc9ea6fea8..d560b3d5a9 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_autoscrolledit.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/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index 6ed3d3c723..79efac6e4a 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_autoscrolledit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index 9d0fd5d19c..343d75df6a 100644
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.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: dp_gui_backend.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/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 3af4c30364..1f34c490ea 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dependencydialog.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/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 08c769d528..3d982cd250 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dependencydialog.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index 039921384d..80b584f894 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.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: dp_gui_dependencydialog.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/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index b46d97e02d..0808dbcb2a 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dialog.src,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/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e8acd11e45..8f79fc5820 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.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: dp_gui_dialog2.cxx,v $
- *
- * $Revision: 1.8.4.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -769,12 +765,6 @@ ExtMgrDialog::~ExtMgrDialog()
 }
 
 //------------------------------------------------------------------------------
-void ExtMgrDialog::selectEntry( long nPos )
-{
-    m_pExtensionBox->selectEntry( nPos );
-}
-
-//------------------------------------------------------------------------------
 void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL )
 {
     m_aGetExtensions.SetURL( rURL );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index de8982a7e3..91bfc072e7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dialog2.hxx,v $
- *
- * $Revision: 1.4.74.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -163,7 +159,6 @@ public:
     virtual void    updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
 
     void            setGetExtensionsURL( const ::rtl::OUString &rURL );
-    void            selectEntry( long nPos );
     virtual long    addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
                                       const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > & );
     bool enablePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index eb4698bf7a..11b06e5fb9 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_dialog2.src,v $
- *
- * $Revision: 1.2.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index f31d63a703..2f3ca34cb6 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.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: dp_gui_extensioncmdqueue.cxx,v $
- *
- * $Revision: 1.7.4.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -252,7 +248,6 @@ public:
                           const bool bEnable );
     void checkForUpdates( const std::vector< TUpdateListEntry > &vExtensionList );
     void stop();
-    bool hasTerminated();
     bool isBusy();
 
     static OUString searchAndReplaceAll( const OUString &rSource,
@@ -745,13 +740,6 @@ void ExtensionCmdQueue::Thread::stop()
 }
 
 //------------------------------------------------------------------------------
-bool ExtensionCmdQueue::Thread::hasTerminated() 
-{
-    osl::MutexGuard aGuard( m_mutex );
-    return m_bTerminated;
-}
-
-//------------------------------------------------------------------------------
 bool ExtensionCmdQueue::Thread::isBusy() 
 {
     osl::MutexGuard aGuard( m_mutex );
@@ -1161,17 +1149,6 @@ void ExtensionCmdQueue::stop()
     m_thread->stop();
 }
 
-void ExtensionCmdQueue::stopAndWait() 
-{
-    m_thread->stop();
-    m_thread->join();
-}
- 
-bool ExtensionCmdQueue::hasTerminated()
-{
-    return m_thread->hasTerminated();
-}
-
 bool ExtensionCmdQueue::isBusy()
 {
     return m_thread->isBusy();
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index 853ce946c2..5a3f48d61f 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_extensioncmdqueue.hxx,v $
- *
- * $Revision: 1.3.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -96,14 +92,6 @@ public:
     */
     void stop();
 
-    /** Determines if thread of this class has terminated.
-    */
-    bool hasTerminated();
-
-    /** Blocks until the thread has terminated. All URLs in the queue will be processed.
-    */
-    void stopAndWait();
-
     bool isBusy();
 private:
     ExtensionCmdQueue(ExtensionCmdQueue &); // not defined
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 36f08dbf5b..2852e67e7d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1,1175 +1,1175 @@
-/*************************************************************************

- *

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

- *

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

-

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

-#include "precompiled_desktop.hxx"

-

-#include "svtools/controldims.hrc"

-

-#include "dp_gui.h"

-#include "dp_gui_extlistbox.hxx"

-#include "dp_gui_theextmgr.hxx"

-#include "dp_gui_dialog2.hxx"

-#include "dp_dependencies.hxx"

-

-#include "comphelper/processfactory.hxx"

-#include "com/sun/star/i18n/CollatorOptions.hpp"

-#include "com/sun/star/deployment/DependencyException.hpp"

-#include "com/sun/star/deployment/DeploymentException.hpp"

-

-

-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )

-

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

-

-namespace dp_gui {

-

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

-//                          struct Entry_Impl

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

-Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,

-                        const uno::Reference< deployment::XPackageManager > &xPackageManager,

-                        PackageState eState ) :

-    m_bActive( false ),

-    m_bLocked( false ),

-    m_bHasOptions( false ),

-    m_bShared( false ),

-    m_bNew( false ),

-    m_bChecked( false ),

-    m_bMissingDeps( false ),

-    m_eState( eState ),

-    m_pPublisher( NULL ),

-    m_xPackage( xPackage ),

-    m_xPackageManager( xPackageManager )

-{

-    m_sTitle = xPackage->getDisplayName();

-    m_sVersion = xPackage->getVersion();

-    m_sDescription = xPackage->getDescription();

-

-    beans::StringPair aInfo( m_xPackage->getPublisherInfo() );

-    m_sPublisher = aInfo.First;

-    m_sPublisherURL = aInfo.Second;

-    

-    // get the icons for the package if there are any

-    uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );

-    if ( xGraphic.is() )

-        m_aIcon = Image( xGraphic );

-

-    xGraphic = xPackage->getIcon( true );

-    if ( xGraphic.is() )

-        m_aIconHC = Image( xGraphic );

-    else

-        m_aIconHC = m_aIcon;

-

-    m_bLocked = m_xPackageManager->isReadOnly();

-

-    if ( eState == AMBIGUOUS )

-        m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );

-    else if ( eState == NOT_REGISTERED )

-        checkDependencies();

-}

-

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

-Entry_Impl::~Entry_Impl()

-{}

-

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

-StringCompare Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const

-{

-    StringCompare eCompare = (StringCompare) pCollator->compareString( m_sTitle, pEntry->m_sTitle );

-    if ( eCompare == COMPARE_EQUAL )

-    {

-        eCompare = m_sVersion.CompareTo( pEntry->m_sVersion );

-        if ( eCompare == COMPARE_EQUAL )

-        {     

-            if ( m_xPackageManager != pEntry->m_xPackageManager )

-            {

-                sal_Int32 nCompare = m_xPackageManager->getContext().compareTo( pEntry->m_xPackageManager->getContext() );

-                if ( nCompare < 0 )

-                    eCompare = COMPARE_LESS;

-                else if ( nCompare > 0 )

-                    eCompare = COMPARE_GREATER;

-            }

-        }

-    }

-    return eCompare;

-}

-

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

-void Entry_Impl::checkDependencies()

-{

-    try {

-        m_xPackage->checkDependencies( uno::Reference< ucb::XCommandEnvironment >() );

-    }

-    catch ( deployment::DeploymentException &e )

-    {

-        deployment::DependencyException depExc;

-        if ( e.Cause >>= depExc )

-        {

-            rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) );

-            for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i )

-            {

-                aMissingDep += OUSTR("\n");

-                aMissingDep += dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]);

-            }

-            aMissingDep += OUSTR("\n");

-            m_sErrorText = aMissingDep;

-            m_bMissingDeps = true;

-        }

-    }

-}

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

-// ExtensionRemovedListener

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

-void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )

-    throw ( uno::RuntimeException )

-{

-    uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY );

-

-    if ( xPackage.is() )

-    {

-        m_pParent->removeEntry( xPackage );

-    }

-}

-

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

-ExtensionRemovedListener::~ExtensionRemovedListener()

-{

-}

-

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

-// ExtensionBox_Impl

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

-ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager ) :

-    IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),

-    m_bHasScrollBar( false ),

-    m_bHasActive( false ),

-    m_bNeedsRecalc( true ),

-    m_bHasNew( false ),

-    m_bInCheckMode( false ),

-    m_bAdjustActive( false ),

-    m_bInDelete( false ),

-    m_nActive( 0 ),

-    m_nTopIndex( 0 ),

-    m_nActiveHeight( 0 ),

-    m_nExtraHeight( 2 ),

-    m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),

-    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),

-    m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),

-    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),

-    m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),

-    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),

-    m_pScrollBar( NULL ),

-    m_pManager( pManager )

-{

-    SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );

-

-    m_pScrollBar = new ScrollBar( this, WB_VERT );

-    m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) );

-    m_pScrollBar->EnableDrag();

-

-    SetPaintTransparent( true );

-    SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );

-    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;

-    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();

-    if ( nIconHeight < nTitleHeight )

-        m_nStdHeight = nTitleHeight;

-    else

-        m_nStdHeight = nIconHeight;

-    m_nStdHeight += GetTextHeight() + TOP_OFFSET;

-

-    nIconHeight = ICON_HEIGHT + 2*TOP_OFFSET + 1;

-    if ( m_nStdHeight < nIconHeight )

-        m_nStdHeight = nIconHeight;

-

-    m_nActiveHeight = m_nStdHeight;

-

-    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();

-    if( IsControlBackground() )

-        SetBackground( GetControlBackground() );

-    else

-        SetBackground( rStyleSettings.GetFieldColor() );

-

-    m_xRemoveListener = new ExtensionRemovedListener( this );

-

-    m_pLocale = new lang::Locale( Application::GetSettings().GetLocale() );

-    m_pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );

-    m_pCollator->loadDefaultCollator( *m_pLocale, i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );

-

-    Show();

-}

-

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

-ExtensionBox_Impl::~ExtensionBox_Impl()

-{

-    if ( ! m_bInDelete )

-        DeleteRemoved();

-

-    m_bInDelete = true;

-

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        if ( (*iIndex)->m_pPublisher )

-        {

-            delete (*iIndex)->m_pPublisher;

-            (*iIndex)->m_pPublisher = NULL;

-        }

-        (*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );

-    }

-

-    m_vEntries.clear();

-

-    delete m_pScrollBar;

-

-    m_xRemoveListener.clear();

-

-    delete m_pLocale;

-    delete m_pCollator;

-}

-

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

-sal_Int32 ExtensionBox_Impl::getItemCount() const

-{

-    return static_cast< sal_Int32 >( m_vEntries.size() );

-}

-

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

-sal_Int32 ExtensionBox_Impl::getSelIndex() const

-{

-    if ( m_bHasActive )

-    {

-        OSL_ASSERT( m_nActive >= -1);

-        return static_cast< sal_Int32 >( m_nActive );

-    }

-    else

-        return static_cast< sal_Int32 >( EXTENSION_LISTBOX_ENTRY_NOTFOUND );

-}

-

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

-void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const

-{

-    if ( nIndex < 0 )

-        throw lang::IllegalArgumentException( OUSTR("The list index starts with 0"),0, 0 );

-    if ( static_cast< sal_uInt32 >( nIndex ) >= m_vEntries.size())

-        throw lang::IllegalArgumentException( OUSTR("There is no element at the provided position."

-        "The position exceeds the number of available list entries"),0, 0 );

-}

-

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

-rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sTitle;

-}

-

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

-rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sVersion;

-}

-

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

-rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sDescription;

-}

-

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

-rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sPublisher;

-}

-

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

-rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    return m_vEntries[ nIndex ]->m_sPublisherURL;

-}

-

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

-void ExtensionBox_Impl::select( sal_Int32 nIndex )

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    checkIndex( nIndex );

-    selectEntry( nIndex );   

-}

-

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

-void ExtensionBox_Impl::select( const rtl::OUString & sName )

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-    typedef ::std::vector< TEntry_Impl >::const_iterator It;

-

-    for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )

-    {

-        if ( sName.equals( (*iIter)->m_sTitle ) )

-        {

-            long nPos = iIter - m_vEntries.begin();

-            selectEntry( nPos );

-            break;

-        }

-    }

-}

-

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

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

-// Title + description

-void ExtensionBox_Impl::CalcActiveHeight( const long nPos )

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    // get title height

-    long aTextHeight;

-    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;

-    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();

-    if ( nIconHeight < nTitleHeight )

-        aTextHeight = nTitleHeight;

-    else

-        aTextHeight = nIconHeight;

-

-    // calc description height

-    Size aSize = GetOutputSizePixel();

-    if ( m_bHasScrollBar )

-        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();

-

-    aSize.Width() -= ICON_OFFSET;

-    aSize.Height() = 10000;

-

-    rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText );

-    aText += m_vEntries[ nPos ]->m_sDescription;

-    

-    Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,

-                                   TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );

-    aTextHeight += aRect.GetHeight();

-

-    if ( aTextHeight < m_nStdHeight )

-        aTextHeight = m_nStdHeight;

-

-    m_nActiveHeight = aTextHeight + m_nExtraHeight;

-}

-

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

-const Size ExtensionBox_Impl::GetMinOutputSizePixel() const

-{

-    return Size( 200, 80 );

-}

-

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

-Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    Size aSize( GetOutputSizePixel() );

-

-    if ( m_bHasScrollBar )

-        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();

-

-    if ( m_vEntries[ nPos ]->m_bActive )

-        aSize.Height() = m_nActiveHeight;

-    else

-        aSize.Height() = m_nStdHeight;

-

-    Point aPos( 0, -m_nTopIndex + nPos * m_nStdHeight );

-    if ( m_bHasActive && ( nPos < m_nActive ) )

-        aPos.Y() += m_nActiveHeight - m_nStdHeight;

-

-    return Rectangle( aPos, aSize );

-}

-

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

-void ExtensionBox_Impl::DeleteRemoved()

-{

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    m_bInDelete = true;

-

-    if ( ! m_vRemovedEntries.empty() )

-    {

-        typedef std::vector< TEntry_Impl >::iterator ITER;

-

-        for ( ITER iIndex = m_vRemovedEntries.begin(); iIndex < m_vRemovedEntries.end(); ++iIndex )

-        {

-            if ( (*iIndex)->m_pPublisher )

-            {

-                delete (*iIndex)->m_pPublisher;

-                (*iIndex)->m_pPublisher = NULL;

-            }

-        }

-

-        m_vRemovedEntries.clear();

-    }

-

-    m_bInDelete = false;

-}

-

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

-//This function may be called with nPos < 0

-void ExtensionBox_Impl::selectEntry( const long nPos )

-{

-    //ToDo whe should not use the guard at such a big scope here.

-    //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be 

-    //modified in this function.

-    //It would be probably best to always use a copy of m_vEntries

-    //and some other state variables from ExtensionBox_Impl for 

-    //the whole painting operation. See issue i86993

-    ::osl::ClearableMutexGuard guard(m_entriesMutex);

-

-    if ( m_bInCheckMode )

-        return;

-

-    if ( m_bHasActive )

-    {

-        if ( nPos == m_nActive )

-            return;

-

-        m_bHasActive = false;

-        m_vEntries[ m_nActive ]->m_bActive = false;

-    }

-

-    if ( ( nPos >= 0 ) && ( nPos < (long) m_vEntries.size() ) )

-    {

-        m_bHasActive = true;

-        m_nActive = nPos;

-        m_vEntries[ nPos ]->m_bActive = true;

-

-        if ( IsReallyVisible() )

-        {

-            m_bNeedsRecalc = true;

-            m_bAdjustActive = true;

-        }

-    }

-

-    if ( IsReallyVisible() )

-        Invalidate();

-

-    guard.clear();

-}

-

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

-void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry )

-{

-    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();

-

-    if ( pEntry->m_bActive )

-        SetTextColor( rStyleSettings.GetHighlightTextColor() );

-    else if ( ( pEntry->m_eState != REGISTERED ) && ( pEntry->m_eState != NOT_AVAILABLE ) )

-        SetTextColor( rStyleSettings.GetDisableColor() );

-    else if ( IsControlForeground() )

-        SetTextColor( GetControlForeground() );

-    else

-        SetTextColor( rStyleSettings.GetFieldTextColor() );

-

-    if ( pEntry->m_bActive )

-    {

-        SetLineColor();

-        SetFillColor( rStyleSettings.GetHighlightColor() );

-        DrawRect( rRect );

-    }

-    else

-    {

-        if( IsControlBackground() )

-            SetBackground( GetControlBackground() );

-        else

-            SetBackground( rStyleSettings.GetFieldColor() );

-

-        SetTextFillColor();

-        Erase( rRect );

-    }

-

-    // Draw extension icon

-    Point aPos( rRect.TopLeft() );

-    aPos += Point( TOP_OFFSET, TOP_OFFSET );

-    Image aImage;

-    if ( ! pEntry->m_aIcon )

-        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;

-    else

-        aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;

-    Size aImageSize = aImage.GetSizePixel();

-    if ( ( aImageSize.Width() <= ICON_HEIGHT ) && ( aImageSize.Height() <= ICON_HEIGHT ) )

-        DrawImage( Point( aPos.X()+((ICON_HEIGHT-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );

-    else

-        DrawImage( aPos, Size( ICON_HEIGHT, ICON_HEIGHT ), aImage );

-

-    // Setup fonts

-    Font aStdFont( GetFont() );

-    Font aBoldFont( aStdFont );

-    aBoldFont.SetWeight( WEIGHT_BOLD );

-    SetFont( aBoldFont );

-    long aTextHeight = GetTextHeight();

-

-    // Init publisher link here

-    if ( !pEntry->m_pPublisher && pEntry->m_sPublisher.Len() )

-    {

-        pEntry->m_pPublisher = new svt::FixedHyperlink( this );

-        pEntry->m_pPublisher->SetBackground();

-        pEntry->m_pPublisher->SetPaintTransparent( true );

-        pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL );

-        pEntry->m_pPublisher->SetDescription( pEntry->m_sPublisher );

-        Size aSize = FixedText::CalcMinimumTextSize( pEntry->m_pPublisher );

-        pEntry->m_pPublisher->SetSizePixel( aSize );

-

-        if ( m_aClickHdl.IsSet() )

-            pEntry->m_pPublisher->SetClickHdl( m_aClickHdl );

-    }

-

-    // Get max title width

-    long nMaxTitleWidth = rRect.GetWidth() - ICON_OFFSET;

-    nMaxTitleWidth -= ( 2 * SMALL_ICON_SIZE ) + ( 4 * SPACE_BETWEEN );

-    if ( pEntry->m_pPublisher )

-    {

-        nMaxTitleWidth -= pEntry->m_pPublisher->GetSizePixel().Width() + (2*SPACE_BETWEEN);

-    }

-

-    long aVersionWidth = GetTextWidth( pEntry->m_sVersion );

-    long aTitleWidth = GetTextWidth( pEntry->m_sTitle ) + (aTextHeight / 3);

-

-    aPos = rRect.TopLeft() + Point( ICON_OFFSET, TOP_OFFSET );

-

-    if ( aTitleWidth > nMaxTitleWidth - aVersionWidth )

-    {

-        aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3);

-        String aShortTitle = GetEllipsisString( pEntry->m_sTitle, aTitleWidth );

-        DrawText( aPos, aShortTitle );

-        aTitleWidth += (aTextHeight / 3);

-    }

-    else

-        DrawText( aPos, pEntry->m_sTitle );

-

-    SetFont( aStdFont );

-    DrawText( Point( aPos.X() + aTitleWidth, aPos.Y() ), pEntry->m_sVersion );

-

-    long nIconHeight = TOP_OFFSET + SMALL_ICON_SIZE;

-    long nTitleHeight = TOP_OFFSET + GetTextHeight();

-    if ( nIconHeight < nTitleHeight )

-        aTextHeight = nTitleHeight;

-    else

-        aTextHeight = nIconHeight;

-

-    // draw description

-    String sDescription;

-    if ( pEntry->m_sErrorText.Len() )

-    {

-        if ( pEntry->m_bActive )

-            sDescription = pEntry->m_sErrorText + OUSTR("\n") + pEntry->m_sDescription;

-        else

-            sDescription = pEntry->m_sErrorText;

-    }

-    else

-        sDescription = pEntry->m_sDescription;

-

-    aPos.Y() += aTextHeight;

-    if ( pEntry->m_bActive )

-    {

-        DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - m_nExtraHeight ),

-                  sDescription, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );

-    }

-    else

-    {

-        const long nWidth = GetTextWidth( sDescription );

-        if ( nWidth > rRect.GetWidth() - aPos.X() )

-            sDescription = GetEllipsisString( sDescription, rRect.GetWidth() - aPos.X() );

-        DrawText( aPos, sDescription );

-    }

-

-    // Draw publisher link

-    if ( pEntry->m_pPublisher )

-    {

-        pEntry->m_pPublisher->Show();

-        aPos = rRect.TopLeft() + Point( ICON_OFFSET + nMaxTitleWidth + (2*SPACE_BETWEEN), TOP_OFFSET );

-        pEntry->m_pPublisher->SetPosPixel( aPos );

-    }

-

-    // Draw status icons

-    if ( pEntry->m_bShared )

-    {

-        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );

-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );

-    }

-    if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps )

-    {

-        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );

-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );

-    }

-    

-    SetLineColor( Color( COL_LIGHTGRAY ) );

-    DrawLine( rRect.BottomLeft(), rRect.BottomRight() );

-}

-

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

-void ExtensionBox_Impl::RecalcAll()

-{

-    if ( m_bHasActive )

-        CalcActiveHeight( m_nActive );

-

-    SetupScrollBar();

-

-    if ( m_bHasActive )

-    {

-        Rectangle aEntryRect = GetEntryRect( m_nActive );

-

-        if ( m_bAdjustActive )

-        {

-            m_bAdjustActive = false;

-

-            // If the top of the selected entry isn't visible, make it visible

-            if ( aEntryRect.Top() < 0 )

-            {

-                m_nTopIndex += aEntryRect.Top();

-                aEntryRect.Move( 0, -aEntryRect.Top() );

-            }

-

-            // If the bottom of the selected entry isn't visible, make it visible even if now the top

-            // isn't visible any longer ( the buttons are more important )

-            Size aOutputSize = GetOutputSizePixel();

-            if ( aEntryRect.Bottom() > aOutputSize.Height() )

-            {

-                m_nTopIndex += ( aEntryRect.Bottom() - aOutputSize.Height() );

-                aEntryRect.Move( 0, -( aEntryRect.Bottom() - aOutputSize.Height() ) );

-            }

-

-            // If there is unused space below the last entry but all entries don't fit into the box,

-            // move the content down to use the whole space

-            const long nTotalHeight = GetTotalHeight();

-            if ( m_bHasScrollBar && ( aOutputSize.Height() + m_nTopIndex > nTotalHeight ) )

-            {

-                long nOffset = m_nTopIndex;

-                m_nTopIndex = nTotalHeight - aOutputSize.Height();

-                nOffset -= m_nTopIndex;

-                aEntryRect.Move( 0, nOffset );

-            }

-

-            if ( m_bHasScrollBar )

-                m_pScrollBar->SetThumbPos( m_nTopIndex );

-        }

-    }

-

-    m_bNeedsRecalc = false;

-}

-

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

-bool ExtensionBox_Impl::HandleTabKey( bool )

-{

-    return false;

-}

-

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

-bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )

-{

-    if ( m_vEntries.empty() )

-        return true;

-

-    long nSelect = 0;

-

-    if ( m_bHasActive )

-    {

-        long nPageSize = GetOutputSizePixel().Height() / m_nStdHeight;

-        if ( nPageSize < 2 )

-            nPageSize = 2;

-

-        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_RIGHT ) )

-            nSelect = m_nActive + 1;

-        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_LEFT ) )

-            nSelect = m_nActive - 1;

-        else if ( nKeyCode == KEY_HOME )

-            nSelect = 0;

-        else if ( nKeyCode == KEY_END )

-            nSelect = m_vEntries.size() - 1;

-        else if ( nKeyCode == KEY_PAGEUP )

-            nSelect = m_nActive - nPageSize + 1;

-        else if ( nKeyCode == KEY_PAGEDOWN )

-            nSelect = m_nActive + nPageSize - 1;

-    }

-    else // when there is no selected entry, we will select the first or the last.

-    {

-        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_PAGEDOWN ) || ( nKeyCode == KEY_HOME ) )

-            nSelect = 0;

-        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_PAGEUP ) || ( nKeyCode == KEY_END ) )

-            nSelect = m_vEntries.size() - 1;

-    }

-

-    if ( nSelect < 0 )

-        nSelect = 0;

-    if ( nSelect >= (long) m_vEntries.size() )

-        nSelect = m_vEntries.size() - 1;

-

-    selectEntry( nSelect );

-

-    return true;

-}

-

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

-void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ )

-{

-    if ( !m_bInDelete )

-        DeleteRemoved();

-

-    if ( m_bNeedsRecalc )

-        RecalcAll();

-

-    Point aStart( 0, -m_nTopIndex );

-    Size aSize( GetOutputSizePixel() );

-

-    if ( m_bHasScrollBar )

-        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();

-

-    const ::osl::MutexGuard aGuard( m_entriesMutex );

-

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        aSize.Height() = (*iIndex)->m_bActive ? m_nActiveHeight : m_nStdHeight;

-        Rectangle aEntryRect( aStart, aSize );

-        DrawRow( aEntryRect, *iIndex );

-        aStart.Y() += aSize.Height();

-    }

-}

-

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

-long ExtensionBox_Impl::GetTotalHeight() const

-{

-    long nHeight = m_vEntries.size() * m_nStdHeight;

-

-    if ( m_bHasActive )

-    {

-        nHeight += m_nActiveHeight - m_nStdHeight;

-    }

-

-    return nHeight;

-}

-

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

-void ExtensionBox_Impl::SetupScrollBar()

-{

-    const Size aSize = GetOutputSizePixel();

-    const long nScrBarSize = GetSettings().GetStyleSettings().GetScrollBarSize();

-    const long nTotalHeight = GetTotalHeight();

-    const bool bNeedsScrollBar = ( nTotalHeight > aSize.Height() );

-

-    if ( bNeedsScrollBar )

-    {

-        if ( m_nTopIndex + aSize.Height() > nTotalHeight )

-            m_nTopIndex = nTotalHeight - aSize.Height();

-

-        m_pScrollBar->SetPosSizePixel( Point( aSize.Width() - nScrBarSize, 0 ),

-                                       Size( nScrBarSize, aSize.Height() ) );

-        m_pScrollBar->SetRangeMax( nTotalHeight );

-        m_pScrollBar->SetVisibleSize( aSize.Height() );

-        m_pScrollBar->SetPageSize( ( aSize.Height() * 4 ) / 5 );

-        m_pScrollBar->SetLineSize( m_nStdHeight );

-        m_pScrollBar->SetThumbPos( m_nTopIndex );

-

-        if ( !m_bHasScrollBar )

-            m_pScrollBar->Show();

-    }

-    else if ( m_bHasScrollBar )

-    {

-        m_pScrollBar->Hide();

-        m_nTopIndex = 0;

-    }

-

-    m_bHasScrollBar = bNeedsScrollBar;

-}

-

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

-void ExtensionBox_Impl::Resize()

-{

-    RecalcAll();

-}

-

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

-long ExtensionBox_Impl::PointToPos( const Point& rPos )

-{

-    long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;

-

-    if ( m_bHasActive && ( nPos > m_nActive ) )

-    {

-        if ( rPos.Y() + m_nTopIndex <= m_nActive*m_nStdHeight + m_nActiveHeight )

-            nPos = m_nActive;

-        else

-            nPos = ( rPos.Y() + m_nTopIndex - (m_nActiveHeight - m_nStdHeight) ) / m_nStdHeight;

-    }

-

-    return nPos;

-}

-

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

-void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )

-{

-    long nPos = PointToPos( rMEvt.GetPosPixel() );

-

-    if ( rMEvt.IsLeft() )

-    {

-        if ( rMEvt.IsMod1() && m_bHasActive )

-            selectEntry( m_vEntries.size() );   // Selecting an not existing entry will deselect the current one

-        else

-            selectEntry( nPos );

-    }

-}

-

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

-long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )

-{

-    if ( !m_bInDelete )

-        DeleteRemoved();

-

-    bool bHandled = false;

-

-    if ( rNEvt.GetType() == EVENT_KEYINPUT )

-    {

-        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();

-        KeyCode         aKeyCode = pKEvt->GetKeyCode();

-        USHORT          nKeyCode = aKeyCode.GetCode();

-

-        if ( nKeyCode == KEY_TAB )

-            bHandled = HandleTabKey( aKeyCode.IsShift() );

-        else if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )

-            bHandled = HandleCursorKey( nKeyCode );

-    }

-

-    if ( rNEvt.GetType() == EVENT_COMMAND )

-    {

-        if ( m_bHasScrollBar &&

-             ( rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL ) )

-        {

-            const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData();

-            if ( pData->GetMode() == COMMAND_WHEEL_SCROLL )

-            {

-                long nThumbPos = m_pScrollBar->GetThumbPos();

-                if ( pData->GetDelta() < 0 )

-                    m_pScrollBar->DoScroll( nThumbPos + m_nStdHeight );

-                else

-                    m_pScrollBar->DoScroll( nThumbPos - m_nStdHeight );

-                bHandled = true;

-            }

-        }

-    }

-

-    if ( !bHandled )

-        return Control::Notify( rNEvt );

-    else

-        return true;

-}

-

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

-bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart,

-                                      const long nEnd, long &nPos )

-{

-    nPos = nStart;

-    if ( nStart > nEnd )

-        return false;

-

-    StringCompare eCompare;

-

-    if ( nStart == nEnd )

-    {

-        eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nStart ] );

-        if ( eCompare == COMPARE_LESS )

-            return false;

-        else if ( eCompare == COMPARE_EQUAL )

-        {

-            //Workaround. See i86963.

-            if (pEntry->m_xPackage != m_vEntries[nStart]->m_xPackage)

-                return false;

-

-            if ( m_bInCheckMode )

-                m_vEntries[ nStart ]->m_bChecked = true;

-            return true;

-        }

-        else

-        {

-            nPos = nStart + 1;

-            return false;

-        }

-    }

-

-    const long nMid = nStart + ( ( nEnd - nStart ) / 2 );

-    eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nMid ] );

-

-    if ( eCompare == COMPARE_LESS )

-        return FindEntryPos( pEntry, nStart, nMid-1, nPos );

-    else if ( eCompare == COMPARE_GREATER )

-        return FindEntryPos( pEntry, nMid+1, nEnd, nPos );

-    else

-    {

-        //Workaround.See i86963.

-        if (pEntry->m_xPackage != m_vEntries[nMid]->m_xPackage)

-            return false;

-

-        if ( m_bInCheckMode )

-            m_vEntries[ nMid ]->m_bChecked = true;

-        nPos = nMid;

-        return true;

-    }

-}

-

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

-long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,

-                                  const uno::Reference< deployment::XPackageManager > &xPackageManager )

-{

-    long nPos = 0;

-    PackageState eState = m_pManager->getPackageState( xPackage );

-

-    TEntry_Impl pEntry( new Entry_Impl( xPackage, xPackageManager, eState ) );

-    xPackage->addEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );

-

-    ::osl::ClearableMutexGuard guard(m_entriesMutex);

-    if ( m_vEntries.empty() )

-    {

-        pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );

-        pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );

-        pEntry->m_bNew        = m_bInCheckMode;

-        m_vEntries.push_back( pEntry );

-    }

-    else

-    {

-        if ( !FindEntryPos( pEntry, 0, m_vEntries.size()-1, nPos ) )

-        {

-            pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );

-            pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );

-            pEntry->m_bNew        = m_bInCheckMode;

-            m_vEntries.insert( m_vEntries.begin()+nPos, pEntry );

-        }

-        else if ( !m_bInCheckMode )

-        {

-            OSL_ENSURE( 0, "ExtensionBox_Impl::addEntry(): Will not add duplicate entries"  );

-        }

-    }

-    //access to m_nActive must be guarded

-    if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) )

-        m_nActive += 1;

-

-    guard.clear();

-

-    if ( IsReallyVisible() )

-        Invalidate();

-

-    m_bNeedsRecalc = true;

-

-    return nPos;

-}

-

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

-void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage )

-{

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        if ( (*iIndex)->m_xPackage == xPackage )

-        {

-            PackageState eState = m_pManager->getPackageState( xPackage );

-            (*iIndex)->m_bHasOptions = m_pManager->supportsOptions( xPackage );

-            (*iIndex)->m_eState = eState;

-            (*iIndex)->m_sTitle = xPackage->getDisplayName();

-            (*iIndex)->m_sVersion = xPackage->getVersion();

-            (*iIndex)->m_sDescription = xPackage->getDescription();

-

-            if ( eState == AMBIGUOUS )

-                (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );

-            else

-                (*iIndex)->m_sErrorText = String();

-

-            if ( IsReallyVisible() )

-                Invalidate();

-            break;

-        }

-    }

-}

-

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

-void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage > &xPackage )

-{

-    if ( ! m_bInDelete )

-    {

-        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );

-

-        typedef std::vector< TEntry_Impl >::iterator ITER;

-

-        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-        {

-            if ( (*iIndex)->m_xPackage == xPackage )

-            {

-                long nPos = iIndex - m_vEntries.begin();

-

-                // Entries mustn't removed here, because they contain a hyperlink control

-                // which can only be deleted when the thread has the solar mutex. Therefor 

-                // the entry will be moved into the m_vRemovedEntries list which will be

-                // cleared on the next paint event

-                m_vRemovedEntries.push_back( *iIndex );

-                m_vEntries.erase( iIndex );

-

-                m_bNeedsRecalc = true;

-

-                if ( IsReallyVisible() )

-                    Invalidate();

-

-                if ( m_bHasActive )

-                {

-                    if ( nPos < m_nActive )

-                        m_nActive -= 1;

-                    else if ( ( nPos == m_nActive ) &&

-                              ( nPos == (long) m_vEntries.size() ) )

-                        m_nActive -= 1;

-

-                    m_bHasActive = false;

-                    //clear before calling out of this method

-                    aGuard.clear();

-                    selectEntry( m_nActive );

-                }

-                break;

-            }

-        }

-    }

-}

-

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

-void ExtensionBox_Impl::RemoveUnlocked()

-{

-    bool bAllRemoved = false;

-

-    while ( ! bAllRemoved )

-    {

-        bAllRemoved = true;

-

-        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );

-

-        typedef std::vector< TEntry_Impl >::iterator ITER;

-

-        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-        {

-            if ( !(*iIndex)->m_bLocked )

-            {

-                bAllRemoved = false;

-                uno::Reference< deployment::XPackage> xPackage = (*iIndex)->m_xPackage;

-                aGuard.clear();

-                removeEntry( xPackage );

-                break;

-            }

-        }

-    }

-}

-

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

-void ExtensionBox_Impl::prepareChecking( const uno::Reference< deployment::XPackageManager > &xPackageMgr )

-{

-    m_bInCheckMode = true;

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )

-    {

-        if ( (*iIndex)->m_xPackageManager == xPackageMgr )

-            (*iIndex)->m_bChecked = false;

-        else

-            (*iIndex)->m_bChecked = true;

-        (*iIndex)->m_bNew = false;

-    }

-}

-

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

-void ExtensionBox_Impl::checkEntries()

-{

-    long nNewPos = -1;

-    long nPos = 0;

-    bool bNeedsUpdate = false;

-    

-    ::osl::ClearableMutexGuard guard(m_entriesMutex);

-    typedef std::vector< TEntry_Impl >::iterator ITER;

-    ITER iIndex = m_vEntries.begin();

-    while ( iIndex < m_vEntries.end() )

-    {

-        if ( (*iIndex)->m_bChecked == false )

-        {

-            bNeedsUpdate = true;

-            nPos = iIndex-m_vEntries.begin();

-            if ( (*iIndex)->m_bNew )

-            {

-                if ( nNewPos == - 1)

-                    nNewPos = nPos;

-                if ( nPos <= m_nActive )

-                    m_nActive += 1;

-            }

-        }

-        iIndex++;

-    }

-    guard.clear();

-

-    m_bInCheckMode = false;

-

-    if ( nNewPos != - 1)

-        selectEntry( nNewPos );

-

-    if ( bNeedsUpdate )

-    {

-        m_bNeedsRecalc = true;

-        if ( IsReallyVisible() )

-            Invalidate();

-    }

-}

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

-bool ExtensionBox_Impl::isHCMode()

-{

-    return (bool)GetSettings().GetStyleSettings().GetHighContrastMode();

-}

-

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

-void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )

-{

-    if ( m_pScrollBar )

-        m_pScrollBar->SetScrollHdl( rLink );

-}

-

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

-void ExtensionBox_Impl::DoScroll( long nDelta )

-{

-    m_nTopIndex += nDelta;

-    Point aNewSBPt( m_pScrollBar->GetPosPixel() );

-

-    Rectangle aScrRect( Point(), GetOutputSizePixel() );

-    aScrRect.Right() -= m_pScrollBar->GetSizePixel().Width();

-    Scroll( 0, -nDelta, aScrRect );

-

-    m_pScrollBar->SetPosPixel( aNewSBPt );

-}

-

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

-IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar )

-{

-    DoScroll( pScrBar->GetDelta() );

-

-    return 1;

-}

-

-} //namespace dp_gui

+/*************************************************************************
+ *
+ * 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_desktop.hxx"
+
+#include "svtools/controldims.hrc"
+
+#include "dp_gui.h"
+#include "dp_gui_extlistbox.hxx"
+#include "dp_gui_theextmgr.hxx"
+#include "dp_gui_dialog2.hxx"
+#include "dp_dependencies.hxx"
+
+#include "comphelper/processfactory.hxx"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/deployment/DependencyException.hpp"
+#include "com/sun/star/deployment/DeploymentException.hpp"
+
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+using namespace ::com::sun::star;
+
+namespace dp_gui {
+
+//------------------------------------------------------------------------------
+//                          struct Entry_Impl
+//------------------------------------------------------------------------------
+Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
+                        const uno::Reference< deployment::XPackageManager > &xPackageManager,
+                        PackageState eState ) :
+    m_bActive( false ),
+    m_bLocked( false ),
+    m_bHasOptions( false ),
+    m_bShared( false ),
+    m_bNew( false ),
+    m_bChecked( false ),
+    m_bMissingDeps( false ),
+    m_eState( eState ),
+    m_pPublisher( NULL ),
+    m_xPackage( xPackage ),
+    m_xPackageManager( xPackageManager )
+{
+    m_sTitle = xPackage->getDisplayName();
+    m_sVersion = xPackage->getVersion();
+    m_sDescription = xPackage->getDescription();
+
+    beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
+    m_sPublisher = aInfo.First;
+    m_sPublisherURL = aInfo.Second;
+    
+    // get the icons for the package if there are any
+    uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
+    if ( xGraphic.is() )
+        m_aIcon = Image( xGraphic );
+
+    xGraphic = xPackage->getIcon( true );
+    if ( xGraphic.is() )
+        m_aIconHC = Image( xGraphic );
+    else
+        m_aIconHC = m_aIcon;
+
+    m_bLocked = m_xPackageManager->isReadOnly();
+
+    if ( eState == AMBIGUOUS )
+        m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+    else if ( eState == NOT_REGISTERED )
+        checkDependencies();
+}
+
+//------------------------------------------------------------------------------
+Entry_Impl::~Entry_Impl()
+{}
+
+//------------------------------------------------------------------------------
+StringCompare Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const
+{
+    StringCompare eCompare = (StringCompare) pCollator->compareString( m_sTitle, pEntry->m_sTitle );
+    if ( eCompare == COMPARE_EQUAL )
+    {
+        eCompare = m_sVersion.CompareTo( pEntry->m_sVersion );
+        if ( eCompare == COMPARE_EQUAL )
+        {     
+            if ( m_xPackageManager != pEntry->m_xPackageManager )
+            {
+                sal_Int32 nCompare = m_xPackageManager->getContext().compareTo( pEntry->m_xPackageManager->getContext() );
+                if ( nCompare < 0 )
+                    eCompare = COMPARE_LESS;
+                else if ( nCompare > 0 )
+                    eCompare = COMPARE_GREATER;
+            }
+        }
+    }
+    return eCompare;
+}
+
+//------------------------------------------------------------------------------
+void Entry_Impl::checkDependencies()
+{
+    try {
+        m_xPackage->checkDependencies( uno::Reference< ucb::XCommandEnvironment >() );
+    }
+    catch ( deployment::DeploymentException &e )
+    {
+        deployment::DependencyException depExc;
+        if ( e.Cause >>= depExc )
+        {
+            rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) );
+            for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i )
+            {
+                aMissingDep += OUSTR("\n");
+                aMissingDep += dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]);
+            }
+            aMissingDep += OUSTR("\n");
+            m_sErrorText = aMissingDep;
+            m_bMissingDeps = true;
+        }
+    }
+}
+//------------------------------------------------------------------------------
+// ExtensionRemovedListener
+//------------------------------------------------------------------------------
+void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )
+    throw ( uno::RuntimeException )
+{
+    uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY );
+
+    if ( xPackage.is() )
+    {
+        m_pParent->removeEntry( xPackage );
+    }
+}
+
+//------------------------------------------------------------------------------
+ExtensionRemovedListener::~ExtensionRemovedListener()
+{
+}
+
+//------------------------------------------------------------------------------
+// ExtensionBox_Impl
+//------------------------------------------------------------------------------
+ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager ) :
+    IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
+    m_bHasScrollBar( false ),
+    m_bHasActive( false ),
+    m_bNeedsRecalc( true ),
+    m_bHasNew( false ),
+    m_bInCheckMode( false ),
+    m_bAdjustActive( false ),
+    m_bInDelete( false ),
+    m_nActive( 0 ),
+    m_nTopIndex( 0 ),
+    m_nActiveHeight( 0 ),
+    m_nExtraHeight( 2 ),
+    m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
+    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
+    m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
+    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),
+    m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
+    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),
+    m_pScrollBar( NULL ),
+    m_pManager( pManager )
+{
+    SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
+
+    m_pScrollBar = new ScrollBar( this, WB_VERT );
+    m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) );
+    m_pScrollBar->EnableDrag();
+
+    SetPaintTransparent( true );
+    SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );
+    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;
+    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();
+    if ( nIconHeight < nTitleHeight )
+        m_nStdHeight = nTitleHeight;
+    else
+        m_nStdHeight = nIconHeight;
+    m_nStdHeight += GetTextHeight() + TOP_OFFSET;
+
+    nIconHeight = ICON_HEIGHT + 2*TOP_OFFSET + 1;
+    if ( m_nStdHeight < nIconHeight )
+        m_nStdHeight = nIconHeight;
+
+    m_nActiveHeight = m_nStdHeight;
+
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+    if( IsControlBackground() )
+        SetBackground( GetControlBackground() );
+    else
+        SetBackground( rStyleSettings.GetFieldColor() );
+
+    m_xRemoveListener = new ExtensionRemovedListener( this );
+
+    m_pLocale = new lang::Locale( Application::GetSettings().GetLocale() );
+    m_pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
+    m_pCollator->loadDefaultCollator( *m_pLocale, i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
+
+    Show();
+}
+
+//------------------------------------------------------------------------------
+ExtensionBox_Impl::~ExtensionBox_Impl()
+{
+    if ( ! m_bInDelete )
+        DeleteRemoved();
+
+    m_bInDelete = true;
+
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        if ( (*iIndex)->m_pPublisher )
+        {
+            delete (*iIndex)->m_pPublisher;
+            (*iIndex)->m_pPublisher = NULL;
+        }
+        (*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
+    }
+
+    m_vEntries.clear();
+
+    delete m_pScrollBar;
+
+    m_xRemoveListener.clear();
+
+    delete m_pLocale;
+    delete m_pCollator;
+}
+
+//------------------------------------------------------------------------------
+sal_Int32 ExtensionBox_Impl::getItemCount() const
+{
+    return static_cast< sal_Int32 >( m_vEntries.size() );
+}
+
+//------------------------------------------------------------------------------
+sal_Int32 ExtensionBox_Impl::getSelIndex() const
+{
+    if ( m_bHasActive )
+    {
+        OSL_ASSERT( m_nActive >= -1);
+        return static_cast< sal_Int32 >( m_nActive );
+    }
+    else
+        return static_cast< sal_Int32 >( EXTENSION_LISTBOX_ENTRY_NOTFOUND );
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const
+{
+    if ( nIndex < 0 )
+        throw lang::IllegalArgumentException( OUSTR("The list index starts with 0"),0, 0 );
+    if ( static_cast< sal_uInt32 >( nIndex ) >= m_vEntries.size())
+        throw lang::IllegalArgumentException( OUSTR("There is no element at the provided position."
+        "The position exceeds the number of available list entries"),0, 0 );
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sTitle;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sVersion;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sDescription;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sPublisher;
+}
+
+//------------------------------------------------------------------------------
+rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    return m_vEntries[ nIndex ]->m_sPublisherURL;
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::select( sal_Int32 nIndex )
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    checkIndex( nIndex );
+    selectEntry( nIndex );   
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::select( const rtl::OUString & sName )
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+    typedef ::std::vector< TEntry_Impl >::const_iterator It;
+
+    for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )
+    {
+        if ( sName.equals( (*iIter)->m_sTitle ) )
+        {
+            long nPos = iIter - m_vEntries.begin();
+            selectEntry( nPos );
+            break;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// Title + description
+void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    // get title height
+    long aTextHeight;
+    long nIconHeight = 2*TOP_OFFSET + SMALL_ICON_SIZE;
+    long nTitleHeight = 2*TOP_OFFSET + GetTextHeight();
+    if ( nIconHeight < nTitleHeight )
+        aTextHeight = nTitleHeight;
+    else
+        aTextHeight = nIconHeight;
+
+    // calc description height
+    Size aSize = GetOutputSizePixel();
+    if ( m_bHasScrollBar )
+        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();
+
+    aSize.Width() -= ICON_OFFSET;
+    aSize.Height() = 10000;
+
+    rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText );
+    aText += m_vEntries[ nPos ]->m_sDescription;
+    
+    Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,
+                                   TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
+    aTextHeight += aRect.GetHeight();
+
+    if ( aTextHeight < m_nStdHeight )
+        aTextHeight = m_nStdHeight;
+
+    m_nActiveHeight = aTextHeight + m_nExtraHeight;
+}
+
+//------------------------------------------------------------------------------
+const Size ExtensionBox_Impl::GetMinOutputSizePixel() const
+{
+    return Size( 200, 80 );
+}
+
+//------------------------------------------------------------------------------
+Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    Size aSize( GetOutputSizePixel() );
+
+    if ( m_bHasScrollBar )
+        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();
+
+    if ( m_vEntries[ nPos ]->m_bActive )
+        aSize.Height() = m_nActiveHeight;
+    else
+        aSize.Height() = m_nStdHeight;
+
+    Point aPos( 0, -m_nTopIndex + nPos * m_nStdHeight );
+    if ( m_bHasActive && ( nPos < m_nActive ) )
+        aPos.Y() += m_nActiveHeight - m_nStdHeight;
+
+    return Rectangle( aPos, aSize );
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::DeleteRemoved()
+{
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    m_bInDelete = true;
+
+    if ( ! m_vRemovedEntries.empty() )
+    {
+        typedef std::vector< TEntry_Impl >::iterator ITER;
+
+        for ( ITER iIndex = m_vRemovedEntries.begin(); iIndex < m_vRemovedEntries.end(); ++iIndex )
+        {
+            if ( (*iIndex)->m_pPublisher )
+            {
+                delete (*iIndex)->m_pPublisher;
+                (*iIndex)->m_pPublisher = NULL;
+            }
+        }
+
+        m_vRemovedEntries.clear();
+    }
+
+    m_bInDelete = false;
+}
+
+//------------------------------------------------------------------------------
+//This function may be called with nPos < 0
+void ExtensionBox_Impl::selectEntry( const long nPos )
+{
+    //ToDo whe should not use the guard at such a big scope here.
+    //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be 
+    //modified in this function.
+    //It would be probably best to always use a copy of m_vEntries
+    //and some other state variables from ExtensionBox_Impl for 
+    //the whole painting operation. See issue i86993
+    ::osl::ClearableMutexGuard guard(m_entriesMutex);
+
+    if ( m_bInCheckMode )
+        return;
+
+    if ( m_bHasActive )
+    {
+        if ( nPos == m_nActive )
+            return;
+
+        m_bHasActive = false;
+        m_vEntries[ m_nActive ]->m_bActive = false;
+    }
+
+    if ( ( nPos >= 0 ) && ( nPos < (long) m_vEntries.size() ) )
+    {
+        m_bHasActive = true;
+        m_nActive = nPos;
+        m_vEntries[ nPos ]->m_bActive = true;
+
+        if ( IsReallyVisible() )
+        {
+            m_bNeedsRecalc = true;
+            m_bAdjustActive = true;
+        }
+    }
+
+    if ( IsReallyVisible() )
+        Invalidate();
+
+    guard.clear();
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry )
+{
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+
+    if ( pEntry->m_bActive )
+        SetTextColor( rStyleSettings.GetHighlightTextColor() );
+    else if ( ( pEntry->m_eState != REGISTERED ) && ( pEntry->m_eState != NOT_AVAILABLE ) )
+        SetTextColor( rStyleSettings.GetDisableColor() );
+    else if ( IsControlForeground() )
+        SetTextColor( GetControlForeground() );
+    else
+        SetTextColor( rStyleSettings.GetFieldTextColor() );
+
+    if ( pEntry->m_bActive )
+    {
+        SetLineColor();
+        SetFillColor( rStyleSettings.GetHighlightColor() );
+        DrawRect( rRect );
+    }
+    else
+    {
+        if( IsControlBackground() )
+            SetBackground( GetControlBackground() );
+        else
+            SetBackground( rStyleSettings.GetFieldColor() );
+
+        SetTextFillColor();
+        Erase( rRect );
+    }
+
+    // Draw extension icon
+    Point aPos( rRect.TopLeft() );
+    aPos += Point( TOP_OFFSET, TOP_OFFSET );
+    Image aImage;
+    if ( ! pEntry->m_aIcon )
+        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;
+    else
+        aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
+    Size aImageSize = aImage.GetSizePixel();
+    if ( ( aImageSize.Width() <= ICON_HEIGHT ) && ( aImageSize.Height() <= ICON_HEIGHT ) )
+        DrawImage( Point( aPos.X()+((ICON_HEIGHT-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );
+    else
+        DrawImage( aPos, Size( ICON_HEIGHT, ICON_HEIGHT ), aImage );
+
+    // Setup fonts
+    Font aStdFont( GetFont() );
+    Font aBoldFont( aStdFont );
+    aBoldFont.SetWeight( WEIGHT_BOLD );
+    SetFont( aBoldFont );
+    long aTextHeight = GetTextHeight();
+
+    // Init publisher link here
+    if ( !pEntry->m_pPublisher && pEntry->m_sPublisher.Len() )
+    {
+        pEntry->m_pPublisher = new svt::FixedHyperlink( this );
+        pEntry->m_pPublisher->SetBackground();
+        pEntry->m_pPublisher->SetPaintTransparent( true );
+        pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL );
+        pEntry->m_pPublisher->SetDescription( pEntry->m_sPublisher );
+        Size aSize = FixedText::CalcMinimumTextSize( pEntry->m_pPublisher );
+        pEntry->m_pPublisher->SetSizePixel( aSize );
+
+        if ( m_aClickHdl.IsSet() )
+            pEntry->m_pPublisher->SetClickHdl( m_aClickHdl );
+    }
+
+    // Get max title width
+    long nMaxTitleWidth = rRect.GetWidth() - ICON_OFFSET;
+    nMaxTitleWidth -= ( 2 * SMALL_ICON_SIZE ) + ( 4 * SPACE_BETWEEN );
+    if ( pEntry->m_pPublisher )
+    {
+        nMaxTitleWidth -= pEntry->m_pPublisher->GetSizePixel().Width() + (2*SPACE_BETWEEN);
+    }
+
+    long aVersionWidth = GetTextWidth( pEntry->m_sVersion );
+    long aTitleWidth = GetTextWidth( pEntry->m_sTitle ) + (aTextHeight / 3);
+
+    aPos = rRect.TopLeft() + Point( ICON_OFFSET, TOP_OFFSET );
+
+    if ( aTitleWidth > nMaxTitleWidth - aVersionWidth )
+    {
+        aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3);
+        String aShortTitle = GetEllipsisString( pEntry->m_sTitle, aTitleWidth );
+        DrawText( aPos, aShortTitle );
+        aTitleWidth += (aTextHeight / 3);
+    }
+    else
+        DrawText( aPos, pEntry->m_sTitle );
+
+    SetFont( aStdFont );
+    DrawText( Point( aPos.X() + aTitleWidth, aPos.Y() ), pEntry->m_sVersion );
+
+    long nIconHeight = TOP_OFFSET + SMALL_ICON_SIZE;
+    long nTitleHeight = TOP_OFFSET + GetTextHeight();
+    if ( nIconHeight < nTitleHeight )
+        aTextHeight = nTitleHeight;
+    else
+        aTextHeight = nIconHeight;
+
+    // draw description
+    String sDescription;
+    if ( pEntry->m_sErrorText.Len() )
+    {
+        if ( pEntry->m_bActive )
+            sDescription = pEntry->m_sErrorText + OUSTR("\n") + pEntry->m_sDescription;
+        else
+            sDescription = pEntry->m_sErrorText;
+    }
+    else
+        sDescription = pEntry->m_sDescription;
+
+    aPos.Y() += aTextHeight;
+    if ( pEntry->m_bActive )
+    {
+        DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - m_nExtraHeight ),
+                  sDescription, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
+    }
+    else
+    {
+        const long nWidth = GetTextWidth( sDescription );
+        if ( nWidth > rRect.GetWidth() - aPos.X() )
+            sDescription = GetEllipsisString( sDescription, rRect.GetWidth() - aPos.X() );
+        DrawText( aPos, sDescription );
+    }
+
+    // Draw publisher link
+    if ( pEntry->m_pPublisher )
+    {
+        pEntry->m_pPublisher->Show();
+        aPos = rRect.TopLeft() + Point( ICON_OFFSET + nMaxTitleWidth + (2*SPACE_BETWEEN), TOP_OFFSET );
+        pEntry->m_pPublisher->SetPosPixel( aPos );
+    }
+
+    // Draw status icons
+    if ( pEntry->m_bShared )
+    {
+        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+    }
+    if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps )
+    {
+        aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );
+    }
+    
+    SetLineColor( Color( COL_LIGHTGRAY ) );
+    DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::RecalcAll()
+{
+    if ( m_bHasActive )
+        CalcActiveHeight( m_nActive );
+
+    SetupScrollBar();
+
+    if ( m_bHasActive )
+    {
+        Rectangle aEntryRect = GetEntryRect( m_nActive );
+
+        if ( m_bAdjustActive )
+        {
+            m_bAdjustActive = false;
+
+            // If the top of the selected entry isn't visible, make it visible
+            if ( aEntryRect.Top() < 0 )
+            {
+                m_nTopIndex += aEntryRect.Top();
+                aEntryRect.Move( 0, -aEntryRect.Top() );
+            }
+
+            // If the bottom of the selected entry isn't visible, make it visible even if now the top
+            // isn't visible any longer ( the buttons are more important )
+            Size aOutputSize = GetOutputSizePixel();
+            if ( aEntryRect.Bottom() > aOutputSize.Height() )
+            {
+                m_nTopIndex += ( aEntryRect.Bottom() - aOutputSize.Height() );
+                aEntryRect.Move( 0, -( aEntryRect.Bottom() - aOutputSize.Height() ) );
+            }
+
+            // If there is unused space below the last entry but all entries don't fit into the box,
+            // move the content down to use the whole space
+            const long nTotalHeight = GetTotalHeight();
+            if ( m_bHasScrollBar && ( aOutputSize.Height() + m_nTopIndex > nTotalHeight ) )
+            {
+                long nOffset = m_nTopIndex;
+                m_nTopIndex = nTotalHeight - aOutputSize.Height();
+                nOffset -= m_nTopIndex;
+                aEntryRect.Move( 0, nOffset );
+            }
+
+            if ( m_bHasScrollBar )
+                m_pScrollBar->SetThumbPos( m_nTopIndex );
+        }
+    }
+
+    m_bNeedsRecalc = false;
+}
+
+// -----------------------------------------------------------------------
+bool ExtensionBox_Impl::HandleTabKey( bool )
+{
+    return false;
+}
+
+// -----------------------------------------------------------------------
+bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )
+{
+    if ( m_vEntries.empty() )
+        return true;
+
+    long nSelect = 0;
+
+    if ( m_bHasActive )
+    {
+        long nPageSize = GetOutputSizePixel().Height() / m_nStdHeight;
+        if ( nPageSize < 2 )
+            nPageSize = 2;
+
+        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_RIGHT ) )
+            nSelect = m_nActive + 1;
+        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_LEFT ) )
+            nSelect = m_nActive - 1;
+        else if ( nKeyCode == KEY_HOME )
+            nSelect = 0;
+        else if ( nKeyCode == KEY_END )
+            nSelect = m_vEntries.size() - 1;
+        else if ( nKeyCode == KEY_PAGEUP )
+            nSelect = m_nActive - nPageSize + 1;
+        else if ( nKeyCode == KEY_PAGEDOWN )
+            nSelect = m_nActive + nPageSize - 1;
+    }
+    else // when there is no selected entry, we will select the first or the last.
+    {
+        if ( ( nKeyCode == KEY_DOWN ) || ( nKeyCode == KEY_PAGEDOWN ) || ( nKeyCode == KEY_HOME ) )
+            nSelect = 0;
+        else if ( ( nKeyCode == KEY_UP ) || ( nKeyCode == KEY_PAGEUP ) || ( nKeyCode == KEY_END ) )
+            nSelect = m_vEntries.size() - 1;
+    }
+
+    if ( nSelect < 0 )
+        nSelect = 0;
+    if ( nSelect >= (long) m_vEntries.size() )
+        nSelect = m_vEntries.size() - 1;
+
+    selectEntry( nSelect );
+
+    return true;
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ )
+{
+    if ( !m_bInDelete )
+        DeleteRemoved();
+
+    if ( m_bNeedsRecalc )
+        RecalcAll();
+
+    Point aStart( 0, -m_nTopIndex );
+    Size aSize( GetOutputSizePixel() );
+
+    if ( m_bHasScrollBar )
+        aSize.Width() -= m_pScrollBar->GetSizePixel().Width();
+
+    const ::osl::MutexGuard aGuard( m_entriesMutex );
+
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        aSize.Height() = (*iIndex)->m_bActive ? m_nActiveHeight : m_nStdHeight;
+        Rectangle aEntryRect( aStart, aSize );
+        DrawRow( aEntryRect, *iIndex );
+        aStart.Y() += aSize.Height();
+    }
+}
+
+// -----------------------------------------------------------------------
+long ExtensionBox_Impl::GetTotalHeight() const
+{
+    long nHeight = m_vEntries.size() * m_nStdHeight;
+
+    if ( m_bHasActive )
+    {
+        nHeight += m_nActiveHeight - m_nStdHeight;
+    }
+
+    return nHeight;
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::SetupScrollBar()
+{
+    const Size aSize = GetOutputSizePixel();
+    const long nScrBarSize = GetSettings().GetStyleSettings().GetScrollBarSize();
+    const long nTotalHeight = GetTotalHeight();
+    const bool bNeedsScrollBar = ( nTotalHeight > aSize.Height() );
+
+    if ( bNeedsScrollBar )
+    {
+        if ( m_nTopIndex + aSize.Height() > nTotalHeight )
+            m_nTopIndex = nTotalHeight - aSize.Height();
+
+        m_pScrollBar->SetPosSizePixel( Point( aSize.Width() - nScrBarSize, 0 ),
+                                       Size( nScrBarSize, aSize.Height() ) );
+        m_pScrollBar->SetRangeMax( nTotalHeight );
+        m_pScrollBar->SetVisibleSize( aSize.Height() );
+        m_pScrollBar->SetPageSize( ( aSize.Height() * 4 ) / 5 );
+        m_pScrollBar->SetLineSize( m_nStdHeight );
+        m_pScrollBar->SetThumbPos( m_nTopIndex );
+
+        if ( !m_bHasScrollBar )
+            m_pScrollBar->Show();
+    }
+    else if ( m_bHasScrollBar )
+    {
+        m_pScrollBar->Hide();
+        m_nTopIndex = 0;
+    }
+
+    m_bHasScrollBar = bNeedsScrollBar;
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::Resize()
+{
+    RecalcAll();
+}
+
+//------------------------------------------------------------------------------
+long ExtensionBox_Impl::PointToPos( const Point& rPos )
+{
+    long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;
+
+    if ( m_bHasActive && ( nPos > m_nActive ) )
+    {
+        if ( rPos.Y() + m_nTopIndex <= m_nActive*m_nStdHeight + m_nActiveHeight )
+            nPos = m_nActive;
+        else
+            nPos = ( rPos.Y() + m_nTopIndex - (m_nActiveHeight - m_nStdHeight) ) / m_nStdHeight;
+    }
+
+    return nPos;
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    long nPos = PointToPos( rMEvt.GetPosPixel() );
+
+    if ( rMEvt.IsLeft() )
+    {
+        if ( rMEvt.IsMod1() && m_bHasActive )
+            selectEntry( m_vEntries.size() );   // Selecting an not existing entry will deselect the current one
+        else
+            selectEntry( nPos );
+    }
+}
+
+//------------------------------------------------------------------------------
+long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
+{
+    if ( !m_bInDelete )
+        DeleteRemoved();
+
+    bool bHandled = false;
+
+    if ( rNEvt.GetType() == EVENT_KEYINPUT )
+    {
+        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
+        KeyCode         aKeyCode = pKEvt->GetKeyCode();
+        USHORT          nKeyCode = aKeyCode.GetCode();
+
+        if ( nKeyCode == KEY_TAB )
+            bHandled = HandleTabKey( aKeyCode.IsShift() );
+        else if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )
+            bHandled = HandleCursorKey( nKeyCode );
+    }
+
+    if ( rNEvt.GetType() == EVENT_COMMAND )
+    {
+        if ( m_bHasScrollBar &&
+             ( rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL ) )
+        {
+            const CommandWheelData* pData = rNEvt.GetCommandEvent()->GetWheelData();
+            if ( pData->GetMode() == COMMAND_WHEEL_SCROLL )
+            {
+                long nThumbPos = m_pScrollBar->GetThumbPos();
+                if ( pData->GetDelta() < 0 )
+                    m_pScrollBar->DoScroll( nThumbPos + m_nStdHeight );
+                else
+                    m_pScrollBar->DoScroll( nThumbPos - m_nStdHeight );
+                bHandled = true;
+            }
+        }
+    }
+
+    if ( !bHandled )
+        return Control::Notify( rNEvt );
+    else
+        return true;
+}
+
+//------------------------------------------------------------------------------
+bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart,
+                                      const long nEnd, long &nPos )
+{
+    nPos = nStart;
+    if ( nStart > nEnd )
+        return false;
+
+    StringCompare eCompare;
+
+    if ( nStart == nEnd )
+    {
+        eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nStart ] );
+        if ( eCompare == COMPARE_LESS )
+            return false;
+        else if ( eCompare == COMPARE_EQUAL )
+        {
+            //Workaround. See i86963.
+            if (pEntry->m_xPackage != m_vEntries[nStart]->m_xPackage)
+                return false;
+
+            if ( m_bInCheckMode )
+                m_vEntries[ nStart ]->m_bChecked = true;
+            return true;
+        }
+        else
+        {
+            nPos = nStart + 1;
+            return false;
+        }
+    }
+
+    const long nMid = nStart + ( ( nEnd - nStart ) / 2 );
+    eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nMid ] );
+
+    if ( eCompare == COMPARE_LESS )
+        return FindEntryPos( pEntry, nStart, nMid-1, nPos );
+    else if ( eCompare == COMPARE_GREATER )
+        return FindEntryPos( pEntry, nMid+1, nEnd, nPos );
+    else
+    {
+        //Workaround.See i86963.
+        if (pEntry->m_xPackage != m_vEntries[nMid]->m_xPackage)
+            return false;
+
+        if ( m_bInCheckMode )
+            m_vEntries[ nMid ]->m_bChecked = true;
+        nPos = nMid;
+        return true;
+    }
+}
+
+//------------------------------------------------------------------------------
+long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,
+                                  const uno::Reference< deployment::XPackageManager > &xPackageManager )
+{
+    long nPos = 0;
+    PackageState eState = m_pManager->getPackageState( xPackage );
+
+    TEntry_Impl pEntry( new Entry_Impl( xPackage, xPackageManager, eState ) );
+    xPackage->addEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
+
+    ::osl::ClearableMutexGuard guard(m_entriesMutex);
+    if ( m_vEntries.empty() )
+    {
+        pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );
+        pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );
+        pEntry->m_bNew        = m_bInCheckMode;
+        m_vEntries.push_back( pEntry );
+    }
+    else
+    {
+        if ( !FindEntryPos( pEntry, 0, m_vEntries.size()-1, nPos ) )
+        {
+            pEntry->m_bHasOptions = m_pManager->supportsOptions( xPackage );
+            pEntry->m_bShared     = ( m_pManager->getSharedPkgMgr() == xPackageManager );
+            pEntry->m_bNew        = m_bInCheckMode;
+            m_vEntries.insert( m_vEntries.begin()+nPos, pEntry );
+        }
+        else if ( !m_bInCheckMode )
+        {
+            OSL_ENSURE( 0, "ExtensionBox_Impl::addEntry(): Will not add duplicate entries"  );
+        }
+    }
+    //access to m_nActive must be guarded
+    if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) )
+        m_nActive += 1;
+
+    guard.clear();
+
+    if ( IsReallyVisible() )
+        Invalidate();
+
+    m_bNeedsRecalc = true;
+
+    return nPos;
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage )
+{
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        if ( (*iIndex)->m_xPackage == xPackage )
+        {
+            PackageState eState = m_pManager->getPackageState( xPackage );
+            (*iIndex)->m_bHasOptions = m_pManager->supportsOptions( xPackage );
+            (*iIndex)->m_eState = eState;
+            (*iIndex)->m_sTitle = xPackage->getDisplayName();
+            (*iIndex)->m_sVersion = xPackage->getVersion();
+            (*iIndex)->m_sDescription = xPackage->getDescription();
+
+            if ( eState == AMBIGUOUS )
+                (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+            else
+                (*iIndex)->m_sErrorText = String();
+
+            if ( IsReallyVisible() )
+                Invalidate();
+            break;
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage > &xPackage )
+{
+    if ( ! m_bInDelete )
+    {
+        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );
+
+        typedef std::vector< TEntry_Impl >::iterator ITER;
+
+        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+        {
+            if ( (*iIndex)->m_xPackage == xPackage )
+            {
+                long nPos = iIndex - m_vEntries.begin();
+
+                // Entries mustn't removed here, because they contain a hyperlink control
+                // which can only be deleted when the thread has the solar mutex. Therefor 
+                // the entry will be moved into the m_vRemovedEntries list which will be
+                // cleared on the next paint event
+                m_vRemovedEntries.push_back( *iIndex );
+                m_vEntries.erase( iIndex );
+
+                m_bNeedsRecalc = true;
+
+                if ( IsReallyVisible() )
+                    Invalidate();
+
+                if ( m_bHasActive )
+                {
+                    if ( nPos < m_nActive )
+                        m_nActive -= 1;
+                    else if ( ( nPos == m_nActive ) &&
+                              ( nPos == (long) m_vEntries.size() ) )
+                        m_nActive -= 1;
+
+                    m_bHasActive = false;
+                    //clear before calling out of this method
+                    aGuard.clear();
+                    selectEntry( m_nActive );
+                }
+                break;
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::RemoveUnlocked()
+{
+    bool bAllRemoved = false;
+
+    while ( ! bAllRemoved )
+    {
+        bAllRemoved = true;
+
+        ::osl::ClearableMutexGuard aGuard( m_entriesMutex );
+
+        typedef std::vector< TEntry_Impl >::iterator ITER;
+
+        for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+        {
+            if ( !(*iIndex)->m_bLocked )
+            {
+                bAllRemoved = false;
+                uno::Reference< deployment::XPackage> xPackage = (*iIndex)->m_xPackage;
+                aGuard.clear();
+                removeEntry( xPackage );
+                break;
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::prepareChecking( const uno::Reference< deployment::XPackageManager > &xPackageMgr )
+{
+    m_bInCheckMode = true;
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
+    {
+        if ( (*iIndex)->m_xPackageManager == xPackageMgr )
+            (*iIndex)->m_bChecked = false;
+        else
+            (*iIndex)->m_bChecked = true;
+        (*iIndex)->m_bNew = false;
+    }
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::checkEntries()
+{
+    long nNewPos = -1;
+    long nPos = 0;
+    bool bNeedsUpdate = false;
+    
+    ::osl::ClearableMutexGuard guard(m_entriesMutex);
+    typedef std::vector< TEntry_Impl >::iterator ITER;
+    ITER iIndex = m_vEntries.begin();
+    while ( iIndex < m_vEntries.end() )
+    {
+        if ( (*iIndex)->m_bChecked == false )
+        {
+            bNeedsUpdate = true;
+            nPos = iIndex-m_vEntries.begin();
+            if ( (*iIndex)->m_bNew )
+            {
+                if ( nNewPos == - 1)
+                    nNewPos = nPos;
+                if ( nPos <= m_nActive )
+                    m_nActive += 1;
+            }
+        }
+        iIndex++;
+    }
+    guard.clear();
+
+    m_bInCheckMode = false;
+
+    if ( nNewPos != - 1)
+        selectEntry( nNewPos );
+
+    if ( bNeedsUpdate )
+    {
+        m_bNeedsRecalc = true;
+        if ( IsReallyVisible() )
+            Invalidate();
+    }
+}
+//------------------------------------------------------------------------------
+bool ExtensionBox_Impl::isHCMode()
+{
+    return (bool)GetSettings().GetStyleSettings().GetHighContrastMode();
+}
+
+//------------------------------------------------------------------------------
+void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )
+{
+    if ( m_pScrollBar )
+        m_pScrollBar->SetScrollHdl( rLink );
+}
+
+// -----------------------------------------------------------------------
+void ExtensionBox_Impl::DoScroll( long nDelta )
+{
+    m_nTopIndex += nDelta;
+    Point aNewSBPt( m_pScrollBar->GetPosPixel() );
+
+    Rectangle aScrRect( Point(), GetOutputSizePixel() );
+    aScrRect.Right() -= m_pScrollBar->GetSizePixel().Width();
+    Scroll( 0, -nDelta, aScrRect );
+
+    m_pScrollBar->SetPosPixel( aNewSBPt );
+}
+
+// -----------------------------------------------------------------------
+IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar )
+{
+    DoScroll( pScrBar->GetDelta() );
+
+    return 1;
+}
+
+} //namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index e1a17bb06d..2749db99ce 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -1,271 +1,267 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: dp_gui_dialog2.cxx,v $

- *

- * $Revision: 1.8.4.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.

- *

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

-

-#include "rtl/ustring.hxx"

-#include "vcl/scrbar.hxx"

-#include "vcl/fixed.hxx"

-#include "vcl/dialog.hxx"

-

-#include "svtools/extensionlistbox.hxx"

-#include "svtools/fixedhyper.hxx"

-#include "cppuhelper/implbase1.hxx"

-#include "unotools/collatorwrapper.hxx"

-

-#include "com/sun/star/lang/Locale.hpp"

-#include "com/sun/star/lang/XEventListener.hpp"

-#include "com/sun/star/deployment/XPackage.hpp"

-#include "com/sun/star/deployment/XPackageManager.hpp"

-

-#include <boost/shared_ptr.hpp>

-

-namespace dp_gui {

-

-#define SMALL_ICON_SIZE     16

-#define TOP_OFFSET           3

-#define ICON_HEIGHT         42

-#define ICON_OFFSET         50

-#define RIGHT_ICON_OFFSET    5

-#define SPACE_BETWEEN        3

-

-class TheExtensionManager;

-

-typedef ::boost::shared_ptr< svt::FixedHyperlink > TFixedHyperlink;

-

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

-//                          struct Entry_Impl

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

-struct Entry_Impl;

-

-typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl;

-

-struct Entry_Impl

-{

-    bool            m_bActive;

-    bool            m_bLocked;

-    bool            m_bHasOptions;

-    bool            m_bShared;

-    bool            m_bNew;

-    bool            m_bChecked;

-    bool            m_bMissingDeps;

-    PackageState    m_eState;

-    String          m_sTitle;

-    String          m_sVersion;

-    String          m_sDescription;

-    String          m_sPublisher;

-    String          m_sPublisherURL;

-    String          m_sErrorText;

-    Image           m_aIcon;

-    Image           m_aIconHC;

-    svt::FixedHyperlink *m_pPublisher;

-

-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> m_xPackage;

-    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager> m_xPackageManager;

-

-    Entry_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,

-                const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,

-                PackageState eState );

-   ~Entry_Impl();

-

-    StringCompare CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const;

-    void          checkDependencies();

-};

-

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

-//                          class ExtensionBox_Impl

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

-

-class ExtensionBox_Impl;

-

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

-class ExtensionRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >

-{

-    ExtensionBox_Impl   *m_pParent;

-

-public:

-

-    ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; }

-   ~ExtensionRemovedListener();

-

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

-    // XEventListener

-    virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )

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

-};

-

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

-class ExtensionBox_Impl : public ::svt::IExtensionListBox

-{

-    bool            m_bHasScrollBar;

-    bool            m_bHasActive;

-    bool            m_bNeedsRecalc;

-    bool            m_bHasNew;

-    bool            m_bInCheckMode;

-    bool            m_bAdjustActive;

-    bool            m_bInDelete;

-    //Must be guarded together with m_vEntries to ensure a valid index at all times.

-    //Use m_entriesMutex as guard.

-    long            m_nActive;

-    long            m_nTopIndex;

-    long            m_nStdHeight;

-    long            m_nActiveHeight;

-    long            m_nExtraHeight;

-    Size            m_aOutputSize;

-    Image           m_aLockedImage;

-    Image           m_aLockedImageHC;

-    Image           m_aWarningImage;

-    Image           m_aWarningImageHC;

-    Image           m_aDefaultImage;

-    Image           m_aDefaultImageHC;

-    Link            m_aClickHdl;

-    

-    ScrollBar      *m_pScrollBar;

-

-    com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener;

-

-    TheExtensionManager      *m_pManager;

-    //This mutex is used for synchronizing access to m_vEntries.

-    //Currently it is used to synchronize adding, removing entries and 

-    //functions like getItemName, getItemDescription, etc. to prevent

-    //that m_vEntries is accessed at an invalid index.

-    //ToDo: There are many more places where m_vEntries is read and which may

-    //fail. For example the Paint method is probable called from the main thread

-    //while new entries are added / removed in a separate thread.

-    mutable ::osl::Mutex    m_entriesMutex;

-    std::vector< TEntry_Impl > m_vEntries;

-    std::vector< TEntry_Impl > m_vRemovedEntries;

-

-    ::com::sun::star::lang::Locale    *m_pLocale;

-    CollatorWrapper *m_pCollator;

-

-    void            CalcActiveHeight( const long nPos );

-    long            GetTotalHeight() const;

-    void            SetupScrollBar();

-    void            DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );

-    bool            HandleTabKey( bool bReverse );

-    bool            HandleCursorKey( USHORT nKeyCode );

-    bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );

-    bool            isHCMode();

-    void            DeleteRemoved();

-

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

-    DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );

-

-    //Index starts with 1.

-    //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid.

-    void checkIndex(sal_Int32 pos) const;

-

-

-public:

-                    ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager );

-                   ~ExtensionBox_Impl();

-

-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );

-    virtual void    Paint( const Rectangle &rPaintRect );

-    virtual void    Resize();

-    virtual long    Notify( NotifyEvent& rNEvt );

-

-    const Size      GetMinOutputSizePixel() const;

-    void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }

-    TEntry_Impl     GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } 

-    long            GetEntryCount() { return (long) m_vEntries.size(); }

-    Rectangle       GetEntryRect( const long nPos ) const;

-    bool            HasActive() { return m_bHasActive; }

-    long            PointToPos( const Point& rPos );

-    void            SetScrollHdl( const Link& rLink );

-    void            DoScroll( long nDelta );

-    void            SetHyperlinkHdl( const Link& rLink ){ m_aClickHdl = rLink; }

-    virtual void    RecalcAll();

-    void            RemoveUnlocked();

-

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

-    virtual void    selectEntry( const long nPos );

-    long            addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,

-                              const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager );

-    void            updateEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );

-    void            removeEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );

-

-    void            prepareChecking( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageMgr );

-    void            checkEntries();

-

-    TheExtensionManager*    getExtensionManager() const { return m_pManager; }

-

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

-    //These functions are used for automatic testing

-

-    /** @return  The count of the entries in the list box. */

-    virtual sal_Int32 getItemCount() const;

-

-    /** @return  The index of the first selected entry in the list box.

-        When nothing is selected, which is the case when getItemCount returns '0',

-        then this function returns EXTENSION_LISTBOX_ENTRY_NOTFOUND */

-    virtual sal_Int32 getSelIndex() const;

-

-    /** @return  The item name of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemName( sal_Int32 index ) const;

-

-    /** @return  The version string of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const;

-

-    /** @return  The description string of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const;

-

-    /** @return  The publisher string of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const;

-

-    /** @return  The link behind the publisher text of the entry with the given index

-        The index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const;

-

-    /** The entry at the given position will be selected

-        Index starts with 0.

-        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */

-    virtual void select( sal_Int32 pos );

-

-    /** The first found entry with the given name will be selected

-        When there was no entry found with the name, the selection doesn't change.

-        Please note that there might be more than one entry with the same

-        name, because:

-            1. the name is not unique

-            2. one extension can be installed as user and shared extension.

-    */

-    virtual void select( const ::rtl::OUString & sName );

-};

-

-}

+/*************************************************************************
+ *
+ * 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 "rtl/ustring.hxx"
+#include "vcl/scrbar.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/dialog.hxx"
+
+#include "svtools/extensionlistbox.hxx"
+#include "svtools/fixedhyper.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "unotools/collatorwrapper.hxx"
+
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/deployment/XPackage.hpp"
+#include "com/sun/star/deployment/XPackageManager.hpp"
+
+#include <boost/shared_ptr.hpp>
+
+namespace dp_gui {
+
+#define SMALL_ICON_SIZE     16
+#define TOP_OFFSET           3
+#define ICON_HEIGHT         42
+#define ICON_OFFSET         50
+#define RIGHT_ICON_OFFSET    5
+#define SPACE_BETWEEN        3
+
+class TheExtensionManager;
+
+typedef ::boost::shared_ptr< svt::FixedHyperlink > TFixedHyperlink;
+
+//------------------------------------------------------------------------------
+//                          struct Entry_Impl
+//------------------------------------------------------------------------------
+struct Entry_Impl;
+
+typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl;
+
+struct Entry_Impl
+{
+    bool            m_bActive;
+    bool            m_bLocked;
+    bool            m_bHasOptions;
+    bool            m_bShared;
+    bool            m_bNew;
+    bool            m_bChecked;
+    bool            m_bMissingDeps;
+    PackageState    m_eState;
+    String          m_sTitle;
+    String          m_sVersion;
+    String          m_sDescription;
+    String          m_sPublisher;
+    String          m_sPublisherURL;
+    String          m_sErrorText;
+    Image           m_aIcon;
+    Image           m_aIconHC;
+    svt::FixedHyperlink *m_pPublisher;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> m_xPackage;
+    ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager> m_xPackageManager;
+
+    Entry_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager,
+                PackageState eState );
+   ~Entry_Impl();
+
+    StringCompare CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const;
+    void          checkDependencies();
+};
+
+//------------------------------------------------------------------------------
+//                          class ExtensionBox_Impl
+//------------------------------------------------------------------------------
+
+class ExtensionBox_Impl;
+
+//------------------------------------------------------------------------------
+class ExtensionRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+{
+    ExtensionBox_Impl   *m_pParent;
+
+public:
+
+    ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; }
+   ~ExtensionRemovedListener();
+
+    //===================================================================================
+    // XEventListener
+    virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )
+        throw (::com::sun::star::uno::RuntimeException);
+};
+
+//------------------------------------------------------------------------------
+class ExtensionBox_Impl : public ::svt::IExtensionListBox
+{
+    bool            m_bHasScrollBar;
+    bool            m_bHasActive;
+    bool            m_bNeedsRecalc;
+    bool            m_bHasNew;
+    bool            m_bInCheckMode;
+    bool            m_bAdjustActive;
+    bool            m_bInDelete;
+    //Must be guarded together with m_vEntries to ensure a valid index at all times.
+    //Use m_entriesMutex as guard.
+    long            m_nActive;
+    long            m_nTopIndex;
+    long            m_nStdHeight;
+    long            m_nActiveHeight;
+    long            m_nExtraHeight;
+    Size            m_aOutputSize;
+    Image           m_aLockedImage;
+    Image           m_aLockedImageHC;
+    Image           m_aWarningImage;
+    Image           m_aWarningImageHC;
+    Image           m_aDefaultImage;
+    Image           m_aDefaultImageHC;
+    Link            m_aClickHdl;
+    
+    ScrollBar      *m_pScrollBar;
+
+    com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener;
+
+    TheExtensionManager      *m_pManager;
+    //This mutex is used for synchronizing access to m_vEntries.
+    //Currently it is used to synchronize adding, removing entries and 
+    //functions like getItemName, getItemDescription, etc. to prevent
+    //that m_vEntries is accessed at an invalid index.
+    //ToDo: There are many more places where m_vEntries is read and which may
+    //fail. For example the Paint method is probable called from the main thread
+    //while new entries are added / removed in a separate thread.
+    mutable ::osl::Mutex    m_entriesMutex;
+    std::vector< TEntry_Impl > m_vEntries;
+    std::vector< TEntry_Impl > m_vRemovedEntries;
+
+    ::com::sun::star::lang::Locale    *m_pLocale;
+    CollatorWrapper *m_pCollator;
+
+    void            CalcActiveHeight( const long nPos );
+    long            GetTotalHeight() const;
+    void            SetupScrollBar();
+    void            DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );
+    bool            HandleTabKey( bool bReverse );
+    bool            HandleCursorKey( USHORT nKeyCode );
+    bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
+    bool            isHCMode();
+    void            DeleteRemoved();
+
+    //-----------------
+    DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
+
+    //Index starts with 1.
+    //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid.
+    void checkIndex(sal_Int32 pos) const;
+
+
+public:
+                    ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager );
+                   ~ExtensionBox_Impl();
+
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void    Paint( const Rectangle &rPaintRect );
+    virtual void    Resize();
+    virtual long    Notify( NotifyEvent& rNEvt );
+
+    const Size      GetMinOutputSizePixel() const;
+    void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
+    TEntry_Impl     GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } 
+    long            GetEntryCount() { return (long) m_vEntries.size(); }
+    Rectangle       GetEntryRect( const long nPos ) const;
+    bool            HasActive() { return m_bHasActive; }
+    long            PointToPos( const Point& rPos );
+    void            SetScrollHdl( const Link& rLink );
+    void            DoScroll( long nDelta );
+    void            SetHyperlinkHdl( const Link& rLink ){ m_aClickHdl = rLink; }
+    virtual void    RecalcAll();
+    void            RemoveUnlocked();
+
+    //-----------------
+    virtual void    selectEntry( const long nPos );
+    long            addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,
+                              const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageManager );
+    void            updateEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+    void            removeEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+
+    void            prepareChecking( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackageManager > &xPackageMgr );
+    void            checkEntries();
+
+    TheExtensionManager*    getExtensionManager() const { return m_pManager; }
+
+    //===================================================================================
+    //These functions are used for automatic testing
+
+    /** @return  The count of the entries in the list box. */
+    virtual sal_Int32 getItemCount() const;
+
+    /** @return  The index of the first selected entry in the list box.
+        When nothing is selected, which is the case when getItemCount returns '0',
+        then this function returns EXTENSION_LISTBOX_ENTRY_NOTFOUND */
+    virtual sal_Int32 getSelIndex() const;
+
+    /** @return  The item name of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemName( sal_Int32 index ) const;
+
+    /** @return  The version string of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const;
+
+    /** @return  The description string of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const;
+
+    /** @return  The publisher string of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const;
+
+    /** @return  The link behind the publisher text of the entry with the given index
+        The index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const;
+
+    /** The entry at the given position will be selected
+        Index starts with 0.
+        Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
+    virtual void select( sal_Int32 pos );
+
+    /** The first found entry with the given name will be selected
+        When there was no entry found with the name, the selection doesn't change.
+        Please note that there might be more than one entry with the same
+        name, because:
+            1. the name is not unique
+            2. one extension can be installed as user and shared extension.
+    */
+    virtual void select( const ::rtl::OUString & sName );
+};
+
+}
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 7425c14ae4..7482f71583 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_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: dp_gui_service.cxx,v $
- * $Revision: 1.23.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 44bf8c19d4..40f5bc9d6f 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_shared.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/desktop/source/deployment/gui/dp_gui_system.cxx b/desktop/source/deployment/gui/dp_gui_system.cxx
index 6b04611aa1..bc11a4b12b 100644
--- a/desktop/source/deployment/gui/dp_gui_system.cxx
+++ b/desktop/source/deployment/gui/dp_gui_system.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_system.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_system.hxx b/desktop/source/deployment/gui/dp_gui_system.hxx
index 41420e4043..40271e3870 100644
--- a/desktop/source/deployment/gui/dp_gui_system.hxx
+++ b/desktop/source/deployment/gui/dp_gui_system.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_system.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 82577c614a..6a98aed677 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.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: dp_gui_theextmgr.cxx,v $
- *
- * $Revision: 1.3.14.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,14 +67,6 @@ TheExtensionManager::TheExtensionManager( Window *pParent,
     m_pExtMgrDialog( NULL ),
     m_pUpdReqDialog( NULL )
 {
-    if ( dp_misc::office_is_running() )
-    {
-        m_xDesktop.set( xContext->getServiceManager()->createInstanceWithContext(
-                            OUSTR("com.sun.star.frame.Desktop"), xContext ), uno::UNO_QUERY );
-        if ( m_xDesktop.is() )
-            m_xDesktop->addTerminateListener( this );
-    }
-
     m_sPackageManagers.realloc(2);
     m_sPackageManagers[0] = deployment::thePackageManagerFactory::get( m_xContext )->getPackageManager( OUSTR("user") );
     m_sPackageManagers[1] = deployment::thePackageManagerFactory::get( m_xContext )->getPackageManager( OUSTR("shared") );;
@@ -114,6 +102,16 @@ TheExtensionManager::TheExtensionManager( Window *pParent,
      }
     catch ( uno::Exception& )
     {}
+
+    if ( dp_misc::office_is_running() )
+    {
+        // the registration should be done after the construction has been ended
+        // otherwise an exception prevents object creation, but it is registered as a listener
+        m_xDesktop.set( xContext->getServiceManager()->createInstanceWithContext(
+                            OUSTR("com.sun.star.frame.Desktop"), xContext ), uno::UNO_QUERY );
+        if ( m_xDesktop.is() )
+            m_xDesktop->addTerminateListener( this );
+    }
 }
 
 //------------------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 982fb00c83..e16f2cb0e4 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_theextmgr.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx
index 6338ad0144..1f92d468d3 100644
--- a/desktop/source/deployment/gui/dp_gui_thread.cxx
+++ b/desktop/source/deployment/gui/dp_gui_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: dp_gui_thread.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/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx
index ce487efbb4..0b5a954b99 100644
--- a/desktop/source/deployment/gui/dp_gui_thread.hxx
+++ b/desktop/source/deployment/gui/dp_gui_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: dp_gui_thread.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/desktop/source/deployment/gui/dp_gui_updatability.cxx b/desktop/source/deployment/gui/dp_gui_updatability.cxx
deleted file mode 100644
index d78ade6a8f..0000000000
--- a/desktop/source/deployment/gui/dp_gui_updatability.cxx
+++ /dev/null
@@ -1,280 +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: dp_gui_updatability.cxx,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
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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_desktop.hxx"
-
-#include "sal/config.h"
-
-#include <cstddef>
-
-#include "com/sun/star/deployment/DeploymentException.hpp"
-#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
-#include "com/sun/star/deployment/XPackage.hpp"
-#include "com/sun/star/deployment/XPackageManager.hpp"
-#include "com/sun/star/deployment/XUpdateInformationProvider.hpp"
-#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/ucb/CommandAbortedException.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "osl/conditn.hxx"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "rtl/ref.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vos/mutex.hxx"
-
-#include "dp_misc.h"
-#include "dp_gui_thread.hxx"
-#include "dp_gui_updatability.hxx"
-
-namespace com { namespace sun { namespace star { namespace uno {
-    class XComponentContext;
-} } } }
-
-using dp_gui::Updatability;
-
-namespace {
-
-namespace css = com::sun::star;
-
-}
-
-class Updatability::Thread: public dp_gui::Thread {
-public:
-    Thread(
-        css::uno::Sequence< css::uno::Reference<
-            css::deployment::XPackageManager > > const & packageManagers,
-        Window & enabled);
-
-    void start();
-
-    void stop();
-
-private:
-    Thread(Thread &); // not defined
-    void operator =(Thread &); // not defined
-
-    virtual ~Thread();
-
-    virtual void execute();
-
-    enum Input { NONE, START, STOP };
-
-    bool m_predeterminedUpdateUrl;
-    css::uno::Sequence< css::uno::Reference<
-        css::deployment::XPackageManager > > m_packageManagers;
-
-    osl::Condition m_wakeup;
-    osl::Mutex m_mutex;
-    Window * m_enabled;
-    Input m_input;
-    css::uno::Reference< css::task::XAbortChannel > m_abort;
-};
-
-Updatability::Thread::Thread(
-    css::uno::Sequence< css::uno::Reference<
-        css::deployment::XPackageManager > > const & packageManagers,
-    Window & enabled):
-    m_predeterminedUpdateUrl(dp_misc::getExtensionDefaultUpdateURL().getLength() > 0),
-    m_packageManagers(packageManagers),
-    m_enabled(&enabled),
-    m_input(NONE)
-{}
-
-void Updatability::Thread::start() {
-    css::uno::Reference< css::task::XAbortChannel > abort;
-    {
-        osl::MutexGuard g(m_mutex);
-        m_input = START;
-        abort = m_abort;
-        m_abort.clear();
-    }
-    m_wakeup.set();
-    if (abort.is()) {
-        abort->sendAbort();
-    }
-}
-
-void Updatability::Thread::stop() {
-    css::uno::Reference< css::task::XAbortChannel > abort;
-    {
-        vos::OGuard g1(Application::GetSolarMutex());
-        osl::MutexGuard g2(m_mutex);
-        m_input = STOP;
-        m_enabled = NULL;
-        abort = m_abort;
-        m_abort.clear();
-    }
-    m_wakeup.set();
-    if (abort.is()) {
-        abort->sendAbort();
-    }
-}
-
-Updatability::Thread::~Thread() {}
-
-void Updatability::Thread::execute() {
-    for (;;) {
-
-        if (m_wakeup.wait() != osl::Condition::result_ok) {
-            dp_misc::TRACE("dp_gui::Updatability::Thread::run: ignored \n");
-            dp_misc::TRACE("osl::Condition::wait failure\n");
-        }
-        m_wakeup.reset();
-        Input input;
-        {
-            osl::MutexGuard g(m_mutex);
-            input = m_input;
-            m_input = NONE;
-        }
-        if (input == NONE) {
-            continue;
-        }
-    start:
-        if (input == STOP) {
-            break;
-        }
-        bool enabled = false;
-        for (sal_Int32 i = 0; !enabled && i < m_packageManagers.getLength();
-             ++i)
-        {
-            css::uno::Reference< css::task::XAbortChannel > abort(
-                m_packageManagers[i]->createAbortChannel());
-            {
-                osl::MutexGuard g(m_mutex);
-                input = m_input;
-                m_input = NONE;
-                if (input == NONE) {
-                    //In case input would be STOP then we would later break out of the loop
-                    //before further calls to the XPackageManger are done. That is, the abort
-                    //channel would not be used anyway. 
-                    m_abort = abort;
-                }
-                if (input != NONE) {
-                    goto start;
-                }
-            }
-            css::uno::Sequence<
-                css::uno::Reference< css::deployment::XPackage > > ps;
-            try {
-                ps = m_packageManagers[i]->getDeployedPackages(
-                    abort,
-                    css::uno::Reference< css::ucb::XCommandEnvironment >());
-            } catch (css::deployment::DeploymentException &) {
-                // If there are any problematic package managers, enable the
-                // update button and let the update process report any problems
-                // to the user:
-                enabled = true;
-                continue;
-            } catch (css::ucb::CommandFailedException &) {
-                throw css::uno::RuntimeException(
-                    rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "CommandFailedException: cannot happen")),
-                    css::uno::Reference< css::uno::XInterface >());
-            } catch (css::ucb::CommandAbortedException &) {
-                osl::MutexGuard g(m_mutex);
-                input = m_input;
-                m_input = NONE;
-                OSL_ASSERT(input != NONE);
-                goto start;
-            } catch (css::lang::IllegalArgumentException &) {
-                throw css::uno::RuntimeException(
-                    rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "IllegalArgumentException: cannot happen")),
-                    css::uno::Reference< css::uno::XInterface >());
-            }
-            if (m_predeterminedUpdateUrl && ps.getLength() != 0) {
-                enabled = true;
-            } else {
-                for (sal_Int32 j = 0; j < ps.getLength(); ++j) {
-                    if (ps[j]->getUpdateInformationURLs().getLength() != 0) {
-                        enabled = true;
-                        break;
-                    }
-                    {
-                        osl::MutexGuard g(m_mutex);
-                        input = m_input;
-                        m_input = NONE;
-                    }
-                    if (input != NONE) {
-                        goto start;
-                    }
-                }
-            }
-        }
-        vos::OGuard g1(Application::GetSolarMutex());
-        Window * e;
-        {
-            osl::MutexGuard g2(m_mutex);
-            e = m_enabled;
-        }
-        if (e != NULL) {
-            e->Enable(enabled);
-        }
-    }
-}
-
-Updatability::Updatability(
-    css::uno::Sequence<
-        css::uno::Reference< css::deployment::XPackageManager > > const &
-        packageManagers,
-    Window & enabled):
-    m_thread(new Thread(packageManagers, enabled))
-{
-    m_thread->launch();
-}
-
-Updatability::~Updatability() {
-
-}
-
-void Updatability::start() {
-    m_thread->start();
-}
-
-void Updatability::stop() {
-    m_thread->stop();
-    // Bad hack; m_thread calls Application::GetSolarMutex, which only works
-    // as long as DeInitVCL has not been called:
-    ULONG n = Application::ReleaseSolarMutex();
-    m_thread->join();
-    Application::AcquireSolarMutex(n);
-}
diff --git a/desktop/source/deployment/gui/dp_gui_updatability.hxx b/desktop/source/deployment/gui/dp_gui_updatability.hxx
deleted file mode 100644
index 7310bcee8f..0000000000
--- a/desktop/source/deployment/gui/dp_gui_updatability.hxx
+++ /dev/null
@@ -1,104 +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: dp_gui_updatability.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 INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATABILITY_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_UPDATABILITY_HXX
-
-#include "sal/config.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "rtl/ref.hxx"
-
-/// @HTML
-
-class Window;
-namespace com { namespace sun { namespace star {
-    namespace deployment { class XPackageManager; }
-    namespace uno { class XComponentContext; }
-} } }
-
-namespace dp_gui {
-
-/**
-   Asynchronously determine whether <code>dp_gui::DialogImpl</code>'s
-   &ldquo;Check for Updates...&rdquo; button shall be enabled (which
-   theoretically can take some time).
-
-   <p>Note that, due to the asynchronous operation, the button may be enabled
-   even if there are no updatable extensions.</p>
-
-   <p>Each instance of this class must be called from a single thread in order
-   to adhere to the following protocol: <code>stop</code> must be called exactly
-   once, with no intervening calls to <code>start</code>, before the destructor
-   is called.</p>
-*/
-class Updatability {
-public:
-    /**
-       Create an instance.
-
-       @param packageManagers
-       a list of non-null package managers
-
-       @param enabled
-       <code>dp_gui::DialogImpl</code>'s &ldquo;Check for Updates...&rdquo;
-       button; will only be accessed with the solar mutex locked
-    */
-    Updatability(
-         com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
-            com::sun::star::deployment::XPackageManager > > const &
-            packageManagers,
-        Window & enabled);
-
-    ~Updatability();
-
-    /**
-       (Re-)start determining whether <code>dp_gui::DialogImpl</code>'s
-       &ldquo;Check for Updates...&rdquo; button shall be enabled.
-    */
-    void start();
-
-    /**
-       Orderly shut down this instance.
-    */
-    void stop();
-
-private:
-    Updatability(Updatability &); // not defined
-    void operator =(Updatability &); // not defined
-
-    class Thread;
-
-    rtl::Reference< Thread > m_thread;
-};
-
-}
-
-#endif
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index a764c63c01..a5075cf720 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updatedata.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/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 2620a1f29a..606f66ff4d 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.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
  *
@@ -256,9 +256,9 @@ private:
     virtual ~Thread();
 
     virtual void execute();
-
+#if 0
     void handleGeneralError(css::uno::Any const & exception) const;
-
+#endif
     void handleSpecificError(
         css::uno::Reference< css::deployment::XPackage > const & package,
         css::uno::Any const & exception) const;
@@ -413,7 +413,7 @@ void UpdateDialog::Thread::execute()
         m_dialog.checkingDone();
     }
 }
-
+#if 0
 void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
     const
 {
@@ -427,7 +427,7 @@ void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
         m_dialog.addGeneralError(message);
     }
 }
-
+#endif
 //Parameter package can be null
 void UpdateDialog::Thread::handleSpecificError(
     css::uno::Reference< css::deployment::XPackage > const & package,
@@ -782,7 +782,7 @@ void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
         SvLBoxButtonKind_disabledCheckbox);
         // position overflow is rather harmless
 }
-
+#if 0
 void UpdateDialog::addGeneralError(rtl::OUString const & message) {
     std::vector< rtl::OUString >::size_type n = m_generalErrors.size();
     m_generalErrors.push_back(message);
@@ -793,7 +793,7 @@ void UpdateDialog::addGeneralError(rtl::OUString const & message) {
         UpdateDialog::Index::newGeneralError(n), SvLBoxButtonKind_staticImage);
         // position overflow is rather harmless
 }
-
+#endif
 void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
     std::vector< UpdateDialog::SpecificError >::size_type n =
         m_specificErrors.size();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 080148189e..483885094a 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.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
  *
@@ -157,9 +157,9 @@ private:
         rtl::OUString const & name, dp_gui::UpdateData const & data);
 
     void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-
+#if 0
     void addGeneralError(rtl::OUString const & message);
-
+#endif
     void addSpecificError(UpdateDialog::SpecificError const & data);
 
     void checkingDone();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 03b5ee9f67..13af12fc10 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -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/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index d58f744286..7f2d85064c 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updateinstalldialog.cxx,v $
- * $Revision: 1.9.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 99357e82ed..b70b8fc59f 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_gui_updateinstalldialog.hxx,v $
- * $Revision: 1.4.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 77cd36f2cc..7c43817754 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.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: dp_gui_updateinstalldialog.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/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index e53693de65..cc6edc0ad7 100644
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.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: dp_gui_versionboxes.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/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 21e0671a39..d4eec29b49 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_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: license_dialog.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/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 82e8b00c25..b24c798da1 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_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: license_dialog.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/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 4d563ae159..b55ad49421 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.30.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,7 +52,6 @@ SLOFILES = \
         $(SLO)$/license_dialog.obj \
         $(SLO)$/dp_gui_dependencydialog.obj \
         $(SLO)$/dp_gui_thread.obj \
-        $(SLO)$/dp_gui_updatability.obj \
         $(SLO)$/dp_gui_updatedialog.obj \
         $(SLO)$/dp_gui_updateinstalldialog.obj \
         $(SLO)$/dp_gui_autoscrolledit.obj \
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index b78e54bb71..414d3639d4 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: db.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index a516099268..67a92937a5 100644
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_dependencies.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,20 +63,6 @@ namespace Dependencies {
     check(::dp_misc::DescriptionInfoset const & infoset);
 
     /**
-       Obtain the (human-readable) name of a dependency.
-
-       @param dependency
-       a dependency represented as a non-null XML element
-
-       @return
-       the name of the dependency; will never be empty, as a localized
-       &ldquo;unknown&rdquo; is substituted for an empty/missing name
-     */
-    DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString name(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::dom::XElement > const & dependency);
-
-    /**
        Obtain the (human-readable) error message of a failed dependency.
 
        @param dependency
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 3ee49627ef..cd964761da 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_descriptioninfoset.hxx,v $
- * $Revision: 1.9.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index f7af05c222..18c75e0505 100644
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_identifier.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index cd54bf9723..6999e022b6 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_interact.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/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 20437d0391..fa3f44654a 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc.h,v $
- * $Revision: 1.13.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk
index 29ba4d4898..829a6bb96b 100644
--- a/desktop/source/deployment/inc/dp_misc.mk
+++ b/desktop/source/deployment/inc/dp_misc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: dp_misc.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/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx
index c32c132bca..a1604df089 100644
--- a/desktop/source/deployment/inc/dp_misc_api.hxx
+++ b/desktop/source/deployment/inc/dp_misc_api.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc_api.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index fc22a05ca7..5e3e1eaf70 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_persmap.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,8 +53,6 @@ public:
     /** in mem db */
     PersistentMap();
     
-    void flush() const;
-    
     bool has( ::rtl::OString const & key ) const;
     bool get( ::rtl::OString * value, ::rtl::OString const & key ) const;
     t_string2string_map getEntries() const;
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 8db396c82f..5ef5fe080d 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_platform.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index edfd8ec0c0..03d28c4d87 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_resource.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/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index e20fc689f1..d70cb0bfa2 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_ucb.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/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx
index e9d966cea0..f3d620f7fa 100644
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_version.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index b410a8d197..cc2a847082 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_xml.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/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index f63661df4c..f11f87ad56 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -84,7 +80,8 @@ SHL1STDLIBS = \
         $(SVLLIB) \
         $(UNOTOOLSLIB) \
         $(DEPLOYMENTMISCLIB) \
-    $(HELPLINKERLIB)
+    $(HELPLINKERLIB) \
+    $(CONFIGMGRLIB)
 
 SHL1DEPN =
 SHL1IMPLIB = i$(TARGET)
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 02dccabff5..b7757bb5ba 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_activepackages.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/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 6b9790f042..76b42ae801 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_activepackages.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 16a502b7b6..88e84d9744 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.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/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index f940366e06..6418e5c32c 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_manager.cxx,v $
- * $Revision: 1.33.8.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -313,19 +310,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
                 that->m_readOnly = true;
             }
         }
-
-        //Workaround. See issue http://www.openoffice.org/issues/show_bug.cgi?id=99257
-        //This prevents the copying of the common.rdbf and native rdbs. It disables the 
-        //feature to add shared extensions in a running office.
-        if (!that->m_readOnly && context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") ))
-        {
-            OUString sNoRdb;
-            ::rtl::Bootstrap::get(OUSTR("NORDBCOPY"), sNoRdb);
-            if (sNoRdb.equalsIgnoreAsciiCase(OUSTR("true"))
-                && dp_misc::office_is_running())
-                that->m_readOnly = true;
-        }
-        
+       
         if (!that->m_readOnly && logFile.getLength() > 0)
         {
             const Any any_logFile(logFile);
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 3519e559be..47af7ed110 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_manager.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/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index 0a50b96ef1..5f761303e4 100644
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.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: dp_manager.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/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src
index ab8e5148bd..479d09f5fd 100644
--- a/desktop/source/deployment/manager/dp_manager.src
+++ b/desktop/source/deployment/manager/dp_manager.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: dp_manager.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/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 2d8010383c..21102bed29 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_managerfac.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/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index 6e4c282b35..a9ff47881f 100644
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/migration/dp_migration.cxx b/desktop/source/deployment/migration/dp_migration.cxx
index 5225d0cc4c..ea1b39a28d 100644
--- a/desktop/source/deployment/migration/dp_migration.cxx
+++ b/desktop/source/deployment/migration/dp_migration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_migration.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/desktop/source/deployment/migration/makefile.mk b/desktop/source/deployment/migration/makefile.mk
index 8eaccc68cd..a37b7e5beb 100644
--- a/desktop/source/deployment/migration/makefile.mk
+++ b/desktop/source/deployment/migration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index 3b449246c4..3a559b8ae5 100644
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: db.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index b509315da6..d073f4121e 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.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
  *
@@ -127,18 +127,6 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
     return unsatisfied;
 }
 
-::rtl::OUString
-name(css::uno::Reference< css::xml::dom::XElement > const & dependency) {
-    ::rtl::OUString n(
-        dependency->getAttributeNS(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name"))));
-    return n.getLength() == 0
-        ? ::rtl::OUString(
-            ::String(::dp_misc::getResId(RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN)))
-        : n;
-}
-
 ::rtl::OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency )
 {
     ::rtl::OUString sReason;
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index d3c7f28115..1ecb757d07 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_descriptioninfoset.cxx,v $
- * $Revision: 1.7.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index 6ade60ad8d..4126a99cd5 100644
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_identifier.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/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index a9fe5a5156..89c2e9a06f 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_interact.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/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index c067b26d1a..dba389ff39 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_misc.cxx,v $
- * $Revision: 1.19.8.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -439,19 +436,19 @@ OUString readConsole()
     {
         OSL_ASSERT((dwRead % 2) == 0);
         OUString value( aBuffer, dwRead / 2);
-        value = value.trim();
-        return value;
+        return value.trim();
     }
-    return OUString();
-
 #else
     char buf[1024];
     rtl_zeroMemory(buf, 1024);
     // read one char less so that the last char in buf is always zero
-    fgets(buf, 1024, stdin);
-    OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
-    return value.trim();
+    if (fgets(buf, 1024, stdin) != NULL)
+    {
+        OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding());
+        return value.trim();
+    }
 #endif
+    return OUString();
 }
 
 void TRACE(::rtl::OUString const & sText)
diff --git a/desktop/source/deployment/misc/dp_misc.hrc b/desktop/source/deployment/misc/dp_misc.hrc
index 76a340adb3..e5d749fc62 100644
--- a/desktop/source/deployment/misc/dp_misc.hrc
+++ b/desktop/source/deployment/misc/dp_misc.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: dp_misc.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/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 67a2bf054a..78e87c2078 100644
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -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/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index a61fd6c4af..187ef14a17 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.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: dp_platform.cxx,v $
- *
- * $Revision: 1.2.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 54aff70ee1..4a82c7b2fa 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_resource.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/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 013ba0e2ce..ab086668d8 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_ucb.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index 440dc8d98d..a4138c5e7a 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_version.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/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index b06788de8d..e191169202 100644
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/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.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 1da716513a..a143a88096 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_component.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -125,7 +122,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         Reference<XComponentContext> m_xRemoteContext;
         
         enum reg {
-            REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED
+            REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED, REG_MAYBE_REGISTERED
         } m_registered;
         
         Reference<loader::XImplementationLoader> getComponentInfo(
@@ -147,6 +144,10 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         
         const Reference<registry::XSimpleRegistry> getRDB() const;
         
+        //Provides the read-only registry (e.g. not the one based on the duplicated
+        //rdb files
+        const Reference<registry::XSimpleRegistry> getRDB_RO() const;
+        
     public:
         inline ComponentPackageImpl(
             ::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -224,8 +225,21 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     
     OUString m_commonRDB;
     OUString m_nativeRDB;
+
+    //URLs of the read-only rdbs (e.g. not the ones of the duplicated files)
+    OUString m_commonRDB_RO;
+    OUString m_nativeRDB_RO;
+
+    //These rdbs are for writing new service entries. The rdb files are copies 
+    //which are created when services are added or removed.
     Reference<registry::XSimpleRegistry> m_xCommonRDB;
     Reference<registry::XSimpleRegistry> m_xNativeRDB;
+
+    //These rdbs are created on the read-only rdbs which are already used
+    //by UNO since the startup of the current session. 
+    Reference<registry::XSimpleRegistry> m_xCommonRDB_RO;
+    Reference<registry::XSimpleRegistry> m_xNativeRDB_RO;
+
     
     void unorc_verify_init( Reference<XCommandEnvironment> const & xCmdEnv );
     void unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv );
@@ -255,6 +269,9 @@ public:
 
     //Will be called from ComponentPackageImpl
     void initServiceRdbFiles();
+
+    //Creates the READ ONLY registries (m_xCommonRDB_RO,m_xNativeRDB_RO)
+    void initServiceRdbFiles_RO();
 };
 
 //______________________________________________________________________________
@@ -262,12 +279,12 @@ const Reference<registry::XSimpleRegistry>
 BackendImpl::ComponentPackageImpl::getRDB() const
 {
     BackendImpl * that = getMyBackend();
+
     //Late "initialization" of the services rdb files
     //This is to prevent problems when running several
     //instances of OOo with root rights in parallel. This
     //would otherwise cause problems when copying the rdbs.
-    //Now this code is only performed if isRegistered or processPackage
-    //is called.
+    //See  http://qa.openoffice.org/issues/show_bug.cgi?id=99257
     {
         const ::osl::MutexGuard guard( getMutex() );
         if (!that->bSwitchedRdbFiles)
@@ -276,7 +293,6 @@ BackendImpl::ComponentPackageImpl::getRDB() const
             that->initServiceRdbFiles();
         }
     }
-
     if (m_loader.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.SharedLibrary") ))
         return that->m_xNativeRDB;
@@ -284,6 +300,19 @@ BackendImpl::ComponentPackageImpl::getRDB() const
         return that->m_xCommonRDB;
 }
 
+//Returns the read only RDB.
+const Reference<registry::XSimpleRegistry>
+BackendImpl::ComponentPackageImpl::getRDB_RO() const
+{
+    BackendImpl * that = getMyBackend();
+
+    if (m_loader.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.SharedLibrary") ))
+        return that->m_xNativeRDB_RO;
+    else
+        return that->m_xCommonRDB_RO;
+}
+
 BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const
 {
     BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
@@ -345,20 +374,22 @@ void BackendImpl::disposing()
 void BackendImpl::initServiceRdbFiles()
 {
     const Reference<XCommandEnvironment> xCmdEnv;
-    if (! m_readOnly) {
+    if (! m_readOnly) 
+    {
         ::ucbhelper::Content cacheDir( getCachePath(), xCmdEnv );
         ::ucbhelper::Content oldRDB;
         // switch common rdb:
-        if (m_commonRDB.getLength() > 0)
+        if (m_commonRDB_RO.getLength() > 0)
+        {
             create_ucb_content(
-            &oldRDB, makeURL( getCachePath(), m_commonRDB ),
-            xCmdEnv, false /* no throw */ );
-        m_commonRDB = m_commonRDB.equalsAsciiL(
+                &oldRDB, makeURL( getCachePath(), m_commonRDB_RO),
+                xCmdEnv, false /* no throw */ );
+        }
+        m_commonRDB = m_commonRDB_RO.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM("common.rdb") )
-            ? OUSTR("common_.rdb") : OUSTR("common.rdb");
+             ? OUSTR("common_.rdb") : OUSTR("common.rdb");
         if (oldRDB.get().is())
         {
-
             if (! cacheDir.transferContent(
                 oldRDB, ::ucbhelper::InsertOperation_COPY,
                 m_commonRDB, NameClash::OVERWRITE ))
@@ -370,13 +401,15 @@ void BackendImpl::initServiceRdbFiles()
             oldRDB = ::ucbhelper::Content();
         }
         // switch native rdb:
-        if (m_nativeRDB.getLength() > 0)
+        if (m_nativeRDB_RO.getLength() > 0)
+        {
             create_ucb_content(
-            &oldRDB, makeURL( getCachePath(), m_nativeRDB ),
-            xCmdEnv, false /* no throw */ );
+                &oldRDB, makeURL(getCachePath(), m_nativeRDB_RO),
+                xCmdEnv, false /* no throw */ );
+        }
         const OUString plt_rdb( getPlatformString() + OUSTR(".rdb") );
         const OUString plt_rdb_( getPlatformString() + OUSTR("_.rdb") );
-        m_nativeRDB = m_nativeRDB.equals( plt_rdb ) ? plt_rdb_ : plt_rdb;
+        m_nativeRDB = m_nativeRDB_RO.equals( plt_rdb ) ? plt_rdb_ : plt_rdb;
         if (oldRDB.get().is())
         {
             if (! cacheDir.transferContent(
@@ -414,6 +447,37 @@ void BackendImpl::initServiceRdbFiles()
     }
 }
 
+void BackendImpl::initServiceRdbFiles_RO()
+{
+    const Reference<XCommandEnvironment> xCmdEnv;
+
+    // common rdb for java, native rdb for shared lib components
+    if (m_commonRDB_RO.getLength() > 0) 
+    {
+        m_xCommonRDB_RO.set(
+            m_xComponentContext->getServiceManager()
+            ->createInstanceWithContext(
+            OUSTR("com.sun.star.registry.SimpleRegistry"),
+            m_xComponentContext), UNO_QUERY_THROW);
+        m_xCommonRDB_RO->open(
+            makeURL(expandUnoRcUrl(getCachePath()), m_commonRDB_RO),
+            sal_True, //read-only 
+            sal_True); // create data source if necessary
+    }
+    if (m_nativeRDB_RO.getLength() > 0) 
+    {
+        m_xNativeRDB_RO.set(
+            m_xComponentContext->getServiceManager()
+            ->createInstanceWithContext(
+            OUSTR("com.sun.star.registry.SimpleRegistry"),
+            m_xComponentContext), UNO_QUERY_THROW);
+        m_xNativeRDB_RO->open(
+            makeURL(expandUnoRcUrl(getCachePath()), m_nativeRDB_RO),
+            sal_True, //read-only 
+            sal_True); // create data source if necessary
+    }
+}
+
 //______________________________________________________________________________
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
@@ -492,7 +556,12 @@ BackendImpl::BackendImpl(
     }
     else
     {
+        //do this before initServiceRdbFiles_RO, because it determines
+        //m_commonRDB and m_nativeRDB
         unorc_verify_init( xCmdEnv );
+
+        initServiceRdbFiles_RO();
+
     }
 }
 
@@ -687,7 +756,7 @@ void BackendImpl::unorc_verify_init(
                 sal_Int32 start = sizeof ("UNO_SERVICES=?$ORIGIN/") - 1;
                 sal_Int32 sep = line.indexOf( ' ', start );
                 OSL_ASSERT( sep > 0 );
-                m_commonRDB = line.copy( start, sep - start );
+                m_commonRDB_RO = line.copy( start, sep - start );
             }
             
             // native rc:
@@ -697,7 +766,7 @@ void BackendImpl::unorc_verify_init(
                     xCmdEnv, false /* no throw */ )) {
                 if (readLine( &line, OUSTR("UNO_SERVICES="), ucb_content,
                               RTL_TEXTENCODING_UTF8 )) {
-                    m_nativeRDB = line.copy(
+                    m_nativeRDB_RO = line.copy(
                         sizeof ("UNO_SERVICES=?$ORIGIN/") - 1 );
                 }
             }
@@ -763,12 +832,19 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
         }
         buf.append(LF);
     }
-    if (m_commonRDB.getLength() > 0 || m_nativeRDB.getLength() > 0)
+
+    // If we duplicated the common or native rdb then we must use those urls
+    //otherwise we use those of the original files. That is, m_commonRDB_RO and 
+    //m_nativeRDB_RO;
+    OUString sCommonRDB(m_commonRDB.getLength() > 0 ? m_commonRDB : m_commonRDB_RO);
+    OUString sNativeRDB(m_nativeRDB.getLength() > 0 ? m_nativeRDB : m_nativeRDB_RO);
+
+    if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0)
     {
         buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=?$ORIGIN/") );
         buf.append( ::rtl::OUStringToOString(
-                        m_commonRDB, RTL_TEXTENCODING_ASCII_US ) );
-        if (m_nativeRDB.getLength() > 0)
+                        sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+        if (sNativeRDB.getLength() > 0)
         {
             buf.append( RTL_CONSTASCII_STRINGPARAM(
                             " ${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
@@ -778,7 +854,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
             ::rtl::OStringBuffer buf2;
             buf2.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=?$ORIGIN/") );
             buf2.append( ::rtl::OUStringToOString(
-                             m_nativeRDB, RTL_TEXTENCODING_ASCII_US ) );
+                             sNativeRDB, RTL_TEXTENCODING_ASCII_US ) );
             buf2.append(LF);
             
             const Reference<io::XInputStream> xData(
@@ -1026,7 +1102,8 @@ BackendImpl::ComponentPackageImpl::isRegistered_(
     if (m_registered == REG_UNINIT)
     {
         m_registered = REG_NOT_REGISTERED;
-        const Reference<registry::XSimpleRegistry> xRDB( getRDB() );
+        bool bAmbiguousComponentName = false;
+        const Reference<registry::XSimpleRegistry> xRDB( getRDB_RO() );
         if (xRDB.is())
         {
             // lookup rdb for location URL:
@@ -1046,21 +1123,51 @@ BackendImpl::ComponentPackageImpl::isRegistered_(
                     pImplNames[ pos ] + OUSTR("/UNO/LOCATION") );
                 const Reference<registry::XRegistryKey> xKey(
                     xRootKey->openKey(key) );
-                if (xKey.is() && xKey->isValid()) {
+                if (xKey.is() && xKey->isValid()) 
+                {
                     const OUString location( xKey->getAsciiValue() );
                     if (location.equalsIgnoreAsciiCase( getURL() ))
+                    {
                         break;
+                    }
+                    else
+                    {
+                        //try to match only the file name
+                        OUString thisUrl(getURL());
+                        OUString thisFileName(thisUrl.copy(thisUrl.lastIndexOf('/')));
+                        
+                        OUString locationFileName(location.copy(location.lastIndexOf('/')));
+                        if (locationFileName.equalsIgnoreAsciiCase(thisFileName))
+                            bAmbiguousComponentName = true;
+                    }
                 }
             }
             if (pos >= 0)
                 m_registered = REG_REGISTERED;
+            else if (bAmbiguousComponentName)
+                m_registered = REG_MAYBE_REGISTERED;
         }
     }
+
+    //Different extensions can use the same service implementations. Then the extensions
+    //which was installed last will overwrite the one from the other extension. That is
+    //the registry will contain the path (the location) of the library or jar of the 
+    //second extension. In this case isRegistered called for the lib of the first extension
+    //would return "not registered". That would mean that during uninstallation 
+    //XPackage::registerPackage is not called, because it just was not registered. This is,
+    //however, necessary for jar files. Registering and unregistering update 
+    //uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
+    //Therefore, we will return always "is ambiguous" if the path of this component cannot 
+    //be found in the registry and if there is another path and both have the same file name (but
+    //the rest of the path is different).
+    //If the caller cannot precisely determine that this package was registered, then it must
+    //call registerPackage.
+    sal_Bool bAmbiguous = m_registered == REG_VOID // REG_VOID == we are in the progress of unregistration
+        || m_registered == REG_MAYBE_REGISTERED;
     return beans::Optional< beans::Ambiguous<sal_Bool> >(
         true /* IsPresent */,
         beans::Ambiguous<sal_Bool>(
-            m_registered == REG_REGISTERED,
-            m_registered == REG_VOID /* IsAmbiguous */ ) );
+            m_registered == REG_REGISTERED, bAmbiguous) );
 }
 
 //______________________________________________________________________________
@@ -1071,6 +1178,8 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
     BackendImpl * that = getMyBackend();  
+    
+ 
     const bool java = m_loader.equalsAsciiL(
         RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2") );
     const OUString url( getURL() );
@@ -1078,10 +1187,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
         !jarManifestHeaderPresent( url, OUSTR("UNO-Type-Path"), xCmdEnv );
     
     if (doRegisterPackage)
-    {
-        if (isJavaTypelib)
-            that->addToUnoRc( java, url, xCmdEnv );
-        
+    {        
         if (! m_xRemoteContext.is()) {
             m_xRemoteContext.set(
                 that->getObject( url ), UNO_QUERY );
@@ -1099,8 +1205,13 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
             m_xRemoteContext->getServiceManager()->createInstanceWithContext(
                 OUSTR("com.sun.star.registry.ImplementationRegistration"),
                 m_xRemoteContext ), UNO_QUERY_THROW );
+
         xImplReg->registerImplementation( m_loader, url, xServicesRDB );
-        
+        //only write to unorc if registration was successful.
+        //It may fail if there is no suitable java.
+        if (isJavaTypelib)
+            that->addToUnoRc( java, url, xCmdEnv );
+
         t_stringlist implNames;
         t_stringpairvec singletons;
         const Reference<loader::XImplementationLoader> xLoader(
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index 4d7549923b..5e9993ab12 100644
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.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: dp_component.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/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src
index e41bb82204..52dfa568eb 100644
--- a/desktop/source/deployment/registry/component/dp_component.src
+++ b/desktop/source/deployment/registry/component/dp_component.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: dp_component.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/desktop/source/deployment/registry/component/makefile.mk b/desktop/source/deployment/registry/component/makefile.mk
index af5e4c6d49..4c4016f9bf 100644
--- a/desktop/source/deployment/registry/component/makefile.mk
+++ b/desktop/source/deployment/registry/component/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index e13d580e2b..cef5d488f6 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_configuration.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,6 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
+//TODO: Large parts of this file were copied from dp_component.cxx; those parts
+// should be consolidated.
+
 #include "dp_configuration.hrc"
 #include "dp_backend.h"
 #include "dp_persmap.h"
@@ -41,16 +41,18 @@
 #include "rtl/uri.hxx"
 #include "rtl/memory.h"
 #include "osl/file.hxx"
+#include "cppuhelper/exc_hlp.hxx"
 #include "ucbhelper/content.hxx"
 #include "comphelper/anytostring.hxx"
 #include "comphelper/servicedecl.hxx"
+#include "configmgr/update.hxx"
 #include "xmlscript/xml_helper.hxx"
 #include "svl/inettype.hxx"
 #include "com/sun/star/ucb/NameClash.hpp"
 #include "com/sun/star/io/XActiveDataSink.hpp"
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
 #include "com/sun/star/util/XRefreshable.hpp"
-#include "com/sun/star/configuration/backend/XLayerImporter.hpp"
+#include <list>
 #include <memory>
 
 
@@ -65,6 +67,8 @@ namespace backend {
 namespace configuration {
 namespace {
 
+typedef ::std::list<OUString> t_stringlist;
+
 //==============================================================================
 class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 {
@@ -98,27 +102,39 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     };
     friend class PackageImpl;
     
-    Reference< ::com::sun::star::configuration::backend::XLayerImporter >
-    m_xMergeImporter;
-    OUString m_configLayer;
+    t_stringlist m_xcs_files;
+    t_stringlist m_xcu_files;
+    t_stringlist & getFiles( bool xcs ) {
+        return xcs ? m_xcs_files : m_xcu_files;
+    }
+    
+    bool m_configmgrini_inited;
+    bool m_configmgrini_modified;
     
     // PackageRegistryBackend
     virtual Reference<deployment::XPackage> bindPackage_(
         OUString const & url, OUString const & mediaType,
         Reference<XCommandEnvironment> const & xCmdEnv );
     
-    void xcu_merge_in( OUString const & url,
-                       Reference< XCommandEnvironment > const & xCmdEnv );
-    void xcs_merge_in( OUString const & url,
-                       Reference< XCommandEnvironment > const & xCmdEnv );
     ::std::auto_ptr<PersistentMap> m_registeredPackages;
-    OUString const & getConfigLayer();
-    Reference<util::XRefreshable> m_defaultProvider;
+        // for backwards compatibility
 
+    virtual void SAL_CALL disposing();
+    
     const Reference<deployment::XPackageTypeInfo> m_xConfDataTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xConfSchemaTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
     
+    void configmgrini_verify_init(
+        Reference<XCommandEnvironment> const & xCmdEnv );
+    void configmgrini_flush( Reference<XCommandEnvironment> const & xCmdEnv );
+    
+    bool addToConfigmgrIni( bool isSchema, OUString const & url,
+                     Reference<XCommandEnvironment> const & xCmdEnv );
+    bool removeFromConfigmgrIni( bool isSchema, OUString const & url,
+                          Reference<XCommandEnvironment> const & xCmdEnv );
+    bool hasInConfigmgrIni( bool isSchema, OUString const & url );
+
 public:
     BackendImpl( Sequence<Any> const & args,
                  Reference<XComponentContext> const & xComponentContext );
@@ -126,17 +142,36 @@ public:
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
     getSupportedPackageTypes() throw (RuntimeException);
+
+    using PackageRegistryBackend::disposing;
 };
 
 //______________________________________________________________________________
+void BackendImpl::disposing()
+{
+    try {
+        configmgrini_flush( Reference<XCommandEnvironment>() );
+        
+        PackageRegistryBackend::disposing();
+    }
+    catch (RuntimeException &) {
+        throw;
+    }
+    catch (Exception &) {
+        Any exc( ::cppu::getCaughtException() );
+        throw lang::WrappedTargetRuntimeException(
+            OUSTR("caught unexpected exception while disposing..."),
+            static_cast<OWeakObject *>(this), exc );
+    }
+}
+
+//______________________________________________________________________________
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xComponentContext )
     : PackageRegistryBackend( args, xComponentContext ),
-      m_defaultProvider( xComponentContext->getValueByName(
-                             OUSTR("/singletons/com.sun.star."
-                                   "configuration.theDefaultProvider") ),
-                         UNO_QUERY ),
+      m_configmgrini_inited( false ),
+      m_configmgrini_modified( false ),
       m_xConfDataTypeInfo( new Package::TypeInfo(
                                OUSTR("application/"
                                      "vnd.sun.star.configuration-data"),
@@ -154,19 +189,17 @@ BackendImpl::BackendImpl(
     m_typeInfos[ 0 ] = m_xConfDataTypeInfo;
     m_typeInfos[ 1 ] = m_xConfSchemaTypeInfo;
     
-    OSL_ASSERT( m_defaultProvider.is() );
+    const Reference<XCommandEnvironment> xCmdEnv;
     
     if (transientMode()) {
-        m_registeredPackages.reset( new PersistentMap );
+        //TODO
     }
     else {
+        configmgrini_verify_init( xCmdEnv );
         m_registeredPackages.reset(
             new PersistentMap(
                 makeURL( getCachePath(), OUSTR("registered_packages.db") ),
                 m_readOnly ) );
-        if (! m_readOnly)
-            create_folder( 0, getConfigLayer(),
-                           Reference<XCommandEnvironment>() );
     }
 }
 
@@ -239,103 +272,253 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         static_cast<sal_Int16>(-1) );
 }
 
+//##############################################################################
+
 //______________________________________________________________________________
-OUString const & BackendImpl::getConfigLayer()
+void BackendImpl::configmgrini_verify_init(
+    Reference<XCommandEnvironment> const & xCmdEnv )
 {
-    if (m_configLayer.getLength() == 0)
+    if (transientMode())
+        return;
+    const ::osl::MutexGuard guard( getMutex() );
+    if (! m_configmgrini_inited)
     {
-        OUString path(
-            makeURL( expandUnoRcUrl( getCachePath() ), OUSTR("registry") ) );
-        ::osl::FileBase::RC rc = ::osl::File::getAbsoluteFileURL(
-            OUString(), path, m_configLayer );
-        if (rc != ::osl::FileBase::E_None)
-            throw RuntimeException(
-                OUSTR("making file URL absolute failed: ") + path,
-                static_cast<OWeakObject *>(this) );
+        // common rc:
+        ::ucbhelper::Content ucb_content;
+        if (create_ucb_content(
+                &ucb_content,
+                makeURL( getCachePath(), OUSTR("configmgr.ini") ),
+                xCmdEnv, false /* no throw */ ))
+        {
+            OUString line;
+            if (readLine( &line, OUSTR("SCHEMA="), ucb_content,
+                          RTL_TEXTENCODING_UTF8 ))
+            {
+                sal_Int32 index = sizeof ("SCHEMA=") - 1;
+                do {
+                    OUString token( line.getToken( 0, ' ', index ).trim() );
+                    if (token.getLength() > 0) {
+                        // cleanup, check if existing:
+                        if (create_ucb_content(
+                                0, expandUnoRcTerm(token), xCmdEnv,
+                                false /* no throw */ )) {
+                            m_xcs_files.push_back( token );
+                        }
+                        else
+                            OSL_ENSURE(
+                                0, "### invalid SCHEMA entry!" );
+                    }
+                }
+                while (index >= 0);
+            }
+            if (readLine( &line, OUSTR("DATA="), ucb_content,
+                          RTL_TEXTENCODING_UTF8 )) {
+                sal_Int32 index = sizeof ("DATA=") - 1;
+                do {
+                    OUString token( line.getToken( 0, ' ', index ).trim() );
+                    if (token.getLength() > 0) {
+                        if (token[ 0 ] == '?')
+                            token = token.copy( 1 );
+                        // cleanup, check if existing:
+                        if (create_ucb_content(
+                                0, expandUnoRcTerm(token),
+                                xCmdEnv, false /* no throw */ )) {
+                            m_xcu_files.push_back( token );
+                        }
+                        else
+                            OSL_ENSURE( 0, "### invalid DATA entry!" );
+                    }
+                }
+                while (index >= 0);
+            }
+        }
+        m_configmgrini_modified = false;
+        m_configmgrini_inited = true;
     }
-    return m_configLayer;
 }
 
-//==============================================================================
-class SchemaFileRoot : public ::dp_misc::XmlRootElement
+//______________________________________________________________________________
+void BackendImpl::configmgrini_flush(
+    Reference<XCommandEnvironment> const & xCmdEnv )
 {
-public:
-    OUString m_name;
-    OUString m_package;
+    if (transientMode())
+        return;
+    if (!m_configmgrini_inited || !m_configmgrini_modified)
+        return;
     
-    inline SchemaFileRoot()
-        : XmlRootElement( OUSTR("http://openoffice.org/2001/registry"),
-                          OUSTR("component-schema") )
-        {}
+    ::rtl::OStringBuffer buf;
+    // UNO_USER_PACKAGES_CACHE, UNO_SHARED_PACKAGES_CACHE have to be resolved
+    // locally:
+    if (m_eContext == CONTEXT_USER) {
+        buf.append( RTL_CONSTASCII_STRINGPARAM(
+                        "UNO_USER_PACKAGES_CACHE=$ORIGIN/../..") );
+    }
+    else if (m_eContext == CONTEXT_SHARED) {
+        buf.append( RTL_CONSTASCII_STRINGPARAM(
+                        "UNO_SHARED_PACKAGES_CACHE=$ORIGIN/../..") );
+    }
+    else
+        OSL_ASSERT(0);
+    buf.append(LF);
     
-    // XRoot
-    virtual Reference< xml::input::XElement > SAL_CALL startRootElement(
-        sal_Int32 uid, OUString const & localname,
-        Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException);
-};
+    if (! m_xcs_files.empty())
+    {
+        t_stringlist::const_iterator iPos( m_xcs_files.begin() );
+        t_stringlist::const_iterator const iEnd( m_xcs_files.end() );
+        buf.append( RTL_CONSTASCII_STRINGPARAM("SCHEMA=") );
+        while (iPos != iEnd) {
+            // encoded ASCII file-urls:
+            const ::rtl::OString item(
+                ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) );
+            buf.append( item );
+            ++iPos;
+            if (iPos != iEnd)
+                buf.append( ' ' );
+        }
+        buf.append(LF);
+    }
+    if (! m_xcu_files.empty())
+    {
+        t_stringlist::const_iterator iPos( m_xcu_files.begin() );
+        t_stringlist::const_iterator const iEnd( m_xcu_files.end() );
+        buf.append( RTL_CONSTASCII_STRINGPARAM("DATA=") );
+        while (iPos != iEnd) {
+            // encoded ASCII file-urls:
+            const ::rtl::OString item(
+                ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) );
+            buf.append( item );
+            ++iPos;
+            if (iPos != iEnd)
+                buf.append( ' ' );
+        }
+        buf.append(LF);
+    }
+    
+    // write configmgr.ini:
+    const Reference<io::XInputStream> xData(
+        ::xmlscript::createInputStream(
+            ::rtl::ByteSequence(
+                reinterpret_cast<sal_Int8 const *>(buf.getStr()),
+                buf.getLength() ) ) );
+    ::ucbhelper::Content ucb_content(
+        makeURL( getCachePath(), OUSTR("configmgr.ini") ), xCmdEnv );
+    ucb_content.writeStream( xData, true /* replace existing */ );
+    
+    m_configmgrini_modified = false;
+}
+
+//------------------------------------------------------------------------------
+inline OUString makeRcTerm( OUString const & url )
+{
+    OSL_ASSERT( url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(
+                                     "vnd.sun.star.expand:") ) );
+    if (url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") )) {
+        // cut protocol:
+        OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
+        // decode uric class chars:
+        rcterm = ::rtl::Uri::decode(
+            rcterm, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
+        return rcterm;
+    }
+    else
+        return url;
+}
 
 //______________________________________________________________________________
-Reference< xml::input::XElement > SchemaFileRoot::startRootElement(
-    sal_Int32 uid, OUString const & localname,
-    Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException)
+bool BackendImpl::addToConfigmgrIni( bool isSchema, OUString const & url_,
+                              Reference<XCommandEnvironment> const & xCmdEnv )
 {
-    // check root element:
-    XmlRootElement::startRootElement( uid, localname, xAttributes );
-    
-    // "name" attribute
-    m_name = xAttributes->getValueByUidName( getUid(), OUSTR("name") );
-    if (m_name.getLength() == 0)
-        throw xml::sax::SAXException(
-            OUSTR("missing schema name attribute!"),
-            static_cast< OWeakObject * >(this), Any() );
-    
-    // "package" attribute
-    m_package = xAttributes->getValueByUidName( getUid(), OUSTR("package") );
-    if (m_package.getLength() == 0)
-        throw xml::sax::SAXException(
-            OUSTR("missing schema package attribute!"),
-            static_cast<OWeakObject *>(this), Any() );
-    
-    // don't go deeper...
-    return Reference<xml::input::XElement>();
+    const OUString rcterm( makeRcTerm(url_) );
+    const ::osl::MutexGuard guard( getMutex() );
+    configmgrini_verify_init( xCmdEnv );
+    t_stringlist & rSet = getFiles(isSchema);
+    if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
+        rSet.push_front( rcterm ); // prepend to list, thus overriding
+        // write immediately:
+        m_configmgrini_modified = true;
+        configmgrini_flush( xCmdEnv );
+        return true;
+    }
+    else
+        return false;
 }
 
 //______________________________________________________________________________
-void BackendImpl::xcs_merge_in(
-    OUString const & url,
+bool BackendImpl::removeFromConfigmgrIni(
+    bool isSchema, OUString const & url_,
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
-    // parse out schema package:
-    SchemaFileRoot * root = new SchemaFileRoot;
-    Reference<xml::input::XRoot> xRoot( root );
-    ::ucbhelper::Content ucb_content( url, xCmdEnv );
-    xml_parse( xRoot, ucb_content, getComponentContext() );
-    
-    OUString dest_folder(
-        makeURL( getConfigLayer(), OUSTR("schema/") + ::rtl::Uri::encode(
-                     root->m_package, rtl_UriCharClassPchar,
-                     rtl_UriEncodeIgnoreEscapes,
-                     RTL_TEXTENCODING_UTF8 ).replace( '.', '/' ) ) );
-    OUString title( root->m_name + OUSTR(".xcs") );
-    OUString dest_url( makeURL( dest_folder, ::rtl::Uri::encode(
-                                    title, rtl_UriCharClassPchar,
-                                    rtl_UriEncodeIgnoreEscapes,
-                                    RTL_TEXTENCODING_UTF8 ) ) );
-    // assure dest folder is existing:
-    ::ucbhelper::Content ucb_dest_folder;
-    create_folder( &ucb_dest_folder, dest_folder, xCmdEnv );
-    if (! ucb_dest_folder.transferContent(
-            ::ucbhelper::Content( url, xCmdEnv ),
-            ::ucbhelper::InsertOperation_COPY,
-            title, NameClash::OVERWRITE ))
-        throw RuntimeException(
-            OUSTR("::ucb::Content::transferContent() failed!"), 0 );
+    const OUString rcterm( makeRcTerm(url_) );
+    const ::osl::MutexGuard guard( getMutex() );
+    configmgrini_verify_init( xCmdEnv );
+    t_stringlist & rSet = getFiles(isSchema);
+    t_stringlist::iterator i(std::find(rSet.begin(), rSet.end(), rcterm));
+    if (i == rSet.end() && !isSchema) { //TODO: see replaceOrigin()
+        i = std::find(
+            rSet.begin(), rSet.end(),
+            rcterm + OUString(RTL_CONSTASCII_USTRINGPARAM(".mod")));
+    }
+    if (i == rSet.end()) {
+        return false;
+    }
+    rSet.erase(i);
+    // write immediately:
+    m_configmgrini_modified = true;
+    configmgrini_flush( xCmdEnv );
+    return true;
+}
+
+//______________________________________________________________________________
+bool BackendImpl::hasInConfigmgrIni(
+    bool isSchema, OUString const & url_ )
+{   
+    const OUString rcterm( makeRcTerm(url_) );
+    const ::osl::MutexGuard guard( getMutex() );
+    t_stringlist const & rSet = getFiles(isSchema);
+    return ::std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end()
+        || (!isSchema && //TODO: see replaceOrigin()
+            ::std::find(
+                rSet.begin(), rSet.end(),
+                rcterm + OUString(RTL_CONSTASCII_USTRINGPARAM(".mod"))) !=
+            rSet.end());
 }
 
 //##############################################################################
 
+// Package
+//______________________________________________________________________________
+BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
+{
+    BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
+    if (NULL == pBackend)
+    {    
+        //May throw a DisposedException
+        check();
+        //We should never get here...
+        throw RuntimeException(
+            OUSTR("Failed to get the BackendImpl"), 
+            static_cast<OWeakObject*>(const_cast<PackageImpl *>(this)));
+    }
+    return pBackend;
+}
+
+beans::Optional< beans::Ambiguous<sal_Bool> >
+BackendImpl::PackageImpl::isRegistered_(
+    ::osl::ResettableMutexGuard &,
+    ::rtl::Reference<AbortChannel> const &,
+    Reference<XCommandEnvironment> const & )
+{
+    BackendImpl * that = getMyBackend();
+    rtl::OUString url(getURL());
+    return beans::Optional< beans::Ambiguous<sal_Bool> >(
+        true /* IsPresent */,
+        beans::Ambiguous<sal_Bool>(
+            that->hasInConfigmgrIni( m_isSchema, url ) ||
+            that->m_registeredPackages->has(
+                rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 ) ),
+            false /* IsAmbiguous */ ) );
+}
+
 //------------------------------------------------------------------------------
 OUString encodeForXml( OUString const & text )
 {
@@ -370,7 +553,7 @@ OUString encodeForXml( OUString const & text )
 }
 
 //______________________________________________________________________________
-void BackendImpl::xcu_merge_in(
+OUString replaceOrigin(
     OUString const & url, Reference< XCommandEnvironment > const & xCmdEnv )
 {
     // looking for %origin%:
@@ -437,199 +620,70 @@ void BackendImpl::xcu_merge_in(
         rtl_copyMemory( filtered.getArray() + write_pos, pAdd, nAdd );
         write_pos += nAdd;
     }
-    if (use_filtered && write_pos < filtered.getLength())
+    if (!use_filtered)
+        return url;
+    if (write_pos < filtered.getLength())
         filtered.realloc( write_pos );
-    
-    Reference<XComponentContext> const & xContext = getComponentContext();
-    if (! m_xMergeImporter.is()) {
-        m_xMergeImporter.set(
-            xContext->getServiceManager()->createInstanceWithContext(
-                OUSTR("com.sun.star.configuration.backend.MergeImporter"),
-                xContext ), UNO_QUERY_THROW );
-    }
-    
-    Reference< ::com::sun::star::configuration::backend::XLayer > xLayer(
-        xContext->getServiceManager()->createInstanceWithContext(
-            OUSTR("com.sun.star.configuration.backend.xml.LayerParser"),
-            xContext ), UNO_QUERY_THROW );
-    
-    Reference< io::XActiveDataSink > xActiveDataSink( xLayer, UNO_QUERY_THROW );
-    if (use_filtered)
-        xActiveDataSink->setInputStream( ::xmlscript::createInputStream(
-                                             filtered ) );
-    else
-        ucb_content.openStream( xActiveDataSink );
-    
-    if (transientMode())
-        m_xMergeImporter->importLayer( xLayer );
-    else
-        m_xMergeImporter->importLayerForEntity( xLayer, getConfigLayer() );
-}
-
-//##############################################################################
-
-// Package
-//______________________________________________________________________________
-BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
-{
-    BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
-    if (NULL == pBackend)
-    {    
-        //May throw a DisposedException
-        check();
-        //We should never get here...
-        throw RuntimeException(
-            OUSTR("Failed to get the BackendImpl"), 
-            static_cast<OWeakObject*>(const_cast<PackageImpl *>(this)));
-    }
-    return pBackend;
-}
-
-beans::Optional< beans::Ambiguous<sal_Bool> >
-BackendImpl::PackageImpl::isRegistered_(
-    ::osl::ResettableMutexGuard &,
-    ::rtl::Reference<AbortChannel> const &,
-    Reference<XCommandEnvironment> const & )
-{
-    BackendImpl * that = getMyBackend();
-    return beans::Optional< beans::Ambiguous<sal_Bool> >(
-        true /* IsPresent */,
-        beans::Ambiguous<sal_Bool>(
-            that->m_registeredPackages->has(
-                rtl::OUStringToOString( m_url, RTL_TEXTENCODING_UTF8 ) ),
-            false /* IsAmbiguous */ ) );
+    rtl::OUString newUrl(url + OUString(RTL_CONSTASCII_USTRINGPARAM(".mod")));
+        //TODO: unique name
+    ucbhelper::Content(newUrl, xCmdEnv).writeStream(
+        xmlscript::createInputStream(filtered), true);
+    return newUrl;
 }
 
 //______________________________________________________________________________
 void BackendImpl::PackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
-    ::rtl::Reference<AbortChannel> const & abortChannel,
+    ::rtl::Reference<AbortChannel> const &,
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
     BackendImpl * that = getMyBackend();
+    OUString url( getURL() );
+    
     if (doRegisterPackage)
     {
         if (m_isSchema)
         {
-            OSL_ENSURE( ! that->transientMode(),
-                        "### schema cannot be deployed transiently!" );
-            if (! that->transientMode()) {
-                that->xcs_merge_in( m_url, xCmdEnv );
-                that->m_registeredPackages->put(
-                    rtl::OUStringToOString( m_url, RTL_TEXTENCODING_UTF8),
-                    rtl::OString(
-                        RTL_CONSTASCII_STRINGPARAM(
-                            "vnd.sun.star.configuration-schema" ) ) );
-            }
+            configmgr::update::insertExtensionXcsFile(
+                that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
         }
         else
         {
-            that->xcu_merge_in( m_url, xCmdEnv );
-            that->m_registeredPackages->put(
-                rtl::OUStringToOString( m_url, RTL_TEXTENCODING_UTF8 ),
-                rtl::OString(
-                    RTL_CONSTASCII_STRINGPARAM(
-                        "vnd.sun.star.configuration-data" ) ) );
+            url = replaceOrigin(url, xCmdEnv);
+            configmgr::update::insertExtensionXcuFile(
+                that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
         }
+        
+        that->addToConfigmgrIni( m_isSchema, url, xCmdEnv );
     }
     else // revoke
     {
-        OSL_ASSERT(
-            that->m_registeredPackages->has(
-                rtl::OUStringToOString( m_url, RTL_TEXTENCODING_UTF8 ) ) );
-        t_string2string_map entries( that->m_registeredPackages->getEntries() );
-        t_string2string_map::const_iterator iPos( entries.begin() );
-        t_string2string_map::const_iterator const iEnd( entries.end() );
-        
-        if (m_isSchema)
-        {
-            if (! that->transientMode())
+        if (!that->removeFromConfigmgrIni(m_isSchema, url, xCmdEnv)) {
+            t_string2string_map entries(
+                that->m_registeredPackages->getEntries());
+            for (t_string2string_map::iterator i(entries.begin());
+                 i != entries.end(); ++i)
             {
-                ::ucbhelper::Content ucbSaveLayer(
-                    makeURL( that->getConfigLayer(), OUSTR("schema") ),
-                    xCmdEnv );
-                ucbSaveLayer.setPropertyValue(
-                    StrTitle::get(), Any( OUSTR("schema.bak") ) );
-                try {
-                    for ( ; iPos != iEnd; ++iPos )
-                    {
-                        checkAborted( abortChannel );
-                        if (iPos->second == "vnd.sun.star.configuration-schema")
-                        {
-                            OUString url(
-                                rtl::OStringToOUString(
-                                    iPos->first, RTL_TEXTENCODING_UTF8 ) );
-                            if (!url.equals( m_url )) {
-                                that->xcs_merge_in( url, xCmdEnv );
-                            }
-                        }
+                rtl::OUString url2(
+                    rtl::OStringToOUString(i->first, RTL_TEXTENCODING_UTF8));
+                if (url2 != url) {
+                    bool schema = i->second.equalsIgnoreAsciiCase(
+                        "vnd.sun.star.configuration-schema");
+                    if (!schema) {
+                        url2 = replaceOrigin(url2, xCmdEnv);
                     }
+                    that->addToConfigmgrIni(schema, url2, xCmdEnv);
                 }
-                catch (RuntimeException &) {
-                    throw;
-                }
-                catch (Exception &) {
-                    ucbSaveLayer.setPropertyValue(
-                        StrTitle::get(), Any( OUSTR("schema") ) );
-                    throw;
-                }
-                that->m_registeredPackages->erase(
-                    rtl::OUStringToOString( m_url, RTL_TEXTENCODING_UTF8 ) );
-                ucbSaveLayer.executeCommand(
-                    OUSTR("delete"), Any( true /* delete physically */ ) );
+                that->m_registeredPackages->erase(i->first);
             }
-        }
-        else // data
-        {
-            if (! that->transientMode())
-            {
-                ::ucbhelper::Content ucbSaveLayer(
-                    makeURL( that->getConfigLayer(), OUSTR("data") ),
-                    xCmdEnv );
-                ucbSaveLayer.setPropertyValue(
-                    StrTitle::get(), Any( OUSTR("data.bak") ) );
-                try {
-                    for ( ; iPos != iEnd; ++iPos )
-                    {
-                        checkAborted( abortChannel );   
-                        if (iPos->second == "vnd.sun.star.configuration-data") {
-                            OUString url(
-                                rtl::OStringToOUString(
-                                    iPos->first, RTL_TEXTENCODING_UTF8 ) );
-                            if (!url.equals( m_url )) {
-                                that->xcu_merge_in( url, xCmdEnv );
-                            }
-                        }
-                    }
-                }
-                catch (RuntimeException &) {
-                    throw;
-                }
-                catch (Exception &) {
-                    ucbSaveLayer.setPropertyValue(
-                        StrTitle::get(), Any( OUSTR("data") ) );
-                    throw;
-                }
-                that->m_registeredPackages->erase(
-                    rtl::OUStringToOString( m_url, RTL_TEXTENCODING_UTF8 ) );
-                ucbSaveLayer.executeCommand(
+            ::ucbhelper::Content(
+                makeURL( that->getCachePath(), OUSTR("registry") ),
+                xCmdEnv ).executeCommand(
                     OUSTR("delete"), Any( true /* delete physically */ ) );
-            }
-        }
-    }
-    
-    if (!m_isSchema && getMyBackend()->m_defaultProvider.is()) {
-        // temp workaround for config bug:
-        try {
-            getMyBackend()->m_defaultProvider->refresh();
-        }
-        catch (lang::WrappedTargetRuntimeException & exc) {
-            (void) exc;
-            OSL_ENSURE( 0, ::rtl::OUStringToOString(
-                            ::comphelper::anyToString(exc.TargetException),
-                            RTL_TEXTENCODING_UTF8 ).getStr() );
         }
+        
+        //TODO: revoking at runtime, possible, sensible?
     }
 }
 
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
index 8e62296be7..479f50e20b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.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: dp_configuration.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/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src
index 2ed7c62b51..3570eaf28f 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.src
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.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: dp_configuration.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/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk
index 433b1e638f..f549b0e7b0 100644
--- a/desktop/source/deployment/registry/configuration/makefile.mk
+++ b/desktop/source/deployment/registry/configuration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index f37a9d5bfe..8771fc6c7f 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_backend.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -137,7 +134,7 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
 {
     ::osl::ResettableMutexGuard guard( getMutex() );
     check();
-    t_string2weakref::const_iterator const iFind( m_bound.find( url ) );
+    t_string2ref::const_iterator const iFind( m_bound.find( url ) );
     if (iFind != m_bound.end()) {
         Reference<deployment::XPackage> xPackage( iFind->second );
         if (xPackage.is())
@@ -169,8 +166,8 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
     }
     
     guard.reset();
-    ::std::pair< t_string2weakref::iterator, bool > insertion(
-        m_bound.insert( t_string2weakref::value_type( url, xNewPackage ) ) );
+    ::std::pair< t_string2ref::iterator, bool > insertion(
+        m_bound.insert( t_string2ref::value_type( url, xNewPackage ) ) );
     if (insertion.second)
     { // first insertion
         OSL_ASSERT( Reference<XInterface>(insertion.first->second)
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 543bb4fd6c..c20a8835f6 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_registry.cxx,v $
- * $Revision: 1.12.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src
index 0ba362ea92..1658e4bdcc 100644
--- a/desktop/source/deployment/registry/dp_registry.src
+++ b/desktop/source/deployment/registry/dp_registry.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: dp_registry.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/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 5ecfab8b34..92e76a3db7 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_executable.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/desktop/source/deployment/registry/executable/makefile.mk b/desktop/source/deployment/registry/executable/makefile.mk
index 7ad5289655..1e57f5ecf3 100644
--- a/desktop/source/deployment/registry/executable/makefile.mk
+++ b/desktop/source/deployment/registry/executable/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 585ca126c4..ca94a30221 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_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: dp_help.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/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc
index 2d0d1883e9..451144813f 100644
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/desktop/source/deployment/registry/help/dp_help.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: dp_help.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/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src
index 4d1ccfaf36..6cb9b023e6 100644
--- a/desktop/source/deployment/registry/help/dp_help.src
+++ b/desktop/source/deployment/registry/help/dp_help.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: dp_help.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/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk
index 9e11f82d3a..ba904bb7f2 100644
--- a/desktop/source/deployment/registry/help/makefile.mk
+++ b/desktop/source/deployment/registry/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 5ce311d1dc..9395922676 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_backend.h,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -247,11 +244,17 @@ class PackageRegistryBackend
     : protected ::dp_misc::MutexHolder, public t_BackendBase
 {
     ::rtl::OUString m_cachePath;
-    
+    //The map held originally WeakReferences. The map entries are removed in the disposing
+    //function, which is called when the XPackages are destructed or they are
+    //explicitely disposed. The latter happens, for example, when a extension is
+    //removed (see dp_manager.cxx). However, because of how the help systems work, now
+    // XPackageManager::getDeployedPackages is called often. This results in a lot
+    //of bindPackage calls which are costly. Therefore we keep hard references in
+    //the map now.
     typedef ::std::hash_map<
-        ::rtl::OUString, css::uno::WeakReference<css::deployment::XPackage>,
-        ::rtl::OUStringHash > t_string2weakref;
-    t_string2weakref m_bound;
+        ::rtl::OUString, css::uno::Reference<css::deployment::XPackage>,
+        ::rtl::OUStringHash > t_string2ref;
+    t_string2ref m_bound;
     
 protected:
     css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
index 7dc6dfad2f..7f8124b78d 100644
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ b/desktop/source/deployment/registry/inc/dp_registry.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: dp_registry.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/desktop/source/deployment/registry/makefile.mk b/desktop/source/deployment/registry/makefile.mk
index 7741583d93..de0e943654 100644
--- a/desktop/source/deployment/registry/makefile.mk
+++ b/desktop/source/deployment/registry/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/registry/package/dp_description.cxx b/desktop/source/deployment/registry/package/dp_description.cxx
index 48a8633f98..144edc685f 100644
--- a/desktop/source/deployment/registry/package/dp_description.cxx
+++ b/desktop/source/deployment/registry/package/dp_description.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_description.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/desktop/source/deployment/registry/package/dp_description.hxx b/desktop/source/deployment/registry/package/dp_description.hxx
index aaaa500721..776d85e698 100644
--- a/desktop/source/deployment/registry/package/dp_description.hxx
+++ b/desktop/source/deployment/registry/package/dp_description.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_description.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index b4042d1969..bffe47b5e7 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_package.cxx,v $
- * $Revision: 1.34.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -446,12 +443,19 @@ BackendImpl::PackageImpl::isRegistered_(
         AbortChannel::Chain chain( abortChannel, xSubAbortChannel );
         beans::Optional< beans::Ambiguous<sal_Bool> > option(
             xPackage->isRegistered( xSubAbortChannel, xCmdEnv ) );
+
+        //present = true if at least one bundle item has this value.
+        //reg = true if all bundle items have an option value (option.IsPresent == 1)
+        //and all have value of true (option.Value.Value == true)
+        //If not, then the bundle has the status of not registered and ambiguous.
         if (option.IsPresent)
         {
             beans::Ambiguous<sal_Bool> const & status = option.Value;
             if (present)
             {
+                //we never come here in the first iteration
                 if (reg != (status.Value != sal_False)) {
+                    
                     ambig = true;
                     reg = false;
                     break;
@@ -459,6 +463,7 @@ BackendImpl::PackageImpl::isRegistered_(
             }
             else
             {
+                //we always come here in the first iteration
                 reg = status.Value;
                 present = true;
             }
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
index 9c2fb9bc0c..0b258a58cd 100644
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ b/desktop/source/deployment/registry/package/dp_package.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: dp_package.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/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src
index 73f5a9d3be..056a17cb06 100644
--- a/desktop/source/deployment/registry/package/dp_package.src
+++ b/desktop/source/deployment/registry/package/dp_package.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: dp_package.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/desktop/source/deployment/registry/package/makefile.mk b/desktop/source/deployment/registry/package/makefile.mk
index 007574eeff..ccadc20703 100644
--- a/desktop/source/deployment/registry/package/makefile.mk
+++ b/desktop/source/deployment/registry/package/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 0c0b3c5191..9eeae38260 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_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: dp_lib_container.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/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index a3033a1162..3a3079755c 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_lib_container.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/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index f5c2ee3e3e..b817c9b6aa 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_script.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/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index 908e7b652d..f5b52f1b1f 100644
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.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: dp_script.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/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src
index d2c2d9f84e..21e0cfdcc9 100644
--- a/desktop/source/deployment/registry/script/dp_script.src
+++ b/desktop/source/deployment/registry/script/dp_script.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: dp_script.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/desktop/source/deployment/registry/script/makefile.mk b/desktop/source/deployment/registry/script/makefile.mk
index 76195895b2..ae159914a5 100644
--- a/desktop/source/deployment/registry/script/makefile.mk
+++ b/desktop/source/deployment/registry/script/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 0653934af9..7db0952c81 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_parceldesc.cxx,v $
- * $Revision: 1.7.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 60f0fab348..d90a38f376 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_parceldesc.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/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 953cdb8901..049e9c9e88 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dp_sfwk.cxx,v $
- * $Revision: 1.16.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
index 3ddae3366d..ed164251cc 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.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: dp_sfwk.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/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src
index 028d30a2d1..32a5072401 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.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: dp_sfwk.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/desktop/source/deployment/registry/sfwk/makefile.mk b/desktop/source/deployment/registry/sfwk/makefile.mk
index 2884e79861..a052296d5c 100644
--- a/desktop/source/deployment/registry/sfwk/makefile.mk
+++ b/desktop/source/deployment/registry/sfwk/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/target.pmk b/desktop/source/deployment/target.pmk
index 067db401b1..82b41766b2 100644
--- a/desktop/source/deployment/target.pmk
+++ b/desktop/source/deployment/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk
index c34f7e1825..06b39cd2d0 100644
--- a/desktop/source/deployment/unopkg/makefile.mk
+++ b/desktop/source/deployment/unopkg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src
index efa9e1de5f..e044c0efc2 100644
--- a/desktop/source/deployment/unopkg/unopkg.src
+++ b/desktop/source/deployment/unopkg/unopkg.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: unopkg.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/desktop/source/inc/exithelper.hxx b/desktop/source/inc/exithelper.hxx
index 76247c7815..112d4848f0 100644
--- a/desktop/source/inc/exithelper.hxx
+++ b/desktop/source/inc/exithelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exithelper.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 7bbc194670..2435467f76 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/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.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx
index efbdcd6c8a..c3b9160dd6 100644
--- a/desktop/source/migration/cfgfilter.cxx
+++ b/desktop/source/migration/cfgfilter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cfgfilter.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
index 31af71f83f..bc0cd9a62b 100644
--- a/desktop/source/migration/makefile.mk
+++ b/desktop/source/migration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 7cb230764f..3de12d3b2c 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: migration.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -16,7 +13,7 @@
  * only, as published by the Free Software Foundation.
  *
  * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT uno::Any WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
  * (a copy is included in the LICENSE file that accompanied this code).
diff --git a/desktop/source/migration/migration.hrc b/desktop/source/migration/migration.hrc
deleted file mode 100644
index 9c558e357c..0000000000
--- a/desktop/source/migration/migration.hrc
+++ /dev/null
@@ -1 +0,0 @@
-.
diff --git a/desktop/source/migration/migration.hxx b/desktop/source/migration/migration.hxx
index 545c47eecd..3ba0d8fd80 100644
--- a/desktop/source/migration/migration.hxx
+++ b/desktop/source/migration/migration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: migration.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/desktop/source/migration/migration.src b/desktop/source/migration/migration.src
deleted file mode 100644
index e69de29bb2..0000000000
--- a/desktop/source/migration/migration.src
+++ /dev/null
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index e07847aed5..0de88d4dbc 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_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: migration_impl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 1840ed8997..c70707bde8 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pages.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,27 +94,20 @@ WelcomePage::WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_B
     _setBold(m_ftHead);
 
     checkEval();
-    // we need to choose the welcome text that is diplayed
-    // choices are the default text, default text+migradtion,
-    // OEM and extended OEM
-    // No OEM is built, remove the check
-//     switch (checkOEM())
-//     {
-//     case OEM_NONE:
-        // check for migration
-        if (Migration::checkMigration())
-        {
-            String aText(WizardResId(STR_WELCOME_MIGRATION));
-            // replace %OLDPRODUCT with found version name
-            aText.SearchAndReplaceAll( UniString::CreateFromAscii("%OLD_VERSION"), Migration::getOldVersionName());
-            m_ftBody.SetText( aText );
-        }
-        else
-        if ( ! m_bLicenseNeedsAcceptance )
-        {
-            String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
-            m_ftBody.SetText( aText );
-        }
+
+    // check for migration
+    if (Migration::checkMigration())
+    {
+        String aText(WizardResId(STR_WELCOME_MIGRATION));
+        // replace %OLDPRODUCT with found version name
+        aText.SearchAndReplaceAll( UniString::CreateFromAscii("%OLD_VERSION"), Migration::getOldVersionName());
+        m_ftBody.SetText( aText );
+    }
+    else if ( ! m_bLicenseNeedsAcceptance )
+    {
+        String aText(WizardResId(STR_WELCOME_WITHOUT_LICENSE));
+        m_ftBody.SetText( aText );
+    }
 }
 
 
@@ -625,84 +615,4 @@ void RegistrationPage::executeSingleMode()
         ::utl::RegOptions().removeReminder();
 }
 
-// -----------------------------------------------------------------------
-
-static char const OEM_PRELOAD_SECTION[] = "Bootstrap";
-static char const OEM_PRELOAD[]		= "Preload";
-static char const STR_TRUE[]		= "1";
-static char const STR_FALSE[]		= "0";
-
-static sal_Bool existsURL( OUString const& _sURL )
-{
-    using namespace osl;
-    DirectoryItem aDirItem;
-
-    if (_sURL.getLength() != 0)
-        return ( DirectoryItem::get( _sURL, aDirItem ) == DirectoryItem::E_None );
-
-    return sal_False;
-}
-
-
-// locate soffice.ini/.rc file
-static OUString locateIniFile()
-{
-    OUString aUserDataPath;
-    OUString aSofficeIniFileURL;
-
-    // Retrieve the default file URL for the soffice.ini/rc
-    rtl::Bootstrap().getIniName( aSofficeIniFileURL );
-
-    if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS )
-    {
-        const char CONFIG_DIR[] = "/config";
-
-        sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/');
-        if ( nIndex > 0 )
-        {
-            OUString		aUserSofficeIniFileURL;
-            OUStringBuffer	aBuffer( aUserDataPath );
-            aBuffer.appendAscii( CONFIG_DIR );
-            aBuffer.append( aSofficeIniFileURL.copy( nIndex ));
-            aUserSofficeIniFileURL = aBuffer.makeStringAndClear();
-
-            if ( existsURL( aUserSofficeIniFileURL ))
-                return aUserSofficeIniFileURL;
-        }
-    }
-    // Fallback try to use the soffice.ini/rc from program folder
-    return aSofficeIniFileURL;
-}
-
-// check whether the OEMPreload flag was set in soffice.ini/.rc
-static sal_Int32 checkOEMPreloadFlag()
-{
-    OUString aSofficeIniFileURL;
-    aSofficeIniFileURL = locateIniFile();
-    Config aConfig(aSofficeIniFileURL);
-    aConfig.SetGroup( OEM_PRELOAD_SECTION );
-    ByteString sResult = aConfig.ReadKey( OEM_PRELOAD );
-    return sResult.ToInt32();
-    /*
-    if ( sResult == STR_TRUE )
-        return sal_True;
-    else
-        return sal_False;
-    */
-}
-
-WelcomePage::OEMType WelcomePage::checkOEM()
-{
-  sal_Int32 oemResult = checkOEMPreloadFlag();
-  switch (oemResult) {
-  case 1:
-    return OEM_NORMAL;
-  case 2:
-    return OEM_EXTENDED;
-  default:
-    return OEM_NONE;
-  }
-}
-
 } // namespace desktop
-
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index f243fff61f..57a3d57f7d 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pages.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,6 @@ private:
     {
         OEM_NONE, OEM_NORMAL, OEM_EXTENDED
     };
-    OEMType checkOEM();
     bool bIsEvalVersion;
     bool bNoEvalText;
     void checkEval();
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index b480a241d0..71818a6438 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autocorrmigration.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/desktop/source/migration/services/autocorrmigration.hxx b/desktop/source/migration/services/autocorrmigration.hxx
index 669ff5830c..bfcdee737d 100644
--- a/desktop/source/migration/services/autocorrmigration.hxx
+++ b/desktop/source/migration/services/autocorrmigration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autocorrmigration.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/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 94e6ebc12f..0796b6f033 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicmigration.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/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index f9af1ea829..47fca13077 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicmigration.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx
index 7be21587fa..b1449b0408 100644
--- a/desktop/source/migration/services/cexports.cxx
+++ b/desktop/source/migration/services/cexports.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cexports.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/desktop/source/migration/services/cppumaker.mk b/desktop/source/migration/services/cppumaker.mk
index c1d1fedcfb..5ab16ed1e3 100644
--- a/desktop/source/migration/services/cppumaker.mk
+++ b/desktop/source/migration/services/cppumaker.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cppumaker.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/desktop/source/migration/services/extensionmigration.cxx b/desktop/source/migration/services/extensionmigration.cxx
index adf2038d8e..dc268aad37 100755
--- a/desktop/source/migration/services/extensionmigration.cxx
+++ b/desktop/source/migration/services/extensionmigration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extensionmigration.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -244,16 +241,6 @@ namespace migration
         }
     }
 
-    void ExtensionMigration::registerConfigurationPackage( const uno::Reference< deployment::XPackage > & xPkg)
-    {
-        const ::rtl::OUString sMediaType = xPkg->getPackageType()->getMediaType();
-        if ( (sMediaType.equals(sConfigurationDataType) || sMediaType.equals(sConfigurationSchemaType) ) )
-        {
-            xPkg->revokePackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
-            xPkg->registerPackage(uno::Reference< task::XAbortChannel >(), uno::Reference< ucb::XCommandEnvironment> ());
-        }
-    }
-
     bool ExtensionMigration::processExtensions( const ::rtl::OUString& sSourceDir, const ::rtl::OUString& sTargetDir )
     {
         if (!copy(sSourceDir, sTargetDir))
diff --git a/desktop/source/migration/services/extensionmigration.hxx b/desktop/source/migration/services/extensionmigration.hxx
index 58588ceb7d..2ca9d74b2c 100755
--- a/desktop/source/migration/services/extensionmigration.hxx
+++ b/desktop/source/migration/services/extensionmigration.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extensionmigration.hxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -101,8 +98,6 @@ namespace migration
             ::com::sun::star::deployment::XPackage > & xPkg);
         void registerBasicPackage(
             const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
-        void registerConfigurationPackage(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > & xPkg);
 
     public:
         ExtensionMigration(::com::sun::star::uno::Reference<
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 065d158138..3511108b3b 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jvmfwk.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -241,15 +238,6 @@ css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
     return css::uno::Sequence< OUString >( &str_name, 1 );
 }
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL jvmfwk_create(
-    css::uno::Reference< css::uno::XComponentContext > const & )
-    throw (css::uno::Exception)
-{
-    return static_cast< ::cppu::OWeakObject * >(new JavaMigration);
-
-}
-
-
 // XServiceInfo
 OUString SAL_CALL JavaMigration::getImplementationName()
     throw (css::uno::RuntimeException)
diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx
index 5786524ee6..dc81b60f53 100644
--- a/desktop/source/migration/services/jvmfwk.hxx
+++ b/desktop/source/migration/services/jvmfwk.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jvmfwk.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,16 +42,9 @@ namespace css = com::sun::star;
 namespace migration
 {
 
-
 rtl::OUString jvmfwk_getImplementationName();
 
 css::uno::Sequence< rtl::OUString > jvmfwk_getSupportedServiceNames();
 
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL jvmfwk_create(
-    css::uno::Reference< css::uno::XComponentContext > const & )
-    throw (css::uno::Exception);
-
-
 } //end blind namespace
 
diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk
index 22d28ee00c..323b823fe3 100644
--- a/desktop/source/migration/services/makefile.mk
+++ b/desktop/source/migration/services/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,8 +50,7 @@ SLOFILES= \
         $(SLO)$/cexports.obj \
         $(SLO)$/basicmigration.obj \
         $(SLO)$/wordbookmigration.obj \
-        $(SLO)$/extensionmigration.obj \
-        $(SLO)$/autocorrmigration.obj
+        $(SLO)$/extensionmigration.obj
 
 SHL1TARGET=$(TARGET)
 SHL1VERSIONMAP = migrationoo2.map
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index c2f670680e..8fe846109c 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: misc.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/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index c5a5996473..54cfe9fb3f 100755
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wordbookmigration.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index e75d6a080d..3096beb3fe 100755
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wordbookmigration.hxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 73735814a5..ae40a73278 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wizard.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/desktop/source/migration/wizard.hrc b/desktop/source/migration/wizard.hrc
index 65b825f77a..7ef461f1ee 100644
--- a/desktop/source/migration/wizard.hrc
+++ b/desktop/source/migration/wizard.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: wizard.hrc,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 99f3a38f3f..a994ec8274 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wizard.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/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index 1130bd6f05..ed6e8d486b 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wizard.src,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 8d6e973133..b4ffc5aad7 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceptor.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/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index c54d63c7cc..a66d243d30 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceptor.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/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk
index e269ec44d9..fb5cb9ab93 100644
--- a/desktop/source/offacc/makefile.mk
+++ b/desktop/source/offacc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/pagein/file_image.h b/desktop/source/pagein/file_image.h
index a575465ddb..dae9f39b65 100644
--- a/desktop/source/pagein/file_image.h
+++ b/desktop/source/pagein/file_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: file_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/desktop/source/pagein/file_image_unx.c b/desktop/source/pagein/file_image_unx.c
index f82ff1d179..e4d62fe6ca 100644
--- a/desktop/source/pagein/file_image_unx.c
+++ b/desktop/source/pagein/file_image_unx.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: file_image_unx.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/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 6264128772..01452a858e 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -123,7 +119,7 @@ $(MISC)$/$(TARGET)-common : makefile.mk
     @-echo $(DLLPRE)package2$(DLLPOST) >> $@
     @-echo $(DLLPRE)ucpfile1$(DLLPOST) >> $@
     @-echo $(DLLPRE)ucb1$(DLLPOST)     >> $@
-    @-echo configmgr2$(UNODLLPOST)     >> $@
+    @-echo $(DLLPRE)configmgr$(DLLPOST) >> $@
 #
     @-echo $(DLLPRE)dtrans$(DLLPOST)   >> $@
     @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST) >> $@
diff --git a/desktop/source/pagein/pagein.c b/desktop/source/pagein/pagein.c
index 7f00c86e8e..9b40013d3a 100644
--- a/desktop/source/pagein/pagein.c
+++ b/desktop/source/pagein/pagein.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: pagein.c,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk
index 4a1f409f45..8384f1b243 100644
--- a/desktop/source/pkgchk/unopkg/makefile.mk
+++ b/desktop/source/pkgchk/unopkg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 2a1c71288c..6b49ed0f48 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -2,13 +2,10 @@
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkg_app.cxx,v $
- * $Revision: 1.14.58.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 7dbce92fd1..68eb11f91b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkg_cmdenv.cxx,v $
- * $Revision: 1.12.8.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c
index 3cc02c0ba3..f1ffe5cd6e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_main.c
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.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: unopkg_main.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/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h
index 5b6e9c4207..2bdc4a2feb 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_main.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_main.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkg_main.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/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 3518b3fb1e..2d8b575dad 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkg_misc.cxx,v $
- * $Revision: 1.15.52.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index b17b89ead1..397c57c6a3 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkg_shared.h,v $
- * $Revision: 1.9.8.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/pkgchk/unopkg/version.map b/desktop/source/pkgchk/unopkg/version.map
index 5e0b22c95d..b729ec6eb6 100644
--- a/desktop/source/pkgchk/unopkg/version.map
+++ b/desktop/source/pkgchk/unopkg/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/desktop/source/registration/com/sun/star/registration/Registration.java b/desktop/source/registration/com/sun/star/registration/Registration.java
index 3d396e3b8d..6ac22c7c39 100644
--- a/desktop/source/registration/com/sun/star/registration/Registration.java
+++ b/desktop/source/registration/com/sun/star/registration/Registration.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Registration.java,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/registration/com/sun/star/registration/makefile.mk b/desktop/source/registration/com/sun/star/registration/makefile.mk
index f20eaf71ad..9784166eb9 100644
--- a/desktop/source/registration/com/sun/star/registration/makefile.mk
+++ b/desktop/source/registration/com/sun/star/registration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
index b0e944a0f8..c475b75dd3 100644
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Registration.java,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
index f3b0b9c3c3..41d328ca08 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Registration.java,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index a58072d363..f81d935891 100644
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Registration.java,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
index c58d83a33d..9323e5de7e 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
@@ -1,531 +1,531 @@
-

-/*

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

- *

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

- *

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

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

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

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

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

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

- * language governing permissions and limitations under the License.

- *

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

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

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

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

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

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

- * identifying information: "Portions Copyrighted [year]

- * [name of copyright owner]"

- *

- * Contributor(s):

- *

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

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

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

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

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

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

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

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

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

- * holder.

- */

-

-package com.sun.star.servicetag;

-

-import java.io.*;

-import java.net.UnknownHostException;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.LinkedHashMap;

-import java.util.Map;

-import java.util.Set;

-

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

-

-/**

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

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

- * components for product registration.

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

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

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

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

- * the following elements:

- * <blockquote>

- *       <table border=0>

- *       <tr>

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

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

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

- *       </tr>

- *       <tr>

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

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

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

- *       </tr>

- *       <tr>

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

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

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

- *       </tr>

- *       <tr>

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

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

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

- *       </tr>

- *       <tr>

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

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

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

- *       </tr>

- *       <tr>

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

- *          <td>System model</td>

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

- *       </tr>

- *       <tr>

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

- *          <td>System manufacturer</td>

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

- *       </tr>

- *       <tr>

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

- *          <td>CPU manufacturer</td>

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

- *       </tr>

- *       <tr>

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

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

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

- *       </tr>

- *       <tr>

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

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

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

- *       </tr>

- *       </table>

- *  </blockquote>

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

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

- * empty.

- * <p>

- * <a name="XMLSchema">

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

- * <p>

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

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

- * by the

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

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

- * Service Tags Technology.

- * <p>

- * Typically the registration data is constructed at installation time

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

- * 

- * <p>

- * <b>Example Usage</b>

- * <p>

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

- * used for product registration.

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

- * <ol>

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

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

- * <br>

- * <blockquote><pre>

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

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

- *                                          ....);

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

- *   if (Registry.isSupported()) {

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

- *   }

- * 

- *   // add to the registration data

- *   RegistrationData registration  = new RegistrationData();

- *   registration.addServiceTag(st); 

- * </pre></blockquote>

- * </li>

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

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

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

- * <p>

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

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

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

- * processes the registration data payload sent via HTTP post

- * and hosts the registration user interface for a specified 

- * registration URL.  Refer to the 

- * Registration Relay Service Specification for details.

- * <p>

- * <blockquote><pre>

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

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

- *   con.setDoInput(true);

- *   con.setDoOutput(true);

- *   con.setUseCaches(false);

- *   con.setAllowUserInteraction(false);

- *   con.setRequestMethod("POST");

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

- *   con.connect();

- *

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

- *   OutputStream out = con.getOutputStream();

- *   registration.storeToXML(out);

- *   out.close();

- * </pre></blockquote>

- * </li>

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

- *     for later service tag lookup or registration.

- * <br>

- * <blockquote><pre>

- *   BufferedOutputStream out = new BufferedOutputStream(

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

- *   registration.storeToXML(out);

- *   out.close();

- * </pre></blockquote>

- * </li> 

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

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

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

- * when the registration data was constructed.

- * <br>

- * <blockquote><pre>

- *   if (Registry.isSupported()) {

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

- *       for (ServiceTag st : svctags) {

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

- *       }

- *   }

- * </pre></blockquote>

- * </li>

- * </ol>

- * 

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

- */

-public class RegistrationData {

-    private final Map<String, String> environment;

-    private final Map<String, String> cpuInfo;

-    private final Map<String, ServiceTag> svcTagMap;

-    private final String urn;

-

-    /**

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

-     * {@link #getRegistrationURN registration URN}.

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

-     * will be initialized for the configuration of the 

-     * running system:

-     * <blockquote>

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

-     * <tt>osArchitecture</tt>

-     * </blockquote>

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

-     */

-    public RegistrationData() {

-        this(Util.generateURN());

-    }

-    

-    // package private

-    RegistrationData(String urn) {

-        this.urn = urn;

-        SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();

-        this.environment = initEnvironment(sysEnv);

-        this.cpuInfo = initCpuInfo(sysEnv);

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

-    }

-    

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

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

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

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

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

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

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

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

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

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

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

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

-        return map;

-    }  

-

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

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

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

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

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

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

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

-        return map;

-    }  

-    

-    /**

-     * Returns the uniform resource name of this registration data

-     * in this format:

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

-     * 

-     * @return the URN of this registration data.

-     */

-    public String getRegistrationURN() {

-        return urn;

-    }

-

-    /**

-     * Returns a map containing the environment information for this

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

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

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

-     * in the returned map.

-     * 

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

-     */

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

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

-    }

-

-    /**

-     * Returns a map containing the cpu information for this

-     * registration data.  Subsequent update to the cpu info

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

-     * in the returned map.

-     *

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

-     */

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

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

-    }

-

-    /**

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

-     * with the given {@code value}.

-     * 

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

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

-     */

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

-        if (name == null) {

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

-        }

-        if (value == null) {

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

-        }

-        if (environment.containsKey(name)) {

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

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

-                    throw new IllegalArgumentException("\"" +

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

-                }

-            }

-            environment.put(name, value);

-        } else {

-            throw new IllegalArgumentException("\"" +

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

-        }   

-    }

-

-    /**

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

-     * with the given {@code value}.

-     *

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

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

-     */

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

-        if (name == null) {

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

-        }

-        if (value == null) {

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

-        }

-        if (cpuInfo.containsKey(name)) {

-            cpuInfo.put(name, value);

-        } else {

-            throw new IllegalArgumentException("\"" +

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

-        }   

-    }

-

-    /**

-     * Returns all service tags in this registration data.

-     * 

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

-     * in this registration data.

-     */

-    public Set<ServiceTag> getServiceTags() {

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

-    }

-

-    /**

-     * Adds a service tag to this registration data. 

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

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

-     * of the service tag in this registration data. 

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

-     * added to this registration data.

-     * 

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

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

-     * 

-     * @throws IllegalArgumentException if 

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

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

-     */

-    public synchronized ServiceTag addServiceTag(ServiceTag st) {

-        ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);

-        

-        String instanceURN = svcTag.getInstanceURN();

-        if (svcTagMap.containsKey(instanceURN)) {

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

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

-        } else {

-            svcTagMap.put(instanceURN, svcTag);

-        }

-        return svcTag;

-    }

-

-    /**

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

-     * data.

-     *

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

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

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

-     */

-    public synchronized ServiceTag getServiceTag(String instanceURN) {

-        if (instanceURN == null) {

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

-        }

-        return svcTagMap.get(instanceURN);

-    }

-

-    /**

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

-     * registration data.

-     *

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

-     * the service tag to be removed.

-     *

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

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

-     * registration data.

-     */

-    public synchronized ServiceTag removeServiceTag(String instanceURN) {

-        if (instanceURN == null) {

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

-        }

-

-        ServiceTag svcTag = null;

-        if (svcTagMap.containsKey(instanceURN)) {

-            svcTag = svcTagMap.remove(instanceURN);

-        }

-        return svcTag;

-    }

-

-     /**

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

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

-     * 

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

-     * @param productDefinedInstanceID the value of the

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

-     * 

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

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

-     * registration data.

-     */

-    public synchronized ServiceTag updateServiceTag(String instanceURN,

-                                                    String productDefinedInstanceID) {

-        ServiceTag svcTag = getServiceTag(instanceURN);

-        if (svcTag == null) {

-            return null;

-        }

-

-        svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);

-        // update the product defined instance ID field

-        svcTag.setProductDefinedInstanceID(productDefinedInstanceID);

-        svcTagMap.put(instanceURN, svcTag);

-        return svcTag;

-    }

-    

-    /**

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

-     * specified input stream.  The XML document must be 

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

-     * registration data schema</a>.

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

-     * 

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

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

-     * stream.

-     * 

-     * @throws IllegalArgumentException if the input stream 

-     * contains an invalid registration data.

-     * 

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

-     */

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

-        try {

-            return RegistrationDocument.load(in);

-        } finally {

-            in.close();

-        }

-    }

-    

-    /**

-     * Writes the registration data to the specified output stream 

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

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

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

-     * 

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

-     * 

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

-     */

-    public void storeToXML(OutputStream os) throws IOException {

-        RegistrationDocument.store(os, this);

-        os.flush();

-    }

-

-    /** 

-     * Returns a newly allocated byte array containing the registration

-     * data in XML format.

-     *

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

-     * data in XML format.

-     */

-    public byte[] toXML() {

-        try {

-            ByteArrayOutputStream out = new ByteArrayOutputStream();

-            storeToXML(out);

-            return out.toByteArray();

-        } catch (IOException e) {

-            // should not reach here

-            return new byte[0];

-        }

-    }

-

-    /**

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

-     * format.

-     * 

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

-     *         format.

-     */

-    @Override

-    public String toString() {

-        try {

-            ByteArrayOutputStream out = new ByteArrayOutputStream();

-            storeToXML(out);

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

-        } catch (IOException e) {

-            // should not reach here

-            return "Error creating the return string.";

-        }

-    }

-}

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

-/*

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

- *

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

- *

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

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

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

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

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

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

- * language governing permissions and limitations under the License.

- *

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

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

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

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

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

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

- * identifying information: "Portions Copyrighted [year]

- * [name of copyright owner]"

- *

- * Contributor(s):

- *

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

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

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

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

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

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

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

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

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

- * holder.

- */

-

-package com.sun.star.servicetag;

-

-import java.io.*;

-import java.net.URL;

-import java.util.Collection;

-import java.util.Map;

-import java.util.Set;

-

-import org.w3c.dom.Document;

-import org.w3c.dom.Element;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-import org.xml.sax.SAXException;

-import org.xml.sax.InputSource;

-

-import javax.xml.XMLConstants;

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-

-import javax.xml.parsers.ParserConfigurationException;

-import javax.xml.validation.Schema;

-import javax.xml.validation.SchemaFactory;

-import javax.xml.validation.Validator;

-

-// For write operation

-import javax.xml.transform.OutputKeys;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerException;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.TransformerConfigurationException;

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

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

-

-/**

- * XML Support Class for Product Registration.

- */

-class RegistrationDocument {

-

-    private static final String REGISTRATION_DATA_SCHEMA =

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

-    private static final String REGISTRATION_DATA_VERSION = "1.0";

-    private static final String SERVICE_TAG_VERSION = "1.0";

-    final static String ST_NODE_REGISTRATION_DATA = "registration_data";

-    final static String ST_ATTR_REGISTRATION_VERSION = "version";

-    final static String ST_NODE_ENVIRONMENT = "environment";

-    final static String ST_NODE_HOSTNAME = "hostname";

-    final static String ST_NODE_HOST_ID = "hostId";

-    final static String ST_NODE_OS_NAME = "osName";

-    final static String ST_NODE_OS_VERSION = "osVersion";

-    final static String ST_NODE_OS_ARCH = "osArchitecture";

-    final static String ST_NODE_SYSTEM_MODEL = "systemModel";

-    final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";

-    final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";

-    final static String ST_NODE_SERIAL_NUMBER = "serialNumber";

-    final static String ST_NODE_PHYS_MEM = "physmem";

-    final static String ST_NODE_CPU_INFO = "cpuinfo";

-    final static String ST_NODE_SOCKETS = "sockets";

-    final static String ST_NODE_CORES = "cores";

-    final static String ST_NODE_VIRT_CPUS = "virtcpus";

-    final static String ST_NODE_CPU_NAME = "name";

-    final static String ST_NODE_CLOCK_RATE = "clockrate";

-    final static String ST_NODE_REGISTRY = "registry";

-    final static String ST_ATTR_REGISTRY_URN = "urn";

-    final static String ST_ATTR_REGISTRY_VERSION = "version";

-    final static String ST_NODE_SERVICE_TAG = "service_tag";

-    final static String ST_NODE_INSTANCE_URN = "instance_urn";

-    final static String ST_NODE_PRODUCT_NAME = "product_name";

-    final static String ST_NODE_PRODUCT_VERSION = "product_version";

-    final static String ST_NODE_PRODUCT_URN = "product_urn";

-    final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";

-    final static String ST_NODE_PRODUCT_PARENT = "product_parent";

-    final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";

-    final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";

-    final static String ST_NODE_PLATFORM_ARCH = "platform_arch";

-    final static String ST_NODE_TIMESTAMP = "timestamp";

-    final static String ST_NODE_CONTAINER = "container";

-    final static String ST_NODE_SOURCE = "source";

-    final static String ST_NODE_INSTALLER_UID = "installer_uid";

-

-    static RegistrationData load(InputStream in) throws IOException {

-        Document document = initializeDocument(in);

-        

-        // Gets the registration URN

-        Element root = getRegistrationDataRoot(document);

-        Element registryRoot =

-                getSingletonElementFromRoot(root, ST_NODE_REGISTRY);

-        String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);

-        

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

-        // Initialize the environment map and service tags

-        RegistrationData regData = new RegistrationData(urn);

-        addServiceTags(registryRoot, regData);

-

-        Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);

-        buildEnvironmentMap(envRoot, regData);

-

-        Element cpuInfo = getSingletonElementFromRoot(envRoot, ST_NODE_CPU_INFO);

-        buildCpuInfoMap(cpuInfo, regData);

-        return regData;

-    }

-

-    static void store(OutputStream os, RegistrationData registration) 

-            throws IOException {

-        // create a new document with the root node

-        Document document = initializeDocument();

-

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

-        // in the registration data

-        addEnvironmentNodes(document,

-                            registration.getEnvironmentMap(),

-                            registration.getCpuInfoMap());

-        addServiceTagRegistry(document, 

-                              registration.getRegistrationURN(),

-                              registration.getServiceTags());

-        transform(document, os);

-    }

-

-    // initialize a document from an input stream 

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

-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

-        SchemaFactory sf = null;

-        try {

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

-            // NullPointerException if SchemaFactory.newInstance is called with

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

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

-            // class loader):

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

-            if (cl == null) {

-                Thread.currentThread().setContextClassLoader(

-                    RegistrationDocument.class.getClassLoader());

-            }

-            try {

-               sf = SchemaFactory.newInstance(

-                   XMLConstants.W3C_XML_SCHEMA_NS_URI);

-            } finally {

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

-            }

-

-            Schema schema = null;

-            try {

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

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

-                // completely!

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

-                schema = sf.newSchema(xsdUrl);

-            }

-        catch (NullPointerException nex) {

-        }

-            

-            Validator validator = null;

-            if (schema != null)

-                validator = schema.newValidator();

-

-            DocumentBuilder builder = factory.newDocumentBuilder();

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

-            

-            if (validator != null)

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

-            

-            return doc;

-        } catch (SAXException sxe) {

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

-            e.initCause(sxe);

-            throw e;

-        } catch (ParserConfigurationException pce) {

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

-            // should not reach here

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

-            x.initCause(pce);

-            throw x;

-        }

-    }

-

-    // initialize a new document for the registration data

-    private static Document initializeDocument() throws IOException {

-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();

-        try {

-            DocumentBuilder builder = factory.newDocumentBuilder();

-            Document doc = builder.newDocument();

-

-            // initialize the document with the registration_data root

-            Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);

-            doc.appendChild(root);

-            root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);

-

-            return doc;

-        } catch (ParserConfigurationException pce) {

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

-            // should not reach here

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

-            x.initCause(pce);

-            throw x;

-        }

-    }

-

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

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

-        try {

-            // Use a Transformer for output

-            TransformerFactory tFactory = TransformerFactory.newInstance();

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

-

-            Transformer transformer = tFactory.newTransformer();

-

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

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

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

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

-            transformer.transform(new DOMSource(document),

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

-        } catch (UnsupportedEncodingException ue) {

-            // Should not reach here

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

-            x.initCause(ue);

-            throw x;

-        } catch (TransformerConfigurationException tce) {

-            // Error generated by the parser

-            // Should not reach here

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

-            x.initCause(tce);

-            throw x;

-        } catch (TransformerException te) {

-            // Error generated by the transformer

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

-            x.initCause(te);

-            throw x;

-        }

-    }

-

-    private static void addServiceTagRegistry(Document document, 

-                                              String registryURN,

-                                              Set<ServiceTag> svcTags) {

-        // add service tag registry node and its attributes

-        Element reg = document.createElement(ST_NODE_REGISTRY);

-        reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);

-        reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);

-        

-        Element root = getRegistrationDataRoot(document);

-        root.appendChild(reg);

-        

-        // adds the elements for the service tags

-        for (ServiceTag st : svcTags) {

-            addServiceTagElement(document, reg, st);

-        }

-    }

-

-    private static void addServiceTagElement(Document document, 

-                                             Element registryRoot,

-                                             ServiceTag st) {

-        Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);

-        registryRoot.appendChild(svcTag);

-        addChildElement(document, svcTag,

-                        ST_NODE_INSTANCE_URN, st.getInstanceURN());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_NAME, st.getProductName());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_VERSION, st.getProductVersion());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_URN, st.getProductURN());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_PARENT, st.getProductParent());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_DEFINED_INST_ID,

-                        st.getProductDefinedInstanceID());

-        addChildElement(document, svcTag,

-                        ST_NODE_PRODUCT_VENDOR, st.getProductVendor());

-        addChildElement(document, svcTag,

-                        ST_NODE_PLATFORM_ARCH, st.getPlatformArch());

-        addChildElement(document, svcTag,

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

-        addChildElement(document, svcTag,

-                        ST_NODE_CONTAINER, st.getContainer());

-        addChildElement(document, svcTag,

-                        ST_NODE_SOURCE, st.getSource());

-        addChildElement(document, svcTag,

-                        ST_NODE_INSTALLER_UID,

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

-    }

-

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

-                                        String element, String text) {

-        Element node = document.createElement(element);

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

-        root.appendChild(node);

-    }

-

-    // Constructs service tags from the document

-    private static void addServiceTags(Element registryRoot,

-                                       RegistrationData registration) {

-        NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);

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

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

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

-            ServiceTag st = getServiceTag(svcTagElement);

-            registration.addServiceTag(st);

-        }

-    }

-

-    // build environment map from the document

-    private static void buildEnvironmentMap(Element envRoot, 

-                                         RegistrationData registration) {

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

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

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

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

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

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

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

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

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

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

-    }

-

-    private static void buildCpuInfoMap(Element cpuInfoRoot, 

-                                         RegistrationData registration) {

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

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

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

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

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

-    }

-

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

-    private static void addEnvironmentNodes(Document document,

-                                            Map<String, String> envMap,

-                                            Map<String, String> cpuInfoMap) {

-        Element root = getRegistrationDataRoot(document);

-

-        Element env = document.createElement(ST_NODE_ENVIRONMENT);

-        root.appendChild(env);

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

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

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

-        }

-

-        Element cpuInfo = document.createElement(ST_NODE_CPU_INFO);

-        env.appendChild(cpuInfo);

-        keys = cpuInfoMap.entrySet();

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

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

-        }

-    }

-

-    private static Element getRegistrationDataRoot(Document doc) {

-        Element root = doc.getDocumentElement();

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

-            throw new IllegalArgumentException("Not a " + 

-                    ST_NODE_REGISTRATION_DATA +

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

-        }

-        return root;

-    }

-

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

-        NodeList children = root.getElementsByTagName(name);

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

-        if (length != 1) {

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

-                    " nodes = " + length);

-        }

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

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

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

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

-        }

-        return e;

-    }

-

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

-    private static ServiceTag getServiceTag(Element svcTagElement) {

-        return new ServiceTag(

-            getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),

-            getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),

-            getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),

-            getTextValue(svcTagElement, ST_NODE_CONTAINER),

-            getTextValue(svcTagElement, ST_NODE_SOURCE),   

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

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

-        );

-    }

-

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

-        String value = "";

-        NodeList nl = e.getElementsByTagName(tagName);

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

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

-            Node node = el.getFirstChild();

-            if (node != null) {

-                value = node.getNodeValue();

-            }

-        }

-        return value;

-    }

-}

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

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

-

-<xs:element name="registration_data">

-  <xs:complexType>

-    <xs:sequence>

-      <xs:element name="environment"

-                  minOccurs="1"

-                  maxOccurs="1">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element ref="hostname"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="hostId"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="osName"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="osVersion"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="osArchitecture"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="systemModel"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="systemManufacturer"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="cpuManufacturer"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="serialNumber"

-                        minOccurs='1'

-                        maxOccurs='1'/>

-            <xs:element ref="physmem"

-                        minOccurs='0'

-                        maxOccurs='1'/>

-            <xs:element name="cpuinfo"

-                        minOccurs='0'

-                        maxOccurs='1'>

-              <xs:complexType>

-                <xs:sequence>

-                  <xs:element ref="sockets"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="cores"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="virtcpus"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="name"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                  <xs:element ref="clockrate"

-                              minOccurs='0'

-                              maxOccurs='1'/>

-                </xs:sequence>

-              </xs:complexType>

-            </xs:element>

-          </xs:sequence>

-        </xs:complexType>

-      </xs:element>

-      <xs:element name="registry"

-                  minOccurs="1"

-                  maxOccurs="1">

-        <xs:complexType>

-          <xs:sequence>

-            <xs:element name="service_tag"

-                        minOccurs="0"

-                        maxOccurs="1024">

-              <xs:complexType>

-                <xs:sequence>

-                  <xs:element ref="instance_urn"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_name"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_version"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_urn"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_parent_urn"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_parent"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_defined_inst_id"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="product_vendor"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="platform_arch"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="timestamp"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="container"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="source"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                  <xs:element ref="installer_uid"

-                              minOccurs='1'

-                              maxOccurs='1'/>

-                </xs:sequence>

-              </xs:complexType>

-            </xs:element>

-          </xs:sequence>

-          <xs:attribute name="urn"

-                        type="xs:string"

-                        use="required"/>

-          <xs:attribute name="version"

-                        type="xs:string"

-                        use="required"/>

-        </xs:complexType>

-      </xs:element>

-    </xs:sequence>

-    <xs:attribute name="version"

-                  type="xs:string"

-                  use="required"/>

-  </xs:complexType>

-</xs:element>

-

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

-  <xs:element name="hostname">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="hostId">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="osName">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="osVersion">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="osArchitecture">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="systemModel">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="systemManufacturer">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="cpuManufacturer">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="serialNumber">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="instance_urn">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-   </xs:element>

-

-  <xs:element name="product_name">

-    <xs:simpleType>

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_version">

-    <xs:simpleType>

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_urn">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_parent_urn">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_parent">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_defined_inst_id">

-      <xs:simpleType>

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

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

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

-          </xs:restriction>

-      </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="product_vendor">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="platform_arch">

-    <xs:simpleType>

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

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="timestamp">

-    <xs:simpleType>

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="container">

-    <xs:simpleType>

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element> 

-

-  <xs:element name="source">

-    <xs:simpleType>

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element> 

-

-  <xs:element name="installer_uid">

-    <xs:simpleType>

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="physmem">

-    <xs:simpleType>

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

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="sockets">

-    <xs:simpleType>

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

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="cores">

-    <xs:simpleType>

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

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="virtcpus">

-    <xs:simpleType>

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

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="name">

-    <xs:simpleType>

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

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

-      </xs:restriction>

-    </xs:simpleType>

-  </xs:element>

-

-  <xs:element name="clockrate">

-    <xs:simpleType>

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

-    </xs:simpleType>

-  </xs:element>

-

-</xs:schema>

+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+<xs:element name="registration_data">
+  <xs:complexType>
+    <xs:sequence>
+      <xs:element name="environment"
+                  minOccurs="1"
+                  maxOccurs="1">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element ref="hostname"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="hostId"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="osName"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="osVersion"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="osArchitecture"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="systemModel"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="systemManufacturer"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="cpuManufacturer"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="serialNumber"
+                        minOccurs='1'
+                        maxOccurs='1'/>
+            <xs:element ref="physmem"
+                        minOccurs='0'
+                        maxOccurs='1'/>
+            <xs:element name="cpuinfo"
+                        minOccurs='0'
+                        maxOccurs='1'>
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element ref="sockets"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="cores"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="virtcpus"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="name"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                  <xs:element ref="clockrate"
+                              minOccurs='0'
+                              maxOccurs='1'/>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="registry"
+                  minOccurs="1"
+                  maxOccurs="1">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="service_tag"
+                        minOccurs="0"
+                        maxOccurs="1024">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element ref="instance_urn"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_name"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_version"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_urn"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_parent_urn"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_parent"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_defined_inst_id"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="product_vendor"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="platform_arch"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="timestamp"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="container"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="source"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                  <xs:element ref="installer_uid"
+                              minOccurs='1'
+                              maxOccurs='1'/>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+          <xs:attribute name="urn"
+                        type="xs:string"
+                        use="required"/>
+          <xs:attribute name="version"
+                        type="xs:string"
+                        use="required"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="version"
+                  type="xs:string"
+                  use="required"/>
+  </xs:complexType>
+</xs:element>
+
+  <!-- definition of simple elements -->
+  <xs:element name="hostname">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="hostId">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="16"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="osName">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="256"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="osVersion">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="osArchitecture">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="256"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="systemModel">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="systemManufacturer">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="cpuManufacturer">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="50"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="serialNumber">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="256"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="instance_urn">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+   </xs:element>
+
+  <xs:element name="product_name">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_version">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_urn">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_parent_urn">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_parent">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="255"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_defined_inst_id">
+      <xs:simpleType>
+          <xs:restriction base="xs:string">
+              <xs:minLength value="0"/>
+              <xs:maxLength value="255"/>
+          </xs:restriction>
+      </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="product_vendor">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="platform_arch">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="0"/>
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="timestamp">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="24"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="container">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element> 
+
+  <xs:element name="source">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="63"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element> 
+
+  <xs:element name="installer_uid">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer">
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="physmem">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="sockets">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="cores">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="virtcpus">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="name">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:maxLength value="128"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+  <xs:element name="clockrate">
+    <xs:simpleType>
+      <xs:restriction base="xs:integer"/>
+    </xs:simpleType>
+  </xs:element>
+
+</xs:schema>
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index 3ecb2af318..afeadb5f3c 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: evaluation.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/desktop/source/so_comp/evaluation.hxx b/desktop/source/so_comp/evaluation.hxx
index 2e64c4192a..9ef4b71baa 100644
--- a/desktop/source/so_comp/evaluation.hxx
+++ b/desktop/source/so_comp/evaluation.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: evaluation.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/so_comp/makefile.mk b/desktop/source/so_comp/makefile.mk
index 4886c3701e..b16ae7a009 100644
--- a/desktop/source/so_comp/makefile.mk
+++ b/desktop/source/so_comp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index f5f54bc144..21b78b5923 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oemjob.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/desktop/source/so_comp/oemjob.hxx b/desktop/source/so_comp/oemjob.hxx
index 921a25a32c..973cae36df 100644
--- a/desktop/source/so_comp/oemjob.hxx
+++ b/desktop/source/so_comp/oemjob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oemjob.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/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
index b8ffb10c26..8955b4f0e8 100644
--- a/desktop/source/so_comp/services.cxx
+++ b/desktop/source/so_comp/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.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/splash/firststart.cxx b/desktop/source/splash/firststart.cxx
index 5b9447627f..4dff54cd92 100755
--- a/desktop/source/splash/firststart.cxx
+++ b/desktop/source/splash/firststart.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: firststart.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/desktop/source/splash/firststart.hxx b/desktop/source/splash/firststart.hxx
index 5ae0bfdcda..3e39ac3574 100755
--- a/desktop/source/splash/firststart.hxx
+++ b/desktop/source/splash/firststart.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: firststart.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index 3ca31875c9..518ccc11ad 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/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/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index d10546d480..fb96ec83e9 100755
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_spl.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/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 6101fa652b..623799cbcb 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: splash.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/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index b8953b6651..77f34be5ce 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: splash.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/desktop/test/deployment/dependencies/readme.txt b/desktop/test/deployment/dependencies/readme.txt
index 751ab31eac..a99fade002 100644
--- a/desktop/test/deployment/dependencies/readme.txt
+++ b/desktop/test/deployment/dependencies/readme.txt
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: readme.txt,v $
-#
-# $Revision: 1.7.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/test/deployment/executable_content/build/hello.c b/desktop/test/deployment/executable_content/build/hello.c
index 5b749b6d92..46313af564 100644
--- a/desktop/test/deployment/executable_content/build/hello.c
+++ b/desktop/test/deployment/executable_content/build/hello.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: hello.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/desktop/test/deployment/executable_content/build/makefile.mk b/desktop/test/deployment/executable_content/build/makefile.mk
index 434a4359cc..038051c974 100644
--- a/desktop/test/deployment/executable_content/build/makefile.mk
+++ b/desktop/test/deployment/executable_content/build/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/test/deployment/identifier/readme.txt b/desktop/test/deployment/identifier/readme.txt
index 91baf01739..8a791c586a 100644
--- a/desktop/test/deployment/identifier/readme.txt
+++ b/desktop/test/deployment/identifier/readme.txt
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: readme.txt,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/test/deployment/locationtest/LocationTest.idl b/desktop/test/deployment/locationtest/LocationTest.idl
index 4c9a797f16..43beaac0a3 100644
--- a/desktop/test/deployment/locationtest/LocationTest.idl
+++ b/desktop/test/deployment/locationtest/LocationTest.idl
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LocationTest.idl,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 
 #ifndef _com_sun_star_comp_smoketest_LocationTest_idl_ 
diff --git a/desktop/test/deployment/locationtest/LocationTest.java b/desktop/test/deployment/locationtest/LocationTest.java
index a0383c19d7..b16d494551 100644
--- a/desktop/test/deployment/locationtest/LocationTest.java
+++ b/desktop/test/deployment/locationtest/LocationTest.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: LocationTest.java,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 package com.sun.star.comp.smoketest;
 
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk
index c8f9f4c652..8fe1897919 100644
--- a/desktop/test/deployment/locationtest/makefile.mk
+++ b/desktop/test/deployment/locationtest/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 4d921f9cb8..bd8e40826c 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OptionsEventHandler.java,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 package com.sun.star.comp.extensionoptions;
 
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
index d6a000274e..662fffce40 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/test/deployment/update/dependencies/readme.txt b/desktop/test/deployment/update/dependencies/readme.txt
index b56d4cc7f1..3c71da2488 100644
--- a/desktop/test/deployment/update/dependencies/readme.txt
+++ b/desktop/test/deployment/update/dependencies/readme.txt
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml b/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
index a401749352..51a631a8eb 100644
--- a/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
+++ b/desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
- *
+
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: update-dependencies.update.xml,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 <description xmlns="http://openoffice.org/extensions/update/2006"
     xmlns:d="http://openoffice.org/extensions/description/2006"
diff --git a/desktop/test/deployment/update/readme.txt b/desktop/test/deployment/update/readme.txt
index cdda759f12..b3fd9126ca 100644
--- a/desktop/test/deployment/update/readme.txt
+++ b/desktop/test/deployment/update/readme.txt
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: readme.txt,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl
index 1679c36d36..af7b3c507e 100755
--- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl
+++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.idl
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TestExtension.idl,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 
 #ifndef _com_sun_star_comp_smoketest_TestExtension_idl_ 
diff --git a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
index 591eb8674e..91e8bf5ff3 100755
--- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java
+++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.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: TestExtension.java,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
- *     
+ *
  *************************************************************************/
 package com.sun.star.comp.smoketest;
 
diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
index bf6bd4836c..6af3928279 100755
--- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
+++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/test/deployment/version/readme.txt b/desktop/test/deployment/version/readme.txt
index 7d452fcc36..c2ba28afd9 100644
--- a/desktop/test/deployment/version/readme.txt
+++ b/desktop/test/deployment/version/readme.txt
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: readme.txt,v $
- *
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/unx/source/officeloader/makefile.mk b/desktop/unx/source/officeloader/makefile.mk
index 46e5911c56..050da981e8 100644
--- a/desktop/unx/source/officeloader/makefile.mk
+++ b/desktop/unx/source/officeloader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/unx/source/officeloader/officeloader.cxx b/desktop/unx/source/officeloader/officeloader.cxx
index f075d8df8d..41510c14a0 100755
--- a/desktop/unx/source/officeloader/officeloader.cxx
+++ b/desktop/unx/source/officeloader/officeloader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeloader.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src
index 1f5939b309..0ab7ca9f8d 100644
--- a/desktop/util/hidother.src
+++ b/desktop/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.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 82cad8c095..c669206bb3 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/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.83 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 0e9f01ddc3..7a80adcad6 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -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/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc
index 27fb7ae5c1..adf7aac708 100644
--- a/desktop/util/ooverinfo2.rc
+++ b/desktop/util/ooverinfo2.rc
@@ -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/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index 105933ff13..a9f3dcd3f4 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -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/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index 881a18fd67..dceb07a7e9 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: launcher.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/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index 278c8e23e9..4285476475 100644
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
index ad4c7c96b7..9c60ad1b48 100644
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ b/desktop/win32/source/applauncher/ooo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc
index b96dc400c5..ce698ba803 100644
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/ooo/verinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/applauncher/sbase.cxx b/desktop/win32/source/applauncher/sbase.cxx
index bded779c1c..df20e3be57 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbase.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/scalc.cxx b/desktop/win32/source/applauncher/scalc.cxx
index 833ed6f531..61147a345d 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scalc.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/sdraw.cxx b/desktop/win32/source/applauncher/sdraw.cxx
index 779c4c552c..e880abfc46 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdraw.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/simpress.cxx b/desktop/win32/source/applauncher/simpress.cxx
index 9ae3d1f8a5..350a4037e4 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpress.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/smath.cxx b/desktop/win32/source/applauncher/smath.cxx
index 5db48b03d1..d42165b4ec 100644
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smath.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/sweb.cxx b/desktop/win32/source/applauncher/sweb.cxx
index 8543e83dfb..a044dad91c 100644
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sweb.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/swriter.cxx b/desktop/win32/source/applauncher/swriter.cxx
index bb4b64d98c..f90091e0fb 100644
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swriter.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
index f1e1bbcefe..0db55c58c4 100644
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ b/desktop/win32/source/applauncher/verinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/extendloaderenvironment.cxx b/desktop/win32/source/extendloaderenvironment.cxx
index 291d5518dd..bf9f6bf982 100644
--- a/desktop/win32/source/extendloaderenvironment.cxx
+++ b/desktop/win32/source/extendloaderenvironment.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extendloaderenvironment.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/desktop/win32/source/extendloaderenvironment.hxx b/desktop/win32/source/extendloaderenvironment.hxx
index 8fd8742181..5fbd65900a 100644
--- a/desktop/win32/source/extendloaderenvironment.hxx
+++ b/desktop/win32/source/extendloaderenvironment.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extendloaderenvironment.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/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index 6d3002dd23..bef67b2df0 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: genericloader.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
index ff2a3ac1b0..5bb1c523ff 100644
--- a/desktop/win32/source/guiloader/makefile.mk
+++ b/desktop/win32/source/guiloader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/guistdio/guistdio.cxx b/desktop/win32/source/guistdio/guistdio.cxx
index 1d373d5f29..3c1f3f220d 100644
--- a/desktop/win32/source/guistdio/guistdio.cxx
+++ b/desktop/win32/source/guistdio/guistdio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guistdio.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 024b456efa..7f2bbe9002 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guistdio.inc,v $
- * $Revision: 1.3.86.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guistdio/makefile.mk b/desktop/win32/source/guistdio/makefile.mk
index 24772fb1ea..660a48bcdc 100644
--- a/desktop/win32/source/guistdio/makefile.mk
+++ b/desktop/win32/source/guistdio/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/guistdio/unopkgio.cxx b/desktop/win32/source/guistdio/unopkgio.cxx
index e9dfafa6ea..d038a2f75f 100644
--- a/desktop/win32/source/guistdio/unopkgio.cxx
+++ b/desktop/win32/source/guistdio/unopkgio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkgio.cxx,v $
- * $Revision: 1.3.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/lwrapa.cxx b/desktop/win32/source/lwrapa.cxx
index bde54bc61b..ce3250c311 100644
--- a/desktop/win32/source/lwrapa.cxx
+++ b/desktop/win32/source/lwrapa.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lwrapa.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/lwrapw.cxx b/desktop/win32/source/lwrapw.cxx
index 285eb649e9..fed35f3a22 100644
--- a/desktop/win32/source/lwrapw.cxx
+++ b/desktop/win32/source/lwrapw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lwrapw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
index ccb165398c..564ba319eb 100644
--- a/desktop/win32/source/makefile.mk
+++ b/desktop/win32/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/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
index 8700867f8a..10758727b7 100644
--- a/desktop/win32/source/officeloader/makefile.mk
+++ b/desktop/win32/source/officeloader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 36ab5ad49b..40bc7e8784 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeloader.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/desktop/win32/source/rebase/Resource.h b/desktop/win32/source/rebase/Resource.h
index 03ec1d4eee..dccac77aae 100644
--- a/desktop/win32/source/rebase/Resource.h
+++ b/desktop/win32/source/rebase/Resource.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Resource.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/desktop/win32/source/rebase/makefile.mk b/desktop/win32/source/rebase/makefile.mk
index dbab5a5d09..724ea0edf4 100644
--- a/desktop/win32/source/rebase/makefile.mk
+++ b/desktop/win32/source/rebase/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/rebase/rebase.cxx b/desktop/win32/source/rebase/rebase.cxx
index 633e74723c..534d4615a3 100644
--- a/desktop/win32/source/rebase/rebase.cxx
+++ b/desktop/win32/source/rebase/rebase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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
@@ -27,164 +24,164 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-

-#include "precompiled_desktop.hxx"

-#define UNICODE

-#define _UNICODE

-

-#define WIN32_LEAN_AND_MEAN

-#if defined _MSC_VER

-#pragma warning(push, 1)

-#endif

-#include <windows.h>

-#include <shellapi.h>

-#include <imagehlp.h>

-#include <wchar.h>

-#if defined _MSC_VER

-#pragma warning(pop)

-#endif

-

-#include <time.h>

-#include "sal/config.h"

-#include "tools/pathutils.hxx"

-

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

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

-

-const int   FORMAT_MESSAGE_SIZE = 4096;

-const DWORD PE_Signature        = 0x00004550;

-const DWORD BASEVIRTUALADDRESS	= 0x10000000;

-

-namespace

-{

-

-bool IsValidHandle( HANDLE handle )

-{

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

-}

-

-void fail() 

-{

-    LPWSTR buf = NULL;

-    FormatMessageW(

-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,

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

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

-    LocalFree(buf);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-bool rebaseImage( wchar_t* pszFilePath, ULONG nNewImageBase)

-{

-    ULONG ulOldImageSize;

-    ULONG_PTR lpOldImageBase;

-    ULONG ulNewImageSize;

-    ULONG_PTR lpNewImageBase  = nNewImageBase;

-    ULONG	  ulDateTimeStamp = 0;

-    bool      bResult(false);

-    

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

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

-    

-    if (nResult != 0)

-    {

-        BOOL bResult = ReBaseImage(

-            cszFilePath,

-            "",

-            TRUE,

-            FALSE,

-            FALSE,

-            0,

-            &ulOldImageSize,

-            &lpOldImageBase,

-            &ulNewImageSize,

-            &lpNewImageBase,

-            ulDateTimeStamp );

-    }

-

-    return bResult;

-}

-

-wchar_t* getBrandPath(wchar_t * path)

-{

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

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

-        exit(EXIT_FAILURE);

-    }

-    return tools::filename(path);

-}

-

-void rebaseImagesInFolder( wchar_t* pszFolder, DWORD nNewImageBase )

-{

-    wchar_t szPattern[MAX_PATH];

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

-    if ( lpLastSlash )

-    {

-        size_t len = lpLastSlash - pszFolder + 1;

-        wcsncpy( szPattern, pszFolder, len );

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

-    }

-

-    WIN32_FIND_DATA	aFindFileData;

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

-

-    if ( IsValidHandle(hFind) )

-    {

-        BOOL fSuccess = false;

-

-        do

-        {

-            wchar_t szLibFilePath[MAX_PATH];

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

-            if ( lpLastSlash )

-            {

-                size_t len = lpLastSlash - pszFolder + 1;

-                wcsncpy( szLibFilePath, pszFolder, len );

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

-            }

-

-            rebaseImage( szLibFilePath, nNewImageBase );

-            fSuccess = FindNextFile( hFind, &aFindFileData );

-        }

-        while ( fSuccess );

-

-        FindClose( hFind );

-    }

-}

-

-}

-

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

-{

-    wchar_t path[MAX_PATH];

-    

-    wchar_t * pathEnd = getBrandPath(path);

-    

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

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-    

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

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if ( pathEnd == NULL )

-        return 0;

-

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

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-    

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

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if ( pathEnd == NULL )

-        return 0;

-    

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

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-

-    return 0;

-}

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

-#include "precompiled_desktop.hxx"

-

-#define  UNICODE    1

-#define _UNICODE    1

-

-#ifndef _WINDOWS_

-#	define WIN32_LEAN_AND_MEAN

-#if defined _MSC_VER

-#pragma warning(push, 1)

-#endif

-#	include <windows.h>

-#	include <shellapi.h>

-#	include <wchar.h>

-#if defined _MSC_VER

-#pragma warning(pop)

-#endif

-#endif

-

-#include "Resource.h"

-#include <time.h>

-#include "sal/config.h"

-#include "tools/pathutils.hxx"

-

-const DWORD PE_Signature = 0x00004550;

-

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

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

-#define MAX_STR_CAPTION		256

-#define MAX_TEXT_LENGTH     1024

-

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

-{

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

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-static void fail() 

-{

-    LPWSTR buf = NULL;

-    FormatMessageW(

-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,

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

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

-    LocalFree(buf);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath )

-{

-    HANDLE                hFile;

-    HANDLE                hFileMapping;

-    LPVOID				  lpFileBase = 0;

-    PIMAGE_DOS_HEADER     lpDosHeader;

-    PIMAGE_NT_HEADERS     lpNTHeader;

-

-    hFile = CreateFile(pszFilePath, 

-                       GENERIC_READ, FILE_SHARE_READ, NULL,

-                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

-                       0);

-                    

-    if ( hFile == INVALID_HANDLE_VALUE )

-    {   

-        return NULL;

-    }

-    

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

-    if ( hFileMapping == 0 )

-    {   

-        CloseHandle(hFile);

-        return NULL;

-    }

-    

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

-    if ( lpFileBase == 0 )

-    {

-        CloseHandle(hFileMapping);

-        CloseHandle(hFile);

-        return NULL;

-    }

-

-    lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase;

-    if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE )

-    { 

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

-        if (lpNTHeader->Signature == PE_Signature )

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

-    }

-    

-    UnmapViewOfFile(lpFileBase);

-    CloseHandle(hFileMapping);

-    CloseHandle(hFile);

-    

-    return lpFileBase;

-}

-

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

-{

-    LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath);

-    if ( lpImageVBA == lpVBA )

-        return true;

-    else

-        return false;

-}

-

-static wchar_t* getBrandPath(wchar_t * pszPath)

-{

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

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

-        exit(EXIT_FAILURE);

-    }

-    return tools::filename(pszPath);

-}

-

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

-{

-    wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ];

-             pAppTitle[0]  = '\0';

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

-

-    wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextServer[0]  = '\0';

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

-

-    wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextClient[0]  = '\0';

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

-

-    wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextNoInstallation[0]  = '\0';

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

-    

-    LPVOID  VBA = (void*)0x10000000;

-    wchar_t path[MAX_PATH];

-    

-    wchar_t * pathEnd = getBrandPath(path);

-    

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

-        fail();

-    bool bFast = checkImageVirtualBaseAddress(path, VBA);

-    

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

-        fail();

-    pathEnd = tools::resolveLink(path);

-

-    if (pathEnd == NULL)

-        failPath(pAppTitle, pTextNoInstallation);

-

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

-        fail();

-    bFast &= checkImageVirtualBaseAddress(path, VBA);

-

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

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if (pathEnd == NULL)

-        failPath(pAppTitle, pTextNoInstallation);

-    

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

-        fail();

-    bFast &= checkImageVirtualBaseAddress(path, VBA);

-

-    const wchar_t* pOutput = pTextClient;

-    if (!bFast)

-        pOutput = pTextServer;

-        

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

-    

-    return 0;

-}

+
+#include "precompiled_desktop.hxx"
+
+#define  UNICODE    1
+#define _UNICODE    1
+
+#ifndef _WINDOWS_
+#	define WIN32_LEAN_AND_MEAN
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#	include <windows.h>
+#	include <shellapi.h>
+#	include <wchar.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#endif
+
+#include "Resource.h"
+#include <time.h>
+#include "sal/config.h"
+#include "tools/pathutils.hxx"
+
+const DWORD PE_Signature = 0x00004550;
+
+#define MY_LENGTH(s)		(sizeof (s) / sizeof *(s) - 1)
+#define MY_STRING(s)		(s), MY_LENGTH(s)
+#define MAX_STR_CAPTION		256
+#define MAX_TEXT_LENGTH     1024
+
+static void failPath(wchar_t* pszAppTitle, wchar_t* pszMsg)
+{
+    MessageBoxW(NULL, pszMsg, pszAppTitle, MB_OK | MB_ICONERROR);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+static void fail() 
+{
+    LPWSTR buf = NULL;
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
+        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);
+    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);
+    LocalFree(buf);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath )
+{
+    HANDLE                hFile;
+    HANDLE                hFileMapping;
+    LPVOID				  lpFileBase = 0;
+    PIMAGE_DOS_HEADER     lpDosHeader;
+    PIMAGE_NT_HEADERS     lpNTHeader;
+
+    hFile = CreateFile(pszFilePath, 
+                       GENERIC_READ, FILE_SHARE_READ, NULL,
+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
+                       0);
+                    
+    if ( hFile == INVALID_HANDLE_VALUE )
+    {   
+        return NULL;
+    }
+    
+    hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    if ( hFileMapping == 0 )
+    {   
+        CloseHandle(hFile);
+        return NULL;
+    }
+    
+    lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);
+    if ( lpFileBase == 0 )
+    {
+        CloseHandle(hFileMapping);
+        CloseHandle(hFile);
+        return NULL;
+    }
+
+    lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase;
+    if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE )
+    { 
+        lpNTHeader = (PIMAGE_NT_HEADERS)((char*)lpDosHeader + lpDosHeader->e_lfanew);
+        if (lpNTHeader->Signature == PE_Signature )
+            lpFileBase = reinterpret_cast<LPVOID>( lpNTHeader->OptionalHeader.ImageBase );
+    }
+    
+    UnmapViewOfFile(lpFileBase);
+    CloseHandle(hFileMapping);
+    CloseHandle(hFile);
+    
+    return lpFileBase;
+}
+
+static bool checkImageVirtualBaseAddress(wchar_t* pszFilePath, LPVOID lpVBA)
+{
+    LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath);
+    if ( lpImageVBA == lpVBA )
+        return true;
+    else
+        return false;
+}
+
+static wchar_t* getBrandPath(wchar_t * pszPath)
+{
+    DWORD n = GetModuleFileNameW(NULL, pszPath, MAX_PATH);
+    if (n == 0 || n >= MAX_PATH) {
+        exit(EXIT_FAILURE);
+    }
+    return tools::filename(pszPath);
+}
+
+extern "C" int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )
+{
+    wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ];
+             pAppTitle[0]  = '\0';
+    LoadString( hInst, IDS_APP_TITLE, pAppTitle, MAX_STR_CAPTION );
+
+    wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextServer[0]  = '\0';
+    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_SERVER, pTextServer, MAX_TEXT_LENGTH );
+
+    wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextClient[0]  = '\0';
+    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_CLIENT, pTextClient, MAX_TEXT_LENGTH );
+
+    wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextNoInstallation[0]  = '\0';
+    LoadString( hInst, IDS_MSG_NO_INSTALLATION_FOUND, pTextNoInstallation, MAX_TEXT_LENGTH );
+    
+    LPVOID  VBA = (void*)0x10000000;
+    wchar_t path[MAX_PATH];
+    
+    wchar_t * pathEnd = getBrandPath(path);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"libxml2.dll")) == NULL)
+        fail();
+    bool bFast = checkImageVirtualBaseAddress(path, VBA);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+
+    if (pathEnd == NULL)
+        failPath(pAppTitle, pTextNoInstallation);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\vclmi.dll")) == NULL)
+        fail();
+    bFast &= checkImageVirtualBaseAddress(path, VBA);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+    
+    if (pathEnd == NULL)
+        failPath(pAppTitle, pTextNoInstallation);
+    
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\sal3.dll")) == NULL)
+        fail();
+    bFast &= checkImageVirtualBaseAddress(path, VBA);
+
+    const wchar_t* pOutput = pTextClient;
+    if (!bFast)
+        pOutput = pTextServer;
+        
+    MessageBoxW( NULL, pOutput, pAppTitle, MB_OK );
+    
+    return 0;
+}
diff --git a/desktop/win32/source/rwrapa.cxx b/desktop/win32/source/rwrapa.cxx
index 57a1e0dd9d..4d4191a765 100644
--- a/desktop/win32/source/rwrapa.cxx
+++ b/desktop/win32/source/rwrapa.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rwrapa.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/rwrapw.cxx b/desktop/win32/source/rwrapw.cxx
index 87719f8ef8..77a0858117 100644
--- a/desktop/win32/source/rwrapw.cxx
+++ b/desktop/win32/source/rwrapw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rwrapw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/Resource.h b/desktop/win32/source/setup/Resource.h
index c2f9288754..6b17f3bfe5 100644
--- a/desktop/win32/source/setup/Resource.h
+++ b/desktop/win32/source/setup/Resource.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/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index d26c9c9538..d910572403 100644
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 23ba22e049..c716ee00f5 100644..100755
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup.cpp,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1981,7 +1978,30 @@ boolean SetupAppX::InstallRuntimes()
     TCHAR *sRuntimePath = 0;
     SYSTEM_INFO siSysInfo;
 
-    GetNativeSystemInfo(&siSysInfo);
+    HMODULE hKernel32 = ::LoadLibrary(_T("Kernel32.dll"));
+    if ( hKernel32 != NULL )
+    {
+        typedef void (CALLBACK* pfnGetNativeSystemInfo_t)(LPSYSTEM_INFO);
+        pfnGetNativeSystemInfo_t pfnGetNativeSystemInfo;
+        pfnGetNativeSystemInfo = (pfnGetNativeSystemInfo_t)::GetProcAddress(hKernel32, "GetNativeSystemInfo");
+        if ( pfnGetNativeSystemInfo != NULL )
+        {
+            pfnGetNativeSystemInfo(&siSysInfo);
+        }
+        else
+        {
+            // GetNativeSystemInfo does not exist. Maybe the code is running under Windows 2000.
+            // Use GetSystemInfo instead.
+            GetSystemInfo(&siSysInfo);
+        }
+        FreeLibrary(hKernel32);
+    }
+    else
+    {
+        // Failed to check Kernel32.dll. There may be something wrong.
+        // Use GetSystemInfo instead anyway.
+        GetSystemInfo(&siSysInfo);
+    }
 
     OutputDebugStringFormat( TEXT( "found architecture<%d>\r\n" ), siSysInfo.wProcessorArchitecture );
 
diff --git a/desktop/win32/source/setup/setup.hxx b/desktop/win32/source/setup/setup.hxx
index 06caa87de6..d43650e078 100644
--- a/desktop/win32/source/setup/setup.hxx
+++ b/desktop/win32/source/setup/setup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup.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/desktop/win32/source/setup/setup_a.cxx b/desktop/win32/source/setup/setup_a.cxx
index 629c4be1bc..ce46df65bc 100644
--- a/desktop/win32/source/setup/setup_a.cxx
+++ b/desktop/win32/source/setup/setup_a.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_a.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/desktop/win32/source/setup/setup_help.hxx b/desktop/win32/source/setup/setup_help.hxx
index 9abb23df30..c87e8a1db0 100644
--- a/desktop/win32/source/setup/setup_help.hxx
+++ b/desktop/win32/source/setup/setup_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: setup_help.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index 37acc1e665..af6b42bd18 100644
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.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/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index 4e016768ee..419d658ac0 100644
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_main.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/desktop/win32/source/setup/setup_w.cxx b/desktop/win32/source/setup/setup_w.cxx
index 6767c701aa..0de38fbf1d 100644
--- a/desktop/win32/source/setup/setup_w.cxx
+++ b/desktop/win32/source/setup/setup_w.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_w.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/desktop/win32/source/sowrapper.cxx b/desktop/win32/source/sowrapper.cxx
index ef5f8d7875..92ec3ead4b 100644
--- a/desktop/win32/source/sowrapper.cxx
+++ b/desktop/win32/source/sowrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sowrapper.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index d4458212c3..47c97344cb 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoinfo.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/wrappera.cxx b/desktop/win32/source/wrappera.cxx
index 3aff61ece7..8fba6a501c 100644
--- a/desktop/win32/source/wrappera.cxx
+++ b/desktop/win32/source/wrappera.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrappera.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/wrapperw.cxx b/desktop/win32/source/wrapperw.cxx
index 9cb26c0670..da423d567e 100644
--- a/desktop/win32/source/wrapperw.cxx
+++ b/desktop/win32/source/wrapperw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrapperw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 70e5c801b9..6a1ff592d6 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
index 92d9d21ce1..e1e0128bf2 100644
--- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
+++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: animationtiming.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx
index c5c884c312..8782c58691 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
index f0b36d4501..3f34a938ef 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillbitmapattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
index f4c438eaa1..329e3f268c 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
@@ -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: strokeattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
index 1b98f7c18c..cc2eca5438 100644
--- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: lineattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
index 6cf75bdd76..f992abb8b3 100644
--- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: linestartendattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
index 0d226dbd88..4e5b742993 100644
--- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: materialattribute3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
index d56d16438b..7eae0f4d8d 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrallattribute3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2007-07-06 13:38:51 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
index dbbd116775..d77b20dfec 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx
index d4693aa778..5bdb9b07ff 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrattribute3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
index b6214cda46..4e0b728c4a 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrfillbitmapattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
index aa7facd6c7..b2353df4ee 100644
--- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
+++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: strokeattribute.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
index 46cee65b8a..5b70617b43 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: viewinformation2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
index df26bee592..688c65903e 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
+++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: viewinformation3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
index 89cbc8e076..a395efa699 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: alphaprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 59d770be94..84f5572326 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: animatedprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 542a39084c..3b9009b944 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: backgroundcolorprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
index ccb22f17ef..40cc4ac5f0 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index 0dc376a9d5..9504772aaa 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: bitmapprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 9239fa0178..07a1f8b18a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: borderlineprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
index 3add93b2a1..59303f74ec 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: chartprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
index 048e5f6a5a..4ac8c9332e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: controlprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
index 6a1bf1330b..6f10a40c94 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
@@ -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: bitmapprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 9df4816a70..a926b282cf 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: drawinglayer_primitivetypes2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.14 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-04-04 06:00: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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
index 90475016fc..b9c41b08cd 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: embedded3dprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
index 41bedd9542..be87c1ae3d 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
@@ -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: backgroundcolorprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
index 2ff1d3e5ca..0c23e5dbd2 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillbitmapprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index 055946566e..05c798481f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillgradientprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index dfebc869b9..86ede1ea78 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillhatchprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
index aa1c12d66f..370e657bcb 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: graphicprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
@@ -38,7 +30,7 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
index 8ea1b86f11..b09cee8b09 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: gridprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
index 27f79615dd..d4cb971c37 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: groupprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
index e1654cd5fe..f7b305b9d3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: helplineprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
index f65eb6e883..fbe74e0740 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: hittestprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
index 85f1c6510c..ee03cef4ad 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: unifiedalphaprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
index 3543957aeb..9853141b31 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: markerarrayprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
index 3e2638796d..b2bd0b482e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: maskprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 37a9c3c26b..5fd1550f29 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: mediaprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
index 8a41324f55..70197fa0ad 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: metafileprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index dfaf65b2bf..28ccc3bfa3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: modifiedcolorprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index c24a9ab8fb..3c661d208c 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: pagepreviewprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index e4e21fe9f2..d6c11230e4 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: pointarrayprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 24785fcf71..e94e7ad2de 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polygonprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index 6f6f373c2f..b4ee009f9a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polypolygonprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
index 9eff05dc6e..7f6b2d6358 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
index 1fafd3b2d1..e86c28f8c9 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sceneprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.9 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 2f3a680535..5b90650dd1 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: shadowprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index f7b9554408..d3baac0fe7 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: structuretagprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 2e829eeaaf..755a692085 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textdecoratedprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 32a105a9c6..122fd63050 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texteffectprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
index 4c0e1ab38a..1e440f9e77 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
@@ -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: wrongspellprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 9177c02cb4..cba7ff1ede 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texthierarchyprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
index 27f547e973..cc3b1e76e6 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textlayoutdevice.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
index a103d607e8..bf12276c3e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
@@ -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: textdecoratedprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
index 0f84b5f115..c1ea62e2aa 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.13 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
index 79e0581bc1..ded394ff74 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
@@ -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: textdecoratedprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
index 54aa9702cf..f712644751 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: transformprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
index 8f1385e0e4..aec49ff7c9 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: unifiedalphaprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
index 775e08866f..9b566f06fd 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
@@ -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: bitmapprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
index 2c687869fb..8a06d92295 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: wrongspellprimitive2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
index 302f84f2b7..8b4ac38398 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
index ec367665af..d969812c4d 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: drawinglayer_primitivetypes3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
index d06161dbf7..7679d45ac0 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: groupprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
index daf4c2f1b0..37c02aba50 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: hatchtextureprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx
index dd6698b6a5..5fa7a26de6 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: hittestprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
index 689478bf5d..f1a4137273 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: modifiedcolorprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
index d40d76ef22..6f97e6e2ef 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polygonprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
index 5d4b581a13..cb9d44f521 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polygontubeprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
index 610c49b2ab..6fb8cb4fdb 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polypolygonprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
index c7cf465dfe..32417c5962 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrcubeprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
index cee185f7d7..851149b434 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrdecompositiontools3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index 6ed3e646bd..66f717aa31 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrextrudelathetools3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index 195de69961..aae1167ef5 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrextrudeprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.9 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index 1a3c82fff9..ecc936d6c7 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrlatheprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.9 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
index 5e22c4940c..840bb0e88e 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrpolypolygonprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
index 6b36a4e6c6..c298d8272f 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
index 6ba1feb9c8..9e46a8181c 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrsphereprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
index 2c54f3a4aa..58aba0bc18 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: shadowprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
index b65fa0e8e5..db8f4354ec 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textureprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
index 63fdace781..b592d54101 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: transformprimitive3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
index d3961905d1..1606ad4d89 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprocessor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
index 55760b13a7..7d1d45e281 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: canvasprocessor.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
index 7dc5181344..4995d02a49 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: contourextractor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
index 46dd1765da..021946229e 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: contourextractor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
index c3ed548333..e63f361fb9 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: linegeometryextractor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:44:27 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index fda1f90cdd..4649004c43 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: linegeometryextractor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:44:27 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
index d1746902f3..04b6fc0b00 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclmetafileprocessor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
index 2cc0f50047..c57a04a4fb 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclpixelprocessor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
index 6ac3d2abdd..b8679292d5 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclprocessor2d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.17 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:17 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
index ad8048fa7e..52b81329d3 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprocessor3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
index de99d94f48..0afabb2346 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: zbufferprocessor3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
index a91238435d..147db4f85b 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: defaultprocessor3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
index 63f0753546..ec4c48893c 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: geometry2dextractor.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
index 9eb5521624..4f8caaf5a2 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: shadow3dextractor.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 0f57556549..27b415bad6 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: zbufferprocessor3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:30:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx
index 26cc190494..0c629fd78d 100644
--- a/drawinglayer/inc/drawinglayer/texture/texture.hxx
+++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texture.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
index 2f63d5ec38..876efbaa62 100644
--- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
+++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texture3d.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/makefile.mk b/drawinglayer/inc/makefile.mk
index cb24680562..ebfd726939 100644
--- a/drawinglayer/inc/makefile.mk
+++ b/drawinglayer/inc/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.1 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-03-05 09:17:49 $
+# OpenOffice.org is free software: you can redistribute it 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/drawinglayer/inc/pch/precompiled_drawinglayer.cxx b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
index da379db178..e2cf820d48 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: precompiled_drawinglayer.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-03-05 09:18:44 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index ae5cbe01f4..bb20426ca5 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: precompiled_drawinglayer.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-03-05 09:18:45 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst
index e3d36cc5cc..d685c262e3 100644
--- a/drawinglayer/prj/build.lst
+++ b/drawinglayer/prj/build.lst
@@ -1,4 +1,4 @@
-dl	drawinglayer	:	goodies sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL
+dl	drawinglayer	:	sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL
 dl	drawinglayer						usr1	-	all	dl_mkout NULL
 dl	drawinglayer\inc					nmake	-	all	dl_inc NULL
 dl	drawinglayer\prj					get		-	all	dl_prj NULL
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index afa2b311b8..520c2bc0fa 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: animationtiming.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/animation/makefile.mk b/drawinglayer/source/animation/makefile.mk
index a72bf10711..07f64fab65 100644
--- a/drawinglayer/source/animation/makefile.mk
+++ b/drawinglayer/source/animation/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.3 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2006-12-13 16:57:07 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/attribute/fillattribute.cxx b/drawinglayer/source/attribute/fillattribute.cxx
index bba413c0b3..431ee7b127 100644
--- a/drawinglayer/source/attribute/fillattribute.cxx
+++ b/drawinglayer/source/attribute/fillattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx b/drawinglayer/source/attribute/fillbitmapattribute.cxx
index da93f5a7b7..6d39298335 100644
--- a/drawinglayer/source/attribute/fillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillbitmapattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx
index 5163e2f6a5..9a85110e56 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -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: strokeattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx
index 5ab44b73db..2bf289bdcc 100644
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: lineattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx
index eafcc7e3f4..8609864f5b 100644
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: linestartendattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/makefile.mk b/drawinglayer/source/attribute/makefile.mk
index 65f899f671..291cf313a6 100644
--- a/drawinglayer/source/attribute/makefile.mk
+++ b/drawinglayer/source/attribute/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.3 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2007-11-07 14:27:26 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx
index b030017780..fefec06829 100644
--- a/drawinglayer/source/attribute/materialattribute3d.cxx
+++ b/drawinglayer/source/attribute/materialattribute3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: materialattribute3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 4bc4b642f9..e7838f2a4b 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrallattribute3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrattribute.cxx b/drawinglayer/source/attribute/sdrattribute.cxx
index 4955ceddc9..b33c8176ca 100644
--- a/drawinglayer/source/attribute/sdrattribute.cxx
+++ b/drawinglayer/source/attribute/sdrattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrattribute3d.cxx b/drawinglayer/source/attribute/sdrattribute3d.cxx
index fef84cf2eb..f85892c9c0 100644
--- a/drawinglayer/source/attribute/sdrattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrattribute3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrattribute3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
index c826aa5847..f177345342 100644
--- a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrfillbitmapattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index 89fc5d8622..3f3fd47ab0 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: strokeattribute.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/geometry/makefile.mk b/drawinglayer/source/geometry/makefile.mk
index 38ceeb55a8..b885221660 100644
--- a/drawinglayer/source/geometry/makefile.mk
+++ b/drawinglayer/source/geometry/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.3 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-06-10 09:29:32 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 4eba454ea5..8bcb3ccc14 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: viewinformation2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:07 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index 8925fb3bb6..b884c359d0 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: viewinformation3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:07 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/alphaprimitive2d.cxx b/drawinglayer/source/primitive2d/alphaprimitive2d.cxx
index 0f4fecc8b0..3d0f1ed69d 100644
--- a/drawinglayer/source/primitive2d/alphaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/alphaprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: alphaprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 41b15c4595..2ff1ff7dd3 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: animatedprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
index 9dde13e2a5..fbba077a54 100644
--- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: backgroundcolorprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 6021adba6d..0c4b9e3955 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index 12e0b7640a..ce8bd60503 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: bitmapprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 8d772ee21f..088f9bb53b 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: borderlineprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/chartprimitive2d.cxx b/drawinglayer/source/primitive2d/chartprimitive2d.cxx
index 68ca32f41e..1aabf87b35 100644
--- a/drawinglayer/source/primitive2d/chartprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/chartprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: chartprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 8e7de81cbb..639328dd94 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: controlprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
index 5284fdc65e..d0c4f459bc 100644
--- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
@@ -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: bitmapprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index b34ade2b64..9cde49bbe0 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: embedded3dprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index 216ffa33dc..145a4f56e0 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -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: backgroundcolorprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
index 6b71b022f8..74aa857012 100644
--- a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillbitmapprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 5e609ebe15..d985edae7b 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillgradientprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index ed420f4f4d..2bdfbb30e7 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: fillhatchprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index f8a57a7389..ff5e38af4d 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: graphicprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 17c13e35ad..42fe117f32 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: gridprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.10 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index d95bb0aec2..32b0c40cd4 100644
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: groupprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
index 6053d7f585..d026d1f24b 100644
--- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: helplineprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/hittestprimitive2d.cxx b/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
index 78156cebbe..b299349c1e 100644
--- a/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/hittestprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: hittestprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
index e3292beeb7..e791190435 100644
--- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: unifiedalphaprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/makefile.mk b/drawinglayer/source/primitive2d/makefile.mk
index c9a3cc191a..87c6c15437 100644
--- a/drawinglayer/source/primitive2d/makefile.mk
+++ b/drawinglayer/source/primitive2d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.13 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-04-04 06:00:23 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index 68ef733afc..ba661f4e2d 100644
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: markerarrayprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index 238939592a..8f0cb1ec86 100644
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: maskprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index f16e322ae6..e488aacfa8 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: mediaprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
@@ -41,7 +33,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index c0f89b4dd0..ab78bc3456 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: metafileprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index 5c2a44131f..7f3b78bf03 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: modifiedcolorprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index 83bbb58bde..f5f2b393e3 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: pagepreviewprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
index 4ab437b60e..dace7bdac1 100644
--- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: pointarrayprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index a66cb4b2f5..ffe14e9738 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polygonprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.12 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 092d572088..accad5c51e 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polypolygonprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 2b25590bf1..64c1ed685d 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 61c7f59f3b..b5305c32ed 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sceneprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.16 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index 5f7c20379c..fd537460c6 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: shadowprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index 973b376400..3d50eef4fb 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: structuretagprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 87e7fe111e..f200c5a38a 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textdecoratedprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.12 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
index ac55fc5900..d24eda4b7d 100644
--- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texteffectprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
index d2e72ed4ea..12952a4303 100644
--- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
@@ -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: textprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.22 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index ff5caffb91..f0af348a35 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texthierarchyprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 53df1e65b8..0f5b70e1ee 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textlayoutdevice.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.10 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index 70d6fe8c66..ccc86adccf 100644
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
@@ -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: textdecoratedprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.12 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index f5b3396728..992d4dc0a8 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.22 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index e8267d7fbf..9e4e88125c 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -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: textdecoratedprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.12 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
index d9b88309a7..65d27e766e 100644
--- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: transformprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx
index ec80034261..6417d4a37d 100644
--- a/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: unifiedalphaprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
index 376fcac866..0e416b7993 100644
--- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
@@ -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: bitmapprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
index 2388ddf9ff..c8ba386027 100644
--- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: wrongspellprimitive2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 894929d875..75a3a2518c 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index 81d532b4cc..9e8cef887d 100644
--- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: groupprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 4ccf07bf3a..e582adfa52 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: hatchtextureprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.11 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/hittestprimitive3d.cxx b/drawinglayer/source/primitive3d/hittestprimitive3d.cxx
index 62a30333ff..8bf457008b 100644
--- a/drawinglayer/source/primitive3d/hittestprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hittestprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: hittestprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/makefile.mk b/drawinglayer/source/primitive3d/makefile.mk
index fb160fb9bf..dfae99b810 100644
--- a/drawinglayer/source/primitive3d/makefile.mk
+++ b/drawinglayer/source/primitive3d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.5 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index 2f41dcb9bb..e846533496 100644
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: modifiedcolorprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 43f8cb925f..9f8aa097b7 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polygonprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.10 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 219f05fab4..b360c8b817 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polygontubeprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.12 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
index 586535b80d..d11dc83af0 100644
--- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: polypolygonprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.9 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index ebe9e727da..04306b782c 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrcubeprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.11 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index df15cc8a3c..e044a47033 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrdecompositiontools3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 222925127a..4a36dc2c6e 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrextrudelathetools3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.11 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 5ebe15db3f..e863d60be4 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrextrudeprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.15 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-26 16:21:48 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index f9827ea627..c33fcc96ea 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrlatheprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.15 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 38a3fea538..687ae40835 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrpolypolygonprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index 58f4fee375..df0dd80ebe 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.10 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index 80ad33e484..06e19603e0 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: sdrsphereprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.12 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
index 1c0811923a..64b1663c88 100644
--- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: shadowprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
index ea3c9e72fa..e06cd11895 100644
--- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: textureprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.9 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
index 1c42aba15e..281b8288de 100644
--- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: transformprimitive3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:33 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx
index 5d7e85b467..3ce4716d48 100644
--- a/drawinglayer/source/processor2d/baseprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprocessor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index f3376e2abe..561160b8a7 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: canvasprocessor.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.8 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx
index a5bd6d380a..1d104cebf0 100644
--- a/drawinglayer/source/processor2d/contourextractor2d.cxx
+++ b/drawinglayer/source/processor2d/contourextractor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: contourextractor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx
index 383f678e28..e20d0894a8 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: helperchartrenderer.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:28:34 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperchartrenderer.hxx b/drawinglayer/source/processor2d/helperchartrenderer.hxx
index e670cccdf2..540e31c0b2 100644
--- a/drawinglayer/source/processor2d/helperchartrenderer.hxx
+++ b/drawinglayer/source/processor2d/helperchartrenderer.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: helperchartrenderer.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:28:43 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
index 902ba55ea5..ed05885cee 100644
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: helperwrongspellrenderer.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:28:52 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
index b6c2303fff..68506c4fb5 100644
--- a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
+++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: helperwrongspellrenderer.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1.2.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008/09/24 14:29:02 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index e7c9daabfa..a8722c6956 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: contourextractor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
index e650a5d8db..cdf64d5e43 100644
--- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
+++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: linegeometryextractor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:44:27 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/makefile.mk b/drawinglayer/source/processor2d/makefile.mk
index fcbf2413b6..ec7b8aef64 100644
--- a/drawinglayer/source/processor2d/makefile.mk
+++ b/drawinglayer/source/processor2d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.8 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
index deab99fe96..e36f76765f 100644
--- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
+++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: contourextractor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
index 653a0833e4..48a26413df 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelperbitmaprender.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.3 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
@@ -37,7 +29,7 @@
 #include "precompiled_drawinglayer.hxx"
 
 #include <vclhelperbitmaprender.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
index caa8d54add..baa2a6b7b8 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelperbitmaprender.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
index d5f3388de5..0506fbf8c9 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelperbitmaptransform.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.4 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
index ff1fdb9dc8..7b051f4f18 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelperbitmaptransform.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11: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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 39db373b1c..99eb1a401d 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelperbufferdevice.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11: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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
index 4ffca76e4c..d33e5a40a5 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelperbufferdevice.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11: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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx
index c02845e9c6..049b1a0a60 100644
--- a/drawinglayer/source/processor2d/vclhelpergradient.cxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelpergradient.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11: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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.hxx b/drawinglayer/source/processor2d/vclhelpergradient.hxx
index 8f2558a7b5..b430425c54 100644
--- a/drawinglayer/source/processor2d/vclhelpergradient.hxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.hxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclhelpergradient.hxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11: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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 59d111fffb..2793de9abd 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclmetafileprocessor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.25 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
@@ -611,7 +603,7 @@ namespace drawinglayer
                     if(mpPDFExtOutDevData && !bSuppressPDFExtOutDevDataSupport)
                     {
                         // emulate data handling from UnoControlPDFExportContact, original see 
-                        // goodies/source/graphic/grfmgr.cxx
+                        // svtools/source/graphic/grfmgr.cxx
                         const Graphic& rGraphic = rGraphicPrimitive.getGraphicObject().GetGraphic();
 
                         if(rGraphic.IsLink())
@@ -639,7 +631,7 @@ namespace drawinglayer
                     if(bUsingPDFExtOutDevData)
                     {
                         // emulate data handling from UnoControlPDFExportContact, original see 
-                        // goodies/source/graphic/grfmgr.cxx
+                        // svtools/source/graphic/grfmgr.cxx
                         const basegfx::B2DRange aCurrentRange(
                             aTranslate.getX(), aTranslate.getY(), 
                             aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY());
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 64eb630165..e21e0f4d4a 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclpixelprocessor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.16 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-26 16:21:48 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 402532c637..2f1bdc364f 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1,31 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: vclprocessor2d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx
index 58ad95a5ba..d2bce7366c 100644
--- a/drawinglayer/source/processor3d/baseprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: baseprocessor3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.7 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
index 789b9f375d..79a0a31f4f 100644
--- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: zbufferprocessor3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 6de3061eb1..b76c1b061c 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: defaultprocessor3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.13 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index 9b44961896..27eb47eb5f 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: geometry2dextractor.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/makefile.mk b/drawinglayer/source/processor3d/makefile.mk
index 2ae2ae52f2..6b739b6e3d 100644
--- a/drawinglayer/source/processor3d/makefile.mk
+++ b/drawinglayer/source/processor3d/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.5 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index d96880fcfb..28400678f1 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: shadow3dextractor.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.9 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index ceb7530350..7922e16c69 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: zbufferprocessor3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-06-24 15:31:09 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/texture/makefile.mk b/drawinglayer/source/texture/makefile.mk
index abbb303cea..d0cf722afc 100644
--- a/drawinglayer/source/texture/makefile.mk
+++ b/drawinglayer/source/texture/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.3 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-04-16 04:59:59 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index 6abef78107..109409357f 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texture.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.6 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:34 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 062d7c67f0..bc1fce2bfb 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: texture3d.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.2 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: aw $ $Date: 2008-05-27 14:11:34 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk
index 5356ee0cef..3de5c47603 100644
--- a/drawinglayer/util/makefile.mk
+++ b/drawinglayer/util/makefile.mk
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.12 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: aw $ $Date: 2008-07-21 17:41:18 $
+# OpenOffice.org is free software: you can redistribute it 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.
 #
 #*************************************************************************
 
@@ -59,7 +51,6 @@ SHL1TARGET= drawinglayer$(DLLPOSTFIX)
 SHL1IMPLIB= idrawinglayer
 
 SHL1STDLIBS=\
-        $(GOODIESLIB)		\
         $(VCLLIB)			\
         $(BASEGFXLIB)		\
         $(TOOLSLIB)			\
diff --git a/svx/source/editeng/editeng.hrc b/editeng/inc/editeng.hrc
index f023ad546d..66fcf0cb92 100644
--- a/svx/source/editeng/editeng.hrc
+++ b/editeng/inc/editeng.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: editeng.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,23 +27,7 @@
 #ifndef _EDITENG_HRC
 #define _EDITENG_HRC
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-#define RID_EDITUNDO_DEL			( RID_EDIT_START + 0 )
-#define RID_EDITUNDO_MOVE			( RID_EDIT_START + 1 )
-#define RID_EDITUNDO_INSERT			( RID_EDIT_START + 2 )
-#define RID_EDITUNDO_REPLACE 		( RID_EDIT_START + 3 )
-#define RID_EDITUNDO_SETATTRIBS		( RID_EDIT_START + 4 )
-#define RID_EDITUNDO_SETSTYLE		( RID_EDIT_START + 5 )
-#define RID_EDITUNDO_RESETATTRIBS	( RID_EDIT_START + 6 )
-#define RID_EDITUNDO_INDENT			( RID_EDIT_START + 7 )
-#define RID_EDITUNDO_TRANSLITERATE	( RID_EDIT_START + 8 )
-
-#define RID_MENU_SPELL				( RID_EDIT_START + 10 )
-#define RID_STR_PARAGRAPH			( RID_EDIT_START + 11 )
-#define RID_STR_WORD				( RID_EDIT_START + 12 )
+#include <editeng/editrids.hrc>
 
 #define MN_SPELLING         1
 #define MN_INSERT           2
@@ -59,5 +40,4 @@
 #define MN_AUTOSTART	2000
 #define MN_DICTSTART	3000
 
-
 #endif	// _EDITENG_HRC
diff --git a/svx/inc/svx/AccessibleComponentBase.hxx b/editeng/inc/editeng/AccessibleComponentBase.hxx
index 1b39f3c7f6..b4a596c3b2 100644
--- a/svx/inc/svx/AccessibleComponentBase.hxx
+++ b/editeng/inc/editeng/AccessibleComponentBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleComponentBase.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,7 +33,7 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace accessibility {
 
@@ -49,7 +46,7 @@ namespace accessibility {
         <type>XAccessibleContext</type>, <type>XInterface</type>,
         <type>XServiceInfo</type>, and <type>XTypeProvider</type>.
 */
-class SVX_DLLPUBLIC AccessibleComponentBase
+class EDITENG_DLLPUBLIC AccessibleComponentBase
     :   public ::com::sun::star::accessibility::XAccessibleExtendedComponent 
 {
 public:
diff --git a/svx/inc/svx/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index 552942f7bc..e5fdd015c8 100644
--- a/svx/inc/svx/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleContextBase.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,7 +28,7 @@
 #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
 
-#include <svx/ChildrenManager.hxx>
+//#include <editeng/ChildrenManager.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
@@ -39,9 +36,7 @@
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#endif
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/weak.hxx>
@@ -51,7 +46,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/compbase4.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 
 namespace accessibility {
@@ -64,7 +59,7 @@ struct MutexOwner {mutable ::osl::Mutex maMutex;};
         <type>XXAccessible<type> and <type>XAccessibleContextContext</type>
         interfaces it supports the <type>XServiceInfo</type> interface.
 */
-class SVX_DLLPUBLIC AccessibleContextBase
+class EDITENG_DLLPUBLIC AccessibleContextBase
     :	public MutexOwner,
         public cppu::WeakComponentImplHelper4<
         ::com::sun::star::accessibility::XAccessible,
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index f78cbd4ad4..a2173fbb5d 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleEditableTextPara.hxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,9 +46,10 @@
 
 #include <comphelper/accessibletexthelper.hxx>
 #include <comphelper/broadcasthelper.hxx>
-#include "AccessibleParaManager.hxx"
-#include "AccessibleImageBullet.hxx"
-#include "unoedprx.hxx"
+#include "editeng/AccessibleParaManager.hxx"
+#include "editeng/AccessibleImageBullet.hxx"
+#include "editeng/unoedprx.hxx"
+#include "editeng/editengdllapi.h"
 
 namespace accessibility
 {
@@ -66,7 +64,7 @@ namespace accessibility
 
     /** This class implements the actual text paragraphs for the EditEngine/Outliner UAA
      */
-    class AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
+    class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
     {
 
     protected:
diff --git a/svx/source/accessibility/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index faaf811315..a8c2b9d08f 100644
--- a/svx/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/inc/editeng/AccessibleImageBullet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleImageBullet.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,8 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include "AccessibleParaManager.hxx"
-#include <svx/unoedsrc.hxx>
+#include "editeng/AccessibleParaManager.hxx"
+#include <editeng/unoedsrc.hxx>
 
 namespace accessibility
 {
diff --git a/svx/source/accessibility/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx
index 17644c2b7a..f2e8b77e78 100644
--- a/svx/source/accessibility/AccessibleParaManager.hxx
+++ b/editeng/inc/editeng/AccessibleParaManager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleParaManager.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,6 +37,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include "editeng/editengdllapi.h"
 
 class SvxEditSourceAdapter;
 
@@ -144,7 +142,7 @@ namespace accessibility
         To facilitate automatic deletion of paragraphs no longer used,
         this class uses the WeakCppRef helper to hold the objects weakly.
      */
-    class AccessibleParaManager
+    class EDITENG_DLLPUBLIC AccessibleParaManager
     {
     public:
         typedef WeakCppRef < ::com::sun::star::accessibility::XAccessible, AccessibleEditableTextPara > WeakPara;
diff --git a/svx/inc/AccessibleSelectionBase.hxx b/editeng/inc/editeng/AccessibleSelectionBase.hxx
index f2b06e1a57..867ee7e603 100644
--- a/svx/inc/AccessibleSelectionBase.hxx
+++ b/editeng/inc/editeng/AccessibleSelectionBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleSelectionBase.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_SELECTION_BASE_HXX
 
 #include <comphelper/accessibleselectionhelper.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace accessibility
 {
@@ -47,7 +44,7 @@ namespace accessibility
         <method>implIsSelected</method>,
         <method>implSelect</method>,
 */
-    class SVX_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection,
+    class EDITENG_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection,
                                     public ::com::sun::star::accessibility::XAccessibleSelection
     {
     protected:
diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
new file mode 100644
index 0000000000..0ba62b4c47
--- /dev/null
+++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
@@ -0,0 +1,283 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: AccessibleStaticTextBase.hxx,v $
+ * $Revision: 1.14 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
+#define _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
+
+#include <memory>
+#include <tools/gen.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
+#include <com/sun/star/accessibility/TextSegment.hpp>
+#include "editeng/editengdllapi.h"
+
+
+class SvxEditSource;
+class SvxEditViewForwarder;
+
+namespace accessibility
+{
+
+    class AccessibleStaticTextBase_Impl;
+
+    typedef ::cppu::ImplHelper2<
+        ::com::sun::star::accessibility::XAccessibleText,
+        ::com::sun::star::accessibility::XAccessibleTextAttributes > AccessibleStaticTextBase_BASE;
+
+    /** Helper class for objects containing EditEngine/Outliner text
+
+        This class implements the XAccessibleText interface for static
+        text, somewhat similar to the children of the
+        AccessibleTextHelper class. Currently, there are no children,
+        i.e. the whole text is presented in one big chunk. This might
+        change in the future, if a need for image bullets should
+        arise. These, by convention, would be represented as children
+        of the text.
+
+        You have to implement the SvxEditSource, SvxTextForwarder,
+        SvxViewForwarder and SvxEditViewForwarder interfaces in order
+        to enable your object to cooperate with this
+        class. SvxTextForwarder encapsulates the fact that text
+        objects do not necessarily have an EditEngine at their
+        disposal, SvxViewForwarder and SvxEditViewForwarder do the
+        same for the document and the edit view. The three mentioned
+        forwarder objects are not stored by the AccessibleTextHelper,
+        but fetched every time from the SvxEditSource. So you are best
+        off making your SvxEditSource::Get*Forwarder methods cache the
+        current forwarder.
+
+        As this class is intended for static (i.e. non-changing) text
+        only, no event broadcasting is necessary. You must handle
+        visibility by yourself, the bounding boxes returned by
+        getCharacterBounds() are relative to your accessibility
+        object.
+
+        @attention All public non-UNO methods (those are the uppercase
+        ones) must not be called with any mutex hold, except when
+        calling from the main thread (with holds the solar mutex),
+        unless stated otherwise. This is because they themselves might
+        need the solar mutex in addition to the object mutex, and the
+        ordering of the locking must be: first solar mutex, then
+        object mutex. Furthermore, state change events might be fired
+        internally.
+
+        @derive Use this class as a base for objects containing static
+        edit engine text. To avoid overwriting every interface method
+        to intercept derived object defunc state, just set NULL as the
+        edit source. Every interface method will then properly throw
+        an exception.
+    */
+    class EDITENG_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
+    {
+
+    public:
+        /** Create accessible text object for given edit source
+
+            @param pEditSource
+            The edit source to use. Object ownership is transferred
+            from the caller to the callee. The object listens on the
+            SvxEditSource for object disposal, so no provisions have
+            to be taken if the caller destroys the data (e.g. the
+            model) contained in the given SvxEditSource.
+
+        */
+        explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource );
+        virtual ~AccessibleStaticTextBase();
+
+    private:
+
+        // declared, but not defined
+        EDITENG_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
+        // declared, but not defined
+        EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
+
+    public:
+        /** Query the current edit source
+
+            @attention This method returns by reference, so you are
+            responsible for serialization (typically, you aquired the
+            solar mutex when calling this method). Thus, the method
+            should only be called from the main office thread.
+
+        */
+        virtual const SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException));
+
+        /** Set the current edit source
+
+            @attention You are required to have the solar mutex
+            locked, when calling this method. Thus, the method should
+            only be called from the main office thread.
+
+            The EditSource set here is required to broadcast out the
+            following hints: EDITSOURCE_HINT_PARASMOVED,
+            EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED,
+            TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED,
+            TEXT_HINT_TEXTHEIGHTCHANGED,
+            TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes
+            will get noticed by the accessibility object. Further
+            more, when the corresponding core object or the model is
+            dying, either the edit source must be set to NULL or it
+            has to broadcast a SFX_HINT_DYING hint.
+
+            This class does not have a dispose method, since it is not
+            a UNO component. Nevertheless, it holds C++ references to
+            several core objects, so you should issue a
+            SetEditSource(::std::auto_ptr<SvxEditSource>(NULL)) in
+            your dispose() method.
+
+            @param pEditSource
+            The new edit source to set. Object ownership is transferred
+            from the caller to the callee.
+        */
+        virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+
+        /** Set the event source
+
+            @attention When setting a reference here, you should call
+            Dispose() when you as the owner are disposing, since until
+            then this object will hold that reference
+
+            @param rInterface
+            The interface that should be set as the source for
+            accessibility events sent by this object.
+         */
+        virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface );
+
+        /** Get the event source
+
+            @return the interface that is set as the source for
+            accessibility events sent by this object.
+         */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const;
+
+        /** Set offset of EditEngine from parent
+
+            @attention You are required to have the solar mutex
+            locked, when calling this method. Thus, the method should
+            only be called from the main office thread.
+
+            If the origin of the underlying EditEngine does
+            not correspond to the upper left corner of the object
+            using this class, you have to specify the offset.
+
+            @param rPoint
+            The offset in screen coordinates (i.e. pixel)
+        */
+        virtual void SetOffset( const Point& rPoint );
+
+        /** Query offset of EditEngine from parent
+
+            @return the offset in screen coordinates (i.e. pixel)
+        */
+        virtual Point GetOffset() const;
+
+        /** Update the visible children
+
+            As this class currently does not represent any content
+            using children, this does nothing at the moment.
+
+            @attention You are required to have the solar mutex
+            locked, when calling this method. Thus, the method should
+            only be called from the main office thread.
+
+            This method reevaluates the visibility of all
+            childrens. Call this method if your visibility state has
+            changed somehow, e.g. if the visible area has changed and
+            the AccessibleStaticTextHelper isn't notified
+            internally. Normally, there should not be a need to call
+            this method.
+        */
+        virtual void UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException));
+
+        /** Drop all references and enter disposed state
+
+            This method drops all references to external objects (also
+            the event source reference set via SetEventSource()) and
+            sets the object into the disposed state (i.e. the methods
+            return default values or throw a uno::DisposedException
+            exception).
+         */
+        virtual void Dispose();
+
+        // XAccessibleText interface implementation
+        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleTextAttributes
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // child-related methods from XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // child-related methods from XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+
+    protected:
+        Rectangle GetParagraphBoundingBox() const;
+        sal_Int32 GetParagraphCount() const;
+        sal_Int32 GetParagraphIndex() const;
+        sal_Int32 GetLineCount( sal_Int32 nParagraph ) const;
+
+    private:
+
+        /// @dyn
+        const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
+
+    };
+
+} // end of namespace accessibility
+
+#endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */
diff --git a/svx/source/inc/AccessibleStringWrap.hxx b/editeng/inc/editeng/AccessibleStringWrap.hxx
index 0d4e5c42e9..9e951b9765 100644
--- a/svx/source/inc/AccessibleStringWrap.hxx
+++ b/editeng/inc/editeng/AccessibleStringWrap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleStringWrap.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 <sal/types.h>
 #include <tools/string.hxx>
 
-#include <svx/svxdllapi.h>
+#include <editeng/editengdllapi.h>
 
 class OutputDevice;
 class SvxFont;
@@ -51,10 +48,10 @@ class AccessibleStringWrap
 {
 public:
 
-    SVX_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
+    EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
 
-    SVX_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
-    SVX_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
+    EDITENG_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
+    EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
 
 private:
     
diff --git a/svx/inc/svx/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx
index c7644ae7a0..846ac8d4f1 100644
--- a/svx/inc/svx/SpellPortions.hxx
+++ b/editeng/inc/editeng/SpellPortions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SpellPortions.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
index 1fae284ecc..afc0bd04e9 100644
--- a/svx/inc/UnoForbiddenCharsTable.hxx
+++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoForbiddenCharsTable.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,11 +33,11 @@
 #include <vos/ref.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvxForbiddenCharactersTable;
 
-class SVX_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2<
+class EDITENG_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2<
                                         com::sun::star::i18n::XForbiddenCharacters,
                                         com::sun::star::linguistic2::XSupportedLocales>
 {
diff --git a/svx/inc/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx
index 2c34f0ed12..ea1a6e5c56 100644
--- a/svx/inc/acorrcfg.hxx
+++ b/editeng/inc/editeng/acorrcfg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acorrcfg.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,14 +29,14 @@
 
 // include ---------------------------------------------------------------
 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <unotools/configitem.hxx>
 /* -----------------------------12.10.00 11:40--------------------------------
 
  ---------------------------------------------------------------------------*/
 class SvxAutoCorrect;
 class SvxAutoCorrCfg;
-class SVX_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
+class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
 {
     SvxAutoCorrCfg& rParent;
     com::sun::star::uno::Sequence<rtl::OUString>    GetPropertyNames();
@@ -56,7 +53,7 @@ public:
 /* -----------------------------12.10.00 11:40--------------------------------
 
  ---------------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
+class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
 {
     SvxAutoCorrCfg& rParent;
     com::sun::star::uno::Sequence<rtl::OUString>    GetPropertyNames();
@@ -73,7 +70,7 @@ public:
 /*--------------------------------------------------------------------
     Beschreibung:   Konfiguration fuer Auto Correction
  --------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxAutoCorrCfg
+class EDITENG_DLLPUBLIC SvxAutoCorrCfg
 {
     friend class SvxBaseAutoCorrCfg;
     friend class SvxSwAutoCorrCfg;
diff --git a/svx/inc/svx/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index f82c492c46..f72c8eb568 100644
--- a/svx/inc/svx/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adjitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,13 +30,9 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include <svx/eeitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -55,7 +48,7 @@ Dieses Item beschreibt die Zeilenausrichtung.
 */
 #define	ADJUST_LASTBLOCK_VERSION		((USHORT)0x0001)
 
-class SVX_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
 {
     BOOL    bLeft      : 1;
     BOOL    bRight     : 1;
diff --git a/svx/inc/svx/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index 059f301efe..af4daaea70 100644
--- a/svx/inc/svx/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: akrnitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +45,7 @@ namespace rtl
     Attribut fuer Pair-Kerning.
 */
 
-class SVX_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index 7f5d7bb7f5..20eec33466 100644
--- a/svx/inc/svx/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: blnkitem.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,10 +31,7 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt, ob geblinkt werden soll.
 */
 
-class SVX_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index 117b0d24a4..4e21750de0 100644
--- a/svx/inc/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bolnitem.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 
@@ -49,7 +46,7 @@ Dieses Item transportiert eine SvxBorderLine.
 
 class SvxBorderLine;
 
-class SVX_DLLPUBLIC SvxLineItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index 1e117d040f..78d173b021 100644
--- a/svx/inc/svx/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: borderline.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // Line defaults in twips (former Writer defaults):
 
@@ -93,7 +90,7 @@
 
 // ============================================================================
 
-class SVX_DLLPUBLIC SvxBorderLine
+class EDITENG_DLLPUBLIC SvxBorderLine
 {
 protected:
     Color  aColor;
diff --git a/svx/inc/svx/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index a4ad27dc6f..d85f7c2dcd 100644
--- a/svx/inc/svx/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: boxitem.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,11 +28,9 @@
 #define _SVX_BOXITEM_HXX
 
 #include <svl/poolitem.hxx>
-#include <svx/borderline.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/borderline.hxx>
+#include <editeng/editengdllapi.h>
+#include <com/sun/star/table/BorderLine.hpp>
 
 namespace rtl { class OUString; }
 
@@ -54,7 +49,7 @@ Abstand nach innen.
 
 #define BOX_4DISTS_VERSION ((USHORT)1)
 
-class SVX_DLLPUBLIC SvxBoxItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
 {
     SvxBorderLine  *pTop,
                    *pBottom,
@@ -111,6 +106,8 @@ public:
         //JP 09.06.99: bIgnoreLine = TRUE -> Distance auch returnen, wenn
         //							keine Line gesetzt ist
     USHORT 	CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const;
+    static com::sun::star::table::BorderLine SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert );
+    static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
 };
 
 inline void SvxBoxItem::SetDistance( USHORT nNew )
@@ -141,7 +138,7 @@ horizontalen und vertikalen innerern Linien transportiert.
 #define VALID_DISTANCE		0x40
 #define VALID_DISABLE		0x80
 
-class SVX_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
 {
     SvxBorderLine* pHori;   //innere horizontale Linie
     SvxBorderLine* pVert;   //innere vertikale Linie
diff --git a/svx/inc/svx/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index eaa800a899..206f4598b4 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brkitem.hxx,v $
- * $Revision: 1.4.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -53,7 +47,7 @@ namespace rtl
 */
 #define	FMTBREAK_NOAUTO	((USHORT)0x0001)
 
-class SVX_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 901c489a34..837dd87e23 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brshitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,18 +30,14 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
 #include <vcl/wall.hxx>
 #include <tools/link.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxBrushItem ----------------------------------------------------
 
 class Graphic;
 class GraphicObject;
-class SfxObjectShell;
 class CntWallpaperItem;
 namespace rtl
 {
@@ -66,7 +59,7 @@ enum SvxGraphicPosition
 #define PARA_DEST_CHAR  1
 
 class SvxBrushItem_Impl;
-class SVX_DLLPUBLIC SvxBrushItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
 {
     Color 				aColor;
     SvxBrushItem_Impl*  pImpl;
@@ -125,8 +118,8 @@ public:
     void                PurgeGraphic() const;
     void                PurgeMedium() const;
 
-    const Graphic* 			GetGraphic( SfxObjectShell* pSh = 0) const;
-    const GraphicObject* 	GetGraphicObject( SfxObjectShell* pSh = 0) const;
+    const Graphic* 			GetGraphic() const;
+    const GraphicObject* 	GetGraphicObject() const;
     const String* 			GetGraphicLink() const		{ return pStrLink; }
     const String* 			GetGraphicFilter() const	{ return pStrFilter; }
 
@@ -138,7 +131,6 @@ public:
 
     SvxBrushItem&		operator=( const SvxBrushItem& rItem);
 
-    //static void					InitSfxLink();
     static SvxGraphicPosition 	WallpaperStyle2GraphicPos( WallpaperStyle eStyle );
     static WallpaperStyle 		GraphicPos2WallpaperStyle( SvxGraphicPosition ePos );
     CntWallpaperItem*			CreateCntWallpaperItem() const;
diff --git a/svx/inc/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index 050c92f6ee..2f2bd994cd 100644
--- a/svx/inc/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bulitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 // define ----------------------------------------------------------------
@@ -68,11 +65,11 @@
 #define VALID_FOLLOWTEXT    0x0100
 #include <svl/poolitem.hxx>
 #include <vcl/font.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 // class SvxBulletItem ---------------------------------------------------
 
-class SVX_DLLPUBLIC SvxBulletItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
 {
     Font            aFont;
     GraphicObject*  pGraphicObject;
diff --git a/svx/inc/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index 739bde77eb..b6debc4285 100644
--- a/svx/inc/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charhiddenitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxCharHiddenItem -------------------------------------------------
 /*
@@ -42,7 +39,7 @@
     This item marks text as hidden
 */
 
-class SVX_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 0d5a901f7e..3d5b36fa59 100644
--- a/svx/inc/svx/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charreliefitem.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,10 +31,7 @@
 
 #include <svl/eitem.hxx>
 #include <vcl/fntstyle.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxCharRotateItem ----------------------------------------------
 
@@ -48,7 +42,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index 67933f26b2..a8eaca8c68 100644
--- a/svx/inc/svx/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charrotateitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxCharRotateItem ----------------------------------------------
 
@@ -49,7 +43,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
 {
     sal_Bool bFitToLine;
 public:
diff --git a/svx/inc/svx/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index 36a7f38f7b..925e84a1eb 100644
--- a/svx/inc/svx/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charscaleitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,13 +29,8 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _SFXENUMITEM_HXX
 #include <svl/intitem.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxCharScaleItem ----------------------------------------------
 
@@ -50,7 +42,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index 625ec28ca5..94fb80ae04 100644
--- a/svx/inc/svx/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmapitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt die Schrift-Ausrichtung (Versalien, Kapitaelchen,...).
 */
 
-class SVX_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index fa9bc7da76..7ca2faac28 100644
--- a/svx/inc/svx/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cntritem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxContourItem --------------------------------------------------
 
@@ -45,7 +39,7 @@
     Dieses Item beschreibt, ob Konturschrift eingestellt ist.
 */
 
-class SVX_DLLPUBLIC SvxContourItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index da04d2120f..6c73008213 100644
--- a/svx/inc/svx/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colritem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,13 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SV_COLOR_HXX //autogen
 #include <tools/color.hxx>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -56,7 +48,7 @@ namespace rtl
 
 #define VERSION_USEAUTOCOLOR	1
 
-class SVX_DLLPUBLIC SvxColorItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxColorItem : public SfxPoolItem
 {
 private:
     Color					mColor;
diff --git a/svx/inc/svx/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index caa835b89a..c62f5bd246 100644
--- a/svx/inc/svx/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: crsditem.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,10 +31,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt, ob und wie durchstrichen ist.
 */
 
-class SVX_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index 6c6d5c5f4d..144bab81cd 100644
--- a/svx/inc/svx/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cscoitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,8 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <tools/string.hxx>
-#include <svx/colritem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
 
 // class SvxCharSetColorItem ---------------------------------------------
 
@@ -43,7 +40,7 @@
     PB: wird nur intern im Reader des Writers benoetigt
 */
 
-class SVX_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
+class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
 {
     rtl_TextEncoding eFrom;
 public:
diff --git a/svx/inc/svx/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index de8af1ee9b..d39dc25c75 100644
--- a/svx/inc/svx/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editdata.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 #define _MyEDITDATA_HXX
 
 #include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <svl/svarray.hxx>
 
@@ -220,7 +217,7 @@ inline void ESelection::Adjust()
     }
 }
 
-struct SVX_DLLPUBLIC EFieldInfo
+struct EDITENG_DLLPUBLIC EFieldInfo
 {
     SvxFieldItem*   pFieldItem;
     String          aCurrentText;
@@ -307,7 +304,7 @@ struct EECharAttrib
     xub_StrLen			nEnd;
 };
 
-SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, SVX_DLLPUBLIC )
+SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUBLIC )
 
 struct MoveParagraphsInfo
 {
diff --git a/svx/inc/svx/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index d117950382..bd8683429f 100644
--- a/svx/inc/svx/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editeng.hxx,v $
- * $Revision: 1.8.14.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -90,14 +87,14 @@ typedef std::vector<SpellPortion> SpellPortions;
 namespace basegfx { class B2DPolyPolygon; }
 #include <rsc/rscsfx.hxx>
 #ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #endif
 #include <i18npool/lang.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <tools/rtti.hxx>	// wegen typedef TypeId
 
-#include <svx/eedata.hxx>
+#include <editeng/eedata.hxx>
 class SvxFieldData;
 
 //////////////////////////////////////////////////////////////////////////////
@@ -113,7 +110,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHard = 2;		/// returns only attributes har
 #define GETATTRIBS_CHARATTRIBS  (sal_uInt8)0x04
 #define GETATTRIBS_ALL          (sal_uInt8)0xFF
 
-class SVX_DLLPUBLIC EditEngine
+class EDITENG_DLLPUBLIC EditEngine
 {
     friend class EditView;
     friend class ImpEditView;
@@ -123,11 +120,11 @@ class SVX_DLLPUBLIC EditEngine
 private:
     ImpEditEngine* 	pImpEditEngine;
 
-                    SVX_DLLPRIVATE EditEngine( const EditEngine& );
-    SVX_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
+                    EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
+    EDITENG_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
 
 //#if 0 // _SOLAR__PRIVATE
-    SVX_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
+    EDITENG_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
 //#endif
 
 protected:
@@ -458,6 +455,7 @@ public:
     virtual Rectangle GetBulletArea( USHORT nPara );
 
     static SfxItemPool*	CreatePool( BOOL bLoadRefCounts = TRUE );
+    static SfxItemPool&	GetGlobalItemPool();
     static sal_uInt32	RegisterClipboardFormatName();
     static BOOL		DoesKeyChangeText( const KeyEvent& rKeyEvent );
     static BOOL		DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
diff --git a/svx/source/dialog/hyphen.hrc b/editeng/inc/editeng/editengdllapi.h
index 9cd708b89d..a2fca4f87a 100644
--- a/svx/source/dialog/hyphen.hrc
+++ b/editeng/inc/editeng/editengdllapi.h
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyphen.hrc,v $
+ * $RCSfile: editengdllapi.h,v $
  * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
@@ -27,22 +27,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_HYPHEN_HRC
-#define _SVX_HYPHEN_HRC
 
-// defines ------------------------------------------------------------------
-
-#define ED_WORD				10
-#define BTN_LEFT			11
-#define BTN_RIGHT			12
-#define FT_WORD             13
-
-#define BTN_HYPH_CONTINUE	20
-#define BTN_HYPH_DELETE		21
-#define BTN_HYPH_CUT		22
-#define BTN_HYPH_CANCEL		23
-#define BTN_HYPH_HELP		24
+#ifndef INCLUDED_EDITENGDLLAPI_H
+#define INCLUDED_EDITENGDLLAPI_H
 
+#include "sal/types.h"
 
+#if defined(EDITENG_DLLIMPLEMENTATION)
+#define EDITENG_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define EDITENG_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
+#define EDITENG_DLLPRIVATE SAL_DLLPRIVATE
 
+#endif
diff --git a/configmgr/source/inc/utility.hxx b/editeng/inc/editeng/editerr.hxx
index 8549747040..7ded1075db 100644
--- a/configmgr/source/inc/utility.hxx
+++ b/editeng/inc/editeng/editerr.hxx
@@ -1,13 +1,13 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: utility.hxx,v $
- * $Revision: 1.10 $
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,27 +27,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+#ifndef _EDIT_ERR_HRC
+#define _EDIT_ERR_HRC
 
-#ifndef INCLUDED_CONFIGMGR_SOURCE_INC_UTILITY_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_INC_UTILITY_HXX
-
-#include "sal/config.h"
-
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-
-#if defined _MSC_VER && _MSC_VER >= 1400
-#pragma warning(disable: 4350)
-    // behavior change: 'member1' called instead of 'member2'
-#endif
-
-namespace configmgr {
-
-    inline rtl_uString * acquireString(rtl::OUString const & string) {
-        rtl_uString_acquire(string.pData);
-        return string.pData;
-    }
+#include <tools/errcode.hxx>
 
-}
+#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS    (2UL | ERRCODE_AREA_SVX)
 
+#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT   (8UL | ERRCODE_AREA_SVX | \
+                                                ERRCODE_CLASS_READ )
 #endif
diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc
new file mode 100644
index 0000000000..0d1acb4615
--- /dev/null
+++ b/editeng/inc/editeng/editids.hrc
@@ -0,0 +1,245 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.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.
+ *
+ ************************************************************************/
+#ifndef _EDIT_SVXIDS_HRC
+#define _EDIT_SVXIDS_HRC
+
+// include ------------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+#define SID_ATTR_BRUSH                                  ( SID_SVX_START + 1 )
+#define SID_ATTR_TABSTOP                                ( SID_SVX_START + 2 )
+#define SID_ATTR_TABSTOP_DEFAULTS                       ( SID_SVX_START + 3 )
+#define SID_ATTR_TABSTOP_POS                            ( SID_SVX_START + 4 )
+#define SID_ATTR_TABSTOP_OFFSET                         ( SID_SVX_START + 5 )
+#define SID_ATTR_CHAR                                   ( SID_SVX_START + 6 )     
+#define SID_ATTR_CHAR_FONT                              ( SID_SVX_START + 7 )     
+#define SID_ATTR_CHAR_POSTURE                           ( SID_SVX_START + 8 )     
+#define SID_ATTR_CHAR_WEIGHT                            ( SID_SVX_START + 9 )     
+#define SID_ATTR_CHAR_SHADOWED                          ( SID_SVX_START + 10 )    
+#define SID_ATTR_CHAR_WORDLINEMODE                      ( SID_SVX_START + 11 )    
+#define SID_ATTR_CHAR_CONTOUR                           ( SID_SVX_START + 12 )    
+#define SID_ATTR_CHAR_STRIKEOUT                         ( SID_SVX_START + 13 )    
+#define SID_ATTR_CHAR_UNDERLINE                         ( SID_SVX_START + 14 )    
+#define SID_ATTR_CHAR_FONTHEIGHT                        ( SID_SVX_START + 15 )    
+#define SID_ATTR_CHAR_PROPSIZE                          ( SID_SVX_START + 16 )    
+#define SID_ATTR_CHAR_COLOR                             ( SID_SVX_START + 17 )    
+#define SID_ATTR_CHAR_KERNING                           ( SID_SVX_START + 18 )    
+#define SID_ATTR_CHAR_CASEMAP                           ( SID_SVX_START + 19 )    
+#define SID_ATTR_CHAR_LANGUAGE                          ( SID_SVX_START + 20 )    
+#define SID_ATTR_CHAR_ESCAPEMENT                        ( SID_SVX_START + 21 )    
+#define SID_ATTR_CHAR_FONTLIST                          ( SID_SVX_START + 22 )    
+#define SID_ATTR_BORDER_OUTER                           ( SID_SVX_START + 24 )
+#define SID_ATTR_BORDER_SHADOW                          ( SID_SVX_START + 25 )
+#define SID_ATTR_PARA                                   ( SID_SVX_START + 26 )
+#define SID_ATTR_PARA_ADJUST                            ( SID_SVX_START + 27 )
+#define SID_ATTR_PARA_ADJUST_LEFT                       ( SID_SVX_START + 28 )
+#define SID_ATTR_PARA_ADJUST_RIGHT                      ( SID_SVX_START + 29 )
+#define SID_ATTR_PARA_ADJUST_CENTER                     ( SID_SVX_START + 30 )
+#define SID_ATTR_PARA_ADJUST_BLOCK                      ( SID_SVX_START + 31 )
+#define SID_ATTR_PARA_ADJUST_BLOCKLINE                  ( SID_SVX_START + 32 )
+#define SID_ATTR_PARA_LINESPACE                         ( SID_SVX_START + 33 )
+#define SID_ATTR_PARA_LINESPACE_10                      ( SID_SVX_START + 34 )
+#define SID_ATTR_PARA_LINESPACE_15                      ( SID_SVX_START + 35 )
+#define SID_ATTR_PARA_LINESPACE_20                      ( SID_SVX_START + 36 )
+#define SID_ATTR_PARA_PAGEBREAK                         ( SID_SVX_START + 37 )
+#define SID_ATTR_PARA_HYPHENZONE                        ( SID_SVX_START + 38 )
+#define SID_ATTR_PARA_SPLIT                             ( SID_SVX_START + 39 )
+#define SID_ATTR_PARA_ORPHANS                           ( SID_SVX_START + 40 )
+#define SID_ATTR_PARA_WIDOWS                            ( SID_SVX_START + 41 )
+#define SID_ATTR_PARA_ULSPACE                           ( SID_SVX_START + 42 )
+#define SID_ATTR_PARA_LRSPACE                           ( SID_SVX_START + 43 )
+#define SID_ATTR_LRSPACE                                ( SID_SVX_START + 48 )
+#define SID_ATTR_ULSPACE                                ( SID_SVX_START + 49 )
+#define SID_ATTR_CHAR_MAPTYPE                           ( SID_SVX_START + 64 )    
+#define SID_ATTR_PARA_MODEL                             ( SID_SVX_START + 65 )
+#define SID_ATTR_PARA_KEEP                              ( SID_SVX_START + 66 )
+#define SID_ATTR_CHAR_AUTOKERN                          ( SID_SVX_START + 67 )    
+#define SID_ATTR_PARA_BULLET                            ( SID_SVX_START + 250 )
+#define SID_ATTR_PARA_OUTLLEVEL                         ( SID_SVX_START + 300 )
+#define SID_FIELD                                       ( SID_SVX_START + 363 )
+#define SID_ATTR_PARA_REGISTER                          ( SID_SVX_START + 413 )
+#define SID_ATTR_PARA_PAGENUM                           ( SID_SVX_START + 457 )
+#define SID_ATTR_PARA_NUMRULE                           ( SID_SVX_START + 587 )
+#define SID_ATTR_BRUSH_CHAR                             ( SID_SVX_START + 591 )
+#define SID_ATTR_NUMBERING_RULE                         ( SID_SVX_START + 855 )
+#define SID_ATTR_CHAR_CHARSETCOLOR                      ( SID_SVX_START + 877 )
+#define SID_ATTR_CHAR_CJK_FONT                          ( SID_SVX_START + 887 )
+#define SID_ATTR_CHAR_CJK_FONTHEIGHT                    ( SID_SVX_START + 888 )
+#define SID_ATTR_CHAR_CJK_LANGUAGE                      ( SID_SVX_START + 889 )
+#define SID_ATTR_CHAR_CJK_POSTURE                       ( SID_SVX_START + 890 )
+#define SID_ATTR_CHAR_CJK_WEIGHT                        ( SID_SVX_START + 891 )
+#define SID_ATTR_CHAR_CTL_FONT                          ( SID_SVX_START + 892 )
+#define SID_ATTR_CHAR_CTL_FONTHEIGHT                    ( SID_SVX_START + 893 )
+#define SID_ATTR_CHAR_CTL_LANGUAGE                      ( SID_SVX_START + 894 )
+#define SID_ATTR_CHAR_CTL_POSTURE                       ( SID_SVX_START + 895 )
+#define SID_ATTR_CHAR_CTL_WEIGHT                        ( SID_SVX_START + 896 )
+#define SID_ATTR_CHAR_TWO_LINES                         ( SID_SVX_START + 897 )
+#define SID_ATTR_CHAR_CJK_RUBY                          ( SID_SVX_START + 898 )
+#define SID_ATTR_CHAR_EMPHASISMARK                      ( SID_SVX_START + 899 )
+#define SID_ATTR_CHAR_SCRIPTTYPE                        ( SID_SVX_START + 900 )
+#define SID_ATTR_PARA_SCRIPTSPACE                       ( SID_SVX_START + 901 )
+#define SID_ATTR_PARA_HANGPUNCTUATION                   ( SID_SVX_START + 902 )
+#define SID_ATTR_PARA_FORBIDDEN_RULES                   ( SID_SVX_START + 903 )
+#define SID_ATTR_CHAR_VERTICAL                          ( SID_SVX_START + 905 )
+#define SID_ATTR_CHAR_ROTATED                           ( SID_SVX_START + 910 )
+#define SID_ATTR_CHAR_SCALEWIDTH                        ( SID_SVX_START + 911 )
+#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE                 ( SID_SVX_START + 919 )
+#define SID_ATTR_CHAR_RELIEF                            ( SID_SVX_START + 920 )
+#define SID_PARA_VERTALIGN                              ( SID_SVX_START + 925 )
+#define SID_ATTR_FRAMEDIRECTION                         ( SID_SVX_START + 944 )
+#define SID_ATTR_PARA_SNAPTOGRID                        ( SID_SVX_START + 945 )
+#define SID_ATTR_PARA_LRSPACE_VERTICAL                  ( SID_SVX_START + 947 )
+#define SID_ATTR_PARA_LEFT_TO_RIGHT                     ( SID_SVX_START + 950 )
+#define SID_ATTR_PARA_RIGHT_TO_LEFT                     ( SID_SVX_START + 951 )
+#define SID_ATTR_CHAR_HIDDEN                            ( SID_SVX_START + 989 )
+#define SID_ATTR_CHAR_LATIN_FONT                        ( SID_SVX_START + 994 )
+#define SID_ATTR_CHAR_LATIN_FONTHEIGHT                  ( SID_SVX_START + 995 )
+#define SID_ATTR_CHAR_LATIN_LANGUAGE                    ( SID_SVX_START + 996 )
+#define SID_ATTR_CHAR_LATIN_POSTURE                     ( SID_SVX_START + 997 )
+#define SID_ATTR_CHAR_LATIN_WEIGHT                      ( SID_SVX_START + 998 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL                     ( SID_SVX_START +1092 )
+
+// this ID didn't exist prior to the svx split
+#define SID_ATTR_CHAR_OVERLINE              			( SID_EDIT_START + 68 )
+
+/*
+// planned, but not doable: changing value of SIDs will break code that uses them for WhichRanges
+#define SID_PARA_VERTALIGN                              ( SID_EDIT_START )
+#define SID_ATTR_BORDER_OUTER                           ( SID_EDIT_START + 1 )
+#define SID_ATTR_BORDER_SHADOW                          ( SID_EDIT_START + 2 )
+#define SID_ATTR_BRUSH                                  ( SID_EDIT_START + 3 )
+#define SID_ATTR_BRUSH_CHAR                             ( SID_EDIT_START + 4 )
+
+
+#define SID_FIELD                                       ( SID_EDIT_START + 7 )
+#define SID_ATTR_FRAMEDIRECTION                         ( SID_EDIT_START + 8 )
+#define SID_ATTR_PARA                                   ( SID_EDIT_START + 9 )
+#define SID_ATTR_PARA_ADJUST                            ( SID_EDIT_START + 10 )
+#define SID_ATTR_PARA_ADJUST_LEFT                       ( SID_EDIT_START + 11 )
+#define SID_ATTR_PARA_BULLET                            ( SID_EDIT_START + 12 )
+#define SID_ATTR_PARA_OUTLLEVEL                         ( SID_EDIT_START + 13 )
+#define SID_ATTR_PARA_REGISTER                          ( SID_EDIT_START + 14 )
+#define SID_ATTR_PARA_PAGENUM                           ( SID_EDIT_START + 15 )
+#define SID_ATTR_PARA_NUMRULE                           ( SID_EDIT_START + 16 )
+#define SID_ATTR_PARA_SCRIPTSPACE                       ( SID_EDIT_START + 17 )
+#define SID_ATTR_PARA_HANGPUNCTUATION                   ( SID_EDIT_START + 18 )
+#define SID_ATTR_PARA_FORBIDDEN_RULES                   ( SID_EDIT_START + 19 )
+#define SID_ATTR_PARA_SNAPTOGRID                        ( SID_EDIT_START + 20 )
+#define SID_ATTR_PARA_LRSPACE_VERTICAL                  ( SID_EDIT_START + 21 )
+#define SID_ATTR_PARA_LEFT_TO_RIGHT                     ( SID_EDIT_START + 22 )
+#define SID_ATTR_PARA_RIGHT_TO_LEFT                     ( SID_EDIT_START + 23 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL                     ( SID_EDIT_START + 24 )
+#define SID_ATTR_PARA_ADJUST_RIGHT                      ( SID_EDIT_START + 25 )
+#define SID_ATTR_PARA_ADJUST_CENTER                     ( SID_EDIT_START + 26 )
+#define SID_ATTR_PARA_ADJUST_BLOCK                      ( SID_EDIT_START + 27 )
+#define SID_ATTR_PARA_ADJUST_BLOCKLINE                  ( SID_EDIT_START + 28 )
+#define SID_ATTR_PARA_LINESPACE                         ( SID_EDIT_START + 29 )
+#define SID_ATTR_PARA_LINESPACE_10                      ( SID_EDIT_START + 30 )
+#define SID_ATTR_PARA_LINESPACE_15                      ( SID_EDIT_START + 31 )
+#define SID_ATTR_PARA_LINESPACE_20                      ( SID_EDIT_START + 32 )
+#define SID_ATTR_PARA_PAGEBREAK                         ( SID_EDIT_START + 33 )
+#define SID_ATTR_PARA_HYPHENZONE                        ( SID_EDIT_START + 34 )
+#define SID_ATTR_PARA_SPLIT                             ( SID_EDIT_START + 35 )
+#define SID_ATTR_PARA_ORPHANS                           ( SID_EDIT_START + 36 )
+#define SID_ATTR_PARA_WIDOWS                            ( SID_EDIT_START + 37 )
+#define SID_ATTR_PARA_ULSPACE                           ( SID_EDIT_START + 38 )
+#define SID_ATTR_PARA_LRSPACE                           ( SID_EDIT_START + 39 )
+#define SID_ATTR_PARA_MODEL                             ( SID_EDIT_START + 40 )
+#define SID_ATTR_PARA_KEEP                              ( SID_EDIT_START + 41 )
+#define SID_ATTR_NUMBERING_RULE                         ( SID_EDIT_START + 42 )
+#define SID_ATTR_LRSPACE                                ( SID_EDIT_START + 43 )
+#define SID_ATTR_ULSPACE                                ( SID_EDIT_START + 44 )
+#define SID_ATTR_TABSTOP                                ( SID_EDIT_START + 45 )
+#define SID_ATTR_TABSTOP_DEFAULTS                       ( SID_EDIT_START + 46 )
+#define SID_ATTR_TABSTOP_POS                            ( SID_EDIT_START + 47 )
+#define SID_ATTR_TABSTOP_OFFSET                         ( SID_EDIT_START + 48 )
+#define SID_ATTR_CHAR                       			( SID_EDIT_START + 49 )
+#define SID_ATTR_CHAR_FONT                  			( SID_EDIT_START + 50 )
+#define SID_ATTR_CHAR_POSTURE               			( SID_EDIT_START + 51 )
+#define SID_ATTR_CHAR_WEIGHT                			( SID_EDIT_START + 52 )
+#define SID_ATTR_CHAR_SHADOWED              			( SID_EDIT_START + 53 )
+#define SID_ATTR_CHAR_WORDLINEMODE          			( SID_EDIT_START + 54 )
+#define SID_ATTR_CHAR_CONTOUR               			( SID_EDIT_START + 55 )
+#define SID_ATTR_CHAR_STRIKEOUT             			( SID_EDIT_START + 56 )
+#define SID_ATTR_CHAR_UNDERLINE             			( SID_EDIT_START + 57 )
+#define SID_ATTR_CHAR_FONTHEIGHT            			( SID_EDIT_START + 58 )
+#define SID_ATTR_CHAR_PROPSIZE              			( SID_EDIT_START + 59 )
+#define SID_ATTR_CHAR_COLOR                 			( SID_EDIT_START + 60 )
+#define SID_ATTR_CHAR_KERNING               			( SID_EDIT_START + 61 )
+#define SID_ATTR_CHAR_CASEMAP               			( SID_EDIT_START + 62 )
+#define SID_ATTR_CHAR_LANGUAGE              			( SID_EDIT_START + 63 )
+#define SID_ATTR_CHAR_ESCAPEMENT            			( SID_EDIT_START + 64 )
+#define SID_ATTR_CHAR_FONTLIST              			( SID_EDIT_START + 65 )
+#define SID_ATTR_CHAR_MAPTYPE               			( SID_EDIT_START + 66 )
+#define SID_ATTR_CHAR_AUTOKERN              			( SID_EDIT_START + 67 )
+#define SID_ATTR_CHAR_OVERLINE              			( SID_EDIT_START + 68 )
+#define SID_ATTR_CHAR_CHARSETCOLOR                      ( SID_EDIT_START + 69 )
+#define SID_ATTR_CHAR_CJK_FONT                          ( SID_EDIT_START + 70 )
+#define SID_ATTR_CHAR_CJK_FONTHEIGHT                    ( SID_EDIT_START + 71 )
+#define SID_ATTR_CHAR_CJK_LANGUAGE                      ( SID_EDIT_START + 72 )
+#define SID_ATTR_CHAR_CJK_POSTURE                       ( SID_EDIT_START + 73 )
+#define SID_ATTR_CHAR_CJK_WEIGHT                        ( SID_EDIT_START + 74 )
+#define SID_ATTR_CHAR_CTL_FONT                          ( SID_EDIT_START + 75 )
+#define SID_ATTR_CHAR_CTL_FONTHEIGHT                    ( SID_EDIT_START + 76 )
+#define SID_ATTR_CHAR_CTL_LANGUAGE                      ( SID_EDIT_START + 77 )
+#define SID_ATTR_CHAR_CTL_POSTURE                       ( SID_EDIT_START + 78 )
+#define SID_ATTR_CHAR_CTL_WEIGHT                        ( SID_EDIT_START + 79 )
+#define SID_ATTR_CHAR_TWO_LINES                         ( SID_EDIT_START + 80 )
+#define SID_ATTR_CHAR_CJK_RUBY                          ( SID_EDIT_START + 81 )
+#define SID_ATTR_CHAR_EMPHASISMARK                      ( SID_EDIT_START + 82 )
+#define SID_ATTR_CHAR_SCRIPTTYPE                        ( SID_EDIT_START + 83 )
+#define SID_ATTR_CHAR_VERTICAL                          ( SID_EDIT_START + 84 )    
+#define SID_ATTR_CHAR_ROTATED                           ( SID_EDIT_START + 85 )
+#define SID_ATTR_CHAR_SCALEWIDTH                        ( SID_EDIT_START + 86 )
+#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE                 ( SID_EDIT_START + 87 )
+#define SID_ATTR_CHAR_RELIEF                            ( SID_EDIT_START + 88 )
+#define SID_ATTR_CHAR_HIDDEN                            ( SID_EDIT_START + 89 )
+#define SID_ATTR_CHAR_LATIN_FONT                        ( SID_EDIT_START + 90 )
+#define SID_ATTR_CHAR_LATIN_FONTHEIGHT                  ( SID_EDIT_START + 91 )
+#define SID_ATTR_CHAR_LATIN_LANGUAGE                    ( SID_EDIT_START + 92 )
+#define SID_ATTR_CHAR_LATIN_POSTURE                     ( SID_EDIT_START + 93 )
+#define SID_ATTR_CHAR_LATIN_WEIGHT                      ( SID_EDIT_START + 94 )
+*/
+
+#if 94 > (SID_EDIT_END-SID_EDIT_START)
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#define SID_TEXT_ALIGNLEFT                                SID_ATTR_PARA_ADJUST_LEFT
+#define SID_TEXT_ALIGNRIGHT                               SID_ATTR_PARA_ADJUST_RIGHT
+#define SID_TEXT_ALIGNCENTER                              SID_ATTR_PARA_ADJUST_CENTER
+#define SID_TEXT_ALIGNBLOCK                               SID_ATTR_PARA_ADJUST_BLOCK
+#define SID_DRAW_TEXT_VERTICAL                            SID_ATTR_CHAR_VERTICAL                              
+
+#endif
+
+// ******************************************************************* EOF
+
diff --git a/svx/inc/svx/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index f2b1aaabdf..3a64a5914a 100644
--- a/svx/inc/svx/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editobj.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,8 @@
 #include <tools/debug.hxx>
 #include <rsc/rscsfx.hxx>
 #include <svl/itemset.hxx>
-#include <svx/eeitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/eeitem.hxx>
+#include "editeng/editengdllapi.h"
 
 DBG_NAMEEX( EE_EditTextObject )
 
@@ -48,11 +45,11 @@ class EECharAttribArray;
 #define EDTOBJ_SETTINGS_ULITEMSUMMATION		0x00000001
 #define EDTOBJ_SETTINGS_ULITEMFIRSTPARA		0x00000002
 
-class SVX_DLLPUBLIC EditTextObject
+class EDITENG_DLLPUBLIC EditTextObject
 {
 private:
     USHORT				nWhich;
-    SVX_DLLPRIVATE EditTextObject&		operator=( const EditTextObject& );
+    EDITENG_DLLPRIVATE EditTextObject&		operator=( const EditTextObject& );
 
 protected:
                         EditTextObject( USHORT nWhich );
diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc
new file mode 100644
index 0000000000..97c9a4b266
--- /dev/null
+++ b/editeng/inc/editeng/editrids.hrc
@@ -0,0 +1,432 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.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.
+ *
+ ************************************************************************/
+#ifndef _EDIT_RIDS_HRC
+#define _EDIT_RIDS_HRC
+
+// include ------------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// strings also used in cui
+#define RID_SVXSTR_PAPERBIN_SETTINGS		(RID_EDIT_START)
+#define RID_SVXSTR_PAPERBIN                 (RID_EDIT_START + 1)
+
+#define RID_OUTLUNDO_EXPAND					(RID_EDIT_START + 2)
+#define RID_OUTLUNDO_COLLAPSE 				(RID_EDIT_START + 3)
+#define RID_OUTLUNDO_ATTR		 			(RID_EDIT_START + 4)
+#define RID_OUTLUNDO_INSERT 				(RID_EDIT_START + 5)
+#define RID_OUTLUNDO_DEPTH					(RID_EDIT_START + 6)
+#define RID_OUTLUNDO_HEIGHT					(RID_EDIT_START + 7)
+
+// strings for items
+
+#define RID_SVXITEMS_FRMDIR_BEGIN			(RID_EDIT_START + 9)
+#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP	(RID_EDIT_START + 9)
+#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP	(RID_EDIT_START + 10)
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT	(RID_EDIT_START + 11)
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT	(RID_EDIT_START + 12)
+#define RID_SVXITEMS_FRMDIR_ENVIRONMENT		(RID_EDIT_START + 13)
+#define RID_SVXITEMS_FRMDIR_END				(RID_EDIT_START + 14)
+
+#define RID_SVXITEMS_TRUE					(RID_EDIT_START + 15)
+#define RID_SVXITEMS_FALSE					(RID_EDIT_START + 16)
+#define RID_SVXITEMS_BORDER_COMPLETE		(RID_EDIT_START + 17)
+#define RID_SVXITEMS_BORDER_TOP				(RID_EDIT_START + 18)
+#define RID_SVXITEMS_BORDER_BOTTOM			(RID_EDIT_START + 19)
+#define RID_SVXITEMS_BORDER_LEFT			(RID_EDIT_START + 20)
+#define RID_SVXITEMS_BORDER_RIGHT			(RID_EDIT_START + 21)
+#define RID_SVXITEMS_BORDER_DISTANCE		(RID_EDIT_START + 22)
+#define RID_SVXITEMS_BORDER_NONE			(RID_EDIT_START + 23)
+
+#define RID_SVXITEMS_TRANSPARENT_TRUE		(RID_EDIT_START + 24)
+#define RID_SVXITEMS_TRANSPARENT_FALSE		(RID_EDIT_START + 25)
+#define RID_SVXITEMS_OPAQUE_TRUE			(RID_EDIT_START + 26)
+#define RID_SVXITEMS_OPAQUE_FALSE			(RID_EDIT_START + 27)
+
+#define RID_SVXITEMS_SHADOW_COMPLETE		(RID_EDIT_START + 28)
+#define RID_SVXITEMS_GRAPHIC				(RID_EDIT_START + 29)
+#define RID_SVXITEMS_LINES					(RID_EDIT_START + 30)
+#define RID_SVXITEMS_ORPHANS_COMPLETE		(RID_EDIT_START + 31)
+#define RID_SVXITEMS_WIDOWS_COMPLETE		(RID_EDIT_START + 32)
+#define RID_SVXITEMS_PAGEMODEL_COMPLETE		(RID_EDIT_START + 33)
+
+#define RID_SVXITEMS_SHADOWED_TRUE			(RID_EDIT_START + 34)
+#define RID_SVXITEMS_SHADOWED_FALSE			(RID_EDIT_START + 35)
+#define RID_SVXITEMS_AUTOKERN_TRUE			(RID_EDIT_START + 36)
+#define RID_SVXITEMS_AUTOKERN_FALSE			(RID_EDIT_START + 37)
+#define RID_SVXITEMS_WORDLINE_TRUE			(RID_EDIT_START + 38)
+#define RID_SVXITEMS_WORDLINE_FALSE			(RID_EDIT_START + 39)
+#define RID_SVXITEMS_CONTOUR_TRUE			(RID_EDIT_START + 40)
+#define RID_SVXITEMS_CONTOUR_FALSE			(RID_EDIT_START + 41)
+#define RID_SVXITEMS_NOLINEBREAK_TRUE		(RID_EDIT_START + 42)
+#define RID_SVXITEMS_NOLINEBREAK_FALSE		(RID_EDIT_START + 43)
+#define RID_SVXITEMS_NOHYPHEN_TRUE			(RID_EDIT_START + 44)
+#define RID_SVXITEMS_NOHYPHEN_FALSE			(RID_EDIT_START + 45)
+#define RID_SVXITEMS_FMTKEEP_TRUE			(RID_EDIT_START + 46)
+#define RID_SVXITEMS_FMTKEEP_FALSE			(RID_EDIT_START + 47)
+#define RID_SVXITEMS_FMTSPLIT_TRUE			(RID_EDIT_START + 48)
+#define RID_SVXITEMS_FMTSPLIT_FALSE			(RID_EDIT_START + 49)
+#define RID_SVXITEMS_PRINT_TRUE				(RID_EDIT_START + 50)
+#define RID_SVXITEMS_PRINT_FALSE			(RID_EDIT_START + 51)
+#define RID_SVXITEMS_PROT_POS_TRUE			(RID_EDIT_START + 52)
+#define RID_SVXITEMS_PROT_POS_FALSE			(RID_EDIT_START + 53)
+#define RID_SVXITEMS_PROT_SIZE_TRUE			(RID_EDIT_START + 54)
+#define RID_SVXITEMS_PROT_SIZE_FALSE		(RID_EDIT_START + 55)
+#define RID_SVXITEMS_PROT_CONTENT_TRUE		(RID_EDIT_START + 56)
+#define RID_SVXITEMS_PROT_CONTENT_FALSE		(RID_EDIT_START + 57)
+#define RID_SVXITEMS_ULSPACE_UPPER			(RID_EDIT_START + 58)
+#define RID_SVXITEMS_ULSPACE_LOWER			(RID_EDIT_START + 59)
+#define RID_SVXITEMS_LRSPACE_LEFT			(RID_EDIT_START + 60)
+#define RID_SVXITEMS_LRSPACE_FLINE			(RID_EDIT_START + 62)
+#define RID_SVXITEMS_LRSPACE_RIGHT			(RID_EDIT_START + 63)
+#define RID_SVXITEMS_SIZE_WIDTH				(RID_EDIT_START + 64)
+#define RID_SVXITEMS_SIZE_HEIGHT			(RID_EDIT_START + 65)
+#define RID_SVXITEMS_PAGE_END_TRUE			(RID_EDIT_START + 66)
+#define RID_SVXITEMS_PAGE_END_FALSE			(RID_EDIT_START + 67)
+#define RID_SVXITEMS_HYPHEN_TRUE			(RID_EDIT_START + 68)
+#define RID_SVXITEMS_HYPHEN_FALSE			(RID_EDIT_START + 69)
+#define RID_SVXITEMS_HYPHEN_MINLEAD			(RID_EDIT_START + 70)
+#define RID_SVXITEMS_HYPHEN_MINTRAIL		(RID_EDIT_START + 71)
+#define RID_SVXITEMS_HYPHEN_MAX				(RID_EDIT_START + 72)
+#define RID_SVXITEMS_HNGPNCT_OFF			(RID_EDIT_START + 73)
+#define RID_SVXITEMS_HNGPNCT_ON				(RID_EDIT_START + 74)
+#define RID_SVXITEMS_FORBIDDEN_RULE_OFF 	(RID_EDIT_START + 75)
+#define RID_SVXITEMS_FORBIDDEN_RULE_ON 	    (RID_EDIT_START + 76)
+#define RID_SVXITEMS_SCRPTSPC_OFF			(RID_EDIT_START + 77)
+#define RID_SVXITEMS_SCRPTSPC_ON			(RID_EDIT_START + 78)
+#define RID_SVXITEMS_CHARSCALE_OFF			(RID_EDIT_START + 79)
+#define RID_SVXITEMS_CHARSCALE				(RID_EDIT_START + 80)
+#define RID_SVXITEMS_CHARROTATE_OFF			(RID_EDIT_START + 81)
+#define RID_SVXITEMS_CHARROTATE				(RID_EDIT_START + 82)
+#define RID_SVXITEMS_CHARROTATE_FITLINE		(RID_EDIT_START + 83)
+
+#define RID_SVXITEMS_RELIEF_BEGIN			(RID_EDIT_START + 85)
+#define RID_SVXITEMS_RELIEF_NONE			(RID_EDIT_START + 85)
+#define RID_SVXITEMS_RELIEF_EMBOSSED		(RID_EDIT_START + 86)
+#define RID_SVXITEMS_RELIEF_ENGRAVED		(RID_EDIT_START + 87)
+#define RID_SVXITEMS_RELIEF_END				(RID_EDIT_START + 88)
+
+// HM_ERR
+#define RID_SVXSTR_HMERR_THESAURUS          (RID_EDIT_START + 89)
+
+// enum FontEmphasisMark ---------------------------------------------------
+#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE	(RID_EDIT_START + 90)
+#define RID_SVXITEMS_EMPHASIS_NONE_STYLE	(RID_EDIT_START + 90)
+#define RID_SVXITEMS_EMPHASIS_DOT_STYLE		(RID_EDIT_START + 91)
+#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE	(RID_EDIT_START + 92)
+#define RID_SVXITEMS_EMPHASIS_DISC_STYLE	(RID_EDIT_START + 93)
+#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE	(RID_EDIT_START + 94)
+
+#define RID_SVXITEMS_EMPHASIS_ABOVE_POS		(RID_EDIT_START + 95)
+#define RID_SVXITEMS_EMPHASIS_BELOW_POS		(RID_EDIT_START + 96)
+
+// enum ESCAPEMENT -------------------------------------------------------
+#define RID_SVXITEMS_ESCAPEMENT_BEGIN		(RID_EDIT_START + 97)
+#define RID_SVXITEMS_ESCAPEMENT_OFF			(RID_EDIT_START + 97)
+#define RID_SVXITEMS_ESCAPEMENT_SUPER		(RID_EDIT_START + 98)
+#define RID_SVXITEMS_ESCAPEMENT_SUB			(RID_EDIT_START + 99)
+#define RID_SVXITEMS_ESCAPEMENT_AUTO		(RID_EDIT_START + 100)
+
+// enum CASEMAP ----------------------------------------------------------
+#define RID_SVXITEMS_CASEMAP_BEGIN			(RID_EDIT_START + 101)
+#define RID_SVXITEMS_CASEMAP_NONE			(RID_EDIT_START + 101)
+#define RID_SVXITEMS_CASEMAP_VERSALIEN		(RID_EDIT_START + 102)
+#define RID_SVXITEMS_CASEMAP_GEMEINE		(RID_EDIT_START + 103)
+#define RID_SVXITEMS_CASEMAP_TITEL			(RID_EDIT_START + 104)
+#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN	(RID_EDIT_START + 105)
+
+#define RID_SVXITEMS_KERNING_COMPLETE		(RID_EDIT_START + 106)
+#define RID_SVXITEMS_KERNING_EXPANDED		(RID_EDIT_START + 107)
+#define RID_SVXITEMS_KERNING_CONDENSED		(RID_EDIT_START + 108)
+
+#define RID_SVXITEMS_BLINK_TRUE				(RID_EDIT_START + 109)
+#define RID_SVXITEMS_BLINK_FALSE			(RID_EDIT_START + 110)
+
+#define RID_SVXITEMS_TWOLINES_OFF			(RID_EDIT_START + 111)
+#define RID_SVXITEMS_TWOLINES				(RID_EDIT_START + 112)
+
+// enum FontStrikeout ----------------------------------------------------
+#define RID_SVXITEMS_STRIKEOUT_BEGIN		(RID_EDIT_START + 113)
+#define RID_SVXITEMS_STRIKEOUT_NONE			(RID_EDIT_START + 113)
+#define RID_SVXITEMS_STRIKEOUT_SINGLE		(RID_EDIT_START + 114)
+#define RID_SVXITEMS_STRIKEOUT_DOUBLE		(RID_EDIT_START + 115)
+#define RID_SVXITEMS_STRIKEOUT_DONTKNOW		(RID_EDIT_START + 116)
+#define RID_SVXITEMS_STRIKEOUT_BOLD			(RID_EDIT_START + 117)
+#define RID_SVXITEMS_STRIKEOUT_SLASH		(RID_EDIT_START + 118)
+#define RID_SVXITEMS_STRIKEOUT_X			(RID_EDIT_START + 119)
+
+// enum FontUnderline - used for overline --------------------------------
+#define RID_SVXITEMS_OL_BEGIN				(RID_EDIT_START + 120)
+#define RID_SVXITEMS_OL_NONE				(RID_EDIT_START + 120)
+#define RID_SVXITEMS_OL_SINGLE				(RID_EDIT_START + 121)
+#define RID_SVXITEMS_OL_DOUBLE				(RID_EDIT_START + 122)
+#define RID_SVXITEMS_OL_DOTTED				(RID_EDIT_START + 123)
+#define RID_SVXITEMS_OL_DONTKNOW			(RID_EDIT_START + 124)
+#define RID_SVXITEMS_OL_DASH				(RID_EDIT_START + 125)
+#define RID_SVXITEMS_OL_LONGDASH			(RID_EDIT_START + 126)
+#define RID_SVXITEMS_OL_DASHDOT				(RID_EDIT_START + 127)
+#define RID_SVXITEMS_OL_DASHDOTDOT			(RID_EDIT_START + 128)
+#define RID_SVXITEMS_OL_SMALLWAVE			(RID_EDIT_START + 129)
+#define RID_SVXITEMS_OL_WAVE				(RID_EDIT_START + 130)
+#define RID_SVXITEMS_OL_DOUBLEWAVE			(RID_EDIT_START + 131)
+#define RID_SVXITEMS_OL_BOLD				(RID_EDIT_START + 132)
+#define RID_SVXITEMS_OL_BOLDDOTTED			(RID_EDIT_START + 133)
+#define RID_SVXITEMS_OL_BOLDDASH			(RID_EDIT_START + 134)
+#define RID_SVXITEMS_OL_BOLDLONGDASH		(RID_EDIT_START + 135)
+#define RID_SVXITEMS_OL_BOLDDASHDOT			(RID_EDIT_START + 136)
+#define RID_SVXITEMS_OL_BOLDDASHDOTDOT		(RID_EDIT_START + 137)
+#define RID_SVXITEMS_OL_BOLDWAVE			(RID_EDIT_START + 138)
+
+// enum FontUnderline - used for underline -------------------------------
+#define RID_SVXITEMS_UL_BEGIN				(RID_EDIT_START + 139)
+#define RID_SVXITEMS_UL_NONE				(RID_EDIT_START + 139)
+#define RID_SVXITEMS_UL_SINGLE				(RID_EDIT_START + 140)
+#define RID_SVXITEMS_UL_DOUBLE				(RID_EDIT_START + 141)
+#define RID_SVXITEMS_UL_DOTTED				(RID_EDIT_START + 142)
+#define RID_SVXITEMS_UL_DONTKNOW			(RID_EDIT_START + 143)
+#define RID_SVXITEMS_UL_DASH				(RID_EDIT_START + 144)
+#define RID_SVXITEMS_UL_LONGDASH			(RID_EDIT_START + 145)
+#define RID_SVXITEMS_UL_DASHDOT				(RID_EDIT_START + 146)
+#define RID_SVXITEMS_UL_DASHDOTDOT			(RID_EDIT_START + 147)
+#define RID_SVXITEMS_UL_SMALLWAVE			(RID_EDIT_START + 148)
+#define RID_SVXITEMS_UL_WAVE				(RID_EDIT_START + 149)
+#define RID_SVXITEMS_UL_DOUBLEWAVE			(RID_EDIT_START + 150)
+#define RID_SVXITEMS_UL_BOLD				(RID_EDIT_START + 151)
+#define RID_SVXITEMS_UL_BOLDDOTTED			(RID_EDIT_START + 152)
+#define RID_SVXITEMS_UL_BOLDDASH			(RID_EDIT_START + 153)
+#define RID_SVXITEMS_UL_BOLDLONGDASH		(RID_EDIT_START + 154)
+#define RID_SVXITEMS_UL_BOLDDASHDOT			(RID_EDIT_START + 155)
+#define RID_SVXITEMS_UL_BOLDDASHDOTDOT		(RID_EDIT_START + 156)
+#define RID_SVXITEMS_UL_BOLDWAVE			(RID_EDIT_START + 157)
+
+// enum FontWeight -------------------------------------------------------
+#define RID_SVXITEMS_WEIGHT_BEGIN			(RID_EDIT_START + 158)
+#define RID_SVXITEMS_WEIGHT_DONTKNOW		(RID_EDIT_START + 158)
+#define RID_SVXITEMS_WEIGHT_THIN			(RID_EDIT_START + 159)
+#define RID_SVXITEMS_WEIGHT_ULTRALIGHT		(RID_EDIT_START + 160)
+#define RID_SVXITEMS_WEIGHT_LIGHT			(RID_EDIT_START + 161)
+#define RID_SVXITEMS_WEIGHT_SEMILIGHT		(RID_EDIT_START + 162)
+#define RID_SVXITEMS_WEIGHT_NORMAL			(RID_EDIT_START + 163)
+#define RID_SVXITEMS_WEIGHT_MEDIUM			(RID_EDIT_START + 164)
+#define RID_SVXITEMS_WEIGHT_SEMIBOLD		(RID_EDIT_START + 165)
+#define RID_SVXITEMS_WEIGHT_BOLD			(RID_EDIT_START + 166)
+#define RID_SVXITEMS_WEIGHT_ULTRABOLD		(RID_EDIT_START + 167)
+#define RID_SVXITEMS_WEIGHT_BLACK			(RID_EDIT_START + 168)
+
+// paper formats
+#define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 169)
+#define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 170)	
+#define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 171)	
+#define RID_SVXSTR_PAPER_A3                 (RID_SVX_START + 172)	
+#define RID_SVXSTR_PAPER_A4                 (RID_SVX_START + 173)	
+#define RID_SVXSTR_PAPER_A5                 (RID_SVX_START + 174)	
+#define RID_SVXSTR_PAPER_B4_ISO             (RID_SVX_START + 175)	
+#define RID_SVXSTR_PAPER_B5_ISO             (RID_SVX_START + 176)	
+#define RID_SVXSTR_PAPER_LETTER             (RID_SVX_START + 177)	
+#define RID_SVXSTR_PAPER_LEGAL              (RID_SVX_START + 178)	
+#define RID_SVXSTR_PAPER_TABLOID            (RID_SVX_START + 179)	
+#define RID_SVXSTR_PAPER_USER               (RID_SVX_START + 180)	
+#define RID_SVXSTR_PAPER_B6_ISO             (RID_SVX_START + 181)	
+#define RID_SVXSTR_PAPER_C4                 (RID_SVX_START + 182)	
+#define RID_SVXSTR_PAPER_C5                 (RID_SVX_START + 183)	
+#define RID_SVXSTR_PAPER_C6                 (RID_SVX_START + 184)	
+#define RID_SVXSTR_PAPER_C65                (RID_SVX_START + 185)	
+#define RID_SVXSTR_PAPER_DL                 (RID_SVX_START + 186)	
+#define RID_SVXSTR_PAPER_DIA                (RID_SVX_START + 187)	
+#define RID_SVXSTR_PAPER_SCREEN             (RID_SVX_START + 188)	
+#define RID_SVXSTR_PAPER_C                  (RID_SVX_START + 189)	
+#define RID_SVXSTR_PAPER_D                  (RID_SVX_START + 190)	
+#define RID_SVXSTR_PAPER_E                  (RID_SVX_START + 191)	
+#define RID_SVXSTR_PAPER_EXECUTIVE          (RID_SVX_START + 192)	
+#define RID_SVXSTR_PAPER_LEGAL2				(RID_SVX_START + 193)	
+#define RID_SVXSTR_PAPER_MONARCH			(RID_SVX_START + 194)	
+#define RID_SVXSTR_PAPER_COM675				(RID_SVX_START + 195)	
+#define RID_SVXSTR_PAPER_COM9				(RID_SVX_START + 196)	
+#define RID_SVXSTR_PAPER_COM10				(RID_SVX_START + 197)	
+#define RID_SVXSTR_PAPER_COM11				(RID_SVX_START + 198)	
+#define RID_SVXSTR_PAPER_COM12				(RID_SVX_START + 199)	
+#define RID_SVXSTR_PAPER_KAI16				(RID_SVX_START + 200)	
+#define RID_SVXSTR_PAPER_KAI32				(RID_SVX_START + 201)	
+#define RID_SVXSTR_PAPER_KAI32BIG			(RID_SVX_START + 202)	
+#define RID_SVXSTR_PAPER_B4_JIS             (RID_SVX_START + 203)	
+#define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 204)	
+#define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 205)	
+
+// enum FontItalic -------------------------------------------------------
+#define RID_SVXITEMS_ITALIC_BEGIN			(RID_EDIT_START + 206)
+#define RID_SVXITEMS_ITALIC_NONE			(RID_EDIT_START + 206)
+#define RID_SVXITEMS_ITALIC_OBLIQUE			(RID_EDIT_START + 207)
+#define RID_SVXITEMS_ITALIC_NORMAL			(RID_EDIT_START + 208)
+
+// enum SvxAdjust -----------------------------------------------------------
+#define RID_SVXITEMS_ADJUST_BEGIN			(RID_EDIT_START + 209)
+#define RID_SVXITEMS_ADJUST_LEFT			(RID_EDIT_START + 209)
+#define RID_SVXITEMS_ADJUST_RIGHT			(RID_EDIT_START + 210)
+#define RID_SVXITEMS_ADJUST_BLOCK			(RID_EDIT_START + 211)
+#define RID_SVXITEMS_ADJUST_CENTER			(RID_EDIT_START + 212)
+#define RID_SVXITEMS_ADJUST_BLOCKLINE		(RID_EDIT_START + 213)
+
+#define RID_SVXITEMS_TAB_DECIMAL_CHAR		(RID_EDIT_START + 214)
+#define RID_SVXITEMS_TAB_FILL_CHAR			(RID_EDIT_START + 215)
+
+#define RID_SVXITEMS_TAB_ADJUST_BEGIN		(RID_EDIT_START + 217)
+#define RID_SVXITEMS_TAB_ADJUST_LEFT		(RID_EDIT_START + 217)
+#define RID_SVXITEMS_TAB_ADJUST_RIGHT		(RID_EDIT_START + 218)
+#define RID_SVXITEMS_TAB_ADJUST_DECIMAL		(RID_EDIT_START + 219)
+#define RID_SVXITEMS_TAB_ADJUST_CENTER		(RID_EDIT_START + 220)
+#define RID_SVXITEMS_TAB_ADJUST_DEFAULT		(RID_EDIT_START + 221)
+
+// enum SvxBreak ------------------------------------------------------------
+#define RID_SVXITEMS_BREAK_BEGIN			(RID_EDIT_START + 222)
+#define RID_SVXITEMS_BREAK_NONE				(RID_EDIT_START + 222)
+#define RID_SVXITEMS_BREAK_COLUMN_BEFORE	(RID_EDIT_START + 223)
+#define RID_SVXITEMS_BREAK_COLUMN_AFTER		(RID_EDIT_START + 224)
+#define RID_SVXITEMS_BREAK_COLUMN_BOTH		(RID_EDIT_START + 225)
+#define RID_SVXITEMS_BREAK_PAGE_BEFORE		(RID_EDIT_START + 226)
+#define RID_SVXITEMS_BREAK_PAGE_AFTER		(RID_EDIT_START + 227)
+#define RID_SVXITEMS_BREAK_PAGE_BOTH		(RID_EDIT_START + 228)
+
+// enum SvxShadowLocation ---------------------------------------------------
+#define RID_SVXITEMS_SHADOW_BEGIN			(RID_EDIT_START + 229)
+#define RID_SVXITEMS_SHADOW_NONE			(RID_EDIT_START + 229)
+#define RID_SVXITEMS_SHADOW_TOPLEFT			(RID_EDIT_START + 230)
+#define RID_SVXITEMS_SHADOW_TOPRIGHT		(RID_EDIT_START + 231)
+#define RID_SVXITEMS_SHADOW_BOTTOMLEFT		(RID_EDIT_START + 232)
+#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT		(RID_EDIT_START + 233)
+
+// Umrandungslinien
+#define RID_SINGLE_LINE0					(RID_EDIT_START + 234)
+#define RID_SINGLE_LINE1					(RID_EDIT_START + 235)
+#define RID_SINGLE_LINE2					(RID_EDIT_START + 236)
+#define RID_SINGLE_LINE3					(RID_EDIT_START + 237)
+#define RID_SINGLE_LINE4					(RID_EDIT_START + 238)
+#define RID_DOUBLE_LINE0					(RID_EDIT_START + 239)
+#define RID_DOUBLE_LINE1					(RID_EDIT_START + 240)
+#define RID_DOUBLE_LINE2					(RID_EDIT_START + 241)
+#define RID_DOUBLE_LINE3					(RID_EDIT_START + 242)
+#define RID_DOUBLE_LINE4					(RID_EDIT_START + 243)
+#define RID_DOUBLE_LINE5					(RID_EDIT_START + 244)
+#define RID_DOUBLE_LINE6					(RID_EDIT_START + 245)
+#define RID_DOUBLE_LINE7					(RID_EDIT_START + 246)
+#define RID_DOUBLE_LINE8					(RID_EDIT_START + 247)
+#define RID_DOUBLE_LINE9					(RID_EDIT_START + 248)
+#define RID_DOUBLE_LINE10					(RID_EDIT_START + 249)
+
+// Metric-Texte
+#define RID_SVXITEMS_METRIC_MM				(RID_EDIT_START + 250)
+#define RID_SVXITEMS_METRIC_CM				(RID_EDIT_START + 251)
+#define RID_SVXITEMS_METRIC_INCH			(RID_EDIT_START + 252)
+#define RID_SVXITEMS_METRIC_POINT			(RID_EDIT_START + 253)
+#define RID_SVXITEMS_METRIC_TWIP			(RID_EDIT_START + 254)
+#define RID_SVXITEMS_METRIC_PIXEL			(RID_EDIT_START + 255)
+
+// enum ColorName -----------------------------------------------------------
+#define RID_SVXITEMS_COLOR_BEGIN			(RID_EDIT_START + 256)
+#define RID_SVXITEMS_COLOR					(RID_EDIT_START + 256)
+#define RID_SVXITEMS_COLOR_BLACK			(RID_EDIT_START + 257)
+#define RID_SVXITEMS_COLOR_BLUE				(RID_EDIT_START + 258)
+#define RID_SVXITEMS_COLOR_GREEN			(RID_EDIT_START + 259)
+#define RID_SVXITEMS_COLOR_CYAN				(RID_EDIT_START + 260)
+#define RID_SVXITEMS_COLOR_RED				(RID_EDIT_START + 261)
+#define RID_SVXITEMS_COLOR_MAGENTA			(RID_EDIT_START + 262)
+#define RID_SVXITEMS_COLOR_BROWN			(RID_EDIT_START + 263)
+#define RID_SVXITEMS_COLOR_GRAY				(RID_EDIT_START + 264)
+#define RID_SVXITEMS_COLOR_LIGHTGRAY		(RID_EDIT_START + 265)
+#define RID_SVXITEMS_COLOR_LIGHTBLUE		(RID_EDIT_START + 266)
+#define RID_SVXITEMS_COLOR_LIGHTGREEN		(RID_EDIT_START + 267)
+#define RID_SVXITEMS_COLOR_LIGHTCYAN		(RID_EDIT_START + 268)
+#define RID_SVXITEMS_COLOR_LIGHTRED			(RID_EDIT_START + 269)
+#define RID_SVXITEMS_COLOR_LIGHTMAGENTA		(RID_EDIT_START + 270)
+#define RID_SVXITEMS_COLOR_YELLOW			(RID_EDIT_START + 271)
+#define RID_SVXITEMS_COLOR_WHITE			(RID_EDIT_START + 272)
+#define RID_SVXITEMS_COLOR_MENUBAR			(RID_EDIT_START + 273)
+#define RID_SVXITEMS_COLOR_MENUBARTEXT		(RID_EDIT_START + 274)
+#define RID_SVXITEMS_COLOR_POPUPMENU		(RID_EDIT_START + 275)
+#define RID_SVXITEMS_COLOR_POPUPMENUTEXT	(RID_EDIT_START + 276)
+#define RID_SVXITEMS_COLOR_WINDOWTEXT		(RID_EDIT_START + 277)
+#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE	(RID_EDIT_START + 278)
+#define RID_SVXITEMS_COLOR_HIGHLIGHT		(RID_EDIT_START + 279)
+#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT	(RID_EDIT_START + 280)
+#define RID_SVXITEMS_COLOR_3DTEXT			(RID_EDIT_START + 281)
+#define RID_SVXITEMS_COLOR_3DFACE			(RID_EDIT_START + 282)
+#define RID_SVXITEMS_COLOR_3DLIGHT			(RID_EDIT_START + 283)
+#define RID_SVXITEMS_COLOR_3DSHADOW			(RID_EDIT_START + 284)
+#define RID_SVXITEMS_COLOR_SCROLLBAR		(RID_EDIT_START + 285)
+#define RID_SVXITEMS_COLOR_FIELD			(RID_EDIT_START + 286)
+#define RID_SVXITEMS_COLOR_FIELDTEXT		(RID_EDIT_START + 287)
+
+
+#define RID_SVXITEMS_PARASNAPTOGRID_ON      (RID_EDIT_START + 288)
+#define RID_SVXITEMS_PARASNAPTOGRID_OFF     (RID_EDIT_START + 289)
+
+#define RID_SVXITEMS_PARAVERTALIGN_AUTO		(RID_EDIT_START + 290)
+#define RID_SVXITEMS_PARAVERTALIGN_BASELINE	(RID_EDIT_START + 291)
+#define RID_SVXITEMS_PARAVERTALIGN_TOP	 	(RID_EDIT_START + 292)
+#define RID_SVXITEMS_PARAVERTALIGN_CENTER	(RID_EDIT_START + 293)
+#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM	(RID_EDIT_START + 294)
+
+#define RID_SVXITEMS_CHARHIDDEN_FALSE       (RID_EDIT_START + 295)
+#define RID_SVXITEMS_CHARHIDDEN_TRUE        (RID_EDIT_START + 296)
+
+// strings for error messsages in dictionary updates
+#define RID_SVXSTR_DIC_ERR_UNKNOWN			(RID_EDIT_START + 297)
+#define RID_SVXSTR_DIC_ERR_FULL				(RID_EDIT_START + 298)
+#define RID_SVXSTR_DIC_ERR_READONLY			(RID_EDIT_START + 299)
+
+// ResIds fuer HM-QueryBoxen und Error-Strings
+#define RID_SVXQB_BW_CONTINUE               (RID_EDIT_START + 300)
+#define RID_SVXQB_CONTINUE                  (RID_EDIT_START + 301)
+
+// EditEngine
+#define RID_EDITUNDO_DEL					(RID_EDIT_START + 302)
+#define RID_EDITUNDO_MOVE					(RID_EDIT_START + 303)
+#define RID_EDITUNDO_INSERT					(RID_EDIT_START + 304)
+#define RID_EDITUNDO_REPLACE		 		(RID_EDIT_START + 305)
+#define RID_EDITUNDO_SETATTRIBS				(RID_EDIT_START + 306)
+#define RID_EDITUNDO_SETSTYLE				(RID_EDIT_START + 307)
+#define RID_EDITUNDO_RESETATTRIBS			(RID_EDIT_START + 308)
+#define RID_EDITUNDO_INDENT					(RID_EDIT_START + 309)
+#define RID_EDITUNDO_TRANSLITERATE			(RID_EDIT_START + 310)
+#define RID_MENU_SPELL						(RID_EDIT_START + 311)
+#define RID_STR_PARAGRAPH					(RID_EDIT_START + 312)
+#define RID_STR_WORD						(RID_EDIT_START + 313)
+#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION	(RID_EDIT_START + 314)
+#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME		(RID_EDIT_START + 315)
+
+#if 315 > (RID_EDIT_END-RID_EDIT_START)
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+
+
+#endif
+
+// ******************************************************************* EOF
+
diff --git a/svx/inc/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index a658509aad..230ace8bf3 100644
--- a/svx/inc/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editstat.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index df48708e34..dc2c81b831 100644
--- a/svx/inc/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editund2.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,12 +28,12 @@
 #ifndef _EDITUND2_HXX
 #define _EDITUND2_HXX
 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <svl/undo.hxx>
 
 class ImpEditEngine;
 
-class SVX_DLLPUBLIC EditUndoManager : public SfxUndoManager
+class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
 {
     using SfxUndoManager::Undo;
     using SfxUndoManager::Redo;
@@ -53,7 +50,7 @@ public:
 // -----------------------------------------------------------------------
 // EditUndo
 // ------------------------------------------------------------------------
-class SVX_DLLPUBLIC EditUndo : public SfxUndoAction
+class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
 {
 private:
     USHORT 			nId;
diff --git a/svx/inc/svx/editview.hxx b/editeng/inc/editeng/editview.hxx
index f0b47412ed..88dad95d99 100644
--- a/svx/inc/svx/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editview.hxx,v $
- * $Revision: 1.4.198.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,10 +57,10 @@ class Font;
 class FontList;
 
 #ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #endif
 #include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace com {
 namespace sun {
@@ -72,7 +69,7 @@ namespace datatransfer {
     class XTransferable;
 }}}}
 
-class SVX_DLLPUBLIC EditView
+class EDITENG_DLLPUBLIC EditView
 {
     friend class EditEngine;
     friend class ImpEditEngine;
@@ -85,8 +82,8 @@ public:	// brauche ich fuer Undo
 private:
     ImpEditView*	pImpEditView;
 
-                    SVX_DLLPRIVATE EditView( const EditView& );
-    SVX_DLLPRIVATE EditView&		operator=( const EditView& );
+                    EDITENG_DLLPRIVATE EditView( const EditView& );
+    EDITENG_DLLPRIVATE EditView&		operator=( const EditView& );
 
 public:
                     EditView( EditEngine* pEng, Window* pWindow );
@@ -244,7 +241,7 @@ public:
 
     static bool ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFontList );
 
-    String			GetSurroundingText() const;

+    String			GetSurroundingText() const;
     Selection		GetSurroundingTextSelection() const;
 };
 
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx
new file mode 100644
index 0000000000..08fd3f335d
--- /dev/null
+++ b/editeng/inc/editeng/edtdlg.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * 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
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 _EDT_ABSTDLG_HXX
+#define _EDT_ABSTDLG_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/solar.h>
+#include <tools/string.hxx>
+#include <editeng/editengdllapi.h>
+#include <i18npool/lang.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <vcl/abstdlg.hxx>
+#include <editeng/hangulhanja.hxx> 
+
+namespace com { namespace sun { namespace star { namespace linguistic2 
+{
+    class XThesaurus;
+    class XHyphenator;
+} } } }
+
+class Window;
+class ResId;
+class Link;
+class SvxSpellWrapper;
+
+class AbstractThesaurusDialog : public VclAbstractDialog
+{
+public:
+    virtual String		GetWord() = 0;
+    virtual sal_uInt16	GetLanguage() const = 0;
+    virtual Window*		GetWindow() = 0;
+};
+
+class AbstractHyphenWordDialog : public VclAbstractDialog
+{
+public:
+    virtual void	SelLeft() = 0;
+    virtual void	SelRight() = 0;
+    virtual Window*	GetWindow() = 0;
+};
+
+class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog
+{
+ public:
+    virtual void EnableRubySupport( sal_Bool _bVal ) = 0;
+     virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0;
+    virtual	void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0;
+     virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0;
+    virtual void	SetOptionsChangedHdl( const Link& _rHdl ) = 0;
+     virtual void	SetIgnoreHdl( const Link& _rHdl ) = 0;
+     virtual void	SetIgnoreAllHdl( const Link& _rHdl ) = 0;
+     virtual void	SetChangeHdl( const Link& _rHdl ) = 0;
+     virtual void	SetChangeAllHdl( const Link& _rHdl ) = 0;
+    virtual void	SetClickByCharacterHdl( const Link& _rHdl ) = 0;
+     virtual void	SetConversionFormatChangedHdl( const Link& _rHdl ) = 0;
+     virtual void	SetFindHdl( const Link& _rHdl ) = 0;
+    virtual sal_Bool		GetUseBothDirections( ) const= 0;
+    virtual editeng::HangulHanjaConversion::ConversionDirection    GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0;
+    virtual void	SetCurrentString(
+                    const String& _rNewString,
+                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
+                    bool _bOriginatesFromDocument = true )=0;
+    virtual String	GetCurrentString( ) const =0;
+    virtual editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const =0;
+    virtual void	FocusSuggestion( )= 0;
+    virtual String	GetCurrentSuggestion( ) const =0;
+};
+
+class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDialogFactory
+{
+public:
+                                        virtual ~EditAbstractDialogFactory();	// needed for export of vtable
+    static EditAbstractDialogFactory*	Create();
+    virtual AbstractThesaurusDialog*		CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
+                                                const String &rWord, sal_Int16 nLanguage ) = 0;
+
+    virtual AbstractHyphenWordDialog*		CreateHyphenWordDialog( Window*, 
+                                                const String &rWord, LanguageType nLang,
+                                                ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
+                                                SvxSpellWrapper* pWrapper ) = 0;
+    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
+                                            editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
+};
+
+#endif
+
diff --git a/svx/inc/svx/eedata.hxx b/editeng/inc/editeng/eedata.hxx
index 32634f95fe..dd6f89d61f 100644
--- a/svx/inc/svx/eedata.hxx
+++ b/editeng/inc/editeng/eedata.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: eedata.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/eeitem.hxx b/editeng/inc/editeng/eeitem.hxx
index e828c91d08..695ec8a8fb 100644
--- a/svx/inc/svx/eeitem.hxx
+++ b/editeng/inc/editeng/eeitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeitem.hxx,v $
- * $Revision: 1.3.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/eeitemid.hxx b/editeng/inc/editeng/eeitemid.hxx
index b66675eeb3..736fafd7fc 100644
--- a/svx/inc/svx/eeitemid.hxx
+++ b/editeng/inc/editeng/eeitemid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeitemid.hxx,v $
- * $Revision: 1.3.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef _EEITEMID_HXX
 #define _EEITEMID_HXX
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #ifdef ITEMID_FONT
 #undef ITEMID_FONT
diff --git a/svx/inc/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 511b7111fa..882bbd39ff 100644
--- a/svx/inc/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eerdll.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,9 @@ class GlobalEditData;
 
 #include <tools/resid.hxx>
 #include <tools/shl.hxx>
+#include <editeng/editengdllapi.h>
 
-class EditResId: public ResId
+class EDITENG_DLLPUBLIC EditResId: public ResId
 {
 public:
     EditResId( USHORT nId );
@@ -58,4 +56,6 @@ public:
 
 #define EE_DLL() EditDLL::Get()
 
+#define EE_RESSTR(x) String( EditResId(x) )
+
 #endif //_EERDLL_HXX
diff --git a/svx/inc/svx/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index 8d5c18b302..915320d797 100644
--- a/svx/inc/svx/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: emphitem.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,10 +31,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt die Font-Betonung.
 */
 
-class SVX_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index a75e157ef3..ecdc6e31da 100644
--- a/svx/inc/svx/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: escpitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -58,7 +52,7 @@ namespace rtl
     Dieses Item beschreibt die Schrift-Position.
 */
 
-class SVX_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface
 {
     short nEsc;
     BYTE  nProp;
diff --git a/svx/inc/svx/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index cc98e695ce..e4cbb86ef2 100644
--- a/svx/inc/svx/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fhgtitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -56,7 +50,7 @@ namespace rtl
 #define	FONTHEIGHT_16_VERSION	((USHORT)0x0001)
 #define	FONTHEIGHT_UNIT_VERSION	((USHORT)0x0002)
 
-class SVX_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
 {
     UINT32	nHeight;
     USHORT	nProp;				// default 100%
diff --git a/svx/inc/svx/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index 4e1f301aea..ee15fb3d4f 100644
--- a/svx/inc/svx/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flditem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <tools/date.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/pstm.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvNumberFormatter;
 class MetaAction;
@@ -44,7 +41,7 @@ class MetaAction;
 
 
 
-class SVX_DLLPUBLIC SvxFieldData : public SvPersistBase
+class EDITENG_DLLPUBLIC SvxFieldData : public SvPersistBase
 {
 public:
                             SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, 1 )
@@ -66,12 +63,12 @@ Das Feld gehoert dem Item.
 Das Feld selbst wird durch eine Ableitung von SvxFieldData bestimmt. (RTTI)
 */
 
-class SVX_DLLPUBLIC SvxFieldItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
 {
 private:
     SvxFieldData*			pField;
 
-                    SVX_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
+                    EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
 
 public:
             TYPEINFO();
@@ -123,7 +120,7 @@ enum SvxDateFormat {	SVXDATEFORMAT_APPDEFAULT, 	// Wie in App eingestellt
                         SVXDATEFORMAT_F		// Dienstag, 13.Februar 1996
                     };
 
-class SVX_DLLPUBLIC SvxDateField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateField : public SvxFieldData
 {
     sal_uInt32				nFixDate;
     SvxDateType				eType;
@@ -166,7 +163,7 @@ enum SvxURLFormat	{	SVXURLFORMAT_APPDEFAULT, 	// Wie in App eingestellt
                         SVXURLFORMAT_REPR			// Repraesentation darstellen
                     };
 
-class SVX_DLLPUBLIC SvxURLField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData
 {
 private:
     SvxURLFormat			eFormat;
@@ -198,7 +195,7 @@ public:
     virtual MetaAction* createBeginComment() const;
 };
 
-class SVX_DLLPUBLIC SvxPageField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD )
@@ -209,7 +206,7 @@ public:
     virtual MetaAction* createBeginComment() const;
 };
 
-class SVX_DLLPUBLIC SvxPagesField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD )
@@ -218,7 +215,7 @@ public:
     virtual int 			operator==( const SvxFieldData& ) const;
 };
 
-class SVX_DLLPUBLIC SvxTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD )
@@ -229,7 +226,7 @@ public:
     virtual MetaAction* createBeginComment() const;
 };
 
-class SVX_DLLPUBLIC SvxFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD )
@@ -238,7 +235,7 @@ public:
     virtual int 			operator==( const SvxFieldData& ) const;
 };
 
-class SVX_DLLPUBLIC SvxTableField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD )
@@ -263,7 +260,7 @@ enum SvxTimeFormat {	SVXTIMEFORMAT_APPDEFAULT, 	// Wie in App eingestellt
                         SVXTIMEFORMAT_AM_HMSH	// 01:49:38.78 PM
                     };
 
-class SVX_DLLPUBLIC SvxExtTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxExtTimeField : public SvxFieldData
 {
 private:
     sal_uInt32				nFixTime;
@@ -310,7 +307,7 @@ enum SvxFileFormat {	SVXFILEFORMAT_NAME_EXT,	// Dateiname mit Extension
 
 
 
-class SVX_DLLPUBLIC SvxExtFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData
 {
 private:
     XubString  				aFile;
@@ -347,7 +344,7 @@ enum SvxAuthorFormat {	SVXAUTHORFORMAT_FULLNAME,	// vollst„ndiger Name
                         SVXAUTHORFORMAT_SHORTNAME	// Initialen
                     };
 
-class SVX_DLLPUBLIC SvxAuthorField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData
 {
 private:
     XubString		aName;
@@ -389,7 +386,7 @@ public:
 
 /** this field is used as a placeholder for a header&footer in impress. The actual
     value is stored at the page */
-class SVX_DLLPUBLIC SvxHeaderField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD )
@@ -400,7 +397,7 @@ public:
 
 /** this field is used as a placeholder for a header&footer in impress. The actual
     value is stored at the page */
-class SVX_DLLPUBLIC SvxFooterField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD )
@@ -411,7 +408,7 @@ public:
 
 /** this field is used as a placeholder for a header&footer in impress. The actual
     value is stored at the page */
-class SVX_DLLPUBLIC SvxDateTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
diff --git a/svx/inc/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index fccbc48fb5..c16b8128bb 100644
--- a/svx/inc/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flstitem.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <svl/poolitem.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxFontListItem -------------------------------------------------
 
@@ -48,7 +45,7 @@ class FontList;
     Die Fontliste wird nicht kopiert und nicht geloescht!
 */
 
-class SVX_DLLPUBLIC SvxFontListItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontListItem : public SfxPoolItem
 {
 private:
     const FontList*                                 pFontList;
diff --git a/svx/inc/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index b83f593bb9..ed251fd519 100644
--- a/svx/inc/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontitem.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,10 +31,8 @@
 
 #include <svl/poolitem.hxx>
 #include <tools/string.hxx>
-#ifndef _FONT_HXX //autogen
 #include <vcl/font.hxx>
-#endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +47,7 @@ namespace rtl
     Dieses Item beschreibt einen Font.
 */
 
-class SVX_DLLPUBLIC SvxFontItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
 {
     String  aFamilyName;
     String  aStyleName;
@@ -115,7 +110,7 @@ public:
 
 };
 
-SVX_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian,
+EDITENG_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian,
                         SvxFontItem& rComplex );
 
 #endif // #ifndef _SVX_FONTITEM_HXX
diff --git a/svx/inc/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index f6b80e1401..07a3b37595 100644
--- a/svx/inc/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: forbiddencharacterstable.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,7 @@
 #include <vos/refernce.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace com {
 namespace sun {
@@ -55,7 +52,7 @@ struct ForbiddenCharactersInfo
 
 DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
 
-class SVX_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
+class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
 {
 private:	
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index e50298f551..afc86474a3 100644
--- a/svx/inc/svx/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: forbiddenruleitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxForbiddenRuleItem -----------------------------------------
 
@@ -45,7 +39,7 @@
     This item describe how to handle the last character of a line.
 */
 
-class SVX_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/frmdir.hxx b/editeng/inc/editeng/frmdir.hxx
index 81c7a130a0..7831ab84ae 100644
--- a/svx/inc/svx/frmdir.hxx
+++ b/editeng/inc/editeng/frmdir.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmdir.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index 70df9f75d5..fe46b5c21b 100644
--- a/svx/inc/svx/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmdiritem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#include <svx/frmdir.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/frmdir.hxx>
+#include <editeng/editengdllapi.h>
 
 // class SvxFrameDirectionItem ----------------------------------------------
 
@@ -48,7 +42,7 @@
     layout text for Western, CJK and CTL languages.
 */
 
-class SVX_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 12a4662222..d8dfecaf30 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwdtitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index 30466f8c37..8843133034 100644
--- a/svx/inc/svx/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hangulhanja.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,14 @@
 #define SVX_HANGUL_HANJA_CONVERSION_HXX
 
 #include <vcl/window.hxx>
-#include <svx/svxenum.hxx>
-
 #include <memory>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 //.............................................................................
-namespace svx
+namespace editeng
 {
 //.............................................................................
 
@@ -62,7 +57,7 @@ namespace svx
             single Hangul syllabills when "replace by character" is enabled.
         </p>
     */
-    class SVX_DLLPUBLIC HangulHanjaConversion
+    class EDITENG_DLLPUBLIC HangulHanjaConversion
     {
         friend class HangulHanjaConversion_Impl;
 
diff --git a/svx/inc/svx/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index 770fafb8a1..fe56817bc8 100644
--- a/svx/inc/svx/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hngpnctitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxHangingPunctuationItem -----------------------------------------
 
@@ -45,7 +39,7 @@
     This item describe how to handle the last character of a line.
 */
 
-class SVX_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index 97fffef06e..2ae3ffcf93 100644
--- a/svx/inc/svx/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyznitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ Dieses Item beschreibt ein Silbentrennungsattribut (Automatisch?, Anzahl der
 Zeichen am Zeilenende und -anfang).
 */
 
-class SVX_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
 {
     BOOL bHyphen:  1;
     BOOL bPageEnd: 1;
diff --git a/svx/inc/svx/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index 321e53fdbe..eca02c7684 100644
--- a/svx/inc/svx/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemtype.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,18 +29,16 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
 
 // forward ---------------------------------------------------------------
 #include <tools/string.hxx>
 #include <tools/resid.hxx>
 #include <tools/bigint.hxx>
-#include <svx/dialmgr.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/shl.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class Color;
 class XColorTable;
@@ -53,19 +48,16 @@ class IntlWrapper;
 static const sal_Unicode cDelim = ',';
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-SVX_DLLPUBLIC String GetSvxString( USHORT nId );
-SVX_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
-#ifndef SVX_LIGHT
+EDITENG_DLLPUBLIC String GetSvxString( USHORT nId );
+EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
 String GetColorString( const Color& rCol );
-#endif
-SVX_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
+EDITENG_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
 
 // -----------------------------------------------------------------------
 
 inline String GetBoolString( BOOL bVal )
 {
-    return String( ResId( bVal ? RID_SVXITEMS_TRUE
-                               : RID_SVXITEMS_FALSE, DIALOG_MGR() ) );
+    return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/inc/svx/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index 19f6b17f9a..c95944a2c9 100644
--- a/svx/inc/svx/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keepitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -50,7 +44,7 @@ namespace rtl
 Dieses Item beschreibt eine logische Variable "Absaetze zusammenhalten?".
 */
 
-class SVX_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index dc4d43c9f0..1766c7ba8f 100644
--- a/svx/inc/svx/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kernitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -54,7 +48,7 @@ namespace rtl
     Dieses Item beschreibt die Schrift-Laufweite.
 */
 
-class SVX_DLLPUBLIC SvxKerningItem : public SfxInt16Item
+class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index 1513c15e2b..da70a1d9e6 100644
--- a/svx/inc/svx/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langitem.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,10 +31,7 @@
 
 #include <svl/eitem.hxx>
 #include <i18npool/lang.h>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt eine Sprache.
 */
 
-class SVX_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 1530e2a133..468a003c10 100644
--- a/svx/inc/svx/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lcolitem.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,16 +29,15 @@
 
 // include ---------------------------------------------------------------
 
-#include <svx/colritem.hxx>
-#include <svx/svxids.hrc>
-#include "svx/svxdllapi.h"
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
 
 /*
  * dummy-Item fuer ToolBox-Controller:
  *
  */
 
-class SVX_DLLPUBLIC SvxLineColorItem : public SvxColorItem
+class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 57ee9cb29c..7f5dbfc1dd 100644
--- a/svx/inc/svx/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lrspitem.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -69,7 +63,7 @@ SetTxtLeft SetTxtFirst GetLeft  GetTxtLeft  GetTxtFirst  (Was?)
 #define	LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003)
 #define	LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004)
 
-class SVX_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
 {
     short	nFirstLineOfst;     // Erstzeileneinzug _immer_ relativ zu nTxtLeft
     long	nTxtLeft;           // wir spendieren einen USHORT
diff --git a/svx/inc/svx/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index 5723dd113e..659e61864e 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lspcitem.hxx,v $
- * $Revision: 1.4.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,12 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -54,7 +47,7 @@ Dieses Item beschreibt den Abstand zwischen den Zeilen.
 */
 
 #define LINE_SPACE_DEFAULT_HEIGHT 200
-class SVX_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
 {
     friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream
 
diff --git a/editeng/inc/editeng/measfld.hxx b/editeng/inc/editeng/measfld.hxx
new file mode 100644
index 0000000000..f78485e920
--- /dev/null
+++ b/editeng/inc/editeng/measfld.hxx
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * 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 _EDIT_MEASFIELD_HXX
+#define _EDIT_MEASFIELD_HXX
+
+#include <editeng/eeitem.hxx>
+
+#ifndef _FLDITEM_HXX
+#ifndef ITEMID_FIELD
+#ifndef _EDITDATA_HXX
+#include <editeng/editdata.hxx>  /* das include wird wg. EE_FEATURE_FIELD benoetigt */
+#endif
+#define ITEMID_FIELD EE_FEATURE_FIELD  /* wird fuer #include <editeng/flditem.hxx> benoetigt */
+#endif
+#include <editeng/flditem.hxx>
+#endif
+#include "editeng/editengdllapi.h"
+
+#define SDR_MEASUREFIELD 50
+
+class SdrMeasureObj;
+
+enum SdrMeasureFieldKind {SDRMEASUREFIELD_VALUE,SDRMEASUREFIELD_UNIT,SDRMEASUREFIELD_ROTA90BLANCS};
+
+class EDITENG_DLLPUBLIC SdrMeasureField: public SvxFieldData {
+    SdrMeasureFieldKind eMeasureFieldKind;
+public:
+    SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,SDR_MEASUREFIELD)
+    SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {}
+    SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {}
+    virtual ~SdrMeasureField();
+    virtual SvxFieldData* Clone() const;
+    virtual int operator==(const SvxFieldData&) const;
+    SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; }
+    void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; }
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#endif //_SVDFIELD_HXX
+
diff --git a/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc
new file mode 100644
index 0000000000..0eaff89bbe
--- /dev/null
+++ b/editeng/inc/editeng/memberids.hrc
@@ -0,0 +1,196 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unomid.hxx,v $
+ * $Revision: 1.3.212.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.
+ *
+ ************************************************************************/
+#ifndef _EDT_UNOMID_HXX
+#define _EDT_UNOMID_HXX
+
+#include <svl/memberid.hrc>
+
+#define MID_LOCATION            0x3c
+#define MID_TRANSPARENT         0x4b
+#define MID_BG_COLOR            0x22
+#define MID_FLAGS               0x2e
+#define MID_DISTANCE            0x29
+#define MID_FG_COLOR            0x2c
+#define MID_OUTER_WIDTH         0x41
+#define MID_INNER_WIDTH         0x35
+#define MID_LINESPACE           0x3b
+
+//NameOrIndex
+#define MID_NAME				16
+#define MID_GRAFURL				32
+
+// SvxPageModelItem
+#define MID_AUTO                1
+
+// SvxTabStop
+#define MID_TABSTOPS            0
+#define MID_STD_TAB             1
+
+//SvxHyphenZoneItem
+#define MID_IS_HYPHEN	      	0
+#define MID_HYPHEN_MIN_LEAD     1
+#define MID_HYPHEN_MIN_TRAIL    2
+#define MID_HYPHEN_MAX_HYPHENS  3
+
+// SvxBoxInfoItem
+#define MID_HORIZONTAL          1
+#define MID_VERTICAL            2
+#define MID_VALIDFLAGS          4
+
+//AdjustItem
+#define MID_PARA_ADJUST			0
+#define MID_LAST_LINE_ADJUST    1
+#define MID_EXPAND_SINGLE       2
+
+//SvxFontItem
+// Don't use 0 as it used for the whole struct
+#define MID_FONT_FAMILY_NAME 	1
+#define MID_FONT_STYLE_NAME     2
+#define MID_FONT_FAMILY         3
+#define MID_FONT_CHAR_SET       4
+#define MID_FONT_PITCH          5
+
+// SvxCharReliefItem
+#define MID_RELIEF				0
+
+//SvxCharRotateItem
+#define MID_ROTATE				0
+#define MID_FITTOLINE			1
+
+//SvxExcapementItem
+#define MID_ESC			 0
+#define MID_ESC_HEIGHT   1
+#define MID_AUTO_ESC     2
+
+//SvxFontWidthItem
+#define MID_FONTWIDTH     	0
+#define MID_FONTWIDTH_PROP  1
+
+//SvxFontHeightItem
+#define MID_FONTHEIGHT     	1
+#define MID_FONTHEIGHT_PROP 2
+#define MID_FONTHEIGHT_DIFF 3
+
+//SvxTextLineItem
+#define MID_TEXTLINED		0
+#define MID_TL_STYLE		1
+#define MID_TL_COLOR		2
+#define MID_TL_HASCOLOR		3
+
+//SvxCrossedOutItem
+#define MID_CROSSED_OUT		0
+#define MID_CROSS_OUT       1
+
+//SvxPostureItem
+#define MID_ITALIC          0
+#define MID_POSTURE         1
+
+//SvxBoolItem
+#define MID_BOLD			0
+#define MID_WEIGHT          1
+
+//SvxLanguageItem
+#define MID_LANG_INT			0
+#define MID_LANG_LOCALE			1
+
+//SvxEmphasisMarkItem
+#define MID_EMPHASIS			0
+
+//SvxTwoLinesItem
+#define MID_TWOLINES			0
+#define MID_START_BRACKET 		1
+#define MID_END_BRACKET 		2
+
+//ULSpaceItem
+#define MID_UL_MARGIN		1
+#define MID_UL_REL_MARGIN	2
+#define MID_UP_MARGIN		3
+#define MID_LO_MARGIN		4
+#define MID_UP_REL_MARGIN	5
+#define MID_LO_REL_MARGIN	6
+
+//LRSpaceItem
+#define MID_LR_MARGIN		0
+#define MID_LRP_MARGIN  	1
+#define MID_LR_REL_MARGIN	2
+#define MID_LRP_REL_MARGIN  3
+#define MID_L_MARGIN		4
+#define MID_R_MARGIN		5
+#define MID_L_REL_MARGIN	6
+#define MID_R_REL_MARGIN	7
+#define MID_FIRST_LINE_INDENT	 	8
+#define MID_FIRST_LINE_REL_INDENT   9
+#define MID_FIRST_AUTO				10
+#define MID_TXT_LMARGIN 			11
+
+//ProtectItem
+#define MID_PROTECT_CONTENT		0
+#define MID_PROTECT_SIZE        1
+#define MID_PROTECT_POSITION    2
+
+//SvxBoxItem
+#define LEFT_BORDER  			1
+#define RIGHT_BORDER            2
+#define TOP_BORDER              3
+#define BOTTOM_BORDER           4
+#define BORDER_DISTANCE         5
+#define LEFT_BORDER_DISTANCE    6
+#define RIGHT_BORDER_DISTANCE   7
+#define TOP_BORDER_DISTANCE     8
+#define BOTTOM_BORDER_DISTANCE  9
+#define MID_LEFT_BORDER             10
+#define MID_RIGHT_BORDER            11
+#define MID_TOP_BORDER              12
+#define MID_BOTTOM_BORDER           13
+
+//BrushItem
+#define MID_BACK_COLOR			0
+#define MID_GRAPHIC_POSITION    1
+#define MID_GRAPHIC_LINK        2
+#define MID_GRAPHIC             3
+#define MID_GRAPHIC_TRANSPARENT 4
+#define MID_GRAPHIC_URL        	5
+#define MID_GRAPHIC_FILTER     	6
+#define MID_GRAPHIC_REPEAT     	7
+#define MID_GRAPHIC_TRANSPARENCY 8
+#define MID_BACK_COLOR_R_G_B    9
+#define MID_BACK_COLOR_TRANSPARENCY 10
+
+//SvxFmtBreakItem
+#define MID_BREAK_BEFORE		0
+#define MID_BREAK_AFTER			1
+
+//SvxCaseMapItem
+#define MID_CASEMAP_VARIANT		0
+#define MID_CASEMAP_TRANS		1
+
+
+
+#endif
diff --git a/svx/inc/svx/mutxhelp.hxx b/editeng/inc/editeng/mutxhelp.hxx
index c3a169f17b..73c4690850 100644
--- a/svx/inc/svx/mutxhelp.hxx
+++ b/editeng/inc/editeng/mutxhelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mutxhelp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index 6d97d9cab8..fbc9697887 100644
--- a/svx/inc/svx/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nhypitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxNoHyphenItem -------------------------------------------------
 
@@ -45,7 +39,7 @@
     PB: ???
 */
 
-class SVX_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index 3b01a4c374..391819eb6f 100644
--- a/svx/inc/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nlbkitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxNoLinebreakItem ----------------------------------------------
 
@@ -44,7 +41,7 @@
     PB: ???
 */
 
-class SVX_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/numdef.hxx b/editeng/inc/editeng/numdef.hxx
index 5807940d18..c2a7e3915b 100644
--- a/svx/inc/svx/numdef.hxx
+++ b/editeng/inc/editeng/numdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numdef.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 5b01d7a9e3..48d91bb83e 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numitem.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,20 +32,16 @@
 #include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <svl/poolitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <tools/gen.hxx>
-#ifndef _SVX_NUMDEF_HXX //autogen
-#include <svx/numdef.hxx>
-#endif
-#ifndef _SV_COLOR_HXX //autogen
+#include <editeng/numdef.hxx>
 #include <tools/color.hxx>
-#endif
 #include <cppuhelper/weakref.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <unotools/fontcvt.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvxBrushItem;
 class Font;
@@ -77,7 +70,7 @@ namespace com{namespace sun{ namespace star{
 #define SVX_NO_NUMLEVEL         0x20
 
 #define LINK_TOKEN 	0x80 //indicate linked bitmaps - for use in dialog only
-class SVX_DLLPUBLIC SvxNumberType
+class EDITENG_DLLPUBLIC SvxNumberType
 {
     static sal_Int32 nRefCount;
     static com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter;
@@ -107,7 +100,7 @@ public:
                     }
 };
 
-class SVX_DLLPUBLIC SvxNumberFormat : public SvxNumberType
+class EDITENG_DLLPUBLIC SvxNumberFormat : public SvxNumberType
 {
 public:
     // --> OD 2008-01-08 #newlistlevelattrs#
@@ -272,7 +265,7 @@ enum SvxNumRuleType
     SVX_RULETYPE_END
 };
 
-class SVX_DLLPUBLIC SvxNumRule
+class EDITENG_DLLPUBLIC SvxNumRule
 {
     USHORT 				nLevelCount;            // Anzahl der unterstuetzten Levels
     ULONG 				nFeatureFlags;          // was wird unterstuetzt?
@@ -331,7 +324,7 @@ public:
 /* -----------------27.10.98 13:04-------------------
  *
  * --------------------------------------------------*/
-class SVX_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
 {
     SvxNumRule* 			pNumRule;
 public:
diff --git a/svx/inc/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index 2d8241db3b..e302c9b9de 100644
--- a/svx/inc/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opaqitem.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -49,7 +46,7 @@ namespace rtl
 Dieses Item beschreibt eine logische Variable "Undurchsichtig ja oder nein".
 */
 
-class SVX_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/optitems.hxx b/editeng/inc/editeng/optitems.hxx
index 0d55fa4638..8776693516 100644
--- a/svx/inc/optitems.hxx
+++ b/editeng/inc/editeng/optitems.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optitems.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,20 +24,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_OPTITEMS_HXX
-#define _SVX_OPTITEMS_HXX
+#ifndef _EDITENG_OPTITEMS_HXX
+#define _EDITENG_OPTITEMS_HXX
 
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // forward ---------------------------------------------------------------
-namespace com{namespace sun{namespace star{
-namespace beans{
-//	class XPropertySet;
-}
+namespace com { namespace sun { namespace star { 
 namespace linguistic2{
     class XSpellChecker1;
 }}}}
@@ -48,9 +42,7 @@ namespace linguistic2{
 
 // class SfxSpellCheckItem -----------------------------------------------
 
-
-
-class SVX_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem
 {
 public:
     TYPEINFO();
@@ -80,9 +72,7 @@ private:
 
 // class SfxHyphenRegionItem ---------------------------------------------
 
-
-
-class SVX_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem
 {
     sal_uInt8 nMinLead;
     sal_uInt8 nMinTrail;
@@ -117,7 +107,5 @@ public:
     }
 };
 
-
-
 #endif
 
diff --git a/svx/inc/svx/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index b3a284f068..cf05974672 100644
--- a/svx/inc/svx/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orphitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,16 +30,13 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
 {
     class OUString;
 }
-#include "svx/svxdllapi.h"
 
 // class SvxOrphansItem --------------------------------------------------
 
@@ -51,7 +45,7 @@ namespace rtl
 Dieses Item beschreibt die Anzahl der Zeilen fuer die Schusterjungenregelung.
 */
 
-class SVX_DLLPUBLIC SvxOrphansItem: public SfxByteItem
+class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
 {
     friend SvStream & operator<<( SvStream & aS, SvxOrphansItem & );
 public:
diff --git a/svx/inc/svx/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index b93f930529..8efc42288d 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outliner.hxx,v $
- * $Revision: 1.6.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,16 +33,16 @@
 
 #include <svl/brdcst.hxx>
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
 #include <vcl/graph.hxx>
 #include <tools/list.hxx>
 #include <tools/link.hxx>
 #include <rsc/rscsfx.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 #include <tools/rtti.hxx>	// wegen typedef TypeId
 #include <vector>
@@ -84,9 +81,9 @@ class SvxForbiddenCharactersTable;
 #include <com/sun/star/uno/Reference.h>
 
 #include <vos/ref.hxx>
-#include <svx/svxfont.hxx>
-#include <svx/eedata.hxx>
-#include <svx/paragraphdata.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/eedata.hxx>
+#include <editeng/paragraphdata.hxx>
 
 class SvxFieldData;
 //////////////////////////////////////////////////////////////////////////////
@@ -186,7 +183,7 @@ inline void ParaRange::Adjust()
 
 #define OL_ROOTPARENT (Paragraph*)NULL
 
-class SVX_DLLPUBLIC OutlinerView
+class EDITENG_DLLPUBLIC OutlinerView
 {
     friend class Outliner;
 
@@ -228,28 +225,28 @@ private:
 
 #ifdef _OUTLINER_CXX
 
-    SVX_DLLPRIVATE void 		ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
-
-    SVX_DLLPRIVATE ULONG       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
-    SVX_DLLPRIVATE void        ImpToggleExpand( Paragraph* pParentPara );
-    SVX_DLLPRIVATE ParaRange	ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
-    SVX_DLLPRIVATE void        ImpHideDDCursor();
-    SVX_DLLPRIVATE void        ImpShowDDCursor();
-    SVX_DLLPRIVATE void        ImpPaintDDCursor();
-
-    SVX_DLLPRIVATE void        ImpDragScroll( const Point& rPosPix );
-    SVX_DLLPRIVATE void        ImpScrollLeft();
-    SVX_DLLPRIVATE void        ImpScrollRight();
-    SVX_DLLPRIVATE void        ImpScrollUp();
-    SVX_DLLPRIVATE void        ImpScrollDown();
-
-    SVX_DLLPRIVATE ULONG       ImpGetInsertionPara( const Point& rPosPixel );
-    SVX_DLLPRIVATE Point       ImpGetDocPos( const Point& rPosPixel );
-    SVX_DLLPRIVATE Pointer     ImpGetMousePointer( MouseTarget eTarget );
-    SVX_DLLPRIVATE USHORT      ImpInitPaste( ULONG& rStart );
-    SVX_DLLPRIVATE void        ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
-    SVX_DLLPRIVATE USHORT      ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
-    SVX_DLLPRIVATE BOOL        ImpIsIndentingPages();
+    EDITENG_DLLPRIVATE void 		ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
+
+    EDITENG_DLLPRIVATE ULONG       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
+    EDITENG_DLLPRIVATE void        ImpToggleExpand( Paragraph* pParentPara );
+    EDITENG_DLLPRIVATE ParaRange	ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
+    EDITENG_DLLPRIVATE void        ImpHideDDCursor();
+    EDITENG_DLLPRIVATE void        ImpShowDDCursor();
+    EDITENG_DLLPRIVATE void        ImpPaintDDCursor();
+
+    EDITENG_DLLPRIVATE void        ImpDragScroll( const Point& rPosPix );
+    EDITENG_DLLPRIVATE void        ImpScrollLeft();
+    EDITENG_DLLPRIVATE void        ImpScrollRight();
+    EDITENG_DLLPRIVATE void        ImpScrollUp();
+    EDITENG_DLLPRIVATE void        ImpScrollDown();
+
+    EDITENG_DLLPRIVATE ULONG       ImpGetInsertionPara( const Point& rPosPixel );
+    EDITENG_DLLPRIVATE Point       ImpGetDocPos( const Point& rPosPixel );
+    EDITENG_DLLPRIVATE Pointer     ImpGetMousePointer( MouseTarget eTarget );
+    EDITENG_DLLPRIVATE USHORT      ImpInitPaste( ULONG& rStart );
+    EDITENG_DLLPRIVATE void        ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
+    EDITENG_DLLPRIVATE USHORT      ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
+    EDITENG_DLLPRIVATE BOOL        ImpIsIndentingPages();
 
 #endif
 
@@ -388,7 +385,7 @@ public:
     void		SetInvalidateMore( USHORT nPixel );
     USHORT		GetInvalidateMore() const;
 
-    String		GetSurroundingText() const;

+    String		GetSurroundingText() const;
      Selection	GetSurroundingTextSelection() const;
 };
 
@@ -398,7 +395,7 @@ DECLARE_LIST(ViewList,OutlinerView*)
 //typedef List ViewList;
 //#endif
 
-class SVX_DLLPUBLIC DrawPortionInfo
+class EDITENG_DLLPUBLIC DrawPortionInfo
 {
 public:
     const Point&        mrStartPos;
@@ -465,7 +462,7 @@ public:
     {}
 };
 
-class SVX_DLLPUBLIC DrawBulletInfo
+class EDITENG_DLLPUBLIC DrawBulletInfo
 {
 public:
     const GraphicObject maBulletGraphicObject;
@@ -482,7 +479,7 @@ public:
     {}
 };
 
-struct SVX_DLLPUBLIC PaintFirstLineInfo
+struct EDITENG_DLLPUBLIC PaintFirstLineInfo
 {
     USHORT mnPara;
     const Point& mrStartPos;
@@ -585,7 +582,7 @@ struct EBulletInfo
 #define OUTLINERMODE_SUBTITLE		(0x0100|OUTLINERMODE_TEXTOBJECT)
 #define OUTLINERMODE_NOTE			(0x0200|OUTLINERMODE_TEXTOBJECT)
 
-class SVX_DLLPUBLIC Outliner : public SfxBroadcaster
+class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
 {
     friend class OutlinerView;
     friend class OutlinerEditEng;
diff --git a/svx/inc/svx/outlobj.hxx b/editeng/inc/editeng/outlobj.hxx
index 470f173d41..0666af5141 100644
--- a/svx/inc/svx/outlobj.hxx
+++ b/editeng/inc/editeng/outlobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlobj.hxx,v $
- * $Revision: 1.5.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,15 +33,15 @@
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <rsc/rscsfx.hxx>
-#include <svx/paragraphdata.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/paragraphdata.hxx>
+#include "editeng/editengdllapi.h"
 
 class EditTextObject;
 class ImplOutlinerParaObject;
 
 //////////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC OutlinerParaObject
+class EDITENG_DLLPUBLIC OutlinerParaObject
 {
 private:
     ImplOutlinerParaObject*        mpImplOutlinerParaObject;
diff --git a/svx/inc/svx/paperinf.hxx b/editeng/inc/editeng/paperinf.hxx
index f875fb5e62..c58ba9c37a 100644
--- a/svx/inc/svx/paperinf.hxx
+++ b/editeng/inc/editeng/paperinf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paperinf.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,8 @@
 
 #include <vcl/print.hxx>
 #include <vcl/mapmod.hxx>
-#include <svx/svxenum.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include "editeng/editengdllapi.h"
 
 // forward ---------------------------------------------------------------
 
@@ -45,7 +42,7 @@ class String;
 
 // class SvxPaperInfo -----------------------------------------------------
 
-class SVX_DLLPUBLIC SvxPaperInfo
+class EDITENG_DLLPUBLIC SvxPaperInfo
 {
 public:
     static Size     GetDefaultPaperSize( MapUnit eUnit = MAP_TWIP );
diff --git a/svx/inc/svx/paragraphdata.hxx b/editeng/inc/editeng/paragraphdata.hxx
index c998cc6291..c1ba59cf65 100644
--- a/svx/inc/svx/paragraphdata.hxx
+++ b/editeng/inc/editeng/paragraphdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlobj.hxx,v $
- * $Revision: 1.5.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index a8455819e2..119532fd57 100644
--- a/svx/inc/svx/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paravertalignitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxParaVertAlignItem ----------------------------------------------
 
@@ -47,7 +41,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
 {
 public:
     enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM };
diff --git a/svx/inc/svx/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index f9b1caa8da..94b50d595e 100644
--- a/svx/inc/svx/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pbinitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // define ----------------------------------------------------------------
 
@@ -49,7 +43,7 @@
     Dieses Item beschreibt die Auswahl eines Papierschachts des Drucker.
 */
 
-class SVX_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
+class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index c6871a7e16..96d6cbb290 100644
--- a/svx/inc/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pgrditem.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 ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxParaGridItem -------------------------------------------------
 
@@ -43,7 +40,7 @@
     Paragraph snap to grid
 */
 
-class SVX_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index b05cf29646..1bcc2b5b6f 100644
--- a/svx/inc/svx/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pmdlitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/stritem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxPageModelItem ------------------------------------------------
 
@@ -45,7 +39,7 @@
 Dieses Item enthaelt einen Namen einer Seitenvorlage.
 */
 
-class SVX_DLLPUBLIC SvxPageModelItem : public SfxStringItem
+class EDITENG_DLLPUBLIC SvxPageModelItem : public SfxStringItem
 {
 private:
     BOOL bAuto;
diff --git a/svx/inc/svx/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index d5ccefd748..03fe0152ca 100644
--- a/svx/inc/svx/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postitem.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,10 +31,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt die Font-Stellung (Italic)
 */
 
-class SVX_DLLPUBLIC SvxPostureItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index ab94837ffe..430c11726e 100644
--- a/svx/inc/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prntitem.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 
@@ -46,7 +43,7 @@ Dieses Item beschreibt eine logische Variable "Drucken ja oder nein".
 */
 
 
-class SVX_DLLPUBLIC SvxPrintItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index 4a9b3e3765..a69643a096 100644
--- a/svx/inc/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protitem.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +48,7 @@ Dieses Item beschreibt, ob Inhalt, Groesse oder Position geschuetzt werden
 sollen.
 */
 
-class SVX_DLLPUBLIC SvxProtectItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem
 {
     BOOL bCntnt :1;     //Inhalt geschuetzt
     BOOL bSize  :1;     //Groesse geschuetzt
diff --git a/svx/inc/svx/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index 6e6acff2a9..8d9751699f 100644
--- a/svx/inc/svx/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prszitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxPropSizeItem -------------------------------------------------
 
@@ -45,7 +39,7 @@
     Dieses Item beschreibt die relative Schriftgroesse.
 */
 
-class SVX_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index a6966ed089..175759b277 100644
--- a/svx/inc/svx/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scriptspaceitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxScriptSpaceItem ----------------------------------------------
 
@@ -46,7 +40,7 @@
     used for the user interface.
 */
 
-class SVX_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx
index 58c7f8a943..3231861d54 100644
--- a/svx/inc/svx/scripttypeitem.hxx
+++ b/editeng/inc/editeng/scripttypeitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scripttypeitem.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,11 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
 #include <svl/languageoptions.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxScriptTypeItem ----------------------------------------------
 
@@ -47,11 +41,11 @@
     used for the user interface.
 */
 
-SVX_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
+EDITENG_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
 USHORT GetItemScriptType( short nI18NType );
 short  GetI18NScriptType( USHORT nItemType );
 
-class SvxScriptTypeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
@@ -61,7 +55,7 @@ public:
 
 };
 
-class SVX_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
+class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 323e4a06fc..0f231ac0d7 100644
--- a/svx/inc/svx/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shaditem.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,11 +31,8 @@
 
 #include <tools/color.hxx>
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -57,7 +51,7 @@ namespace rtl
 #define SHADOW_LEFT		((USHORT)2)
 #define SHADOW_RIGHT	((USHORT)3)
 
-class SVX_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
 {
     Color 				aShadowColor;
     USHORT 				nWidth;
diff --git a/svx/inc/svx/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index 9f6fa35af3..8905a19a08 100644
--- a/svx/inc/svx/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shdditem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +45,7 @@ namespace rtl
     Dieses Item beschreibt, ob und wie schattiert ist.
 */
 
-class SVX_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index ca255a6128..ef2b00bb57 100644
--- a/svx/inc/svx/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sizeitem.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,10 +31,7 @@
 
 #include <tools/gen.hxx>
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxSizeItem -----------------------------------------------------
 
@@ -46,7 +40,7 @@
 Dieses Item beschreibt eine zweidimensionale Groesse (Size).
 */
 
-class SVX_DLLPUBLIC SvxSizeItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
 {
 
     Size aSize;
diff --git a/svx/inc/svx/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index 4a12a22dcf..3de7928f25 100644
--- a/svx/inc/svx/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spltitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +45,7 @@ namespace rtl
 Dieses Item beschreibt eine logische Variable "Absatz trennen ja oder nein".
 */
 
-class SVX_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index 2cc7ccd1a7..1be54f909f 100644
--- a/svx/inc/svx/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: splwrap.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,10 +29,10 @@
 
 // include ---------------------------------------------------------------
 
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // forward ---------------------------------------------------------------
 
@@ -49,13 +46,13 @@ class Window;
 
 // misc functions ---------------------------------------------------------------
 
-void SVX_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText );
+void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText );
 
 /*--------------------------------------------------------------------
      Beschreibung: Der SpellWrapper
  --------------------------------------------------------------------*/
 
-class SVX_DLLPUBLIC SvxSpellWrapper {
+class EDITENG_DLLPUBLIC SvxSpellWrapper {
 private:
     friend class SvxSpellCheckDialog;
     friend class SvxHyphenWordDialog;
@@ -80,8 +77,8 @@ private:
     sal_Bool	bAllRight	: 1; // falsche Woerter in geignetes Woerterbuch
                              // aufnehmen und nicht den Dialog starten.
 
-    SVX_DLLPRIVATE sal_Bool 	SpellNext();   		// naechsten Bereich anwaehlen
-    SVX_DLLPRIVATE sal_Bool	FindSpellError(); 	// Suche nach Fehlern ( ueber Bereiche hinweg )
+    EDITENG_DLLPRIVATE sal_Bool 	SpellNext();   		// naechsten Bereich anwaehlen
+    sal_Bool	FindSpellError(); 	// Suche nach Fehlern ( ueber Bereiche hinweg )
 
 public:
     SvxSpellWrapper( Window* pWn,
diff --git a/svx/inc/svx/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 26d34abb10..72441fa901 100644
--- a/svx/inc/svx/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxacorr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,8 +35,8 @@
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <tools/string.hxx>
-#include <svx/swafopt.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/swafopt.hxx>
+#include "editeng/editengdllapi.h"
 
 class CharClass;
 class SfxPoolItem;
@@ -54,7 +51,7 @@ class SotStorage;
 // Flags fuer die AutoKorrekt-Flags
 const long CptlSttSntnc		= 0x00000001;	// Gross-Buchstaben am SatzAnfang
 const long CptlSttWrd		= 0x00000002;	// keine 2 Gr.-Buchst. am WordAnfang
-const long ChgFractionSymbol= 0x00000004;	// 1/2, 1/4, .. ersetzen
+const long AddNonBrkSpace   = 0x00000004;	// Add non breaking space before :;?!
 const long ChgOrdinalNumber = 0x00000008;	// Ordinal-Number 1st, 2nd,..
 const long ChgToEnEmDash    = 0x00000010;	// - -> Endash/Emdash
 const long ChgWeightUnderl  = 0x00000020;	// * -> Fett, _ -> unterstreichen
@@ -63,7 +60,7 @@ const long Autocorrect 		= 0x00000080;	// Autokorrektur aufrufen
 const long ChgQuotes		= 0x00000100;	// doppelte Quotes ersetzen
 const long SaveWordCplSttLst= 0x00000200;	// GrB. am SatzAnf. auto. aufnehmen
 const long SaveWordWrdSttLst= 0x00000400;	// 2 GrB. am WortAnf. auto. aufnehmen
-const long IngnoreDoubleSpace= 0x00000800;	// 2 Spaces ignorieren
+const long IgnoreDoubleSpace= 0x00000800;	// 2 Spaces ignorieren
 const long ChgSglQuotes		= 0x00001000;	// einfache Quotes ersetzen
 
 const long ChgWordLstLoad	= 0x20000000;	// Ersetzungsliste geladen
@@ -73,7 +70,7 @@ const long WrdSttLstLoad	= 0x80000000;	// Exceptionlist fuer WordStart geladen
 // TODO: handle unicodes > U+FFFF and check users of this class
 
 // nur eine Mappingklasse
-class SVX_DLLPUBLIC SvxAutoCorrDoc
+class EDITENG_DLLPUBLIC SvxAutoCorrDoc
 {
 public:
     SvxAutoCorrDoc() {}
@@ -114,7 +111,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxAutocorrWord
+class EDITENG_DLLPUBLIC SvxAutocorrWord
 {
     String sShort, sLong;
     BOOL bIsTxtOnly;				// ist reiner ASCII - Text
@@ -129,9 +126,9 @@ public:
 };
 
 typedef SvxAutocorrWord* SvxAutocorrWordPtr;
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , SVX_DLLPUBLIC)
+SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , EDITENG_DLLPUBLIC)
 
-class SVX_DLLPUBLIC SvxAutoCorrectLanguageLists
+class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
 {
     String sShareAutoCorrFile, sUserAutoCorrFile;
     // falls die AutoCorr Datei neuer ist
@@ -199,7 +196,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxAutoCorrect
+class EDITENG_DLLPUBLIC SvxAutoCorrect
 {
     friend class SvxAutoCorrectLanguageLists;
 
@@ -216,7 +213,6 @@ class SVX_DLLPUBLIC SvxAutoCorrect
 
     long nFlags;
     sal_Unicode cStartDQuote, cEndDQuote, cStartSQuote, cEndSQuote,
-                c1Div2, c1Div4, c3Div4,
                 cEmDash, cEnDash;
 
 
@@ -359,14 +355,15 @@ public:
     BOOL FnCptlSttWrd( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
-    BOOL FnChgFractionSymbol( SvxAutoCorrDoc&, const String&,
-                                xub_StrLen nSttPos, xub_StrLen nEndPos );
     BOOL FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
     BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
+    BOOL FnAddNonBrkSpace( SvxAutoCorrDoc&, const String&,
+                                xub_StrLen nSttPos, xub_StrLen nEndPos,
+                                LanguageType eLang = LANGUAGE_SYSTEM );
     BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang = LANGUAGE_SYSTEM );
@@ -384,6 +381,8 @@ public:
 // (used to avoid occasional 'collisions' with (Thai) input-sequence-checking)
     static sal_Bool		IsAutoCorrectChar( sal_Unicode cChar );
 
+    sal_Bool NeedsHardspaceAutocorr( sal_Unicode cChar );
+
     CharClass& GetCharClass( LanguageType eLang )
     {
         if( !pCharClass || eLang != eCharClassLang )
diff --git a/svx/inc/svx/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index d2f2530f27..fc0bb18946 100644
--- a/svx/inc/svx/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxenum.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index a710c64097..3a6c347c85 100644
--- a/svx/inc/svx/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxfont.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,16 @@
 #define	_SVX_SVXFONT_HXX
 
 #include <limits.h>		// USHRT_MAX
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <i18npool/lang.h>
 #include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvxDoCapitals;
 class OutputDevice;
 class Printer;
 
-class SVX_DLLPUBLIC SvxFont : public Font
+class EDITENG_DLLPUBLIC SvxFont : public Font
 {
     LanguageType eLang;         // Language
     SvxCaseMap	 eCaseMap;      // Textauszeichnung
diff --git a/svx/inc/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index fffb5e3a36..45195c2acb 100644
--- a/svx/inc/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxrtf.hxx,v $
- * $Revision: 1.24.208.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,17 +28,14 @@
 #ifndef _SVXRTF_HXX
 #define _SVXRTF_HXX
 
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 #include <tools/string.hxx>
 #include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
 
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
-#include "svx/svxdllapi.h"
-
+#include <editeng/editengdllapi.h>
 
 class Font;
 class Color;
@@ -111,7 +105,7 @@ struct SvxRTFStyleType
 
 // Bitmap - Mode
 
-struct SVX_DLLPUBLIC SvxRTFPictureType
+struct EDITENG_DLLPUBLIC SvxRTFPictureType
 {
     // Format der Bitmap
     enum RTF_BMPSTYLE
@@ -221,7 +215,7 @@ struct RTFPardAttrMapIds
 // -----------------------------------------------------------------------
 
 
-class SVX_DLLPUBLIC SvxRTFParser : public SvRTFParser
+class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
 {
     SvStream &rStrm;
     SvxRTFColorTbl	aColorTbl;
@@ -410,7 +404,7 @@ public:
 
 // der Stack fuer die Attribute:
 // diese Klasse darf nur vom SvxRTFParser benutzt werden!
-class SVX_DLLPUBLIC SvxRTFItemStackType
+class EDITENG_DLLPUBLIC SvxRTFItemStackType
 {
     friend class SvxRTFParser;
     friend class SvxRTFItemStackList;
diff --git a/svx/inc/svx/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index 18ae7e0114..121ffc52f8 100644
--- a/svx/inc/svx/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swafopt.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,13 +28,13 @@
 #define _SVXSWAFOPT_HXX
 
 #include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvStringsISortDtor;
 class SmartTagMgr;
 
 // Klasse fuer Optionen vom Autoformat
-struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
 {
     Font aBulletFont;
     Font aByInputBulletFont;
@@ -52,7 +49,6 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
 
     BYTE nRightMargin;
 
-    BOOL bReplaceQuote : 1;
     BOOL bAutoCorrect : 1;
     BOOL bCptlSttSntnc : 1;
     BOOL bCptlSttWrd : 1;
@@ -65,9 +61,9 @@ struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
     BOOL bDelEmptyNode : 1;
     BOOL bSetNumRule : 1;
 
-    BOOL bChgFracionSymbol : 1;
     BOOL bChgOrdinalNumber : 1;
     BOOL bChgToEnEmDash : 1;
+    BOOL bAddNonBrkSpace : 1;
     BOOL bChgWeightUnderl : 1;
     BOOL bSetINetAttr : 1;
 
diff --git a/svx/inc/svx/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index edd17a9ac6..6ed88c95e9 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tstpitem.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 // class SvxTabStop ------------------------------------------------------
 
@@ -47,7 +41,7 @@
 #define cDfltDecimalChar    (sal_Unicode(0x00)) // aus IntlWrapper besorgen
 #define cDfltFillChar       (sal_Unicode(' '))
 
-class SVX_DLLPUBLIC SvxTabStop
+class EDITENG_DLLPUBLIC SvxTabStop
 {
 private:
     long            nTabPos;
@@ -56,7 +50,7 @@ private:
     mutable sal_Unicode		m_cDecimal;
     sal_Unicode		cFill;
 
-    SVX_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
+    EDITENG_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
 
     void fillDecimal() const;
 
@@ -115,14 +109,14 @@ public:
 
 // class SvxTabStopItem --------------------------------------------------
 
-SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, SVX_DLLPUBLIC )
+SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, EDITENG_DLLPUBLIC )
 
 /*
 [Beschreibung]
 Dieses Item beschreibt eine Liste von TabStops.
 */
 
-class SVX_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr
+class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr
 {
 //friend class SvxTabStopObject_Impl;
 
diff --git a/svx/inc/svx/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index 67417ac88c..aede9984a0 100644
--- a/svx/inc/svx/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: twolinesitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,10 +29,7 @@
 
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -43,7 +37,7 @@ namespace rtl
     class OUString;
 }
 
-class SVX_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
 {
     sal_Unicode	cStartBracket, cEndBracket;
     sal_Bool bOn;
diff --git a/svx/inc/txtrange.hxx b/editeng/inc/editeng/txtrange.hxx
index 3427999306..0ae674d94c 100644
--- a/svx/inc/txtrange.hxx
+++ b/editeng/inc/editeng/txtrange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtrange.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class PolyPolygon;
 class Range;
@@ -57,7 +54,7 @@ typedef SvLongs* SvLongsPtr;
 |*    Letzte Aenderung AMA 20.01.97
 |*
 *************************************************************************/
-class SVX_DLLPUBLIC TextRanger
+class EDITENG_DLLPUBLIC TextRanger
 {
     Range *pRangeArr;
     SvLongsPtr *pCache;
diff --git a/svx/inc/svx/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index d5b328361a..c4307ac896 100644
--- a/svx/inc/svx/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: udlnitem.hxx,v $
- * $Revision: 1.4.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,12 +30,9 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
 #include <vcl/vclenum.hxx>
 #include <tools/color.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -50,7 +44,7 @@ namespace rtl
 
 /* Value container for underline and overline font effects */
 
-class SVX_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
 {
     Color mColor;
 public:
@@ -106,7 +100,7 @@ public:
 
 /* Value container for underline font effects */
 
-class SVX_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
+class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
 {
 public:
     TYPEINFO();
@@ -123,7 +117,7 @@ public:
 
 /* Value container for overline font effects */
 
-class SVX_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
+class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 87d2262b76..209cb92c89 100644
--- a/svx/inc/svx/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ulspitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -52,7 +46,7 @@ Dieses Item beschreibt den oberen und unteren Rand einer Seite oder Absatz.
 
 #define	ULSPACE_16_VERSION	((USHORT)0x0001)
 
-class SVX_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
 {
     USHORT nUpper;  //Oberer Rand
     USHORT nLower;  //Unterer Rand
diff --git a/svx/inc/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index e46a91634a..c0a32ca29d 100644
--- a/svx/inc/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoedhlp.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,7 @@
 #include <svtools/textdata.hxx>
 #include <svl/hint.hxx>
 #include <tools/gen.hxx> 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 struct EENotify;
 class EditEngine;
@@ -49,7 +46,7 @@ class EditEngine;
     case denotes the destination position, the two parameters the
     start and the end of the moved paragraph range.
  */
-class SVX_DLLPUBLIC SvxEditSourceHint : public TextHint
+class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint
 {
 private:
     ULONG 	mnStart;
@@ -70,7 +67,7 @@ public:
 
 /** Helper class for common functionality in edit sources
  */
-class SVX_DLLPUBLIC SvxEditSourceHelper
+class EDITENG_DLLPUBLIC SvxEditSourceHelper
 {
 public:
 
diff --git a/svx/source/inc/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 9235e212ba..29fbaf8bba 100644
--- a/svx/source/inc/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoedprx.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,10 @@
 
 #include <memory>
 #include <svl/brdcst.hxx>
-#include <svx/unoedsrc.hxx>
-
-#include <svx/editdata.hxx>
+#include <editeng/unoedsrc.hxx>
 
+#include <editeng/editdata.hxx>
+#include "editeng/editengdllapi.h"
 
 class SvxAccessibleTextAdapter : public SvxTextForwarder
 {
@@ -141,7 +138,7 @@ private:
     SvxAccessibleTextAdapter*	mrTextForwarder;
 };
 
-class SvxEditSourceAdapter : public SvxEditSource
+class EDITENG_DLLPUBLIC SvxEditSourceAdapter : public SvxEditSource
 {
 public:
     SvxEditSourceAdapter();
diff --git a/svx/inc/svx/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index b60ec2d586..7bf2af6872 100644
--- a/svx/inc/svx/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoedsrc.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 #endif
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <list>
 
@@ -71,7 +68,7 @@ typedef std::list< SvxUnoTextRangeBase* > SvxUnoTextRangeBaseList;
     contain an EditEngine/Outliner. Is used e.g. for filling an
     EditEngine with the content of a cell, note page or page template.
 */
-class SVX_DLLPUBLIC SvxEditSource
+class EDITENG_DLLPUBLIC SvxEditSource
 {
 public:
     virtual					~SvxEditSource();
@@ -151,7 +148,7 @@ public:
     SvxEditSource::UpdateData(). This copies back the data to the model's
     EditTextObject/OutlinerParaObject.
  */
-class SVX_DLLPUBLIC SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxTextForwarder
 {
 public:
     virtual				~SvxTextForwarder();
@@ -457,7 +454,7 @@ public:
     This one has to be different from the SvxEditViewForwarder, since
     the latter is only valid in edit mode.
  */
-class SVX_DLLPUBLIC SvxViewForwarder
+class EDITENG_DLLPUBLIC SvxViewForwarder
 {
 public:
     virtual				~SvxViewForwarder();
diff --git a/svx/inc/unofdesc.hxx b/editeng/inc/editeng/unofdesc.hxx
index 64c7aab92a..c21677274d 100644
--- a/svx/inc/unofdesc.hxx
+++ b/editeng/inc/editeng/unofdesc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofdesc.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,9 +32,9 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <svl/itemset.hxx>
 #include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
-class SVX_DLLPUBLIC SvxUnoFontDescriptor
+class EDITENG_DLLPUBLIC SvxUnoFontDescriptor
 {
 public:
     static void ConvertToFont( const ::com::sun::star::awt::FontDescriptor& rDesc, Font& rFont );
diff --git a/svx/inc/svx/unofield.hxx b/editeng/inc/editeng/unofield.hxx
index 357bdb7711..b519d9482d 100644
--- a/svx/inc/svx/unofield.hxx
+++ b/editeng/inc/editeng/unofield.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofield.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,11 +34,11 @@
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/component.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <comphelper/servicehelper.hxx>
 
-#include <svx/mutxhelp.hxx>
+#include <editeng/mutxhelp.hxx>
 
 // ids usable for the constructor
 #define ID_DATEFIELD		0
@@ -65,7 +62,10 @@ class SvxUnoFieldData_Impl;
 class SfxItemPropertySet;
 class SvxFieldData;
 
-class SVX_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField( 
+    const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
                         public ::cppu::OComponentHelper,
                         public ::com::sun::star::text::XTextField,
                         public ::com::sun::star::beans::XPropertySet,
diff --git a/svx/inc/svx/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index 6aa4a18fb0..59a357c24a 100644
--- a/svx/inc/svx/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofored.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,13 +28,13 @@
 #ifndef _SVX_UNOFORED_HXX
 #define _SVX_UNOFORED_HXX
 
-#include <svx/editeng.hxx>
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editeng.hxx>
+#include <editeng/unoedsrc.hxx>
+#include "editeng/editengdllapi.h"
 
 //	SvxEditEngineForwarder - SvxTextForwarder fuer EditEngine
 
-class SVX_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder
 {
 private:
     EditEngine&			rEditEngine;
diff --git a/svx/inc/svx/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index bb56d57721..8b441656a2 100644
--- a/svx/inc/svx/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoforou.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,21 +28,20 @@
 #ifndef _SVX_UNOFOROU_HXX
 #define _SVX_UNOFOROU_HXX
 
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/unoedsrc.hxx>
+#include "editeng/editengdllapi.h"
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 class Outliner;
-class SdrObject;
 
 //	SvxOutlinerForwarder - SvxTextForwarder fuer Outliner
 
-class SVX_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
 {
 private:
     Outliner&			rOutliner;
-    SdrObject*			pSdrObject;
+    BOOL				bOutlinerText;
 
     /** this pointer may be null or point to an item set for the attribs of
         the selection maAttribsSelection */
@@ -62,7 +58,7 @@ private:
     mutable USHORT		mnParaAttribsCache;
 
 public:
-                        SvxOutlinerForwarder( Outliner& rOutl, SdrObject* pSdrObj = 0 );
+                        SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText = FALSE );
     virtual				~SvxOutlinerForwarder();
 
     virtual USHORT		GetParagraphCount() const;
diff --git a/svx/inc/svx/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx
index 96b11fda51..22789ed959 100644
--- a/svx/inc/svx/unoipset.hxx
+++ b/editeng/inc/editeng/unoipset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoipset.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,7 +30,7 @@
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <svl/itemprop.hxx>
 
 class SvxIDPropertyCombineList;
@@ -41,40 +38,46 @@ class SdrItemPool;
 class SfxItemSet;
 class SvxShape;
 
-class SVX_DLLPUBLIC SvxItemPropertySet
+#define SFX_METRIC_ITEM                         (0x40)
+
+class EDITENG_DLLPUBLIC SvxItemPropertySet
 {
     SfxItemPropertyMap          m_aPropertyMap;
     mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
     const SfxItemPropertyMapEntry*  _pMap;
     SvxIDPropertyCombineList*	pCombiList;
     sal_Bool					mbConvertTwips;
+    SfxItemPool&				mrItemPool;
 
 public:
-    SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, sal_Bool bConvertTwips = sal_False );
+    SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool, sal_Bool bConvertTwips = sal_False );
     ~SvxItemPropertySet();
 
     // Methoden, die direkt mit dem ItemSet arbeiten
-    ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) const;
-    void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet ) const;
+    ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const;
+    void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const;
 
     // Methoden, die stattdessen Any benutzen
     ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const;
     void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal ) const;
 
-    // Properties von einem anderen Set uebernehmen
-    void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,  SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet )const;
     sal_Bool AreThereOwnUsrAnys() const { return (pCombiList ? sal_True : sal_False); }
     ::com::sun::star::uno::Any* GetUsrAnyForID(sal_uInt16 nWID) const;
     void AddUsrAnyForID(const ::com::sun::star::uno::Any& rAny, sal_uInt16 nWID);
 
     com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const;
     const SfxItemPropertyMapEntry* getPropertyMapEntries() const {return _pMap;}
-    //void setPropertyMap( const SfxItemPropertyMapEntry *pMap ) { _pMap = pMap; }
     const SfxItemPropertyMap* getPropertyMap()const { return &m_aPropertyMap;}
     const SfxItemPropertySimpleEntry* getPropertyMapEntry(const ::rtl::OUString &rName) const;
 
     static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > getPropertySetInfo( const SfxItemPropertyMapEntry* pMap );
 };
 
+/** converts the given any with a metric to 100th/mm if needed */
+EDITENG_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, com::sun::star::uno::Any & rMetric ) throw();
+
+/** converts the given any with a metric from 100th/mm to the given metric if needed */
+EDITENG_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, com::sun::star::uno::Any & rMetric ) throw();
+
 #endif // _SVX_UNOIPSET_HXX_
 
diff --git a/svx/inc/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index 574906459d..ed455b2c09 100644
--- a/svx/inc/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unolingu.hxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,7 +39,7 @@
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XDictionaryList.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class LinguMgrExitLstnr;
 
@@ -67,13 +64,13 @@ class SvxLinguConfigUpdate
 
 public:
 
-    SVX_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
+    EDITENG_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
     static BOOL IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
 };
 
 ///////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC LinguMgr
+class EDITENG_DLLPUBLIC LinguMgr
 {
     friend class LinguMgrExitLstnr;
 
@@ -173,22 +170,22 @@ inline SvxAlternativeSpelling::SvxAlternativeSpelling() :
 }
 
 
-SVX_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( 
+EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( 
         const ::com::sun::star::uno::Reference< 
             ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord );
 
 
 ///////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC SvxDicListChgClamp
+class EDITENG_DLLPUBLIC SvxDicListChgClamp
 {
 private:
     ::com::sun::star::uno::Reference< 
         ::com::sun::star::linguistic2::XDictionaryList > 	xDicList;
 
     // disallow access to copy-constructor and assignment-operator
-    SVX_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
-    SVX_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
+    EDITENG_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
+    EDITENG_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
 
 public:
     SvxDicListChgClamp( ::com::sun::star::uno::Reference< 
@@ -199,38 +196,38 @@ public:
 ///////////////////////////////////////////////////////////////////////////
 
 //TL:TODO: remove those functions or make them inline
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XSpellChecker1 >	SvxGetSpellChecker();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XHyphenator >  	SvxGetHyphenator();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XThesaurus >  	SvxGetThesaurus();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::beans::XPropertySet > 		SvxGetLinguPropertySet();
 //TL:TODO: remove argument or provide SvxGetIgnoreAllList with the same one
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionary >  	SvxGetOrCreatePosDic( 
             ::com::sun::star::uno::Reference< 
                 ::com::sun::star::linguistic2::XDictionaryList >  xDicList );
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionary >  	SvxGetIgnoreAllList();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionary >  	SvxGetChangeAllList();
 
 ///////////////////////////////////////////////////////////////////////////
 // misc functions
 //
 
-SVX_DLLPUBLIC LanguageType 						SvxLocaleToLanguage( 
+EDITENG_DLLPUBLIC LanguageType 						SvxLocaleToLanguage( 
         const ::com::sun::star::lang::Locale& rLocale );
-SVX_DLLPUBLIC ::com::sun::star::lang::Locale& 	SvxLanguageToLocale( 
+EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale& 	SvxLanguageToLocale( 
         ::com::sun::star::lang::Locale& rLocale, LanguageType eLang );
-SVX_DLLPUBLIC ::com::sun::star::lang::Locale    SvxCreateLocale( LanguageType eLang );
+EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale    SvxCreateLocale( LanguageType eLang );
 
 
-SVX_DLLPUBLIC short	SvxDicError( Window *pParent, sal_Int16 nError );
+EDITENG_DLLPUBLIC short	SvxDicError( Window *pParent, sal_Int16 nError );
 
 
 #endif
diff --git a/editeng/inc/editeng/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx
new file mode 100644
index 0000000000..7fb5a537b6
--- /dev/null
+++ b/editeng/inc/editeng/unonrule.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+ *
+ * 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_UNONRULE_HXX
+#define _SVX_UNONRULE_HXX
+
+#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/ucb/XAnyCompare.hpp>
+#include "editeng/editengdllapi.h"
+#include <cppuhelper/implbase5.hxx>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <editeng/numitem.hxx>
+#include <comphelper/servicehelper.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw();
+const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException );
+bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule );
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
+
+class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< com::sun::star::container::XIndexReplace, com::sun::star::ucb::XAnyCompare, 
+    com::sun::star::lang::XUnoTunnel, com::sun::star::util::XCloneable, com::sun::star::lang::XServiceInfo >
+{
+private:
+    SvxNumRule maRule;
+public:
+    SvxUnoNumberingRules( const SvxNumRule& rRule ) throw();
+    virtual ~SvxUnoNumberingRules() throw();
+
+    UNO3_GETIMPLEMENTATION_DECL( SvxUnoNumberingRules )
+
+    //XIndexReplace
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const com::sun::star::uno::Any& Element ) throw(
+    com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IndexOutOfBoundsException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+
+    //XIndexAccess
+    virtual sal_Int32 SAL_CALL getCount() throw(com::sun::star::uno::RuntimeException) ;
+    virtual com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(com::sun::star::lang::IndexOutOfBoundsException, 
+        com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+
+    //XElementAccess
+    virtual com::sun::star::uno::Type SAL_CALL getElementType() throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements() throw(com::sun::star::uno::RuntimeException);
+
+    // XAnyCompare
+    virtual sal_Int16 SAL_CALL compare( const com::sun::star::uno::Any& Any1, const com::sun::star::uno::Any& Any2 ) throw(com::sun::star::uno::RuntimeException);
+
+    // XCloneable
+    virtual com::sun::star::uno::Reference< com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual rtl::OUString SAL_CALL getImplementationName(  ) throw(com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(com::sun::star::uno::RuntimeException);
+
+    // intern
+    com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const throw();
+    void setNumberingRuleByIndex( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException );
+
+    static sal_Int16 Compare( const com::sun::star::uno::Any& rAny1, const com::sun::star::uno::Any& rAny2 );
+
+    const SvxNumRule& getNumRule() const { return maRule; }
+};
+
+
+#endif
+
+
diff --git a/svx/source/inc/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx
index 2cde80e068..072bcfa119 100644
--- a/svx/source/inc/unopracc.hxx
+++ b/editeng/inc/editeng/unopracc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopracc.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,8 +28,7 @@
 #ifndef _SVX_UNOPRACC_HXX
 #define _SVX_UNOPRACC_HXX
 
-#include <svx/unoshape.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 
 
 class SvxEditSource;
diff --git a/svx/inc/svx/unoprnms.hxx b/editeng/inc/editeng/unoprnms.hxx
index 541c2f5577..dd8a2e544d 100644
--- a/svx/inc/svx/unoprnms.hxx
+++ b/editeng/inc/editeng/unoprnms.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoprnms.hxx,v $
- * $Revision: 1.4.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index da5c79c2ed..abe3c5a9d6 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unotext.hxx,v $
- * $Revision: 1.6.84.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,16 +28,15 @@
 #ifndef _SVX_UNOTEXT_HXX
 #define _SVX_UNOTEXT_HXX
 
-#include <tools/link.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XText.hpp>
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#endif
 #include <com/sun/star/text/XTextRangeMover.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -48,19 +44,6 @@
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/text/XTextAppend.hpp>
 #include <com/sun/star/text/XTextCopy.hpp>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <svl/itemprop.hxx>
-#include <svx/editdata.hxx>
-#include <svx/unoedsrc.hxx>
-#include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/outliner.hxx>
-#include <svx/unoforou.hxx>
-
-#include <svx/unoprnms.hxx>
-#include <svx/eeitem.hxx>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@@ -70,10 +53,22 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <cppuhelper/interfacecontainer.h>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakagg.hxx>
 #include <osl/mutex.hxx>
-#include "svx/svxdllapi.h"
-
 #include <comphelper/servicehelper.hxx>
+#include <tools/link.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/solar.hrc>
+#include <editeng/editdata.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
+#include <editeng/memberids.hrc>
+
+class SvxItemPropertySet;
 
 #ifndef SEQTYPE
  #if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
@@ -83,14 +78,11 @@
  #endif
 #endif
 
-#include <svx/unoprov.hxx>
-#include <svx/unomid.hxx>
-
-#define WID_FONTDESC		        3900
-#define WID_NUMLEVEL		        3901
-#define WID_PORTIONTYPE		        3903
-#define WID_NUMBERINGSTARTVALUE     3904
-#define WID_PARAISNUMBERINGRESTART  3905
+#define WID_FONTDESC		        OWN_ATTR_VALUE_START
+#define WID_NUMLEVEL		        OWN_ATTR_VALUE_START+1
+#define WID_PORTIONTYPE		        OWN_ATTR_VALUE_START+2
+#define WID_NUMBERINGSTARTVALUE     OWN_ATTR_VALUE_START+3
+#define WID_PARAISNUMBERINGRESTART  OWN_ATTR_VALUE_START+4
 
 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \
     {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES),		EE_PARA_NUMBULLET,	&::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
@@ -176,8 +168,8 @@ class SvxTextEditSource;
 class SvxFieldData;
 struct ESelection;
 
-SVX_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
-SVX_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
+EDITENG_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
+EDITENG_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
 
 // ====================================================================
 // Diese Klasse implementiert eine SvxEditSource und einen SvxTextForwarder
@@ -254,7 +246,7 @@ namespace accessibility
 }
 
 // ====================================================================
-class SVX_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange,
+class EDITENG_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange,
                             public ::com::sun::star::beans::XPropertySet,
                             public ::com::sun::star::beans::XMultiPropertySet,
                             public ::com::sun::star::beans::XMultiPropertyStates,
@@ -313,8 +305,8 @@ public:
     const SvxItemPropertySet*   getPropertySet() const throw() { return mpPropSet; }
     SvxEditSource*				GetEditSource() const throw() { return mpEditSource; }
 
-    static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxTextEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
-    static sal_Bool GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL,  SvxTextEditSource* pEditSource = NULL  ) throw( ::com::sun::star::uno::RuntimeException );
+    static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException );
+    static sal_Bool GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL,  SvxEditSource* pEditSource = NULL  ) throw( ::com::sun::star::uno::RuntimeException );
 
     void attachField( const SvxFieldData* pData ) throw();
 
@@ -367,7 +359,7 @@ public:
 // ====================================================================
 
 class SvxUnoTextBase;
-class SVX_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
                         public ::com::sun::star::lang::XTypeProvider,
                         public ::cppu::OWeakAggObject
 {
@@ -400,7 +392,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-class SVX_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
                         public ::com::sun::star::text::XTextAppend,
                         public ::com::sun::star::text::XTextCopy,
                         public ::com::sun::star::container::XEnumerationAccess,
@@ -477,7 +469,7 @@ public:
 };
 
 // ====================================================================
-class SVX_DLLPUBLIC SvxUnoText  : public SvxUnoTextBase,
+class EDITENG_DLLPUBLIC SvxUnoText  : public SvxUnoTextBase,
                     public ::cppu::OWeakAggObject
 {
 public:
@@ -625,7 +617,7 @@ public:
 
 // ====================================================================
 
-class SVX_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase,
                          public ::com::sun::star::text::XTextCursor,
                          public ::com::sun::star::lang::XTypeProvider,
                          public ::cppu::OWeakAggObject
@@ -675,9 +667,9 @@ public:
 
 };
 
-SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet();
-SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap();
-SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet();
-SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap();
+EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet();
+EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap();
+EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet();
+EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap();
 
 #endif
diff --git a/svx/inc/svx/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx
index 7ac53846da..ac2380d7fc 100644
--- a/svx/inc/svx/unoviwed.hxx
+++ b/editeng/inc/editeng/unoviwed.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoviwed.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,9 +28,9 @@
 #ifndef _SVX_UNOVIWED_HXX
 #define _SVX_UNOVIWED_HXX
 
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 class EditView;
 
diff --git a/svx/inc/svx/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx
index 0f20c15d6d..0752826835 100644
--- a/svx/inc/svx/unoviwou.hxx
+++ b/editeng/inc/editeng/unoviwou.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoviwou.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,19 +28,19 @@
 #ifndef _SVX_UNOVIWOU_HXX
 #define _SVX_UNOVIWOU_HXX
 
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/unoedsrc.hxx>
+#include <editeng/editengdllapi.h>
 
 class OutlinerView;
 
 /// Specialization for Draw/Impress
-class SVX_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder
+class EDITENG_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder
 {
 private:
     OutlinerView&		mrOutlinerView;
     Point				maTextShapeTopLeft;
 
-    SVX_DLLPRIVATE Point				GetTextOffset() const;
+    EDITENG_DLLPRIVATE Point				GetTextOffset() const;
 
 public:
     explicit			SvxDrawOutlinerViewForwarder( OutlinerView& rOutl );
diff --git a/svx/inc/svx/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 513a56822f..ef18c3a142 100644
--- a/svx/inc/svx/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wghtitem.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,10 +31,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Dieses Item beschreibt die Font-Staerke.
 */
 
-class SVX_DLLPUBLIC SvxWeightItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index f63cfbc48c..034bb9119d 100644
--- a/svx/inc/svx/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: widwitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,11 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +45,7 @@ namespace rtl
 Dieses Item beschreibt die Anzahl der Zeilen fuer die Hurenkinderregelung.
 */
 
-class SVX_DLLPUBLIC SvxWidowsItem: public SfxByteItem
+class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
 {
     friend SvStream & operator<<( SvStream & aS, SvxWidowsItem & );
 public:
diff --git a/svx/inc/svx/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index 27885c61ad..7c33fc7e86 100644
--- a/svx/inc/svx/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: writingmodeitem.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,12 +31,11 @@
 
 #include <com/sun/star/text/WritingMode.hpp>
 #include <svl/intitem.hxx>
-#include <svx/svddef.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxWritingModeItem ----------------------------------------------
 
-class SVX_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index 6807b47999..307209b0db 100644
--- a/svx/inc/svx/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrlmitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +46,7 @@ namespace rtl
     Wortgrenzen beschraenkt ist.
 */
 
-class SVX_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index c75bb76833..2e283e5e69 100644
--- a/svx/inc/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcnitm.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define _SVX_XMLCNITM_HXX
 
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLNamespaceMap;
 namespace rtl { class OUString; }
@@ -41,7 +38,7 @@ namespace rtl { class OUString; }
 
 class SvXMLAttrContainerData;
 
-class SVX_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
 {
     SvXMLAttrContainerData	*pImpl;
 
diff --git a/svx/source/inc/editxml.hxx b/editeng/inc/editxml.hxx
index 0c02aa6e95..8f67199c78 100644
--- a/svx/source/inc/editxml.hxx
+++ b/editeng/inc/editxml.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editxml.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/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc
new file mode 100644
index 0000000000..32c109aad2
--- /dev/null
+++ b/editeng/inc/helpid.hrc
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 _EDITENG_HELPID_HRC
+#define _EDITENG_HELPID_HRC
+
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// Help-Ids --------------------------------------------------------------
+#define HID_EDITENG_SPELLER_WORDLANGUAGE                            (HID_EDIT_START)
+#define HID_EDITENG_SPELLER_PARALANGUAGE                            (HID_EDIT_START +  1)
+#define HID_EDITENG_SPELLER_ADDWORD                                 (HID_EDIT_START +  2)
+#define HID_EDITENG_SPELLER_AUTOCORRECT                             (HID_EDIT_START +  3)
+#define HID_EDITENG_SPELLER_IGNORE                                  (HID_EDIT_START +  4)
+#define HID_EDITENG_SPELLER_START                                   (HID_EDIT_START +  5)
+#define HID_AUTOCORR_HELP_END                                       (HID_EDIT_START +  6)
+#define HID_AUTOCORR_HELP_START                                     (HID_EDIT_START +  7)
+#define HID_AUTOCORR_HELP_WORD                                               HID_AUTOCORR_HELP_START
+
+#define HID_AUTOCORR_HELP_SENT                                               (HID_AUTOCORR_HELP_START+1)
+#define HID_AUTOCORR_HELP_SENTWORD                                           (HID_AUTOCORR_HELP_START+2)
+#define HID_AUTOCORR_HELP_ACORWORD                                           (HID_AUTOCORR_HELP_START+3)
+
+#define HID_AUTOCORR_HELP_ACORSENTWORD                                       (HID_AUTOCORR_HELP_START+5)
+
+#define HID_AUTOCORR_HELP_CHGTOENEMDASH                                      (HID_AUTOCORR_HELP_START+7)
+#define HID_AUTOCORR_HELP_WORDENEMDASH                                       (HID_AUTOCORR_HELP_START+8)
+#define HID_AUTOCORR_HELP_SENTENEMDASH                                       (HID_AUTOCORR_HELP_START+9)
+#define HID_AUTOCORR_HELP_SENTWORDENEMDASH                                   (HID_AUTOCORR_HELP_START+10)
+#define HID_AUTOCORR_HELP_ACORWORDENEMDASH                                   (HID_AUTOCORR_HELP_START+11)
+
+#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH                               (HID_AUTOCORR_HELP_START+13)
+#define HID_AUTOCORR_HELP_CHGQUOTES                                          (HID_AUTOCORR_HELP_START+15)
+#define HID_AUTOCORR_HELP_CHGSGLQUOTES                                       (HID_AUTOCORR_HELP_START+16)
+#define HID_AUTOCORR_HELP_SETINETATTR                                        (HID_AUTOCORR_HELP_START+17)
+#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE                                 (HID_AUTOCORR_HELP_START+18)
+#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL                                    (HID_AUTOCORR_HELP_START+19)
+#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL                                  (HID_AUTOCORR_HELP_START+20)
+#define HID_AUTOCORR_HELP_CHGORDINALNUMBER                                   (HID_AUTOCORR_HELP_START+21) // HID_EDIT_START +  28
+
+// please adjust ACT_SVX_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+
+#define ACT_SVX_HID_END		(HID_EDIT_START+28)
+#if ACT_SVX_HID_END > HID_EDIT_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#endif
+
diff --git a/svx/source/svxlink/makefile.mk b/editeng/inc/makefile.mk
index 4494b1dcce..6ecb444e03 100644
--- a/svx/source/svxlink/makefile.mk
+++ b/editeng/inc/makefile.mk
@@ -29,15 +29,10 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=..
 
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=svxlink
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
+PRJNAME=editeng
+TARGET=inc
 
 # --- Settings -----------------------------------------------------
 
@@ -46,20 +41,12 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=\
-        $(SLO)$/linkmgr.obj \
-        $(SLO)$/fileobj.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	\
-        linkmgr.src
-
-.IF "$(GUI)" == "WNT"
-NOOPTFILES=\
-   $(SLO)$/fileobj.obj
-.ENDIF
-
-# ==========================================================================
-
 .INCLUDE :  target.mk
 
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+    $(SLO)$/precompiled.pch \
+    $(SLO)$/precompiled_ex.pch
+    
+.ENDIF			# "$(ENABLE_PCH)"!=""
+
diff --git a/configmgr/workben/memory/testmodules.hxx b/editeng/inc/pch/precompiled_editeng.cxx
index b8a5aa9f9b..888d78efa1 100644
--- a/configmgr/workben/memory/testmodules.hxx
+++ b/editeng/inc/pch/precompiled_editeng.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: testmodules.hxx,v $
+ * $RCSfile: precompiled_svx.cxx,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -28,14 +28,5 @@
  *
  ************************************************************************/
 
-#ifndef CONFIGMGR_WORKBEN_TESTMODULES_
-#include <vector>
-
-namespace configtest
-{
-    extern char const * const s_aTestModules[];
-    extern unsigned int const s_nTestModules;
-    extern std::vector<char const *> listTestModules(int argc, char* argv[]);
-}
-#endif  // CONFIGMGR_WORKBEN_TESTMODULES_
+#include "precompiled_editeng.hxx"
 
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
new file mode 100644
index 0000000000..d82ecc6cb6
--- /dev/null
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -0,0 +1,897 @@
+/*************************************************************************
+ *
+ * DO NOT 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_svx.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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:50:08.279739
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleEventObject.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp"
+#include "com/sun/star/accessibility/TextSegment.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleAction.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventListener.hpp"
+#include "com/sun/star/accessibility/XAccessibleImage.hpp"
+#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleSelection.hpp"
+#include "com/sun/star/accessibility/XAccessibleStateSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleTable.hpp"
+#include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp"
+#include "com/sun/star/accessibility/XAccessibleValue.hpp"
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FocusChangeReason.hpp"
+#include "com/sun/star/awt/FontDescriptor.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontType.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/FontWidth.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/GradientStyle.hpp"
+#include "com/sun/star/awt/Key.hpp"
+#include "com/sun/star/awt/KeyEvent.hpp"
+#include "com/sun/star/awt/KeyModifier.hpp"
+#include "com/sun/star/awt/LineEndFormat.hpp"
+#include "com/sun/star/awt/PosSize.hpp"
+#include "com/sun/star/awt/RasterOperation.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "com/sun/star/awt/SimpleFontMetric.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/TextAlign.hpp"
+#include "com/sun/star/awt/VisualEffect.hpp"
+#include "com/sun/star/awt/WindowAttribute.hpp"
+#include "com/sun/star/awt/WindowDescriptor.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XCheckBox.hpp"
+#include "com/sun/star/awt/XComboBox.hpp"
+#include "com/sun/star/awt/XControl.hpp"
+#include "com/sun/star/awt/XControlContainer.hpp"
+#include "com/sun/star/awt/XControlModel.hpp"
+#include "com/sun/star/awt/XDevice.hpp"
+#include "com/sun/star/awt/XFocusListener.hpp"
+#include "com/sun/star/awt/XFont.hpp"
+#include "com/sun/star/awt/XGraphics.hpp"
+#include "com/sun/star/awt/XImageConsumer.hpp"
+#include "com/sun/star/awt/XItemListener.hpp"
+#include "com/sun/star/awt/XLayoutConstrains.hpp"
+#include "com/sun/star/awt/XListBox.hpp"
+#include "com/sun/star/awt/XMouseListener.hpp"
+#include "com/sun/star/awt/XProgressMonitor.hpp"
+#include "com/sun/star/awt/XTabController.hpp"
+#include "com/sun/star/awt/XTabControllerModel.hpp"
+#include "com/sun/star/awt/XTextListener.hpp"
+#include "com/sun/star/awt/XToolkit.hpp"
+#include "com/sun/star/awt/XVclWindowPeer.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XWindowListener.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hdl"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XIntrospection.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/container/XContainerQuery.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XIdentifierContainer.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XIndexReplace.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/datatransfer/DataFlavor.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/document/EventObject.hpp"
+#include "com/sun/star/document/UpdateDocMode.hpp"
+#include "com/sun/star/document/XActionLockable.hpp"
+#include "com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventListener.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XExporter.hpp"
+#include "com/sun/star/document/XFilter.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "com/sun/star/document/XImporter.hpp"
+#include "com/sun/star/document/XLinkTargetSupplier.hpp"
+#include "com/sun/star/document/XMimeTypeInfo.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CameraGeometry.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/ColorMode.hpp"
+#include "com/sun/star/drawing/ConnectionType.hpp"
+#include "com/sun/star/drawing/ConnectorType.hpp"
+#include "com/sun/star/drawing/DashStyle.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.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/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/MeasureKind.hpp"
+#include "com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonFlags.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextAdjust.hpp"
+#include "com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "com/sun/star/drawing/TextAnimationKind.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/TextureKind.hpp"
+#include "com/sun/star/drawing/TextureMode.hpp"
+#include "com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "com/sun/star/drawing/XShapeDescriptor.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/ElementModes.hpp"
+#include "com/sun/star/embed/EmbedMisc.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/EntryInitModes.hpp"
+#include "com/sun/star/embed/NoVisualAreaSizeException.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedObjectFactory.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XInsertObjectDialog.hpp"
+#include "com/sun/star/embed/XLinkageSupport.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
+#include "com/sun/star/embed/XTransactedObject.hpp"
+#include "com/sun/star/form/DatabaseDeleteEvent.hpp"
+#include "com/sun/star/form/DatabaseParameterEvent.hpp"
+#include "com/sun/star/form/ErrorEvent.hpp"
+#include "com/sun/star/form/FormButtonType.hpp"
+#include "com/sun/star/form/FormComponentType.hpp"
+#include "com/sun/star/form/ListSourceType.hpp"
+#include "com/sun/star/form/NavigationBarMode.hpp"
+#include "com/sun/star/form/TabulatorCycle.hpp"
+#include "com/sun/star/form/XBoundComponent.hpp"
+#include "com/sun/star/form/XBoundControl.hpp"
+#include "com/sun/star/form/XConfirmDeleteBroadcaster.hpp"
+#include "com/sun/star/form/XConfirmDeleteListener.hpp"
+#include "com/sun/star/form/XDatabaseParameterBroadcaster2.hpp"
+#include "com/sun/star/form/XDatabaseParameterListener.hpp"
+#include "com/sun/star/form/XForm.hpp"
+#include "com/sun/star/form/XFormComponent.hpp"
+#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/XFormControllerListener.hpp"
+#include "com/sun/star/form/XFormsSupplier.hpp"
+#include "com/sun/star/form/XFormsSupplier2.hpp"
+#include "com/sun/star/form/XGrid.hpp"
+#include "com/sun/star/form/XGridColumnFactory.hpp"
+#include "com/sun/star/form/XGridFieldDataSupplier.hpp"
+#include "com/sun/star/form/XGridPeer.hpp"
+#include "com/sun/star/form/XImageProducerSupplier.hpp"
+#include "com/sun/star/form/XLoadListener.hpp"
+#include "com/sun/star/form/XLoadable.hpp"
+#include "com/sun/star/form/XReset.hpp"
+#include "com/sun/star/form/XResetListener.hpp"
+#include "com/sun/star/form/binding/XBindableValue.hpp"
+#include "com/sun/star/form/binding/XListEntrySink.hpp"
+#include "com/sun/star/form/binding/XValueBinding.hpp"
+#include "com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "com/sun/star/form/validation/XFormComponentValidityListener.hpp"
+#include "com/sun/star/form/validation/XValidatableFormComponent.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/DispatchInformation.hpp"
+#include "com/sun/star/frame/FeatureStateEvent.hpp"
+#include "com/sun/star/frame/FrameSearchFlag.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchInformationProvider.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterception.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XFrameActionListener.hpp"
+#include "com/sun/star/frame/XFrames.hpp"
+#include "com/sun/star/frame/XFramesSupplier.hpp"
+#include "com/sun/star/frame/XInterceptorInfo.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XModuleManager.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousDispatch.hpp"
+#include "com/sun/star/frame/status/ClipboardFormats.hpp"
+#include "com/sun/star/frame/status/FontHeight.hpp"
+#include "com/sun/star/frame/status/ItemStatus.hpp"
+#include "com/sun/star/frame/status/LeftRightMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMarginScale.hpp"
+#include "com/sun/star/gallery/GalleryItemType.hpp"
+#include "com/sun/star/gallery/XGalleryItem.hpp"
+#include "com/sun/star/gallery/XGalleryTheme.hpp"
+#include "com/sun/star/gallery/XGalleryThemeProvider.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/i18n/CharacterIteratorMode.hdl"
+#include "com/sun/star/i18n/CharacterIteratorMode.hpp"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/i18n/ForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/InputSequenceCheckMode.hpp"
+#include "com/sun/star/i18n/KCharacterType.hpp"
+#include "com/sun/star/i18n/ScriptType.hdl"
+#include "com/sun/star/i18n/ScriptType.hpp"
+#include "com/sun/star/i18n/TextConversionOption.hdl"
+#include "com/sun/star/i18n/TextConversionOption.hpp"
+#include "com/sun/star/i18n/TextConversionType.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+#include "com/sun/star/i18n/UnicodeScript.hpp"
+#include "com/sun/star/i18n/UnicodeType.hdl"
+#include "com/sun/star/i18n/WordType.hpp"
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/XExtendedInputSequenceChecker.hpp"
+#include "com/sun/star/i18n/XExtendedTextConversion.hpp"
+#include "com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/XTextConversion.hpp"
+#include "com/sun/star/inspection/XObjectInspector.hpp"
+#include "com/sun/star/inspection/XObjectInspectorModel.hpp"
+#include "com/sun/star/io/IOException.hpp"
+#include "com/sun/star/io/XActiveDataControl.hpp"
+#include "com/sun/star/io/XActiveDataSink.hpp"
+#include "com/sun/star/io/XActiveDataSource.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XInputStreamProvider.hpp"
+#include "com/sun/star/io/XMarkableStream.hpp"
+#include "com/sun/star/io/XObjectInputStream.hpp"
+#include "com/sun/star/io/XObjectOutputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/io/XPersistObject.hpp"
+#include "com/sun/star/io/XSeekable.hdl"
+#include "com/sun/star/io/XStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceDisplayName.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/linguistic2/ConversionDictionaryType.hpp"
+#include "com/sun/star/linguistic2/ConversionDirection.hdl"
+#include "com/sun/star/linguistic2/ConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/DictionaryEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryType.hpp"
+#include "com/sun/star/linguistic2/SpellFailure.hpp"
+#include "com/sun/star/linguistic2/XAvailableLocales.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionary.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/XDictionary.hpp"
+#include "com/sun/star/linguistic2/XDictionary1.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEntry.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEventListener.hpp"
+#include "com/sun/star/linguistic2/XDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XDictionaryListEventListener.hpp"
+#include "com/sun/star/linguistic2/XHyphenatedWord.hpp"
+#include "com/sun/star/linguistic2/XHyphenator.hpp"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hdl"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hpp"
+#include "com/sun/star/linguistic2/XMeaning.hpp"
+#include "com/sun/star/linguistic2/XPossibleHyphens.hpp"
+#include "com/sun/star/linguistic2/XSpellAlternatives.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker1.hpp"
+#include "com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "com/sun/star/linguistic2/XThesaurus.hpp"
+#include "com/sun/star/media/XPlayer.hpp"
+#include "com/sun/star/media/ZoomLevel.hpp"
+#include "com/sun/star/plugin/PluginDescription.hpp"
+#include "com/sun/star/plugin/XPluginManager.hpp"
+#include "com/sun/star/reflection/XIdlClass.hpp"
+#include "com/sun/star/reflection/XIdlMethod.hpp"
+#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/script/ScriptEvent.hpp"
+#include "com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "com/sun/star/script/XEventAttacherManager.hpp"
+#include "com/sun/star/script/XInvocation.hpp"
+#include "com/sun/star/script/XLibraryContainer.hpp"
+#include "com/sun/star/script/XScriptListener.hpp"
+#include "com/sun/star/script/XTypeConverter.hpp"
+#include "com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp"
+#include "com/sun/star/script/browse/BrowseNodeTypes.hpp"
+#include "com/sun/star/script/browse/XBrowseNode.hpp"
+#include "com/sun/star/script/browse/XBrowseNodeFactory.hpp"
+#include "com/sun/star/script/provider/ScriptErrorRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptExceptionRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptFrameworkErrorType.hpp"
+#include "com/sun/star/script/provider/XScriptProvider.hpp"
+#include "com/sun/star/script/provider/XScriptProviderSupplier.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/sdb/ParametersRequest.hpp"
+#include "com/sun/star/sdb/RowChangeAction.hpp"
+#include "com/sun/star/sdb/RowChangeEvent.hpp"
+#include "com/sun/star/sdb/SQLContext.hpp"
+#include "com/sun/star/sdb/SQLErrorEvent.hpp"
+#include "com/sun/star/sdb/XColumn.hpp"
+#include "com/sun/star/sdb/XColumnUpdate.hpp"
+#include "com/sun/star/sdb/XCompletedConnection.hpp"
+#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp"
+#include "com/sun/star/sdb/XQueriesSupplier.hpp"
+#include "com/sun/star/sdb/XResultSetAccess.hpp"
+#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp"
+#include "com/sun/star/sdb/XRowSetApproveListener.hpp"
+#include "com/sun/star/sdb/XRowSetSupplier.hpp"
+#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp"
+#include "com/sun/star/sdb/XSQLErrorListener.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposer.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp"
+#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp"
+#include "com/sun/star/sdbc/ColumnValue.hpp"
+#include "com/sun/star/sdbc/DataType.hpp"
+#include "com/sun/star/sdbc/ResultSetConcurrency.hpp"
+#include "com/sun/star/sdbc/ResultSetType.hpp"
+#include "com/sun/star/sdbc/XConnection.hpp"
+#include "com/sun/star/sdbc/XDataSource.hpp"
+#include "com/sun/star/sdbc/XDatabaseMetaData.hpp"
+#include "com/sun/star/sdbc/XPreparedStatement.hpp"
+#include "com/sun/star/sdbc/XResultSet.hpp"
+#include "com/sun/star/sdbc/XResultSetUpdate.hpp"
+#include "com/sun/star/sdbc/XRow.hpp"
+#include "com/sun/star/sdbc/XRowSet.hpp"
+#include "com/sun/star/sdbc/XRowSetListener.hpp"
+#include "com/sun/star/sdbc/XStatement.hpp"
+#include "com/sun/star/sdbcx/Privilege.hpp"
+#include "com/sun/star/sdbcx/XColumnsSupplier.hpp"
+#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp"
+#include "com/sun/star/sdbcx/XDeleteRows.hpp"
+#include "com/sun/star/sdbcx/XRowLocate.hpp"
+#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include "com/sun/star/security/XDocumentDigitalSignatures.hpp"
+#include "com/sun/star/style/BreakType.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/GraphicLocation.hpp"
+#include "com/sun/star/style/LineSpacing.hpp"
+#include "com/sun/star/style/LineSpacingMode.hpp"
+#include "com/sun/star/style/NumberingType.hpp"
+#include "com/sun/star/style/PageStyleLayout.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/TabStop.hpp"
+#include "com/sun/star/style/VerticalAlignment.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/table/BorderLine.hpp"
+#include "com/sun/star/table/CellAddress.hpp"
+#include "com/sun/star/table/CellContentType.hpp"
+#include "com/sun/star/table/CellHoriJustify.hpp"
+#include "com/sun/star/table/CellOrientation.hpp"
+#include "com/sun/star/table/CellRangeAddress.hpp"
+#include "com/sun/star/table/CellVertJustify.hpp"
+#include "com/sun/star/table/ShadowFormat.hpp"
+#include "com/sun/star/table/ShadowLocation.hpp"
+#include "com/sun/star/table/TableBorder.hpp"
+#include "com/sun/star/table/TableOrientation.hpp"
+#include "com/sun/star/task/XInteractionHandler.hpp"
+#include "com/sun/star/task/XStatusIndicator.hpp"
+#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
+#include "com/sun/star/text/CharacterCompressionType.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/GraphicCrop.hpp"
+#include "com/sun/star/text/HoriOrientation.hpp"
+#include "com/sun/star/text/RelOrientation.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/TextContentAnchorType.hpp"
+#include "com/sun/star/text/VertOrientation.hpp"
+#include "com/sun/star/text/WrapTextMode.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
+#include "com/sun/star/text/XNumberingFormatter.hpp"
+#include "com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "com/sun/star/text/XRubySelection.hpp"
+#include "com/sun/star/text/XSimpleText.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextContent.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextField.hdl"
+#include "com/sun/star/text/XTextField.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/text/XTextRangeCompare.hpp"
+#include "com/sun/star/text/XTextRangeMover.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/NameClash.hpp"
+#include "com/sun/star/ucb/NumberedSortingInfo.hpp"
+#include "com/sun/star/ucb/TransferInfo.hpp"
+#include "com/sun/star/ucb/XAnyCompare.hpp"
+#include "com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentAccess.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
+#include "com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp"
+#include "com/sun/star/ui/ImageType.hpp"
+#include "com/sun/star/ui/ItemStyle.hpp"
+#include "com/sun/star/ui/ItemType.hpp"
+#include "com/sun/star/ui/UIElementType.hpp"
+#include "com/sun/star/ui/XImageManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfiguration.hpp"
+#include "com/sun/star/ui/XUIConfigurationListener.hpp"
+#include "com/sun/star/ui/XUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfigurationPersistence.hpp"
+#include "com/sun/star/ui/XUIConfigurationStorage.hpp"
+#include "com/sun/star/ui/XUIElement.hpp"
+#include "com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp"
+#include "com/sun/star/ui/dialogs/ListboxControlActions.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerListener.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerNotifier.hpp"
+#include "com/sun/star/ui/dialogs/XFilePreview.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/XAggregation.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/util/Date.hpp"
+#include "com/sun/star/util/DateTime.hpp"
+#include "com/sun/star/util/Language.hpp"
+#include "com/sun/star/util/MeasureUnit.hpp"
+#include "com/sun/star/util/NumberFormat.hpp"
+#include "com/sun/star/util/SearchAlgorithms.hpp"
+#include "com/sun/star/util/SearchFlags.hpp"
+#include "com/sun/star/util/SearchOptions.hpp"
+#include "com/sun/star/util/SearchResult.hpp"
+#include "com/sun/star/util/SortField.hpp"
+#include "com/sun/star/util/SortFieldType.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCancellable.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "com/sun/star/util/XLocalizedAliases.hpp"
+#include "com/sun/star/util/XModeChangeBroadcaster.hpp"
+#include "com/sun/star/util/XModeChangeListener.hpp"
+#include "com/sun/star/util/XModeSelector.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XModifyBroadcaster.hpp"
+#include "com/sun/star/util/XModifyListener.hpp"
+#include "com/sun/star/util/XNumberFormatTypes.hpp"
+#include "com/sun/star/util/XNumberFormats.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XNumberFormatter.hpp"
+#include "com/sun/star/util/XTextSearch.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/util/logging/LogLevel.hpp"
+#include "com/sun/star/util/logging/XLogger.hpp"
+#include "com/sun/star/view/XSelectionChangeListener.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+#include "com/sun/star/xforms/XFormsSupplier.hpp"
+#include "com/sun/star/xforms/XFormsUIHelper1.hpp"
+#include "com/sun/star/xforms/XModel.hpp"
+#include "com/sun/star/xforms/XSubmission.hpp"
+#include "com/sun/star/xml/AttributeData.hpp"
+#include "com/sun/star/xml/dom/DOMException.hpp"
+#include "com/sun/star/xml/dom/XDocument.hpp"
+#include "com/sun/star/xml/dom/XNode.hpp"
+#include "com/sun/star/xml/dom/events/XEventListener.hpp"
+#include "com/sun/star/xml/dom/events/XEventTarget.hpp"
+#include "com/sun/star/xml/sax/InputSource.hpp"
+#include "com/sun/star/xml/sax/SAXParseException.hpp"
+#include "com/sun/star/xml/sax/XAttributeList.hpp"
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XParser.hpp"
+#include "comphelper/accessibleeventnotifier.hxx"
+#include "comphelper/anytostring.hxx"
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/componentcontext.hxx"
+#include "comphelper/configurationhelper.hxx"
+#include "comphelper/container.hxx"
+#include "comphelper/embeddedobjectcontainer.hxx"
+#include "comphelper/enumhelper.hxx"
+#include "comphelper/implementationreference.hxx"
+#include "comphelper/interaction.hxx"
+#include "comphelper/numbers.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/propertysethelper.hxx"
+#include "comphelper/regpathhelper.hxx"
+#include "comphelper/scopeguard.hxx"
+#include "comphelper/seqstream.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/sequenceasvector.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "comphelper/storagehelper.hxx"
+#include "comphelper/types.hxx"
+#include "comphelper/uno3.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/compbase12.hxx"
+#include "cppuhelper/compbase2.hxx"
+#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/compbase4.hxx"
+#include "cppuhelper/compbase6.hxx"
+#include "cppuhelper/compbase7.hxx"
+#include "cppuhelper/component.hxx"
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase11.hxx"
+#include "cppuhelper/implbase12.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/implbase5.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/implbase8.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/typeprovider.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakagg.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+#include "linguistic/lngprops.hxx"
+#include "osl/diagnose.h"
+#include "osl/endian.h"
+#include "osl/file.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/nlsupport.h"
+#include "osl/process.h"
+#include "osl/security.hxx"
+#include "rsc/rscsfx.hxx"
+#include "rtl/bootstrap.hxx"
+#include "rtl/cipher.h"
+#include "rtl/crc.h"
+#include "rtl/digest.h"
+#include "rtl/locale.h"
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/tencinfo.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/config.h"
+#include "sal/main.h"
+#include "sal/types.h"
+#include "svl/srchdefs.hxx"
+#include "sot/clsids.hxx"
+#include "sot/exchange.hxx"
+#include "sot/factory.hxx"
+#include "sot/formats.hxx"
+#include <map>
+#include <set>
+#include <slist>
+#include <vector>
+#include "svtools/FilterConfigItem.hxx"
+#include "svtools/accessibilityoptions.hxx"
+#include "svl/adrparse.hxx"
+#include "svtools/apearcfg.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
+#include "svtools/colorcfg.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
+#include "svtools/ehdl.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
+#include "svtools/fontsubstconfig.hxx"
+#include "svtools/helpopt.hxx"
+#include "svl/hint.hxx"
+#include "svtools/htmlkywd.hxx"
+#include "svtools/htmltokn.h"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
+#include "svtools/localresaccess.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
+#include "svtools/menuoptions.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
+#include "svtools/miscopt.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
+#include "svtools/parhtml.hxx"
+#include "svtools/parrtf.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
+#include "svtools/rtfkeywd.hxx"
+#include "svtools/rtfout.hxx"
+#include "svtools/rtftoken.h"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
+#include "svtools/soerr.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
+#include "svtools/stdmenu.hxx"
+#include "svtools/stringtransfer.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
+#include "svtools/textdata.hxx"
+#include "svtools/transfer.hxx"
+#include "svtools/txtcmp.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
+#include "svtools/unoevent.hxx"
+#include "svtools/unoimap.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
+#include "sys/stat.h"
+#include "sys/types.h"
+#include "toolkit/awt/vclxdevice.hxx"
+#include "toolkit/controls/unocontrol.hxx"
+#include "tools/bigint.hxx"
+#include "tools/color.hxx"
+#include "tools/config.hxx"
+#include "tools/contnr.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/dynary.hxx"
+#include "tools/errcode.hxx"
+#include "tools/errinf.hxx"
+#include "tools/fract.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/inetdef.hxx"
+#include "tools/line.hxx"
+#include "tools/link.hxx"
+#include "tools/list.hxx"
+#include "tools/multisel.hxx"
+#include "tools/poly.hxx"
+#include "tools/rc.h"
+#include "tools/rc.hxx"
+#include "tools/rcid.h"
+#include "tools/ref.hxx"
+#include "tools/resary.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/rtti.hxx"
+#include "tools/shl.hxx"
+#include "tools/solar.h"
+#include "tools/stack.hxx"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/tenccvt.hxx"
+#include "tools/urlobj.hxx"
+#include "tools/vcompat.hxx"
+#include "tools/vector2d.hxx"
+#include "tools/weakbase.hxx"
+#include "tools/wldcrd.hxx"
+#include "tools/zcodec.hxx"
+#include "ucbhelper/commandenvironment.hxx"
+#include "ucbhelper/configurationkeys.hxx"
+#include "ucbhelper/content.hxx"
+#include "ucbhelper/contentbroker.hxx"
+#include "unicode/ubidi.h"
+#include "uno/lbnames.h"
+#include "uno/mapping.hxx"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "unotools/accessiblestatesethelper.hxx"
+#include "unotools/bootstrap.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/collatorwrapper.hxx"
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/confignode.hxx"
+#include "unotools/configpathes.hxx"
+#include "unotools/configvaluecontainer.hxx"
+#include "unotools/localfilehelper.hxx"
+#include "unotools/processfactory.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "unotools/streamwrap.hxx"
+#include "unotools/textsearch.hxx"
+#include "unotools/transliterationwrapper.hxx"
+#include "unotools/ucbhelper.hxx"
+#include "vcl/abstdlg.hxx"
+#include "vcl/animate.hxx"
+#include "vcl/bitmap.hxx"
+#include "vcl/bitmapex.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/cmdevt.h"
+#include "vcl/configsettings.hxx"
+#include "vcl/controllayout.hxx"
+#include "vcl/cursor.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/dndhelp.hxx"
+#include "vcl/fldunit.hxx"
+#include "vcl/fntstyle.hxx"
+#include "unotools/fontcvt.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/help.hxx"
+#include "vcl/image.hxx"
+#include "vcl/jobset.hxx"
+#include "vcl/keycodes.hxx"
+#include "vcl/mapmod.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/mnemonic.hxx"
+#include "vcl/pointr.hxx"
+#include "vcl/region.hxx"
+#include "vcl/salbtype.hxx"
+#include "vcl/stdtext.hxx"
+#include "vcl/timer.hxx"
+#include "vcl/unohelp.hxx"
+#include "vcl/unohelp2.hxx"
+#include "vcl/wall.hxx"
+#include "vcl/wintypes.hxx"
+#include "vos/mutex.hxx"
+#include "vos/ref.hxx"
+#include "vos/refernce.hxx"
+#include "vos/thread.hxx"
+#include "vos/xception.hxx"
+#include "xmloff/DashStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/nmspmap.hxx"
+#include "xmloff/xmlcnimp.hxx"
+#include "xmloff/xmlictxt.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlstyle.hxx"
+#include "xmloff/xmltoken.hxx"
+//---MARKER---
+#endif
+
diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst
new file mode 100644
index 0000000000..551a21bc37
--- /dev/null
+++ b/editeng/prj/build.lst
@@ -0,0 +1,13 @@
+ed	editeng	:	l10n svtools xmloff linguistic NULL
+ed	editeng										usr1	-	all	ed_mkout NULL
+ed	editeng\inc									nmake	-	all	ed_inc NULL
+ed	editeng\source\items						nmake	-	all	ed_items ed_inc NULL
+ed	editeng\source\editeng						nmake	-	all	ed_eeng ed_inc NULL
+ed	editeng\source\misc							nmake	-	all	ed_misc ed_inc NULL
+ed	editeng\source\outliner						nmake	-	all	ed_outl ed_inc NULL
+ed	editeng\source\rtf							nmake	-	all	ed_rtf ed_inc NULL
+ed	editeng\source\uno							nmake	-	all	ed_uno ed_inc NULL
+ed	editeng\source\xml							nmake	-	all	ed_xml ed_inc NULL
+ed	editeng\source\accessibility				nmake	-	all	ed_accessibility ed_inc NULL
+ed  editeng\util                                nmake   -   all ed_util ed_rtf ed_eeng ed_items ed_outl ed_uno ed_xml ed_accessibility ed_misc NULL
+
diff --git a/editeng/prj/d.lst b/editeng/prj/d.lst
new file mode 100644
index 0000000000..364c1a8fdd
--- /dev/null
+++ b/editeng/prj/d.lst
@@ -0,0 +1,14 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\iediteng.lib %_DEST%\lib%_EXT%\iediteng.lib
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+
+mkdir: %_DEST%\inc%_EXT%\svx
+..\inc\editeng\*.h %_DEST%\inc%_EXT%\editeng\*.h
+..\inc\editeng\*.hrc %_DEST%\inc%_EXT%\editeng\*.hrc
+..\inc\editeng\*.hxx %_DEST%\inc%_EXT%\editeng\*.hxx
+
diff --git a/svx/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index cad94ba608..d2d1a19bf3 100644
--- a/svx/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleComponentBase.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,22 +26,19 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
-#include <svx/AccessibleComponentBase.hxx>
+#include <editeng/AccessibleComponentBase.hxx>
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLE_ROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_SELECTION_HPP_
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#endif
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/XShapeDescriptor.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
 #include <tools/color.hxx>
 
 using namespace ::rtl;
diff --git a/svx/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 1721f8dccd..b9d5a66301 100644
--- a/svx/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleContextBase.cxx,v $
- * $Revision: 1.28.144.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,24 +26,23 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
+#include "precompiled_editeng.hxx"
 
-#include <svx/AccessibleContextBase.hxx>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 
+#include <editeng/AccessibleContextBase.hxx>
 
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <rtl/uuid.h>
-
 #include <vos/mutex.hxx>
-#include <vcl/svapp.hxx>
+//#include <vcl/svapp.hxx>
 
 #include <utility>
 
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 55775b8fbb..4175896eb4 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleEditableTextPara.cxx,v $
- * $Revision: 1.53 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -61,6 +58,10 @@
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 // <--
 #include <vcl/unohelp.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoipset.hxx>
+#include <editeng/outliner.hxx>
 
 //------------------------------------------------------------------------
 //
@@ -69,13 +70,9 @@
 //------------------------------------------------------------------------
 
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <svx/unoshape.hxx>
-#include "unolingu.hxx"
-#include "unopracc.hxx"
-#include "AccessibleEditableTextPara.hxx"
-#include <svx/dialmgr.hxx>
-
-#include "accessibility.hrc"
+#include <editeng/unolingu.hxx>
+#include <editeng/unopracc.hxx>
+#include "editeng/AccessibleEditableTextPara.hxx"
 #include <svtools/colorcfg.hxx>
 
 
@@ -105,7 +102,7 @@ namespace accessibility
             {MAP_CHAR_LEN("ParaUserDefinedAttributes"),     EE_PARA_XMLATTRIBS,     &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  ,        0,     0},
             {0,0,0,0,0,0}
         };
-        static SvxItemPropertySet aPropSet( aPropMap );
+        static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
         return &aPropSet;
     }
 
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 9212b9dd40..9024283c54 100644
--- a/svx/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleImageBullet.cxx,v $
- * $Revision: 1.22 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/gen.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
@@ -43,15 +40,15 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
-#include "unolingu.hxx"
-#include "AccessibleEditableTextPara.hxx"
-#include "AccessibleImageBullet.hxx"
-#include <svx/dialmgr.hxx>
-
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/outliner.hxx>
-#include "accessibility.hrc"
+#include <editeng/unolingu.hxx>
+#include "editeng/AccessibleEditableTextPara.hxx"
+#include "editeng/AccessibleImageBullet.hxx"
+#include <editeng/eerdll.hxx>
+
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include "editeng.hrc"
 #include <svtools/colorcfg.hxx>
 
 
@@ -173,7 +170,7 @@ namespace accessibility
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // Get the string from the resource for the specified id.
-        return ::rtl::OUString( SVX_RESSTR (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) );
+        return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) );
     }
 
     ::rtl::OUString SAL_CALL  AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
@@ -183,7 +180,7 @@ namespace accessibility
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // Get the string from the resource for the specified id.
-        return ::rtl::OUString( SVX_RESSTR (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) );
+        return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) );
     }
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
diff --git a/svx/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 970443c686..6ce6edaa54 100644
--- a/svx/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleParaManager.cxx,v $
- * $Revision: 1.16 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -48,11 +45,11 @@
 //
 //------------------------------------------------------------------------
 
-#include "unoedhlp.hxx"
-#include "unopracc.hxx"
-#include <svx/unoedsrc.hxx>
-#include "AccessibleParaManager.hxx"
-#include "AccessibleEditableTextPara.hxx"
+#include <editeng/unoedhlp.hxx>
+#include <editeng/unopracc.hxx>
+#include <editeng/unoedsrc.hxx>
+#include "editeng/AccessibleParaManager.hxx"
+#include "editeng/AccessibleEditableTextPara.hxx"
 
 
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 37b769c44f..784b1ac5cd 100644
--- a/svx/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleSelectionBase.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,9 +26,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include "AccessibleSelectionBase.hxx"
+#include <editeng/AccessibleSelectionBase.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index c0227e63cb..93e06493f1 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleStaticTextBase.cxx,v $
- * $Revision: 1.27 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -57,11 +54,11 @@
 //
 //------------------------------------------------------------------------
 
-#include <svx/editdata.hxx>
-#include "unopracc.hxx"
-#include "unoedprx.hxx"
-#include "AccessibleStaticTextBase.hxx"
-#include "AccessibleEditableTextPara.hxx"
+#include <editeng/editdata.hxx>
+#include <editeng/unopracc.hxx>
+#include "editeng/unoedprx.hxx"
+#include <editeng/AccessibleStaticTextBase.hxx>
+#include "editeng/AccessibleEditableTextPara.hxx"
 
 
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 6a38e254ff..c530d118da 100644
--- a/svx/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleStringWrap.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,15 +26,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <algorithm>
 #include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
 
-#include <svx/svxfont.hxx>
-#include "AccessibleStringWrap.hxx"
-
+#include <editeng/svxfont.hxx>
+#include <editeng/AccessibleStringWrap.hxx>
 
 //------------------------------------------------------------------------
 //
diff --git a/svx/source/outliner/outliner.hrc b/editeng/source/accessibility/accessibility.src
index 1b60bf32f5..51d2a49e6e 100644
--- a/svx/source/outliner/outliner.hrc
+++ b/editeng/source/accessibility/accessibility.src
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outliner.hrc,v $
- * $Revision: 1.3 $
+ * $RCSfile: accessibility.src,v $
+ * $Revision: 1.34 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,22 +27,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _OUTLINER_HRC
-#define _OUTLINER_HRC
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
+#include "editeng.hrc"
 
-#ifndef RID_OUTL_START
-#define RID_OUTL_START				( RID_EDIT_END + 100 )
-#endif
+String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
+{
+    Text [ en-US ] = "Image bullet in paragraph" ;
+};
+
+String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
+{
+    Text [ en-US ] = "Image bullet" ;
+};
 
-#define RID_OUTLUNDO_DEPTH			( RID_OUTL_START + 0 )
-#define RID_OUTLUNDO_HEIGHT			( RID_OUTL_START + 1 )
-#define RID_OUTLUNDO_EXPAND			( RID_OUTL_START + 2 )
-#define RID_OUTLUNDO_COLLAPSE 		( RID_OUTL_START + 3 )
-#define RID_OUTLUNDO_ATTR 			( RID_OUTL_START + 4 )
-#define RID_OUTLUNDO_INSERT 		( RID_OUTL_START + 5 )
 
-#endif	// _OUTLINER_HRC
diff --git a/svx/source/options/makefile.mk b/editeng/source/accessibility/makefile.mk
index 6f15d41ad0..e29b6477f6 100644..100755
--- a/svx/source/options/makefile.mk
+++ b/editeng/source/accessibility/makefile.mk
@@ -1,14 +1,14 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE 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.31 $
+# $Revision: 1.25 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -28,15 +28,12 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..$/..
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util\svxpch
+PRJ=..$/..
 
-PRJNAME=svx
-TARGET=options
-LIBTARGET=NO
+PRJNAME=editeng
+TARGET=accessibility
+ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
@@ -45,24 +42,17 @@ LIBTARGET=NO
 
 # --- Files --------------------------------------------------------
 
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    optgrid.src     
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-    $(SLO)$/asiancfg.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-    $(SLO)$/htmlcfg.obj \
-    $(SLO)$/optitems.obj    \
-    $(SLO)$/optgrid.obj \
-    $(SLO)$/srchcfg.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-# --- Targets -------------------------------------------------------
+SLOFILES = \
+    $(SLO)$/AccessibleStringWrap.obj			\
+    $(SLO)$/AccessibleContextBase.obj			\
+    $(SLO)$/AccessibleComponentBase.obj			\
+    $(SLO)$/AccessibleSelectionBase.obj			\
+    $(SLO)$/AccessibleStaticTextBase.obj		\
+    $(SLO)$/AccessibleParaManager.obj			\
+    $(SLO)$/AccessibleEditableTextPara.obj		\
+    $(SLO)$/AccessibleImageBullet.obj			
+    
+# --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
 
diff --git a/svx/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 1ac66fb300..0e6ae868af 100644
--- a/svx/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editattr.cxx,v $
- * $Revision: 1.16.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,33 +26,36 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
-
-#include <svx/svxfont.hxx>
-#include <svx/flditem.hxx>
-#include <fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-
-
-#include <editattr.hxx>
+#include "precompiled_editeng.hxx"
+
+//#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/svxfont.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+
+#include "editattr.hxx"
 
 DBG_NAME( EE_EditAttrib )
 
diff --git a/svx/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 818ae1f710..da0de76b11 100644
--- a/svx/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editattr.hxx,v $
- * $Revision: 1.13.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef _EDITATTR_HXX
 #define	_EDITATTR_HXX
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 class SvxFont;
 class SvxFontItem;
diff --git a/svx/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index c93e7bc63f..47611286ca 100644
--- a/svx/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editdbg.cxx,v $
- * $Revision: 1.22.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,43 +26,41 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
 
-#ifndef _MSGBOX_HXX //autogen
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
-#endif
-
-#include <svx/lspcitem.hxx>
-
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/lspcitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #include <editdoc.hxx>
 #include <editdbg.hxx>
 
diff --git a/svx/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index 78764a0c9a..f33d6ec1f3 100644
--- a/svx/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editdbg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@ class SfxPoolItem;
 ByteString 	DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem );
 void 		DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL );
 
-class SVX_DLLPUBLIC EditDbg
+class EditDbg
 {
 public:
     static void			ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE );
diff --git a/svx/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index d5f9ee16ee..7b34d931e2 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editdoc.cxx,v $
- * $Revision: 1.48.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,45 +26,44 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
-
-#include <svx/tstpitem.hxx>
-#include <svx/colritem.hxx>
-#include <fontitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <xmlcnitm.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/tstpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editeng/editids.hrc>
 
 #include <editdoc.hxx>
 #include <editdbg.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include <tools/stream.hxx>
-
 #include <tools/debug.hxx>
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
-
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HPP_
 #include <com/sun/star/i18n/ScriptType.hpp>
-#endif
-
 #include <stdlib.h>	// qsort
 
 using namespace ::com::sun::star;
diff --git a/svx/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 0828f9dc4e..e3ad32cfab 100644
--- a/svx/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editdoc.hxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +34,7 @@
 
 #include <editattr.hxx>
 #include <edtspell.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 4aba92347e..1c277845a2 100644
--- a/svx/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editdoc2.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,37 +26,41 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <svl/smplhint.hxx>
+
 #include <tools/rtti.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
 
 #include <editdoc.hxx>
 #include <impedit.hxx>
 #include <editdbg.hxx>
 
-#include <svx/numitem.hxx>
-
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/charscaleitem.hxx>
+#include <editeng/numitem.hxx>
+
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/charscaleitem.hxx>
 
 #include <vcl/svapp.hxx>	// Fuer AppWindow...
 
diff --git a/svx/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 67f8cb69ad..ef1b0c1db9 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editeng.cxx,v $
- * $Revision: 1.117.12.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,10 +26,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
-// #define _SOLAR__PRIVATE 1
 #define USE_SVXFONT
 
 #define _SVSTDARR_USHORTS
@@ -40,58 +40,56 @@
 #include <svl/ctloptions.hxx>
 #include <svtools/ctrltool.hxx>
 
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <editstat.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editstat.hxx>
 #include <editdbg.hxx>
 #include <eerdll2.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <editeng.hrc>
-#include <svx/flditem.hxx>
-#include <txtrange.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/txtrange.hxx>
 #include <vcl/graph.hxx>
 
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 
-#include <svx/numitem.hxx>
-#include <bulitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vcl/help.hxx>
-#include <svx/xpoly.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 
-#include <sfx2/srchdefs.hxx>
+#include <svl/srchdefs.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
-#include <svx/frmdiritem.hxx>
+#include <editeng/frmdiritem.hxx>
 #endif
 #include <basegfx/polygon/b2dpolygon.hxx>
 
@@ -111,6 +109,7 @@ static sal_Bool bDebugPaint = sal_False;
 
 SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
 
+static SfxItemPool* pGlobalPool=0;
 
 // ----------------------------------------------------------------------
 // EditEngine
@@ -1146,9 +1145,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
                     pEditView->pImpEditView->DrawSelection();
                     // Autokorrektur ?
                     if ( ( pImpEditEngine->GetStatus().DoAutoCorrect() ) &&
-                         (  ( nCharCode == ' ' ) || ( nCharCode == '*' ) ||
-                             ( nCharCode == '\"' ) || ( nCharCode == '\'' ) ||
-                            ( nCharCode == '_' )  ))
+                        SvxAutoCorrect::IsAutoCorrectChar( nCharCode ) )
                     {
                         aCurSel = pImpEditEngine->AutoCorrect( aCurSel, nCharCode, !pEditView->IsInsertMode() );
                     }
@@ -2620,6 +2617,13 @@ SfxItemPool* EditEngine::CreatePool( sal_Bool bPersistentRefCounts )
     return pPool;
 }
 
+SfxItemPool& EditEngine::GetGlobalItemPool()
+{
+    if ( !pGlobalPool )
+        pGlobalPool = CreatePool();
+    return *pGlobalPool;
+}
+
 sal_uInt32 EditEngine::RegisterClipboardFormatName()
 {
     static sal_uInt32 nFormat = 0;
diff --git a/svx/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index 1204ba1661..7543185f24 100644
--- a/svx/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.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: editeng.src,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/svx/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 496106efb0..6370ec605f 100644
--- a/svx/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editobj.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,26 +26,28 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #define ENABLE_STRING_STREAM_OPERATORS
 #include <tools/stream.hxx>
 
 #include <editobj2.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <editattr.hxx>
-#include <svx/editeng.hxx>
-#include <fontitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <bulitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <vcl/graph.hxx>
 #include <svl/intitem.hxx>
 #include <unotools/fontcvt.hxx>
diff --git a/svx/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index ab8d1c9347..b7eae5dc22 100644
--- a/svx/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editobj2.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef _EDITOBJ2_HXX
 #define _EDITOBJ2_HXX
 
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <editdoc.hxx>
 
 #include <unotools/fontcvt.hxx>
diff --git a/svx/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 90e1ea91d2..55dca7e631 100644
--- a/svx/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsel.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,13 +26,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <editsel.hxx>
 #include <impedit.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 
 //	----------------------------------------------------------------------
 //	class EditSelFunctionSet
diff --git a/svx/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index bc4b78bb1d..82b6724edf 100644
--- a/svx/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsel.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx
index 896c1768d9..3ca3829c32 100644
--- a/svx/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editstt2.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef _EDITSTT2_HXX
 #define _EDITSTT2_HXX
 
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 
 class InternalEditStatus : public EditStatus
 {
diff --git a/svx/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index be57d52112..9d6f8bedbb 100644
--- a/svx/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editundo.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,14 +26,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <impedit.hxx>
 #include <editundo.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 
 DBG_NAME( EditUndo )
 
diff --git a/svx/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 1def47b7e9..ae8e7fae81 100644
--- a/svx/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editundo.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,8 +29,8 @@
 #define _EDITUNDO_HXX
 
 #include <editdoc.hxx>
-#include <editund2.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editund2.hxx>
+#include <editeng/editdata.hxx>
 
 #define UNDO_NOACTION			0
 #define UNDO_NEWUNDO			1
diff --git a/svx/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index ff0928954e..d9f60c5f64 100644
--- a/svx/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editview.cxx,v $
- * $Revision: 1.52.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,52 +26,51 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/i18n/WordType.hpp>
 #include <vcl/metric.hxx>
 
-#define _SOLAR__PRIVATE 1
-
 #include <i18npool/mslangid.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/ctrltool.hxx>
+#include <svtools/langtab.hxx>
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/flditem.hxx>
-#include <svx/svxacorr.hxx>
-#include <svx/langitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <eerdll.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/svxacorr.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include <editeng.hrc>
-#include <dlgutil.hxx>
 #include <helpid.hrc>
 #include <i18npool/lang.h>
 #include <vcl/menu.hxx>
-#include <acorrcfg.hxx>
-#include <unolingu.hxx>
-#include <fontitem.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/fontitem.hxx>
 
 #include <com/sun/star/frame/XStorable.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HDL_
 #include <com/sun/star/beans/PropertyValues.hdl>
-#endif
 #include <com/sun/star/lang/Locale.hpp>
 #include <linguistic/lngprops.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
 
-
 using ::rtl::OUString;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -1080,8 +1076,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
                 nGuessLangPara = nGuessLangWord;
 
             aPopupMenu.InsertSeparator();
-            String aTmpWord( ::GetLanguageString( nGuessLangWord ) );
-            String aTmpPara( ::GetLanguageString( nGuessLangPara ) );
+            String aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) );
+            String aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) );
             String aWordStr( EditResId( RID_STR_WORD ) );
             aWordStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpWord );
             String aParaStr( EditResId( RID_STR_PARAGRAPH ) );
@@ -1547,53 +1543,53 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo
     return bRet;
 }
 
-String EditView::GetSurroundingText() const

-{

-    DBG_CHKTHIS( EditView, 0 );

-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );

-

-    EditSelection aSel( pImpEditView->GetEditSelection() );

-    aSel.Adjust( PIMPEE->GetEditDoc() );

-

-    if( HasSelection() )

-    {

-        XubString aStr = PIMPEE->GetSelected( aSel );

-

-        // Stop reconversion if the selected text includes a line break.

-        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )

-        return aStr;

-        else

-        return String();

-    }

-    else

-    {

-        aSel.Min().SetIndex( 0 );

-        aSel.Max().SetIndex( aSel.Max().GetNode()->Len() );

-        return PIMPEE->GetSelected( aSel );

-    }

-}

-

-Selection EditView::GetSurroundingTextSelection() const

-{

-    DBG_CHKTHIS( EditView, 0 );

-

-    ESelection aSelection( GetSelection() );

-    aSelection.Adjust();

-

-    if( HasSelection() )

-    {

-        EditSelection aSel( pImpEditView->GetEditSelection() );

-        aSel.Adjust( PIMPEE->GetEditDoc() );

-        XubString aStr = PIMPEE->GetSelected( aSel );

-

-        // Stop reconversion if the selected text includes a line break.

-        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )

-        return Selection( 0, aSelection.nEndPos - aSelection.nStartPos );

-        else

-        return Selection( 0, 0 );

-    }

-    else

-    {

-        return Selection( aSelection.nStartPos, aSelection.nEndPos );

-    }

-}

+String EditView::GetSurroundingText() const
+{
+    DBG_CHKTHIS( EditView, 0 );
+    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
+
+    EditSelection aSel( pImpEditView->GetEditSelection() );
+    aSel.Adjust( PIMPEE->GetEditDoc() );
+
+    if( HasSelection() )
+    {
+        XubString aStr = PIMPEE->GetSelected( aSel );
+
+        // Stop reconversion if the selected text includes a line break.
+        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )
+        return aStr;
+        else
+        return String();
+    }
+    else
+    {
+        aSel.Min().SetIndex( 0 );
+        aSel.Max().SetIndex( aSel.Max().GetNode()->Len() );
+        return PIMPEE->GetSelected( aSel );
+    }
+}
+
+Selection EditView::GetSurroundingTextSelection() const
+{
+    DBG_CHKTHIS( EditView, 0 );
+
+    ESelection aSelection( GetSelection() );
+    aSelection.Adjust();
+
+    if( HasSelection() )
+    {
+        EditSelection aSel( pImpEditView->GetEditSelection() );
+        aSel.Adjust( PIMPEE->GetEditDoc() );
+        XubString aStr = PIMPEE->GetSelected( aSel );
+
+        // Stop reconversion if the selected text includes a line break.
+        if ( aStr.Search( 0x0A ) == STRING_NOTFOUND )
+        return Selection( 0, aSelection.nEndPos - aSelection.nStartPos );
+        else
+        return Selection( 0, 0 );
+    }
+    else
+    {
+        return Selection( aSelection.nStartPos, aSelection.nEndPos );
+    }
+}
diff --git a/svx/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 09768f67bf..5b760d8c46 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edtspell.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,19 +26,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <impedit.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 #include <edtspell.hxx>
-#include <svx/flditem.hxx>
-#include <fontitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/inc/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index f2d0717e39..a979b364c6 100644
--- a/svx/inc/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edtspell.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,12 +28,12 @@
 #ifndef _EDTSPELL_HXX
 #define _EDTSPELL_HXX
 
-#include <svx/svxbox.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/splwrap.hxx>
-#include <svx/svxacorr.hxx>
+#include <svtools/svxbox.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/splwrap.hxx>
+#include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace linguistic2 {
     class XSpellChecker1;
@@ -148,7 +145,7 @@ inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos )
 
 
 
-class SVX_DLLPUBLIC EdtAutoCorrDoc : public SvxAutoCorrDoc
+class EdtAutoCorrDoc : public SvxAutoCorrDoc
 {
     ImpEditEngine* 	pImpEE;
     ContentNode*	pCurNode;
diff --git a/svx/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index a497b8a5c3..a6d5096be7 100644
--- a/svx/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eehtml.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,19 +26,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
 
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <eehtml.hxx>
 #include <impedit.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/flditem.hxx>
 #include <tools/urlobj.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 
@@ -52,7 +51,7 @@
 #define STYLE_PRE		  		101
 
 EditHTMLParser::EditHTMLParser( SvStream& rIn, const String& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs )
-    : SfxHTMLParser( rIn, true )
+    : HTMLParser( rIn, true )
     , aBaseURL( rBaseURL )
 {
     pImpEditEngine = 0;
diff --git a/svx/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 0399553998..6314db6161 100644
--- a/svx/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eehtml.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/svarray.hxx>
 
 #include <editdoc.hxx>
-#include <sfx2/sfxhtml.hxx>
+#include <svtools/parhtml.hxx>
 
 class ImpEditEngine;
 
@@ -46,9 +43,7 @@ struct AnchorInfo
     String	aText;
 };
 
-#ifndef SVX_LIGHT
-
-class EditHTMLParser : public SfxHTMLParser
+class EditHTMLParser : public HTMLParser
 {
     using HTMLParser::CallParser;
 private:
@@ -100,6 +95,4 @@ public:
 SV_DECL_REF( EditHTMLParser )
 SV_IMPL_REF( EditHTMLParser );
 
-#endif
-
 #endif // _EEHTML_HXX
diff --git a/svx/source/editeng/eeng_pch.cxx b/editeng/source/editeng/eeng_pch.cxx
index d9afbde59b..2b471257cf 100644
--- a/svx/source/editeng/eeng_pch.cxx
+++ b/editeng/source/editeng/eeng_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: eeng_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
@@ -29,5 +26,5 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <eeng_pch.hxx>
diff --git a/svx/source/editeng/eeng_pch.hxx b/editeng/source/editeng/eeng_pch.hxx
index f4dd0ab7f2..d62f5a428a 100644
--- a/svx/source/editeng/eeng_pch.hxx
+++ b/editeng/source/editeng/eeng_pch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeng_pch.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,10 +31,4 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-
-#ifndef SVX_LIGHT
-#include <svx/thesdlg.hxx>
-#endif
 
diff --git a/svx/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 8ab5389ee1..ab573f9b1f 100644
--- a/svx/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeobj.cxx,v $
- * $Revision: 1.11 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
 #include <eeng_pch.hxx>
@@ -37,7 +34,7 @@
 #include <eeobj.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <svl/itempool.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index c013d040b3..390992f2b7 100644
--- a/svx/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eeobj.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 0951d2c6e4..fa1510ab9c 100644
--- a/svx/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eerdll.cxx,v $
- * $Revision: 1.31.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,52 +26,53 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <svl/solar.hrc>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <bulitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/scriptspaceitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
 #include <svl/itempool.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <xmlcnitm.hxx>
-
-#include <forbiddencharacterstable.hxx>
-
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <comphelper/processfactory.hxx>
 
 static EditDLL* pDLL=0;
@@ -227,7 +225,7 @@ EditResId::EditResId( USHORT nId ):
 EditDLL::EditDLL()
 {
     pGlobalData = new GlobalEditData;
-    ByteString aResMgrName( "svx" );
+    ByteString aResMgrName( "editeng" );
     pResMgr = ResMgr::CreateResMgr(
         aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
 }
diff --git a/svx/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx
index 8b8a584545..5ca92b7e47 100644
--- a/svx/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eerdll2.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,8 +29,7 @@
 #define _EERDLL2_HXX
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <vos/ref.hxx>
 
 class SfxPoolItem;
diff --git a/svx/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 39100e88ab..6301ecce7a 100644
--- a/svx/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eertfpar.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,17 +26,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <eertfpar.hxx>
 #include <impedit.hxx>
 #include <svl/intitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/flditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/flditem.hxx>
 
 #include <svtools/rtftoken.h>
 
diff --git a/svx/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 6969fa62fe..3216dece6b 100644
--- a/svx/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eertfpar.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
 #ifndef _EERTFPAR_HXX
 #define _EERTFPAR_HXX
 
-#include <svxrtf.hxx>
+#include <editeng/svxrtf.hxx>
 
 #include <editdoc.hxx>
 #include <impedit.hxx>
diff --git a/svx/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index cc5e08e5f7..77316af584 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impedit.cxx,v $
- * $Revision: 1.64 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,37 +26,30 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #include <tools/poly.hxx>
-#include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/linguistic2/XDictionaryEntry.hpp>
 #include <com/sun/star/linguistic2/DictionaryType.hpp>
 #include <com/sun/star/linguistic2/DictionaryEvent.hpp>
 #include <com/sun/star/linguistic2/XDictionaryEventListener.hpp>
 #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
-
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANS_HPP_
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#endif
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
-
 #include <vos/mutex.hxx>
-
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/transfer.hxx>
-
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 
diff --git a/svx/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 39cbb85a8e..3d89cf9caa 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impedit.hxx,v $
- * $Revision: 1.89.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,8 +32,8 @@
 #include <editundo.hxx>
 #include <editobj2.hxx>
 #include <editstt2.hxx>
-#include <svx/editdata.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/svxacorr.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/cursor.hxx>
@@ -52,17 +49,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-
-#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
 #include <com/sun/star/i18n/WordType.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
 
 #include <i18npool/lang.h>
-
 #include <vos/ref.hxx>
 
 DBG_NAMEEX( EditView )
@@ -101,9 +91,9 @@ class TextRanger;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
 class SvtCTLOptions;
-#include <svx/SpellPortions.hxx>
+#include <editeng/SpellPortions.hxx>
 
-#include <svx/eedata.hxx>
+#include <editeng/eedata.hxx>
 
 class SvUShorts;
 class SvxNumberFormat;
diff --git a/svx/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 769a5c7ca0..27d95e0979 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impedit2.cxx,v $
- * $Revision: 1.124.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,46 +26,40 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
-#include <svx/lspcitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/flditem.hxx>
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #include <editdbg.hxx>
 #include <eerdll2.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <edtspell.hxx>
 #include <eeobj.hxx>
-#include <txtrange.hxx>
+#include <editeng/txtrange.hxx>
 #include <svl/urlbmk.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svl/ctloptions.hxx>
-#include <acorrcfg.hxx>
-
-#include <svx/fhgtitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <fontitem.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sfx2/dispatch.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/fontitem.hxx>
 #include <vcl/cmdevt.h>
 
-#ifndef SVX_LIGHT
-#ifndef _SFXFRAME_HXX //autogen
-#include <sfx2/frame.hxx>
-#endif
-#endif
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -641,41 +632,41 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView )
             pView->GetWindow()->SetCursorRect();
         }
     }
-    else if ( rCEvt.GetCommand() == COMMAND_SELECTIONCHANGE )

-    {

-        const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData();

-

-        ESelection aSelection = pView->GetSelection();

-        aSelection.Adjust();

-

-        if( pView->HasSelection() )

-        {

-            aSelection.nEndPos = aSelection.nStartPos;

-            aSelection.nStartPos += pData->GetStart();

-            aSelection.nEndPos += pData->GetEnd();

-        }

-        else

-        {

-            aSelection.nStartPos = pData->GetStart();

-            aSelection.nEndPos = pData->GetEnd();

-        }

-        pView->SetSelection( aSelection );

-    }

-    else if ( rCEvt.GetCommand() == COMMAND_PREPARERECONVERSION )

-    {

-        if ( pView->HasSelection() )

-        {

-            ESelection aSelection = pView->GetSelection();

-            aSelection.Adjust();

-

-            if ( aSelection.nStartPara != aSelection.nEndPara )

-            {

-                xub_StrLen aParaLen = pEditEngine->GetTextLen( aSelection.nStartPara );

-                aSelection.nEndPara = aSelection.nStartPara;

-                aSelection.nEndPos = aParaLen;

-                pView->SetSelection( aSelection );

-            }

-        }

+    else if ( rCEvt.GetCommand() == COMMAND_SELECTIONCHANGE )
+    {
+        const CommandSelectionChangeData *pData = rCEvt.GetSelectionChangeData();
+
+        ESelection aSelection = pView->GetSelection();
+        aSelection.Adjust();
+
+        if( pView->HasSelection() )
+        {
+            aSelection.nEndPos = aSelection.nStartPos;
+            aSelection.nStartPos += pData->GetStart();
+            aSelection.nEndPos += pData->GetEnd();
+        }
+        else
+        {
+            aSelection.nStartPos = pData->GetStart();
+            aSelection.nEndPos = pData->GetEnd();
+        }
+        pView->SetSelection( aSelection );
+    }
+    else if ( rCEvt.GetCommand() == COMMAND_PREPARERECONVERSION )
+    {
+        if ( pView->HasSelection() )
+        {
+            ESelection aSelection = pView->GetSelection();
+            aSelection.Adjust();
+
+            if ( aSelection.nStartPara != aSelection.nEndPara )
+            {
+                xub_StrLen aParaLen = pEditEngine->GetTextLen( aSelection.nStartPara );
+                aSelection.nEndPara = aSelection.nStartPara;
+                aSelection.nEndPos = aParaLen;
+                pView->SetSelection( aSelection );
+            }
+        }
     }
 
     GetSelEngine().Command( rCEvt );
diff --git a/svx/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index a51824ec34..125e0e898c 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impedit3.cxx,v $
- * $Revision: 1.124.82.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,56 +26,53 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
 
-#ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
-#endif
-
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/lspcitem.hxx>
-
-#include <svx/flditem.hxx>
-
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/flditem.hxx>
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <txtrange.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <fontitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/txtrange.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/numitem.hxx>
 
 #include <svtools/colorcfg.hxx>
 #include <svl/ctloptions.hxx>
 
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 
 #include <math.h>
 #include <vcl/svapp.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <vcl/metric.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/text/CharacterCompressionType.hpp>
diff --git a/svx/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 98d8c7eb03..e629a0a00f 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impedit4.cxx,v $
- * $Revision: 1.78.54.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,74 +26,62 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
 
-#ifndef _MSGBOX_HXX //autogen
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
-#endif
 #include <vcl/svapp.hxx>
 
-#include <sfx2/srchitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
+#include <svl/srchitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
 
 #include <eertfpar.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <impedit.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <eehtml.hxx>
 #include <editobj2.hxx>
 #include <i18npool/lang.h>
 
-#include <editxml.hxx>
-
-
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/emphitem.hxx>
+#include "editxml.hxx"
+
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/emphitem.hxx>
 #include <textconv.hxx>
-
 #include <rtl/tencinfo.h>
-
 #include <svtools/rtfout.hxx>
-
-#ifndef SVX_LIGHT
 #include <edtspell.hxx>
-#endif
-#include <svx/scripttypeitem.hxx>
-#include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XMeaning.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <unotools/transliterationwrapper.hxx>
-
-#ifndef _TXTCMP_HXX //autogen
 #include <unotools/textsearch.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <vcl/help.hxx>
-
 #include <svtools/rtfkeywd.hxx>
+#include <editeng/edtdlg.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1550,8 +1535,8 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
             lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
 #endif
             bHasConvTxt =   (nSrcLang == nLangFound) ||
-                            (svx::HangulHanjaConversion::IsChinese( nLangFound ) &&
-                             svx::HangulHanjaConversion::IsChinese( nSrcLang ));
+                            (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
+                             editeng::HangulHanjaConversion::IsChinese( nSrcLang ));
             if (bHasConvTxt)
                 return bHasConvTxt;
        }
@@ -1600,7 +1585,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
         // not work. Thus since chinese conversion is not interactive we start
         // at the begin of the paragraph to solve the problem, i.e. have the
         // TextConversion service get those characters together in the same call.
-        USHORT nStartIdx = ( svx::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
+        USHORT nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
                                 0 : aWordStartPaM.GetIndex();
         pConvInfo->aConvStart.nIndex = nStartIdx;
     }
@@ -1764,8 +1749,8 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
             lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
 #endif
             sal_Bool bLangOk =  (nLangFound == nSrcLang) ||
-                                (svx::HangulHanjaConversion::IsChinese( nLangFound ) &&
-                                 svx::HangulHanjaConversion::IsChinese( nSrcLang ));
+                                (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
+                                 editeng::HangulHanjaConversion::IsChinese( nSrcLang ));
 
             if (nAttribEnd != USHRT_MAX) // start already found?
             {
@@ -2563,18 +2548,19 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
     if (!xThes.is())
         return EE_SPELL_ERRORFOUND;
 
-    SvxThesaurusDialog aDialog( pEditView->GetWindow(), xThes, aWord, GetLanguage( aCurSel.Max() ) );
-
-    if ( aDialog.Execute() == RET_OK )
+    EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
+    AbstractThesaurusDialog* pDlg = pFact->CreateThesaurusDialog( pEditView->GetWindow(), xThes, aWord, GetLanguage( aCurSel.Max() ) );
+    if ( pDlg->Execute() == RET_OK )
     {
         // Wort ersetzen...
         pEditView->pImpEditView->DrawSelection();
         pEditView->pImpEditView->SetEditSelection( aCurSel );
         pEditView->pImpEditView->DrawSelection();
-        pEditView->InsertText( aDialog.GetWord() );
+        pEditView->InsertText( pDlg->GetWord() );
         pEditView->ShowCursor( sal_True, sal_False );
     }
 
+    delete pDlg;
     return EE_SPELL_OK;
 #else
     return EE_SPELL_NOSPELLER;
diff --git a/svx/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 02535744fe..55c65ef3cf 100644
--- a/svx/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impedit5.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,18 +26,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <editdbg.hxx>
 
 #include <svl/smplhint.hxx>
 
 
-#include <svx/lrspitem.hxx>
+#include <editeng/lrspitem.hxx>
 
 void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
 {
diff --git a/svx/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk
index 6df91a78f8..4a8f8f2540 100644
--- a/svx/source/editeng/makefile.mk
+++ b/editeng/source/editeng/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -30,13 +26,13 @@
 #*************************************************************************
 PRJ=..$/..
 
-PRJNAME=svx
+PRJNAME=editeng
 TARGET=editeng
 AUTOSEG=true
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=eeng_pch
-PROJECTPCHSOURCE=eeng_pch
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=eeng_pch
+#PROJECTPCHSOURCE=eeng_pch
 
 ENABLE_EXCEPTIONS=TRUE
 
@@ -53,13 +49,7 @@ CDEFS+=-DEDITDEBUG
 .ENDIF
 
 SLOFILES =	\
-            $(SLO)$/svxacorr.obj \
-            $(SLO)$/acorrcfg.obj \
-            $(SLO)$/txtrange.obj \
-            $(SLO)$/SvXMLAutoCorrectImport.obj \
-            $(SLO)$/SvXMLAutoCorrectExport.obj \
-            $(SLO)$/forbiddencharacterstable.obj \
-            $(SLO)$/swafopt.obj \
+            $(SLO)$/textconv.obj \
             $(SLO)$/editattr.obj \
             $(SLO)$/editdbg.obj	\
             $(SLO)$/editdoc.obj	\
@@ -78,9 +68,7 @@ SLOFILES =	\
             $(SLO)$/impedit2.obj \
             $(SLO)$/impedit3.obj \
             $(SLO)$/impedit4.obj \
-            $(SLO)$/impedit5.obj \
-            $(SLO)$/textconv.obj \
-            $(SLO)$/unolingu.obj
+            $(SLO)$/impedit5.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES=	editeng.src
diff --git a/svx/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 4975b0cf7f..41ec376497 100644
--- a/svx/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textconv.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,18 +26,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <impedit.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
-#include <unolingu.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <svx/langitem.hxx>
-#include <fontitem.hxx>
-#include "textconv.hxx"
+#include <editeng/langitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <textconv.hxx>
 
 
 using ::rtl::OUString;
diff --git a/svx/inc/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 01af93edfa..4a478af5d0 100644
--- a/svx/inc/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textconv.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,17 +27,17 @@
 #ifndef _TEXTCONV_HXX
 #define _TEXTCONV_HXX
 
-#include <svx/splwrap.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/splwrap.hxx>
+#include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svx/hangulhanja.hxx>
+#include <editeng/hangulhanja.hxx>
 
 class EditView;
 class ImpEditEngine;
 class ContentNode;
 
-class TextConvWrapper : public svx::HangulHanjaConversion 
+class TextConvWrapper : public editeng::HangulHanjaConversion 
 {
     rtl::OUString   aConvText;      // convertible text part found last time
     LanguageType    nConvTextLang;  // language of aConvText
diff --git a/svx/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 36ca6126a0..ff81548d0a 100644
--- a/svx/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bulitem.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,17 +26,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/stream.hxx>
-
 #include <vcl/outdev.hxx>
 
 #define _SVX_BULITEM_CXX
 
-#include "bulitem.hxx"
-#include "svxerr.hxx"
+#include <editeng/bulitem.hxx>
+#include <editeng/editrids.hrc>
 
 // #90477#
 #include <tools/tenccvt.hxx>
diff --git a/svx/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 0ae65385d2..515aef9282 100644
--- a/svx/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charhiddenitem.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,12 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
-#include <charhiddenitem.hxx>
-#include <svx/svxitems.hrc>
-#include <svx/dialmgr.hxx>
+#include <editeng/charhiddenitem.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
 
 TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_False, 0));
 
@@ -75,7 +72,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
diff --git a/svx/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 486debf4b2..b5151dc71e 100644
--- a/svx/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flditem.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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/zforlist.hxx>
 #include <tools/urlobj.hxx>
@@ -37,9 +34,9 @@
 #define _SVX_FLDITEM_CXX
 #include <unotools/localfilehelper.hxx>
 
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 
-#include <svx/svdfield.hxx>
+#include <editeng/measfld.hxx>
 
 // #90477#
 #include <tools/tenccvt.hxx>
diff --git a/svx/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 2ef2ff6f57..a7cc6bdaad 100644
--- a/svx/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmitems.cxx,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,62 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/script/XTypeConverter.hpp>
-
-#include <limits.h>
-#include <comphelper/processfactory.hxx>
-
-
-#include <goodies/grfmgr.hxx>
-#include <tools/urlobj.hxx>
-#ifndef SVX_LIGHT
-#ifndef _SFXDOCFILE_HXX //autogen
-#include <sfx2/docfile.hxx>
-#endif
-#include <sfx2/objsh.hxx>
-#endif // !SVX_LIGHT
-#include <basic/sbx.hxx>
-#define GLOBALOVERFLOW3
-
-#define _SVX_FRMITEMS_CXX
-
-#include <svl/memberid.hrc>
-#include <svtools/wallitem.hxx>
-#include <svl/cntwall.hxx>
-
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <svx/impgrf.hxx>
-#include <svx/svxids.hrc>
-#include <svx/svxitems.hrc>
-#include <svx/dialogs.hrc>
-
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include "prntitem.hxx"
-#include "opaqitem.hxx"
-#include "protitem.hxx"
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include "bolnitem.hxx"
-#include <svx/brshitem.hxx>
-//CHINA001 #include "backgrnd.hxx"
-#include <svx/frmdiritem.hxx>
-
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
-#include <svx/unoprnms.hxx>
-#include <com/sun/star/table/BorderLine.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/table/CellVertJustify.hpp>
 #include <com/sun/star/table/ShadowLocation.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
@@ -106,8 +53,44 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/frame/status/UpperLowerMarginScale.hpp>
 
+#include <unotools/ucbstreamhelper.hxx>
+#include <limits.h>
+#include <comphelper/processfactory.hxx>
+#include <svtools/grfmgr.hxx>
+#include <tools/urlobj.hxx>
 #include <comphelper/types.hxx>
-#include <svx/unomid.hxx>
+#include <svl/memberid.hrc>
+#include <svtools/wallitem.hxx>
+#include <svl/cntwall.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <svtools/filter.hxx>
+
+#define GLOBALOVERFLOW3
+
+#define _SVX_FRMITEMS_CXX
+
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng/pbinitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/prntitem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/protitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/keepitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/memberids.hrc>
+#include <editeng/editerr.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -193,7 +176,6 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )	const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -209,10 +191,10 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
             BYTE nValue = GetValue();
 
             if ( PAPERBIN_PRINTER_SETTINGS == nValue )
-                rText = SVX_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
+                rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
             else
             {
-                rText = SVX_RESSTR(RID_SVXSTR_PAPERBIN);
+                rText = EE_RESSTR(RID_SVXSTR_PAPERBIN);
                 rText += sal_Unicode(' ');
                 rText += String::CreateFromInt32( nValue );
             }
@@ -221,7 +203,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
         //no break necessary
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
+
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -356,13 +338,13 @@ SfxItemPresentation SvxSizeItem::GetPresentation
             return SFX_ITEM_PRESENTATION_NAMELESS;
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
-            rText = SVX_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
+            rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
             rText += GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl );
-            rText += SVX_RESSTR(GetMetricId(ePresUnit));
+            rText += EE_RESSTR(GetMetricId(ePresUnit));
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
+            rText += EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
             rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
-            rText += SVX_RESSTR(GetMetricId(ePresUnit));
+            rText += EE_RESSTR(GetMetricId(ePresUnit));
             return SFX_ITEM_PRESENTATION_COMPLETE;
         //no break necessary
         default: ;//prevent warning
@@ -624,19 +606,19 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
+            rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
             if ( 100 != nPropLeftMargin )
                 ( rText += String::CreateFromInt32( nPropLeftMargin )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nLeftMargin,
                                        eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             rText += cpDelim;
             if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
             {
-                rText += SVX_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
+                rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
                 if ( 100 != nPropFirstLineOfst )
                     ( rText += String::CreateFromInt32( nPropFirstLineOfst ))
                             += sal_Unicode('%');
@@ -644,18 +626,18 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
                 {
                     rText += GetMetricText( (long)nFirstLineOfst,
                                             eCoreUnit, ePresUnit, pIntl );
-                    rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                    rText += EE_RESSTR(GetMetricId(ePresUnit));
                 }
                 rText += cpDelim;
             }
-            rText += SVX_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
+            rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
             if ( 100 != nPropRightMargin )
                 ( rText += String::CreateFromInt32( nPropRightMargin )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nRightMargin,
                                         eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
@@ -974,22 +956,22 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
+            rText = EE_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
             if ( 100 != nPropUpper )
                 ( rText += String::CreateFromInt32( nPropUpper )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
+            rText += EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
             if ( 100 != nPropLower )
                 ( rText += String::CreateFromInt32( nPropLower )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
@@ -1106,7 +1088,7 @@ SfxItemPresentation SvxPrintItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_PRINT_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1163,7 +1145,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_OPAQUE_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1254,19 +1236,19 @@ SfxItemPresentation SvxProtectItem::GetPresentation
 
             if ( bCntnt )
                 nId = RID_SVXITEMS_PROT_CONTENT_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PROT_SIZE_FALSE;
 
             if ( bSize )
                 nId = RID_SVXITEMS_PROT_SIZE_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PROT_POS_FALSE;
 
             if ( bPos )
                 nId = RID_SVXITEMS_PROT_POS_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1480,28 +1462,28 @@ SfxItemPresentation SvxShadowItem::GetPresentation
 
             if ( aShadowColor.GetTransparency() )
                 nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+            rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
             return ePres;
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
             rText += ::GetColorString( aShadowColor );
             rText += cpDelim;
 
             sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
             if ( aShadowColor.GetTransparency() )
                 nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
-            rText += SVX_RESSTR(GetMetricId(ePresUnit));
+            rText += EE_RESSTR(GetMetricId(ePresUnit));
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+            rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
             return ePres;
         }
         default: ;//prevent warning
@@ -1566,7 +1548,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
 XubString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" );
-    return XubString( SVX_RES( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
+    return XubString( EditResId( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
 }
 
 // -----------------------------------------------------------------------
@@ -1700,10 +1682,10 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
     aStr += cpDelim;
 
     if ( nResId )
-        aStr += SVX_RESSTR(nResId);
+        aStr += EE_RESSTR(nResId);
     else
     {
-        String sMetric = SVX_RESSTR(GetMetricId( eDestUnit ));
+        String sMetric = EE_RESSTR(GetMetricId( eDestUnit ));
         aStr += GetMetricText( (long)nInWidth, eSrcUnit, eDestUnit, pIntl );
         if ( bMetricStr )
             aStr += sMetric;
@@ -1845,7 +1827,7 @@ int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
 }
 
 // -----------------------------------------------------------------------
-table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert)
+table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert)
 {
     table::BorderLine aLine;
     if(pLine)
@@ -1874,10 +1856,10 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
         {
             // 4 Borders and 5 distances
             uno::Sequence< uno::Any > aSeq( 9 );
-            aSeq[0] = uno::makeAny( lcl_SvxLineToLine(GetLeft(), bConvert) );
-            aSeq[1] = uno::makeAny( lcl_SvxLineToLine(GetRight(), bConvert) );
-            aSeq[2] = uno::makeAny( lcl_SvxLineToLine(GetBottom(), bConvert) );
-            aSeq[3] = uno::makeAny( lcl_SvxLineToLine(GetTop(), bConvert) );
+            aSeq[0] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetLeft(), bConvert) );
+            aSeq[1] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetRight(), bConvert) );
+            aSeq[2] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetBottom(), bConvert) );
+            aSeq[3] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetTop(), bConvert) );
             aSeq[4] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( GetDistance()) : GetDistance()));
             aSeq[5] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( nTopDist ) : nTopDist ));
             aSeq[6] <<= uno::makeAny( (sal_Int32)(bConvert ? TWIP_TO_MM100_UNSIGNED( nBottomDist ) : nBottomDist ));
@@ -1889,22 +1871,22 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
         case MID_LEFT_BORDER:
             bSerialize = sal_True;      // intentionally no break!
         case LEFT_BORDER:
-            aRetLine = lcl_SvxLineToLine(GetLeft(), bConvert);
+            aRetLine = SvxBoxItem::SvxLineToLine(GetLeft(), bConvert);
             break;
         case MID_RIGHT_BORDER:
             bSerialize = sal_True;      // intentionally no break!
         case RIGHT_BORDER:
-            aRetLine = lcl_SvxLineToLine(GetRight(), bConvert);
+            aRetLine = SvxBoxItem::SvxLineToLine(GetRight(), bConvert);
             break;
         case MID_BOTTOM_BORDER:
             bSerialize = sal_True;      // intentionally no break!
         case BOTTOM_BORDER:
-            aRetLine = lcl_SvxLineToLine(GetBottom(), bConvert);
+            aRetLine = SvxBoxItem::SvxLineToLine(GetBottom(), bConvert);
             break;
         case MID_TOP_BORDER:
             bSerialize = sal_True;      // intentionally no break!
         case TOP_BORDER:
-            aRetLine = lcl_SvxLineToLine(GetTop(), bConvert);
+            aRetLine = SvxBoxItem::SvxLineToLine(GetTop(), bConvert);
             break;
         case BORDER_DISTANCE:
             nDist = GetDistance();
@@ -1951,7 +1933,7 @@ sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
 }
 
 // -----------------------------------------------------------------------
-sal_Bool lcl_LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
 {
     rSvxLine.SetColor(   Color(rLine.Color));
     rSvxLine.SetInWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth  ));
@@ -1982,7 +1964,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 table::BorderLine aBorderLine;
                 if ( aSeq[0] >>= aBorderLine )
                 {
-                    sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+                    sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
                     SetLine(bSet ? &aLine : 0, BOX_LINE_LEFT );
                 }
                 else
@@ -1990,7 +1972,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
                 if ( aSeq[1] >>= aBorderLine )
                 {
-                    sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+                    sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
                     SetLine(bSet ? &aLine : 0, BOX_LINE_RIGHT );
                 }
                 else
@@ -1998,7 +1980,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
                 if ( aSeq[2] >>= aBorderLine )
                 {
-                    sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+                    sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
                     SetLine(bSet ? &aLine : 0, BOX_LINE_BOTTOM );
                 }
                 else
@@ -2006,7 +1988,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 
                 if ( aSeq[3] >>= aBorderLine )
                 {
-                    sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+                    sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
                     SetLine(bSet ? &aLine : 0, BOX_LINE_TOP );
                 }
                 else
@@ -2116,7 +2098,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         else
             return sal_False;
 
-        sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+        sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
         SetLine(bSet ? &aLine : 0, nLine);
     }
 
@@ -2194,12 +2176,12 @@ SfxItemPresentation SvxBoxItem::GetPresentation
         {
             if( !(pTop || pBottom || pLeft || pRight) )
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_BORDER_NONE);
+                rText = EE_RESSTR(RID_SVXITEMS_BORDER_NONE);
                 rText += cpDelim;
             }
             else
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_BORDER_COMPLETE);
+                rText = EE_RESSTR(RID_SVXITEMS_BORDER_COMPLETE);
                 if( pTop && pBottom && pLeft && pRight &&
                     *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight )
                 {
@@ -2210,60 +2192,60 @@ SfxItemPresentation SvxBoxItem::GetPresentation
                 {
                     if ( pTop )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_TOP);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP);
                         rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                     if ( pBottom )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
                         rText += pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                     if ( pLeft )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_LEFT);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT);
                         rText += pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                     if ( pRight )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
                         rText += pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                 }
             }
 
-            rText += SVX_RESSTR(RID_SVXITEMS_BORDER_DISTANCE);
+            rText += EE_RESSTR(RID_SVXITEMS_BORDER_DISTANCE);
             if( nTopDist == nBottomDist && nTopDist == nLeftDist &&
                 nTopDist == nRightDist )
             {
                 rText += GetMetricText( (long)nTopDist, eCoreUnit,
                                             ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             else
             {
-                (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_TOP))
+                (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP))
                       += GetMetricText( (long)nTopDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit)))
+                      += EE_RESSTR(GetMetricId(ePresUnit)))
                       += cpDelim;
-                (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
+                (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
                       += GetMetricText( (long)nBottomDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit)))
+                      += EE_RESSTR(GetMetricId(ePresUnit)))
                       += cpDelim;
-                (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_LEFT))
+                (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT))
                       += GetMetricText( (long)nLeftDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit)))
+                      += EE_RESSTR(GetMetricId(ePresUnit)))
                       += cpDelim;
-                ((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
+                ((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
                       += GetMetricText( (long)nRightDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit));
+                      += EE_RESSTR(GetMetricId(ePresUnit));
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
@@ -2811,8 +2793,8 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
         {
             // 2 BorderLines, flags, valid flags and distance
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 5 );
-            aSeq[0] = ::com::sun::star::uno::makeAny( lcl_SvxLineToLine( pHori, bConvert) );
-            aSeq[1] = ::com::sun::star::uno::makeAny( lcl_SvxLineToLine( pVert, bConvert) );
+            aSeq[0] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pHori, bConvert) );
+            aSeq[1] = ::com::sun::star::uno::makeAny( SvxBoxItem::SvxLineToLine( pVert, bConvert) );
             if ( IsTable() )
                 nVal |= 0x01;
             if ( IsDist() )
@@ -2829,11 +2811,11 @@ sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
 
         case MID_HORIZONTAL:
             bSerialize = sal_True;
-            aRetLine = lcl_SvxLineToLine( pHori, bConvert);
+            aRetLine = SvxBoxItem::SvxLineToLine( pHori, bConvert);
             break;
         case MID_VERTICAL:
             bSerialize = sal_True;
-            aRetLine = lcl_SvxLineToLine( pVert, bConvert);
+            aRetLine = SvxBoxItem::SvxLineToLine( pVert, bConvert);
             break;
         case MID_FLAGS:
             bIntMember = sal_True;
@@ -2900,7 +2882,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 sal_Int32 nVal( 0 );
                 if ( aSeq[0] >>= aBorderLine )
                 {
-                    sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+                    sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
                     if ( bSet )
                         SetLine( &aLine, BOXINFO_LINE_HORI );
                 }
@@ -2908,7 +2890,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     return sal_False;
                 if ( aSeq[1] >>= aBorderLine )
                 {
-                    sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+                    sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
                     if ( bSet )
                         SetLine( &aLine, BOXINFO_LINE_VERT );
                 }
@@ -2992,7 +2974,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 return sal_False;
 
             SvxBorderLine aLine;
-            sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
+            sal_Bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
             if ( bSet )
                 SetLine( &aLine, nMemberId == MID_HORIZONTAL ? BOXINFO_LINE_HORI : BOXINFO_LINE_VERT );
             break;
@@ -3077,7 +3059,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
 XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
-    XubString aStr( SVX_RES( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
+    XubString aStr( EditResId( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
     return aStr;
 }
 
@@ -3223,7 +3205,7 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_FMTKEEP_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -3290,7 +3272,7 @@ sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
     nMemId &= ~CONVERT_TWIPS;
     if ( nMemId == 0 )
     {
-        rVal <<= uno::makeAny( lcl_SvxLineToLine(pLine, bConvert) );
+        rVal <<= uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) );
         return sal_True;
     }
     else if ( pLine )
@@ -3324,7 +3306,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
         {
             if ( !pLine )
                 pLine = new SvxBorderLine;
-            if( !lcl_LineToSvxLine(aLine, *pLine, bConvert) )
+            if( !SvxBoxItem::LineToSvxLine(aLine, *pLine, bConvert) )
                 DELETEZ( pLine );
             return sal_True;
         }
@@ -3457,66 +3439,14 @@ public:
     GraphicObject*	pGraphicObject;
     sal_Int8        nGraphicTransparency; //contains a percentage value which is
                                           //copied to the GraphicObject when necessary
-#ifndef SVX_LIGHT
-    SfxMediumRef	xMedium;
-#endif
     Link			aDoneLink;
+    SvStream*		pStream;
 
-    SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0) {}
-};
-/*
-// class SvxBrushItemLink_Impl -------------------------------------------
-
-class SvxBrushItemLink_Impl : public SfxBrushItemLink
-{
-    virtual Graphic						GetGraphic( const String& rLink, const String& rFilter );
-    virtual CreateSvxBrushTabPage		GetBackgroundTabpageCreateFunc();
-    virtual GetSvxBrushTabPageRanges	GetBackgroundTabpageRanges();
+    SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {}
 };
 
 // -----------------------------------------------------------------------
 
-Graphic SvxBrushItemLink_Impl::GetGraphic( const String& rLink, const String& rFilter)
-{
-    Graphic aResult;
-    SvxBrushItem aItem( rLink, rFilter, GPOS_TILED );
-    const Graphic* pGraph = aItem.GetGraphic();
-    if( pGraph )
-        aResult = *pGraph;
-    return aResult;
-}
-
-// -----------------------------------------------------------------------
-
-CreateSvxBrushTabPage SvxBrushItemLink_Impl::GetBackgroundTabpageCreateFunc()
-{
-#ifndef SVX_LIGHT
-    return (CreateSvxBrushTabPage)SvxBackgroundTabPage::Create;
-#else
-    return CreateSvxBrushTabPage();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-GetSvxBrushTabPageRanges SvxBrushItemLink_Impl::GetBackgroundTabpageRanges()
-{
-#ifndef SVX_LIGHT
-    return (GetSvxBrushTabPageRanges)SvxBackgroundTabPage::GetRanges;
-#else
-    return GetSvxBrushTabPageRanges();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-void SvxBrushItem::InitSfxLink()
-{
-    SfxBrushItemLink::Set( new SvxBrushItemLink_Impl );
-}
-*/
-// -----------------------------------------------------------------------
-
 void SvxBrushItem::SetDoneLink( const Link& rLink )
 {
     pImpl->aDoneLink = rLink;
@@ -3747,10 +3677,6 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
 
 SvxBrushItem::~SvxBrushItem()
 {
-#ifndef SVX_LIGHT
-    if( pImpl->xMedium.Is() )
-        pImpl->xMedium->SetDoneLink( Link() );
-#endif
     delete pImpl->pGraphicObject;
     delete pImpl;
     delete pStrLink;
@@ -3961,7 +3887,6 @@ SfxItemPresentation SvxBrushItem::GetPresentation
     XubString&          rText, const IntlWrapper *
     ) const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -3979,18 +3904,18 @@ SfxItemPresentation SvxBrushItem::GetPresentation
 
                 if ( aColor.GetTransparency() )
                     nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-                rText += SVX_RESSTR(nId);
+                rText += EE_RESSTR(nId);
             }
             else
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_GRAPHIC);
+                rText = EE_RESSTR(RID_SVXITEMS_GRAPHIC);
             }
 
             return ePres;
         }
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
+
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -4117,95 +4042,33 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
 // const wegcasten, da const als logisches const zu verstehen ist
 // wenn GetGraphic() gerufen wird, soll sich das Item darum kuemmern,
 // eine gelinkte Grafik zu holen.
-
-GraphicFilter* GetGrfFilter();
-
-IMPL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void*, EMPTYARG )
-{
-#ifndef SVX_LIGHT
-    pThis->pImpl->pGraphicObject = new GraphicObject;
-    SvStream* pStream = pThis->pImpl->xMedium->GetInStream();
-    if( pStream && !pStream->GetError() )
-    {
-        Graphic aGraphic;
-        int	nRes;
-        pStream->Seek( STREAM_SEEK_TO_BEGIN );
-        nRes = GetGrfFilter()->
-            ImportGraphic( aGraphic, *pThis->pStrLink, *pStream,
-                           GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG );
-
-        if( nRes != GRFILTER_OK )
-        {
-            DELETEZ( pThis->pImpl->pGraphicObject );
-            pThis->bLoadAgain = sal_False;
-        }
-        else
-        {
-            pThis->pImpl->pGraphicObject->SetGraphic( aGraphic );
-            pThis->ApplyGraphicTransparency_Impl();
-        }
-    }
-    else
-    {
-        DELETEZ( pThis->pImpl->pGraphicObject );
-        pThis->bLoadAgain = sal_False;
-    }
-
-    pThis->pImpl->xMedium.Clear();
-    pThis->pImpl->aDoneLink.Call( pThis );
-#endif
-    return 0;
-}
-
 // -----------------------------------------------------------------------
 
 void SvxBrushItem::PurgeGraphic() const
 {
-#ifndef SVX_LIGHT
     PurgeMedium();
     DELETEZ( pImpl->pGraphicObject );
     ((SvxBrushItem*)this)->bLoadAgain = sal_True;
-#endif
 }
 
 // -----------------------------------------------------------------------
 
 void SvxBrushItem::PurgeMedium() const
 {
-#ifndef SVX_LIGHT
-    pImpl->xMedium.Clear();
-#endif
+    DELETEZ( pImpl->pStream );
 }
 
 // -----------------------------------------------------------------------
-
-const GraphicObject* SvxBrushItem::GetGraphicObject( SfxObjectShell* pSh ) const
+const GraphicObject* SvxBrushItem::GetGraphicObject() const
 {
-#ifndef SVX_LIGHT
-    if ( bLoadAgain && pStrLink && !pImpl->pGraphicObject && !pImpl->xMedium.Is() )
+    if ( bLoadAgain && pStrLink && !pImpl->pGraphicObject )
     // wenn Grafik schon geladen, als Cache benutzen
     {
         //JP 29.6.2001: only with "valid" names - empty names now allowed
         if( pStrLink->Len() )
         {
-            pImpl->xMedium = new SfxMedium(
-                *pStrLink, STREAM_STD_READ, sal_False );
-
-            if( pImpl->xMedium->IsRemote() )
-            {
-                if( pSh ) 
-                {
-                    pSh->RegisterTransfer( *pImpl->xMedium );
-                }
-                else
-                {
-                    DBG_WARNING( "SvxBrushItem::GetGraphic ohne DocShell" );
-                }
-            }
-
-            SfxMediumRef xRef( pImpl->xMedium );
-            // Ref halten wg. synchr. DoneCallback
-            if( pImpl->aDoneLink.IsSet() )
+            // currently we don't have asynchronous processing
+/*			if( pImpl->aDoneLink.IsSet() )
             {
                 // Auf besonderen Wunsch des Writers wird der synchrone und der
                 // asynchrone Fall was die Benachrichtigung angeht unterschiedlich
@@ -4217,23 +4080,47 @@ const GraphicObject* SvxBrushItem::GetGraphicObject( SfxObjectShell* pSh ) const
                 pImpl->xMedium->DownLoad(
                     STATIC_LINK( this, SvxBrushItem, DoneHdl_Impl ) );
                 pImpl->aDoneLink = aTmp;
+            } */
+
+            pImpl->pStream = utl::UcbStreamHelper::CreateStream( *pStrLink, STREAM_STD_READ );
+            if( pImpl->pStream && !pImpl->pStream->GetError() )
+            {
+                Graphic aGraphic;
+                int	nRes;
+                pImpl->pStream->Seek( STREAM_SEEK_TO_BEGIN );
+                nRes = GraphicFilter::GetGraphicFilter()->
+                    ImportGraphic( aGraphic, *pStrLink, *pImpl->pStream,
+                                   GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG );
+
+                if( nRes != GRFILTER_OK )
+                {
+                    const_cast < SvxBrushItem*> (this)->bLoadAgain = sal_False;
+                }
+                else
+                {
+                    pImpl->pGraphicObject = new GraphicObject;
+                    pImpl->pGraphicObject->SetGraphic( aGraphic );
+                    const_cast < SvxBrushItem*> (this)->ApplyGraphicTransparency_Impl();
+                }
             }
             else
             {
-                pImpl->xMedium->DownLoad( );
-                DoneHdl_Impl( (SvxBrushItem*)this, 0 );
+                const_cast < SvxBrushItem*> (this)->bLoadAgain = sal_False;
             }
+
+            // currently we don't have asynchronous processing
+//			pThis->pImpl->aDoneLink.Call( pThis );
         }
     }
-#endif
+
     return pImpl->pGraphicObject;
 }
 
 // -----------------------------------------------------------------------
 
-const Graphic* SvxBrushItem::GetGraphic( SfxObjectShell* pSh ) const
+const Graphic* SvxBrushItem::GetGraphic() const
 {
-    const GraphicObject* pGrafObj = GetGraphicObject( pSh );
+    const GraphicObject* pGrafObj = GetGraphicObject();
     return( pGrafObj ? &( pGrafObj->GetGraphic() ) : NULL );
 }
 
@@ -4498,7 +4385,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
 
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
-        rText = SVX_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
+        rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
         break;
 
     default:
diff --git a/svx/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index e94e5d9e2f..a5c7110e9f 100644
--- a/svx/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemtype.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,21 +26,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/list.hxx>
 #include <vcl/outdev.hxx>
-#include <sfx2/objsh.hxx>
-
-#include <svx/svxids.hrc>
-
-
+#include <editeng/editrids.hrc>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svx/xtable.hxx>
-#include "drawitem.hxx"
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
 
 // -----------------------------------------------------------------------
 
@@ -152,7 +144,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
 
 XubString GetSvxString( sal_uInt16 nId )
 {
-    return SVX_RESSTR( nId );
+    return EE_RESSTR( nId );
 }
 
 #ifndef SVX_LIGHT
@@ -161,17 +153,6 @@ XubString GetSvxString( sal_uInt16 nId )
 
 XubString GetColorString( const Color& rCol )
 {
-    const SfxPoolItem* pItem = NULL;
-    XColorTable* pCol = NULL;
-    SfxObjectShell* pSh = SfxObjectShell::Current();
-
-    if ( pSh )
-    {
-        pItem = pSh->GetItem( SID_COLOR_TABLE );
-        if( pItem )
-            pCol = static_cast<const SvxColorTableItem*>(pItem )->GetColorTable();
-    }
-
     XubString sStr;
 
     FASTBOOL bFound = sal_False;
@@ -194,7 +175,7 @@ XubString GetColorString( const Color& rCol )
     }
 
     if ( nColor < nColCount )
-        sStr = SVX_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 );
+        sStr = EE_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 );
 
     if ( !sStr.Len() )
     {
diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk
new file mode 100644
index 0000000000..512db7cc34
--- /dev/null
+++ b/editeng/source/items/makefile.mk
@@ -0,0 +1,79 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE 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.19 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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=..$/..
+
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=svxpch
+#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
+#ENABLE_EXCEPTIONS=TRUE
+
+PRJNAME=editeng
+TARGET=items
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=items
+SRC1FILES =  \
+        page.src \
+        svxitems.src
+
+SLOFILES= \
+                $(SLO)$/optitems.obj    \
+                $(SLO)$/svdfield.obj \
+        $(SLO)$/writingmodeitem.obj \
+        $(SLO)$/frmitems.obj \
+        $(SLO)$/paraitem.obj \
+        $(SLO)$/textitem.obj \
+        $(SLO)$/flditem.obj \
+        $(SLO)$/svxfont.obj \
+        $(SLO)$/paperinf.obj    \
+        $(SLO)$/itemtype.obj	\
+        $(SLO)$/bulitem.obj \
+        $(SLO)$/numitem.obj \
+        $(SLO)$/xmlcnitm.obj \
+        $(SLO)$/charhiddenitem.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/svdfield.obj \
+        $(SLO)$/paraitem.obj \
+        $(SLO)$/frmitems.obj \
+        $(SLO)$/numitem.obj\
+        $(SLO)$/xmlcnitm.obj\
+        $(SLO)$/flditem.obj
+
+.INCLUDE :	target.mk
+
diff --git a/svx/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 4c3aa6d0a5..fd4ccfa005 100644
--- a/svx/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numitem.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,25 +26,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <svx/numitem.hxx>
+#include <editeng/numitem.hxx>
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <vcl/font.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_NUMDEF_HXX
-#include <svx/numdef.hxx>
-#endif
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng/numdef.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/text/XNumberingFormatter.hpp>
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
@@ -55,7 +49,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include "unonrule.hxx"
+#include <editeng/unonrule.hxx>
 
 #define MM100_TO_TWIP(MM100)	((MM100*72L+63L)/127L)
 
diff --git a/svx/source/options/optitems.cxx b/editeng/source/items/optitems.cxx
index f37e9ecc98..9b126e3f0d 100644
--- a/svx/source/options/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optitems.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,15 +26,17 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/shl.hxx>
 #include <tools/resid.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 
-#include "optitems.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/svxitems.hrc>
+#include <editeng/optitems.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
@@ -169,10 +168,10 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             rText += String::CreateFromInt32( nMinLead );
-            rText += String( ResId( RID_SVXITEMS_HYPHEN_MINLEAD, DIALOG_MGR() ) );
+            rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINLEAD ) );
             rText += ',';
             rText += String::CreateFromInt32( nMinTrail );
-            rText += String( ResId( RID_SVXITEMS_HYPHEN_MINTRAIL, DIALOG_MGR() ) );
+            rText += String( EditResId( RID_SVXITEMS_HYPHEN_MINTRAIL ) );
             return ePres;
         }
         default:
diff --git a/svx/source/items/page.src b/editeng/source/items/page.src
index 966d5e66e3..9a39dc85e6 100644
--- a/svx/source/items/page.src
+++ b/editeng/source/items/page.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: page.src,v $
- * $Revision: 1.71 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
 
  // include ---------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <editeng/editrids.hrc>
 
 String RID_SVXSTR_PAPER_A0
 {
diff --git a/svx/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 7a67a0009f..1c7c7d8b08 100644
--- a/svx/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paperinf.cxx,v $
- * $Revision: 1.12 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 
@@ -37,12 +34,9 @@
 #include <tools/shl.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
-
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svx/paperinf.hxx>
-#include <svx/dialmgr.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/paperinf.hxx>
+#include <editeng/eerdll.hxx>
 
 /*--------------------------------------------------------------------
     Beschreibung:	Ist der Printer gueltig
@@ -185,7 +179,7 @@ String SvxPaperInfo::GetName( Paper ePaper )
         default: DBG_ERRORFILE( "unknown papersize" );
     }
 
-    return ( nResId > 0 ) ? String( SVX_RES( nResId ) ) : String();
+    return ( nResId > 0 ) ? String( EditResId( nResId ) ) : String();
 }
 
 
diff --git a/svx/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 5fc1e51908..217bdf3b6a 100644
--- a/svx/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paraitem.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,57 +26,49 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/syslocale.hxx>
-
 #include <comphelper/types.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
 #include <tools/rtti.hxx>
-#include <basic/sbx.hxx>
 #define GLOBALOVERFLOW3
 
 #define _SVX_PARAITEM_CXX
 #include <svl/itempool.hxx>
 
 #include <svl/memberid.hrc>
-#include <svx/svxitems.hrc>
-
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/orphitem.hxx>
-#include <svx/widwitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/pmdlitem.hxx>
-#include <svx/spltitem.hxx>
-#include <svx/hyznitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/hngpnctitem.hxx>
-#include <svx/forbiddenruleitem.hxx>
-#include <svx/paravertalignitem.hxx>
-#include "pgrditem.hxx"
-
-
+#include <editeng/editrids.hrc>
+
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/pmdlitem.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/hyznitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/paravertalignitem.hxx>
+#include <editeng/pgrditem.hxx>
 #include <rtl/ustring.hxx>
-
-#include <svx/unomid.hxx>
-
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/memberids.hrc>
+#include <editeng/editids.hrc>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/paperinf.hxx>
 #include <vcl/svapp.hxx>
-
 #include <algorithm>
 
 using namespace ::rtl;
@@ -502,7 +491,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const
 XubString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" );
-    return SVX_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
+    return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
@@ -615,15 +604,15 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText = EE_RESSTR(RID_SVXITEMS_LINES);
             break;
         }
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE);
             rText += ' ';
-            rText += SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText += EE_RESSTR(RID_SVXITEMS_LINES);
         }
         
         default:
@@ -687,15 +676,15 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText = EE_RESSTR(RID_SVXITEMS_LINES);
             break;
         }
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE);
             rText += ' ';
-            rText += SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText += EE_RESSTR(RID_SVXITEMS_LINES);
         }
         
         default:
@@ -811,13 +800,13 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
 
             if ( bHyphen )
                 nId = RID_SVXITEMS_HYPHEN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PAGE_END_FALSE;
 
             if ( bPageEnd )
                 nId = RID_SVXITEMS_PAGE_END_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += String::CreateFromInt32( nMinLead );
             rText += cpDelim;
@@ -832,22 +821,22 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
 
             if ( bHyphen )
                 nId = RID_SVXITEMS_HYPHEN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PAGE_END_FALSE;
 
             if ( bPageEnd )
                 nId = RID_SVXITEMS_PAGE_END_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += String::CreateFromInt32(nMinLead);
-            rText += SVX_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD);
+            rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD);
             rText += cpDelim;
             rText += String::CreateFromInt32(nMinTrail);
-            rText += SVX_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL);
+            rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL);
             rText += cpDelim;
             rText += String::CreateFromInt32(nMaxHyphens);
-            rText += SVX_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
+            rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
         default: ;//prevent warning
@@ -918,17 +907,17 @@ XubString SvxTabStop::GetValueString() const
     aStr += sal_Unicode( '(' );
     aStr += UniString::CreateFromInt32(nTabPos);
     aStr += cpDelim;
-    aStr += XubString( ResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment, DIALOG_MGR() ) );
+    aStr += XubString( EditResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment ) );
 
     aStr += cpDelim;
     aStr += sal_Unicode('[');
-    aStr += XubString( ResId( RID_SVXITEMS_TAB_DECIMAL_CHAR, DIALOG_MGR() ) );
+    aStr += XubString( EditResId( RID_SVXITEMS_TAB_DECIMAL_CHAR ) );
     aStr += GetDecimal();
     aStr += sal_Unicode(']');
     aStr += cpDelim;
     aStr += cpDelim;
     aStr += sal_Unicode('[');
-    aStr += XubString( ResId( RID_SVXITEMS_TAB_FILL_CHAR, DIALOG_MGR() ) );
+    aStr += XubString( EditResId( RID_SVXITEMS_TAB_FILL_CHAR ) );
     aStr += cFill;
     aStr += sal_Unicode(']');
     aStr += sal_Unicode(')');
@@ -1211,7 +1200,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
                 rText += GetMetricText(
                     (long)((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
                 if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
-                    rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                    rText += EE_RESSTR(GetMetricId(ePresUnit));
                 bComma = sal_True;
             }
         }
@@ -1374,7 +1363,7 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_FMTSPLIT_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1446,7 +1435,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             if ( bSet )
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE);
+                rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE);
                 rText += GetValue();
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
@@ -1497,7 +1486,7 @@ SfxItemPresentation SvxScriptSpaceItem::GetPresentation(
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR( !GetValue()
+            rText = EE_RESSTR( !GetValue()
                                     ? RID_SVXITEMS_SCRPTSPC_OFF
                                     : RID_SVXITEMS_SCRPTSPC_ON );
             return ePres;
@@ -1550,7 +1539,7 @@ SfxItemPresentation SvxHangingPunctuationItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                rText = SVX_RESSTR( !GetValue()
+                rText = EE_RESSTR( !GetValue()
                                         ? RID_SVXITEMS_HNGPNCT_OFF
                                         : RID_SVXITEMS_HNGPNCT_ON );
                 return ePres;
@@ -1611,7 +1600,7 @@ SfxItemPresentation SvxForbiddenRuleItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                rText = SVX_RESSTR( !GetValue()
+                rText = EE_RESSTR( !GetValue()
                                         ? RID_SVXITEMS_FORBIDDEN_RULE_OFF
                                         : RID_SVXITEMS_FORBIDDEN_RULE_ON );
                 return ePres;
@@ -1677,7 +1666,7 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
                     case BOTTOM:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break;
                     default:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break;
                 }
-                rText = SVX_RESSTR( nTmp );
+                rText = EE_RESSTR( nTmp );
                 return ePres;
             }
         default: ;//prevent warning
@@ -1754,8 +1743,8 @@ SfxItemPresentation SvxParaGridItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
                 rText = GetValue() ?
-                        SVX_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
-                        SVX_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_OFF );
+                        EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
+                        EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_OFF );
 
                 return ePres;
             }
diff --git a/configmgr/source/treemgr/viewaccess.cxx b/editeng/source/items/svdfield.cxx
index cc0765903e..4b97762bd5 100644
--- a/configmgr/source/treemgr/viewaccess.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewaccess.cxx,v $
- * $Revision: 1.5 $
+ * $RCSfile: svdomeas.cxx,v $
+ * $Revision: 1.35.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -29,31 +29,37 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_configmgr.hxx"
+#include "precompiled_editeng.hxx"
 
-#include "viewaccess.hxx"
-#include "tree.hxx"
-#include "noderef.hxx"
+#include <editeng/measfld.hxx>
 
-//-----------------------------------------------------------------------------
-namespace configmgr
+SV_IMPL_PERSIST1(SdrMeasureField,SvxFieldData);
+
+__EXPORT SdrMeasureField::~SdrMeasureField()
 {
-//-----------------------------------------------------------------------------
-    namespace view
-    {
-//-----------------------------------------------------------------------------
-configuration::NodeData* ViewTreeAccess::nodeData(configuration::NodeRef const& _aNodeArg) const
+}
+
+SvxFieldData* __EXPORT SdrMeasureField::Clone() const
 {
-    return this->nodeData(_aNodeArg.getOffset());
+    return new SdrMeasureField(*this);
 }
 
-//-----------------------------------------------------------------------------
-configuration::NodeData* ViewTreeAccess::nodeData(unsigned int _aNodePos) const
+int __EXPORT SdrMeasureField::operator==(const SvxFieldData& rSrc) const
 {
-    return m_tree->nodeData(_aNodePos);
+    return eMeasureFieldKind==((SdrMeasureField&)rSrc).GetMeasureFieldKind();
 }
 
-//-----------------------------------------------------------------------------
-    }
+void __EXPORT SdrMeasureField::Load(SvPersistStream& rIn)
+{
+    UINT16 nFieldKind;
+    rIn>>nFieldKind;
+    eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
+}
+
+void __EXPORT SdrMeasureField::Save(SvPersistStream& rOut)
+{
+    rOut<<(UINT16)eMeasureFieldKind;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/svx/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 98c911c8a8..91a8c2e137 100644
--- a/svx/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxfont.cxx,v $
- * $Revision: 1.15.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,25 +26,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ----------------------------------------------------------------
 
-#ifndef _OUTDEV_HXX //autogen
 #include <vcl/outdev.hxx>
-#endif
-#ifndef _PRINT_HXX //autogen
 #include <vcl/print.hxx>
-#endif
 #include <tools/poly.hxx>
 #include <unotools/charclass.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 
 #define _SVX_SVXFONT_CXX
 
-#include <svx/svxfont.hxx>
-#include <svx/escpitem.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/escpitem.hxx>
 
 // Minimum: Prozentwert fuers kernen
 #define MINKERNPERCENT 5
diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src
new file mode 100644
index 0000000000..3b50d35d5d
--- /dev/null
+++ b/editeng/source/items/svxitems.src
@@ -0,0 +1,1027 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxitems.src,v $
+ * $Revision: 1.83.212.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.
+ *
+ ************************************************************************/
+ // include ------------------------------------------------------------------
+#include <editeng/editrids.hrc>
+ // pragma -------------------------------------------------------------------
+
+ // Value-Strings ------------------------------------------------------------
+String RID_SVXITEMS_TRUE
+{
+    Text [ en-US ] = "True" ;
+};
+String RID_SVXITEMS_FALSE
+{
+    Text [ en-US ] = "False" ;
+};
+ // enum SvxBreak ------------------------------------------------------------
+String RID_SVXITEMS_BREAK_NONE
+{
+    Text [ en-US ] = "No break" ;
+};
+String RID_SVXITEMS_BREAK_COLUMN_BEFORE
+{
+    Text [ en-US ] = "Break before new column" ;
+};
+String RID_SVXITEMS_BREAK_COLUMN_AFTER
+{
+    Text [ en-US ] = "Break after new column" ;
+};
+String RID_SVXITEMS_BREAK_COLUMN_BOTH
+{
+    Text [ en-US ] = "Break before and after new column" ;
+};
+String RID_SVXITEMS_BREAK_PAGE_BEFORE
+{
+    Text [ en-US ] = "Break before new page" ;
+};
+String RID_SVXITEMS_BREAK_PAGE_AFTER
+{
+    Text [ en-US ] = "Break after new page" ;
+};
+String RID_SVXITEMS_BREAK_PAGE_BOTH
+{
+    Text [ en-US ] = "Break before and after new page" ;
+};
+ // enum SvxShadowLocation ---------------------------------------------------
+String RID_SVXITEMS_SHADOW_NONE
+{
+    Text [ en-US ] = "No Shadow" ;
+};
+String RID_SVXITEMS_SHADOW_TOPLEFT
+{
+    Text [ en-US ] = "Shadow top left" ;
+};
+String RID_SVXITEMS_SHADOW_TOPRIGHT
+{
+    Text [ en-US ] = "Shadow top right" ;
+};
+String RID_SVXITEMS_SHADOW_BOTTOMLEFT
+{
+    Text [ en-US ] = "Shadow bottom left" ;
+};
+String RID_SVXITEMS_SHADOW_BOTTOMRIGHT
+{
+    Text [ en-US ] = "Shadow bottom right" ;
+};
+ // enum ColorName -----------------------------------------------------------
+String RID_SVXITEMS_COLOR
+{
+    Text [ en-US ] = "Color " ;
+};
+String RID_SVXITEMS_COLOR_BLACK
+{
+    Text [ en-US ] = "Black" ;
+};
+String RID_SVXITEMS_COLOR_BLUE
+{
+    Text [ en-US ] = "Blue" ;
+};
+String RID_SVXITEMS_COLOR_GREEN
+{
+    Text [ en-US ] = "Green" ;
+};
+String RID_SVXITEMS_COLOR_CYAN
+{
+    Text [ en-US ] = "Cyan" ;
+};
+String RID_SVXITEMS_COLOR_RED
+{
+    Text [ en-US ] = "Red" ;
+};
+String RID_SVXITEMS_COLOR_MAGENTA
+{
+    Text [ en-US ] = "Magenta" ;
+};
+String RID_SVXITEMS_COLOR_BROWN
+{
+    Text [ en-US ] = "Brown" ;
+};
+String RID_SVXITEMS_COLOR_GRAY
+{
+    Text [ en-US ] = "Gray" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTGRAY
+{
+    Text [ en-US ] = "Light Gray" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTBLUE
+{
+    Text [ en-US ] = "Light Blue" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTGREEN
+{
+    Text [ en-US ] = "Light Green" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTCYAN
+{
+    Text [ en-US ] = "Light Cyan" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTRED
+{
+    Text [ en-US ] = "Light Red" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTMAGENTA
+{
+    Text [ en-US ] = "Light Magenta" ;
+};
+String RID_SVXITEMS_COLOR_YELLOW
+{
+    Text [ en-US ] = "Yellow" ;
+};
+String RID_SVXITEMS_COLOR_WHITE
+{
+    Text [ en-US ] = "White" ;
+};
+String RID_SVXITEMS_COLOR_MENUBAR
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_MENUBARTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_POPUPMENU
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_POPUPMENUTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_WINDOWTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_WINDOWWORKSPACE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_HIGHLIGHT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DFACE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DLIGHT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DSHADOW
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_SCROLLBAR
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_FIELD
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_FIELDTEXT
+{
+    Text = "?" ;
+};
+ // enum FontItalic -------------------------------------------------------
+String RID_SVXITEMS_ITALIC_NONE
+{
+    Text [ en-US ] = "Not Italic" ;
+};
+String RID_SVXITEMS_ITALIC_OBLIQUE
+{
+    Text [ en-US ] = "Oblique italic" ;
+};
+String RID_SVXITEMS_ITALIC_NORMAL
+{
+    Text [ en-US ] = "Italic" ;
+};
+ // enum FontWeight -------------------------------------------------------
+String RID_SVXITEMS_WEIGHT_DONTKNOW
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_WEIGHT_THIN
+{
+    Text [ en-US ] = "thin" ;
+};
+String RID_SVXITEMS_WEIGHT_ULTRALIGHT
+{
+    Text [ en-US ] = "ultra thin" ;
+};
+String RID_SVXITEMS_WEIGHT_LIGHT
+{
+    Text [ en-US ] = "light" ;
+};
+String RID_SVXITEMS_WEIGHT_SEMILIGHT
+{
+    Text [ en-US ] = "semi light" ;
+};
+String RID_SVXITEMS_WEIGHT_NORMAL
+{
+    Text [ en-US ] = "normal" ;
+};
+String RID_SVXITEMS_WEIGHT_MEDIUM
+{
+    Text [ en-US ] = "medium" ;
+};
+String RID_SVXITEMS_WEIGHT_SEMIBOLD
+{
+    Text [ en-US ] = "semi bold" ;
+};
+String RID_SVXITEMS_WEIGHT_BOLD
+{
+    Text [ en-US ] = "bold" ;
+};
+String RID_SVXITEMS_WEIGHT_ULTRABOLD
+{
+    Text [ en-US ] = "ultra bold" ;
+};
+String RID_SVXITEMS_WEIGHT_BLACK
+{
+    Text [ en-US ] = "black" ;
+};
+ // enum FontUnderline - used for underline ------------------------------
+String RID_SVXITEMS_UL_NONE
+{
+    Text [ en-US ] = "No underline" ;
+};
+String RID_SVXITEMS_UL_SINGLE
+{
+    Text [ en-US ] = "Single underline" ;
+};
+String RID_SVXITEMS_UL_DOUBLE
+{
+    Text [ en-US ] = "Double underline" ;
+};
+String RID_SVXITEMS_UL_DOTTED
+{
+    Text [ en-US ] = "Dotted underline" ;
+};
+String RID_SVXITEMS_UL_DONTKNOW
+{
+    Text [ en-US ] = "Underline";
+};
+String RID_SVXITEMS_UL_DASH
+{
+    Text [ en-US ] = "Underline (dashes)";
+};
+String RID_SVXITEMS_UL_LONGDASH
+{
+    Text [ en-US ] = "Underline (long dashes)";
+};
+String RID_SVXITEMS_UL_DASHDOT
+{
+    Text [ en-US ] = "Underline (dot dash)";
+};
+String RID_SVXITEMS_UL_DASHDOTDOT
+{
+    Text [ en-US ] = "Underline (dot dot dash)";
+};
+String RID_SVXITEMS_UL_SMALLWAVE
+{
+    Text [ en-US ] = "Underline (small wave)";
+};
+String RID_SVXITEMS_UL_WAVE
+{
+    Text [ en-US ] = "Underline (Wave)";
+};
+String RID_SVXITEMS_UL_DOUBLEWAVE
+{
+    Text [ en-US ] = "Underline (Double wave)";
+};
+String RID_SVXITEMS_UL_BOLD
+{
+    Text [ en-US ] = "Underlined (Bold)";
+};
+String RID_SVXITEMS_UL_BOLDDOTTED
+{
+    Text [ en-US ] = "Dotted underline (Bold)";
+};
+String RID_SVXITEMS_UL_BOLDDASH
+{
+    Text [ en-US ] = "Underline (Dash bold)";
+};
+String RID_SVXITEMS_UL_BOLDLONGDASH
+{
+    Text [ en-US ] = "Underline (long dash, bold)";
+};
+String RID_SVXITEMS_UL_BOLDDASHDOT
+{
+    Text [ en-US ] = "Underline (dot dash, bold)";
+};
+String RID_SVXITEMS_UL_BOLDDASHDOTDOT
+{
+    Text [ en-US ] = "Underline (dot dot dash, bold)";
+};
+String RID_SVXITEMS_UL_BOLDWAVE
+{
+    Text [ en-US ] = "Underline (wave, bold)";
+};
+ // enum FontUnderline - used for overline -------------------------------
+String RID_SVXITEMS_OL_NONE
+{
+    Text [ en-US ] = "No overline" ;
+};
+String RID_SVXITEMS_OL_SINGLE
+{
+    Text [ en-US ] = "Single overline" ;
+};
+String RID_SVXITEMS_OL_DOUBLE
+{
+    Text [ en-US ] = "Double overline" ;
+};
+String RID_SVXITEMS_OL_DOTTED
+{
+    Text [ en-US ] = "Dotted overline" ;
+};
+String RID_SVXITEMS_OL_DONTKNOW
+{
+    Text [ en-US ] = "Overline";
+};
+String RID_SVXITEMS_OL_DASH
+{
+    Text [ en-US ] = "Overline (dashes)";
+};
+String RID_SVXITEMS_OL_LONGDASH
+{
+    Text [ en-US ] = "Overline (long dashes)";
+};
+String RID_SVXITEMS_OL_DASHDOT
+{
+    Text [ en-US ] = "Overline (dot dash)";
+};
+String RID_SVXITEMS_OL_DASHDOTDOT
+{
+    Text [ en-US ] = "Overline (dot dot dash)";
+};
+String RID_SVXITEMS_OL_SMALLWAVE
+{
+    Text [ en-US ] = "Overline (small wave)";
+};
+String RID_SVXITEMS_OL_WAVE
+{
+    Text [ en-US ] = "Overline (Wave)";
+};
+String RID_SVXITEMS_OL_DOUBLEWAVE
+{
+    Text [ en-US ] = "Overline (Double wave)";
+};
+String RID_SVXITEMS_OL_BOLD
+{
+    Text [ en-US ] = "Overlined (Bold)";
+};
+String RID_SVXITEMS_OL_BOLDDOTTED
+{
+    Text [ en-US ] = "Dotted overline (Bold)";
+};
+String RID_SVXITEMS_OL_BOLDDASH
+{
+    Text [ en-US ] = "Overline (Dash bold)";
+};
+String RID_SVXITEMS_OL_BOLDLONGDASH
+{
+    Text [ en-US ] = "Overline (long dash, bold)";
+};
+String RID_SVXITEMS_OL_BOLDDASHDOT
+{
+    Text [ en-US ] = "Overline (dot dash, bold)";
+};
+String RID_SVXITEMS_OL_BOLDDASHDOTDOT
+{
+    Text [ en-US ] = "Overline (dot dot dash, bold)";
+};
+String RID_SVXITEMS_OL_BOLDWAVE
+{
+    Text [ en-US ] = "Overline (wave, bold)";
+};
+ // enum FontStrikeout ----------------------------------------------------
+String RID_SVXITEMS_STRIKEOUT_NONE
+{
+    Text [ en-US ] = "No strikethrough" ;
+};
+String RID_SVXITEMS_STRIKEOUT_SINGLE
+{
+    Text [ en-US ] = "Single strikethrough" ;
+};
+String RID_SVXITEMS_STRIKEOUT_DOUBLE
+{
+    Text [ en-US ] = "Double strikethrough" ;
+};
+String RID_SVXITEMS_STRIKEOUT_BOLD
+{
+    Text [ en-US ] = "Bold strikethrough";
+};
+String RID_SVXITEMS_STRIKEOUT_SLASH
+{
+    Text [ en-US ] = "Strike through with slash";
+};
+String RID_SVXITEMS_STRIKEOUT_X
+{
+    Text [ en-US ] = "Strike through with Xes";
+};
+ // enum CASEMAP ----------------------------------------------------------
+String RID_SVXITEMS_CASEMAP_NONE
+{
+    Text [ en-US ] = "None" ;
+};
+String RID_SVXITEMS_CASEMAP_VERSALIEN
+{
+    Text [ en-US ] = "Caps" ;
+};
+String RID_SVXITEMS_CASEMAP_GEMEINE
+{
+    Text [ en-US ] = "Lowercase" ;
+};
+String RID_SVXITEMS_CASEMAP_TITEL
+{
+    Text [ en-US ] = "Title" ;
+};
+String RID_SVXITEMS_CASEMAP_KAPITAELCHEN
+{
+    Text [ en-US ] = "Small caps" ;
+};
+ // enum ESCAPEMENT -------------------------------------------------------
+String RID_SVXITEMS_ESCAPEMENT_OFF
+{
+    Text [ en-US ] = "Normal position" ;
+};
+String RID_SVXITEMS_ESCAPEMENT_SUPER
+{
+    Text [ en-US ] = "Superscript " ;
+};
+String RID_SVXITEMS_ESCAPEMENT_SUB
+{
+    Text [ en-US ] = "Subscript " ;
+};
+String RID_SVXITEMS_ESCAPEMENT_AUTO
+{
+    Text [ en-US ] = "automatic" ;
+};
+ // enum SvxAdjust -----------------------------------------------------------
+String RID_SVXITEMS_ADJUST_LEFT
+{
+    Text [ en-US ] = "Align left" ;
+};
+String RID_SVXITEMS_ADJUST_RIGHT
+{
+    Text [ en-US ] = "Align right" ;
+};
+String RID_SVXITEMS_ADJUST_BLOCK
+{
+    Text [ en-US ] = "Justify" ;
+};
+String RID_SVXITEMS_ADJUST_CENTER
+{
+    Text [ en-US ] = "Centered" ;
+};
+String RID_SVXITEMS_ADJUST_BLOCKLINE
+{
+    Text [ en-US ] = "Justify" ;
+};
+ // enum SvxTabAdjust --------------------------------------------------------
+String RID_SVXITEMS_TAB_DECIMAL_CHAR
+{
+    Text [ en-US ] = "Decimal Symbol:" ;
+};
+String RID_SVXITEMS_TAB_FILL_CHAR
+{
+    Text [ en-US ] = "Fill character:" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_LEFT
+{
+    Text [ en-US ] = "Left" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_RIGHT
+{
+    Text [ en-US ] = "Right" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_DECIMAL
+{
+    Text [ en-US ] = "Decimal" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_CENTER
+{
+    Text [ en-US ] = "Centered" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_DEFAULT
+{
+    Text [ en-US ] = "Default" ;
+};
+String RID_SINGLE_LINE0
+{
+    Text [ en-US ] = "Single, fine lines" ;
+};
+String RID_SINGLE_LINE1
+{
+    Text [ en-US ] = "Single, thin" ;
+};
+String RID_SINGLE_LINE2
+{
+    Text [ en-US ] = "Single, thick" ;
+};
+String RID_SINGLE_LINE3
+{
+    Text [ en-US ] = "Single, very thick" ;
+};
+String RID_SINGLE_LINE4
+{
+    Text [ en-US ] = "Single, bold" ;
+};
+String RID_DOUBLE_LINE0
+{
+    Text [ en-US ] = "Double, fine lines, spacing: small" ;
+};
+String RID_DOUBLE_LINE1
+{
+    Text [ en-US ] = "Double, fine line, spacing: large" ;
+};
+String RID_DOUBLE_LINE2
+{
+    Text [ en-US ] = "Double, thin, spacing: small" ;
+};
+String RID_DOUBLE_LINE3
+{
+    Text [ en-US ] = "Double, thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE4
+{
+    Text [ en-US ] = "Double, inside: fine lines, outside: thin, spacing: large" ;
+};
+String RID_DOUBLE_LINE5
+{
+    Text [ en-US ] = "Double, inside: fine lines, outside: thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE6
+{
+    Text [ en-US ] = "Double, inside: fine lines, outside: very thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE7
+{
+    Text [ en-US ] = "Double, inside: thin, outside: thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE8
+{
+    Text [ en-US ] = "Double, inside: thick, outside: thin, spacing: small" ;
+};
+String RID_DOUBLE_LINE9
+{
+    Text [ en-US ] = "Double, inside: thick, outside: very thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE10
+{
+    Text [ en-US ] = "Double, inside: very thick, outside: thick, Spacing: large" ;
+};
+String RID_SVXITEMS_METRIC_MM
+{
+    Text = "mm" ;
+};
+String RID_SVXITEMS_METRIC_CM
+{
+    Text = "cm" ;
+};
+String RID_SVXITEMS_METRIC_INCH
+{
+    Text = "inch" ;
+};
+String RID_SVXITEMS_METRIC_POINT
+{
+    Text = "pt" ;
+};
+String RID_SVXITEMS_METRIC_TWIP
+{
+    Text = "twip" ;
+};
+String RID_SVXITEMS_METRIC_PIXEL
+{
+    Text = "pixel" ;
+};
+ // GetValueText von BoolItems
+String RID_SVXITEMS_SHADOWED_TRUE
+{
+    Text [ en-US ] = "Shadowed" ;
+};
+String RID_SVXITEMS_SHADOWED_FALSE
+{
+    Text [ en-US ] = "Not Shadowed" ;
+};
+String RID_SVXITEMS_BLINK_TRUE
+{
+    Text [ en-US ] = "Blinking" ;
+};
+String RID_SVXITEMS_BLINK_FALSE
+{
+    Text [ en-US ] = "Not Blinking" ;
+};
+String RID_SVXITEMS_AUTOKERN_TRUE
+{
+    Text [ en-US ] = "Pair Kerning" ;
+};
+String RID_SVXITEMS_AUTOKERN_FALSE
+{
+    Text [ en-US ] = "No pair kerning" ;
+};
+String RID_SVXITEMS_WORDLINE_TRUE
+{
+    Text [ en-US ] = "Individual words" ;
+};
+String RID_SVXITEMS_WORDLINE_FALSE
+{
+    Text [ en-US ] = "Not Words Only" ;
+};
+String RID_SVXITEMS_CONTOUR_TRUE
+{
+    Text [ en-US ] = "Outline" ;
+};
+String RID_SVXITEMS_CONTOUR_FALSE
+{
+    Text [ en-US ] = "No Outline" ;
+};
+String RID_SVXITEMS_NOLINEBREAK_TRUE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_NOLINEBREAK_FALSE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_NOHYPHEN_TRUE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_NOHYPHEN_FALSE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_PRINT_TRUE
+{
+    Text [ en-US ] = "Print" ;
+};
+String RID_SVXITEMS_PRINT_FALSE
+{
+    Text [ en-US ] = "Don't print" ;
+};
+String RID_SVXITEMS_OPAQUE_TRUE
+{
+    Text [ en-US ] = "Opaque" ;
+};
+String RID_SVXITEMS_OPAQUE_FALSE
+{
+    Text [ en-US ] = "Not Opaque" ;
+};
+String RID_SVXITEMS_FMTKEEP_TRUE
+{
+    Text [ en-US ] = "Keep with next paragraph" ;
+};
+String RID_SVXITEMS_FMTKEEP_FALSE
+{
+    Text [ en-US ] = "Don't Keep Paragraphs Together" ;
+};
+String RID_SVXITEMS_FMTSPLIT_TRUE
+{
+    Text [ en-US ] = "Split paragraph" ;
+};
+String RID_SVXITEMS_FMTSPLIT_FALSE
+{
+    Text [ en-US ] = "Don't split paragraph" ;
+};
+String RID_SVXITEMS_PROT_CONTENT_TRUE
+{
+    Text [ en-US ] = "Contents protected" ;
+};
+String RID_SVXITEMS_PROT_CONTENT_FALSE
+{
+    Text [ en-US ] = "Contents not protected" ;
+};
+String RID_SVXITEMS_PROT_SIZE_TRUE
+{
+    Text [ en-US ] = "Size protected" ;
+};
+String RID_SVXITEMS_PROT_SIZE_FALSE
+{
+    Text [ en-US ] = "Size not protected" ;
+};
+String RID_SVXITEMS_PROT_POS_TRUE
+{
+    Text [ en-US ] = "Position protected" ;
+};
+String RID_SVXITEMS_PROT_POS_FALSE
+{
+    Text [ en-US ] = "Position not protected" ;
+};
+String RID_SVXITEMS_TRANSPARENT_TRUE
+{
+    Text [ en-US ] = "Transparent" ;
+};
+String RID_SVXITEMS_TRANSPARENT_FALSE
+{
+    Text [ en-US ] = "Not Transparent" ;
+};
+String RID_SVXITEMS_HYPHEN_TRUE
+{
+    Text [ en-US ] = "Hyphenation" ;
+};
+String RID_SVXITEMS_HYPHEN_FALSE
+{
+    Text [ en-US ] = "No hyphenation" ;
+};
+String RID_SVXITEMS_PAGE_END_TRUE
+{
+    Text [ en-US ] = "Page End" ;
+};
+String RID_SVXITEMS_PAGE_END_FALSE
+{
+    Text [ en-US ] = "No Page End" ;
+};
+String RID_SVXITEMS_SIZE_WIDTH
+{
+    Text [ en-US ] = "Width: " ;
+};
+String RID_SVXITEMS_SIZE_HEIGHT
+{
+    Text [ en-US ] = "Height: " ;
+};
+String RID_SVXITEMS_LRSPACE_LEFT
+{
+    Text [ en-US ] = "Indent left " ;
+};
+String RID_SVXITEMS_LRSPACE_FLINE
+{
+    Text [ en-US ] = "First Line " ;
+};
+String RID_SVXITEMS_LRSPACE_RIGHT
+{
+    Text [ en-US ] = "Indent right " ;
+};
+String RID_SVXITEMS_SHADOW_COMPLETE
+{
+    Text [ en-US ] = "Shadow: " ;
+};
+String RID_SVXITEMS_BORDER_COMPLETE
+{
+    Text [ en-US ] = "Borders " ;
+};
+String RID_SVXITEMS_BORDER_NONE
+{
+    Text [ en-US ] = "No border";
+};
+String RID_SVXITEMS_BORDER_TOP
+{
+    Text [ en-US ] = "top " ;
+};
+String RID_SVXITEMS_BORDER_BOTTOM
+{
+    Text [ en-US ] = "bottom " ;
+};
+String RID_SVXITEMS_BORDER_LEFT
+{
+    Text [ en-US ] = "left " ;
+};
+String RID_SVXITEMS_BORDER_RIGHT
+{
+    Text [ en-US ] = "right " ;
+};
+String RID_SVXITEMS_BORDER_DISTANCE
+{
+    Text [ en-US ] = "Spacing " ;
+};
+String RID_SVXITEMS_ULSPACE_UPPER
+{
+    Text [ en-US ] = "From top " ;
+};
+String RID_SVXITEMS_ULSPACE_LOWER
+{
+    Text [ en-US ] = "From bottom " ;
+};
+String RID_SVXITEMS_LINES
+{
+    Text [ en-US ] = "%1 Lines" ;
+    Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines";
+};
+String RID_SVXITEMS_WIDOWS_COMPLETE
+{
+    Text [ en-US ] = "Widow control" ;
+};
+String RID_SVXITEMS_ORPHANS_COMPLETE
+{
+    Text [ en-US ] = "Orphan control" ;
+};
+String RID_SVXITEMS_HYPHEN_MINLEAD
+{
+    Text [ en-US ] = "Characters at end of line" ;
+};
+String RID_SVXITEMS_HYPHEN_MINTRAIL
+{
+    Text [ en-US ] = "Characters at beginning of line" ;
+};
+String RID_SVXITEMS_HYPHEN_MAX
+{
+    Text [ en-US ] = "Hyphens" ;
+};
+String RID_SVXITEMS_PAGEMODEL_COMPLETE
+{
+    Text [ en-US ] = "Page Style: " ;
+};
+String RID_SVXITEMS_KERNING_COMPLETE
+{
+    Text [ en-US ] = "Kerning " ;
+};
+String RID_SVXITEMS_KERNING_EXPANDED
+{
+    Text [ en-US ] = "locked " ;
+};
+String RID_SVXITEMS_KERNING_CONDENSED
+{
+    Text [ en-US ] = "Condensed " ;
+};
+String RID_SVXITEMS_GRAPHIC
+{
+    Text [ en-US ] = "Graphic" ;
+};
+String RID_SVXITEMS_EMPHASIS_NONE_STYLE
+{
+    Text [ en-US ] = "none";
+};
+String RID_SVXITEMS_EMPHASIS_DOT_STYLE
+{
+    Text [ en-US ] = "Dots ";
+};
+String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
+{
+    Text [ en-US ] = "Circle ";
+};
+String RID_SVXITEMS_EMPHASIS_DISC_STYLE
+{
+// ??? disc == filled ring
+    Text [ en-US ] = "Filled circle ";
+};
+String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
+{
+    Text [ en-US ] = "Accent ";
+};
+String RID_SVXITEMS_EMPHASIS_ABOVE_POS
+{
+    Text [ en-US ] = "Above";
+};
+String RID_SVXITEMS_EMPHASIS_BELOW_POS
+{
+    Text [ en-US ] = "Below";
+};
+String RID_SVXITEMS_TWOLINES_OFF
+{
+    Text [ en-US ] = "Double-lined off";
+};
+String RID_SVXITEMS_TWOLINES
+{
+    Text [ en-US ] = "Double-lined";
+};
+String RID_SVXITEMS_SCRPTSPC_OFF
+{
+    Text [ en-US ] = "No automatic character spacing";
+};
+String RID_SVXITEMS_SCRPTSPC_ON
+{
+    Text [ en-US ] = "No automatic character spacing";
+};
+String RID_SVXITEMS_HNGPNCT_OFF
+{
+    Text [ en-US ] = "No hanging punctuation at line end";
+};
+String RID_SVXITEMS_HNGPNCT_ON
+{
+    Text [ en-US ] = "Hanging punctuation at line end";
+};
+String RID_SVXITEMS_FORBIDDEN_RULE_OFF
+{
+    Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines";
+};
+String RID_SVXITEMS_FORBIDDEN_RULE_ON
+{
+    Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines";
+};
+String RID_SVXITEMS_CHARROTATE_OFF
+{
+    Text [ en-US ] = "No rotated characters";
+};
+String RID_SVXITEMS_CHARROTATE
+{
+    Text [ en-US ] = "Character rotated by $(ARG1)°";
+};
+String RID_SVXITEMS_CHARROTATE_FITLINE
+{
+    Text [ en-US ] = "Fit to line";
+};
+String RID_SVXITEMS_CHARSCALE
+{
+    Text [ en-US ] = "Characters scaled $(ARG1)%";
+};
+String RID_SVXITEMS_CHARSCALE_OFF
+{
+    Text [ en-US ] = "No scaled characters";
+};
+String RID_SVXITEMS_RELIEF_NONE
+{
+    Text [ en-US ] = "No relief";
+};
+String RID_SVXITEMS_RELIEF_EMBOSSED
+{
+    Text [ en-US ] = "Relief";
+};
+String RID_SVXITEMS_RELIEF_ENGRAVED
+{
+    Text [ en-US ] = "Engraved";
+};
+String RID_SVXITEMS_PARAVERTALIGN_AUTO
+{
+    Text [ en-US ] = "Automatic text alignment";
+};
+String RID_SVXITEMS_PARAVERTALIGN_BASELINE
+{
+    Text [ en-US ] = "Text aligned to base line";
+};
+String RID_SVXITEMS_PARAVERTALIGN_TOP
+{
+    Text [ en-US ] = "Text aligned top";
+};
+String RID_SVXITEMS_PARAVERTALIGN_CENTER
+{
+    Text [ en-US ] = "Text aligned middle";
+};
+String RID_SVXITEMS_PARAVERTALIGN_BOTTOM
+{
+    Text [ en-US ] = "Text aligned bottom";
+};
+String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP
+{
+    Text [ en-US ] = "Text direction left-to-right (horizontal)";
+};
+String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP
+{
+    Text [ en-US ] = "Text direction right-to-left (horizontal)";
+};
+String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT
+{
+    Text [ en-US ] = "Text direction right-to-left (vertical)";
+};
+String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT
+{
+    Text [ en-US ] = "Text direction left-to-right (vertical)";
+};
+String RID_SVXITEMS_FRMDIR_ENVIRONMENT
+{
+    Text [ en-US ] = "Use superordinate object text direction setting";
+};
+String RID_SVXITEMS_PARASNAPTOGRID_ON
+{
+    Text[ en-US ] = "Paragraph snaps to text grid (if active)";
+};
+String RID_SVXITEMS_PARASNAPTOGRID_OFF
+{
+    Text[ en-US ] = "Paragraph does not snap to text grid";
+};
+String RID_SVXITEMS_CHARHIDDEN_FALSE
+{
+    Text [ en-US ] = "Not hidden";
+};
+String RID_SVXITEMS_CHARHIDDEN_TRUE
+{
+    Text [ en-US ] = "Hidden";
+};
+// ********************************************************************** EOF
+
diff --git a/svx/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index b241e08996..6b21048046 100644
--- a/svx/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textitem.cxx,v $
- * $Revision: 1.74.86.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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <com/sun/star/style/CaseMap.hpp>
@@ -40,16 +37,16 @@
 #include <toolkit/unohlp.hxx>
 #include <math.h>
 #include <rtl/math.hxx>
+#include <unotools/fontdefs.hxx>
+#include <vcl/outdev.hxx>
+#include <editeng/eeitem.hxx>
+#include <svtools/unitconv.hxx>
 
-#include <svx/eeitem.hxx>
-
-#include <basic/sbx.hxx>
 #define GLOBALOVERFLOW3
 
-
 #include <svl/memberid.hrc>
-#include <svx/svxids.hrc>
-#include <svx/svxitems.hrc>
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
 #include <vcl/vclenum.hxx>
 #include <tools/bigint.hxx>
 #include <tools/tenccvt.hxx>
@@ -79,41 +76,38 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/text/FontEmphasis.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <svx/unomid.hxx>
-
-
-#include "flstitem.hxx"
-#include "fontitem.hxx"
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fwdtitem.hxx"
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/cmapitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
-#include "nlbkitem.hxx"
-#include <svx/nhypitem.hxx>
-#include <svx/lcolitem.hxx>
-#include <svx/blnkitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/twolinesitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/charrotateitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <editeng/memberids.hrc>
+#include <editeng/flstitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fwdtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/prszitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/nlbkitem.hxx>
+#include <editeng/nhypitem.hxx>
+#include <editeng/lcolitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/charrotateitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
 
 // #90477#
 #include <tools/tenccvt.hxx>
@@ -573,7 +567,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
     }
 
     if ( nId )
-        sTxt = SVX_RESSTR( nId );
+        sTxt = EditResId( nId );
     return sTxt;
 }
 
@@ -735,7 +729,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation
 XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)WEIGHT_BLACK, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 14:18-------------------
@@ -1106,7 +1100,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
             if( SFX_MAPUNIT_RELATIVE != ePropUnit )
             {
                 ( rText = String::CreateFromInt32( (short)nProp ) ) +=
-                        SVX_RESSTR( GetMetricId( ePropUnit ) );
+                        EE_RESSTR( GetMetricId( ePropUnit ) );
                 if( 0 <= (short)nProp )
                     rText.Insert( sal_Unicode('+'), 0 );
             }
@@ -1114,7 +1108,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
             {
                 rText = GetMetricText( (long)nHeight,
                                         eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-                rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+                rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             }
             else
                 ( rText = String::CreateFromInt32( nProp )) += sal_Unicode('%');
@@ -1319,7 +1313,7 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
             {
                 rText = GetMetricText( (long)nWidth,
                                         eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-                rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+                rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             }
             else
                 ( rText = String::CreateFromInt32( nProp )) += sal_Unicode('%');
@@ -1534,7 +1528,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const
 XubString SvxUnderlineItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
 }
 
 // class SvxOverlineItem ------------------------------------------------
@@ -1567,7 +1561,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, USHORT) const
 XubString SvxOverlineItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
 }
 
 // class SvxCrossedOutItem -----------------------------------------------
@@ -1658,7 +1652,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
 XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)STRIKEOUT_X, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 16:28-------------------
@@ -1755,7 +1749,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_SHADOWED_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -1816,7 +1810,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_AUTOKERN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -1878,7 +1872,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_WORDLINE_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -1939,7 +1933,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CONTOUR_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -2257,11 +2251,11 @@ SfxItemPresentation SvxKerningItem::GetPresentation
             return ePres;
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-            rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+            rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             return ePres;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
             USHORT nId = 0;
 
             if ( GetValue() > 0 )
@@ -2270,9 +2264,9 @@ SfxItemPresentation SvxKerningItem::GetPresentation
                 nId = RID_SVXITEMS_KERNING_CONDENSED;
 
             if ( nId )
-                rText += SVX_RESSTR(nId);
+                rText += EE_RESSTR(nId);
             rText += GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-            rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+            rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             return ePres;
         }
         default: ; //prevent warning
@@ -2370,7 +2364,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
 XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos < (USHORT)SVX_CASEMAP_END, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 16:29-------------------
@@ -2518,7 +2512,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
             if ( nEsc != 0 )
             {
                 if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc )
-                    rText += String( SVX_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO) );
+                    rText += String( EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO) );
                 else
                     ( rText += String::CreateFromInt32( nEsc )) += sal_Unicode('%');
             }
@@ -2534,7 +2528,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
 XubString SvxEscapementItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos < (USHORT)SVX_ESCAPEMENT_END, "enum overflow!" );
-    return SVX_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
+    return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
@@ -2948,7 +2942,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_BLINK_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -3009,7 +3003,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
                 sal_uInt16 nVal = GetValue();
-                rText = SVX_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
+                rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
                                         ( EMPHASISMARK_STYLE & nVal ));
                 USHORT nId = ( EMPHASISMARK_POS_ABOVE & nVal )
                                 ? RID_SVXITEMS_EMPHASIS_ABOVE_POS
@@ -3017,7 +3011,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
                                     ? RID_SVXITEMS_EMPHASIS_BELOW_POS
                                     : 0;
                 if( nId )
-                    rText += SVX_RESSTR( nId );
+                    rText += EE_RESSTR( nId );
                 return ePres;
             }
         default: ; //prevent warning
@@ -3210,10 +3204,10 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             if( !GetValue() )
-                rText = SVX_RESSTR( RID_SVXITEMS_TWOLINES_OFF );
+                rText = EE_RESSTR( RID_SVXITEMS_TWOLINES_OFF );
             else
             {
-                rText = SVX_RESSTR( RID_SVXITEMS_TWOLINES );
+                rText = EE_RESSTR( RID_SVXITEMS_TWOLINES );
                 if( GetStartBracket() )
                     rText.Insert( GetStartBracket(), 0 );
                 if( GetEndBracket() )
@@ -3302,14 +3296,14 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             if( !GetValue() )
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARROTATE_OFF );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE_OFF );
             else
             {
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARROTATE );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE );
                 rText.SearchAndReplaceAscii( "$(ARG1)",
                             String::CreateFromInt32( GetValue() / 10 ));
                 if( IsFitToLine() )
-                    rText += SVX_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE );
+                    rText += EE_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE );
             }
             return ePres;
         }
@@ -3447,10 +3441,10 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             if( !GetValue() )
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARSCALE_OFF );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE_OFF );
             else
             {
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARSCALE );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE );
                 rText.SearchAndReplaceAscii( "$(ARG1)",
                             String::CreateFromInt32( GetValue() ));
             }
@@ -3522,7 +3516,7 @@ String SvxCharReliefItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
                     "enum overflow" );
-    return String( SVX_RES( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
+    return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
 }
 
 USHORT SvxCharReliefItem::GetValueCount() const
diff --git a/svx/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 35afd13291..732664f46e 100644
--- a/svx/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: writingmodeitem.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,17 +26,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 
 
-#include <svx/writingmodeitem.hxx>
-#include <svx/dialmgr.hxx>
-
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
+#include <editeng/writingmodeitem.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
@@ -101,7 +95,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
 
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
-        rText = SVX_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
+        rText = String( EditResId( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ) );
         break;
 
     default:
diff --git a/svx/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index b7e6260951..843106ba5c 100644
--- a/svx/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcnitm.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,14 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <com/sun/star/xml/AttributeData.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <xmloff/xmlcnimp.hxx>
-#ifndef _XMLOFF_XMLCNITM_HXX
 #include <xmloff/unoatrcn.hxx>
-#endif
-#include "xmlcnitm.hxx"
+#include <editeng/xmlcnitm.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 71bc790664..71602b53e3 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SvXMLAutoCorrectExport.cxx,v $
- * $Revision: 1.9 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <SvXMLAutoCorrectExport.hxx>
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index 6620168ca3..224d9e3586 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SvXMLAutoCorrectExport.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 
 class SvXMLAutoCorrectExport : public SvXMLExport
 {
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 28b8f493dc..e6cc0e61c8 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SvXMLAutoCorrectImport.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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <SvXMLAutoCorrectImport.hxx>
 #ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 4b1bfb4b5e..2175a453a7 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SvXMLAutoCorrectImport.hxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +34,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 
 class SvXMLAutoCorrectImport : public SvXMLImport
 {
diff --git a/svx/source/editeng/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 439691d4ca..3bf26ec629 100644
--- a/svx/source/editeng/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acorrcfg.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,16 +26,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include "acorrcfg.hxx"
-#include <sfx2/app.hxx>
+#include "precompiled_editeng.hxx"
 
+#include <editeng/acorrcfg.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/urihelper.hxx>
 
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -86,11 +82,6 @@ SvxAutoCorrCfg::~SvxAutoCorrCfg()
     delete pAutoCorrect;
 }
 
-/*String SvxAutoCorrCfg::GetName() const
-{
-    return String( OffResId( RID_STR_NAME_ACORRCFG ));
-}
-*/
 void SvxAutoCorrCfg::SetAutoCorrect( SvxAutoCorrect* pNew )
 {
     if( pNew && pNew != pAutoCorrect )
@@ -119,7 +110,7 @@ Sequence<OUString> 	SvxBaseAutoCorrCfg::GetPropertyNames()
         "ChangeUnderlineWeight",				//  5
         "SetInetAttribute",						//  6
         "ChangeOrdinalNumber",					//  7
-        "ChangeFraction",						//  8
+        "AddNonBreakingSpace",                  //  8
         "ChangeDash",							//  9
         "RemoveDoubleSpaces",					// 10
         "ReplaceSingleQuote",					// 11
@@ -189,17 +180,17 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
                         if(*(sal_Bool*)pValues[nProp].getValue())
                             nFlags |= ChgOrdinalNumber;
                     break;//"ChangeOrdinalNumber",
-                    case  8:
+                    case 8:
                         if(*(sal_Bool*)pValues[nProp].getValue())
-                            nFlags |= ChgFractionSymbol;
-                    break;//"ChangeFraction",
+                             nFlags |= AddNonBrkSpace;
+                    break;//"AddNonBreakingSpace"
                     case  9:
                         if(*(sal_Bool*)pValues[nProp].getValue())
                             nFlags |= ChgToEnEmDash;
                     break;//"ChangeDash",
                     case 10:
                         if(*(sal_Bool*)pValues[nProp].getValue())
-                            nFlags |= IngnoreDoubleSpace;
+                            nFlags |= IgnoreDoubleSpace;
                     break;//"RemoveDoubleSpaces",
                     case 11:
                         if(*(sal_Bool*)pValues[nProp].getValue())
@@ -301,16 +292,16 @@ void SvxBaseAutoCorrCfg::Commit()
                 bVal = 0 != (nFlags & ChgOrdinalNumber);
                 pValues[nProp].setValue(&bVal, rType);
             break;//"ChangeOrdinalNumber",
-            case  8:
-                bVal = 0 != (nFlags & ChgFractionSymbol);
+            case 8:
+                bVal = 0 != (nFlags & AddNonBrkSpace);
                 pValues[nProp].setValue(&bVal, rType);
-            break;//"ChangeFraction",
+            break;//"AddNonBreakingSpace"
             case  9:
                 bVal = 0 != (nFlags & ChgToEnEmDash);
                 pValues[nProp].setValue(&bVal, rType);
             break;//"ChangeDash",
             case 10:
-                bVal = 0 != (nFlags & IngnoreDoubleSpace);
+                bVal = 0 != (nFlags & IgnoreDoubleSpace);
                 pValues[nProp].setValue(&bVal, rType);
             break;//"RemoveDoubleSpaces",
             case 11:
@@ -362,7 +353,7 @@ Sequence<OUString> 	SvxSwAutoCorrCfg::GetPropertyNames()
         "Format/Option/ChangeUnderlineWeight",                          // 8
         "Format/Option/SetInetAttribute",                               // 9
         "Format/Option/ChangeOrdinalNumber",                            //10
-        "Format/Option/ChangeFraction",                                 //11
+        "Format/Option/AddNonBreakingSpace",                            //11
         "Format/Option/ChangeDash",                                     //12
         "Format/Option/DelEmptyParagraphs",                             //13
         "Format/Option/ReplaceUserStyle",                               //14
@@ -372,35 +363,34 @@ Sequence<OUString> 	SvxSwAutoCorrCfg::GetPropertyNames()
         "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily",    //18
         "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset",   //19
         "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch",     //20
-        "Format/Option/ReplaceQuote",                                   //21
-        "Format/Option/CombineParagraphs",                              //22
-        "Format/Option/CombineValue",                                   //23
-        "Format/Option/DelSpacesAtStartEnd",                            //24
-        "Format/Option/DelSpacesBetween",                               //25
-        "Format/ByInput/Enable",                                        //26
-        "Format/ByInput/ChangeDash",                                    //27
-        "Format/ByInput/ApplyNumbering/Enable",                         //28
-        "Format/ByInput/ChangeToBorders",                               //29
-        "Format/ByInput/ChangeToTable",                                 //30
-        "Format/ByInput/ReplaceStyle",                                  //31
-        "Format/ByInput/DelSpacesAtStartEnd",                           //32
-        "Format/ByInput/DelSpacesBetween",                              //33
-        "Completion/Enable",                                            //34
-        "Completion/MinWordLen",                                        //35
-        "Completion/MaxListLen",                                        //36
-        "Completion/CollectWords",                                      //37
-        "Completion/EndlessList",                                       //38
-        "Completion/AppendBlank",                                       //39
-        "Completion/ShowAsTip",                                         //40
-        "Completion/AcceptKey",                                         //41
-        "Completion/KeepList",                                          //42
-        "Format/ByInput/ApplyNumbering/SpecialCharacter/Char",          //43
-        "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",          //44
-        "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",    //45
-        "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",   //46
-        "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",     //47
+        "Format/Option/CombineParagraphs",                              //21
+        "Format/Option/CombineValue",                                   //22
+        "Format/Option/DelSpacesAtStartEnd",                            //23
+        "Format/Option/DelSpacesBetween",                               //24
+        "Format/ByInput/Enable",                                        //25
+        "Format/ByInput/ChangeDash",                                    //26
+        "Format/ByInput/ApplyNumbering/Enable",                         //27
+        "Format/ByInput/ChangeToBorders",                               //28
+        "Format/ByInput/ChangeToTable",                                 //29
+        "Format/ByInput/ReplaceStyle",                                  //30
+        "Format/ByInput/DelSpacesAtStartEnd",                           //31
+        "Format/ByInput/DelSpacesBetween",                              //32
+        "Completion/Enable",                                            //33
+        "Completion/MinWordLen",                                        //34
+        "Completion/MaxListLen",                                        //35
+        "Completion/CollectWords",                                      //36
+        "Completion/EndlessList",                                       //37
+        "Completion/AppendBlank",                                       //38
+        "Completion/ShowAsTip",                                         //39
+        "Completion/AcceptKey",                                         //40
+        "Completion/KeepList",                                          //41
+        "Format/ByInput/ApplyNumbering/SpecialCharacter/Char",          //42
+        "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",          //43
+        "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",    //44
+        "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",   //45
+        "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch"      //46
     };
-    const int nCount = 48;
+    const int nCount = 47;
     Sequence<OUString> aNames(nCount);
     OUString* pNames = aNames.getArray();
     for(int i = 0; i < nCount; i++)
@@ -438,7 +428,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                     case   8: rSwFlags.bChgWeightUnderl = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeUnderlineWeight",
                     case   9: rSwFlags.bSetINetAttr = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/SetInetAttribute",
                     case  10: rSwFlags.bChgOrdinalNumber = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeOrdinalNumber",
-                    case  11: rSwFlags.bChgFracionSymbol = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeFraction",
+                    case  11: rSwFlags.bAddNonBrkSpace = *(sal_Bool*)pValues[nProp].getValue( ); break; // "Format/Option/AddNonBreakingSpace",
 // it doesn't exist here - the common flags are used for that -> LM
 //                  case  12: rSwFlags.bChgToEnEmDash = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ChangeDash",
                     case  13: rSwFlags.bDelEmptyNode = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelEmptyParagraphs",
@@ -475,78 +465,77 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
                         rSwFlags.aBulletFont.SetPitch(FontPitch(nVal));
                     }
                     break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch",
-                    case  21: rSwFlags.bReplaceQuote = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/ReplaceQuote",
-                    case  22: rSwFlags.bRightMargin = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/CombineParagraphs",
-                    case  23:
+                    case  21: rSwFlags.bRightMargin = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/CombineParagraphs",
+                    case  22:
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nRightMargin =
                             sal::static_int_cast< BYTE >(nVal);
                     }
                     break; // "Format/Option/CombineValue",
-                    case  24: rSwFlags.bAFmtDelSpacesAtSttEnd =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelSpacesAtStartEnd",
-                    case  25: rSwFlags.bAFmtDelSpacesBetweenLines = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelSpacesBetween",
-                    case  26: rParent.bAutoFmtByInput = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/Enable",
-                    case  27: rSwFlags.bChgToEnEmDash = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ChangeDash",
-                    case  28: rSwFlags.bSetNumRule = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ApplyNumbering/Enable",
-                    case  29: rSwFlags.bSetBorder = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ChangeToBorders",
-                    case  30: rSwFlags.bCreateTable = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ChangeToTable",
-                    case  31: rSwFlags.bReplaceStyles =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ReplaceStyle",
-                    case  32: rSwFlags.bAFmtByInpDelSpacesAtSttEnd =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/DelSpacesAtStartEnd",
-                    case  33: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/DelSpacesBetween",
-                    case  34: rSwFlags.bAutoCompleteWords = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/Enable",
-                    case  35:
+                    case  23: rSwFlags.bAFmtDelSpacesAtSttEnd =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelSpacesAtStartEnd",
+                    case  24: rSwFlags.bAFmtDelSpacesBetweenLines = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/Option/DelSpacesBetween",
+                    case  25: rParent.bAutoFmtByInput = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/Enable",
+                    case  26: rSwFlags.bChgToEnEmDash = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ChangeDash",
+                    case  27: rSwFlags.bSetNumRule = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ApplyNumbering/Enable",
+                    case  28: rSwFlags.bSetBorder = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ChangeToBorders",
+                    case  29: rSwFlags.bCreateTable = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ChangeToTable",
+                    case  30: rSwFlags.bReplaceStyles =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/ReplaceStyle",
+                    case  31: rSwFlags.bAFmtByInpDelSpacesAtSttEnd =  *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/DelSpacesAtStartEnd",
+                    case  32: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *(sal_Bool*)pValues[nProp].getValue(); break; // "Format/ByInput/DelSpacesBetween",
+                    case  33: rSwFlags.bAutoCompleteWords = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/Enable",
+                    case  34:
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltWordLen =
                             sal::static_int_cast< USHORT >(nVal);
                     }
                     break; // "Completion/MinWordLen",
-                    case  36:
+                    case  35:
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltListLen =
                             sal::static_int_cast< USHORT >(nVal);
                     }
                     break; // "Completion/MaxListLen",
-                    case  37: rSwFlags.bAutoCmpltCollectWords = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/CollectWords",
-                    case  38: rSwFlags.bAutoCmpltEndless = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/EndlessList",
-                    case  39: rSwFlags.bAutoCmpltAppendBlanc = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/AppendBlank",
-                    case  40: rSwFlags.bAutoCmpltShowAsTip = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/ShowAsTip",
-                    case  41:
+                    case  36: rSwFlags.bAutoCmpltCollectWords = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/CollectWords",
+                    case  37: rSwFlags.bAutoCmpltEndless = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/EndlessList",
+                    case  38: rSwFlags.bAutoCmpltAppendBlanc = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/AppendBlank",
+                    case  39: rSwFlags.bAutoCmpltShowAsTip = *(sal_Bool*)pValues[nProp].getValue(); break; // "Completion/ShowAsTip",
+                    case  40:
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.nAutoCmpltExpandKey =
                             sal::static_int_cast< USHORT >(nVal);
                     }
                     break; // "Completion/AcceptKey"
-                    case 42 :rSwFlags.bAutoCmpltKeepList = *(sal_Bool*)pValues[nProp].getValue(); break;//"Completion/KeepList"
-                    case 43 :
+                    case 41 :rSwFlags.bAutoCmpltKeepList = *(sal_Bool*)pValues[nProp].getValue(); break;//"Completion/KeepList"
+                    case 42 :
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.cByInputBullet =
                             sal::static_int_cast< sal_Unicode >(nVal);
                     }
                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Char",
-                    case 44 :
+                    case 43 :
                     {
                         OUString sTemp; pValues[nProp] >>= sTemp;
                         rSwFlags.aByInputBulletFont.SetName(sTemp);
                     }
                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",
-                    case 45 :
+                    case 44 :
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.aByInputBulletFont.SetFamily(FontFamily(nVal));
                     }
                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",
-                    case 46 :
+                    case 45 :
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.aByInputBulletFont.SetCharSet(CharSet(nVal));
                     }
                     break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",
-                    case 47 :
+                    case 46 :
                     {
                         sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
                         rSwFlags.aByInputBulletFont.SetPitch(FontPitch(nVal));
@@ -599,7 +588,7 @@ void SvxSwAutoCorrCfg::Commit()
             case   8: bVal = rSwFlags.bChgWeightUnderl; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeUnderlineWeight",
             case   9: bVal = rSwFlags.bSetINetAttr; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/SetInetAttribute",
             case  10: bVal = rSwFlags.bChgOrdinalNumber; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeOrdinalNumber",
-            case  11: bVal = rSwFlags.bChgFracionSymbol; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ChangeFraction",
+            case  11: bVal = rSwFlags.bAddNonBrkSpace;  pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/AddNonBreakingSpace",
 // it doesn't exist here - the common flags are used for that -> LM
             case  12:
                 bVal = sal_True;  pValues[nProp].setValue(&bVal, rType);
@@ -622,49 +611,48 @@ void SvxSwAutoCorrCfg::Commit()
             case  20:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetPitch();
             break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch",
-            case  21: bVal = rSwFlags.bReplaceQuote; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/ReplaceQuote",
-            case  22: bVal = rSwFlags.bRightMargin; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/CombineParagraphs",
-            case  23:
+            case  21: bVal = rSwFlags.bRightMargin; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/CombineParagraphs",
+            case  22:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin;
             break; // "Format/Option/CombineValue",
-            case  24: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
-            case  25: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
-            case  26: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable",
-            case  27: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash",
-            case  28: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable",
-            case  29: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders",
-            case  30: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable",
-            case  31: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle",
-            case  32: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
-            case  33: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
-            case  34: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable",
-            case  35:
+            case  23: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
+            case  24: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
+            case  25: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable",
+            case  26: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash",
+            case  27: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable",
+            case  28: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders",
+            case  29: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable",
+            case  30: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle",
+            case  31: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
+            case  32: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
+            case  33: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable",
+            case  34:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen;
             break; // "Completion/MinWordLen",
-            case  36:
+            case  35:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltListLen;
             break; // "Completion/MaxListLen",
-            case  37: bVal = rSwFlags.bAutoCmpltCollectWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/CollectWords",
-            case  38: bVal = rSwFlags.bAutoCmpltEndless; pValues[nProp].setValue(&bVal, rType); break; // "Completion/EndlessList",
-            case  39: bVal = rSwFlags.bAutoCmpltAppendBlanc; pValues[nProp].setValue(&bVal, rType); break; // "Completion/AppendBlank",
-            case  40: bVal = rSwFlags.bAutoCmpltShowAsTip; pValues[nProp].setValue(&bVal, rType); break; // "Completion/ShowAsTip",
-            case  41:
+            case  36: bVal = rSwFlags.bAutoCmpltCollectWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/CollectWords",
+            case  37: bVal = rSwFlags.bAutoCmpltEndless; pValues[nProp].setValue(&bVal, rType); break; // "Completion/EndlessList",
+            case  38: bVal = rSwFlags.bAutoCmpltAppendBlanc; pValues[nProp].setValue(&bVal, rType); break; // "Completion/AppendBlank",
+            case  39: bVal = rSwFlags.bAutoCmpltShowAsTip; pValues[nProp].setValue(&bVal, rType); break; // "Completion/ShowAsTip",
+            case  40:
                 pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltExpandKey;
             break; // "Completion/AcceptKey"
-            case 42 :bVal = rSwFlags.bAutoCmpltKeepList; pValues[nProp].setValue(&bVal, rType); break;// "Completion/KeepList"
-            case 43 :
+            case 41 :bVal = rSwFlags.bAutoCmpltKeepList; pValues[nProp].setValue(&bVal, rType); break;// "Completion/KeepList"
+            case 42 :
                 pValues[nProp] <<= (sal_Int32)rSwFlags.cByInputBullet;
             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Char",
-            case 44 :
+            case 43 :
                 pValues[nProp] <<= OUString(rSwFlags.aByInputBulletFont.GetName());
             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",
-            case 45 :
+            case 44 :
                 pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetFamily();
             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",
-            case 46 :
+            case 45 :
                 pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetCharSet();
             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",
-            case 47 :
+            case 46 :
                 pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetPitch();
             break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontPitch",
         }
diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx
new file mode 100755
index 0000000000..f02b4733c7
--- /dev/null
+++ b/editeng/source/misc/edtdlg.cxx
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: sfxdlg.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_editeng.hxx"
+
+#include <editeng/edtdlg.hxx>
+
+EditAbstractDialogFactory* EditAbstractDialogFactory::Create()
+{
+    return dynamic_cast <EditAbstractDialogFactory*>( VclAbstractDialogFactory::Create() );
+}
+
+EditAbstractDialogFactory::~EditAbstractDialogFactory()
+{
+}
diff --git a/svx/source/editeng/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 862e4ec7fd..da7b654a8b 100644
--- a/svx/source/editeng/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: forbiddencharacterstable.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,16 +26,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #include <unotools/localedatawrapper.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize, USHORT nGrow )
  : SvxForbiddenCharactersTableImpl( nISize, nGrow )
diff --git a/svx/source/dialog/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 9f56848d8e..b200bbf091 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hangulhanja.cxx,v $
- * $Revision: 1.20.102.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,11 +26,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <svx/hangulhanja.hxx>
-#include <vcl/msgbox.hxx> //add CHINA001
+#include "precompiled_editeng.hxx"
+#include <editeng/hangulhanja.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/button.hxx>
-// header for class SvtLinguConfig
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
 
@@ -51,14 +47,14 @@
 #include <vcl/stdtext.hxx>
 #include <unotools/charclass.hxx>
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <unolingu.hxx>
+#include <editeng/edtdlg.hxx> 
+#include <editeng/editrids.hrc>
+#include <editeng/unolingu.hxx>
 
 #define HHC HangulHanjaConversion
 
 //.............................................................................
-namespace svx
+namespace editeng
 {
 //.............................................................................
 
@@ -344,7 +340,7 @@ namespace svx
         DBG_ASSERT( m_bIsInteractive, "createDialog when the conversion should not be interactive?" );
         if ( m_bIsInteractive && !m_pConversionDialog )
         {
-            SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+            EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
             if(pFact)
             {
                 m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection );
diff --git a/editeng/source/misc/lingu.src b/editeng/source/misc/lingu.src
new file mode 100644
index 0000000000..146753207c
--- /dev/null
+++ b/editeng/source/misc/lingu.src
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * 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 ---------------------------------------------------------------
+#include <editeng/editrids.hrc>
+ // pragma ----------------------------------------------------------------
+
+ // QueryBoxen ---------------------------------------------------------------
+QueryBox RID_SVXQB_CONTINUE
+{
+    BUTTONS = WB_YES_NO ;
+    DEFBUTTON = WB_DEF_YES ;
+    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Anfang des Dokumentes fortsetzen? : šberpr³fung am Anfang des Dokumentes fortsetzen? */
+    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Anfang des Dokumentes fortsetzen? : šberpr³fung am Anfang des Dokumentes fortsetzen? */
+    Message [ en-US ] = "Continue checking at beginning of document?" ;
+};
+QueryBox RID_SVXQB_BW_CONTINUE
+{
+    BUTTONS = WB_YES_NO ;
+    DEFBUTTON = WB_DEF_YES ;
+    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Ende des Dokumentes fortsetzen? : šberpr³fung am Ende des Dokumentes fortsetzen? */
+    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Ende des Dokumentes fortsetzen? : šberpr³fung am Ende des Dokumentes fortsetzen? */
+    Message [ en-US ] = "Continue checking at end of document?" ;
+};
+String RID_SVXSTR_HMERR_THESAURUS
+{
+    /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus für die eingestellte Sprache ist nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : Ein Thesaurus f³r die eingestellte Sprache ist nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
+    /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus für die eingestellte Sprache ist nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : Ein Thesaurus f³r die eingestellte Sprache ist nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
+    Text [ en-US ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ;
+};
+String RID_SVXSTR_DIC_ERR_UNKNOWN
+{
+    Text [ en-US ] = "Word cannot be added to dictionary\ndue to unknown reason.";
+};
+String RID_SVXSTR_DIC_ERR_FULL
+{
+    Text [ en-US ] = "The dictionary is already full.";
+};
+String RID_SVXSTR_DIC_ERR_READONLY
+{
+    Text [ en-US ] = "The dictionary is read-only.";
+};
+
+ // ********************************************************************** EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/editeng/source/misc/makefile.mk b/editeng/source/misc/makefile.mk
new file mode 100644
index 0000000000..7eb2d80447
--- /dev/null
+++ b/editeng/source/misc/makefile.mk
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE 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.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.
+#
+#*************************************************************************
+PRJ=..$/..
+
+PRJNAME=editeng
+TARGET=misc
+
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=eeng_pch
+#PROJECTPCHSOURCE=eeng_pch
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Allgemein ----------------------------------------------------------
+
+.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != ""
+CDEFS+=-DEDITDEBUG
+.ENDIF
+
+SLOFILES =	\
+    $(SLO)$/edtdlg.obj \
+    $(SLO)$/unolingu.obj \
+    $(SLO)$/acorrcfg.obj \
+    $(SLO)$/forbiddencharacterstable.obj \
+    $(SLO)$/hangulhanja.obj \
+    $(SLO)$/splwrap.obj \
+    $(SLO)$/svxacorr.obj \
+    $(SLO)$/SvXMLAutoCorrectExport.obj \
+    $(SLO)$/SvXMLAutoCorrectImport.obj \
+    $(SLO)$/swafopt.obj \
+    $(SLO)$/txtrange.obj
+
+SRS1NAME=misc
+SRC1FILES =  \
+        lingu.src
+
+.INCLUDE :  target.mk
+
diff --git a/svx/source/dialog/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index d22cdb26ad..68cc6c5309 100644
--- a/svx/source/dialog/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: splwrap.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,34 +26,31 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include<rtl/ustring.hxx>
 #include <tools/shl.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/debug.hxx>
+#include <svtools/langtab.hxx>
 
 #ifndef __RSC
 #include <tools/errinf.hxx>
 #endif
-#include <svxerr.hxx>
-#include <dlgutil.hxx>
-#include <unolingu.hxx>
-#include <sfx2/sfxuno.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 
 #include <map>
 
-#include <svx/svxenum.hxx>
-#include "hyphen.hxx"       // Der HyphenDialog
-#include <svx/splwrap.hxx>      // Der Wrapper
-#include <svx/thesdlg.hxx>      // ThesaurusDlg
-#include <svx/dialmgr.hxx>
-
-#include <svx/dialogs.hrc>
-
+#include <editeng/svxenum.hxx>
+#include <editeng/splwrap.hxx>      // Der Wrapper
+#include <editeng/edtdlg.hxx>      
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/editids.hrc>
+#include <editeng/editerr.hxx>
 
 #define WAIT_ON() if(pWin != NULL) { pWin->EnterWait(); }
 
@@ -134,14 +128,14 @@ void SvxSpellWrapper::ShowLanguageErrors()
 
         if (SVX_LANG_MISSING_DO_WARN == nTmpSpell)
         {
-            String aErr( ::GetLanguageString( nLang ) );
+            String aErr( SvtLanguageTable::GetLanguageString( nLang ) );
             ErrorHandler::HandleError(
                 *new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
             nTmpSpell = SVX_LANG_MISSING;
         }
         if (SVX_LANG_MISSING_DO_WARN == nTmpHyph)
         {
-            String aErr( ::GetLanguageString( nLang ) );
+            String aErr( SvtLanguageTable::GetLanguageString( nLang ) );
             ErrorHandler::HandleError(
                 *new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
             nTmpHyph = SVX_LANG_MISSING;
@@ -346,25 +340,22 @@ void SvxSpellWrapper::ChangeThesWord( const String& )
 
 void SvxSpellWrapper::StartThesaurus( const String &rWord, sal_uInt16 nLanguage )
 {
-
-    String sErr( SVX_RES( RID_SVXSTR_HMERR_THESAURUS ) );
-
     Reference< XThesaurus >  xThes( SvxGetThesaurus() );
     if (!xThes.is())
     {
-        InfoBox( pWin, sErr ).Execute();
+        InfoBox( pWin, EE_RESSTR( RID_SVXSTR_HMERR_THESAURUS ) ).Execute();
         return;
     }
 
     WAIT_ON();	// while looking up for initial word
-    SvxThesaurusDialog aDlg(pWin, xThes, rWord, nLanguage);
+    EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
+    AbstractThesaurusDialog* pDlg = pFact->CreateThesaurusDialog( pWin, xThes, rWord, nLanguage );
     WAIT_OFF();
-
-    if ( aDlg.Execute()== RET_OK )
+    if ( pDlg->Execute()== RET_OK )
     {
-        ChangeThesWord( aDlg.GetWord() );
+        ChangeThesWord( pDlg->GetWord() );
     }
-
+    delete pDlg;
 }
 
 // -----------------------------------------------------------------------
@@ -413,12 +404,12 @@ void SvxSpellWrapper::SpellDocument( )
         bDialog = sal_True;
         if (xHyphWord.is())
         {
-            DBG_ASSERT(xHyphWord.is(), "NULL pointer");
-            SvxHyphenWordDialog* pDlg =
-                new SvxHyphenWordDialog( xHyphWord->getWord(),
+            EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
+            AbstractHyphenWordDialog* pDlg = pFact->CreateHyphenWordDialog( pWin, 
+                            xHyphWord->getWord(),
                             SvxLocaleToLanguage( xHyphWord->getLocale() ),
-                            pWin, xHyph, this );
-            pWin = pDlg;
+                            xHyph, this );
+            pWin = pDlg->GetWindow();
             pDlg->Execute();
             delete pDlg;
         }
@@ -470,7 +461,6 @@ sal_Bool SvxSpellWrapper::SpellNext( )
         return sal_False;
     }
 
-    ResMgr& rMgr = DIALOG_MGR();
     sal_Bool bGoOn = sal_False;
 
     if ( bOtherCntnt )
@@ -514,7 +504,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
         if( bDontWrapAround )
 #else
         sal_uInt16 nResId = bReverse ? RID_SVXQB_BW_CONTINUE : RID_SVXQB_CONTINUE;
-        QueryBox aBox( pWin, ResId( nResId, rMgr ) );
+        QueryBox aBox( pWin, EditResId( nResId ) );
         if ( aBox.Execute() != RET_YES )
 #endif
 
diff --git a/svx/source/editeng/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c95ef473f3..ebc025fea7 100644
--- a/svx/source/editeng/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxacorr.cxx,v $
- * $Revision: 1.62 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,38 +26,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
 #include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 #include <tools/urlobj.hxx>
 #include <tools/table.hxx>
 #include <i18npool/mslangid.hxx>
-#ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _STORINFO_HXX //autogen
 #include <sot/storinfo.hxx>
-#endif
-#ifndef _SFX_DOCFILE_HXX
-#include <sfx2/docfile.hxx>
-#endif
-#include <sfx2/sfxhelp.hxx>
-#include <sfx2/viewfrm.hxx>
 // fuer die Sort-String-Arrays aus dem SVMEM.HXX
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
-
-#ifndef SVTOOLS_FSTATHELPER_HXX
 #include <svl/fstathelper.hxx>
-#endif
 #include <svtools/helpopt.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
-#ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL_
 #include <com/sun/star/i18n/UnicodeType.hdl>
-#endif
 #include <unotools/collatorwrapper.hxx>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <unotools/localedatawrapper.hxx>
@@ -68,23 +52,15 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-
+#include <editeng/editids.hrc>
 #include <sot/storage.hxx>
 #include <comphelper/storagehelper.hxx>
-
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/svxacorr.hxx>
-#include "unolingu.hxx"
-
-#ifndef _SVX_HELPID_HRC
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/svxacorr.hxx>
+#include <editeng/unolingu.hxx>
 #include <helpid.hrc>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
@@ -96,6 +72,9 @@
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <xmloff/xmltoken.hxx>
+#include <vcl/help.hxx>
+
+#define CHAR_HARDBLANK		((sal_Unicode)0x00A0)
 
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
@@ -333,7 +312,13 @@ sal_Bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar )
             cChar == ' '  || cChar == '\'' || cChar == '\"' ||
             cChar == '*'  || cChar == '_'  ||
             cChar == '.'  || cChar == ','  || cChar == ';' ||
-            cChar == ':'  || cChar == '?' || cChar == '!';
+            cChar == ':'  || cChar == '?' || cChar == '!' || cChar == '/';
+}
+
+sal_Bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar )
+{
+    return cChar == ';' || cChar == ':'  || cChar == '?' || cChar == '!' || 
+        cChar == '/' /*case for the urls exception*/;
 }
 
 /* -----------------19.11.98 10:15-------------------
@@ -344,9 +329,9 @@ long SvxAutoCorrect::GetDefaultFlags()
     long nRet = Autocorrect
                     | CptlSttSntnc
                     | CptlSttWrd
-                    | ChgFractionSymbol
                     | ChgOrdinalNumber
                     | ChgToEnEmDash
+                    | AddNonBrkSpace
                     | ChgWeightUnderl
                     | SetINetAttr
                     | ChgQuotes
@@ -383,9 +368,6 @@ SvxAutoCorrect::SvxAutoCorrect( const String& rShareAutocorrFile,
 {
     nFlags = SvxAutoCorrect::GetDefaultFlags();
 
-    c1Div2 = ByteString::ConvertToUnicode( '\xBD', RTL_TEXTENCODING_MS_1252 );
-    c1Div4 = ByteString::ConvertToUnicode( '\xBC', RTL_TEXTENCODING_MS_1252 );
-    c3Div4 = ByteString::ConvertToUnicode( '\xBE', RTL_TEXTENCODING_MS_1252 );
     cEmDash = ByteString::ConvertToUnicode( '\x97', RTL_TEXTENCODING_MS_1252 );
     cEnDash = ByteString::ConvertToUnicode( '\x96', RTL_TEXTENCODING_MS_1252 );
 }
@@ -403,7 +385,6 @@ SvxAutoCorrect::SvxAutoCorrect( const SvxAutoCorrect& rCpy )
     nFlags( rCpy.nFlags & ~(ChgWordLstLoad|CplSttLstLoad|WrdSttLstLoad)),
     cStartDQuote( rCpy.cStartDQuote ), cEndDQuote( rCpy.cEndDQuote ),
     cStartSQuote( rCpy.cStartSQuote ), cEndSQuote( rCpy.cEndSQuote ),
-    c1Div2( rCpy.c1Div2 ), c1Div4( rCpy.c1Div4 ), c3Div4( rCpy.c3Div4 ),
     cEmDash( rCpy.cEmDash ), cEnDash( rCpy.cEnDash )
 {
 }
@@ -487,40 +468,6 @@ BOOL SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
 }
 
 
-BOOL SvxAutoCorrect::FnChgFractionSymbol(
-                                SvxAutoCorrDoc& rDoc, const String& rTxt,
-                                xub_StrLen nSttPos, xub_StrLen nEndPos )
-{
-    sal_Unicode cChar = 0;
-
-    for( ; nSttPos < nEndPos; ++nSttPos )
-        if( !lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nSttPos ) ))
-            break;
-    for( ; nSttPos < nEndPos; --nEndPos )
-        if( !lcl_IsInAsciiArr( sImplEndSkipChars, rTxt.GetChar( nEndPos - 1 ) ))
-            break;
-
-    // 1/2, 1/4, ... ersetzen durch das entsprechende Zeichen vom Font
-    if( 3 == nEndPos - nSttPos && '/' == rTxt.GetChar( nSttPos+1 ))
-    {
-        switch( ( rTxt.GetChar( nSttPos )) * 256 + rTxt.GetChar( nEndPos-1 ))
-        {
-        case '1' * 256 + '2':		cChar = c1Div2;		break;
-        case '1' * 256 + '4':		cChar = c1Div4;		break;
-        case '3' * 256 + '4':		cChar = c3Div4;		break;
-        }
-
-        if( cChar )
-        {
-            // also austauschen:
-            rDoc.Delete( nSttPos+1, nEndPos );
-            rDoc.Replace( nSttPos, cChar );
-        }
-    }
-    return 0 != cChar;
-}
-
-
 BOOL SvxAutoCorrect::FnChgOrdinalNumber(
                                 SvxAutoCorrDoc& rDoc, const String& rTxt,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
@@ -692,6 +639,80 @@ BOOL SvxAutoCorrect::FnChgToEnEmDash(
     return bRet;
 }
 
+BOOL SvxAutoCorrect::FnAddNonBrkSpace(
+                                SvxAutoCorrDoc& rDoc, const String& rTxt,
+                                xub_StrLen, xub_StrLen nEndPos,
+                                LanguageType eLang )
+{
+    bool bRet = false;
+    
+    CharClass& rCC = GetCharClass( eLang );
+    const lang::Locale rLocale = rCC.getLocale( );
+
+    if ( rLocale.Language == OUString::createFromAscii( "fr" ) )
+    {
+        bool bFrCA = rLocale.Country == OUString::createFromAscii( "CA" );
+        OUString allChars = OUString::createFromAscii( ":;!?" );
+        OUString chars( allChars );
+        if ( bFrCA )
+            chars = OUString::createFromAscii( ":" );
+
+        sal_Unicode cChar = rTxt.GetChar( nEndPos );
+        bool bHasSpace = chars.indexOf( sal_Unicode( cChar ) ) != -1;
+        bool bIsSpecial = allChars.indexOf( sal_Unicode( cChar ) ) != -1;
+        if ( bIsSpecial )
+        {
+            // Get the last word delimiter position
+            xub_StrLen nSttWdPos = nEndPos;
+            while( nSttWdPos && !IsWordDelim( rTxt.GetChar( --nSttWdPos )))
+                ;
+            
+            // Check the presence of "://" in the word
+            xub_StrLen nStrPos = rTxt.Search( String::CreateFromAscii( "://" ), nSttWdPos + 1 );
+            if ( STRING_NOTFOUND == nStrPos )
+            {
+                // Check the previous char
+                sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
+                if ( ( chars.indexOf( sal_Unicode( cPrevChar ) ) == -1 ) && cPrevChar != '\t' )
+                { 
+                    // Remove any previous normal space
+                    xub_StrLen nPos = nEndPos - 1;
+                    while ( cPrevChar == ' ' || cPrevChar == CHAR_HARDBLANK )
+                    {
+                        if ( nPos == 0 ) break;
+                        nPos--;
+                        cPrevChar = rTxt.GetChar( nPos );
+                    }
+    
+                    if ( nPos != 0 )
+                    {
+                        nPos++;
+                        if ( nEndPos - nPos > 0 )
+                            rDoc.Delete( nPos, nEndPos );
+    
+                        // Add the non-breaking space at the end pos
+                        if ( bHasSpace )
+                            rDoc.Insert( nPos, CHAR_HARDBLANK );
+                        bRet = true;
+                    }
+                }
+            }
+        }
+        else if ( cChar == '/' )
+        {
+            // Remove the hardspace right before to avoid formatting URLs
+            sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
+            sal_Unicode cMaybeSpaceChar = rTxt.GetChar( nEndPos - 2 );
+            if ( cPrevChar == ':' && cMaybeSpaceChar == CHAR_HARDBLANK )
+            {
+                rDoc.Delete( nEndPos - 2, nEndPos - 1 );
+                bRet = true;
+            }
+        }
+    }
+
+    return bRet;
+}
 
 BOOL SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
@@ -1173,10 +1194,10 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
         {
             //JP 10.02.97: doppelte Spaces verhindern
             if( nInsPos && ' ' == cChar &&
-                IsAutoCorrFlag( IngnoreDoubleSpace ) &&
+                IsAutoCorrFlag( IgnoreDoubleSpace ) &&
                 ' ' == rTxt.GetChar( nInsPos - 1 ) )
             {
-                nRet = IngnoreDoubleSpace;
+                nRet = IgnoreDoubleSpace;
                 break;
             }
 
@@ -1204,6 +1225,13 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                 rDoc.Insert( nInsPos, cChar );
             else
                 rDoc.Replace( nInsPos, cChar );
+    
+            // Hardspaces autocorrection    
+            if ( NeedsHardspaceAutocorr( cChar ) && IsAutoCorrFlag( AddNonBrkSpace ) &&
+                FnAddNonBrkSpace( rDoc, rTxt, 0, nInsPos, rDoc.GetLanguage( nInsPos, FALSE ) ) )
+            {
+                nRet = AddNonBrkSpace;
+            }
         }
 
         if( !nInsPos )
@@ -1241,7 +1269,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
         // Bug 19285: Symbolzeichen nicht anfassen
         if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nInsPos ))
             break;
-
+            
         if( IsAutoCorrFlag( Autocorrect ) )
         {
             const String* pPara = 0;
@@ -1298,9 +1326,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             }
         }
 
-        if( ( IsAutoCorrFlag( nRet = ChgFractionSymbol ) &&
-                FnChgFractionSymbol( rDoc, rTxt, nCapLttrPos, nInsPos ) ) ||
-            ( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) &&
+        if( ( IsAutoCorrFlag( nRet = ChgOrdinalNumber ) &&
                 FnChgOrdinalNumber( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) ) ||
             ( IsAutoCorrFlag( nRet = SetINetAttr ) &&
                 ( ' ' == cChar || '\t' == cChar || 0x0a == cChar || !cChar ) &&
@@ -1326,8 +1352,7 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
 
     } while( FALSE );
 
-    SfxViewFrame* pVFrame;
-    if( nRet && 0 != (pVFrame = SfxViewFrame::Current()) )
+    if( nRet )
     {
         ULONG nHelpId = 0;
         if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd|ChgToEnEmDash ) )
@@ -1347,16 +1372,16 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
                  if( nRet & ChgQuotes) 			nHelpId = 16;
             else if( nRet & ChgSglQuotes) 		nHelpId = 17;
             else if( nRet & SetINetAttr) 		nHelpId = 18;
-            else if( nRet & IngnoreDoubleSpace) nHelpId = 19;
+            else if( nRet & IgnoreDoubleSpace)  nHelpId = 19;
             else if( nRet & ChgWeightUnderl) 	nHelpId = 20;
-            else if( nRet & ChgFractionSymbol ) nHelpId = 21;
+            else if( nRet & AddNonBrkSpace)     nHelpId = 21;
             else if( nRet & ChgOrdinalNumber)	nHelpId = 22;
         }
 
         if( nHelpId )
         {
             nHelpId += HID_AUTOCORR_HELP_START - 1;
-            SfxHelp::OpenHelpAgent( &pVFrame->GetFrame(), nHelpId );
+            Application::GetHelp()->OpenHelpAgent( nHelpId );
         }
     }
 
diff --git a/svx/source/editeng/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 0940a4e736..357ae7b095 100644
--- a/svx/source/editeng/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swafopt.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,11 +26,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/keycodes.hxx>
 #include <tools/string.hxx>
 
-#include <svx/swafopt.hxx>
+#include <editeng/swafopt.hxx>
 
 /*------------------------------------------------------------------------
  Beschreibung:
@@ -44,14 +41,13 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
                         RTL_CONSTASCII_STRINGPARAM( "StarSymbol" )),
                     Size( 0, 14 ) )
 {
-    bReplaceQuote =
     bAutoCorrect =
     bCptlSttSntnc =
     bCptlSttWrd =
     bChkFontAttr =
     bChgUserColl =
     bChgEnumNum =
-    bChgFracionSymbol =
+    bAddNonBrkSpace =
     bChgOrdinalNumber =
     bChgToEnEmDash =
     bChgWeightUnderl =
@@ -104,7 +100,6 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
 SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFlags )
 {
     bAutoCorrect = rAFFlags.bAutoCorrect;
-    bReplaceQuote = rAFFlags.bReplaceQuote;
     bCptlSttSntnc = rAFFlags.bCptlSttSntnc;
     bCptlSttWrd = rAFFlags.bCptlSttWrd;
     bChkFontAttr = rAFFlags.bChkFontAttr;
@@ -115,7 +110,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
     bSetNumRule = rAFFlags.bSetNumRule;
     bAFmtByInput = rAFFlags.bAFmtByInput;
 
-    bChgFracionSymbol = rAFFlags.bChgFracionSymbol;
+    bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
     bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
     bChgToEnEmDash = rAFFlags.bChgToEnEmDash;
     bChgWeightUnderl = rAFFlags.bChgWeightUnderl;
diff --git a/svx/source/editeng/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 6ddbda37d2..e0440e424c 100644
--- a/svx/source/editeng/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtrange.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,9 +26,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include "txtrange.hxx"
+#include <editeng/txtrange.hxx>
 #include <math.h>
 #include <tools/poly.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/editeng/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 65d5c3b0c2..7aefa78f98 100644
--- a/svx/source/editeng/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unolingu.cxx,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,14 +26,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <map>
 #include <set>
 #include <vector>
 #include <slist>
 #include <memory>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/logfile.hxx>
@@ -66,8 +63,8 @@
 #include <vcl/msgbox.hxx>
 #include <tools/shl.hxx>
 #include <linguistic/misc.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 using namespace ::rtl;
 using namespace ::comphelper;
@@ -1341,7 +1338,7 @@ short SvxDicError( Window *pParent, sal_Int16 nError )
                 nRid = RID_SVXSTR_DIC_ERR_UNKNOWN;
                 DBG_ASSERT(0, "unexpected case");
         }
-        nRes = InfoBox( pParent, SVX_RESSTR( nRid ) ).Execute();
+        nRes = InfoBox( pParent, EE_RESSTR( nRid ) ).Execute();
     }
     return nRes;
 }
diff --git a/svx/source/outliner/makefile.mk b/editeng/source/outliner/makefile.mk
index deef353049..df1c795801 100644
--- a/svx/source/outliner/makefile.mk
+++ b/editeng/source/outliner/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -31,7 +27,7 @@
 
 PRJ=..$/..
 
-PRJNAME=svx
+PRJNAME=editeng
 TARGET=outliner
 AUTOSEG=true
 ENABLE_EXCEPTIONS=TRUE
diff --git a/svx/source/outliner/outl_pch.cxx b/editeng/source/outliner/outl_pch.cxx
index 803d3d31d8..a321fb5f65 100644
--- a/svx/source/outliner/outl_pch.cxx
+++ b/editeng/source/outliner/outl_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: outl_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
@@ -29,6 +26,6 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <outl_pch.hxx>
 
diff --git a/svx/source/outliner/outl_pch.hxx b/editeng/source/outliner/outl_pch.hxx
index 128abb3936..d0155ac091 100644
--- a/svx/source/outliner/outl_pch.hxx
+++ b/editeng/source/outliner/outl_pch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outl_pch.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,11 +25,9 @@
  *
  ************************************************************************/
 #include <svl/intitem.hxx>
-
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/editdata.hxx>
-#include <eerdll.hxx>
-
-#include <svx/lrspitem.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
diff --git a/svx/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 7812afe440..f8d4b9a199 100644
--- a/svx/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outleeng.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,17 +26,23 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <outl_pch.hxx>
+#include "precompiled_editeng.hxx"
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <outleeng.hxx>
 #include <paralist.hxx>
-#include <outliner.hrc>
+#include <editeng/editrids.hrc>
 #include <svl/itemset.hxx>
-#include <svx/eeitem.hxx>
-#include "editstat.hxx"
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
 #include "outlundo.hxx"
 
 OutlinerEditEng::OutlinerEditEng( Outliner* pEngOwner, SfxItemPool* pPool )
diff --git a/svx/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index cf4d7d13a9..96cafc8aea 100644
--- a/svx/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outleeng.hxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,9 +27,9 @@
 #ifndef _OUTLEENG_HXX
 #define _OUTLEENG_HXX
 
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #ifndef _EDITENG_HXX
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #endif
 
 typedef EENotify* EENotifyPtr;
diff --git a/svx/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index c1ee8fe2a0..f471e19206 100644
--- a/svx/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlin2.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,24 +26,30 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <outl_pch.hxx>
-
+#include "precompiled_editeng.hxx"
+
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <tools/list.hxx>
 #include <svl/style.hxx>
 #include <vcl/mapmod.hxx>
 
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #define _OUTLINER_CXX
 
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <paralist.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <outleeng.hxx>
 #include <outlundo.hxx>
-#include <svx/eeitem.hxx>
-#include <editstat.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
 
 DBG_NAMEEX(Outliner)
 
diff --git a/svx/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 3f469a47f4..e0a89aae91 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outliner.cxx,v $
- * $Revision: 1.75.20.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,34 +26,40 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <outl_pch.hxx>
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #include <math.h>
 #include <svl/style.hxx>
 #include <vcl/wrkwin.hxx>
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <paralist.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <outleeng.hxx>
 #include <outlundo.hxx>
-#include <svx/eeitem.hxx>
-#include <editstat.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/editobj.hxx>
 #include <svl/itemset.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/metric.hxx>
-#include <svx/numitem.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
-#include <goodies/grfmgr.hxx>
-#include <svx/svxfont.hxx>
-#include <svx/brshitem.hxx>
+#include <svtools/grfmgr.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/brshitem.hxx>
 #include <svl/itempool.hxx>
 
 // #101498# calculate if it's RTL or not
diff --git a/svx/source/outliner/outliner.src b/editeng/source/outliner/outliner.src
index 1cfea02c3d..e7e557e040 100644
--- a/svx/source/outliner/outliner.src
+++ b/editeng/source/outliner/outliner.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: outliner.src,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,7 +25,8 @@
  *
  ************************************************************************/
 
-#include <outliner.hrc>
+#include <editeng/editrids.hrc>
+
 String RID_OUTLUNDO_HEIGHT
 {
     Text [ en-US ] = "Move" ;
diff --git a/svx/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index 72601d9d7e..df2c8b5977 100644
--- a/svx/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlobj.cxx,v $
- * $Revision: 1.12.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,15 +26,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <outl_pch.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <outleeng.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 
diff --git a/svx/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 5c3612af4f..65bd725f84 100644
--- a/svx/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlundo.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,12 +26,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <outl_pch.hxx>
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <outlundo.hxx>
 
 
diff --git a/svx/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 7ed0e83a71..de9d24b3f6 100644
--- a/svx/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlundo.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,12 +28,9 @@
 #ifndef _OUTLUNDO_HXX
 #define _OUTLUNDO_HXX
 
-#include <svx/outliner.hxx>
-
-#ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
-#endif
-#include <editund2.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editund2.hxx>
 
 class OutlinerUndoBase : public EditUndo
 {
diff --git a/svx/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index c0f264f000..e7ee6c7c16 100644
--- a/svx/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outlvw.cxx,v $
- * $Revision: 1.34.150.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,23 +26,29 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <outl_pch.hxx>
+#include "precompiled_editeng.hxx"
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <outleeng.hxx>
 #include <paralist.hxx>
 #include <outlundo.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/flditem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/numitem.hxx>
 #include <vcl/window.hxx>
 #include <svl/itemset.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 
 
 // Breite der Randzonen innerhalb derer beim D&D gescrollt wird
diff --git a/svx/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index e5493a24dc..bb586f0a8f 100644
--- a/svx/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paralist.cxx,v $
- * $Revision: 1.11.6.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,11 +26,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <paralist.hxx>
-#include <svx/outliner.hxx>		// nur wegen Paragraph, muss geaendert werden!
-#include <svx/numdef.hxx>
+#include <editeng/outliner.hxx>		// nur wegen Paragraph, muss geaendert werden!
+#include <editeng/numdef.hxx>
 
 DBG_NAME(Paragraph)
 
diff --git a/svx/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index c2205530a9..66715bcb8e 100644
--- a/svx/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paralist.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svrtf/makefile.mk b/editeng/source/rtf/makefile.mk
index 950036034d..ef1c5f44b1 100644
--- a/svx/source/svrtf/makefile.mk
+++ b/editeng/source/rtf/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -31,13 +27,8 @@
 
 PRJ=..$/..
 
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=svxrtf
-LIBTARGET=NO
-AUTOSEG=true
+PRJNAME=editeng
+TARGET=rtf
 
 # --- Settings -----------------------------------------------------
 
@@ -49,17 +40,11 @@ AUTOSEG=true
 EXCEPTIONSFILES= \
         $(SLO)$/svxrtf.obj
 
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
+SLOFILES= \
+        $(EXCEPTIONSFILES) \
         $(SLO)$/rtfitem.obj \
-        $(SLO)$/svxrtf.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
         $(SLO)$/rtfgrf.obj
 
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
 # ==========================================================================
 
 .INCLUDE :  target.mk
diff --git a/svx/source/svrtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index b889384ba2..d4c50fe922 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfgrf.cxx,v $
- * $Revision: 1.13 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <osl/endian.h>
@@ -40,8 +37,7 @@
 #include <svtools/rtftoken.h>
 #include <svtools/filter.hxx>
 
-#include "svx/impgrf.hxx"
-#include "svxrtf.hxx"
+#include <editeng/svxrtf.hxx>
 
 
 #ifndef DBG_UTIL
@@ -490,7 +486,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
 
         if( bValidBmp )
         {
-            GraphicFilter* pGF = ::GetGrfFilter();
+            GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
             USHORT nImportFilter = GRFILTER_FORMAT_DONTKNOW;
 
             if( pFilterNm )
diff --git a/svx/source/svrtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ca87b02088..ce2adc3ecb 100644
--- a/svx/source/svrtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rtfitem.cxx,v $
- * $Revision: 1.35.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,74 +26,72 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
-#include "flstitem.hxx"
-#include "fontitem.hxx"
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fwdtitem.hxx"
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/cmapitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
-#include "nlbkitem.hxx"
-#include <svx/nhypitem.hxx>
-#include <svx/lcolitem.hxx>
-#include <svx/blnkitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/twolinesitem.hxx>
-
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include "prntitem.hxx"
-#include "opaqitem.hxx"
-#include "protitem.hxx"
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include "bolnitem.hxx"
-#include <svx/brshitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/orphitem.hxx>
-#include <svx/widwitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/pmdlitem.hxx>
-#include <svx/spltitem.hxx>
-#include <svx/hyznitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charrotateitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/paravertalignitem.hxx>
-#include <svx/forbiddenruleitem.hxx>
-#include <svx/hngpnctitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include "charhiddenitem.hxx"
-
+#include <editeng/flstitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fwdtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/prszitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/nlbkitem.hxx>
+#include <editeng/nhypitem.hxx>
+#include <editeng/lcolitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/prntitem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/protitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/keepitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/pmdlitem.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/hyznitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charrotateitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/paravertalignitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/charhiddenitem.hxx>
 
 #include <svtools/rtftoken.h>
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
 
-#include "svxrtf.hxx"
-
+#include <editeng/svxrtf.hxx>
+#include <editeng/editids.hrc>
 
 #define BRACELEFT	'{'
 #define BRACERIGHT	'}'
diff --git a/svx/source/svrtf/segincr.asm b/editeng/source/rtf/segincr.asm
index d90d79dbd8..27575f74ad 100644
--- a/svx/source/svrtf/segincr.asm
+++ b/editeng/source/rtf/segincr.asm
@@ -2,14 +2,10 @@
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ; 
-; Copyright 2008 by Sun Microsystems, Inc.
+; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
 ; OpenOffice.org - a multi-platform office productivity suite
 ;
-; $RCSfile: segincr.asm,v $
-;
-; $Revision: 1.6 $
-;
 ; This file is part of OpenOffice.org.
 ;
 ; OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svrtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8e4587909d..676e96f173 100644
--- a/svx/source/svrtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxrtf.cxx,v $
- * $Revision: 1.34.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
@@ -45,11 +42,11 @@
 #include <comphelper/string.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
-#include <svx/scriptspaceitem.hxx>
-#include "fontitem.hxx"
-#include <svx/colritem.hxx>
-#include "svxrtf.hxx"
-#include <svx/svxids.hrc>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/svxrtf.hxx>
+#include <editeng/editids.hrc>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/svx/source/unoedit/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 53b36fd977..12483c63fc 100644
--- a/svx/source/unoedit/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoForbiddenCharsTable.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,12 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include "UnoForbiddenCharsTable.hxx"
-#include "forbiddencharacterstable.hxx"
+#include "precompiled_editeng.hxx"
+#include <editeng/UnoForbiddenCharsTable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include "unolingu.hxx"
+#include <editeng/unolingu.hxx> // LocalToLanguage, LanguageToLocale
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/unoedit/makefile.mk b/editeng/source/uno/makefile.mk
index 802ded5aa7..573dd21508 100644
--- a/svx/source/unoedit/makefile.mk
+++ b/editeng/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,9 +27,8 @@
 
 PRJ=..$/..
 
-PRJNAME=svx
-TARGET=unoedit
-LIBTARGET=NO
+PRJNAME=editeng
+TARGET=uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -43,26 +38,23 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
+SLOFILES= \
+        $(SLO)$/unonrule.obj	\
         $(SLO)$/unoedsrc.obj	\
         $(SLO)$/unoedhlp.obj	\
+        $(SLO)$/unofdesc.obj	\
         $(SLO)$/unoviwou.obj	\
         $(SLO)$/unofored.obj	\
         $(SLO)$/unoforou.obj	\
+        $(SLO)$/unoipset.obj	\
         $(SLO)$/unotext.obj		\
         $(SLO)$/unotext2.obj	\
-        $(SLO)$/unofield.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
+        $(SLO)$/unofield.obj	\
         $(SLO)$/UnoForbiddenCharsTable.obj \
         $(SLO)$/unopracc.obj	\
         $(SLO)$/unoedprx.obj	\
         $(SLO)$/unoviwed.obj
 
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svx/source/unoedit/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 7de489be70..4788f014a8 100644
--- a/svx/source/unoedit/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoedhlp.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,12 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/debug.hxx>
 
-#include "unoedhlp.hxx"
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
 
 //------------------------------------------------------------------------
 
diff --git a/svx/source/unoedit/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 2b500aeac6..f8cf3068d2 100644
--- a/svx/source/unoedit/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoedprx.cxx,v $
- * $Revision: 1.22 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -51,16 +48,14 @@
 // Project-local header
 //
 //------------------------------------------------------------------------
-#include "unoedprx.hxx"
-#include <svx/unotext.hxx>
-
-#include "unoedhlp.hxx"
-#include <svx/svdmodel.hxx>
-#include <svx/svdpntv.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include "AccessibleStringWrap.hxx"
+#include "editeng/unoedprx.hxx"
+#include <editeng/unotext.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/AccessibleStringWrap.hxx>
+#include <editeng/outliner.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index 7efc794107..e0149b3f36 100644
--- a/svx/source/unoedit/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoedsrc.cxx,v $
- * $Revision: 1.13 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <svl/brdcst.hxx>
 
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 
 //------------------------------------------------------------------------
diff --git a/svx/source/unodraw/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 2fa0cf4abc..162f3457c7 100644
--- a/svx/source/unodraw/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofdesc.cxx,v $
- * $Revision: 1.7.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,25 +26,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #ifndef _TOOLKIT_HELPRE_VCLUNOHELPER_HXX_
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
-#include <fontitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/unomid.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/memberids.hrc>
 #include <svl/itempool.hxx>
 
-#include "unofdesc.hxx"
+#include <editeng/unofdesc.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/unoedit/unofield.cxx b/editeng/source/uno/unofield.cxx
index f058a44ba8..1c05f3e239 100644
--- a/svx/source/unoedit/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofield.cxx,v $
- * $Revision: 1.31 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
@@ -40,12 +37,12 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/svdfield.hxx>
-#include <svx/unofield.hxx>
-#include <svx/unoprov.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/measfld.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/unotext.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
@@ -1115,7 +1112,69 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
 
 sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
+uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
+{
+    uno::Reference< uno::XInterface > xRet;
+
+    const OUString aTextFieldPrexit( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") );
+    
+    // #i93308# up to OOo 3.2 we used this wrong namespace name with the capital T & F. This is
+    // fixed since OOo 3.2 but for compatibility we will still provide support for the wrong notation.
+    const OUString aTextFieldPrexit2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.") );
+
+    if( (ServiceSpecifier.compareTo( aTextFieldPrexit, aTextFieldPrexit.getLength() ) == 0) ||
+        (ServiceSpecifier.compareTo( aTextFieldPrexit2, aTextFieldPrexit2.getLength() ) == 0) )
+    {
+        OUString aFieldType( ServiceSpecifier.copy( aTextFieldPrexit.getLength() ) );
+
+        sal_Int32 nId = ID_UNKNOWN;
 
+        if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DateTime") ) )
+        {
+            nId = ID_DATEFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL") ) )
+        {
+            nId = ID_URLFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageNumber") ) )
+        {
+            nId = ID_PAGEFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageCount") ) )
+        {
+            nId = ID_PAGESFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SheetName") ) )
+        {
+            nId = ID_TABLEFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName") ) )
+        {
+            nId = ID_EXT_FILEFIELD;
+        }
+        else if (aFieldType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("docinfo.Title") ) ||
+                 aFieldType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("DocInfo.Title") ) )
+        {
+            nId = ID_FILEFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Author") ) )
+        {
+            nId = ID_AUTHORFIELD;
+        }
+        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Measure") ) )
+        {
+            nId = ID_MEASUREFIELD;
+        }
+
+        if( nId != ID_UNKNOWN )
+            xRet = (::cppu::OWeakObject * )new SvxUnoTextField( nId );
+    }
+
+    return xRet;
+}
diff --git a/svx/source/unoedit/unofored.cxx b/editeng/source/uno/unofored.cxx
index 0a357002aa..b64855dc87 100644
--- a/svx/source/unoedit/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofored.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,21 +26,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <algorithm>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
 #include <svl/itemset.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <unoedhlp.hxx>
-#include <svx/editdata.hxx>
-#include <svx/outliner.hxx>
-#include <svx/editobj.hxx>		// nur fuer die GetText-Kruecke
-
-#include <svx/unofored.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editobj.hxx>		// nur fuer die GetText-Kruecke
+
+#include <editeng/unofored.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 6faf19938a..df31b81e7f 100644
--- a/svx/source/unoedit/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoforou.cxx,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,33 +26,32 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <algorithm>
 #include <svl/style.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
 #include <svl/itemset.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editdata.hxx>
-#include <svx/outliner.hxx>
-#include <unoedhlp.hxx>
-#include <svx/svdobj.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unoedhlp.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/unoforou.hxx>
-#include <svx/unofored.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/unoforou.hxx>
+#include <editeng/unofored.hxx>
+#include <editeng/outlobj.hxx>
 
 using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, SdrObject* pSdrObj /* = 0 */ ) :
+SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText /* = FALSE */ ) :
     rOutliner( rOutl ),
-    pSdrObject( pSdrObj ),
+    bOutlinerText( bOutlText ),
     mpAttribsCache( NULL ),
     mpParaAttribsCache( NULL ),
     mnParaAttribsCache( 0 )
@@ -490,7 +486,7 @@ sal_Bool SvxOutlinerForwarder::SetDepth( USHORT nPara, sal_Int16 nNewDepth )
         {
             rOutliner.SetDepth( pPara, nNewDepth );
 
-            const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT);
+//			const bool bOutlinerText = pSdrObject && (pSdrObject->GetObjInventor() == SdrInventor) && (pSdrObject->GetObjIdentifier() == OBJ_OUTLINETEXT);
             if( bOutlinerText )
                 rOutliner.SetLevelDependendStyleSheet( nPara );
 
diff --git a/svx/source/unodraw/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 87d0d53e8c..879c2ef8bb 100644
--- a/svx/source/unodraw/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoipset.cxx,v $
- * $Revision: 1.28 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svl/eitem.hxx>
 #include <tools/list.hxx>
@@ -38,15 +35,10 @@
 #include <vector>
 #include <svl/itemprop.hxx>
 
-#include <svx/unoipset.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svxids.hrc>
-#include <svx/deflt3d.hxx>
-#include <svx/unoshprp.hxx>
-#include <svx/editeng.hxx>
-#include "unoapi.hxx"
-#include <svx/svdobj.hxx>
-
+#include <editeng/unoipset.hxx>
+#include <editeng/editids.hrc>
+#include <editeng/editeng.hxx>
+#include <svl/itempool.hxx>
 #include <algorithm>
 
 using namespace ::com::sun::star;
@@ -69,9 +61,9 @@ struct SvxIDPropertyCombine
 
 DECLARE_LIST( SvxIDPropertyCombineList, SvxIDPropertyCombine * )
 
-SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, sal_Bool bConvertTwips )
+SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, SfxItemPool& rItemPool, sal_Bool bConvertTwips )
 :   m_aPropertyMap( pMap ),
-    _pMap(pMap), mbConvertTwips(bConvertTwips)
+    _pMap(pMap), mbConvertTwips(bConvertTwips), mrItemPool( rItemPool )
 {
     pCombiList = NULL;
 }
@@ -119,120 +111,51 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID)
     pCombiList->Insert(pNew);
 }
 
-//----------------------------------------------------------------------
-void SvxItemPropertySet::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
-  SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet ) const 
-{
-    if(rPropSet.AreThereOwnUsrAnys())
-    {
-        const SfxItemPropertyMap* pSrc = rPropSet.getPropertyMap();
-        PropertyEntryVector_t aSrcPropVector = pSrc->getPropertyEntries();
-        PropertyEntryVector_t::const_iterator aSrcIt = aSrcPropVector.begin();
-        while(aSrcIt != aSrcPropVector.end())
-        {
-            if(aSrcIt->nWID)
-            {
-                uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID);
-                if(pUsrAny)
-                {
-                    // Aequivalenten Eintrag in pDst suchen
-                    const SfxItemPropertySimpleEntry* pEntry = m_aPropertyMap.getByName( aSrcIt->sName );
-                    if(pEntry)
-                    {
-                        // entry found
-                        if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END)
-                        {
-                            // Special ID im PropertySet, kann nur direkt am
-                            // Objekt gesetzt werden+
-                            xSet->setPropertyValue( aSrcIt->sName, *pUsrAny);
-                        }
-                        else
-                        {
-                            if(rSet.GetPool()->IsWhich(pEntry->nWID))
-                                rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
-
-                            // setzen
-                            setPropertyValue(pEntry, *pUsrAny, rSet);
-                        }
-                    }
-                }
-            }
-
-            // next entry
-            ++aSrcIt;
-        }
-    }
-}
-
-/** this function checks if a SFX_METRIC_ITEM realy needs to be converted.
-    This check is for items that store either metric values if theire positiv
-    or percentage if theire negativ.
-*/
-sal_Bool SvxUnoCheckForConversion( const SfxItemSet&, sal_Int32 nWID, const uno::Any& rVal )
+sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal )
 {
     sal_Bool bConvert = sal_True; // the default is that all metric items must be converted
-
-    switch( nWID )
-    {
-    case XATTR_FILLBMP_SIZEX:
-    case XATTR_FILLBMP_SIZEY:
-        {
-            sal_Int32 nValue = 0;
-            if( rVal >>= nValue )
-                bConvert = nValue > 0;
-            break;
-        }
-    }
-
-    // the default is to always
+    sal_Int32 nValue = 0;
+    if( rVal >>= nValue )
+        bConvert = (nValue > 0);
     return bConvert;
 }
 
+
 //----------------------------------------------------------------------
-uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) const
+uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const
 {
     uno::Any aVal;
     if(!pMap || !pMap->nWID)
         return aVal;
 
-    // item holen
     const SfxPoolItem* pItem = 0;
     SfxItemPool* pPool = rSet.GetPool();
-
-    rSet.GetItemState( pMap->nWID, pMap->nWID != SDRATTR_XMLATTRIBUTES, &pItem );
-
+    rSet.GetItemState( pMap->nWID, bSearchInParent, &pItem );
     if( NULL == pItem && pPool )
-    {
         pItem = &(pPool->GetDefaultItem( pMap->nWID ));
-    }
 
     const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
-
     BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
     if( eMapUnit == SFX_MAPUNIT_100TH_MM )
         nMemberId &= (~CONVERT_TWIPS);
 
-    // item-Wert als UnoAny zurueckgeben
     if(pItem)
     {
         pItem->QueryValue( aVal, nMemberId );
-
         if( pMap->nMemberId & SFX_METRIC_ITEM )
         {
-            // check for needed metric translation
-            if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
+            if( eMapUnit != SFX_MAPUNIT_100TH_MM )
             {
-                if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) )
+                if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aVal ) )
                     SvxUnoConvertToMM( eMapUnit, aVal );
             }			
         }
-        // convert typeless SfxEnumItem to enum type
         else if ( pMap->pType->getTypeClass() == uno::TypeClass_ENUM &&
               aVal.getValueType() == ::getCppuType((const sal_Int32*)0) )
         {
+            // convert typeless SfxEnumItem to enum type
             sal_Int32 nEnum;
             aVal >>= nEnum;
-
             aVal.setValue( &nEnum, *pMap->pType );
         }
     }
@@ -245,7 +168,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
 }
 
 //----------------------------------------------------------------------
-void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) const
+void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const
 {
     if(!pMap || !pMap->nWID)
         return;
@@ -275,14 +198,11 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
 
         const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pMap->nWID) : SFX_MAPUNIT_100TH_MM;
 
-        if( pMap->nMemberId & SFX_METRIC_ITEM )
+        // check for needed metric translation
+        if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != SFX_MAPUNIT_100TH_MM )
         {
-            // check for needed metric translation
-            if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
-            {
-                if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) )
-                    SvxUnoConvertFromMM( eMapUnit, aValue );
-            }			
+            if ( !bDontConvertNegativeValues || SvxUnoCheckForPositiveValue( aValue ) )
+                SvxUnoConvertFromMM( eMapUnit, aValue );
         }
 
         pNewItem = pItem->Clone();
@@ -311,20 +231,19 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     // Noch kein UsrAny gemerkt, generiere Default-Eintrag und gib
     // diesen zurueck
 
-    SdrItemPool& rItemPool = SdrObject::GetGlobalDrawObjectItemPool();
-    const SfxMapUnit eMapUnit = rItemPool.GetMetric((USHORT)pMap->nWID);
+    const SfxMapUnit eMapUnit = mrItemPool.GetMetric((USHORT)pMap->nWID);
     BYTE nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM);
     if( eMapUnit == SFX_MAPUNIT_100TH_MM )
         nMemberId &= (~CONVERT_TWIPS);
 
     uno::Any aVal;
-    SfxItemSet aSet( rItemPool, pMap->nWID, pMap->nWID);
+    SfxItemSet aSet( mrItemPool, pMap->nWID, pMap->nWID);
 
     if( (pMap->nWID < OWN_ATTR_VALUE_START) && (pMap->nWID > OWN_ATTR_VALUE_END ) )
     {
         // Default aus ItemPool holen
-        if(rItemPool.IsWhich(pMap->nWID))
-            aSet.Put(rItemPool.GetDefaultItem(pMap->nWID));
+        if(mrItemPool.IsWhich(pMap->nWID))
+            aSet.Put(mrItemPool.GetDefaultItem(pMap->nWID));
     }
 
     if(aSet.Count())
diff --git a/svx/source/unodraw/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index c010c7da47..dd68f547fc 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unonrule.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,42 +26,30 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #define PROPERTY_NONE 0
 
 #include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
-
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase5.hxx>
-
-#include <svl/itempool.hxx>
-#include <goodies/grfmgr.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/graph.hxx>
-
-#include <comphelper/servicehelper.hxx>
+#include <svtools/grfmgr.hxx>
 #include <toolkit/unohlp.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/brshitem.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/numitem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/unotext.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/numitem.hxx>
-#include "unofdesc.hxx"
-#include "unonrule.hxx"
-#include "unoapi.hxx"
+#include <editeng/brshitem.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/unofdesc.hxx>
+#include <editeng/unonrule.hxx>
+#include <editeng/editids.hrc>
 
 using ::rtl::OUString;
 using ::com::sun::star::util::XCloneable;
@@ -111,53 +96,10 @@ unsigned short ConvertUnoAdjust( SvxAdjust eAdjust )
     return aSvxToUnoAdjust[eAdjust];
 }
 
-
-
 /******************************************************************
  * SvxUnoNumberingRules
  ******************************************************************/
 
-class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< XIndexReplace, XAnyCompare, XUnoTunnel, XCloneable, XServiceInfo >
-{
-private:
-    SvxNumRule maRule;
-public:
-    SvxUnoNumberingRules( const SvxNumRule& rRule ) throw();
-    virtual ~SvxUnoNumberingRules() throw();
-
-    UNO3_GETIMPLEMENTATION_DECL( SvxUnoNumberingRules )
-
-    //XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException);
-
-    //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(RuntimeException) ;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException);
-
-    //XElementAccess
-    virtual Type SAL_CALL getElementType() throw(RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements() throw(RuntimeException);
-
-    // XAnyCompare
-    virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException);
-
-    // XCloneable
-    virtual Reference< XCloneable > SAL_CALL createClone(  ) throw (RuntimeException);
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException);
-
-    // intern
-    Sequence<beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const throw();
-    void setNumberingRuleByIndex( const Sequence< beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( RuntimeException, IllegalArgumentException );
-
-    static sal_Int16 Compare( const Any& rAny1, const Any& rAny2 );
-
-    const SvxNumRule& getNumRule() const { return maRule; }
-};
-
 UNO3_GETIMPLEMENTATION_IMPL( SvxUnoNumberingRules );
 
 SvxUnoNumberingRules::SvxUnoNumberingRules( const SvxNumRule& rRule ) throw()
@@ -458,7 +400,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(	const Sequence< beans::Prope
             OUString aURL;
             if( aVal >>= aURL )
             {
-                GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+                GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
                 SvxBrushItem aBrushItem( aGrafObj, GPOS_AREA, SID_ATTR_BRUSH );
                 aFmt.SetGraphicBrush( &aBrushItem );
                 continue;
@@ -597,8 +539,7 @@ bool SvxGetNumRule( Reference< XIndexReplace > xRule, SvxNumRule& rNumRule )
 }
 
 ///////////////////////////////////////////////////////////////////////
-
-Reference< XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw()
+com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw()
 {
     DBG_ASSERT( pRule, "No default SvxNumRule!" );
     if( pRule )
@@ -612,30 +553,6 @@ Reference< XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw()
     }
 }
 
-///////////////////////////////////////////////////////////////////////
-
-Reference< XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw()
-{
-    SvxNumRule* pDefaultRule = NULL;
-    if( pModel )
-    {
-        SvxNumBulletItem* pItem = (SvxNumBulletItem*) pModel->GetItemPool().GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
-        if( pItem )
-        {
-            pDefaultRule = pItem->GetNumRule();
-        }
-    }
-
-    if( pDefaultRule )
-    {
-        return SvxCreateNumRule( pDefaultRule );
-    }
-    else
-    {
-        SvxNumRule aTempRule( 0, 10, false );
-        return SvxCreateNumRule( &aTempRule );
-    }
-}
 
 ///////////////////////////////////////////////////////////////////////
 
@@ -690,3 +607,9 @@ Reference< XAnyCompare > SvxCreateNumRuleCompare() throw()
 {
     return new SvxUnoNumberingRulesCompare();
 }
+
+::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw()
+{
+    SvxNumRule aTempRule( 0, 10, false );
+    return SvxCreateNumRule( &aTempRule );
+}
diff --git a/svx/source/unoedit/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 16656bba36..06b5a4be3a 100644
--- a/svx/source/unoedit/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopracc.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,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -50,10 +47,8 @@
 //
 //------------------------------------------------------------------------
 
-#ifndef _SVX_UNOPRACC_HXX_
-#include "unopracc.hxx"
-#endif
-#include <svx/unoedsrc.hxx>
+#include <editeng/unopracc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unotext.cxx b/editeng/source/uno/unotext.cxx
index c70b63a1e6..f7bb37eac0 100644
--- a/svx/source/unoedit/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unotext.cxx,v $
- * $Revision: 1.66 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,42 +26,34 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/svapp.hxx>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
-#ifndef _COM_SUN_STAR_TEXT_XTEXTFIELD_HDL_
 #include <com/sun/star/text/XTextField.hdl>
-#endif
 #include <vos/mutex.hxx>
 #include <svl/itemset.hxx>
-
-#include <svx/eeitem.hxx>
 #include <svl/itempool.hxx>
-#include <fontitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/svdobj.hxx>
 #include <svl/intitem.hxx>
-
 #include <svl/eitem.hxx>
-
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/unoshtxt.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unotext.hxx>
-#include <svx/unoedsrc.hxx>
-#include <svx/unomid.hxx>
-#include "unonrule.hxx"
-#include "unofdesc.hxx"
-#include "unoapi.hxx"
-#include <svx/unofield.hxx>
-#include <svx/flditem.hxx>
-#include <svx/unoshprp.hxx>
-#include <svx/numitem.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/unonrule.hxx>
+#include <editeng/unofdesc.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unoipset.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
@@ -75,8 +64,12 @@ using namespace ::com::sun::star;
     if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
         return uno::makeAny(uno::Reference< xint >(this))
 
+const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet()
+{
+    static SvxItemPropertySet aTextCursorSvxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap(), EditEngine::GetGlobalItemPool() );
+    return &aTextCursorSvxPropertySet;
+}
 
-extern const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet();
 const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
 {
     // Propertymap fuer einen Outliner Text
@@ -96,7 +89,7 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
 }
 const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet()
 {
-    static SvxItemPropertySet aSvxTextPortionPropertySet( ImplGetSvxTextPortionPropertyMap() );
+    static SvxItemPropertySet aSvxTextPortionPropertySet( ImplGetSvxTextPortionPropertyMap(), EditEngine::GetGlobalItemPool() );
     return &aSvxTextPortionPropertySet;
 }
 
@@ -106,6 +99,28 @@ const SfxItemPropertySet* ImplGetSvxTextPortionSfxPropertySet()
     return &aSvxTextPortionSfxPropertySet;
 }
 
+const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
+{
+    // Propertymap fuer einen Outliner Text
+    static const SfxItemPropertyMapEntry aSvxUnoOutlinerTextCursorPropertyMap[] =
+    {
+        SVX_UNOEDIT_CHAR_PROPERTIES,
+        SVX_UNOEDIT_FONT_PROPERTIES,
+        SVX_UNOEDIT_OUTLINER_PROPERTIES,
+        SVX_UNOEDIT_PARA_PROPERTIES,
+        {MAP_CHAR_LEN("TextUserDefinedAttributes"),			EE_CHAR_XMLATTRIBS,		&::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  , 		0,     0},
+        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),			EE_PARA_XMLATTRIBS,		&::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  , 		0,     0},
+        {0,0,0,0,0,0}
+    };
+
+    return aSvxUnoOutlinerTextCursorPropertyMap;
+}
+const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet()
+{
+    static SfxItemPropertySet aTextCursorSfxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap() );
+    return &aTextCursorSfxPropertySet; 
+}
+
 // ====================================================================
 // helper fuer Item/Property Konvertierung
 // ====================================================================
@@ -518,16 +533,16 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa
 
 void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException )
 {
-    if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, (SvxTextEditSource*)GetEditSource() ))
+    if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() ))
     {
         //	Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund)
         //	muss vorher das alte Item aus dem Dokument geholt werden
         rNewSet.Put(rOldSet.Get(pMap->nWID));			// altes Item in neuen Set
-        mpPropSet->setPropertyValue(pMap, rValue, rNewSet);
+        mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false );
     }
 }
 
-sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxTextEditSource* pEditSource /* = NULL*/ ) throw( uno::RuntimeException )
+sal_Bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ ) throw( uno::RuntimeException )
 {
     switch( pMap->nWID )
     {
@@ -693,12 +708,12 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM
         break;
 
     default:
-        if(!GetPropertyValueHelper( *((SfxItemSet*)(&rSet)), pMap, rAny, &maSelection, (SvxTextEditSource*)GetEditSource() ))
-            rAny = mpPropSet->getPropertyValue(pMap, rSet);
+        if(!GetPropertyValueHelper( *((SfxItemSet*)(&rSet)), pMap, rAny, &maSelection, GetEditSource() ))
+            rAny = mpPropSet->getPropertyValue(pMap, rSet, true, false );
     }
 }
 
-sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxTextEditSource* pEditSource /* = NULL */ )
+sal_Bool SvxUnoTextRangeBase::GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ )
     throw( uno::RuntimeException )
 {
     switch( pMap->nWID )
@@ -1311,7 +1326,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
                     {
                         SfxItemSet aSet( *pPool,	pMap->nWID, pMap->nWID);
                         aSet.Put(pPool->GetDefaultItem(pMap->nWID));
-                        return mpPropSet->getPropertyValue(pMap, aSet);
+                        return mpPropSet->getPropertyValue(pMap, aSet, true, false );
                     }
                 }
             }
@@ -1498,7 +1513,7 @@ void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw()
 sal_Bool SAL_CALL SvxUnoTextRangeBase::supportsService( const OUString& ServiceName )
     throw(uno::RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames()
@@ -1511,7 +1526,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames
     SAL_THROW(())
 {
     uno::Sequence< OUString >	aSeq;
-    SvxServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.style.CharacterProperties",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.style.CharacterProperties",
                                                   "com.sun.star.style.CharacterPropertiesComplex",
                                                   "com.sun.star.style.CharacterPropertiesAsian");
     return aSeq;
@@ -2323,7 +2338,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
     SAL_THROW(())
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames_Static() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.text.Text" );
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.text.Text" );
     return aSeq;
 }
 
@@ -2517,7 +2532,7 @@ SfxItemSet SvxDummyTextSource::GetAttribs( const ESelection&, BOOL ) const
     // AW: Very dangerous: The former implementation used a SfxItemPool created on the
     // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
     // a deleted Pool by design.
-    return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool());
+    return SfxItemSet(EditEngine::GetGlobalItemPool());
 }
 
 SfxItemSet SvxDummyTextSource::GetParaAttribs( sal_uInt16 ) const
diff --git a/svx/source/unoedit/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 249fd71d4e..fbb1aff288 100644
--- a/svx/source/unoedit/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unotext2.cxx,v $
- * $Revision: 1.27 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 
@@ -39,11 +36,11 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/eeitem.hxx>
-
-#include <svx/flditem.hxx>
-#include <svx/unofield.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/unotext.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
@@ -398,7 +395,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 5, "com.sun.star.style.ParagraphProperties",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 5, "com.sun.star.style.ParagraphProperties",
                                                   "com.sun.star.style.ParagraphPropertiesComplex",
                                                   "com.sun.star.style.ParagraphPropertiesAsian",
                                                   "com.sun.star.text.TextContent",
@@ -698,13 +695,13 @@ OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeEx
 
 sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 4,"com.sun.star.style.ParagraphProperties",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 4,"com.sun.star.style.ParagraphProperties",
                                                   "com.sun.star.style.ParagraphPropertiesComplex",
                                                   "com.sun.star.style.ParagraphPropertiesAsian",
                                                  "com.sun.star.text.TextCursor");
diff --git a/svx/source/unoedit/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx
index 19ef737c0b..32c885a59d 100644
--- a/svx/source/unoedit/unoviwed.cxx
+++ b/editeng/source/uno/unoviwed.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoviwed.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,15 +26,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 
-#include <svx/unoviwed.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
-#include <svx/svdotext.hxx>
-
+#include <editeng/unoviwed.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 
 SvxEditEngineViewForwarder::SvxEditEngineViewForwarder( EditView& rView ) :
     mrView( rView )
diff --git a/svx/source/unoedit/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 9825d6db53..121ee4ee14 100644
--- a/svx/source/unoedit/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoviwou.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,15 +26,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 
-#include <svx/unoviwou.hxx>
-#include <svx/outliner.hxx>
-#include <svx/editeng.hxx>
-#include <svx/svdotext.hxx>
-
+#include <editeng/unoviwou.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editeng.hxx>
 
 SvxDrawOutlinerViewForwarder::SvxDrawOutlinerViewForwarder( OutlinerView& rOutl ) :
     mrOutlinerView ( rOutl ), maTextShapeTopLeft()
diff --git a/svx/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx
index 8cca5d8108..73ed41e84e 100644
--- a/svx/source/xml/editsource.hxx
+++ b/editeng/source/xml/editsource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: editsource.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef _SVX_EDITSOURCE_HXX
 #define _SVX_EDITSOURCE_HXX
 
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 class EditEngine;
 class SvxEditEngineSourceImpl;
diff --git a/configmgr/source/api/makefile.mk b/editeng/source/xml/makefile.mk
index 3d601f5b99..bfcfeb70f1 100644
--- a/configmgr/source/api/makefile.mk
+++ b/editeng/source/xml/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.12 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -30,24 +30,21 @@
 #*************************************************************************
 
 PRJ=..$/..
-PRJINC=$(PRJ)$/source$/inc
-PRJNAME=configmgr
-TARGET=api
+PRJNAME=editeng
+TARGET=xml
 
 ENABLE_EXCEPTIONS=TRUE
 
-# --- Settings ----------------------------------
+# --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-# --- Files -------------------------------------
+# --- Files --------------------------------------------------------
+SLOFILES = \
+        $(SLO)$/xmltxtimp.obj		\
+        $(SLO)$/xmltxtexp.obj		
 
-SLOFILES=	\
-        $(SLO)$/confevents.obj	\
-        $(SLO)$/confsvccomponent.obj
-
-# --- Targets ----------------------------------
+# --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
-
diff --git a/svx/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 5eed46da43..873185ba40 100644
--- a/svx/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltxtexp.cxx,v $
- * $Revision: 1.15 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /** this file implements an export of a selected EditEngine content into
-    a xml stream. See svx/source/inc/xmledit.hxx for interface */
+    a xml stream. See editeng/source/inc/xmledit.hxx for interface */
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -41,28 +38,25 @@
 #include <svl/itemprop.hxx>
 #include <svl/brdcst.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sfx2/docfile.hxx>
-#ifndef _SVSTOR_HXX
 #include <sot/storage.hxx>
-#endif
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include "xmloff/nmspmap.hxx"
-#include "xmloff/xmlmetae.hxx"
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlmetae.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <svx/editeng.hxx>
-#include "xmloff/xmlexp.hxx"
-#include <svx/unoedsrc.hxx>
-#include <svx/unofored.hxx>
-#include <svx/unotext.hxx>
+#include <xmloff/xmlexp.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/unofored.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/editeng.hxx>
 #include "editsource.hxx"
-
-#include <cppuhelper/implbase4.hxx>
-#include <svx/unofield.hxx>
-#include <svx/unomod.hxx>
-#include "unonrule.hxx"
+#include <editeng/unonrule.hxx>
+#include <editeng/unoipset.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::container;
@@ -245,7 +239,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co
     if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.NumberingRules" ) ) )
     {
         return uno::Reference< uno::XInterface >(
-            SvxCreateNumRule( (SdrModel*)NULL ), uno::UNO_QUERY );
+            SvxCreateNumRule(), uno::UNO_QUERY );
     }
     if (   (0 == aServiceSpecifier.reverseCompareToAsciiL(
             RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.textfield.DateTime")))
@@ -256,7 +250,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co
         return (::cppu::OWeakObject * )new SvxUnoTextField( ID_EXT_DATEFIELD );
     }
 
-    return SvxUnoDrawMSFactory::createTextField( aServiceSpecifier );
+    return SvxUnoTextCreateTextField( aServiceSpecifier );
 
 }
 
@@ -410,7 +404,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
         SVX_UNOEDIT_PARA_PROPERTIES,
         {0,0,0,0,0,0}
     };
-    static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap );
+    static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
 
     SvxUnoText* pUnoText = new SvxUnoText( &aEditSource, &aSvxXMLTextExportComponentPropertySet, mxText );
     pUnoText->SetSelection( rSel );
diff --git a/svx/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 966b467aa9..6135fa1554 100644
--- a/svx/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltxtimp.cxx,v $
- * $Revision: 1.11 $
- *
  * 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_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
@@ -40,20 +37,19 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <rtl/ustrbuf.hxx>
-
-#ifndef _SVSTOR_HXX
 #include <sot/storage.hxx>
-#endif
 #include <svl/itemprop.hxx>
-#include <sfx2/docfile.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmloff/xmlmetae.hxx"
+#include <xmloff/xmlmetae.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include "editsource.hxx"
-#include <svx/unotext.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoipset.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::document;
@@ -165,7 +161,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
         SVX_UNOEDIT_PARA_PROPERTIES,
         {0,0,0,0,0,0}
     };
-    static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap );
+    static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
 
     uno::Reference<text::XText > xParent;
     SvxUnoText* pUnoText = new SvxUnoText( &aEditSource, &aSvxXMLTextImportComponentPropertySet, xParent );
diff --git a/configmgr/source/backendhelper/exports.dxp b/editeng/util/editeng.dxp
index 9630d7e067..9630d7e067 100644
--- a/configmgr/source/backendhelper/exports.dxp
+++ b/editeng/util/editeng.dxp
diff --git a/editeng/util/hidother.src b/editeng/util/hidother.src
new file mode 100644
index 0000000000..6f3b2285f8
--- /dev/null
+++ b/editeng/util/hidother.src
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: hidother.src,v $
+ * $Revision: 1.45 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 "../inc/helpid.hrc"
+
+hidspecial HID_AUTOCORR_HELP_ACORSENTWORD   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORD;};
+hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
+hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
+hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
+hidspecial HID_AUTOCORR_HELP_CHGQUOTES          { HelpID =  HID_AUTOCORR_HELP_CHGQUOTES;};
+hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES       { HelpID =  HID_AUTOCORR_HELP_CHGSGLQUOTES;};
+hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL    { HelpID =  HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;};
+hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
+hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
+hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
+hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
+hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
+hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
+
+
diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk
new file mode 100644
index 0000000000..a11bde28ae
--- /dev/null
+++ b/editeng/util/makefile.mk
@@ -0,0 +1,102 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE 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.61 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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=editeng
+TARGET=editeng
+GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# -------------
+
+HELPIDFILES=    ..$/inc$/helpid.hrc
+
+# editeng
+SHL1TARGET= editeng$(DLLPOSTFIX)
+SHL1IMPLIB= iediteng
+SHL1USE_EXPORTS=name
+SHL1LIBS= \
+    $(SLB)$/items.lib     \
+    $(SLB)$/misc.lib	\
+    $(SLB)$/rtf.lib	\
+    $(SLB)$/uno.lib	\
+    $(SLB)$/accessibility.lib	\
+    $(SLB)$/editeng.lib \
+    $(SLB)$/outliner.lib \
+    $(SLB)$/xml.lib 
+
+SHL1STDLIBS= \
+             $(XMLOFFLIB) \
+             $(BASEGFXLIB) \
+             $(LNGLIB) \
+             $(SVTOOLLIB) \
+             $(TKLIB) \
+             $(VCLLIB) \
+             $(SVLLIB) \
+             $(SOTLIB) \
+             $(UNOTOOLSLIB) \
+             $(TOOLSLIB) \
+             $(I18NISOLANGLIB) \
+             $(I18NPAPERLIB) \
+             $(COMPHELPERLIB) \
+             $(UCBHELPERLIB) \
+             $(CPPUHELPERLIB) \
+             $(CPPULIB) \
+             $(VOSLIB) \
+             $(SALLIB) \
+             $(ICUUCLIB)
+
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=	$(SHL1TARGET)
+DEFLIB1NAME=$(TARGET)
+
+# ------------------------------------------------------------------------------
+
+# Resource files
+SRSFILELIST=\
+        $(SRS)$/editeng.srs \
+        $(SRS)$/outliner.srs \
+        $(SRS)$/misc.srs \
+        $(SRS)$/items.srs
+
+RESLIB1NAME=editeng
+RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
+RESLIB1SRSFILES= $(SRSFILELIST)
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/configmgr/makefile.pmk b/editeng/util/makefile.pmk
index 0ef67b4369..fac1139d7b 100644
--- a/configmgr/makefile.pmk
+++ b/editeng/util/makefile.pmk
@@ -1,14 +1,14 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+# 
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: $
+# $RCSfile: makefile.pmk,v $
 #
-# $Revision: $
+# $Revision: 1.6 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -29,4 +29,19 @@
 #
 #*************************************************************************
 
-VISIBILITY_HIDDEN = TRUE
+# define EDITENG_DLLIMPLEMENTATION (see @ editengdllapi.h)
+CDEFS += -DEDITENG_DLLIMPLEMENTATION
+
+.IF "$(ENABLE_GTK)" != ""
+CFLAGS+=-DENABLE_GTK
+.ENDIF
+
+.IF "$(ENABLE_KDE)" != ""
+CFLAGS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+CFLAGS+=-DENABLE_KDE4
+.ENDIF
+
+VISIBILITY_HIDDEN=TRUE
diff --git a/embeddedobj/inc/makefile.mk b/embeddedobj/inc/makefile.mk
index 462087a0a3..29b98e89a4 100644
--- a/embeddedobj/inc/makefile.mk
+++ b/embeddedobj/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/embeddedobj/inc/pch/precompiled_embeddedobj.cxx b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
index 56211aa308..aef2e4e3a9 100644
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
+++ b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_embeddedobj.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/embeddedobj/inc/pch/precompiled_embeddedobj.hxx b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
index baf3881b54..883dcf44f5 100644
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
+++ b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_embeddedobj.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index 02a057ca81..a61305e192 100644
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,4 +1,4 @@
-eo	embeddedobj	:	offuh sal cppu cppuhelper comphelper sot svtools NULL
+eo	embeddedobj	:	offuh sal cppu cppuhelper comphelper tools unotools vos NULL
 eo	embeddedobj									usr1	-	all	eo_mkout NULL
 eo	embeddedobj\inc								nmake	-	all	eo_inc NULL
 eo	embeddedobj\source\commonembedding			nmake	-	all	eo_commonembed eo_inc NULL
diff --git a/embeddedobj/qa/embedding/EmbeddingUnitTest.java b/embeddedobj/qa/embedding/EmbeddingUnitTest.java
index 3a17934099..ce2aa05d6a 100644
--- a/embeddedobj/qa/embedding/EmbeddingUnitTest.java
+++ b/embeddedobj/qa/embedding/EmbeddingUnitTest.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: EmbeddingUnitTest.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/embeddedobj/qa/embedding/makefile.mk b/embeddedobj/qa/embedding/makefile.mk
index 1d516e77e2..78c6dfb805 100644
--- a/embeddedobj/qa/embedding/makefile.mk
+++ b/embeddedobj/qa/embedding/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.14.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 62aa5aa7c9..d63e2ea9be 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: embedobj.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/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index f84ec214c4..9409c02a7b 100644
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inplaceobj.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/embeddedobj/source/commonembedding/makefile.mk b/embeddedobj/source/commonembedding/makefile.mk
index fb34576ac6..d731b729d9 100644
--- a/embeddedobj/source/commonembedding/makefile.mk
+++ b/embeddedobj/source/commonembedding/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 4dc01d6554..9991e19a69 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: miscobj.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/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 2d0bbc9d05..5cc9c03d8c 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: persistence.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/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index f72de11a03..eb990c382f 100644
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/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.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index c1622aa296..46466dbc40 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: specialobject.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/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index ff85611330..5b5c2479f2 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: visobj.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/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 4648ea1bf0..4a7e5f8911 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfactory.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/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index 0c5314877b..538aa667e0 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfactory.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/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index b52c8b7c43..bb4010a29b 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docholder.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/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index db048a4969..a7e23af262 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dummyobject.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/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index fcbf2d130c..f14f8159ff 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: intercept.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/embeddedobj/source/general/makefile.mk b/embeddedobj/source/general/makefile.mk
index f0dc5be199..2aab057358 100644
--- a/embeddedobj/source/general/makefile.mk
+++ b/embeddedobj/source/general/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 084921120c..e72f9ae1e3 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcreator.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/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 1da11b48c9..d676e65e36 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: closepreventer.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/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index b81b736abe..1ccf79c660 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commonembobj.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/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index c018f1d18a..38b601c01c 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docholder.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/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 7bdedf1408..8ee1d489c9 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dummyobject.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 58119deade..c8fc280394 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: intercept.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/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 16e27ab54c..7dd81f3f17 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleembobj.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/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index 8b6e35a24a..40bcc1c1cb 100644
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: specialobject.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/embeddedobj/source/inc/targetstatecontrol.hxx b/embeddedobj/source/inc/targetstatecontrol.hxx
index 3ce7436ebb..dba9c4c9bf 100644
--- a/embeddedobj/source/inc/targetstatecontrol.hxx
+++ b/embeddedobj/source/inc/targetstatecontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targetstatecontrol.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/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index 28e9adce0e..d59029d664 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcreator.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/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx
index 1344b95f10..485e4e3e57 100644
--- a/embeddedobj/source/msole/advisesink.cxx
+++ b/embeddedobj/source/msole/advisesink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: advisesink.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/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx
index 5760de90da..f2101826b9 100644
--- a/embeddedobj/source/msole/advisesink.hxx
+++ b/embeddedobj/source/msole/advisesink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: advisesink.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/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
index 427dd07444..42bc7b86d5 100644
--- a/embeddedobj/source/msole/closepreventer.cxx
+++ b/embeddedobj/source/msole/closepreventer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: closepreventer.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/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index db79473e34..9b2e649484 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphconvert.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,60 +31,63 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <tools/link.hxx>
+#include <vos/mutex.hxx>
+#include <unotools/streamwrap.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/seqstream.hxx>
+#include <tools/stream.hxx>
 
 #include "mtnotification.hxx"
 #include "oleembobj.hxx"
 
-// TODO: when conversion service is ready this headers should disappear
-#include <svtools/filter.hxx>
-#include <vcl/graph.hxx>
-
-#include <tools/link.hxx>
-#include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
-
 
 using namespace ::com::sun::star;
 
             
 sal_Bool ConvertBufferToFormat( void* pBuf,
                                 sal_uInt32 nBufSize,
-                                const ::rtl::OUString& aFormatShortName,
+                                const ::rtl::OUString& aMimeType,
                                 uno::Any& aResult )
 {
     // produces sequence with data in requested format and returns it in aResult
     if ( pBuf )
     {
-        SvMemoryStream aBufStream( pBuf, nBufSize, STREAM_READ );
-        aBufStream.ObjectOwnsMemory( sal_False );
-
-        Graphic aGraph;
-        GraphicFilter aGrFilter( sal_True );
-        if ( aGrFilter.ImportGraphic( aGraph, String(), aBufStream ) == ERRCODE_NONE )
+        uno::Sequence < sal_Int8 > aData( (sal_Int8*)pBuf, nBufSize );
+        uno::Reference < io::XInputStream > xIn = new comphelper::SequenceInputStream( aData );
+        try
         {
-            sal_uInt16 nFormat = aGrFilter.GetExportFormatNumberForShortName( aFormatShortName );
-
-            if ( nFormat != GRFILTER_FORMAT_DONTKNOW )
+            uno::Reference < graphic::XGraphicProvider > xGraphicProvider( comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.graphic.GraphicProvider") ), uno::UNO_QUERY );
+            if( xGraphicProvider.is() )
             {
-                SvMemoryStream aNewStream( 65535, 65535 );
-                if ( aGrFilter.ExportGraphic( aGraph, String(), aNewStream, nFormat ) == ERRCODE_NONE )
+                uno::Sequence< beans::PropertyValue > aMediaProperties( 1 );
+                aMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+                aMediaProperties[0].Value <<= xIn;
+                uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties  ) );
+                if( xGraphic.is() )
                 {
-                    /*
-                    {
-                        aNewStream.Seek( 0 );
-                        SvFileStream aFile( String::CreateFromAscii( "file:///d:/test.png" ), STREAM_STD_READWRITE);
-                        aFile.SetStreamSize( 0 );
-                        aNewStream >> aFile;
-                    }
-                    */
-
-                    aResult <<= uno::Sequence< sal_Int8 >(
-                                                    reinterpret_cast< const sal_Int8* >( aNewStream.GetData() ),
-                                                    aNewStream.Seek( STREAM_SEEK_TO_END ) );
+                    SvMemoryStream aNewStream( 65535, 65535 );
+//					uno::Reference < io::XOutputStream > xOut = new utl::OOutputStreamHelper( aNewStream.GetLockBytes() );
+                    uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream );				
+                    uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 );
+                    aOutMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+                    aOutMediaProperties[0].Value <<= xOut;
+                    aOutMediaProperties[1].Name = ::rtl::OUString::createFromAscii( "MimeType" );
+                    aOutMediaProperties[1].Value <<= aMimeType;
+
+                    xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
+                    aResult <<= uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aNewStream.GetData() ), aNewStream.Seek( STREAM_SEEK_TO_END ) );
                     return sal_True;
                 }
             }
         }
+        catch (uno::Exception&)
+        {}
     }
 
     return sal_False;
@@ -96,7 +96,6 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
 // =====================================================================
 // MainThreadNotificationRequest
 // =====================================================================
-
 MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect )
 : m_pObject( xObj.get() )
 , m_xObject( static_cast< embed::XEmbeddedObject* >( xObj.get() ) )
@@ -104,49 +103,31 @@ MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Refer
 , m_nAspect( nAspect )
 {}
 
-void MainThreadNotificationRequest::mainThreadWorkerStart( MainThreadNotificationRequest* pMTRequest )
-{
-    if ( Application::GetMainThreadIdentifier() == osl_getThreadIdentifier( NULL ) )
-    {
-        // this is the main thread
-        worker( pMTRequest, pMTRequest );
-    }
-    else
-        Application::PostUserEvent( STATIC_LINK( NULL, MainThreadNotificationRequest, worker ), pMTRequest );
-}
-
-IMPL_STATIC_LINK_NOINSTANCE( MainThreadNotificationRequest, worker, MainThreadNotificationRequest*, pMTRequest )
+void SAL_CALL MainThreadNotificationRequest::notify (const uno::Any& ) throw (uno::RuntimeException)
 {
-    if ( pMTRequest )
+    if ( m_pObject )
     {
-        if ( pMTRequest->m_pObject )
+        try
         {
-            try
+            uno::Reference< uno::XInterface > xLock = m_xObject.get();
+            if ( xLock.is() )
             {
-                uno::Reference< uno::XInterface > xLock = pMTRequest->m_xObject.get();
-                if ( xLock.is() )
-                {
-                    // this is the main thread, the solar mutex must be locked
-                    ::vos::OGuard aGuard( Application::GetSolarMutex() );
-                    if ( pMTRequest->m_nNotificationType == OLECOMP_ONCLOSE )
-                        pMTRequest->m_pObject->OnClosed_Impl();
-                    else if ( pMTRequest->m_nAspect == embed::Aspects::MSOLE_CONTENT )
-                        pMTRequest->m_pObject->OnViewChanged_Impl();
-                    else if ( pMTRequest->m_nAspect == embed::Aspects::MSOLE_ICON )
-                        pMTRequest->m_pObject->OnIconChanged_Impl();
-                }
-            }
-            catch( uno::Exception& )
-            {
-                // ignore all the errors
+                // this is the main thread, the solar mutex must be locked
+                if ( m_nNotificationType == OLECOMP_ONCLOSE )
+                    m_pObject->OnClosed_Impl();
+                else if ( m_nAspect == embed::Aspects::MSOLE_CONTENT )
+                    m_pObject->OnViewChanged_Impl();
+                else if ( m_nAspect == embed::Aspects::MSOLE_ICON )
+                    m_pObject->OnIconChanged_Impl();
             }
         }
-
-        delete pMTRequest;
+        catch( uno::Exception& )
+        {
+            // ignore all the errors
+        }
     }
-
-    return 0;
 }
 
-// =====================================================================
-
+MainThreadNotificationRequest::~MainThreadNotificationRequest()
+{
+}
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index 2af3f28183..07b08bce69 100644
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -91,13 +87,14 @@ EXCEPTIONSFILES += \
 SHL1OBJS= $(SLOFILES)
 
 SHL1STDLIBS=\
+    $(UNOTOOLSLIB)\
     $(SALLIB)\
     $(VOSLIB)\
     $(CPPULIB)\
     $(CPPUHELPERLIB)\
     $(COMPHELPERLIB)\
-    $(TOOLSLIB)\
-    $(SVTOOLLIB)
+    $(TOOLSLIB)
+    
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
@@ -107,7 +104,6 @@ EMBOBJLIB=iembobj.lib
 .ENDIF
 
 SHL1STDLIBS+=\
-    $(VCLLIB)\
     $(EMBOBJLIB)\
     $(OLE32LIB)\
     $(GDI32LIB)\
@@ -118,7 +114,6 @@ DEF1EXPORTFILE=	exports.dxp
 .ELIF "$(GUI)"=="OS2"
 
 SHL1STDLIBS+=\
-    $(VCLLIB)\
     iembobj.lib
 
 DEF1EXPORTFILE=	exports.dxp
diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index 6cda477bf6..4e8820ef3f 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mtnotification.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,8 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <cppuhelper/weakref.hxx>
+#include <com/sun/star/awt/XCallback.hpp>
+#include <cppuhelper/implbase1.hxx>
 
 #include <rtl/ref.hxx>
 
@@ -39,7 +37,7 @@ class OleEmbeddedObject;
 #define OLECOMP_ONVIEWCHANGE	1
 #define OLECOMP_ONCLOSE			2
 
-class MainThreadNotificationRequest
+class MainThreadNotificationRequest :  public cppu::WeakImplHelper1< com::sun::star::awt::XCallback >
 {
     OleEmbeddedObject* m_pObject;
     ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XEmbeddedObject > m_xObject;
@@ -48,11 +46,10 @@ class MainThreadNotificationRequest
     sal_uInt32 m_nAspect;
 
 public:
+    virtual void SAL_CALL notify (const com::sun::star::uno::Any& rUserData)
+        throw (com::sun::star::uno::RuntimeException);
     MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect = 0 );
-
-    static long worker( MainThreadNotificationRequest*, MainThreadNotificationRequest* );
-
-    static void mainThreadWorkerStart( MainThreadNotificationRequest* );
+    ~MainThreadNotificationRequest();
 };
 
 
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index d156d19bbe..bbbef5ae8e 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olecomponent.cxx,v $
- * $Revision: 1.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,10 +34,9 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/io/XTruncate.hpp>
-
+#include <com/sun/star/awt/XRequestCallback.hpp>
 
 #include <platform.h>
-
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -194,43 +190,36 @@ struct OleComponentNative_Impl {
     ComSmart< IStorage > m_pIStorage;
     FormatEtcList m_aFormatsList;
     uno::Sequence< datatransfer::DataFlavor > m_aSupportedGraphFormats;
-    uno::Sequence< ::rtl::OUString > m_aGraphShortFormats; //short names for formats from previous sequence
 
     OleComponentNative_Impl()
     {
         // TODO: Extend format list
         m_aSupportedGraphFormats.realloc( 5 );
-        m_aGraphShortFormats.realloc( 5 );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
             ::rtl::OUString::createFromAscii( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ),
             ::rtl::OUString::createFromAscii( "Windows Enhanced Metafile" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
-        m_aGraphShortFormats[0] = ::rtl::OUString::createFromAscii( "EMF" );
 
         m_aSupportedGraphFormats[1] = datatransfer::DataFlavor(
             ::rtl::OUString::createFromAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
             ::rtl::OUString::createFromAscii( "Windows Metafile" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
-        m_aGraphShortFormats[1] = ::rtl::OUString::createFromAscii( "WMF" );
 
         m_aSupportedGraphFormats[2] = datatransfer::DataFlavor(
             ::rtl::OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
             ::rtl::OUString::createFromAscii( "Bitmap" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
-        m_aGraphShortFormats[2] = ::rtl::OUString::createFromAscii( "BMP" );
 
         m_aSupportedGraphFormats[3] = datatransfer::DataFlavor(
             ::rtl::OUString::createFromAscii( "image/png" ),
             ::rtl::OUString::createFromAscii( "PNG" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
-        m_aGraphShortFormats[3] = ::rtl::OUString::createFromAscii( "PNG" );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
             ::rtl::OUString::createFromAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
             ::rtl::OUString::createFromAscii( "GDIMetafile" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
-        m_aGraphShortFormats[0] = ::rtl::OUString::createFromAscii( "SVM" );
     }
 
     void AddSupportedFormat( const FORMATETC& aFormatEtc );
@@ -307,9 +296,11 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
 
         unsigned char* pBuf = NULL;
         sal_uInt32 nBufSize = 0;
+        ::rtl::OUString aFormat;
 
         if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile
         {
+            aFormat = ::rtl::OUString::createFromAscii("image/x-wmf");
             METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict );
             if ( pMF )
             {
@@ -340,6 +331,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
         }
         else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile
         {
+            aFormat = ::rtl::OUString::createFromAscii("image/x-emf");
             nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL );
             pBuf = new unsigned char[nBufSize];
             if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) )
@@ -353,6 +345,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
         }
         else if ( aMedium.tymed == TYMED_GDI ) // Bitmap
         {
+            aFormat = ::rtl::OUString::createFromAscii("image/x-MS-bmp");
             nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL );
             pBuf = new unsigned char[nBufSize];
             if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) )
@@ -372,7 +365,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
                   && aFlavor.DataType == m_aSupportedGraphFormats[nInd].DataType
                   && aFlavor.DataType == getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) )
             {
-                bAnyIsReady = ConvertBufferToFormat( ( void* )pBuf, nBufSize, m_aGraphShortFormats[nInd], aResult );
+                bAnyIsReady = ConvertBufferToFormat( ( void* )pBuf, nBufSize, aFormat, aResult );
                 break;
             }
         }
@@ -1424,9 +1417,11 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect )
 
     if ( xLockObject.is() )
     {
-        // the request will be deleted immedeatelly after execution by it's implementation
-        MainThreadNotificationRequest* pMTNotifRequest = new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect );
-        MainThreadNotificationRequest::mainThreadWorkerStart( pMTNotifRequest );
+        uno::Reference < awt::XRequestCallback > xRequestCallback( 
+            m_xFactory->createInstance(
+             ::rtl::OUString::createFromAscii("com.sun.star.awt.AsyncCallback") ),
+             uno::UNO_QUERY );
+        xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() );
     }
 }
 
@@ -1443,9 +1438,11 @@ void OleComponent::OnClose_Impl()
 
     if ( xLockObject.is() )
     {
-        // the request will be deleted immedeatelly after execution by it's implementation
-        MainThreadNotificationRequest* pMTNotifRequest = new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE );
-        MainThreadNotificationRequest::mainThreadWorkerStart( pMTNotifRequest );
+        uno::Reference < awt::XRequestCallback > xRequestCallback( 
+            m_xFactory->createInstance(
+             ::rtl::OUString::createFromAscii("com.sun.star.awt.AsyncCallback") ),
+             uno::UNO_QUERY );
+        xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() );
     }
 }
 
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index f77dbd2330..9da64a0b48 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olecomponent.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/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 28a1aa9b02..e1bf2754b6 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleembed.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/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index c57ad63730..7db1a22003 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olemisc.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/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index a85356e191..f35e1acb0f 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olepersist.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/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 096f6249f9..1baa773963 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleregister.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/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 27f6a59d7c..810f40a015 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olevisual.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/embeddedobj/source/msole/olewrapclient.cxx b/embeddedobj/source/msole/olewrapclient.cxx
index 983e7c970f..fa9b055417 100644
--- a/embeddedobj/source/msole/olewrapclient.cxx
+++ b/embeddedobj/source/msole/olewrapclient.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olewrapclient.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/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index affcf3a6f1..d53ab38d1e 100644
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: olewrapclient.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/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 2be4a3f9d4..923a2fe353 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ownview.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/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 9d65bb13b0..023f0dacd3 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ownview.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/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index c731f24899..26f9029c5e 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: platform.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/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 56199216cc..312b7ede44 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xdialogcreator.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/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index ef99e96405..910c58208c 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xdialogcreator.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/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index d78c841f0a..f5eab2f205 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xolefactory.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/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index 25c9ca5d91..97bd9f7cca 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xolefactory.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/embeddedobj/test/Container1/JavaWindowPeerFake.java b/embeddedobj/test/Container1/JavaWindowPeerFake.java
index 7f70867cd3..6d2c8819ad 100644
--- a/embeddedobj/test/Container1/JavaWindowPeerFake.java
+++ b/embeddedobj/test/Container1/JavaWindowPeerFake.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: JavaWindowPeerFake.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/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java
index 6feb79025a..56bfc1f668 100644
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.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: NativeView.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/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk
index d635ce250f..e482384dd9 100644
--- a/embeddedobj/test/Container1/makefile.mk
+++ b/embeddedobj/test/Container1/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.14.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/test/Container1/nativelib/makefile.mk b/embeddedobj/test/Container1/nativelib/makefile.mk
index 0bd5be0420..331a5b12f2 100644
--- a/embeddedobj/test/Container1/nativelib/makefile.mk
+++ b/embeddedobj/test/Container1/nativelib/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index 7a5f5e3b47..bb9a795434 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.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: nativeview.c,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.h b/embeddedobj/test/Container1/nativelib/nativeview.h
index 9b867cd388..1a3f320087 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.h
+++ b/embeddedobj/test/Container1/nativelib/nativeview.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nativeview.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/embeddedobj/test/MainThreadExecutor/makefile.mk b/embeddedobj/test/MainThreadExecutor/makefile.mk
index c3f39a5556..c94341e604 100644
--- a/embeddedobj/test/MainThreadExecutor/makefile.mk
+++ b/embeddedobj/test/MainThreadExecutor/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index 1d951895c7..84daf9585c 100644
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index 78dec2c3e9..54648c4fc6 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xexecutor.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/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index b4bd6ba97d..1a60bfeaee 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xexecutor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index ae5b2d4501..aadd528d1a 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bitmapcreator.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/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index 1f0d5d76d0..bcabc4f69b 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bitmapcreator.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/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 1a3e7cd8bc..b84748bc75 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mainthreadexecutor.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/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index 21f762de2f..1a5421cf1e 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mainthreadexecutor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/embeddedobj/test/mtexecutor/makefile.mk b/embeddedobj/test/mtexecutor/makefile.mk
index 28c308e70d..fb6c6224b7 100644
--- a/embeddedobj/test/mtexecutor/makefile.mk
+++ b/embeddedobj/test/mtexecutor/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index b28bfb1658..44ac1a022f 100644
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mteregister.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/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
index 91fe1c83fe..763d64c164 100644
--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index c55ca4a8c4..a4182adb27 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventattacher.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/eventattacher/source/makefile.mk b/eventattacher/source/makefile.mk
index f642559b80..ddab6f7ea3 100644
--- a/eventattacher/source/makefile.mk
+++ b/eventattacher/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.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index 3f387afe4b..c30c298ef0 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FileAccess.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/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk
index ff9eaab41f..7bd6266f7d 100644
--- a/fileaccess/source/makefile.mk
+++ b/fileaccess/source/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/AddressConvention.hxx b/formula/inc/AddressConvention.hxx
index fdb6f18043..942573fa48 100644
--- a/formula/inc/AddressConvention.hxx
+++ b/formula/inc/AddressConvention.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index 9044bd7b7a..e933f6d341 100644
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: externalrefmgr.hxx,v $
- * $Revision: 1.1.2.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 4be65adb75..b67d78abd1 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
index 6808c6afd8..cce1557a90 100644
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
@@ -1,89 +1,86 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: tokenuno.hxx,v $

- * $Revision: 1.4 $

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

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

-

-#ifndef FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED

-#define FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED

-

-#include "formula/formuladllapi.h"

-#include <cppuhelper/implbase2.hxx>

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

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

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

-#include <memory>

-#include "formula/FormulaCompiler.hxx"

-

-

-namespace formula

-{

-

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

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

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

-{

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

-public:

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

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

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

-

-protected:

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

-    virtual                 ~FormulaOpCodeMapperObj();

-

-private:

-                            // XFormulaOpCodeMapper

-                            // Attributes

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

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

-                            // Methods

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

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

-                                    sal_Int32 nLanguage )

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

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

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

-                                    sal_Int32 nLanguage, sal_Int32 nGroups )

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

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

-

-                            // XServiceInfo

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

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

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

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

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

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

-

-};

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

-} // formula

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

-

-#endif // FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
+#define FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
+
+#include "formula/formuladllapi.h"
+#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
+#include "formula/FormulaCompiler.hxx"
+
+
+namespace formula
+{
+
+class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
+                            ::com::sun::star::sheet::XFormulaOpCodeMapper,
+                            ::com::sun::star::lang::XServiceInfo >
+{
+    ::std::auto_ptr<FormulaCompiler> m_pCompiler;
+public:
+    static ::rtl::OUString	getImplementationName_Static();
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static();
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext);
+
+protected:
+                            FormulaOpCodeMapperObj(::std::auto_ptr<FormulaCompiler> _pCompiler);
+    virtual                 ~FormulaOpCodeMapperObj();
+
+private:
+                            // XFormulaOpCodeMapper
+                            // Attributes
+    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException);
+                            // Methods
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings(
+                                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames,
+                                    sal_Int32 nLanguage )
+                                throw ( ::com::sun::star::lang::IllegalArgumentException,
+                                        ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings(
+                                    sal_Int32 nLanguage, sal_Int32 nGroups )
+                                throw ( ::com::sun::star::lang::IllegalArgumentException,
+                                        ::com::sun::star::uno::RuntimeException);
+
+                            // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+                                throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+                                throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+                                throw(::com::sun::star::uno::RuntimeException);
+
+};
+// =============================================================================
+} // formula
+// =============================================================================
+
+#endif // FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/formula/inc/formula/IControlReferenceHandler.hxx
index 75ca7da10d..d6574cb5aa 100644
--- a/formula/inc/formula/IControlReferenceHandler.hxx
+++ b/formula/inc/formula/IControlReferenceHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.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/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index 90f736bdc5..c0579f1ac7 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcpage.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 8c402c2819..2df2a8ee78 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.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: compiler.hrc,v $
- * $Revision: 1.20.134.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx
index c15697ac91..d99971788b 100644
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: errorcodes.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/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 5f9825356f..0ae141cc30 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formdata.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 0b91f59f4c..812c6631d3 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.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/formula/inc/formula/formuladllapi.h b/formula/inc/formula/formuladllapi.h
index 2320ae6cb8..cc04767419 100644
--- a/formula/inc/formula/formuladllapi.h
+++ b/formula/inc/formula/formuladllapi.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx
index 9d18097271..063b7b0cc0 100644
--- a/formula/inc/formula/formulahelper.hxx
+++ b/formula/inc/formula/formulahelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.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/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index e51e17b750..a659609600 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcutl.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/formula/inc/formula/grammar.hxx b/formula/inc/formula/grammar.hxx
index 74520da4a0..691dbcb715 100644
--- a/formula/inc/formula/grammar.hxx
+++ b/formula/inc/formula/grammar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grammar.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/intruref.hxx b/formula/inc/formula/intruref.hxx
index a0dc9ad5ee..640ce14e4b 100644
--- a/formula/inc/formula/intruref.hxx
+++ b/formula/inc/formula/intruref.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: intruref.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/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index 4616f24fd7..12061917d6 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opcode.hxx,v $
- * $Revision: 1.23.134.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index 313ef1b8c4..be1b2f6acd 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.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/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 46192f9271..54e8179c3f 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenarray.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/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index be01c94513..dfd7403f8d 100644
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.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: helpids.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/formula/inc/makefile.mk b/formula/inc/makefile.mk
index 4d06d357ee..dfe7226e08 100644
--- a/formula/inc/makefile.mk
+++ b/formula/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/formula/inc/pch/precompiled_formula.cxx b/formula/inc/pch/precompiled_formula.cxx
index 77cdd62b24..9a56cf658e 100644
--- a/formula/inc/pch/precompiled_formula.cxx
+++ b/formula/inc/pch/precompiled_formula.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_reportdesign.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/formula/inc/pch/precompiled_formula.hxx b/formula/inc/pch/precompiled_formula.hxx
index 8d33bbec97..7dd6970f7b 100644
--- a/formula/inc/pch/precompiled_formula.hxx
+++ b/formula/inc/pch/precompiled_formula.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_reportdesign.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index a657d462b5..bdc6e4f0d3 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index d71126816a..c16be9acd1 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tokenuno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/api/makefile.mk b/formula/source/core/api/makefile.mk
index d4c132ac41..a99f9184ac 100644
--- a/formula/source/core/api/makefile.mk
+++ b/formula/source/core/api/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx
index 4a29c25d6b..39809ab9b6 100644
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 74795e32fe..ccc740633c 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: token.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/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc
index ecb21ef55b..ee055f3bb2 100644
--- a/formula/source/core/inc/core_resource.hrc
+++ b/formula/source/core/inc/core_resource.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: core_resource.hrc,v $
- * $Revision: 1.16.68.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index 77b1a4de50..c38c158e0a 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: core_resource.hxx,v $
- * $Revision: 1.5.68.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index d61c479462..15ed492b5b 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: core_resource.cxx,v $
- * $Revision: 1.11.68.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index c653087da4..eaa326ab31 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.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: compiler.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/formula/source/core/resource/makefile.mk b/formula/source/core/resource/makefile.mk
index 13744ad59b..7aa3433476 100644
--- a/formula/source/core/resource/makefile.mk
+++ b/formula/source/core/resource/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 92f7faadac..e0472000d1 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcutl.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/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 678e011c6f..89d3508bc1 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.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/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 75d4906e90..bb9e2a5a2a 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.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: formdlgs.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/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 7828b0a6ef..8ea9545c09 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.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: formdlgs.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/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index aef0a6674f..caa22cd3c0 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formula.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 149684f17c..1da4aef269 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcpage.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/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 801fda4389..77b32f495c 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcpage.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 4d12751105..6298e94c4b 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: funcutl.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/formula/source/ui/dlg/makefile.mk b/formula/source/ui/dlg/makefile.mk
index 04d19bb79a..688e169d26 100644
--- a/formula/source/ui/dlg/makefile.mk
+++ b/formula/source/ui/dlg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index ddda38e485..0de42f971e 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parawin.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/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc
index 388da0657b..484ca53937 100644
--- a/formula/source/ui/dlg/parawin.hrc
+++ b/formula/source/ui/dlg/parawin.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: parawin.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/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 3a68cd94b9..8f128e5ad4 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: parawin.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/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index d74ef6a1b7..78be77040b 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.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: parawin.src,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/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 846b32f5dd..c32d3dfa3b 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: structpg.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/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 5990df37a4..a71ca68008 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: structpg.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/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index e170c08c6d..a09e3fd03d 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.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: RptResId.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/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 2c06a804eb..de80a167a1 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ModuleHelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index 8fca1dff65..b13419b701 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ModuleHelper.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/formula/source/ui/resource/makefile.mk b/formula/source/ui/resource/makefile.mk
index d9a6039ae7..602359e1ea 100644
--- a/formula/source/ui/resource/makefile.mk
+++ b/formula/source/ui/resource/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/formula/util/hidother.src b/formula/util/hidother.src
index 942d5c2e36..8f56afa1cd 100644
--- a/formula/util/hidother.src
+++ b/formula/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index 130bf7f9bd..3e8f2301b2 100644
--- a/formula/util/makefile.mk
+++ b/formula/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/formula/util/makefile.pmk b/formula/util/makefile.pmk
index 9b0f73ace8..db2375e917 100644
--- a/formula/util/makefile.pmk
+++ b/formula/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/fpicker/inc/makefile.mk b/fpicker/inc/makefile.mk
index a820da9949..8d04d47bc3 100644
--- a/fpicker/inc/makefile.mk
+++ b/fpicker/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/fpicker/inc/pch/precompiled_fpicker.cxx b/fpicker/inc/pch/precompiled_fpicker.cxx
index 2e4d1a1bdf..8e4c0da71b 100644
--- a/fpicker/inc/pch/precompiled_fpicker.cxx
+++ b/fpicker/inc/pch/precompiled_fpicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_fpicker.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/fpicker/inc/pch/precompiled_fpicker.hxx b/fpicker/inc/pch/precompiled_fpicker.hxx
index 633410b94e..940b61295f 100644
--- a/fpicker/inc/pch/precompiled_fpicker.hxx
+++ b/fpicker/inc/pch/precompiled_fpicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_fpicker.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/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 717b5d1297..e718f04685 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AquaFilePickerDelegate.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index d73e5d82ff..4266453a71 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.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: AquaFilePickerDelegate.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/fpicker/source/aqua/CFStringUtilities.cxx b/fpicker/source/aqua/CFStringUtilities.cxx
index eec4530f87..482ab7876b 100644
--- a/fpicker/source/aqua/CFStringUtilities.cxx
+++ b/fpicker/source/aqua/CFStringUtilities.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CFStringUtilities.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/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 1f5bf37320..357e0412de 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CFStringUtilities.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/fpicker/source/aqua/ControlHelper.cxx b/fpicker/source/aqua/ControlHelper.cxx
index d289608631..290967508d 100644
--- a/fpicker/source/aqua/ControlHelper.cxx
+++ b/fpicker/source/aqua/ControlHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ControlHelper.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/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index a3956e3040..739f311253 100644
--- a/fpicker/source/aqua/ControlHelper.hxx
+++ b/fpicker/source/aqua/ControlHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ControlHelper.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/fpicker/source/aqua/FPServiceInfo.hxx b/fpicker/source/aqua/FPServiceInfo.hxx
index c63f3a2274..2fe849d647 100644
--- a/fpicker/source/aqua/FPServiceInfo.hxx
+++ b/fpicker/source/aqua/FPServiceInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPServiceInfo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index 21fc269a59..d38c0a0a5a 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPentry.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/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index 75996f2d32..b360260295 100644
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FilterHelper.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/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index c77f93f26b..d72235842d 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FilterHelper.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/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx
index bff6535174..5c7a9b33ee 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NSString_OOoAdditions.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm
index cc22cbc9c7..6707cff4c8 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.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: NSString_OOoAdditions.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/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
index e65bb3984f..f38941f9e7 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NSURL_OOoAdditions.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index d9495a5c9a..56fc198650 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.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: NSURL_OOoAdditions.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/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index 9017bf2122..7129757c99 100644
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaConstants.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/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index 9e99200325..f48275cbe6 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaFilePicker.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/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 46d8f73064..2721147535 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaFilePicker.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/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index de72b44370..a71effa052 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaFolderPicker.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/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index bf28a29efa..38540ff8c5 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaFolderPicker.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/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index c084c71a25..4dc0cdc9b6 100644
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaPicker.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/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index 53775d7045..fc01ab780e 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalAquaPicker.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/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
index e6a8247480..f79d2a0189 100644
--- a/fpicker/source/aqua/makefile.mk
+++ b/fpicker/source/aqua/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 7f40fa026d..977834a420 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx
index 270bd436b4..a7d555e86e 100644
--- a/fpicker/source/aqua/resourceprovider.hxx
+++ b/fpicker/source/aqua/resourceprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index f725a20c1f..980c04513b 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fpicker.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/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
index 7f8f8c0bc4..f5d624f8e4 100644
--- a/fpicker/source/generic/makefile.mk
+++ b/fpicker/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 990a991d83..8f48eddc28 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OfficeControlAccess.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/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index b524f99a00..1252aac0fc 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OfficeControlAccess.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/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 7aed16688c..980a197703 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OfficeFilePicker.cxx,v $
- * $Revision: 1.17.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -984,8 +981,9 @@ void SAL_CALL SvtFilePicker::appendFilterGroup(	const ::rtl::OUString& sGroupTit
 
     // check the names
     if ( FilterNameExists( aFilters ) )
-        // TODO: a more precise exception message
-        throw IllegalArgumentException();
+        throw IllegalArgumentException(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter name exists")),
+            static_cast< OWeakObject * >(this), 1);
 
     // ensure that we have a filter list
     ::rtl::OUString sInitialCurrentFilter;
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 7244602edb..cb5e8699c5 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OfficeFilePicker.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/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src
index c841631466..ceb8ea14ef 100644
--- a/fpicker/source/office/OfficeFilePicker.src
+++ b/fpicker/source/office/OfficeFilePicker.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: OfficeFilePicker.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/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index d9543a3aee..e6011bb3ab 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OfficeFolderPicker.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/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index a92736098c..3fd8ecd6af 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OfficeFolderPicker.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/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 467f7d99ac..86e12d4d5f 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asyncfilepicker.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/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 79f7cf2697..bb415111eb 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asyncfilepicker.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/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 8fa1ac31f4..491babacb7 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commonpicker.cxx,v $
- * $Revision: 1.9.12.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 6dc6e41a75..dfe4c4058d 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commonpicker.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/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 19b4ad6e3d..1f99c1ebad 100644
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fpinteraction.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/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 6f614d7a3f..025c8e62c8 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fpinteraction.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/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index d41fcc336c..13bc9dedc1 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fps_office.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/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 3ee5166fed..20a7e9b2c9 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fpsmartcontent.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/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index fc280c555b..4ecf9b247b 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fpsmartcontent.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/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 1f8b6a3ce4..429676d8b7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iodlg.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/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index ecd5fd98e1..365c1ec7bb 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index d0a6d1489d..0753072215 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 56ab98ac22..2f19df5a1b 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.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: iodlg.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/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 1bd67da654..e362af4ca4 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iodlgimp.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/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 07ad8af65a..f85eacbe1f 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iodlgimp.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/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
index 1362458622..c687d8cb33 100644
--- a/fpicker/source/office/makefile.mk
+++ b/fpicker/source/office/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx
index c5826998a0..2d66b84638 100644
--- a/fpicker/source/office/pickercallbacks.hxx
+++ b/fpicker/source/office/pickercallbacks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pickercallbacks.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/fpicker/source/unx/gnome/FPServiceInfo.hxx b/fpicker/source/unx/gnome/FPServiceInfo.hxx
index 2e18671555..c76e7532d4 100644
--- a/fpicker/source/unx/gnome/FPServiceInfo.hxx
+++ b/fpicker/source/unx/gnome/FPServiceInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPServiceInfo.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/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index b4aef6e0c8..93097ff8d1 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPentry.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/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 65cf6e79dc..4b3859399b 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalGtkFilePicker.cxx,v $
- * $Revision: 1.28.42.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index 0146b9cdb8..85e934db58 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalGtkFilePicker.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/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index a19f1cc29d..775484eb5c 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalGtkFolderPicker.cxx,v $
- * $Revision: 1.11.42.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
index 049374ef81..e2804e2ff1 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalGtkFolderPicker.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/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 3a9b3a3a5d..9c8dc395cf 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalGtkPicker.cxx,v $
- * $Revision: 1.17.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.hxx b/fpicker/source/unx/gnome/SalGtkPicker.hxx
index a520117c0e..b9957e59bf 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SalGtkPicker.hxx,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
diff --git a/fpicker/source/unx/gnome/eventnotification.hxx b/fpicker/source/unx/gnome/eventnotification.hxx
index 2b3d943fa9..e09917bd24 100644
--- a/fpicker/source/unx/gnome/eventnotification.hxx
+++ b/fpicker/source/unx/gnome/eventnotification.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventnotification.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/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk
index 2c0f42cafc..aa1fbc54b7 100644
--- a/fpicker/source/unx/gnome/makefile.mk
+++ b/fpicker/source/unx/gnome/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx
index 04c407b3df..9552bd4fde 100644
--- a/fpicker/source/unx/gnome/resourceprovider.cxx
+++ b/fpicker/source/unx/gnome/resourceprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/fpicker/source/unx/gnome/resourceprovider.hxx b/fpicker/source/unx/gnome/resourceprovider.hxx
index b5e24c59ed..8f424b0e55 100644
--- a/fpicker/source/unx/gnome/resourceprovider.hxx
+++ b/fpicker/source/unx/gnome/resourceprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/fpicker/source/unx/kde4/FPServiceInfo.hxx b/fpicker/source/unx/kde4/FPServiceInfo.hxx
index 59804eaba8..67ca61ccf8 100644
--- a/fpicker/source/unx/kde4/FPServiceInfo.hxx
+++ b/fpicker/source/unx/kde4/FPServiceInfo.hxx
@@ -1,61 +1,27 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index 5fa358df2d..dfcb339452 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -1,61 +1,27 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index bea4617e8b..0c0fb21372 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -1,54 +1,27 @@
 /*************************************************************************
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  Sun Microsystems Inc., October, 2000
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ * This file is part of OpenOffice.org.
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): Jan Holesovsky <kendy@openoffice.org>
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index 291e6f7c3a..3a59634b84 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
@@ -1,61 +1,27 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): Jan Holesovsky <kendy@openoffice.org>
- *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk
index 6f9db777bc..e245e66184 100644
--- a/fpicker/source/unx/kde4/makefile.mk
+++ b/fpicker/source/unx/kde4/makefile.mk
@@ -1,62 +1,27 @@
 #*************************************************************************
 #
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
+# OpenOffice.org - a multi-platform office productivity suite
 #
+# This file is part of OpenOffice.org.
 #
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#
-#   The Contents of this file are made available subject to the terms of
-#   either of the following licenses
-#
-#          - GNU Lesser General Public License Version 2.1
-#          - Sun Industry Standards Source License Version 1.1
-#
-#   Sun Microsystems Inc., October, 2000
-#
-#   GNU Lesser General Public License Version 2.1
-#   =============================================
-#   Copyright 2000 by Sun Microsystems, Inc.
-#   901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License version 2.1, as published by the Free Software Foundation.
-#
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#   MA  02111-1307  USA
-#
-#
-#   Sun Industry Standards Source License Version 1.1
-#   =================================================
-#   The contents of this file are subject to the Sun Industry Standards
-#   Source License Version 1.1 (the "License"); You may not use this file
-#   except in compliance with the License. You may obtain a copy of the
-#   License at http://www.openoffice.org/license.html.
-#
-#   Software provided under this License is provided on an "AS IS" basis,
-#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-#   See the License for the specific provisions governing your rights and
-#   obligations concerning the Software.
-#
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-#
-#   Copyright: 2000 by Sun Microsystems, Inc.
-#
-#   All Rights Reserved.
-#
-#   Contributor(s): _______________________________________
-#
-#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
index 6b7f6ef534..3661771122 100644
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/filepicker/FPServiceInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPServiceInfo.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/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 7d2d9d93fc..1e35bdd02d 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FPentry.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/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index f28a18c56a..46b738f28d 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FileOpenDlg.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/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
index 618754b738..29083d46d4 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FileOpenDlg.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/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 2342c88aee..67b2124e67 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FilePicker.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/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index 4d0a21aed2..fc629208ca 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FilePicker.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/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index dbdb632906..7404db33df 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FilterContainer.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/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx
index 3224e45117..d875b7735c 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FilterContainer.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/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 37288ef726..97239428ff 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IVistaFilePickerInternalNotify.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/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index 1954a8de42..63758d1cfe 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PreviewCtrl.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/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
index ebf2160c16..604269f3b4 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PreviewCtrl.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/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx
index 3c446f412e..7b06e8c9ed 100644
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ b/fpicker/source/win32/filepicker/SolarMutex.cxx
@@ -1,58 +1,55 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: asynceventnotifier.cxx,v $

- * $Revision: 1.16 $

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

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

-

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

-#include "precompiled_fpicker.hxx"

-

-#include <vcl/svapp.hxx>

-#include <vos/mutex.hxx>

-#include <osl/thread.hxx>

-

-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)

-{

-    int nAcquireCount = 0;

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

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

-    

-    if ( nMainThreadId == nThreadId )

-    {

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

-        if ( rMutex.tryToAcquire() )

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

-    }

-    

-    return nAcquireCount;

-}

-

-void AcquireSolarMutex(int nAcquireCount)

-{

-    if ( nAcquireCount )

-        Application::AcquireSolarMutex( nAcquireCount );

-}

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

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: asynceventnotifier.cxx,v $

- * $Revision: 1.16 $

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

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

-

-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);

-

-void AcquireSolarMutex(int nAcquireCount);

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);
+
+void AcquireSolarMutex(int nAcquireCount);
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index a80604c18f..b6cff99fde 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VistaFilePicker.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/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index 11ef555404..9de046dad4 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VistaFilePicker.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/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 6814f79761..28d894799a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VistaFilePickerEventHandler.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/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index ad1870d5ee..de79949092 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VistaFilePickerEventHandler.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/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 31784e44bd..63663e5690 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VistaFilePickerImpl.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/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index a5fb9e9330..f3be49c39e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VistaFilePickerImpl.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/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 2ee2867d95..71e441904a 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinFileOpenImpl.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/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index 16c0c3b7ce..6239b52dc7 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinFileOpenImpl.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/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index ba847f15eb..a6a4bf4b11 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asynceventnotifier.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index d08860a4a4..53861a7751 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asynceventnotifier.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/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index bc4515c13b..8c4e170271 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asyncrequests.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/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx
index 0a7e5c2c15..123fec7732 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: asyncrequests.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx
index 8c6d87e414..3ae33e995e 100644
--- a/fpicker/source/win32/filepicker/comptr.hxx
+++ b/fpicker/source/win32/filepicker/comptr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: comptr.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/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index 76cd8e655a..df595fbf51 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlaccess.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/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index 26c70e2434..1bfa5a1bd5 100644
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlaccess.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/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index d1d4f99842..e34bc8beae 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlcommand.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/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index a280c61cc9..cf806283ab 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlcommand.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/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
index 4e0de409a0..db96e70ce8 100644
--- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlcommandrequest.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/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 445d8eea22..84fb9215e8 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlcommandresult.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/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx
index 1a5bc33c2f..9a817af71e 100644
--- a/fpicker/source/win32/filepicker/customcontrol.cxx
+++ b/fpicker/source/win32/filepicker/customcontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customcontrol.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/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx
index 54ecad8e61..d74a41323d 100644
--- a/fpicker/source/win32/filepicker/customcontrol.hxx
+++ b/fpicker/source/win32/filepicker/customcontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customcontrol.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/fpicker/source/win32/filepicker/customcontrolcontainer.cxx b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
index 3d1d8ff91a..e91c74300d 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customcontrolcontainer.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/fpicker/source/win32/filepicker/customcontrolcontainer.hxx b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
index d7a5647c59..0fad562022 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customcontrolcontainer.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/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index 8fbfc6c660..4ff1bb915b 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customcontrolfactory.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/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index 028684b0ab..30e2eb27b3 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customcontrolfactory.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/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
index 1482c5c42b..569f53fb3b 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialogcustomcontrols.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/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
index ad14e6a977..1bdef8c21e 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialogcustomcontrols.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/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index a3e19e8179..7be071f628 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dibpreview.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/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 8e018050ca..6f079ebfac 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dibpreview.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/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index 2b3d943fa9..e09917bd24 100644
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventnotification.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/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
index 05244444e6..1243d0fb4b 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filepickereventnotification.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/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
index ac74ceace0..e4bdcd02ec 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filepickereventnotification.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/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index dc0858a63a..ea8da8419f 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filepickerstate.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/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 2559871c3a..d3722fa479 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filepickerstate.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/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index a9b467316b..189b9bc403 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: getfilenamewrapper.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/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 81419226ca..b370348310 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: getfilenamewrapper.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/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 1e1c2d6bfe..02a99c76d6 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helppopupwindow.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/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index 1c6ef3c231..aeb3e89261 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helppopupwindow.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/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk
index de192879b6..feea7ee803 100644
--- a/fpicker/source/win32/filepicker/makefile.mk
+++ b/fpicker/source/win32/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h
index fe4492d87e..3cb073e466 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: platform_vista.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/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h
index 4108b109ac..5d59ba6f7c 100644
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: platform_xp.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/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index de09f1fae5..6746a01d0d 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: previewadapter.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/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 43eb6555d3..e850ccd299 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: previewadapter.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/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index a74b699766..75892a83cc 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: previewbase.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/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 692cd07621..c91dae6c98 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: previewbase.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/fpicker/source/win32/filepicker/propmap.hxx b/fpicker/source/win32/filepicker/propmap.hxx
index ca877ccd75..6bbeae9641 100644
--- a/fpicker/source/win32/filepicker/propmap.hxx
+++ b/fpicker/source/win32/filepicker/propmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propmap.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index fef500d58c..74bed5dbbb 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shared.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h
index e867ca4d73..1567cbf5f7 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/filepicker/vistatypes.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vistatypes.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/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index d8ae71baf6..46be0c2d9a 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_fps.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/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/filepicker/workbench/makefile.mk
index 8a9d104f82..926e2c22a0 100644
--- a/fpicker/source/win32/filepicker/workbench/makefile.mk
+++ b/fpicker/source/win32/filepicker/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
index db92045d8a..203fc51931 100644
--- a/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
+++ b/fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FOPServiceInfo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 9d2e67199d..06e8a06810 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FolderPicker.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/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 95a0a5a02f..c98c9ca4fa 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FolderPicker.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/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index 774fc88fc2..627da82b8d 100644
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FopEvtDisp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index d8a134ce44..d379ca47a5 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Fopentry.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/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index d63ca14d12..699403093b 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MtaFop.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/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx
index 1246d080ce..815d4500c3 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.hxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MtaFop.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/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index d0171429ad..ab70810f40 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinFOPImpl.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/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 0b664880e3..b6082be55d 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinFOPImpl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/source/win32/folderpicker/makefile.mk
index 7a0ee692bd..7f0556d7ce 100644
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ b/fpicker/source/win32/folderpicker/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index ee72930a52..677eb4f696 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_fops.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/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/source/win32/folderpicker/workbench/makefile.mk
index dda6c98e21..bfdf840989 100644
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/source/win32/folderpicker/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index b1ca089687..b043c09dd2 100644
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AutoBuffer.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/fpicker/source/win32/misc/AutoBuffer.hxx b/fpicker/source/win32/misc/AutoBuffer.hxx
index f4f2bd25a0..568122146c 100644
--- a/fpicker/source/win32/misc/AutoBuffer.hxx
+++ b/fpicker/source/win32/misc/AutoBuffer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AutoBuffer.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/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 8d41da1fb1..5682479b29 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinImplHelper.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/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 494cbd61e3..1d92d73011 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinImplHelper.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/fpicker/source/win32/misc/makefile.mk b/fpicker/source/win32/misc/makefile.mk
index 29ba591478..70faefdeae 100644
--- a/fpicker/source/win32/misc/makefile.mk
+++ b/fpicker/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 9f609a7769..d38c829a5f 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index e1d2134f2a..9e65b5e467 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
index 3f8a1d6218..66d9c348f3 100644
--- a/fpicker/test/makefile.mk
+++ b/fpicker/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/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 0d5342fcb0..77eda31856 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index fbdb51e6e9..c249e4259e 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/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/framework/collector/cmduicollector.cxx b/framework/collector/cmduicollector.cxx
deleted file mode 100644
index 94cbf563c6..0000000000
--- a/framework/collector/cmduicollector.cxx
+++ /dev/null
@@ -1,2722 +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: cmduicollector.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_framework.hxx"
-
-#include <sal/main.h>
-#include <osl/file.hxx>
-#include <osl/thread.h>
-#include "tools/getprocessworkingdir.hxx"
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/string.hxx>
-
-#include <rsc/rscsfx.hxx>
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/bootstrap.hxx>
-#include <tools/resmgr.hxx>
-#include <tools/rc.h>
-#include <tools/isolang.hxx>
-//#include <vcl/rc.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/keycodes.hxx>
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-
-#include <com/sun/star/awt/KeyEvent.hpp>
-#include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyModifier.hpp>
-
-#include <hash_map>
-#include <vector>
-
-using namespace rtl;
-namespace css = ::com::sun::star;
-
-// Menubars
-const unsigned short MENUBAR_GLOBAL             = 261;
-const unsigned short MENUBAR_BASIC              = 14851;
-const unsigned short MENUBAR_WRITER             = 20016;
-const unsigned short MENUBAR_WRITERWEB          = 20019;
-const unsigned short MENUBAR_WRITERGLOBAL       = 20029;
-const unsigned short MENUBAR_CALC               = 26007;
-const unsigned short MENUBAR_DRAW               = 23009;
-const unsigned short MENUBAR_CHART              = 20081;
-const unsigned short MENUBAR_MATH               = 20814;
-const unsigned short MENUBAR_IMPRESS            = 23006;
-const unsigned short MENUBAR_BIBLIOGRAPHY       = 15901;
-const unsigned short MENUBAR_BACKINGCOMP        = 261;
-const unsigned short MENUBAR_DBACCESS_TABLE     = 19210;
-const unsigned short MENUBAR_DBACCESS_QUERY     = 19211;
-const unsigned short MENUBAR_DBACCESS_RELATION  = 19212;
-
-// Accelerators (TODO_AS change numbers)
-const unsigned short ACC_GLOBAL             = 262;
-const unsigned short ACC_WRITER             = 20017;
-const unsigned short ACC_WRITERWEB          = 20017;    // same as writer ?
-const unsigned short ACC_WRITERGLOBAL       = 20017;    // same as writer ?
-const unsigned short ACC_CALC               = 26006;
-const unsigned short ACC_DRAW               = 23008;
-const unsigned short ACC_CHART              = 20080;
-const unsigned short ACC_MATH               = 20815;
-const unsigned short ACC_IMPRESS            = 23008;    // same as draw ?
-const unsigned short ACC_BASIC              = 0;
-const unsigned short ACC_BIBLIOGRAPHY       = 0;
-const unsigned short ACC_BACKINGCOMP        = 0;
-const unsigned short ACC_DBACCESS_TABLE     = 0;
-const unsigned short ACC_DBACCESS_QUERY     = 0;
-const unsigned short ACC_DBACCESS_RELATION  = 0;
-
-// Toolbars
-const unsigned short TOOLBAR_functionbar                = 560;
-const unsigned short TOOLBAR_fullscreenbar              = 558;
-const unsigned short TOOLBAR_macrobar                   = 14850;
-const unsigned short TOOLBAR_formsnavigationbar         = 18003;
-const unsigned short TOOLBAR_formsfilterbar             = 18004;
-const unsigned short TOOLBAR_mathtoolbar                = 20050;
-//const unsigned short TOOLBAR_chartobjectbar             = 30001;
-const unsigned short TOOLBAR_charttoolbar               = 30513;
-const unsigned short TOOLBAR_calctextobjectbar          = 25005;
-const unsigned short TOOLBAR_calcformsobjectbar         = 25047;
-const unsigned short TOOLBAR_calcdrawobjectbar          = 25053;
-const unsigned short TOOLBAR_calcgrapicobjectbar        = 25054;
-const unsigned short TOOLBAR_calcformatobjectbar	    = 25001;
-const unsigned short TOOLBAR_calcpreviewbar             = 25006;
-const unsigned short TOOLBAR_calctoolbar                = 25035;
-const unsigned short TOOLBAR_drawbezierobjectbar        = 23015;
-const unsigned short TOOLBAR_drawgluepointsobjectbar    = 23019;
-const unsigned short TOOLBAR_impressgraphicobjectbar    = 23030;
-const unsigned short TOOLBAR_drawdrawingobjectbar       = 23013;
-const unsigned short TOOLBAR_impresstextobjectbar       = 23016;
-const unsigned short TOOLBAR_drawtextobjectbar          = 23028;
-const unsigned short TOOLBAR_impresstoolbar             = 23011;
-const unsigned short TOOLBAR_impressoptionsbar          = 23020;
-const unsigned short TOOLBAR_impresscommontaskbar       = 23021;
-const unsigned short TOOLBAR_drawtoolbar                = 23025;
-const unsigned short TOOLBAR_drawoptionsbar             = 23026;
-const unsigned short TOOLBAR_drawgraphicobjectbar       = 23027;
-const unsigned short TOOLBAR_impressoutlinetoolbar      = 23017;
-const unsigned short TOOLBAR_impressslideviewtoolbar    = 23012;
-const unsigned short TOOLBAR_impressslideviewobjectbar  = 23014;
-const unsigned short TOOLBAR_writerbezierobjectbar      = 23283;
-const unsigned short TOOLBAR_writerdrawingobjectbar     = 23269;
-const unsigned short TOOLBAR_writerformsobjectbar       = 23299;
-const unsigned short TOOLBAR_writerdrawtextobjectbar    = 23270;
-const unsigned short TOOLBAR_writerframeobjectbar       = 23267;
-const unsigned short TOOLBAR_writergraphicobjectbar     = 23268;
-const unsigned short TOOLBAR_writernumobjectbar         = 23271;
-const unsigned short TOOLBAR_writeroleobjectbar         = 23272;
-const unsigned short TOOLBAR_writertableobjectbar       = 23266;
-const unsigned short TOOLBAR_writertextobjectbar        = 23265;
-const unsigned short TOOLBAR_writerpreviewobjectbar     = 20631;
-//const unsigned short TOOLBAR_websourceviewobjectbar     = 23282;
-//const unsigned short TOOLBAR_websourceviewtoolbar       = 20412;
-const unsigned short TOOLBAR_webtextobjectbar           = 20403;
-const unsigned short TOOLBAR_writertoolbar              = 23273;
-const unsigned short TOOLBAR_webframeobjectbar          = 20408;
-const unsigned short TOOLBAR_webgraphicobjectbar        = 20410;
-const unsigned short TOOLBAR_weboleobjectbar            = 20411;
-const unsigned short TOOLBAR_webtoolbar                 = 20402;
-//const unsigned short TOOLBAR_BRW_TAB_TOOLBOX            = 19200;
-const unsigned short TOOLBAR_BRW_QRY_TOOLBOX            = 19201;
-//const unsigned short TOOLBAR_QRY_TOOLBOX_SQL            = 19202;
-const unsigned short TOOLBAR_BRW_QUERYDESIGN_TOOLBOX	= 19203;
-const unsigned short TOOLBAR_BRW_REALTIONDESIGN_TOOLBOX	= 19204;
-const unsigned short TOOLBAR_fontworkobjectbar          = 10987;
-const unsigned short TOOLBAR_extrusionobjectbar         = 10986;
-const unsigned short TOOLBAR_writerviewerbar            = 23310;
-const unsigned short TOOLBAR_calcviewerbar              = 25000;
-const unsigned short TOOLBAR_impressviewerbar           = 23023;
-const unsigned short TOOLBAR_drawviewerbar              = 23024;
-
-// Sub-Toolbars
-const unsigned short RID_LIB_START                      = 10000;
-const unsigned short RID_APP_START                      = 20000;
-
-// Draw/Impress
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ALIGNMENT       = RID_APP_START+1;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ALIGNMENT_TBX   = RID_APP_START+5;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ZOOM    		= RID_APP_START+2;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ZOOM_TBX        = RID_APP_START+6;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_CHOOSE_MODE         = RID_APP_START+7;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_CHOOSE_MODE_TBX     = RID_APP_START+8;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_TEXT            = RID_APP_START+10;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_TEXT_TBX	    = RID_APP_START+11;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_RECTANGLES   	= RID_APP_START+12;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_RECTANGLES_TBX  = RID_APP_START+13;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ELLIPSES    	= RID_APP_START+14;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ELLIPSES_TBX 	= RID_APP_START+15;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_LINES       	= RID_APP_START+16;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_LINES_TBX   	= RID_APP_START+17;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_3D_OBJECTS  	= RID_APP_START+18;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_3D_OBJECTS_TBX  = RID_APP_START+19;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_INSERT       	= RID_APP_START+20;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_INSERT_TBX   	= RID_APP_START+21;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_POSITION     	= RID_APP_START+22;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_POSITION_TBX 	= RID_APP_START+23;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_CONNECTORS      = RID_APP_START+24;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_CONNECTORS_TBX  = RID_APP_START+25;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ARROWS      	= RID_APP_START+26;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_ARROWS_TBX   	= RID_APP_START+27;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_GRAFFILTERS   	= RID_APP_START+29;
-const unsigned short SUBTOOLBAR_DRAWIMPRESS_RID_GRAFFILTERS_TBX = RID_APP_START+30;
-
-//Writer
-const unsigned short RID_SW_START = 20000;
-const unsigned short RC_BASE   = RID_SW_START;
-const unsigned short RC_RIBBAR = (RC_BASE + 720);
-const unsigned short RC_RIBBAR_BEGIN = RC_RIBBAR;
-const unsigned short SUBTOOLBAR_WRITER_RID_INSERT_CTRL          = (RC_RIBBAR_BEGIN + 24);
-const unsigned short SUBTOOLBAR_WRITER_TBX_INSERT               = 1;
-const unsigned short SUBTOOLBAR_WRITER_RID_INSERT_OBJ_CTRL      = (RC_RIBBAR_BEGIN + 25);
-const unsigned short SUBTOOLBAR_WRITER_TBX_OBJ_INSERT           = 2;
-const unsigned short SUBTOOLBAR_WRITER_RID_TBL_OPT_CTRL         = (RC_RIBBAR_BEGIN + 27);
-const unsigned short SUBTOOLBAR_WRITER_TBX_OPTIMIZE_TABLE       = 1;
-
-//Calc
-const unsigned short SC_RESOURCE_START                          = (RID_APP_START+5000);
-const unsigned short SUBTOOLBAR_CALC_RID_TBXCTL_INSERT		    = (SC_RESOURCE_START+38);
-const unsigned short SUBTOOLBAR_CALC_RID_TOOLBOX_INSERT         = 1;
-const unsigned short SUBTOOLBAR_CALC_RID_TBXCTL_INSCELLS		= (SC_RESOURCE_START+39);
-const unsigned short SUBTOOLBAR_CALC_RID_TOOLBOX_INSCELLS       = 2;
-const unsigned short SUBTOOLBAR_CALC_RID_TBXCTL_INSOBJ		    = (SC_RESOURCE_START+40);
-const unsigned short SUBTOOLBAR_CALC_RID_TOOLBOX_INSOBJ         = 3;
-
-//Basic
-const unsigned short RID_BASICIDE_START                         = (RID_LIB_START+4850);
-const unsigned short SUBTOOLBAR_BASIC_RID_TBXCONTROLS			= ( RID_BASICIDE_START + 65 );
-const unsigned short SUBTOOLBAR_BASIC_RID_TOOLBOX               = ( RID_BASICIDE_START + 66 );
-
-//Global
-const unsigned short RID_SVX_START                              = (RID_LIB_START);
-const unsigned short SUBTOOLBAR_GLOBAL_RID_SVXTBX_DRAW          = (RID_SVX_START + 189);
-const unsigned short SUBTOOLBAR_GLOBAL_TBX_DRAW                 = 1;
-const unsigned short SUBTOOLBAR_GLOBAL_RID_SVXTBX_ALIGNMENT     = (RID_SVX_START + 190);
-const unsigned short SUBTOOLBAR_GLOBAL_TBX_ALIGNMENT            = 10131; // SID_OBJECT_ALIGN_LEFT
-
-struct KeyIdentifierInfo
-{
-    sal_Int16 Code      ;
-    char*     Identifier;
-};
-        
-KeyIdentifierInfo AWTKeyIdentifierMap[] =
-{
-    {css::awt::Key::NUM0          , "KEY_0"          },
-    {css::awt::Key::NUM1          , "KEY_1"          },
-    {css::awt::Key::NUM2          , "KEY_2"          },
-    {css::awt::Key::NUM3          , "KEY_3"          },
-    {css::awt::Key::NUM4          , "KEY_4"          },
-    {css::awt::Key::NUM5          , "KEY_5"          },
-    {css::awt::Key::NUM6          , "KEY_6"          },
-    {css::awt::Key::NUM7          , "KEY_7"          },
-    {css::awt::Key::NUM8          , "KEY_8"          },
-    {css::awt::Key::NUM9          , "KEY_9"          },
-    {css::awt::Key::A             , "KEY_A"          },
-    {css::awt::Key::B             , "KEY_B"          },
-    {css::awt::Key::C             , "KEY_C"          },
-    {css::awt::Key::D             , "KEY_D"          },
-    {css::awt::Key::E             , "KEY_E"          },
-    {css::awt::Key::F             , "KEY_F"          },
-    {css::awt::Key::G             , "KEY_G"          },
-    {css::awt::Key::H             , "KEY_H"          },
-    {css::awt::Key::I             , "KEY_I"          },
-    {css::awt::Key::J             , "KEY_J"          },
-    {css::awt::Key::K             , "KEY_K"          },
-    {css::awt::Key::L             , "KEY_L"          },
-    {css::awt::Key::M             , "KEY_M"          },
-    {css::awt::Key::N             , "KEY_N"          },
-    {css::awt::Key::O             , "KEY_O"          },
-    {css::awt::Key::P             , "KEY_P"          },
-    {css::awt::Key::Q             , "KEY_Q"          },
-    {css::awt::Key::R             , "KEY_R"          },
-    {css::awt::Key::S             , "KEY_S"          },
-    {css::awt::Key::T             , "KEY_T"          },
-    {css::awt::Key::U             , "KEY_U"          },
-    {css::awt::Key::V             , "KEY_V"          },
-    {css::awt::Key::W             , "KEY_W"          },
-    {css::awt::Key::X             , "KEY_X"          },
-    {css::awt::Key::Y             , "KEY_Y"          },
-    {css::awt::Key::Z             , "KEY_Z"          },
-    {css::awt::Key::F1            , "KEY_F1"         },
-    {css::awt::Key::F2            , "KEY_F2"         },
-    {css::awt::Key::F3            , "KEY_F3"         },
-    {css::awt::Key::F4            , "KEY_F4"         },
-    {css::awt::Key::F5            , "KEY_F5"         },
-    {css::awt::Key::F6            , "KEY_F6"         },
-    {css::awt::Key::F7            , "KEY_F7"         },
-    {css::awt::Key::F8            , "KEY_F8"         },
-    {css::awt::Key::F9            , "KEY_F9"         },
-    {css::awt::Key::F10           , "KEY_F10"        },
-    {css::awt::Key::F11           , "KEY_F11"        },
-    {css::awt::Key::F12           , "KEY_F12"        },
-    {css::awt::Key::F13           , "KEY_F13"        },
-    {css::awt::Key::F14           , "KEY_F14"        },
-    {css::awt::Key::F15           , "KEY_F15"        },
-    {css::awt::Key::F16           , "KEY_F16"        },
-    {css::awt::Key::F17           , "KEY_F17"        },
-    {css::awt::Key::F18           , "KEY_F18"        },
-    {css::awt::Key::F19           , "KEY_F19"        },
-    {css::awt::Key::F20           , "KEY_F20"        },
-    {css::awt::Key::F21           , "KEY_F21"        },
-    {css::awt::Key::F22           , "KEY_F22"        },
-    {css::awt::Key::F23           , "KEY_F23"        },
-    {css::awt::Key::F24           , "KEY_F24"        },
-    {css::awt::Key::F25           , "KEY_F25"        },
-    {css::awt::Key::F26           , "KEY_F26"        },
-    {css::awt::Key::DOWN          , "KEY_DOWN"       },
-    {css::awt::Key::UP            , "KEY_UP"         },
-    {css::awt::Key::LEFT          , "KEY_LEFT"       },
-    {css::awt::Key::RIGHT         , "KEY_RIGHT"      },
-    {css::awt::Key::HOME          , "KEY_HOME"       },
-    {css::awt::Key::END           , "KEY_END"        },
-    {css::awt::Key::PAGEUP        , "KEY_PAGEUP"     },
-    {css::awt::Key::PAGEDOWN      , "KEY_PAGEDOWN"   },
-    {css::awt::Key::RETURN        , "KEY_RETURN"     },
-    {css::awt::Key::ESCAPE        , "KEY_ESCAPE"     },
-    {css::awt::Key::TAB           , "KEY_TAB"        },
-    {css::awt::Key::BACKSPACE     , "KEY_BACKSPACE"  },
-    {css::awt::Key::SPACE         , "KEY_SPACE"      },
-    {css::awt::Key::INSERT        , "KEY_INSERT"     },
-    {css::awt::Key::DELETE        , "KEY_DELETE"     },
-    {css::awt::Key::ADD           , "KEY_ADD"        },
-    {css::awt::Key::SUBTRACT      , "KEY_SUBTRACT"   },
-    {css::awt::Key::MULTIPLY      , "KEY_MULTIPLY"   },
-    {css::awt::Key::DIVIDE        , "KEY_DIVIDE"     },
-    {css::awt::Key::POINT         , "KEY_POINT"      },
-    {css::awt::Key::COMMA         , "KEY_COMMA"      },
-    {css::awt::Key::LESS          , "KEY_LESS"       },
-    {css::awt::Key::GREATER       , "KEY_GREATER"    },
-    {css::awt::Key::EQUAL         , "KEY_EQUAL"      },
-    {css::awt::Key::OPEN          , "KEY_OPEN"       },
-    {css::awt::Key::CUT           , "KEY_CUT"        },
-    {css::awt::Key::COPY          , "KEY_COPY"       },
-    {css::awt::Key::PASTE         , "KEY_PASTE"      },
-    {css::awt::Key::UNDO          , "KEY_UNDO"       },
-    {css::awt::Key::REPEAT        , "KEY_REPEAT"     },
-    {css::awt::Key::FIND          , "KEY_FIND"       },
-    {css::awt::Key::PROPERTIES    , "KEY_PROPERTIES" },
-    {css::awt::Key::FRONT         , "KEY_FRONT"      },
-    {css::awt::Key::CONTEXTMENU   , "KEY_CONTEXTMENU"},
-    {css::awt::Key::HELP          , "KEY_HELP"       },
-    {css::awt::Key::MENU          , "KEY_MENU"       },
-    {css::awt::Key::HANGUL_HANJA  , "KEY_HANGUL_HANJA"},
-    {css::awt::Key::DECIMAL       , "KEY_DECIMAL"    },
-    {css::awt::Key::TILDE         , "KEY_TILDE"      },
-    {css::awt::Key::QUOTELEFT     , "KEY_QUOTELEFT"  },
-    {0                            , ""               } // mark the end of this array!
-};                             
-
-struct ISO_code
-{
-    const char* pLanguage;
-    const char* pCountry;
-};
-
-const int NUM_LANGUAGES = 27;
-//const int NUM_LANGUAGES = 1;
-
-ISO_code Language_codes[] =
-{
-    { "de", ""       },
-    { "en", "US"     },
-    { "ar", ""       },
-    { "no", ""       },
-    { "ca", ""       },
-    { "zh", "TW"     },
-    { "cs", ""       },
-    { "da", ""       },
-    { "el", ""       },
-    { "es", ""       },
-    { "fi", ""       },
-    { "fr", ""       },
-    { "he", ""       },
-    { "it", ""       },
-    { "ja", ""       },
-    { "ko", ""       },
-    { "nl", ""       },
-    { "pl", ""       },
-    { "pt", "BR"     },
-    { "ru", ""       },
-    { "sk", ""       },
-    { "sv", ""       },
-    { "th", ""       },
-    { "tr", ""       },
-    { "hi", ""       },
-    { "zh", "CN"     },
-    { "pt", ""       },
-    { 0,  0          }
-};
-
-enum MODULES
-{
-    MODULE_GLOBAL,
-    MODULE_WRITER,
-    MODULE_CALC,
-    MODULE_DRAWIMPRESS,
-    MODULE_CHART,
-    MODULE_MATH,
-    MODULE_BASIC,
-    MODULE_BIBLIO,
-    MODULE_BACKINGCOMP,
-    MODULE_DBACCESS,
-    MODULE_COUNT
-};
-
-enum SUBMODULES
-{
-    SUBMODULE_GLOBAL       = 1,
-    SUBMODULE_WRITER       = 2,
-    SUBMODULE_WRITERWEB    = 4,
-    SUBMODULE_WRITERGLOBAL = 8,
-    SUBMODULE_CALC         = 16,
-    SUBMODULE_DRAW         = 32,
-    SUBMODULE_IMPRESSS     = 64,
-    SUBMODULE_CHART        = 128,
-    SUBMODULE_MATH         = 256,
-    SUBMODULE_BASIC        = 512,
-    SUBMODULE_BIBLIO       = 1024,
-    SUBMODULE_BACKINGCOMP  = 2048,
-    SUBMODULE_DB_TABLE     = 4096,
-    SUBMODULE_DB_QUERY     = 8192,
-    SUBMODULE_DB_RELATION  = 16384
-};
-
-enum PARENT_RESTYPES
-{
-    PARENT_RESTYPE_FLOATINGWINDOW
-};
-
-struct Projects
-{
-    const char* pProjectFolder;
-    const char* pResPrefix;
-    const char* pCSVPrefix;
-    bool        bSlotCommands;
-    MODULES     eBelongsTo;
-};
-
-Projects ProjectModule_Mapping[] =
-{
-    { "sfx2"        , "sfx",    "sfx2",     true,   MODULE_GLOBAL         },
-    { "svx"         , "svx",    "svx",      true,   MODULE_GLOBAL         },
-    { "svx"         , "ofa",    "ofa",      true,   MODULE_GLOBAL         },
-    { "sw"          , "sw",     "sw",       true,   MODULE_WRITER         },
-    { "sd"          , "sd",     "sd",       true,   MODULE_DRAWIMPRESS    },
-    { "sc"          , "sc",     "sc",       true,   MODULE_CALC           },
-    { "sch"         , "sch",    "sch",      true,   MODULE_CHART          },
-    { "starmath"    , "sm",     "starmath", true,   MODULE_MATH           },
-    { "basctl"      , "basctl", "bastctl",  true,   MODULE_BASIC          },
-    { "extensions"  , "bib",    "",         false,  MODULE_BIBLIO         },
-    { "offmgr"      , "ofa",    "",         false,  MODULE_BACKINGCOMP    },
-    { "dbaccess"    , "dbu",    "",         false,  MODULE_DBACCESS       },
-    { 0             , 0,        "",         false,  MODULE_BASIC          }
-};
-
-const char XMLFileExtension[] = ".xcu";
-const char* ModuleToXML_Mapping[] =
-{
-    "GenericCommands",
-    "WriterCommands",
-    "CalcCommands",
-    "DrawImpressCommands",
-    "ChartCommands",
-    "MathCommands",
-    "BasicIDECommands",
-    "BibliographyCommands",
-    "StartModuleCommands",
-    "DbuCommands",
-    0
-};
-
-struct ResourceToModule
-{
-    unsigned short nResId;
-    const char*    pXMLPrefix;
-    MODULES        eBelongsTo;
-    bool           bWritten;
-};
-
-struct SubResourceToModule
-{
-    unsigned short  nParentResId;
-    PARENT_RESTYPES eParentResType;
-    unsigned short  nResId;
-    const char*     pXMLPrefix;
-    MODULES         eBelongsTo;
-    bool            bWritten;
-};
-
-ResourceToModule ResourceModule_Mapping[] =
-{
-    { MENUBAR_GLOBAL,           "default",      MODULE_GLOBAL       },  // important: To prevent duplicate popup menu entries make sure this is the first entry!!
-    { MENUBAR_BASIC,            "basic",        MODULE_BASIC        },
-    { MENUBAR_WRITER,           "writer",       MODULE_WRITER       },
-    { MENUBAR_WRITERWEB,        "web",          MODULE_WRITER       },
-    { MENUBAR_WRITERGLOBAL,     "global",       MODULE_WRITER       },
-    { MENUBAR_CALC,             "calc",         MODULE_CALC         },
-    { MENUBAR_DRAW,             "draw",         MODULE_DRAWIMPRESS  },
-    { MENUBAR_CHART,            "chart",        MODULE_CHART        },
-    { MENUBAR_MATH,             "math",         MODULE_MATH         },
-    { MENUBAR_IMPRESS,          "impress",      MODULE_DRAWIMPRESS  },
-    { MENUBAR_BIBLIOGRAPHY,     "biblio",       MODULE_BIBLIO       },
-    { MENUBAR_BACKINGCOMP,      "backing",      MODULE_BACKINGCOMP  },
-    { MENUBAR_DBACCESS_TABLE,   "dbtable",      MODULE_DBACCESS     },
-    { MENUBAR_DBACCESS_QUERY,   "dbquery",      MODULE_DBACCESS     },
-    { MENUBAR_DBACCESS_RELATION,"dbrelation",   MODULE_DBACCESS     },
-    { 0,                        "",             MODULE_DBACCESS     }
-};
-
-
-ResourceToModule AccResourceModule_Mapping[] =
-{
-    { ACC_GLOBAL,           "default",      MODULE_GLOBAL       },
-    { ACC_WRITER,           "writer",       MODULE_WRITER       },
-    { ACC_WRITERWEB,        "web",          MODULE_WRITER       },
-    { ACC_WRITERGLOBAL,     "global",       MODULE_WRITER       },
-    { ACC_CALC,             "calc",         MODULE_CALC         },
-    { ACC_DRAW,             "draw",         MODULE_DRAWIMPRESS  },
-    { ACC_CHART,            "chart",        MODULE_CHART        },
-    { ACC_MATH,             "math",         MODULE_MATH         },
-    { ACC_IMPRESS,          "impress",      MODULE_DRAWIMPRESS  },
-    { ACC_BIBLIOGRAPHY,     "biblio",       MODULE_BIBLIO       }, // 0
-    { ACC_BACKINGCOMP,      "backing",      MODULE_BACKINGCOMP  }, // 0
-    { ACC_DBACCESS_TABLE,   "dbtable",      MODULE_DBACCESS     }, // 0
-    { ACC_DBACCESS_QUERY,   "dbquery",      MODULE_DBACCESS     }, // 0
-    { ACC_DBACCESS_RELATION,"dbrelation",   MODULE_DBACCESS     }, // 0
-    { ACC_BASIC,            "basic",        MODULE_BASIC        }, // 0
-    { 0,                    "",             MODULE_COUNT        }
-};
-
-ResourceToModule TBResourceModule_Mapping[] =
-{
-    { TOOLBAR_functionbar                   ,"standardbar",                 MODULE_GLOBAL        , false        },
-    { TOOLBAR_fullscreenbar                 ,"fullscreenbar",               MODULE_GLOBAL        , false        },
-    { TOOLBAR_macrobar                      ,"macrobar",                    MODULE_BASIC         , false        },
-    { TOOLBAR_formsnavigationbar            ,"formsnavigationbar",          MODULE_GLOBAL        , false        },
-    { TOOLBAR_formsfilterbar                ,"formsfilterbar",              MODULE_GLOBAL        , false        },
-    { TOOLBAR_fontworkobjectbar             ,"fontworkobjectbar",           MODULE_GLOBAL        , false        },
-    { TOOLBAR_extrusionobjectbar            ,"extrusionobjectbar",          MODULE_GLOBAL        , false        },
-    { TOOLBAR_mathtoolbar                   ,"mathtoolbar",                 MODULE_MATH          , false        },
-//    { TOOLBAR_chartobjectbar                ,"chartobjectbar",              MODULE_CHART         , false        },
-    { TOOLBAR_charttoolbar                  ,"charttoolbar",                MODULE_CHART         , false        },
-    { TOOLBAR_calctextobjectbar             ,"calctextobjectbar",           MODULE_CALC          , false        },
-    { TOOLBAR_calcformsobjectbar            ,"calcformsobjectbar",          MODULE_CALC          , false        },
-    { TOOLBAR_calcdrawobjectbar             ,"calcdrawobjectbar",           MODULE_CALC          , false        },
-    { TOOLBAR_calcgrapicobjectbar           ,"calcgrapicobjectbar",         MODULE_CALC          , false        },
-    { TOOLBAR_calcformatobjectbar	        ,"calcformatobjectbar",         MODULE_CALC          , false        },
-    { TOOLBAR_calcpreviewbar                ,"calcpreviewbar",              MODULE_CALC          , false        },
-    { TOOLBAR_calctoolbar                   ,"calctoolbar",                 MODULE_CALC          , false        },
-    { TOOLBAR_drawbezierobjectbar           ,"drawbezierobjectbar",         MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawgluepointsobjectbar       ,"drawgluepointsobjectbar",     MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impressgraphicobjectbar       ,"impressgraphicobjectbar",     MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawdrawingobjectbar          ,"drawdrawingobjectbar",        MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impresstextobjectbar          ,"impresstextobjectbar",        MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawtextobjectbar             ,"drawtextobjectbar",           MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impresstoolbar                ,"impresstoolbar",              MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impressoptionsbar             ,"impressoptionsbar",           MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impresscommontaskbar          ,"impresscommontaskbar",        MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawtoolbar                   ,"drawtoolbar",                 MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawoptionsbar                ,"drawoptionsbar",              MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawgraphicobjectbar          ,"drawgraphicobjectbar",        MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impressoutlinetoolbar         ,"impressoutlinetoolbar",       MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impressslideviewtoolbar       ,"impressslideviewtoolbar",     MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_impressslideviewobjectbar     ,"impressslideviewobjectbar",   MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_writerbezierobjectbar         ,"writerbezierobjectbar",       MODULE_WRITER        , false        },
-    { TOOLBAR_writerdrawingobjectbar        ,"writerdrawingobjectbar",      MODULE_WRITER        , false        },
-    { TOOLBAR_writerformsobjectbar          ,"writerformsobjectbar",        MODULE_WRITER        , false        },
-    { TOOLBAR_writerdrawtextobjectbar       ,"writerdrawtextobjectbar",     MODULE_WRITER        , false        },
-    { TOOLBAR_writerframeobjectbar          ,"writerframeobjectbar",        MODULE_WRITER        , false        },
-    { TOOLBAR_writergraphicobjectbar        ,"writergraphicobjectbar",      MODULE_WRITER        , false        },
-    { TOOLBAR_writernumobjectbar            ,"writernumobjectbar",          MODULE_WRITER        , false        },
-    { TOOLBAR_writeroleobjectbar            ,"writeroleobjectbar",          MODULE_WRITER        , false        },
-    { TOOLBAR_writertableobjectbar          ,"writertableobjectbar",        MODULE_WRITER        , false        },
-    { TOOLBAR_writertextobjectbar           ,"writertextobjectbar",         MODULE_WRITER        , false        },
-    { TOOLBAR_writerpreviewobjectbar        ,"writerpreviewobjectbar",      MODULE_WRITER        , false        },
-//    { TOOLBAR_websourceviewobjectbar        ,"websourceviewobjectbar",      MODULE_WRITER        , false        },
-//    { TOOLBAR_websourceviewtoolbar          ,"websourceviewtoolbar",        MODULE_WRITER        , false        },
-    { TOOLBAR_webtextobjectbar              ,"webtextobjectbar",            MODULE_WRITER        , false        },
-    { TOOLBAR_writertoolbar                 ,"writertoolbar",               MODULE_WRITER        , false        },
-    { TOOLBAR_webframeobjectbar             ,"webframeobjectbar",           MODULE_WRITER        , false        },
-    { TOOLBAR_webgraphicobjectbar           ,"webgraphicobjectbar",         MODULE_WRITER        , false        },
-    { TOOLBAR_weboleobjectbar               ,"weboleobjectbar",             MODULE_WRITER        , false        },
-    { TOOLBAR_webtoolbar                    ,"webtoolbar",                  MODULE_WRITER        , false        },
-//    { TOOLBAR_BRW_TAB_TOOLBOX               ,"dbtablebrowsebar",            MODULE_DBACCESS      , false        },
-    { TOOLBAR_BRW_QRY_TOOLBOX               ,"dbquerybrowsebar",            MODULE_DBACCESS      , false        },
-//    { TOOLBAR_QRY_TOOLBOX_SQL               ,"dbquerysqlbar",               MODULE_DBACCESS      , false        },
-    { TOOLBAR_BRW_QUERYDESIGN_TOOLBOX       ,"dbquerydesignbar",            MODULE_DBACCESS      , false        },
-    { TOOLBAR_BRW_REALTIONDESIGN_TOOLBOX    ,"dbrelationbrowsebar",         MODULE_DBACCESS      , false        },
-    { TOOLBAR_writerviewerbar               ,"writerviewerbar",             MODULE_WRITER        , false        },
-    { TOOLBAR_calcviewerbar                 ,"calcviewerbar",               MODULE_CALC          , false        },
-    { TOOLBAR_impressviewerbar              ,"impressviewerbar",            MODULE_DRAWIMPRESS   , false        },
-    { TOOLBAR_drawviewerbar                 ,"drawviewerbar",               MODULE_DRAWIMPRESS   , false        },
-    { 0                                     ,"",                            MODULE_GLOBAL        , false        }
-};
-
-struct SubResourceToModule TBSubResourceModule_Mapping[] =
-{
-    { SUBTOOLBAR_DRAWIMPRESS_RID_ALIGNMENT,   PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_ALIGNMENT_TBX     , "drawimpressalignmentbar"   ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_ZOOM,        PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_ZOOM_TBX          , "drawimpresszoombar"        ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_CHOOSE_MODE,     PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_CHOOSE_MODE_TBX       , "drawimpresschoosemodebar"  ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_TEXT,        PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_TEXT_TBX	      , "drawimpresstextbar"        ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_RECTANGLES,  PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_RECTANGLES_TBX    , "drawimpressrectanglebar"   ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_ELLIPSES,    PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_ELLIPSES_TBX 	  , "drawimpressellipsesbar"    ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_LINES,       PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_LINES_TBX   	  , "drawimpresslinesbar"       ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_3D_OBJECTS,  PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_3D_OBJECTS_TBX    , "drawimpress3dobjectsbar"   ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_INSERT,      PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_INSERT_TBX   	  , "drawimpressinsertbar"      ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_POSITION,    PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_POSITION_TBX 	  , "drawimpresspositionbar"    ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_CONNECTORS,  PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_CONNECTORS_TBX    , "drawimpressconnectorsbar"  ,   MODULE_DRAWIMPRESS  , false },
-    { SUBTOOLBAR_DRAWIMPRESS_RID_ARROWS,      PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_ARROWS_TBX   	  , "drawimpressarrowsbar"      ,   MODULE_DRAWIMPRESS  , false },
-//    { SUBTOOLBAR_DRAWIMPRESS_RID_GRAFFILTERS, PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_DRAWIMPRESS_RID_GRAFFILTERS_TBX   , "drawimpressgraffiltersbar" ,   MODULE_DRAWIMPRESS, false },
-    { SUBTOOLBAR_WRITER_RID_INSERT_CTRL     , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_WRITER_TBX_INSERT                 , "writerinsertbar"           ,   MODULE_WRITER       , false },
-    { SUBTOOLBAR_WRITER_RID_INSERT_OBJ_CTRL , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_WRITER_TBX_OBJ_INSERT             , "writerinsertobjectbar"     ,   MODULE_WRITER       , false },
-    { SUBTOOLBAR_WRITER_RID_TBL_OPT_CTRL    , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_WRITER_TBX_OPTIMIZE_TABLE         , "writeroptimizetablebar"    ,   MODULE_WRITER       , false },
-    { SUBTOOLBAR_GLOBAL_RID_SVXTBX_DRAW     , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_GLOBAL_TBX_DRAW                   , "genericdrawbar"            ,   MODULE_GLOBAL       , false },
-    { SUBTOOLBAR_GLOBAL_RID_SVXTBX_ALIGNMENT, PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_GLOBAL_TBX_ALIGNMENT              , "genericalignmentbar"       ,   MODULE_GLOBAL       , false },
-    { SUBTOOLBAR_CALC_RID_TBXCTL_INSERT	    , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_CALC_RID_TOOLBOX_INSERT           , "calcinsertbar"             ,   MODULE_CALC         , false },
-    { SUBTOOLBAR_CALC_RID_TBXCTL_INSCELLS   , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_CALC_RID_TOOLBOX_INSCELLS         , "calcinsertcellsbar"        ,   MODULE_CALC         , false },
-    { SUBTOOLBAR_CALC_RID_TBXCTL_INSOBJ	    , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_CALC_RID_TOOLBOX_INSOBJ           , "calcinsertobjectbar"       ,   MODULE_CALC         , false },
-    { SUBTOOLBAR_BASIC_RID_TBXCONTROLS      , PARENT_RESTYPE_FLOATINGWINDOW, SUBTOOLBAR_BASIC_RID_TOOLBOX                 , "basicinsertcontrolsbar"    ,   MODULE_BASIC        , false },
-    { 0,                                      PARENT_RESTYPE_FLOATINGWINDOW, 0                                            , ""                          ,   MODULE_GLOBAL       , false }
-};
-
-struct CommandLabels
-{
-    unsigned short  nID;
-    bool            bWritten;
-    bool            bPopupMenu;
-    rtl::OUString   aCommand;
-    unsigned long   nModules;
-    rtl::OUString   aLabels[NUM_LANGUAGES];
-    unsigned long   nProperties;
-
-    CommandLabels() :
-    nID( 0 ),
-    bWritten( false ),
-    bPopupMenu( false ),
-    nModules( 0 ),
-    nProperties( 0 )
-
-    {}
-};
-
-struct KeyCommandInfo
-{
-    KeyCode aVCLKey;
-    css::awt::KeyEvent aAWTKey;
-    ::rtl::OUString sCommand;
-    ::rtl::OUString sKey;
-    USHORT nCommandId;
-    
-    bool operator==(const KeyCommandInfo& rI) const
-    {
-        return (
-                   (rI.aVCLKey    == aVCLKey) &&
-                   (rI.aAWTKey.KeyCode    == aAWTKey.KeyCode) &&
-                   (rI.aAWTKey.Modifiers    == aAWTKey.Modifiers) &&
-                   (rI.sCommand   == sCommand) &&
-                   (rI.sKey       == sKey) &&
-                   (rI.nCommandId == nCommandId)
-               );
-    }
-};
-
-struct ToolBarInfo
-{
-    unsigned short nID;
-    bool           bWritten;
-    unsigned long  nModules; // Which sub modules need this toolbar
-    rtl::OUString  aUIName[NUM_LANGUAGES];
-
-    ToolBarInfo() :
-        nID( 0 ),
-        bWritten( false ),
-        nModules( 0 ) {}
-};
-
-struct OUStringHashCode
-{
-    size_t operator()( const ::rtl::OUString& sString ) const
-    {
-        return sString.hashCode();
-    }
-};
-
-typedef std::hash_map< int, CommandLabels > CommandIDToLabelsMap;
-typedef std::hash_map< OUString, CommandLabels, OUStringHashCode, ::std::equal_to< OUString > > CommandToLabelsMap;
-typedef std::hash_map< int, ToolBarInfo > ResIdToToolBarInfoMap;
-typedef std::vector< KeyCommandInfo > KeyCommandInfoList;
-typedef std::hash_map< int, KeyCommandInfoList > Locale2KeyCommandInfoList;
-
-static CommandIDToLabelsMap     moduleMapFiles[MODULE_COUNT];
-static CommandToLabelsMap       modulePopupMenusCmd[MODULE_COUNT];
-static Locale2KeyCommandInfoList moduleAccs[MODULE_COUNT];
-
-bool ExtractVersionNumber( const OUString& rVersion, OUString& rVersionNumber )
-{
-    bool bCheckNumOnly( false );
-
-    OUStringBuffer aBuf;
-
-    rVersionNumber = OUString();
-    for ( int i = 0; i < rVersion.getLength(); i++ )
-    {
-        if ( rVersion[i] >= sal_Unicode( '0' ) && rVersion[i] <= sal_Unicode( '9' ))
-        {
-            bCheckNumOnly = true;
-            aBuf.append( rVersion[i] );
-        }
-        else if ( bCheckNumOnly )
-            return false;
-    }
-
-    rVersionNumber = aBuf.makeStringAndClear();
-    return true;
-}
-
-bool ReadCSVFile( const OUString& aCVSFileURL, MODULES eModule, const OUString& aProjectName )
-{
-    osl::File  aCSVFile( aCVSFileURL );
-    fprintf(stdout, "############ read csv \"%s\" ... ", ::rtl::OUStringToOString(aCVSFileURL, RTL_TEXTENCODING_UTF8).getStr());
-    if ( aCSVFile.open( OpenFlag_Read ) != osl::FileBase::E_None )
-    {
-        fprintf(stdout, "failed!\n");
-        return false;
-    }
-    fprintf(stdout, "OK!\n");
-    
-    {
-        sal_Bool            bEOF;
-        ::rtl::ByteSequence aCSVLine;
-        OUString            aUnoCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-
-        while ( aCSVFile.isEndOfFile( &bEOF ) == osl::FileBase::E_None && !bEOF )
-        {
-            aCSVFile.readLine( aCSVLine );
-
-            OString     aLine( (const char *)aCSVLine.getConstArray(), aCSVLine.getLength() );
-            OString     aID;
-            OString     aAccelState;
-            OString     aMenuState;
-            OString     aStatusState;
-            OString     aToolbarState;
-            OString     aCmdName;
-            OString     aSlotName;
-            OString     aImageRotationState;
-            OString     aImageReflectionState;
-
-            sal_Int32 nIndex = 0;
-            aID                     = aLine.getToken( 2, ',', nIndex );
-            aAccelState             = aLine.getToken( 2, ',', nIndex );
-            aMenuState              = aLine.getToken( 0, ',', nIndex );
-            aStatusState            = aLine.getToken( 0, ',', nIndex );
-            aToolbarState           = aLine.getToken( 0, ',', nIndex );
-            aImageRotationState     = aLine.getToken( 8, ',', nIndex );
-            aImageReflectionState   = aLine.getToken( 0, ',', nIndex );
-            aCmdName                = aLine.getToken( 10, ',', nIndex );
-            aSlotName               = aLine.getToken( 1, ',', nIndex );
-
-            if ( aCmdName.getLength() == 0 )
-                aCmdName = aSlotName;
-
-            int nID = aID.toInt32();
-
-            if ( nID > 5000 && ( aAccelState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                                 aMenuState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                                 aStatusState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                                 aToolbarState.equalsIgnoreAsciiCase( "TRUE" ) ))
-            {
-                CommandLabels aCmdLabel;
-
-                aCmdLabel.nID = nID;
-                aCmdLabel.aCommand = aUnoCmd;
-                aCmdLabel.aCommand += OStringToOUString( aCmdName, RTL_TEXTENCODING_ASCII_US );
-                aCmdLabel.nModules |= ( 1 << (unsigned long)( eModule ));
-
-                // Set bitfield
-                aCmdLabel.nProperties = (( aImageRotationState.equalsIgnoreAsciiCase( "TRUE" ) ? 1 : 0 ) << 1 );
-                aCmdLabel.nProperties |= (( aImageReflectionState.equalsIgnoreAsciiCase( "TRUE" ) ? 1 : 0 ) << 2 );
-
-                moduleMapFiles[int(eModule)].insert( CommandIDToLabelsMap::value_type( nID, aCmdLabel ));
-                modulePopupMenusCmd[int(eModule)].insert( CommandToLabelsMap::value_type( aCmdLabel.aCommand, aCmdLabel ));
-            }
-        }
-
-        aCSVFile.close();
-    }
-
-    return true;
-}
-
-CommandLabels* RetrieveCommandLabelsFromID( unsigned short nId, MODULES eModule )
-{
-    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[MODULE_GLOBAL].find( nId );
-    if ( pIter != moduleMapFiles[MODULE_GLOBAL].end() )
-        return &(pIter->second);
-    else if ( eModule != MODULE_GLOBAL )
-    {
-        CommandIDToLabelsMap::iterator pIter = moduleMapFiles[eModule].find( nId );
-        if ( pIter != moduleMapFiles[eModule].end() )
-            return &(pIter->second);
-    }
-
-    return NULL;
-}
-
-CommandLabels* RetrieveCommandLabelsFromCommand( const OUString& aCommand, MODULES eModule )
-{
-    CommandToLabelsMap::iterator pIter = modulePopupMenusCmd[MODULE_GLOBAL].find( aCommand );
-    if ( pIter != modulePopupMenusCmd[MODULE_GLOBAL].end() )
-        return &(pIter->second);
-    else if ( eModule != MODULE_GLOBAL )
-    {
-        CommandToLabelsMap::iterator pIter = modulePopupMenusCmd[eModule].find( aCommand );
-        if ( pIter != modulePopupMenusCmd[eModule].end() )
-            return &(pIter->second);
-    }
-
-    return NULL;
-}
-
-void AddCommandLabelsToIDHashMap( MODULES eModule, const CommandLabels& rNewCmdLabels )
-{
-    moduleMapFiles[int(eModule)].insert( CommandIDToLabelsMap::value_type( rNewCmdLabels.nID, rNewCmdLabels ));
-}
-
-void AddCommandLabelsToCommandHashMap( MODULES eModule, const CommandLabels& rNewCmdLabels )
-{
-    modulePopupMenusCmd[int(eModule)].insert( CommandToLabelsMap::value_type( rNewCmdLabels.aCommand, rNewCmdLabels ));
-}
-
-KeyCode impl_KeyCodeAWT2VCL(const css::awt::KeyEvent& aAWTKey)
-{
-    BOOL   bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
-    BOOL   bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
-    BOOL   bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
-    BOOL   bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
-    USHORT nKey   = (USHORT)aAWTKey.KeyCode;
-    // unfortunately MENU and CONTEXTMENU are twisted between vcl and awt
-    if( aAWTKey.KeyCode == css::awt::Key::MENU )
-        nKey = KEY_CONTEXTMENU;
-    else if( aAWTKey.KeyCode == css::awt::Key::CONTEXTMENU )
-        nKey = KEY_MENU;
-    return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
-}
-
-css::awt::KeyEvent impl_KeyCodeVCL2AWT(const KeyCode& aVCLKey)
-{
-    css::awt::KeyEvent aAWTKey;
-    aAWTKey.Modifiers = 0;
-    aAWTKey.KeyCode   = (sal_Int16)aVCLKey.GetCode();
-    // unfortunately MENU and CONTEXTMENU are twisted between vcl and awt
-    if( aAWTKey.KeyCode == css::awt::Key::MENU )
-        aAWTKey.KeyCode = css::awt::Key::CONTEXTMENU;
-    else if( aAWTKey.KeyCode == css::awt::Key::CONTEXTMENU )
-        aAWTKey.KeyCode = css::awt::Key::MENU;
-    
-    if (aVCLKey.IsShift())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; 
-    if (aVCLKey.IsMod1())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; 
-    if (aVCLKey.IsMod2())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
-        if (aVCLKey.IsMod3())
-        aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
-    
-    return aAWTKey;    
-}
-
-bool impl_isDuplicateKey(const KeyCommandInfoList& rList,
-                         const KeyCommandInfo&     aInfo)
-{                        
-    KeyCommandInfoList::const_iterator pInfo;
-    KeyCommandInfoList::const_iterator aEnd = rList.end();
-    for (  pInfo  = rList.begin();
-           pInfo != aEnd  ;
-         ++pInfo                 )
-    {
-        if (
-            (pInfo->aVCLKey    == aInfo.aVCLKey   ) &&
-            (pInfo->nCommandId == aInfo.nCommandId)
-           )
-        {
-            return true;           
-        }
-    }         
-    return false;
-}
-
-bool ReadAccelerators( int nLangIndex, ResMgr* pResMgr, MODULES eModule, const ::rtl::OUString& aProjectName, Accelerator* pAcc )
-{
-    Locale2KeyCommandInfoList& rLocale = moduleAccs[eModule];
-    KeyCommandInfoList&        rAccs   = rLocale[nLangIndex];              
-    
-    USHORT c = pAcc->GetItemCount();
-    rAccs.reserve(rAccs.size()+c);
-    USHORT i = 0;
-    for (i=0; i<c; ++i)
-    {
-        USHORT nItem = pAcc->GetItemId(i);
-        
-        KeyCommandInfo aInfo;
-        aInfo.nCommandId = nItem;  
-        aInfo.aVCLKey    = pAcc->GetItemKeyCode(i); // dont use GetKeyCode(nItem) ... You cant handle logic keys then. Because they have the same ID - but another keycode!
-        aInfo.aAWTKey    = impl_KeyCodeVCL2AWT(aInfo.aVCLKey);
-
-        fprintf(stdout, "     acc key=%d\tid=%d", aInfo.aVCLKey.GetFullCode(), aInfo.nCommandId);
-        CommandLabels* pCmdInfo = RetrieveCommandLabelsFromID(aInfo.nCommandId, eModule);
-        if (!pCmdInfo || !pCmdInfo->aCommand.getLength())
-        {
-            fprintf(stdout, "\t\t\t=>\tERROR\t: no command [mod=%d]\n", eModule);
-            continue;
-        }
-        aInfo.sCommand = pCmdInfo->aCommand;
-        fprintf(stdout, "\tcmd=%s\t=>\t", ::rtl::OUStringToOString(aInfo.sCommand, RTL_TEXTENCODING_UTF8).getStr());
-        
-        sal_Int32 i = 0;
-        while(AWTKeyIdentifierMap[i].Code != 0)
-        {
-            const KeyIdentifierInfo& rKeyInfo = AWTKeyIdentifierMap[i];
-            if (aInfo.aAWTKey.KeyCode == rKeyInfo.Code)
-            {
-                aInfo.sKey = ::rtl::OUString::createFromAscii(rKeyInfo.Identifier);
-                break;
-            }
-            ++i;
-        }
-
-        if (!aInfo.sKey.getLength())
-        {
-            fprintf(stdout, "ERROR\t: no key identifier\n");
-            continue;
-        }
-        
-        if (impl_isDuplicateKey(rAccs, aInfo))
-        {
-            fprintf(stdout, "WARNING\t: key is duplicate\n");
-            continue;
-        }
-        
-        fprintf(stdout, "\n");
-        rAccs.push_back(aInfo);
-    }
-    
-    return true;
-}
-
-bool ReadMenuLabels( int nLangIndex, Menu* pMenu, MODULES eModule, bool bHasSlotInfos, OUString aResourceFilePrefix )
-{
-    OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-
-    for ( unsigned short n = 0; n < pMenu->GetItemCount(); n++ )
-    {
-        unsigned short nId = pMenu->GetItemId( n );
-        if ( pMenu->GetItemType( n ) != MENUITEM_SEPARATOR )
-        {
-            OUString aLabel( pMenu->GetItemText( nId ));
-            OUString aCommand( pMenu->GetItemCommand( nId ));
-            bool     bHasUnoCommand( aCommand.getLength() > 0 && ( aCommand.indexOf( aCmd ) == 0 ));
-
-            if ( pMenu->GetPopupMenu( nId ) != 0 )
-            {
-                CommandLabels* pCmdLabels = 0;
-                // Special popup menus have ID's between 5000-10000. Apps uses various ID's from their number area =>
-                // don't use ID if outside this area, you can accidently map popups to functions!!
-                if (( nId > 5000 ) && ( nId < 10000 ))
-                    pCmdLabels = RetrieveCommandLabelsFromID( nId, eModule );
-                if ( !pCmdLabels )
-                    pCmdLabels = RetrieveCommandLabelsFromCommand( aCommand, eModule );
-
-                if ( pCmdLabels )
-                {
-                    pCmdLabels->aLabels[nLangIndex] = aLabel;
-                    pCmdLabels->bPopupMenu = true;
-                }
-                else
-                {
-                    if ( bHasUnoCommand )
-                    {
-                        CommandLabels aCmdLabels;
-
-                        aCmdLabels.nID = 0;
-                        aCmdLabels.aCommand = aCommand;
-                        aCmdLabels.aLabels[nLangIndex] = aLabel;
-                        aCmdLabels.bPopupMenu = true;
-                        AddCommandLabelsToCommandHashMap( eModule, aCmdLabels );
-                    }
-                    else
-                    {
-                        fprintf( stderr, "Popup menu (resource = %s ) with unknown uno-command and id '%s', ID = %d, aCmd = %s\n",
-                            OUStringToOString( aResourceFilePrefix, RTL_TEXTENCODING_UTF8 ).getStr(),
-                            OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr(),
-                            nId,
-                            OUStringToOString( aCommand, RTL_TEXTENCODING_ASCII_US ).getStr() );
-                    }
-                }
-
-                ReadMenuLabels( nLangIndex, pMenu->GetPopupMenu( nId ), eModule, bHasSlotInfos, aResourceFilePrefix );
-            }
-            else
-            {
-                if ( bHasSlotInfos )
-                {
-                    CommandLabels* pCmdLabels = RetrieveCommandLabelsFromID( nId, eModule );
-                    if ( !pCmdLabels )
-                        pCmdLabels = RetrieveCommandLabelsFromCommand( aCommand, eModule );
-
-                    if ( pCmdLabels )
-                        pCmdLabels->aLabels[nLangIndex] = aLabel;
-                    else if ( bHasUnoCommand )
-                    {
-                        CommandLabels aCmdLabels;
-
-                        aCmdLabels.nID = ( nId > 5000 ) ? nId : 0;
-                        aCmdLabels.aCommand = aCommand;
-                        aCmdLabels.aLabels[nLangIndex] = aLabel;
-                        AddCommandLabelsToCommandHashMap( eModule, aCmdLabels );
-                        if ( nId > 5000 )
-                            AddCommandLabelsToIDHashMap( eModule, aCmdLabels );
-                   }
-                   else
-                   {
-                        fprintf( stderr, "Menu item with unknown uno-command and id '%s', ID = %d, aCmd = %s\n",
-                            OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr(),
-                            nId,
-                            OUStringToOString( aCommand, RTL_TEXTENCODING_ASCII_US ).getStr() );
-                   }
-                }
-                else if ( bHasUnoCommand )
-                {
-                    CommandLabels* pCmdLabels = RetrieveCommandLabelsFromCommand( aCommand, eModule );
-                    if ( pCmdLabels )
-                        pCmdLabels->aLabels[nLangIndex] = aLabel;
-                    else
-                    {
-                        CommandLabels aCmdLabels;
-
-                        aCmdLabels.nID = 0;
-                        aCmdLabels.aCommand = aCommand;
-                        aCmdLabels.aLabels[nLangIndex] = aLabel;
-                        AddCommandLabelsToCommandHashMap( eModule, aCmdLabels );
-                    }
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-class SfxSlotInfo : public Resource
-{
-    OUString aName;
-    OUString aHelpText;
-public:
-    SfxSlotInfo(const ResId &rResId);
-
-    const OUString &GetName() const { return aName; }
-    const OUString &GetHelpText() const { return aHelpText; }
-};
-
-SfxSlotInfo::SfxSlotInfo( const ResId &rResId ) :
-    Resource( rResId.SetRT( RSC_SFX_SLOT_INFO ) )
-{
-    unsigned short nMask = (unsigned short) ReadShortRes();
-    if(nMask & RSC_SFX_SLOT_INFO_SLOTNAME)
-    {
-        aName = ReadStringRes();
-    }
-    if(nMask & RSC_SFX_SLOT_INFO_HELPTEXT)
-    {
-        aHelpText = ReadStringRes();
-    }
-}
-
-bool ReadSlotInfos( int nLangIndex, ResMgr* pResMgr, MODULES eModule, const OUString& aProjectName )
-{
-    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[MODULE_GLOBAL].begin();
-    CommandIDToLabelsMap::iterator pEnd = moduleMapFiles[MODULE_GLOBAL].end();
-
-    if ( eModule != MODULE_GLOBAL )
-    {
-        while ( pIter != pEnd )
-        {
-            int nId = pIter->first;
-            CommandLabels& rCmdLabels = pIter->second;
-
-            ResId aResId( nId, pResMgr );
-            aResId.SetRT( RSC_SFX_SLOT_INFO );
-
-            if ( pResMgr->IsAvailable( aResId ))
-            {
-                SfxSlotInfo aSlotInfo( aResId );
-                OUString    aText( aSlotInfo.GetName() );
-                if ( rCmdLabels.aLabels[nLangIndex].getLength() == 0 )
-                    rCmdLabels.aLabels[nLangIndex] = aText;
-            }
-            ++pIter;
-        }
-    }
-
-    pIter = moduleMapFiles[eModule].begin();
-    pEnd = moduleMapFiles[eModule].end();
-    while ( pIter != pEnd )
-    {
-        int nId = pIter->first;
-        CommandLabels& rCmdLabels = pIter->second;
-
-        ResId aResId( nId, pResMgr );
-        aResId.SetRT( RSC_SFX_SLOT_INFO );
-
-        if ( pResMgr->IsAvailable( aResId ))
-        {
-            SfxSlotInfo aSlotInfo( aResId );
-            OUString    aText( aSlotInfo.GetName() );
-            if ( rCmdLabels.aLabels[nLangIndex].getLength() == 0 )
-                rCmdLabels.aLabels[nLangIndex] = aText;
-        }
-        ++pIter;
-    }
-
-    return true;
-}
-
-bool ReadResourceFile( int nLangIndex, const OUString& aResourceDirURL, const OUString& aResourceFilePrefix, MODULES eModule, const OUString& aProjectName, bool bHasSlotInfos )
-{
-    OUString aSysDirPath;
-    OString  aResFilePrefix = OUStringToOString( aResourceFilePrefix, RTL_TEXTENCODING_ASCII_US );
-
-    osl::FileBase::getSystemPathFromFileURL( aResourceDirURL, aSysDirPath );
-
-    String aSysDirPathStr( aSysDirPath );
-
-//    String aLangString( String::CreateFromAscii( Language_Mapping[nLangIndex].pISO ));
-//    LanguageType aLangtype = ConvertIsoStringToLanguage( aLangString );
-    ::com::sun::star::lang::Locale aLocale;
-    aLocale.Language = OUString::createFromAscii( Language_codes[nLangIndex].pLanguage );
-    aLocale.Country = OUString::createFromAscii( Language_codes[nLangIndex].pCountry );
-    ResMgr* pResMgr = ResMgr::CreateResMgr( aResFilePrefix.getStr(),
-                                            aLocale,
-                                            NULL,
-                                            &aSysDirPathStr );
-    if ( pResMgr )
-    {
-        int i = 0;
-        while ( ResourceModule_Mapping[i].nResId > 0 )
-        {
-            if ( ResourceModule_Mapping[i].eBelongsTo == eModule )
-            {
-                ResId   aResId( ResourceModule_Mapping[i].nResId, pResMgr );
-                aResId.SetRT( RSC_MENU );
-
-                if ( pResMgr->IsAvailable( aResId ))
-                {
-                    MenuBar* pMenuBar = new MenuBar( aResId );
-                    ReadMenuLabels( nLangIndex, (Menu *)pMenuBar, eModule, bHasSlotInfos, aResourceFilePrefix );
-                    delete pMenuBar;
-                }
-
-                if ( bHasSlotInfos )
-                    ReadSlotInfos( nLangIndex, pResMgr, eModule, aProjectName );
-            }
-            ++i;
-        }
-
-        i = 0;
-        while ( AccResourceModule_Mapping[i].nResId > 0 )
-        {
-            if ( AccResourceModule_Mapping[i].eBelongsTo != eModule )
-            {
-                ++i;
-                continue;
-            }
-            
-            ResId   aAccResId( AccResourceModule_Mapping[i].nResId, pResMgr );
-            aAccResId.SetRT( RSC_ACCEL );
-            
-            if (!pResMgr->IsAvailable( aAccResId ))
-            {
-                fprintf(stdout, ".. acc %d not found\n", AccResourceModule_Mapping[i].nResId);
-                ++i;
-                continue;
-            }
-                
-            Accelerator* pAcc = new Accelerator( aAccResId );
-            ReadAccelerators( nLangIndex, pResMgr, eModule, aProjectName, pAcc );
-            delete pAcc;
-            ++i;
-        }
-        
-        delete pResMgr;
-    }
-
-    return true;
-}
-
-static const char ENCODED_AMPERSAND[]  = "&amp;";
-static const char ENCODED_LESS[]       = "&lt;";
-static const char ENCODED_GREATER[]    = "&gt;";
-static const char ENCODED_QUOTE[]      = "&quot;";
-static const char ENCODED_APOS[]       = "&apos;";
-
-struct EncodeChars
-{
-    char  cChar;
-    const char* pEncodedChars;
-};
-
-EncodeChars EncodeChar_Map[] =
-{
-    { '&', ENCODED_AMPERSAND    },
-    { '<', ENCODED_LESS         },
-    { '>', ENCODED_GREATER      },
-    { '"', ENCODED_QUOTE        },
-    { '\'', ENCODED_APOS        },
-    { ' ', 0                    }
-};
-
-// Encodes a string to UTF-8 and uses "Built-in entity reference" to
-// to escape character data that is not markup!
-OString EncodeString( const OUString& aToEncodeStr )
-{
-    OString aString = OUStringToOString( aToEncodeStr, RTL_TEXTENCODING_UTF8 );
-
-    int     i = 0;
-    bool    bMustCopy( sal_False );
-    while ( EncodeChar_Map[i].pEncodedChars != 0 )
-    {
-        OStringBuffer aBuf;
-        bool bEncoded( false );
-
-        sal_Int32 nCurIndex = 0;
-        sal_Int32 nIndex    = 0;
-        while ( nIndex < aString.getLength() )
-        {
-            nIndex = aString.indexOf( EncodeChar_Map[i].cChar, nIndex );
-            if ( nIndex > 0 )
-            {
-                bEncoded = true;
-                if ( nIndex > nCurIndex )
-                    aBuf.append( aString.copy( nCurIndex, nIndex-nCurIndex ));
-                aBuf.append( EncodeChar_Map[i].pEncodedChars );
-                nCurIndex = nIndex+1;
-            }
-            else if ( nIndex == 0 )
-            {
-                bEncoded = true;
-                aBuf.append( EncodeChar_Map[i].pEncodedChars );
-                nCurIndex = nIndex+1;
-            }
-            else
-            {
-                if ( bEncoded && nCurIndex < aString.getLength() )
-                    aBuf.append( aString.copy( nCurIndex ));
-                break;
-            }
-            ++nIndex;
-        }
-
-        if ( bEncoded )
-            aString = aBuf.makeStringAndClear();
-        ++i;
-    }
-
-    return aString;
-}
-
-// Mark all commands which are popups
-void FindAndMarkModulePopupMenuCmds()
-{
-    for ( int i = 0; i < int( MODULE_COUNT ); i++ )
-    {
-        CommandToLabelsMap::iterator pCmdIter = modulePopupMenusCmd[i].begin();
-        CommandToLabelsMap::iterator pCmdEnd = modulePopupMenusCmd[i].end();
-        while ( pCmdIter != pCmdEnd )
-        {
-            CommandLabels& rCmdLabel = pCmdIter->second;
-            if ( rCmdLabel.bPopupMenu )
-            {
-                CommandIDToLabelsMap::iterator pIDIter = moduleMapFiles[i].begin();
-                CommandIDToLabelsMap::iterator pIDEnd = moduleMapFiles[i].end();
-                while ( pIDIter != pIDEnd )
-                {
-                    CommandLabels& rIDLabel = pIDIter->second;
-                    if ( rIDLabel.aCommand.equals( rCmdLabel.aCommand ))
-                    {
-                        rIDLabel.bPopupMenu = true;
-                        break;
-                    }
-                    ++pIDIter;
-                }
-            }
-
-            ++pCmdIter;
-        }
-    }
-}
-
-
-bool FindAndMarkPopupMenuCmds( const OUString& aCommand, MODULES eExcludeModule )
-{
-    bool bFound( sal_False );
-
-    for ( int i = 1; i < int( MODULE_COUNT ); i++ )
-    {
-        if ( eExcludeModule != MODULES( i ))
-        {
-            CommandToLabelsMap::iterator pCmdIter = modulePopupMenusCmd[i].find( aCommand );
-            if ( pCmdIter != modulePopupMenusCmd[i].end() )
-            {
-                CommandLabels& rCmdLabel = pCmdIter->second;
-                rCmdLabel.bWritten = true; // mark as written, this is now a global popup menu command
-                bFound = true;
-            }
-        }
-    }
-
-    return bFound;
-}
-
-bool FindAndMoveGlobalPopupMenus()
-{
-    for ( int i = 1; i < int( MODULE_COUNT ); i++ )
-    {
-        CommandToLabelsMap::iterator pCmdIter = modulePopupMenusCmd[i].begin();
-        CommandToLabelsMap::iterator pCmdEnd = modulePopupMenusCmd[i].end();
-        while ( pCmdIter != pCmdEnd )
-        {
-            CommandLabels& rCmdLabel = pCmdIter->second;
-            if ( rCmdLabel.bPopupMenu )
-            {
-                bool bDuplicate = FindAndMarkPopupMenuCmds( rCmdLabel.aCommand, MODULES( i ));
-                if ( bDuplicate )
-                {
-                    CommandToLabelsMap::const_iterator pIter = modulePopupMenusCmd[MODULE_GLOBAL].find( rCmdLabel.aCommand );
-                    if ( pIter == modulePopupMenusCmd[MODULE_GLOBAL].end() )
-                    {
-                        // Put command into global ui command list
-                        CommandLabels aCmdLabels;
-
-                        aCmdLabels.nID = 0;
-                        aCmdLabels.aCommand = rCmdLabel.aCommand;
-                        aCmdLabels.bPopupMenu = true;
-                        for ( int j = 0; j < NUM_LANGUAGES; j++ )
-                            aCmdLabels.aLabels[j] = rCmdLabel.aLabels[j];
-                        AddCommandLabelsToCommandHashMap( MODULE_GLOBAL, aCmdLabels );
-                        rCmdLabel.bWritten = true;
-                    }
-                    else
-                    {
-                        rCmdLabel.bWritten = true;
-                    }
-                }
-            }
-            ++pCmdIter;
-        }
-    }
-
-    return true;
-}
-
-static const char XMLStart[]        = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-
-bool WriteXMLFiles( const OUString& aOutputDirURL)
-{
-    static const char DocType[]                 = "<!DOCTYPE oor:component-data SYSTEM \"../../../../../component-update.dtd\">\n";
-    static const char ComponentDataStart[]      = "<oor:component-data oor:name=\"";
-    static const char ComponentDataStartEnd[]   = "\" oor:package=\"org.openoffice.Office.UI\" xmlns:oor=\"http://openoffice.org/2001/registry\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
-    static const char GroupText[]               = "\t<node oor:name=\"UserInterface\">\n";
-    static const char SetTextCmds[]             = "\t\t<node oor:name=\"Commands\">\n";
-    static const char SetTextPopups[]           = "\t\t<node oor:name=\"Popups\">\n";
-    static const char NodeStart[]               = "\t\t\t<node oor:name=\"";
-    static const char ReplaceOp[]               = "\" oor:op=\"replace\">\n";
-    static const char NodeEnd[]                 = "\t\t\t</node>\n";
-    static const char PropLabelNodeStart[]      = "\t\t\t\t<prop oor:name=\"Label\" oor:type=\"xs:string\">\n";
-    static const char PropNodeEnd[]             = "\t\t\t\t</prop>\n";
-    static const char PropPropNodeStart[]       = "\t\t\t\t<prop oor:name=\"Properties\" oor:type=\"xs:int\">\n";
-    static const char PropHelpIdStart[]         = "\t\t\t\t<prop oor:name=\"HelpId\" oor:type=\"xs:int\">\n";
-    static const char ValueSimpleNodeStart[]    = "\t\t\t\t\t<value>";
-    static const char ValueNodeStart[]          = "\t\t\t\t\t<value xml:lang=\"";
-    static const char ValueNodeMid[]            = "\">";
-    static const char ValueNodeEnd[]            = "</value>\n";
-    static const char ValueNodeEmpty[]          = "\t\t\t\t\t<value/>\n";
-    static const char SetTextEnd[]              = "\t\t</node>\n";
-    static const char GroupTextEnd[]            = "\t</node>\n";
-    static const char ComponentDataEnd[]        = "</oor:component-data>\n";
-
-    // Search popup menu commands that can be moved to the global list as they are used in more than one project
-    FindAndMoveGlobalPopupMenus();
-    // Search and mark all commands which are popups
-    FindAndMarkModulePopupMenuCmds();
-
-    OUString aOutputDirectoryURL( aOutputDirURL );
-    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-        aOutputDirectoryURL += OUString::createFromAscii( "/" );
-
-    int i = 0;
-    while ( ModuleToXML_Mapping[i] != 0 )
-    {
-        OUString aOutputFileURL( aOutputDirectoryURL );
-        aOutputFileURL += OUString::createFromAscii( ModuleToXML_Mapping[i] );
-        aOutputFileURL += OUString::createFromAscii( XMLFileExtension );
-
-        osl::File aXMLFile( aOutputFileURL );
-
-        osl::File::RC nRet = aXMLFile.open( OpenFlag_Create|OpenFlag_Write );
-        if ( nRet == osl::File::E_EXIST )
-        {
-            nRet = aXMLFile.open( OpenFlag_Write );
-            if ( nRet == osl::File::E_None )
-                nRet = aXMLFile.setSize( 0 );
-        }
-
-        if ( nRet == osl::FileBase::E_None )
-        {
-            sal_uInt64 nWritten;
-
-            aXMLFile.write( XMLStart, strlen( XMLStart ), nWritten );
-            aXMLFile.write( DocType, strlen( DocType ), nWritten );
-            aXMLFile.write( ComponentDataStart, strlen( ComponentDataStart ), nWritten );
-            aXMLFile.write( ModuleToXML_Mapping[i], strlen( ModuleToXML_Mapping[i] ), nWritten );
-            aXMLFile.write( ComponentDataStartEnd, strlen( ComponentDataStartEnd ), nWritten );
-            aXMLFile.write( GroupText, strlen( GroupText ), nWritten );
-
-            if (( !moduleMapFiles[i].empty()      ) ||
-                ( !modulePopupMenusCmd[i].empty() )    )
-            {
-                for ( int nSets = 0; nSets < 2; nSets++ )
-                {
-                    if ( nSets == 0 )
-                        aXMLFile.write( SetTextCmds, strlen( SetTextCmds ), nWritten );
-                    else
-                        aXMLFile.write( SetTextPopups, strlen( SetTextPopups ), nWritten );
-
-                    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[i].begin();
-                    CommandIDToLabelsMap::iterator pEnd = moduleMapFiles[i].end();
-                    while ( pIter != pEnd )
-                    {
-                        CommandLabels& rCmdLabels = pIter->second;
-
-                        if ( rCmdLabels.bWritten )
-                        {
-                            ++pIter;
-                            continue;
-                        }
-
-                        CommandToLabelsMap::iterator pCmdIter = modulePopupMenusCmd[i].find( rCmdLabels.aCommand );
-                        if ( pCmdIter != modulePopupMenusCmd[i].end() )
-                        {
-                            // Mark as written within the popup menus hash table
-                            CommandLabels& rCmdLabel = pCmdIter->second;
-                            rCmdLabel.bWritten = true;
-                        }
-
-                        // We have to save popups on the next iteration
-                        if (( nSets == 0 ) && rCmdLabels.bPopupMenu )
-                        {
-                            ++pIter;
-                            continue;
-                        }
-
-                        // Mark as written for next iteration
-                        rCmdLabels.bWritten = true;
-
-                        // we have to use UTF-8 as encoding
-                        OString aCmd = OUStringToOString( rCmdLabels.aCommand, RTL_TEXTENCODING_UTF8 );
-
-                        aXMLFile.write( NodeStart, strlen( NodeStart ), nWritten );
-                        aXMLFile.write( aCmd.getStr(), aCmd.getLength(), nWritten );
-                        aXMLFile.write( ReplaceOp, strlen( ReplaceOp ), nWritten );
-                        aXMLFile.write( PropLabelNodeStart, strlen( PropLabelNodeStart ), nWritten );
-
-                        sal_Bool bLabels( sal_False );
-                        for ( int j = 0; j < NUM_LANGUAGES; j++ )
-                        {
-                            OString aLabel;
-                            if ( rCmdLabels.aLabels[j].getLength() > 0 )
-                            {
-                                bLabels = sal_True;
-
-                                // Encode label to the XML rules.
-                                aLabel = EncodeString( rCmdLabels.aLabels[j] );
-                            }
-                            else
-                            {
-                                CommandToLabelsMap::const_iterator pIter = modulePopupMenusCmd[i].find( rCmdLabels.aCommand );
-                                if ( pIter != modulePopupMenusCmd[i].end() )
-                                {
-                                    const CommandLabels& rCmdLabels = pIter->second;
-                                    if ( rCmdLabels.aLabels[j].getLength() > 0 )
-                                    {
-                                        bLabels = sal_True;
-                                        aLabel = EncodeString( rCmdLabels.aLabels[j] );
-                                    }
-                                }
-                            }
-
-                            if ( aLabel.getLength() > 0 )
-                            {
-                                OString mystr;
-                                mystr += Language_codes[j].pLanguage;
-                                if ( strlen(Language_codes[j].pCountry))
-                                {
-                                    mystr += "-";
-                                    mystr += Language_codes[j].pCountry;
-                                }
-
-                                /*
-                                char mystr[255];
-                                strncat( mystr, Language_codes[j].pLanguage, 2);
-                                if ( strlen(Language_codes[j].pCountry))
-                                {
-                                    strncat( mystr, "-", 1);
-                                    strncat( mystr, Language_codes[j].pCountry, 2);
-                                }
-                                */
-                                aXMLFile.write( ValueNodeStart, strlen( ValueNodeStart ), nWritten );
-                                aXMLFile.write( mystr, strlen( mystr ), nWritten );
-                                aXMLFile.write( ValueNodeMid, strlen( ValueNodeMid ), nWritten );
-                                aXMLFile.write( aLabel.getStr(), aLabel.getLength(), nWritten );
-                                aXMLFile.write( ValueNodeEnd, strlen( ValueNodeEnd ), nWritten );
-                            }
-                        }
-
-                        if ( !bLabels )
-                            aXMLFile.write( ValueNodeEmpty, strlen( ValueNodeEmpty ), nWritten );
-                        aXMLFile.write( PropNodeEnd, strlen( PropNodeEnd ), nWritten );
-
-                        char aBuf[16] = {0};
-
-                        // write properties node which stores additional information about a command
-                        if ( rCmdLabels.nProperties != 0 )
-                        {
-                            sprintf( aBuf, "%d", rCmdLabels.nProperties );
-                            aXMLFile.write( PropPropNodeStart, strlen( PropPropNodeStart ), nWritten );
-                            aXMLFile.write( ValueSimpleNodeStart, strlen( ValueSimpleNodeStart ), nWritten );
-                            aXMLFile.write( aBuf, strlen( aBuf ), nWritten );
-                            aXMLFile.write( ValueNodeEnd, strlen( ValueNodeEnd ), nWritten );
-                            aXMLFile.write( PropNodeEnd, strlen( PropNodeEnd ), nWritten );
-                        }
-
-/*
-                        // write help ID property node
-                        sprintf( aBuf, "%d", rCmdLabels.nID );
-                        aXMLFile.write( PropHelpIdStart, strlen( PropHelpIdStart ), nWritten );
-                        aXMLFile.write( ValueSimpleNodeStart, strlen( ValueSimpleNodeStart ), nWritten );
-                        aXMLFile.write( aBuf, strlen( aBuf ), nWritten );
-                        aXMLFile.write( ValueNodeEnd, strlen( ValueNodeEnd ), nWritten );
-                        aXMLFile.write( PropNodeEnd, strlen( PropNodeEnd ), nWritten );
-*/
-                        aXMLFile.write( NodeEnd, strlen( NodeEnd ), nWritten );
-                        ++pIter;
-                    }
-
-                    sal_uInt32 nSize = modulePopupMenusCmd[i].size();
-                    if ( nSize > 0 )
-                    {
-                        CommandToLabelsMap::iterator pIter = modulePopupMenusCmd[i].begin();
-                        while ( pIter != modulePopupMenusCmd[i].end() )
-                        {
-                            CommandLabels& rCmdLabels = pIter->second;
-
-                            if (( nSets == 0 ) && rCmdLabels.bPopupMenu )
-                            {
-                                ++pIter;
-                                continue;
-                            }
-
-                            if ( !rCmdLabels.bWritten )
-                            {
-                                rCmdLabels.bWritten = true;
-                                OString aCmd( OUStringToOString( rCmdLabels.aCommand, RTL_TEXTENCODING_UTF8 ));
-                                aXMLFile.write( NodeStart, strlen( NodeStart ), nWritten );
-                                aXMLFile.write( aCmd.getStr(), aCmd.getLength(), nWritten );
-                                aXMLFile.write( ReplaceOp, strlen( ReplaceOp ), nWritten );
-                                aXMLFile.write( PropLabelNodeStart, strlen( PropLabelNodeStart ), nWritten );
-
-                                sal_Bool bLabels( sal_False );
-                                for ( int k = 0; k < NUM_LANGUAGES; k++ )
-                                {
-                                    if ( rCmdLabels.aLabels[k].getLength() > 0 )
-                                    {
-                                        bLabels = sal_True;
-                                        OString aLabel( OUStringToOString( rCmdLabels.aLabels[k], RTL_TEXTENCODING_UTF8 ));
-
-                                        char mystr[255];
-                                        strncat( mystr, Language_codes[k].pLanguage, 2);
-                                        if ( strlen(Language_codes[k].pCountry))
-                                        {
-                                            strncat( mystr, "-", 1);
-                                            strncat( mystr, Language_codes[k].pCountry, 2);
-                                        }
-
-                                        aXMLFile.write( ValueNodeStart, strlen( ValueNodeStart ), nWritten );
-                                        aXMLFile.write( mystr, strlen( mystr ), nWritten );
-                                        aXMLFile.write( ValueNodeMid, strlen( ValueNodeMid ), nWritten );
-                                        aXMLFile.write( aLabel.getStr(), aLabel.getLength(), nWritten );
-                                        aXMLFile.write( ValueNodeEnd, strlen( ValueNodeEnd ), nWritten );
-                                    }
-                                }
-
-                                if ( !bLabels )
-                                    aXMLFile.write( ValueNodeEmpty, strlen( ValueNodeEmpty ), nWritten );
-
-                                aXMLFile.write( PropNodeEnd, strlen( PropNodeEnd ), nWritten );
-                                aXMLFile.write( NodeEnd, strlen( NodeEnd ), nWritten );
-                            }
-
-                            ++pIter;
-                        }
-                    }
-
-                    aXMLFile.write( SetTextEnd, strlen( SetTextEnd ), nWritten );
-                }
-            }
-            else
-            {
-                // Write empty sets
-                aXMLFile.write( SetTextCmds, strlen( SetTextCmds ), nWritten );
-                aXMLFile.write( SetTextEnd, strlen( SetTextEnd ), nWritten );
-                aXMLFile.write( SetTextPopups, strlen( SetTextPopups ), nWritten );
-                aXMLFile.write( SetTextEnd, strlen( SetTextEnd ), nWritten );
-            }
-
-            aXMLFile.write( GroupTextEnd, strlen( GroupTextEnd ), nWritten );
-            aXMLFile.write( ComponentDataEnd, strlen( ComponentDataEnd ), nWritten );
-
-            aXMLFile.close();
-            ++i;
-        }
-    }
-
-    return true;
-}
-
-bool WriteLevel( osl::File& rFile, int nLevel )
-{
-    const char cTab[] = "\t";
-
-    sal_uInt64 nWritten;
-    for ( int i = 0; i < nLevel; i++ )
-        rFile.write( cTab, strlen( cTab ), nWritten );
-
-    return true;
-}
-
-bool WriteSeparator( osl::File& rFile, int nLevel )
-{
-    static const char MenuSeparator[] = "<menu:menuseparator/>\n";
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuSeparator, strlen( MenuSeparator ), nWritten );
-
-    return true;
-}
-
-bool WriteMenuItem( osl::File& rFile, const OUString& aCmd, const OUString& aHelpID, int nLevel )
-{
-    static const char MenuItemStart[]   = "<menu:menuitem menu:id=\"";
-    static const char MenuItemHelp[]    = "menu:helpid=\"";
-    static const char MenuItemLabel[]   = "menu:label=\"";
-    static const char MenuItemAttrEnd[] = "\" ";
-    static const char MenuItemEnd[]     = "/>\n";
-
-    OString aCmdStr = OUStringToOString( aCmd, RTL_TEXTENCODING_UTF8 );
-    OString aHelpId = OUStringToOString( aHelpID, RTL_TEXTENCODING_UTF8 );
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuItemStart, strlen( MenuItemStart ), nWritten );
-    rFile.write( aCmdStr.getStr(), aCmdStr.getLength(), nWritten );
-    rFile.write( MenuItemAttrEnd, strlen( MenuItemAttrEnd ), nWritten );
-    rFile.write( MenuItemHelp, strlen( MenuItemHelp ), nWritten );
-    rFile.write( aHelpId.getStr(), aHelpId.getLength(), nWritten );
-    rFile.write( MenuItemAttrEnd, strlen( MenuItemAttrEnd ), nWritten );
-    rFile.write( MenuItemLabel, strlen( MenuItemLabel ), nWritten );
-    rFile.write( MenuItemAttrEnd, strlen( MenuItemAttrEnd ), nWritten );
-    rFile.write( MenuItemEnd, strlen( MenuItemEnd ), nWritten );
-
-    return true;
-}
-
-bool WritePopupMenuEmpty( osl::File& rFile, int nLevel )
-{
-    static const char MenuPopupStart[]  = "<menu:menupopup/>\n";
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuPopupStart, strlen( MenuPopupStart ), nWritten );
-
-    return true;
-}
-
-bool WritePopupMenuStart( osl::File& rFile, int nLevel )
-{
-    static const char MenuPopupStart[]  = "<menu:menupopup>\n";
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuPopupStart, strlen( MenuPopupStart ), nWritten );
-
-    return true;
-}
-
-bool WritePopupMenuEnd( osl::File& rFile, int nLevel )
-{
-    static const char MenuPopupEnd[]    = "</menu:menupopup>\n";
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuPopupEnd, strlen( MenuPopupEnd ), nWritten );
-
-    return true;
-}
-
-bool WriteMenuStart( osl::File& rFile, const OUString& aCmd, int nLevel )
-{
-    static const char MenuStart[]       = "<menu:menu menu:id=\"";
-    static const char MenuEnd[]         = ">\n";
-    static const char MenuAttrEnd[]     = "\" ";
-    static const char MenuLabel[]       = "menu:label=\"";
-
-    OString aCmdStr = OUStringToOString( aCmd, RTL_TEXTENCODING_UTF8 );
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuStart, strlen( MenuStart ), nWritten );
-    rFile.write( aCmdStr.getStr(), aCmdStr.getLength(), nWritten );
-    rFile.write( MenuAttrEnd, strlen( MenuAttrEnd ), nWritten );
-    rFile.write( MenuLabel, strlen( MenuLabel ), nWritten );
-    rFile.write( MenuAttrEnd, strlen( MenuAttrEnd ), nWritten );
-    rFile.write( MenuEnd, strlen( MenuEnd ), nWritten );
-
-    return true;
-}
-
-bool WriteMenuEnd( osl::File& rFile, int nLevel )
-{
-    static const char MenuEnd[]         = "</menu:menu>\n";
-
-    sal_uInt64 nWritten;
-    WriteLevel( rFile, nLevel );
-    rFile.write( MenuEnd, strlen( MenuEnd ), nWritten );
-
-    return true;
-}
-
-bool WriteAccXML( osl::File& rFile, Accelerator* pAcc, MODULES eModule, int nLevel )
-{
-   ::rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-
-    for ( unsigned short n = 0; n < pAcc->GetItemCount(); n++ )
-    {
-        unsigned short nId = pAcc->GetItemId( n );
-    }
-
-    return true;
-}
-
-bool WriteMenuBarXML( osl::File& rFile, Menu* pMenu, MODULES eModule, int nLevel )
-{
-   OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-
-    for ( unsigned short n = 0; n < pMenu->GetItemCount(); n++ )
-    {
-        unsigned short nId = pMenu->GetItemId( n );
-        if ( pMenu->GetItemType( n ) != MENUITEM_SEPARATOR )
-        {
-            OUString aLabel( pMenu->GetItemText( nId ));
-            OUString aCommand( pMenu->GetItemCommand( nId ));
-            bool     bHasUnoCommand( aCommand.getLength() > 0 && ( aCommand.indexOf( aCmd ) == 0 ));
-
-            if ( pMenu->GetPopupMenu( nId ) != 0 )
-            {
-                if ( !bHasUnoCommand )
-                {
-                    CommandLabels* pCmdLabels = 0;
-                    pCmdLabels = RetrieveCommandLabelsFromID( nId, eModule );
-                    if ( !pCmdLabels )
-                        pCmdLabels = RetrieveCommandLabelsFromCommand( aCommand, eModule );
-
-                    if ( pCmdLabels )
-                        aCommand = pCmdLabels->aCommand;
-                    else if ( aCommand.getLength() == 0 )
-                        aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ));
-                }
-
-                WriteMenuStart( rFile, aCommand, nLevel );
-                WritePopupMenuStart( rFile, nLevel+1 );
-                WriteMenuBarXML( rFile, pMenu->GetPopupMenu( nId ), eModule, nLevel+2 );
-                WritePopupMenuEnd( rFile, nLevel+1 );
-                WriteMenuEnd( rFile, nLevel );
-            }
-            else if ( pMenu->IsMenuBar() )
-            {
-                // write empty popup menu
-                WriteMenuStart( rFile, aCommand, nLevel );
-                WritePopupMenuEmpty( rFile, nLevel+1 );
-                WriteMenuEnd( rFile, nLevel );
-            }
-            else
-            {
-                CommandLabels* pCmdLabels = RetrieveCommandLabelsFromID( nId, eModule );
-                if ( !pCmdLabels )
-                    pCmdLabels = RetrieveCommandLabelsFromCommand( aCommand, eModule );
-
-                if ( pCmdLabels )
-                    aCommand = pCmdLabels->aCommand;
-                else
-                    aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ));
-
-                OUString aHelpId = OUString::valueOf( sal_Int32( pMenu->GetHelpId( nId )));
-                WriteMenuItem( rFile, aCommand, aHelpId, nLevel );
-            }
-        }
-        else
-        {
-            WriteSeparator( rFile, nLevel );
-        }
-    }
-
-    return true;
-}
-
-bool impl_isAccListDuplicate(const KeyCommandInfoList& rAccsReference,
-                             const KeyCommandInfoList& rAccs         )
-{
-    KeyCommandInfoList::const_iterator pIt1;
-    KeyCommandInfoList::const_iterator aEnd = rAccsReference.end();
-    for (  pIt1  = rAccsReference.begin();
-           pIt1 != aEnd  ;
-         ++pIt1                          )
-    {
-        KeyCommandInfoList::const_iterator pIt2 = ::std::find(rAccs.begin(), rAccs.end(), *pIt1);
-        if (pIt2 == rAccs.end())
-            return false;
-    }
-    return true;         
-}
-                             
-bool ReadResourceWriteAcceleratorXMLLang( const ::rtl::OUString& aOutDirURL, 
-                                      const ::rtl::OUString& aResourceDirURL, 
-                                      const ::rtl::OUString& aResourceFilePrefix, 
-                                            MODULES          eModule, 
-                                      const ::rtl::OUString& aProjectName,
-                                      int nLanguage)
-{
-    static const char AccStart[]    = "<accel:acceleratorlist xmlns:accel=\"http://openoffice.org/2001/accel\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n"; 
-    static const char AccEnd[]      = "</accel:acceleratorlist>\n";
-
-    Locale2KeyCommandInfoList& rLocale        = moduleAccs[eModule];
-    KeyCommandInfoList&        rAccs          = rLocale[nLanguage]; // current language
-    KeyCommandInfoList&        rAccsReference = rLocale[1];         // en-US!
-
-    // dont write empty files :-)
-    if ( rAccs.empty() )
-        return true;
-
-    ::rtl::OUString sLanguage = ::rtl::OUString::createFromAscii(Language_codes[nLanguage].pLanguage);
-    ::rtl::OUString sCountry  = ::rtl::OUString::createFromAscii(Language_codes[nLanguage].pCountry);
-    
-    // dont generate duplicate xml files, if current language isnt different from en-US!
-    // Of course we have to write en-US everytimes :-)
-    if (nLanguage != 1 && impl_isAccListDuplicate(rAccsReference, rAccs))
-    {
-        fprintf(stdout, "ignore acc list [mod=%d, lang=%s-%s] ... seems to be duplicate against en-US=1\n", eModule, ::rtl::OUStringToOString(sLanguage, RTL_TEXTENCODING_UTF8).getStr(), ::rtl::OUStringToOString(sCountry, RTL_TEXTENCODING_UTF8).getStr());
-        return true;
-    }
-    
-    fprintf(stdout, "write acc list [mod=%d, lang=%s-%s] ... seems to be duplicate against en-US=1\n", eModule, ::rtl::OUStringToOString(sLanguage, RTL_TEXTENCODING_UTF8).getStr(), ::rtl::OUStringToOString(sCountry, RTL_TEXTENCODING_UTF8).getStr());
-    
-    ::rtl::OUString aSysDirPath;
-    ::rtl::OString  aResFilePrefix = ::rtl::OUStringToOString( aResourceFilePrefix, RTL_TEXTENCODING_ASCII_US );
-    
-    osl::FileBase::getSystemPathFromFileURL( aResourceDirURL, aSysDirPath );
-
-    String aSysDirPathStr( aSysDirPath );
-
-    ::rtl::OUString aOutputDirectoryURL( aOutDirURL );
-    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-        aOutputDirectoryURL += ::rtl::OUString::createFromAscii( "/" );
-
-    int i = 0;
-    while ( AccResourceModule_Mapping[i].nResId > 0 )
-    {
-        if ( AccResourceModule_Mapping[i].eBelongsTo == eModule )
-            break;
-        ++i;
-    }
-            
-    ::rtl::OUString aOutputFileURL( aOutputDirectoryURL );
-    aOutputFileURL += ::rtl::OUString::createFromAscii( AccResourceModule_Mapping[i].pXMLPrefix );
-    aOutputFileURL += ::rtl::OUString::createFromAscii( "_(" );
-    aOutputFileURL += sLanguage;
-    aOutputFileURL += ::rtl::OUString::createFromAscii( "-" );
-    aOutputFileURL += sCountry;
-    aOutputFileURL += ::rtl::OUString::createFromAscii( ")_accelerator.xml" );
-
-    osl::File aXMLFile( aOutputFileURL );
-    osl::File::RC nRet = aXMLFile.open( OpenFlag_Write );
-    if ( nRet != osl::File::E_None )
-    {
-        nRet = aXMLFile.open( OpenFlag_Write | OpenFlag_Create );
-        if ( nRet != osl::File::E_None )
-        {
-            fprintf(stdout, "ERROR:\tcould not create acc.xml \"%s\" [ret=%d]\n", ::rtl::OUStringToOString( aOutputFileURL, RTL_TEXTENCODING_ASCII_US ).getStr(), nRet);
-            return false;
-        }
-    }
-        
-    sal_uInt64 nWritten;
-
-    aXMLFile.write( XMLStart, strlen( XMLStart ), nWritten );
-    aXMLFile.write( AccStart, strlen( AccStart ), nWritten );
-      
-    ::rtl::OUStringBuffer sAccBuf(10000);
-    KeyCommandInfoList::const_iterator pIt;
-    KeyCommandInfoList::const_iterator aEnd = rAccs.end();
-    for (  pIt  = rAccs.begin();
-           pIt != aEnd  ;
-         ++pIt                 )
-    {
-        const KeyCommandInfo& aInfo = *pIt;
-        
-        sAccBuf.appendAscii("\t<accel:item accel:code=\"");
-        sAccBuf.append(aInfo.sKey);
-        sAccBuf.appendAscii("\"");
-
-        BOOL   bShift = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
-        BOOL   bMod1  = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
-        BOOL   bMod2  = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
-        BOOL   bMod3  = ((aInfo.aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
-    
-        if (bShift)        
-            sAccBuf.appendAscii(" accel:shift=\"true\"");
-        if (bMod1)        
-            sAccBuf.appendAscii(" accel:mod1=\"true\"");
-        if (bMod2)        
-            sAccBuf.appendAscii(" accel:mod2=\"true\"");
-        if (bMod3)
-            sAccBuf.appendAscii(" accel:mod3=\"true\"");
-        
-        sAccBuf.appendAscii(" xlink:href=\"");
-        sAccBuf.append(aInfo.sCommand);
-        sAccBuf.appendAscii("\"/>\n");
-    }         
-    
-    ::rtl::OString sAcc = ::rtl::OUStringToOString(sAccBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
-    
-    aXMLFile.write( sAcc.getStr(), sAcc.getLength(), nWritten );
-    aXMLFile.write( AccEnd, strlen( AccEnd ), nWritten );
-    aXMLFile.close();
-        
-    return true;
-}
-
-bool ReadResourceWriteAcceleratorXML( const ::rtl::OUString& aOutDirURL, 
-                                      const ::rtl::OUString& aResourceDirURL, 
-                                      const ::rtl::OUString& aResourceFilePrefix, 
-                                            MODULES          eModule, 
-                                      const ::rtl::OUString& aProjectName)
-{
-    for ( int k = 0; k < NUM_LANGUAGES; k++ )
-    {
-        if (!ReadResourceWriteAcceleratorXMLLang(aOutDirURL, aResourceDirURL, aResourceFilePrefix, eModule, aProjectName, k))
-            return false;
-    }
-    return true;
-}
-
-bool ReadResourceWriteMenuBarXML( const OUString& aOutDirURL,
-                                  const OUString& aResourceDirURL,
-                                  const OUString& aResourceFilePrefix,
-                                  MODULES eModule,
-                                  const OUString& aProjectName )
-{
-    static const char MenuBarStart[]    = "<menu:menubar xmlns:menu=\"http://openoffice.org/2001/menu\" menu:id=\"menubar\">\n";
-    static const char MenuBarEnd[]      = "</menu:menubar>";
-
-    OUString aSysDirPath;
-    OString  aResFilePrefix = OUStringToOString( aResourceFilePrefix, RTL_TEXTENCODING_ASCII_US );
-
-    osl::FileBase::getSystemPathFromFileURL( aResourceDirURL, aSysDirPath );
-
-    String aSysDirPathStr( aSysDirPath );
-
-//    String aLangString( String::CreateFromAscii( Language_Mapping[0].pISO ));
-//    LanguageType aLangtype = ConvertIsoStringToLanguage( aLangString );
-    ::com::sun::star::lang::Locale aLocale;
-    aLocale.Language = OUString::createFromAscii( Language_codes[1].pLanguage );
-    aLocale.Country = OUString::createFromAscii( Language_codes[1].pCountry );
-    ResMgr* pResMgr = ResMgr::CreateResMgr( aResFilePrefix.getStr(),
-                                            aLocale,
-                                            NULL,
-                                            &aSysDirPathStr );
-    if ( pResMgr )
-    {
-        OUString aMenuBar( RTL_CONSTASCII_USTRINGPARAM( "menubar" ));
-        int i = 0;
-        while ( ResourceModule_Mapping[i].nResId > 0 )
-        {
-            if ( ResourceModule_Mapping[i].eBelongsTo == eModule )
-            {
-                ResId   aResId( ResourceModule_Mapping[i].nResId, pResMgr );
-                aResId.SetRT( RSC_MENU );
-
-                if ( pResMgr->IsAvailable( aResId ))
-                {
-                    OUString aOutputDirectoryURL( aOutDirURL );
-                    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-                        aOutputDirectoryURL += OUString::createFromAscii( "/" );
-
-                    OUString aOutputFileURL( aOutputDirectoryURL );
-                    aOutputFileURL += OUString::createFromAscii( ResourceModule_Mapping[i].pXMLPrefix );
-                    aOutputFileURL += aMenuBar;
-                    aOutputFileURL += OUString::createFromAscii( ".xml" );
-
-                    osl::File aXMLFile( aOutputFileURL );
-                    osl::File::RC nRet = aXMLFile.open( OpenFlag_Create|OpenFlag_Write );
-                    if ( nRet == osl::File::E_EXIST )
-                    {
-                        nRet = aXMLFile.open( OpenFlag_Write );
-                        if ( nRet == osl::File::E_None )
-                            nRet = aXMLFile.setSize( 0 );
-                    }
-
-                    if ( nRet == osl::FileBase::E_None )
-                    {
-                        sal_uInt64 nWritten;
-
-                        aXMLFile.write( XMLStart, strlen( XMLStart ), nWritten );
-                        aXMLFile.write( MenuBarStart, strlen( MenuBarStart ), nWritten );
-
-                        MenuBar* pMenuBar = new MenuBar( aResId );
-                        WriteMenuBarXML( aXMLFile, (Menu *)pMenuBar, eModule, 1 );
-                        delete pMenuBar;
-
-                        aXMLFile.write( MenuBarEnd, strlen( MenuBarEnd ), nWritten );
-                        aXMLFile.close();
-                    }
-                }
-            }
-            ++i;
-        }
-
-        delete pResMgr;
-    }
-
-    return true;
-}
-
-bool WriteToolBarSeparator( osl::File& rFile )
-{
-    static const char ToolBarSeparator[] = " <toolbar:toolbarseparator/>\n";
-
-    sal_uInt64 nWritten;
-    rFile.write( ToolBarSeparator, strlen( ToolBarSeparator ), nWritten );
-
-    return true;
-}
-
-bool WriteToolBarSpace( osl::File& rFile )
-{
-    static const char ToolBarSpace[] = " <toolbar:toolbarspace/>\n";
-
-    sal_uInt64 nWritten;
-    rFile.write( ToolBarSpace, strlen( ToolBarSpace ), nWritten );
-
-    return true;
-}
-
-bool WriteToolBarBreak( osl::File& rFile )
-{
-    static const char ToolBarBlank[] = " <toolbar:toolbarbreak/>\n";
-
-    sal_uInt64 nWritten;
-    rFile.write( ToolBarBlank, strlen( ToolBarBlank ), nWritten );
-
-    return true;
-}
-
-bool WriteToolBarItem( osl::File& rFile, const OUString& aCmd, const OUString& aHelpID, ToolBoxItemBits nStyle, bool bVisible )
-{
-    static const char ToolBarItemStart[]                = " <toolbar:toolbaritem xlink:href=\"";
-    static const char ToolBarItemLabel[]                = "toolbar:text=\"";
-    static const char ToolBarItemHelp[]                 = "toolbar:helpid=\"helpid:";
-    static const char ToolBarItemStyle[]                = "toolbar:style=\"";
-    static const char ToolBarItemVisible[]              = "toolbar:visible=\"false";
-    static const char ToolBarItemAttrEnd[]              = "\" ";
-    static const char ToolBarItemEnd[]                  = "/>\n";
-    static const char ATTRIBUTE_ITEMSTYLE_RADIO[]       = "radio";
-    static const char ATTRIBUTE_ITEMSTYLE_AUTO[]        = "auto";
-    static const char ATTRIBUTE_ITEMSTYLE_LEFT[]	    = "left";
-    static const char ATTRIBUTE_ITEMSTYLE_AUTOSIZE[]	= "autosize";
-    static const char ATTRIBUTE_ITEMSTYLE_DROPDOWN[]    = "dropdown";
-    static const char ATTRIBUTE_ITEMSTYLE_REPEAT[]		= "repeat";
-
-    OString aCmdStr = OUStringToOString( aCmd, RTL_TEXTENCODING_UTF8 );
-    OString aHelpId = OUStringToOString( aHelpID, RTL_TEXTENCODING_UTF8 );
-
-    sal_uInt64 nWritten;
-    rFile.write( ToolBarItemStart, strlen( ToolBarItemStart ), nWritten );
-    rFile.write( aCmdStr.getStr(), aCmdStr.getLength(), nWritten );
-    rFile.write( ToolBarItemAttrEnd, strlen( ToolBarItemAttrEnd ), nWritten );
-    rFile.write( ToolBarItemHelp, strlen( ToolBarItemHelp ), nWritten );
-    rFile.write( aHelpId.getStr(), aHelpId.getLength(), nWritten );
-    rFile.write( ToolBarItemAttrEnd, strlen( ToolBarItemAttrEnd ), nWritten );
-    rFile.write( ToolBarItemLabel, strlen( ToolBarItemLabel ), nWritten );
-    rFile.write( ToolBarItemAttrEnd, strlen( ToolBarItemAttrEnd ), nWritten );
-    if ( nStyle != 0 )
-    {
-        rFile.write( ToolBarItemStyle, strlen( ToolBarItemStyle ), nWritten );
-        sal_Bool bBitSet( sal_False );
-        if ( nStyle & TIB_RADIOCHECK )
-        {
-            rFile.write( ATTRIBUTE_ITEMSTYLE_RADIO, strlen( ATTRIBUTE_ITEMSTYLE_RADIO ), nWritten );
-            bBitSet = sal_True;
-        }
-        if ( nStyle & TIB_AUTOCHECK )
-        {
-            if ( bBitSet )
-                rFile.write( " ", 1, nWritten );
-            rFile.write( ATTRIBUTE_ITEMSTYLE_AUTO, strlen( ATTRIBUTE_ITEMSTYLE_AUTO ), nWritten );
-            bBitSet = sal_True;
-        }
-        if ( nStyle & TIB_LEFT )
-        {
-            if ( bBitSet )
-                rFile.write( " ", 1, nWritten );
-            rFile.write( ATTRIBUTE_ITEMSTYLE_LEFT, strlen( ATTRIBUTE_ITEMSTYLE_LEFT ), nWritten );
-            bBitSet = sal_True;
-        }
-        if ( nStyle & TIB_AUTOSIZE )
-        {
-            if ( bBitSet )
-                rFile.write( " ", 1, nWritten );
-            rFile.write( ATTRIBUTE_ITEMSTYLE_AUTOSIZE, strlen( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ), nWritten );
-            bBitSet = sal_True;
-        }
-        if ( nStyle & TIB_DROPDOWN )
-        {
-            if ( bBitSet )
-                rFile.write( " ", 1, nWritten );
-            rFile.write( ATTRIBUTE_ITEMSTYLE_DROPDOWN, strlen( ATTRIBUTE_ITEMSTYLE_DROPDOWN ), nWritten );
-            bBitSet = sal_True;
-        }
-        if ( nStyle & TIB_REPEAT )
-        {
-            if ( bBitSet )
-                rFile.write( " ", 1, nWritten );
-            rFile.write( ATTRIBUTE_ITEMSTYLE_REPEAT, strlen( ATTRIBUTE_ITEMSTYLE_REPEAT ), nWritten );
-        }
-        rFile.write( ToolBarItemAttrEnd, strlen( ToolBarItemAttrEnd ), nWritten );
-    }
-    if ( !bVisible )
-    {
-        rFile.write( ToolBarItemVisible, strlen( ToolBarItemVisible ), nWritten );
-        rFile.write( ToolBarItemAttrEnd, strlen( ToolBarItemAttrEnd ), nWritten );
-    }
-
-    rFile.write( ToolBarItemEnd, strlen( ToolBarItemEnd ), nWritten );
-
-    return true;
-}
-
-bool WriteToolBarXML( osl::File& rFile, ToolBox* pToolBar, MODULES eModule )
-{
-   OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-
-    for ( unsigned short n = 0; n < pToolBar->GetItemCount(); n++ )
-    {
-        unsigned short  nId = pToolBar->GetItemId( n );
-        ToolBoxItemType eType = pToolBar->GetItemType( n );
-
-        if ( eType == TOOLBOXITEM_BUTTON )
-        {
-            OUString        aLabel( pToolBar->GetItemText( nId ));
-            OUString        aCommand( pToolBar->GetItemCommand( nId ));
-            bool            bHasUnoCommand( aCommand.getLength() > 0 && ( aCommand.indexOf( aCmd ) == 0 ));
-            bool            bVisible( pToolBar->IsItemVisible( nId ));
-            ToolBoxItemBits nItemBits( pToolBar->GetItemBits( nId ));
-
-            CommandLabels* pCmdLabels = RetrieveCommandLabelsFromID( nId, eModule );
-            if ( !pCmdLabels )
-                pCmdLabels = RetrieveCommandLabelsFromCommand( aCommand, eModule );
-
-            if ( pCmdLabels )
-                aCommand = pCmdLabels->aCommand;
-            else
-                aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ));
-
-            sal_uInt32 nHelpId = pToolBar->GetHelpId( nId );
-            if ( nHelpId == 0 )
-                nHelpId = nId;
-
-            OUString aHelpId = OUString::valueOf( sal_Int32( nHelpId ));
-            WriteToolBarItem( rFile, aCommand, aHelpId, nItemBits, bVisible );
-        }
-        else if ( eType == TOOLBOXITEM_SEPARATOR )
-        {
-            WriteToolBarSeparator( rFile );
-        }
-        else if ( eType == TOOLBOXITEM_SPACE )
-        {
-            WriteToolBarSpace( rFile );
-        }
-        else if ( eType == TOOLBOXITEM_BREAK )
-        {
-            WriteToolBarBreak( rFile );
-        }
-    }
-
-    return true;
-}
-
-bool ReadResourceWriteToolBarXML( const OUString& aOutDirURL,
-                                  const OUString& aResourceDirURL,
-                                  const OUString& aResourceFilePrefix,
-                                  MODULES eModule,
-                                  const OUString& aProjectName )
-{
-    static const char ToolBarDocType[]  = "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">\n";
-    static const char ToolBarStart[]    = "<toolbar:toolbar xmlns:toolbar=\"http://openoffice.org/2001/toolbar\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" toolbar:id=\"toolbar\">\n";
-    static const char ToolBarEnd[]      = "</toolbar:toolbar>";
-
-    OUString aSysDirPath;
-    OString  aResFilePrefix = OUStringToOString( aResourceFilePrefix, RTL_TEXTENCODING_ASCII_US );
-
-    osl::FileBase::getSystemPathFromFileURL( aResourceDirURL, aSysDirPath );
-
-    String aSysDirPathStr( aSysDirPath );
-
-    ::com::sun::star::lang::Locale aLocale;
-    aLocale.Language = OUString::createFromAscii( Language_codes[0].pLanguage );
-    aLocale.Country = OUString::createFromAscii( Language_codes[0].pCountry );
-    ResMgr* pResMgr = ResMgr::CreateResMgr( aResFilePrefix.getStr(),
-                                            aLocale,
-                                            NULL,
-                                            &aSysDirPathStr );
-
-    WorkWindow* pWindow = new WorkWindow( NULL, WB_APP | WB_STDWORK | WB_HIDE );
-    if ( pResMgr )
-    {
-        int i = 0;
-        while ( TBResourceModule_Mapping[i].nResId > 0 )
-        {
-            if ( TBResourceModule_Mapping[i].eBelongsTo == eModule )
-            {
-                ResId   aResId( TBResourceModule_Mapping[i].nResId, pResMgr );
-                aResId.SetRT( RSC_TOOLBOX );
-
-                if ( pResMgr->IsAvailable( aResId ))
-                {
-                    OUString aOutputDirectoryURL( aOutDirURL );
-                    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-                        aOutputDirectoryURL += OUString::createFromAscii( "/" );
-
-                    OUString aOutputFileURL( aOutputDirectoryURL );
-                    aOutputFileURL += OUString::createFromAscii( TBResourceModule_Mapping[i].pXMLPrefix );
-                    aOutputFileURL += OUString::createFromAscii( ".xml" );
-
-                    osl::File aXMLFile( aOutputFileURL );
-                    osl::File::RC nRet = aXMLFile.open( OpenFlag_Create|OpenFlag_Write );
-                    if ( nRet == osl::File::E_EXIST )
-                    {
-                        nRet = aXMLFile.open( OpenFlag_Write );
-                        if ( nRet == osl::File::E_None )
-                            nRet = aXMLFile.setSize( 0 );
-                    }
-
-                    if ( nRet == osl::FileBase::E_None )
-                    {
-                        sal_uInt64 nWritten;
-
-                        aXMLFile.write( XMLStart, strlen( XMLStart ), nWritten );
-                        aXMLFile.write( ToolBarDocType, strlen( ToolBarDocType ), nWritten );
-                        aXMLFile.write( ToolBarStart, strlen( ToolBarStart ), nWritten );
-
-                        ToolBox* pToolBox = new ToolBox( pWindow, aResId );
-                        WriteToolBarXML( aXMLFile, (ToolBox *)pToolBox, eModule );
-                        delete pToolBox;
-
-                        aXMLFile.write( ToolBarEnd, strlen( ToolBarEnd ), nWritten );
-                        aXMLFile.close();
-
-                        TBResourceModule_Mapping[i].bWritten = true;
-                    }
-                }
-            }
-            ++i;
-        }
-
-        delete pResMgr;
-    }
-
-    delete pWindow;
-
-    return true;
-}
-
-class MyFloatingWindow : public FloatingWindow
-{
-    public:
-        MyFloatingWindow( Window* pParent, const ResId& rResId, const ResId& rSubTbxResId );
-        ~MyFloatingWindow()
-        {
-            delete pMyToolBox;
-        }
-
-        ToolBox* GetSubToolBox() { return pMyToolBox; }
-
-    private:
-        ToolBox* pMyToolBox;
-};
-
-MyFloatingWindow::MyFloatingWindow( Window* pParent, const ResId& rResId, const ResId& rSubTbxResId ) :
-    FloatingWindow( pParent, rResId )
-{
-    pMyToolBox = new ToolBox( this, rSubTbxResId );
-
-    FreeResource();
-}
-
-
-bool ReadResourceWriteSubToolBarXML( const OUString& aOutDirURL,
-                                     const OUString& aResourceDirURL,
-                                     const OUString& aResourceFilePrefix,
-                                     MODULES eModule,
-                                     const OUString& aProjectName )
-{
-    static const char ToolBarDocType[]  = "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">\n";
-    static const char ToolBarStart[]    = "<toolbar:toolbar xmlns:toolbar=\"http://openoffice.org/2001/toolbar\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" toolbar:id=\"toolbar\">\n";
-    static const char ToolBarEnd[]      = "</toolbar:toolbar>";
-
-    OUString aSysDirPath;
-    OString  aResFilePrefix = OUStringToOString( aResourceFilePrefix, RTL_TEXTENCODING_ASCII_US );
-
-    osl::FileBase::getSystemPathFromFileURL( aResourceDirURL, aSysDirPath );
-
-    String aSysDirPathStr( aSysDirPath );
-
-    ::com::sun::star::lang::Locale aLocale;
-    aLocale.Language = OUString::createFromAscii( Language_codes[0].pLanguage );
-    aLocale.Country = OUString::createFromAscii( Language_codes[0].pCountry );
-    ResMgr* pResMgr = ResMgr::CreateResMgr( aResFilePrefix.getStr(),
-                                            aLocale,
-                                            NULL,
-                                            &aSysDirPathStr );
-
-    WorkWindow* pWindow = new WorkWindow( NULL, WB_APP | WB_STDWORK | WB_HIDE );
-    if ( pResMgr )
-    {
-        int i = 0;
-        while ( TBSubResourceModule_Mapping[i].nParentResId > 0 )
-        {
-            if ( TBSubResourceModule_Mapping[i].eBelongsTo == eModule )
-            {
-                ResId   aParentResId( TBSubResourceModule_Mapping[i].nParentResId, pResMgr );
-                ResId   aResId( TBSubResourceModule_Mapping[i].nResId, pResMgr );
-                MyFloatingWindow* pFloatWin( 0 );
-
-                aResId.SetRT( RSC_TOOLBOX );
-                aParentResId.SetRT( RSC_FLOATINGWINDOW );
-
-                if ( pResMgr->IsAvailable( aParentResId ))
-                {
-                    pFloatWin = new MyFloatingWindow( pWindow, aParentResId, aResId );
-
-                    OUString aOutputDirectoryURL( aOutDirURL );
-                    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-                        aOutputDirectoryURL += OUString::createFromAscii( "/" );
-
-                    OUString aOutputFileURL( aOutputDirectoryURL );
-                    aOutputFileURL += OUString::createFromAscii( TBSubResourceModule_Mapping[i].pXMLPrefix );
-                    aOutputFileURL += OUString::createFromAscii( ".xml" );
-
-                    osl::File aXMLFile( aOutputFileURL );
-                    osl::File::RC nRet = aXMLFile.open( OpenFlag_Create|OpenFlag_Write );
-                    if ( nRet == osl::File::E_EXIST )
-                    {
-                        nRet = aXMLFile.open( OpenFlag_Write );
-                        if ( nRet == osl::File::E_None )
-                            nRet = aXMLFile.setSize( 0 );
-                    }
-
-                    if ( nRet == osl::FileBase::E_None )
-                    {
-                        sal_uInt64 nWritten;
-
-                        aXMLFile.write( XMLStart, strlen( XMLStart ), nWritten );
-                        aXMLFile.write( ToolBarDocType, strlen( ToolBarDocType ), nWritten );
-                        aXMLFile.write( ToolBarStart, strlen( ToolBarStart ), nWritten );
-
-                        ToolBox* pToolBox = pFloatWin->GetSubToolBox();
-                        if ( pToolBox )
-                            WriteToolBarXML( aXMLFile, (ToolBox *)pToolBox, eModule );
-
-                        aXMLFile.write( ToolBarEnd, strlen( ToolBarEnd ), nWritten );
-                        aXMLFile.close();
-
-                        TBSubResourceModule_Mapping[i].bWritten = true;
-                    }
-
-                    if ( pFloatWin )
-                    {
-                        delete pFloatWin;
-                        pFloatWin = 0;
-                    }
-                }
-            }
-            ++i;
-        }
-
-        delete pResMgr;
-    }
-
-    delete pWindow;
-
-    return true;
-}
-
-bool Convert( sal_Bool        bUseProduct,
-              const OUString& aUseRes,
-              const OUString& rVersion,
-              const OUString& rOutputDirName,
-              const OUString& rPlatformName,
-              const std::vector< OUString >& rInDirVector,
-              const OUString& rErrOutputFileName )
-{
-    OUString aWorkDir;
-
-    tools::getProcessWorkingDir( &aWorkDir );
-
-    // Try to find xx*.csv file and put all commands into hash table
-    for ( int i = 0; i < (int)rInDirVector.size(); i++ )
-    {
-        OUString aAbsInDirURL;
-        OUString aInDirURL;
-        OUString aInDir( rInDirVector[i] );
-
-        osl::FileBase::getFileURLFromSystemPath( aInDir, aInDirURL );
-        osl::FileBase::getAbsoluteFileURL( aWorkDir, aInDirURL, aAbsInDirURL );
-        osl::Directory aDir( aAbsInDirURL );
-        if ( aDir.open() == osl::FileBase::E_None )
-        {
-            osl::DirectoryItem aItem;
-            while ( aDir.getNextItem( aItem ) == osl::FileBase::E_None )
-            {
-                osl::FileStatus aFileStatus( FileStatusMask_FileName );
-
-                aItem.getFileStatus( aFileStatus );
-
-                int j=0;
-                OUString aFileName = aFileStatus.getFileName();
-
-                while ( ProjectModule_Mapping[j].pProjectFolder != 0 &&
-                        ProjectModule_Mapping[j].bSlotCommands == true )
-                {
-                    if ( aFileName.equalsAscii( ProjectModule_Mapping[j].pProjectFolder ))
-                    {
-                        OUStringBuffer aBuf( aAbsInDirURL );
-
-                        aBuf.appendAscii( "/" );
-                        aBuf.append( aFileStatus.getFileName() );
-                        aBuf.appendAscii( "/" );
-                        aBuf.append( rPlatformName );
-                        if ( bUseProduct )
-                            aBuf.appendAscii( ".pro" );
-                        aBuf.appendAscii( "/misc/xx" );
-                        aBuf.appendAscii( ProjectModule_Mapping[j].pCSVPrefix );
-                        aBuf.appendAscii( ".csv" );
-
-                        OUString aCSVFileURL( aBuf.makeStringAndClear() );
-                        ReadCSVFile( aCSVFileURL, ProjectModule_Mapping[j].eBelongsTo, OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ));
-                        break;
-                    }
-                    j++;
-                }
-            }
-
-            aDir.close();
-        }
-    }
-
-    OUString aVersionNumber;
-    bool bOk = ExtractVersionNumber( rVersion, aVersionNumber );
-    if ( bOk )
-    {
-        // Try to find the resource files and read in menus and slot infos
-        for ( int i = 0; i < (int)rInDirVector.size(); i++ )
-        {
-            OUString aAbsInDirURL;
-            OUString aInDirURL;
-            OUString aInDir( rInDirVector[i] );
-
-            osl::FileBase::getFileURLFromSystemPath( aInDir, aInDirURL );
-            osl::FileBase::getAbsoluteFileURL( aWorkDir, aInDirURL, aAbsInDirURL );
-            osl::Directory aDir( aAbsInDirURL );
-            if ( aDir.open() == osl::FileBase::E_None )
-            {
-                osl::DirectoryItem aItem;
-                while ( aDir.getNextItem( aItem ) == osl::FileBase::E_None )
-                {
-                    osl::FileStatus aFileStatus( FileStatusMask_FileName );
-
-                    aItem.getFileStatus( aFileStatus );
-
-                    int j=0;
-                    OUString aFileName = aFileStatus.getFileName();
-
-                    while ( ProjectModule_Mapping[j].pProjectFolder != 0 )
-                    {
-                        if ( aFileName.equalsAscii( ProjectModule_Mapping[j].pProjectFolder ))
-                        {
-                            OUStringBuffer aBuf( aAbsInDirURL );
-
-                            aBuf.appendAscii( "/" );
-                            aBuf.append( aFileStatus.getFileName() );
-                            aBuf.appendAscii( "/common" );
-                            if ( bUseProduct )
-                                aBuf.appendAscii( ".pro" );
-                            aBuf.appendAscii( "/bin/" );
-                            if ( aUseRes.equalsAscii( "so" ))
-                                aBuf.appendAscii( "so/" );
-
-                            OUString aResDirURL( aBuf.makeStringAndClear() );
-
-                            OUStringBuffer aLangResBuf;
-                            aLangResBuf.appendAscii( ProjectModule_Mapping[j].pResPrefix );
-                            aLangResBuf.append( aVersionNumber );
-                            OUString aLangResPrefix( aLangResBuf.makeStringAndClear() );
-
-                            for ( int k = 0; k < NUM_LANGUAGES; k++ )
-                            {
-                                char aBuf[8] = {0};
-
-                                ReadResourceFile( k,
-                                                  aResDirURL,
-                                                  aLangResPrefix,
-                                                  ProjectModule_Mapping[j].eBelongsTo,
-                                                  OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ),
-                                                  ProjectModule_Mapping[j].bSlotCommands );
-                            }
-
-                            OUString aOutDirURL;
-                            osl::FileBase::getFileURLFromSystemPath( rOutputDirName, aOutDirURL );
-                            osl::FileBase::getAbsoluteFileURL( aWorkDir, aOutDirURL, aOutDirURL );
-
-                            ReadResourceWriteMenuBarXML( aOutDirURL, aResDirURL, aLangResPrefix, ProjectModule_Mapping[j].eBelongsTo, OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ));
-                            ReadResourceWriteToolBarXML( aOutDirURL, aResDirURL, aLangResPrefix, ProjectModule_Mapping[j].eBelongsTo, OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ));
-                            ReadResourceWriteSubToolBarXML( aOutDirURL, aResDirURL, aLangResPrefix, ProjectModule_Mapping[j].eBelongsTo, OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ));
-                            ReadResourceWriteAcceleratorXML( aOutDirURL, aResDirURL, aLangResPrefix, ProjectModule_Mapping[j].eBelongsTo, ::rtl::OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ));
-                        }
-                        j++;
-                    }
-                }
-
-                aDir.close();
-            }
-        }
-    }
-
-    OUString aOutDirURL;
-    osl::FileBase::getFileURLFromSystemPath( rOutputDirName, aOutDirURL );
-    osl::FileBase::getAbsoluteFileURL( aWorkDir, aOutDirURL, aOutDirURL );
-
-    WriteXMLFiles( aOutDirURL );
-
-    sal_Int32 n = 0;
-    while ( TBResourceModule_Mapping[n].nResId > 0 )
-    {
-        if ( !TBResourceModule_Mapping[n].bWritten )
-            fprintf( stderr, "Warning: Couldn't convert toolbar %s\n", TBResourceModule_Mapping[n].pXMLPrefix );
-        n++;
-    }
-
-    n = 0;
-    while ( TBSubResourceModule_Mapping[n].nResId > 0 )
-    {
-        if ( !TBSubResourceModule_Mapping[n].bWritten )
-            fprintf( stderr, "Warning: Couldn't convert sub toolbar %s\n", TBSubResourceModule_Mapping[n].pXMLPrefix );
-        n++;
-    }
-
-    return true;
-}
-
-bool GetCommandOption( const ::std::vector< OUString >& rArgs, const OUString& rSwitch, OUString& rParam )
-{
-    bool        bRet = false;
-    OUString    aSwitch( OUString::createFromAscii( "-" ));
-
-    aSwitch += rSwitch;
-    for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
-    {
-        for( int n = 0; ( n < 2 ) && !bRet; n++ )
-        {
-            if ( aSwitch.equalsIgnoreAsciiCase( rArgs[ i ] ))
-            {
-                bRet = true;
-
-                if( i < ( nCount - 1 ) )
-                    rParam = rArgs[ i + 1 ];
-                else
-                    rParam = OUString();
-            }
-        }
-    }
-
-    return bRet;
-}
-
-// -----------------------------------------------------------------------
-
-bool GetCommandOptions( const ::std::vector< OUString >& rArgs, const OUString& rSwitch, ::std::vector< OUString >& rParams )
-{
-    bool bRet = false;
-
-    OUString    aSwitch( OUString::createFromAscii( "-" ));
-
-    aSwitch += rSwitch;
-    for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
-    {
-        for( int n = 0; ( n < 2 ) && !bRet; n++ )
-        {
-            if ( aSwitch.equalsIgnoreAsciiCase( rArgs[ i ] ))
-            {
-                if( i < ( nCount - 1 ) )
-                    rParams.push_back( rArgs[ i + 1 ] );
-                else
-                    rParams.push_back( OUString() );
-
-                break;
-            }
-        }
-    }
-
-    return( !rParams.empty() );
-}
-
-void ShowUsage()
-{
-    fprintf( stderr, "Usage: uicmdxml output_dir -r res -v version [-p] -s platform -i input_dir [-i input_dir] [-f errfile]\n" );
-    fprintf( stderr, "Options:" );
-    fprintf( stderr, "   -r [oo|so]    use resources from ooo, so\n" );
-    fprintf( stderr, "   -v            name of the version used, f.e. SRX645, SRC680\n" );
-    fprintf( stderr, "   -p            use product version\n" );
-    fprintf( stderr, "   -s            name of the system to use, f.e. wntmsci8, unxsols4, unxlngi5\n" );
-    fprintf( stderr, "   -i ...        name of directory to be searched for input files [multiple occurence is possible]\n" );
-    fprintf( stderr, "   -f            name of file, error output should be written to\n" );
-    fprintf( stderr, "Examples:\n" );
-    fprintf( stderr, "    uicmdxml /home/out -r so -v SRC680 -p unxlngi5 -i /home/res -f /home/out/log.err\n" );
-}
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-// -----------------------------------------------------------------------
-
-// Forward declaration
-void Main();
-
-// -----------------------------------------------------------------------
-
-SAL_IMPLEMENT_MAIN()
-{
-    Reference< XMultiServiceFactory > xMS;
-
-    // for this to work make sure an <appname>.ini file is available, you can just copy soffice.ini
-    Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
-    xMS = Reference< XMultiServiceFactory >( xComponentContext->getServiceManager() , UNO_QUERY );
-
-    InitVCL( xMS );
-    ::Main();
-    DeInitVCL();
-
-    return 0;
-}
-
-void Main()
-{
-    ::std::vector< OUString > aArgs;
-
-    sal_uInt32 nCmds = osl_getCommandArgCount();
-    if ( nCmds >= 8 )
-    {
-        for ( sal_uInt32 i=0; i < nCmds; i++ )
-        {
-            OUString aArg;
-            osl_getCommandArg( i, &aArg.pData );
-            aArgs.push_back( aArg );
-        }
-
-        ::std::vector< OUString > aInDirVector;
-        OUString                  aErrOutputFileName;
-        OUString                  aOutputDirName( aArgs[0] );
-        OUString                  aPlatformName;
-        OUString                  aVersion;
-        OUString                  aUseRes;
-        bool                      bUseProduct;
-        OUString                  aDummy;
-
-        GetCommandOption( aArgs, OUString::createFromAscii( "v" ), aVersion );
-        bUseProduct = GetCommandOption( aArgs, OUString::createFromAscii( "p" ), aDummy );
-        GetCommandOption( aArgs, OUString::createFromAscii( "s" ), aPlatformName );
-        GetCommandOptions( aArgs, OUString::createFromAscii( "i" ), aInDirVector );
-        GetCommandOption( aArgs, OUString::createFromAscii( "f" ), aErrOutputFileName );
-        GetCommandOption( aArgs, OUString::createFromAscii( "r" ), aUseRes );
-
-        if ( aVersion.getLength() > 0 &&
-             aPlatformName.getLength() > 0 &&
-             aUseRes.getLength() > 0 &&
-             !aInDirVector.empty() )
-        {
-            Convert( bUseProduct, aUseRes, aVersion, aOutputDirName, aPlatformName, aInDirVector, aErrOutputFileName );
-        }
-        else
-        {
-            ShowUsage();
-            exit( -1 );
-        }
-    }
-    else
-    {
-        ShowUsage();
-        exit( -1 );
-    }
-}
diff --git a/framework/collector/makefile.mk b/framework/collector/makefile.mk
deleted file mode 100644
index 11b9620ad4..0000000000
--- a/framework/collector/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=			framework
-TARGET=				framework_collector
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- login applikation -------------------------------------------------------
-
-APP1TARGET= 	uicmdxml
-
-APP1OBJS=		$(SLO)$/cmduicollector.obj
-
-APP1STDLIBS=	\
-                $(SALLIB)							\
-                $(VOSLIB)							\
-                $(TOOLSLIB)                         \
-                $(CPPULIB)                          \
-                $(COMPHELPERLIB)					\
-                $(CPPUHELPERLIB)					\
-                $(VCLLIB)
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/framework/collector/uicmdstohtml.cxx b/framework/collector/uicmdstohtml.cxx
deleted file mode 100644
index 8b685b3e3d..0000000000
--- a/framework/collector/uicmdstohtml.cxx
+++ /dev/null
@@ -1,1178 +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: uicmdstohtml.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_framework.hxx"
-
-#include <sal/main.h>
-#include <osl/file.hxx>
-#include <osl/thread.h>
-#include "tools/getprocessworkingdir.hxx"
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/string.hxx>
-
-#include <hash_map>
-#include <vector>
-#include <algorithm>
-
-using namespace rtl;
-
-enum MODULES
-{
-    MODULE_GLOBAL,
-    MODULE_WRITER,
-    MODULE_CALC,
-    MODULE_DRAWIMPRESS,
-    MODULE_CHART,
-    MODULE_MATH,
-    MODULE_BASIC,
-    MODULE_BIBLIO,
-    MODULE_BACKINGCOMP,
-    MODULE_DBACCESS,
-    MODULE_COUNT
-};
-
-enum APPMODULES
-{
-    APPMODULE_BACKINGCOMP,
-    APPMODULE_WRITER,
-    APPMODULE_WRITERWEB,
-    APPMODULE_WRITERGLOBAL,
-    APPMODULE_CALC,
-    APPMODULE_DRAW,
-    APPMODULE_IMPRESS,
-    APPMODULE_CHART,
-    APPMODULE_BIBLIOGRAPHY,
-    APPMODULE_BASICIDE,
-    APPMODULE_DBAPP,
-    APPMODULE_DBBROWSER,
-    APPMODULE_DBQUERY,
-    APPMODULE_DBRELATION,
-    APPMODULE_DBTABLE,
-    APPMODULE_COUNT
-};
-
-enum UIELEMENTTYPE
-{
-    UITYPE_TOOLBAR,
-    UITYPE_MENUBAR,
-    UITYPE_STATUSBAR,
-    UITYPE_ACCELERATOR,
-    UITYPE_COUNT
-};
-
-struct Projects
-{
-    const char* pProjectFolder;
-    const char* pResPrefix;
-    const char* pCSVPrefix;
-    bool        bSlotCommands;
-    MODULES     eBelongsTo;
-};
-
-struct AppModules
-{
-    const char* pModuleName;
-    const char* pModuleIdentifier;
-    const char* pProjectFolder;
-    const char* pSubFolder;
-};
-
-struct UIElementTypeName
-{
-    const char* Name;
-    const char* ShortName;
-};
-
-Projects ProjectModule_Mapping[] =
-{
-    { "sfx2"        , "sfx",    "sfx2",     true,   MODULE_GLOBAL         },
-    { "svx"         , "svx",    "svx",      true,   MODULE_GLOBAL         },
-    { "svx"         , "ofa",    "ofa",      true,   MODULE_GLOBAL         },
-    { "sw"          , "sw",     "sw",       true,   MODULE_WRITER         },
-    { "sd"          , "sd",     "sd",       true,   MODULE_DRAWIMPRESS    },
-    { "sc"          , "sc",     "sc",       true,   MODULE_CALC           },
-    { "sch"         , "sch",    "sch",      true,   MODULE_CHART          },
-    { "starmath"    , "sm",     "starmath", true,   MODULE_MATH           },
-    { "basctl"      , "basctl", "bastctl",  true,   MODULE_BASIC          },
-    { "extensions"  , "bib",    "",         false,  MODULE_BIBLIO         },
-    { "framework"   , "fwk",    "",         false,  MODULE_BACKINGCOMP    },
-    { "dbaccess"    , "dbu",    "",         false,  MODULE_DBACCESS       },
-    { 0             , 0,        "",         false,  MODULE_BASIC          }
-};
-
-AppModules AppModules_Mapping[] =
-{
-    { "Backing Component"       , "startmodule"     ,"framework" , 0                      },
-    { "Writer"                  , "swriter"         ,"sw"        , 0                      },
-    { "Writer Web"              , "sweb"            ,"sw"        , 0                      },
-    { "Writer Global"           , "sglobal"         ,"sw"        , 0                      },
-    { "Calc"                    , "scalc"           ,"sc"        , 0                      },
-    { "Draw"                    , "sdraw"           ,"sd"        , 0                      },
-    { "Impress"                 , "simpress"        ,"sd"        , 0                      },
-    { "Chart"                   , "schart"          ,"sch"       , 0                      },
-    { "Bibliography"            , "sbibliography"   ,"extensions", "source/bibliography"  },
-    { "Basic IDE"               , "basicide"        ,"basctl"    , 0                      },
-    { "Database Application"    , "dbapp"           ,"dbaccess"  , 0                      },
-    { "Database Browser"        , "dbbrowser"       ,"dbaccess"  , 0                      },
-    { "Database Query"          , "dbquery"         ,"dbaccess"  , 0                      },
-    { "Database Relation"       , "dbrelation"      ,"dbaccess"  , 0                      },
-    { "Database Table"          , "dbtable"         ,"dbaccess"  , 0                      },
-    { 0                         , 0                 ,0           , 0                      }
-};
-
-UIElementTypeName UIElementTypeFolderName[] =
-{
-    { "toolbar",    "T"  },
-    { "menubar",    "M"  },
-    { "statusbar",  "S"  },
-    { "accelerator","A"  },
-    { 0                  }
-};
-
-const char UICONFIGFOLDER[] = "uiconfig";
-
-const char XMLFileExtension[] = ".xcu";
-const char* ModuleName[] =
-{
-    "Global commands",
-    "Writer commands",
-    "Calc commands",
-    "Draw/Impress commands",
-    "Chart commands",
-    "Math commands",
-    "BasicIDE commands",
-    "Bibliography commands",
-    "Startmodule commands",
-    "Database commands",
-    0
-};
-
-const char* ModuleToXML_Mapping[] =
-{
-    "GenericCommands",
-    "WriterCommands",
-    "CalcCommands",
-    "DrawImpressCommands",
-    "ChartCommands",
-    "MathCommands",
-    "BasicIDECommands",
-    "BibliographyCommands",
-    "StartModuleCommands",
-    "DbuCommands",
-    0
-};
-
-struct CommandLabels
-{
-    unsigned short  nID;
-    rtl::OUString   aCommand;
-    rtl::OUString   aDefine;
-    unsigned long   nModules;
-    rtl::OUString   aLabels;
-    unsigned long   nProperties;
-    rtl::OUString   aUIAvailable;
-
-    CommandLabels() :
-    nID( 0 ),
-    nModules( 0 ),
-    nProperties( 0 )
-
-    {}
-    
-    bool CommandLabels::operator< ( const CommandLabels& aCmdLabel ) const
-    {
-        return ( aCommand.compareTo( aCmdLabel.aCommand ) <= 0 );
-    }
-};
-
-struct CommandInfo
-{
-    rtl::OUString   aCommand;
-    unsigned long   nAppModules; // bit field for every app module
-    unsigned long   nUIElements; // bit field for every ui element type
-
-    bool CommandInfo::operator< ( const CommandInfo& aCmdInfo ) const
-    {
-        return ( aCommand.compareTo( aCmdInfo.aCommand ) <= 0 );
-    }
-};
-
-struct OUStringHashCode
-{
-    size_t operator()( const ::rtl::OUString& sString ) const
-    {
-        return sString.hashCode();
-    }
-};
-
-typedef std::hash_map< rtl::OUString, CommandInfo, OUStringHashCode, ::std::equal_to< OUString > > CommandToCommandInfoMap;
-typedef std::hash_map< int, CommandLabels > CommandIDToLabelsMap;
-typedef std::vector< CommandLabels > CommandLabelsVector;
-typedef std::vector< CommandInfo > CommandInfoVector;
-
-static CommandIDToLabelsMap moduleMapFiles[MODULE_COUNT];
-static CommandLabelsVector moduleCmdVector[MODULE_COUNT];
-static CommandToCommandInfoMap commandInfoMap;
-static CommandInfoVector commandInfoVector;
-
-bool ExtractVersionNumber( const OUString& rVersion, OUString& rVersionNumber )
-{
-    bool bCheckNumOnly( false );
-
-    OUStringBuffer aBuf;
-
-    rVersionNumber = OUString();
-    for ( int i = 0; i < rVersion.getLength(); i++ )
-    {
-        if ( rVersion[i] >= sal_Unicode( '0' ) && rVersion[i] <= sal_Unicode( '9' ))
-        {
-            bCheckNumOnly = true;
-            aBuf.append( rVersion[i] );
-        }
-        else if ( bCheckNumOnly )
-            return false;
-    }
-
-    rVersionNumber = aBuf.makeStringAndClear();
-    return true;
-}
-
-bool ReadCSVFile( const OUString& aCVSFileURL, MODULES eModule, const OUString& aProjectName )
-{
-    osl::File  aCSVFile( aCVSFileURL );
-    fprintf(stdout, "############ read csv \"%s\" ... ", ::rtl::OUStringToOString(aCVSFileURL, RTL_TEXTENCODING_UTF8).getStr());
-    if ( aCSVFile.open( OpenFlag_Read ) != osl::FileBase::E_None )
-    {
-        fprintf(stdout, "failed!\n");
-        return false;
-    }
-    fprintf(stdout, "OK!\n");
-    
-    {
-        sal_Bool            bEOF;
-        ::rtl::ByteSequence aCSVLine;
-        OUString            aUnoCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-
-        while ( aCSVFile.isEndOfFile( &bEOF ) == osl::FileBase::E_None && !bEOF )
-        {
-            aCSVFile.readLine( aCSVLine );
-
-            OString     aLine( (const char *)aCSVLine.getConstArray(), aCSVLine.getLength() );
-            OString     aDefine;
-            OString     aID;
-            OString     aAccelState;
-            OString     aMenuState;
-            OString     aStatusState;
-            OString     aToolbarState;
-            OString     aCmdName;
-            OString     aSlotName;
-            OString     aImageRotationState;
-            OString     aImageReflectionState;
-
-            sal_Int32 nIndex = 0;
-            aDefine                 = aLine.getToken( 1, ',', nIndex );
-            aID                     = aLine.getToken( 0, ',', nIndex );
-            aAccelState             = aLine.getToken( 2, ',', nIndex );
-            aMenuState              = aLine.getToken( 0, ',', nIndex );
-            aStatusState            = aLine.getToken( 0, ',', nIndex );
-            aToolbarState           = aLine.getToken( 0, ',', nIndex );
-            aImageRotationState     = aLine.getToken( 8, ',', nIndex );
-            aImageReflectionState   = aLine.getToken( 0, ',', nIndex );
-            aCmdName                = aLine.getToken( 10, ',', nIndex );
-            aSlotName               = aLine.getToken( 1, ',', nIndex );
-
-            if ( aCmdName.getLength() == 0 )
-                aCmdName = aSlotName;
-
-            int nID = aID.toInt32();
-
-            if ( nID > 5000 && ( aAccelState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                                 aMenuState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                                 aStatusState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                                 aToolbarState.equalsIgnoreAsciiCase( "TRUE" ) ))
-            {
-                CommandLabels aCmdLabel;
-
-                aCmdLabel.nID = nID;
-                aCmdLabel.aCommand += OStringToOUString( aCmdName, RTL_TEXTENCODING_ASCII_US );
-                aCmdLabel.nModules |= ( 1 << (unsigned long)( eModule ));
-                aCmdLabel.aDefine = OStringToOUString( aDefine, RTL_TEXTENCODING_ASCII_US );
-                
-                OUString aUIAvailable;
-                if ( aAccelState.equalsIgnoreAsciiCase( "TRUE" ) ||
-                     aMenuState.equalsIgnoreAsciiCase( "TRUE" )  ||
-                     aToolbarState.equalsIgnoreAsciiCase( "TRUE" ))
-                    aUIAvailable = OUString::createFromAscii( "AMT" );
-                else if ( aStatusState.equalsIgnoreAsciiCase( "TRUE" ))
-                    aUIAvailable = OUString::createFromAscii( "S" );
-                aCmdLabel.aUIAvailable = aUIAvailable;
-
-                // Set bitfield
-                aCmdLabel.nProperties = (( aImageRotationState.equalsIgnoreAsciiCase( "TRUE" ) ? 1 : 0 ) << 1 );
-                aCmdLabel.nProperties |= (( aImageReflectionState.equalsIgnoreAsciiCase( "TRUE" ) ? 1 : 0 ) << 2 );
-
-                moduleMapFiles[int(eModule)].insert( CommandIDToLabelsMap::value_type( nID, aCmdLabel ));
-            }
-        }
-
-        aCSVFile.close();
-    }
-
-    return true;
-}
-
-bool ReadXMLFile( const OUString& aFileURL, APPMODULES eAppModule, UIELEMENTTYPE eUIType, const char* pItemTag, const char* pAttributeTag, sal_Int32 nAttributeTagSize )
-{
-    osl::File  aXMLFile( aFileURL );
-    if ( aXMLFile.open( OpenFlag_Read ) != osl::FileBase::E_None )
-    {
-        fprintf(stdout, "failed!\n");
-        return false;
-    }
-    
-    sal_Bool            bEOF;
-    ::rtl::ByteSequence aXMLLine;
-
-    while ( aXMLFile.isEndOfFile( &bEOF ) == osl::FileBase::E_None && !bEOF )
-    {
-        aXMLFile.readLine( aXMLLine );
-        
-        OString aLine( (const char *)aXMLLine.getConstArray(), aXMLLine.getLength() );
-        
-        if ( aLine.indexOf( pItemTag ) >= 0 )
-        {
-            sal_Int32 nIndex = aLine.indexOf( pAttributeTag );
-            if (( nIndex >= 0 ) && (( nIndex+nAttributeTagSize+1 ) < aLine.getLength() ))
-            {
-                sal_Int32 nIndex2 = aLine.indexOf( "\"", nIndex+nAttributeTagSize );
-                OString aCmd = aLine.copy( nIndex+nAttributeTagSize, (nIndex2-(nIndex+nAttributeTagSize)) );
-                
-                OUString aCmdString = OStringToOUString( aCmd, RTL_TEXTENCODING_ASCII_US );
-                
-                CommandToCommandInfoMap::iterator pIter = commandInfoMap.find( aCmdString );
-                if ( pIter != commandInfoMap.end() )
-                {
-                    pIter->second.nAppModules |= ( 1 << eAppModule );
-                    pIter->second.nUIElements |= ( 1 << eUIType );
-                }
-                else
-                {
-                    CommandInfo aCmdInfo;
-                    aCmdInfo.aCommand = aCmdString;
-                    aCmdInfo.nAppModules = ( 1 << eAppModule );
-                    aCmdInfo.nUIElements = ( 1 << eUIType );
-                    commandInfoMap.insert( CommandToCommandInfoMap::value_type( aCmdString, aCmdInfo ));
-                }
-            }
-        }
-    }
-
-    return true;
-}
-
-bool ReadMenuBarXML( const OUString& aFileURL, APPMODULES eAppModule )
-{
-    static char MENUITEM_TAG[]      = "<menu:menuitem";
-    static char MENUITEM_ID[]       = "menu:id=\"";
-    static int  MENUITEM_ID_SIZE    = strlen( MENUITEM_ID );
-
-    return ReadXMLFile( aFileURL, eAppModule, UITYPE_MENUBAR, MENUITEM_TAG, MENUITEM_ID, MENUITEM_ID_SIZE );
-}
-
-bool ReadToolBarXML( const OUString& aFileURL, APPMODULES eAppModule )
-{
-    static char TOOLBARITEM_TAG[]      = "<toolbar:toolbaritem";
-    static char TOOLBARITEM_ID[]       = "xlink:href=\"";
-    static int  TOOLBARITEM_ID_SIZE    = strlen( TOOLBARITEM_ID );
-
-    return ReadXMLFile( aFileURL, eAppModule, UITYPE_TOOLBAR, TOOLBARITEM_TAG, TOOLBARITEM_ID, TOOLBARITEM_ID_SIZE );
-}
-
-bool ReadStatusBarXML( const rtl::OUString& aFileURL, APPMODULES eAppModule )
-{
-    static char STATUSBARITEM_TAG[]      = "<statusbar:statusbaritem";
-    static char STATUSBARITEM_ID[]       = "xlink:href=\"";
-    static int  STATUSBARITEM_ID_SIZE    = strlen( STATUSBARITEM_ID );
-    
-    return ReadXMLFile( aFileURL, eAppModule, UITYPE_STATUSBAR, STATUSBARITEM_TAG, STATUSBARITEM_ID, STATUSBARITEM_ID_SIZE );
-}
-
-bool ReadAcceleratorXML( const rtl::OUString& aFileURL, APPMODULES eAppModule )
-{
-    static char ACCELERATORITEM_TAG[]      = "<accel:item";
-    static char ACCELERATORITEM_ID[]       = "xlink:href=\"";
-    static int  ACCELERATORITEM_ID_SIZE    = strlen( ACCELERATORITEM_ID );
-    
-    return ReadXMLFile( aFileURL, eAppModule, UITYPE_ACCELERATOR, ACCELERATORITEM_TAG, ACCELERATORITEM_ID, ACCELERATORITEM_ID_SIZE );
-}
-
-bool ReadXMLFile( const rtl::OUString& aFileURL, APPMODULES eAppModule, UIELEMENTTYPE eUIElementType )
-{
-    switch ( eUIElementType )
-    {
-        case UITYPE_TOOLBAR:
-            return ReadToolBarXML( aFileURL, eAppModule );
-        case UITYPE_MENUBAR:
-            return ReadMenuBarXML( aFileURL, eAppModule );
-        case UITYPE_STATUSBAR:
-            return ReadStatusBarXML( aFileURL, eAppModule );
-        case UITYPE_ACCELERATOR:
-            return ReadAcceleratorXML( aFileURL, eAppModule );
-        default:
-            return false;
-    }
-}
-
-bool ReadXMLFilesForAppModule( const rtl::OUString& aFolderURL, APPMODULES eAppModule )
-{
-    osl::Directory aDir( aFolderURL );
-    if ( aDir.open() == osl::FileBase::E_None )
-    {
-        osl::DirectoryItem aFolderItem;
-        while ( aDir.getNextItem( aFolderItem ) == osl::FileBase::E_None )
-        {
-            osl::FileStatus aFileStatus( FileStatusMask_FileName );
-
-            aFolderItem.getFileStatus( aFileStatus );
-
-            OUString aFolderName = aFileStatus.getFileName();
-            int i=0;
-            while ( i < UITYPE_COUNT )
-            {
-                if ( aFolderName.equalsAscii( UIElementTypeFolderName[i].Name ))
-                {
-                    OUStringBuffer aBuf( aFolderURL );
-                    aBuf.appendAscii( "/" );
-                    aBuf.append( aFolderName );
-
-                    OUString aUIElementFolderURL( aBuf.makeStringAndClear() );
-                    osl::Directory aUIElementTypeDir( aUIElementFolderURL );
-                    if ( aUIElementTypeDir.open() == osl::FileBase::E_None )
-                    {
-                        osl::DirectoryItem aItem;
-                        while ( aUIElementTypeDir.getNextItem( aItem ) == osl::FileBase::E_None )
-                        {
-                            osl::FileStatus aFileStatus( FileStatusMask_FileName );
-
-                            aItem.getFileStatus( aFileStatus );
-                            if ( aFileStatus.getFileType() == osl_File_Type_Regular )
-                            {
-                                OUStringBuffer aBuf( aUIElementFolderURL );
-                                aBuf.appendAscii( "/" );
-                                aBuf.append( aFileStatus.getFileName() );
-
-                                ReadXMLFile( aBuf.makeStringAndClear(), eAppModule, (UIELEMENTTYPE)i );
-                            }
-                            else if (( aFileStatus.getFileType() == osl_File_Type_Directory ) &&
-                                     ( aFileStatus.getFileName().equalsAscii( "en-US" )))
-                            {
-                                // Accelerators are language-dependent
-                                OUStringBuffer aBuf( aUIElementFolderURL );
-                                aBuf.appendAscii( "/" );
-                                aBuf.append( aFileStatus.getFileName() );
-                                aBuf.appendAscii( "/default.xml" );
-                                
-                                ReadXMLFile( aBuf.makeStringAndClear(), eAppModule, (UIELEMENTTYPE)i );
-                            }
-                        }
-                    }
-                    break;
-                }
-                ++i;
-            }
-        }
-    }
-
-    return true;
-}
-
-void SortCommandTable( MODULES eModule )
-{
-    // copy entries from hash_map to vector
-    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[int( eModule)].begin();
-    while ( pIter != moduleMapFiles[int( eModule )].end() )
-    {
-        CommandLabels& rCmdLabels = pIter->second;
-        moduleCmdVector[int( eModule )].push_back( rCmdLabels );
-        ++pIter;
-    }
-    
-    CommandLabelsVector::iterator pIterStart = moduleCmdVector[int(eModule)].begin();
-    CommandLabelsVector::iterator pIterEnd   = moduleCmdVector[int(eModule)].end();
-
-    std::sort( pIterStart, pIterEnd );
-}
-
-void SortCommandInfoVector()
-{
-    // copy entries from hash_map to vector
-    CommandToCommandInfoMap::iterator pIter = commandInfoMap.begin();
-    while ( pIter != commandInfoMap.end() )
-    {
-        CommandInfo& rCmdInfo = pIter->second;
-        commandInfoVector.push_back( rCmdInfo );
-        ++pIter;
-    }
-    
-    CommandInfoVector::iterator pIterStart = commandInfoVector.begin();
-    CommandInfoVector::iterator pIterEnd   = commandInfoVector.end();
-
-    std::sort( pIterStart, pIterEnd );
-}
-
-CommandLabels* RetrieveCommandLabelsFromID( unsigned short nId, MODULES eModule )
-{
-    CommandIDToLabelsMap::iterator pIter = moduleMapFiles[MODULE_GLOBAL].find( nId );
-    if ( pIter != moduleMapFiles[MODULE_GLOBAL].end() )
-        return &(pIter->second);
-    else if ( eModule != MODULE_GLOBAL )
-    {
-        CommandIDToLabelsMap::iterator pIter = moduleMapFiles[eModule].find( nId );
-        if ( pIter != moduleMapFiles[eModule].end() )
-            return &(pIter->second);
-    }
-
-    return NULL;
-}
-
-static const char ENCODED_AMPERSAND[]  = "&amp;";
-static const char ENCODED_LESS[]       = "&lt;";
-static const char ENCODED_GREATER[]    = "&gt;";
-static const char ENCODED_QUOTE[]      = "&quot;";
-static const char ENCODED_APOS[]       = "&apos;";
-
-struct EncodeChars
-{
-    char  cChar;
-    const char* pEncodedChars;
-};
-
-EncodeChars EncodeChar_Map[] =
-{
-    { '&', ENCODED_AMPERSAND    },
-    { '<', ENCODED_LESS         },
-    { '>', ENCODED_GREATER      },
-    { '"', ENCODED_QUOTE        },
-    { '\'', ENCODED_APOS        },
-    { ' ', 0                    }
-};
-
-// Encodes a string to UTF-8 and uses "Built-in entity reference" to
-// to escape character data that is not markup!
-OString EncodeString( const OUString& aToEncodeStr )
-{
-    OString aString = OUStringToOString( aToEncodeStr, RTL_TEXTENCODING_UTF8 );
-
-    int     i = 0;
-    bool    bMustCopy( sal_False );
-    while ( EncodeChar_Map[i].pEncodedChars != 0 )
-    {
-        OStringBuffer aBuf;
-        bool bEncoded( false );
-
-        sal_Int32 nCurIndex = 0;
-        sal_Int32 nIndex    = 0;
-        while ( nIndex < aString.getLength() )
-        {
-            nIndex = aString.indexOf( EncodeChar_Map[i].cChar, nIndex );
-            if ( nIndex > 0 )
-            {
-                bEncoded = true;
-                if ( nIndex > nCurIndex )
-                    aBuf.append( aString.copy( nCurIndex, nIndex-nCurIndex ));
-                aBuf.append( EncodeChar_Map[i].pEncodedChars );
-                nCurIndex = nIndex+1;
-            }
-            else if ( nIndex == 0 )
-            {
-                bEncoded = true;
-                aBuf.append( EncodeChar_Map[i].pEncodedChars );
-                nCurIndex = nIndex+1;
-            }
-            else
-            {
-                if ( bEncoded && nCurIndex < aString.getLength() )
-                    aBuf.append( aString.copy( nCurIndex ));
-                break;
-            }
-            ++nIndex;
-        }
-
-        if ( bEncoded )
-            aString = aBuf.makeStringAndClear();
-        ++i;
-    }
-
-    return aString;
-}
-
-static const char HTMLStart[]        = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n";
-static const char HTMLHead[]         = "<html>\n \
- <head>\n \
- \n \
- <meta http-equiv=\"CONTENT-TYPE\"\n \
- content=\"text/html; charset=windows-1252\">\n \
- <title>OpenOffice.org 2.0 : Index of command names</title>\n \
-\n \
-  <style>\n \
-        <!-- \n \
-        BODY,DIV,TABLE,THEAD,TBODY,TFOOT,TR,TH,TD,P { font-family:\"Albany\"; font-size:x-small }\n \
-         -->\n \
-    </style>\n \
-\n \
-</head>\n \
-<body text=\"#000000\">";
-
-static const char HTMLJumpTable[] = "<h1><b>Command tables for OpenOffice.org 2.0<br/>\n \
-</b></h1>\n \
-<br/>\n \
-<p>The following tables list all available commands that are\n \
-accessible through the GUI. The command names  are used with the \".uno:\"\n \
-protocol scheme to define framework commands. These  command URLs can be\n \
-used to dispatch/execute, like \".uno:About\" shows the about box.\n \
-Please keep in mind that slot-URLs are deprecated for OpenOffice.org 2.0 and\n \
-shouldn't be used anymore.<br/>\n \
-<br/>\n \
-Abbreviations:<br/>\n \
-A = accelerator<br/>\n \
-M = menu<br/>\n \
-T = toolbox<br/>\n \
-S = status bar<br/>\n \
-</p>\n \
-<br/>\n";
-
-bool WriteLevel( osl::File& rFile, int nLevel )
-{
-    const char cTab[] = "\t";
-
-    sal_uInt64 nWritten;
-    for ( int i = 0; i < nLevel; i++ )
-        rFile.write( cTab, strlen( cTab ), nWritten );
-
-    return true;
-}
-
-bool WriteJumpTable( osl::File& rFile )
-{
-    static const char JUMP_ENTRY_1[] = "- ";
-    static const char JUMP_LINK_1[]  = "<a href=\"#";
-    static const char JUMP_LINK_2[]  = "\">";
-    static const char JUMP_LINK_3[]  = "</a>";
-    static const char JUMP_ENTRY_2[] = "<br/>\n";
-
-    sal_uInt64 nWritten;
-
-    rFile.write( HTMLJumpTable, strlen( HTMLJumpTable ), nWritten );
-    
-    sal_uInt32 i = 0;
-    while ( ModuleName[i] != 0 )
-    {
-        if ( !moduleMapFiles[i].empty() )
-        {
-            OString aTableNameStr( ModuleName[i] );
-            OStringBuffer aJumpMark( aTableNameStr );
-
-            // convert jump mark
-            for ( sal_Int32 j = 0; j < aJumpMark.getLength(); j++ )
-                if ( aJumpMark[j] == ' ' )
-                    aJumpMark.setCharAt( j, '_' );
-            
-            rFile.write( JUMP_ENTRY_1, strlen( JUMP_ENTRY_1 ), nWritten );
-            rFile.write( JUMP_LINK_1, strlen( JUMP_LINK_1 ), nWritten );
-            rFile.write( aJumpMark, aJumpMark.getLength(), nWritten );
-            rFile.write( JUMP_LINK_2, strlen( JUMP_LINK_2 ), nWritten );
-            rFile.write( aTableNameStr, aTableNameStr.getLength(), nWritten );
-            rFile.write( JUMP_LINK_3, strlen( JUMP_LINK_3 ), nWritten );
-            rFile.write( JUMP_ENTRY_2, strlen( JUMP_ENTRY_2 ), nWritten );
-        }
-        i++;
-    }
-    
-    return true;
-}
-
-bool WriteHTMLTable( osl::File& rFile, const rtl::OUString& aTableName )
-{
-    static const char TABLE_NAME1[] = "<h2>";
-    static const char TABLE_NAME2[] = "</h2>\n";
-    static const char ANCHOR_1[]    = "<a name=\"";
-    static const char ANCHOR_2[]    = "\"></a>";
-    static const char TABLE_FRAME[] = "<table frame=\"box\" cellspacing=\"0\" cols=\"4\" rules=\"groups\" border=\"1\">\n";
-    static const char COLGROUPS1[]  = "<colgroup><col width=\"189\"></colgroup> 	<colgroup><col width=\"93\"></colgroup>\n";
-    static const char COLGROUPS2[]  = "<colgroup><col width=\"277\"></colgroup> 	<colgroup><col width=\"47\"></colgroup>\n";
-    static const char TBODY_1[]     = "<tbody>\n\t<tr>\n";
-    static const char TBODY_2[]     = "\t</tr>\n</tbody>\n";
-    static const char TD_1[]        = "<td width=\"189\" height=\"17\" align=\"left\"><b>Commands</b></td>\n";
-    static const char TD_2[]        = "<td width=\"93\" align=\"left\"><b>GUI Elements</b></td>\n";
-    static const char TD_3[]        = "<td width=\"277\" align=\"left\"><b>Internal definitions of commands ID</b></td>\n";
-    static const char TD_4[]        = "<td width=\"47\" align=\"left\"><b>ID</b></td>\n";
-
-    if ( aTableName.getLength() > 0 )
-    {
-        sal_uInt64 nWritten;
-        OString aTableNameStr = OUStringToOString( aTableName, RTL_TEXTENCODING_ASCII_US );
-        OStringBuffer aJumpMark( aTableNameStr );
-
-        // convert jump mark
-        for ( sal_Int32 j = 0; j < aJumpMark.getLength(); j++ )
-            if ( aJumpMark[j] == ' ' )
-                aJumpMark.setCharAt( j, '_' );
-
-        rFile.write( TABLE_NAME1, strlen( TABLE_NAME1 ), nWritten );
-        rFile.write( ANCHOR_1, strlen( ANCHOR_1 ), nWritten );
-        rFile.write( aJumpMark, aJumpMark.getLength(), nWritten );
-        rFile.write( ANCHOR_2, strlen( ANCHOR_2 ), nWritten );
-        rFile.write( aTableNameStr, aTableNameStr.getLength(), nWritten );
-        rFile.write( TABLE_NAME2, strlen( TABLE_NAME2 ), nWritten );
-        rFile.write( TABLE_FRAME, strlen( TABLE_FRAME ), nWritten );
-        rFile.write( COLGROUPS1, strlen( COLGROUPS1 ), nWritten );
-        rFile.write( COLGROUPS2, strlen( COLGROUPS2 ), nWritten );
-        rFile.write( TBODY_1, strlen( TBODY_1 ), nWritten );
-        rFile.write( TD_1, strlen( TD_1 ), nWritten );
-        rFile.write( TD_2, strlen( TD_2 ), nWritten );
-        rFile.write( TD_3, strlen( TD_3 ), nWritten );
-        rFile.write( TD_4, strlen( TD_4 ), nWritten );
-    }
-
-    return true;
-}
-
-bool WriteHTMLTableRow( osl::File& rFile, const CommandLabels& rCmdLabels )
-{
-    static const char TBODY_1[]     = "<tbody>\n\t<tr>\n";
-    static const char TBODY_2[]     = "\t</tr>\n</tbody>\n";
-    static const char TD_FIRST[]    = "\t<td height=\"17\" align=\"left\">";
-    static const char TD_L[]        = "\t<td align=\"left\">";
-    static const char TD_R[]        = "\t<td align=\"right\">";
-    static const char TD_CLOSE[]    = "</td>\n";
-
-    OString aCmdStr = OUStringToOString( rCmdLabels.aCommand, RTL_TEXTENCODING_UTF8 );
-    OString aUIStr  = OUStringToOString( rCmdLabels.aUIAvailable, RTL_TEXTENCODING_UTF8 );
-    OString aDefStr = OUStringToOString( rCmdLabels.aDefine, RTL_TEXTENCODING_UTF8 );
-    OString aIDStr  = OString::valueOf( sal_Int32( rCmdLabels.nID ));
-    
-    sal_uInt64 nWritten;
-    rFile.write( TBODY_1, strlen( TBODY_1 ), nWritten );
-
-    rFile.write( TD_FIRST, strlen( TD_FIRST ), nWritten );
-    rFile.write( aCmdStr, aCmdStr.getLength(), nWritten );
-    rFile.write( TD_CLOSE, strlen( TD_CLOSE ), nWritten );
-
-    rFile.write( TD_L, strlen( TD_L ), nWritten );
-    rFile.write( aUIStr, aUIStr.getLength(), nWritten );
-    rFile.write( TD_CLOSE, strlen( TD_CLOSE ), nWritten );
-
-    rFile.write( TD_L, strlen( TD_L ), nWritten );
-    rFile.write( aDefStr, aDefStr.getLength(), nWritten );
-    rFile.write( TD_CLOSE, strlen( TD_CLOSE ), nWritten );
-
-    rFile.write( TD_R, strlen( TD_R ), nWritten );
-    rFile.write( aIDStr, aIDStr.getLength(), nWritten );
-    rFile.write( TD_CLOSE, strlen( TD_CLOSE ), nWritten );
-
-    rFile.write( TBODY_2, strlen( TBODY_2 ), nWritten );
-    
-    return true;
-}
-
-bool WriteHTMLTableClose( osl::File& rFile )
-{
-    static const char TBODY_CLOSE[]     = "\t</tr>\n</tbody>\n";
-    static const char TABLE_CLOSE[]     = "</table>\n";
-    static const char BR[]              = "<br/>\n";
-    
-    sal_uInt64 nWritten;
-    rFile.write( TBODY_CLOSE, strlen( TBODY_CLOSE ), nWritten );
-    rFile.write( TABLE_CLOSE, strlen( TABLE_CLOSE ), nWritten );
-    rFile.write( BR, strlen( BR ), nWritten );
-
-    return true;
-}
-
-bool WriteHTMLFile( const OUString& aOutputDirURL)
-{
-    OUString aOutputDirectoryURL( aOutputDirURL );
-    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-        aOutputDirectoryURL += OUString::createFromAscii( "/" );
-
-    OUString aOutputFileURL( aOutputDirectoryURL );
-    aOutputFileURL += OUString::createFromAscii( "commandsReference.html" );
-    
-    osl::File aHTMLFile( aOutputFileURL );
-    osl::File::RC nRet = aHTMLFile.open( OpenFlag_Create|OpenFlag_Write );
-    if ( nRet == osl::File::E_EXIST )
-    {
-        nRet = aHTMLFile.open( OpenFlag_Write );
-        if ( nRet == osl::File::E_None )
-            nRet = aHTMLFile.setSize( 0 );
-    }
-
-    if ( nRet == osl::FileBase::E_None )
-    {
-        sal_uInt64 nWritten;
-
-        aHTMLFile.write( HTMLStart, strlen( HTMLStart ), nWritten );
-        aHTMLFile.write( HTMLHead, strlen( HTMLHead ), nWritten );
-        
-        WriteJumpTable( aHTMLFile );
-
-        int i = 0;
-        while ( ModuleToXML_Mapping[i] != 0 )
-        {
-            SortCommandTable( MODULES( i ));
-            if ( !moduleCmdVector[i].empty() )
-            {
-                WriteHTMLTable( aHTMLFile, OUString::createFromAscii( ModuleName[i] ));
-
-                for ( sal_uInt32 j = 0; j < moduleCmdVector[i].size(); j++ )
-                {
-                    CommandLabels& rCmdLabels = (moduleCmdVector[i])[j];
-                    WriteHTMLTableRow( aHTMLFile, rCmdLabels );
-                }
-                
-                WriteHTMLTableClose( aHTMLFile );
-            }
-            ++i;
-        }
-        aHTMLFile.close();
-    }
-
-    return true;
-}
-
-bool WriteUICommand( osl::File& rFile, const CommandInfo& rCmdInfo )
-{
-    static const char MODULE_HAS_COMMAND[] = ",1";
-    static const char MODULE_NOT_COMMAND[] = ",0";
-    static const char NEWLINE[]            = "\n";
-    static const char COMMA[]              = ",";
-
-    sal_uInt64 nWritten;
-
-    OString aCommand = OUStringToOString( rCmdInfo.aCommand, RTL_TEXTENCODING_ASCII_US );
-
-    rFile.write( aCommand, aCommand.getLength(), nWritten );
-    rFile.write( COMMA, strlen( COMMA ), nWritten );
-
-    if ( rCmdInfo.nUIElements & ( 1<<UITYPE_ACCELERATOR ))
-        rFile.write( UIElementTypeFolderName[UITYPE_ACCELERATOR].ShortName, strlen( UIElementTypeFolderName[UITYPE_ACCELERATOR].ShortName ), nWritten );
-    if ( rCmdInfo.nUIElements & ( 1<<UITYPE_TOOLBAR))
-        rFile.write( UIElementTypeFolderName[UITYPE_TOOLBAR].ShortName, strlen( UIElementTypeFolderName[UITYPE_TOOLBAR].ShortName ), nWritten );
-    if ( rCmdInfo.nUIElements & ( 1<<UITYPE_MENUBAR ))
-        rFile.write( UIElementTypeFolderName[UITYPE_MENUBAR].ShortName, strlen( UIElementTypeFolderName[UITYPE_MENUBAR].ShortName ), nWritten );
-    if ( rCmdInfo.nUIElements & ( 1<<UITYPE_STATUSBAR ))
-        rFile.write( UIElementTypeFolderName[UITYPE_STATUSBAR].ShortName, strlen( UIElementTypeFolderName[UITYPE_STATUSBAR].ShortName ), nWritten );
-
-    sal_Int32 nApps = rCmdInfo.nAppModules;
-    for ( sal_Int32 i = 0; i < APPMODULE_COUNT; i++ )
-    {
-        if ( nApps & ( 1 << i ))
-            rFile.write( MODULE_HAS_COMMAND, strlen( MODULE_HAS_COMMAND ), nWritten );
-        else
-            rFile.write( MODULE_NOT_COMMAND, strlen( MODULE_NOT_COMMAND ), nWritten );
-    }
-    rFile.write( NEWLINE, strlen( NEWLINE ), nWritten );
-
-    return true;
-}
-
-bool WriteUICommands( const OUString& aOutputDirURL )
-{
-    static const char COMMA[]   = ",";
-    static const char HEADER[]  = "User interface command, GUI Element";
-    static const char NEWLINE[] = "\n";
-
-    OUString aOutputDirectoryURL( aOutputDirURL );
-    if ( aOutputDirectoryURL.getLength() > 0 && aOutputDirectoryURL[aOutputDirectoryURL.getLength()-1] != '/' )
-        aOutputDirectoryURL += OUString::createFromAscii( "/" );
-
-    OUString aOutputFileURL( aOutputDirectoryURL );
-    aOutputFileURL += OUString::createFromAscii( "UsedCommands.csv" );
-
-    osl::File aCSVFile( aOutputFileURL );
-    osl::File::RC nRet = aCSVFile.open( OpenFlag_Create|OpenFlag_Write );
-    if ( nRet == osl::File::E_EXIST )
-    {
-        nRet = aCSVFile.open( OpenFlag_Write );
-        if ( nRet == osl::File::E_None )
-            nRet = aCSVFile.setSize( 0 );
-    }
-
-    if ( nRet == osl::FileBase::E_None )
-    {
-        sal_uInt64 nWritten;
-
-        aCSVFile.write( HEADER, strlen( HEADER ), nWritten );
-        for ( sal_Int32 i = 0; i < APPMODULE_COUNT; i++ )
-        {
-            aCSVFile.write( COMMA, strlen( COMMA ), nWritten );
-            aCSVFile.write( AppModules_Mapping[i].pModuleName, strlen( AppModules_Mapping[i].pModuleName ), nWritten );
-        }
-        aCSVFile.write( NEWLINE, strlen( NEWLINE ), nWritten );
-
-        for ( sal_uInt32 j = 0; j < commandInfoVector.size(); j++ )
-        {
-            const CommandInfo& rCmdInfo = commandInfoVector[j];
-            WriteUICommand( aCSVFile, rCmdInfo );
-        }
-
-        aCSVFile.close();
-    }
-
-    return true;
-}
-
-bool Convert( sal_Bool        bUseProduct,
-              const OUString& aUseRes,
-              const OUString& rVersion,
-              const OUString& rOutputDirName,
-              const OUString& rPlatformName,
-              const std::vector< OUString >& rInDirVector,
-              const OUString& rErrOutputFileName )
-{
-    OUString aWorkDir;
-
-    tools::getProcessWorkingDir( &aWorkDir );
-
-    // Try to find xx*.csv file and put all commands into hash table
-    for ( int i = 0; i < (int)rInDirVector.size(); i++ )
-    {
-        OUString aAbsInDirURL;
-        OUString aInDirURL;
-        OUString aInDir( rInDirVector[i] );
-
-        osl::FileBase::getFileURLFromSystemPath( aInDir, aInDirURL );
-        osl::FileBase::getAbsoluteFileURL( aWorkDir, aInDirURL, aAbsInDirURL );
-        osl::Directory aDir( aAbsInDirURL );
-        if ( aDir.open() == osl::FileBase::E_None )
-        {
-            osl::DirectoryItem aItem;
-            while ( aDir.getNextItem( aItem ) == osl::FileBase::E_None )
-            {
-                osl::FileStatus aFileStatus( FileStatusMask_FileName );
-
-                aItem.getFileStatus( aFileStatus );
-
-                int j=0;
-                OUString aFileName = aFileStatus.getFileName();
-
-                while ( ProjectModule_Mapping[j].pProjectFolder != 0 &&
-                        ProjectModule_Mapping[j].bSlotCommands == true )
-                {
-                    if ( aFileName.equalsAscii( ProjectModule_Mapping[j].pProjectFolder ))
-                    {
-                        OUStringBuffer aBuf( aAbsInDirURL );
-
-                        aBuf.appendAscii( "/" );
-                        aBuf.append( aFileStatus.getFileName() );
-                        aBuf.appendAscii( "/" );
-                        aBuf.append( rPlatformName );
-                        if ( bUseProduct )
-                            aBuf.appendAscii( ".pro" );
-                        aBuf.appendAscii( "/misc/xx" );
-                        aBuf.appendAscii( ProjectModule_Mapping[j].pCSVPrefix );
-                        aBuf.appendAscii( ".csv" );
-
-                        OUString aCSVFileURL( aBuf.makeStringAndClear() );
-                        ReadCSVFile( aCSVFileURL, ProjectModule_Mapping[j].eBelongsTo, OUString::createFromAscii( ProjectModule_Mapping[j].pProjectFolder ));
-                        break;
-                    }
-                    ++j;
-                }
-
-                j = 0;
-                while ( AppModules_Mapping[j].pModuleIdentifier != 0 )
-                {
-                    if ( aFileName.equalsAscii( AppModules_Mapping[j].pProjectFolder ))
-                    {
-                        OUStringBuffer aBuf( aAbsInDirURL );
-
-                        aBuf.appendAscii( "/" );
-                        aBuf.append( aFileName );
-                        aBuf.appendAscii( "/" );
-                        if ( AppModules_Mapping[j].pSubFolder != 0 )
-                        {
-                            aBuf.appendAscii( AppModules_Mapping[j].pSubFolder );
-                            aBuf.appendAscii( "/" );
-                        }
-                        aBuf.appendAscii( UICONFIGFOLDER );
-                        aBuf.appendAscii( "/" );
-                        aBuf.appendAscii( AppModules_Mapping[j].pModuleIdentifier );
-                        
-                        OUString aXMLAppModuleFolder( aBuf.makeStringAndClear() );
-                        ReadXMLFilesForAppModule( aXMLAppModuleFolder, (APPMODULES)j );
-                    }
-                    ++j;
-                }
-            }
-
-            aDir.close();
-        }
-    }
-
-    OUString aOutDirURL;
-    osl::FileBase::getFileURLFromSystemPath( rOutputDirName, aOutDirURL );
-    osl::FileBase::getAbsoluteFileURL( aWorkDir, aOutDirURL, aOutDirURL );
-
-    WriteHTMLFile( aOutDirURL );
-
-    SortCommandInfoVector();
-    WriteUICommands( aOutDirURL );
-
-    return true;
-}
-
-bool GetCommandOption( const ::std::vector< OUString >& rArgs, const OUString& rSwitch, OUString& rParam )
-{
-    bool        bRet = false;
-    OUString    aSwitch( OUString::createFromAscii( "-" ));
-
-    aSwitch += rSwitch;
-    for( int i = 0, nCount = rArgs.size(); ( i < nCount ) && !bRet; i++ )
-    {
-        for( int n = 0; ( n < 2 ) && !bRet; n++ )
-        {
-            if ( aSwitch.equalsIgnoreAsciiCase( rArgs[ i ] ))
-            {
-                bRet = true;
-
-                if( i < ( nCount - 1 ) )
-                    rParam = rArgs[ i + 1 ];
-                else
-                    rParam = OUString();
-            }
-        }
-    }
-
-    return bRet;
-}
-
-// -----------------------------------------------------------------------
-
-bool GetCommandOptions( const ::std::vector< OUString >& rArgs, const OUString& rSwitch, ::std::vector< OUString >& rParams )
-{
-    bool bRet = false;
-
-    OUString    aSwitch( OUString::createFromAscii( "-" ));
-
-    aSwitch += rSwitch;
-    for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
-    {
-        for( int n = 0; ( n < 2 ) && !bRet; n++ )
-        {
-            if ( aSwitch.equalsIgnoreAsciiCase( rArgs[ i ] ))
-            {
-                if( i < ( nCount - 1 ) )
-                    rParams.push_back( rArgs[ i + 1 ] );
-                else
-                    rParams.push_back( OUString() );
-
-                break;
-            }
-        }
-    }
-
-    return( rParams.size() > 0 );
-}
-
-void ShowUsage()
-{
-    fprintf( stderr, "Usage: uicmdxml output_dir -r res -v version [-p] -s platform -i input_dir [-i input_dir] [-f errfile]\n" );
-    fprintf( stderr, "Options:" );
-    fprintf( stderr, "   -r [oo|so]    use resources from ooo, so\n" );
-    fprintf( stderr, "   -v            name of the version used, f.e. SRX645, SRC680\n" );
-    fprintf( stderr, "   -p            use product version\n" );
-    fprintf( stderr, "   -s            name of the system to use, f.e. wntmsci8, unxsols4, unxlngi5\n" );
-    fprintf( stderr, "   -i ...        name of directory to be searched for input files [multiple occurence is possible]\n" );
-    fprintf( stderr, "   -f            name of file, error output should be written to\n" );
-    fprintf( stderr, "Examples:\n" );
-    fprintf( stderr, "    uicmd2html /home/out -r so -v SRC680 -p unxlngi5 -i /home/res -f /home/out/log.err\n" );
-}
-
-// -----------------------------------------------------------------------
-
-int main ( int argc, char ** argv)
-{
-    ::std::vector< OUString > aArgs;
-
-    sal_uInt32 nCmds = argc;
-    if ( nCmds >= 8 )
-    {
-        for ( sal_Int32 i=0; i < sal_Int32( nCmds ); i++ )
-        {
-            OUString aArg = OStringToOUString( argv[i], osl_getThreadTextEncoding() );
-            aArgs.push_back( aArg );
-        }
-
-        ::std::vector< OUString > aInDirVector;
-        OUString                  aErrOutputFileName;
-        OUString                  aOutputDirName( aArgs[0] );
-        OUString                  aOutDirURL;
-        OUString                  aPlatformName;
-        OUString                  aVersion;
-        OUString                  aUseRes;
-        bool                      bUseProduct;
-        OUString                  aDummy;
-
-        osl::FileBase::getFileURLFromSystemPath( aOutputDirName, aOutDirURL );
-        sal_Int32 j = aOutDirURL.lastIndexOf( '/' );
-        if ( j > 0 )
-            aOutDirURL = aOutDirURL.copy( 0, j+1 );
-        osl::FileBase::getSystemPathFromFileURL( aOutDirURL, aOutputDirName );
-        
-        GetCommandOption( aArgs, OUString::createFromAscii( "v" ), aVersion );
-        bUseProduct = GetCommandOption( aArgs, OUString::createFromAscii( "p" ), aDummy );
-        GetCommandOption( aArgs, OUString::createFromAscii( "s" ), aPlatformName );
-        GetCommandOptions( aArgs, OUString::createFromAscii( "i" ), aInDirVector );
-        GetCommandOption( aArgs, OUString::createFromAscii( "f" ), aErrOutputFileName );
-        GetCommandOption( aArgs, OUString::createFromAscii( "r" ), aUseRes );
-
-        if ( aVersion.getLength() > 0 &&
-             aPlatformName.getLength() > 0 &&
-             aUseRes.getLength() > 0 &&
-             aInDirVector.size() > 0 )
-        {
-            Convert( bUseProduct, aUseRes, aVersion, aOutputDirName, aPlatformName, aInDirVector, aErrOutputFileName );
-        }
-        else
-        {
-            ShowUsage();
-            exit( -1 );
-        }
-    }
-    else
-    {
-        ShowUsage();
-        exit( -1 );
-    }
-}
diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd
index f49ef5f840..5217b635cd 100644
--- a/framework/dtd/accelerator.dtd
+++ b/framework/dtd/accelerator.dtd
@@ -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: accelerator.dtd,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean		"(true|false)">
diff --git a/framework/dtd/event.dtd b/framework/dtd/event.dtd
index be748a4472..bf83b64583 100644
--- a/framework/dtd/event.dtd
+++ b/framework/dtd/event.dtd
@@ -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: event.dtd,v $
- 
-  $Revision: 1.5 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- xlink:type -->
diff --git a/framework/dtd/groupuinames.dtd b/framework/dtd/groupuinames.dtd
index 6378e4ef06..7feb3c5e06 100644
--- a/framework/dtd/groupuinames.dtd
+++ b/framework/dtd/groupuinames.dtd
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: groupuinames.dtd,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <!ELEMENT groupuinames:template-group-list (groupuinames:template-group*)>
 <!ATTLIST groupuinames:template-group-list xmlns:groupuinames CDATA #FIXED "http://openoffice.org/2006/groupuinames"> 
diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd
index f2bf2f0744..e79fdbbb42 100644
--- a/framework/dtd/image.dtd
+++ b/framework/dtd/image.dtd
@@ -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: image.dtd,v $
- 
-  $Revision: 1.5 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % url "CDATA">
diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd
index 545d40f0cc..df11832274 100644
--- a/framework/dtd/menubar.dtd
+++ b/framework/dtd/menubar.dtd
@@ -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: menubar.dtd,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT menu:menubar (menu:menu+)>
diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd
index 10e767df86..3b380317b6 100644
--- a/framework/dtd/statusbar.dtd
+++ b/framework/dtd/statusbar.dtd
@@ -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: statusbar.dtd,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean		"(true|false)">
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd
index 31620dd0dd..258f9ddb30 100644
--- a/framework/dtd/toolbar.dtd
+++ b/framework/dtd/toolbar.dtd
@@ -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: toolbar.dtd,v $
- 
-  $Revision: 1.9 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <!ENTITY % boolean "(true|false)">
 <!ENTITY % numeric "CDATA">
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index d32a7752e7..aba67e1b4a 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconst.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,10 +45,6 @@ namespace framework{
     
 #define ATTRIBUTE_TYPE_CDATA		    DECLARE_ASCII("CDATA")
 
-// items without any namespace value!
-#define ELEMENT_ACCELERATORLIS          DECLARE_ASCII("acceleratorlist")
-#define ELEMENT_ITEM				    DECLARE_ASCII("item"           )
-
 #define XMLNS_ACCEL                     DECLARE_ASCII("accel")
 #define XMLNS_XLINK	                    DECLARE_ASCII("xlink")
 
@@ -90,10 +83,6 @@ namespace framework{
 #define NS_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("http://openoffice.org/2001/accel^mod2" )
 #define NS_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("http://openoffice.org/2001/accel^mod3" )
 
-// some storage related values (pathes, names of sub storages etcpp).
-#define PRESET_DEFAULT_XML              DECLARE_ASCII("default.xml")
-#define PRESET_CURRENT_XML              DECLARE_ASCII("current.xml")
-
 } // namespace framework
 
 #endif // _FRAMEWORK_ACCELERATORCONST_H_
diff --git a/framework/inc/arguments.h b/framework/inc/arguments.h
index 914043c39a..5dc4668da7 100644
--- a/framework/inc/arguments.h
+++ b/framework/inc/arguments.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: arguments.h,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index a296a788db..f53ddac470 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggercontainer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 00641c241d..020aafddf2 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggerpropertyset.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/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 01676a9035..ce85a5d527 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggerseparatorpropertyset.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/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 37e5e05933..c02b7822eb 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonmenu.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx
index ea3f05735c..040b357add 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/classes/addonsoptions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonsoptions.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/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 4155140114..5f620a7fbe 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bmkmenu.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index e29119e6f3..a5b5bda118 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checkediterator.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/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 6a068ac4dd..65c3277c95 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/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.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx
index 0b1ef72456..6d76204248 100644
--- a/framework/inc/classes/droptargetlistener.hxx
+++ b/framework/inc/classes/droptargetlistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: droptargetlistener.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/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 2d375f913e..b5f1761f0d 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtercache.hxx,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/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index aa980009fc..1cb351735b 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtercachedata.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 431fe2f31c..db8fe774db 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framecontainer.hxx,v $
- * $Revision: 1.18.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx
index 34d825d994..cabd25b2ad 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/classes/framelistanalyzer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framelistanalyzer.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/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index b08829eb0d..50c69f9ac1 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwkresid.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 84574282e8..346f3d3fef 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingwindow.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index f81e093ed8..1710989484 100755
--- a/framework/inc/classes/fwlresid.hxx
+++ b/framework/inc/classes/fwlresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FwlResId.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 2ac4f42b8f..57c4515124 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagewrapper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/classes/menuextensionsupplier.hxx
index b1f3efefcc..eda9f9eb52 100644
--- a/framework/inc/classes/menuextensionsupplier.hxx
+++ b/framework/inc/classes/menuextensionsupplier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuextensionsupplier.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/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 50a7457f0f..a3c5945626 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menumanager.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/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 20b20c202a..a5de798d77 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index e50fa55e2c..d28b79bdd2 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protocolhandlercache.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 2284185872..66503d3176 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.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: resource.hrc,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/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index ea27faa3d0..5c11f41c9f 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rootactiontriggercontainer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx
index 2c9f9a551f..f4f37efcd9 100644
--- a/framework/inc/classes/servicemanager.hxx
+++ b/framework/inc/classes/servicemanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servicemanager.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx
index 75c1d9d365..6c65fbf69f 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/classes/sfxhelperfunctions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxhelperfunctions.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/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 032d1094c9..fdd98dd2a3 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: taskcreator.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/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 51c7ccf015..8a27a9732d 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wildcard.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/framework/inc/classes/xmlnamespaces.hxx b/framework/inc/classes/xmlnamespaces.hxx
index 1cfaeb164e..23ca22cf93 100644
--- a/framework/inc/classes/xmlnamespaces.hxx
+++ b/framework/inc/classes/xmlnamespaces.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnamespaces.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
index 3e7199083e..947f7b1053 100644
--- a/framework/inc/commands.h
+++ b/framework/inc/commands.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commands.h,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index d435eab3b6..76c41f97e8 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basedispatcher.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/blankdispatcher.hxx b/framework/inc/dispatch/blankdispatcher.hxx
index e0dc9e23ab..8586bf0efe 100644
--- a/framework/inc/dispatch/blankdispatcher.hxx
+++ b/framework/inc/dispatch/blankdispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: blankdispatcher.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/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 9579d83cbb..42da0205c8 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: closedispatcher.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/framework/inc/dispatch/createdispatcher.hxx b/framework/inc/dispatch/createdispatcher.hxx
index fbd7b05696..569acb6f24 100644
--- a/framework/inc/dispatch/createdispatcher.hxx
+++ b/framework/inc/dispatch/createdispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: createdispatcher.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/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 6790d09460..c8d16766d8 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchinformationprovider.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/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 20f0d5becc..3bb619f810 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchprovider.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/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx
index 819294a6f3..7ade8d5658 100644
--- a/framework/inc/dispatch/helpagentdispatcher.hxx
+++ b/framework/inc/dispatch/helpagentdispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helpagentdispatcher.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx
index 69e5854957..07a10f48f5 100644
--- a/framework/inc/dispatch/interaction.hxx
+++ b/framework/inc/dispatch/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/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index a0c703bb90..a48c5da47e 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interceptionhelper.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 77c9290b24..5563ef190c 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailtodispatcher.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 485d436ffe..25375b2649 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menudispatcher.hxx,v $
- * $Revision: 1.7.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 2c3f98577e..33a8af37c8 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oxt_handler.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 5b705e7b07..f9feb35384 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popupmenudispatcher.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/selfdispatcher.hxx b/framework/inc/dispatch/selfdispatcher.hxx
index 6310c08ee7..3ac72633c4 100644
--- a/framework/inc/dispatch/selfdispatcher.hxx
+++ b/framework/inc/dispatch/selfdispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selfdispatcher.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 4b08e0622b..8ccdff80a5 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servicehandler.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/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 4d084f9f2b..254ace4f04 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: closedispatcher.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -86,14 +83,14 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
                    uno resources. */
         css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
 
-        //---------------------------------------

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

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

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

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

-        ::rtl::OUString m_sDispatchTarget;

-    

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

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

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

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

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

+        ::sal_Bool implts_isBackingModePossible();
     
         //---------------------------------------
         /** @short  open the special BackingComponent (now StartModule)
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 557cad6f27..98084094cb 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: systemexec.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/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index 714558edc8..404a13099f 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targets.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,11 +41,11 @@
 namespace framework{
 
 //_________________________________________________________________________________________________________________
-

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

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

+static ::rtl::OUString CMD_UNO_CLOSEFRAME      = ::rtl::OUString::createFromAscii(".uno:CloseFrame"     );
 
 }		//	namespace framework
 
diff --git a/framework/inc/filterflags.h b/framework/inc/filterflags.h
index 6b1d02178f..b2f6382fa8 100644
--- a/framework/inc/filterflags.h
+++ b/framework/inc/filterflags.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filterflags.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/framework/inc/framework.hrc b/framework/inc/framework.hrc
index f7d9152ba5..5d52eed36b 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framework.hrc,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/general.h b/framework/inc/general.h
index 865faa4475..029fa602a1 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: general.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/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/helper/acceleratorinfo.hxx
index e3ab51bd78..e4f203c6e6 100644
--- a/framework/inc/helper/acceleratorinfo.hxx
+++ b/framework/inc/helper/acceleratorinfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorinfo.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx
index 92dd8e1764..70dff36296 100644
--- a/framework/inc/helper/actiontriggerhelper.hxx
+++ b/framework/inc/helper/actiontriggerhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggerhelper.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/framework/inc/helper/configimporter.hxx b/framework/inc/helper/configimporter.hxx
index 97f3ddecf6..9e4a6f5229 100644
--- a/framework/inc/helper/configimporter.hxx
+++ b/framework/inc/helper/configimporter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configimporter.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/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 13133a408d..cc46c0a451 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dockingareadefaultacceptor.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index eed35eee41..c0f4c8bc51 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imageproducer.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 1bd908b266..c23a38fb24 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -1,72 +1,69 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: acceleratorinfo.hxx,v $

- * $Revision: 1.6 $

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

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

-

-#ifndef __MISC_HELPER_HXX_

-#define __MISC_HELPER_HXX_

-

-#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>

-#include <com/sun/star/container/XNameAccess.hpp>

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

-

-#include <i18npool/lang.h>

-#include <svl/languageoptions.hxx>

-

-namespace framework

-{

-

-inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )

-{

-    return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));

-}

-

-    

-class LanguageGuessingHelper

-{

-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;

-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;

-    

-public:

-    LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) : m_xServiceManager(_xServiceManager){}

-

-    ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >  GetGuesser() const;

-};

-

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __MISC_HELPER_HXX_
+#define __MISC_HELPER_HXX_
+
+#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+
+#include <i18npool/lang.h>
+#include <svl/languageoptions.hxx>
+
+namespace framework
+{
+
+inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )
+{
+    return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));
+}
+
+    
+class LanguageGuessingHelper
+{
+    mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >    m_xLanguageGuesser;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+    
+public:
+    LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) : m_xServiceManager(_xServiceManager){}
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing >  GetGuesser() const;
+};
+
 ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&    _xServiceFactory
             ,::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >&        _xUICommandLabels
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame
             ,::rtl::OUString& _rModuleIdentifier
             ,sal_Bool& _rIni
-            ,const sal_Char* _pName);

-

-} // namespace framework

-

-#endif // __MISC_HELPER_HXX_

-

+            ,const sal_Char* _pName);
+
+} // namespace framework
+
+#endif // __MISC_HELPER_HXX_
+
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index c67999382e..6cc1c27290 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: networkdomain.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 5d7ee6e1be..da9be2f894 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ocomponentaccess.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index bdb031413b..acd5f68e35 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ocomponentenumeration.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/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 2e16c8f716..82d828dd17 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oframes.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/otasksaccess.hxx b/framework/inc/helper/otasksaccess.hxx
index bb93792f78..ad3e5e7191 100644
--- a/framework/inc/helper/otasksaccess.hxx
+++ b/framework/inc/helper/otasksaccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: otasksaccess.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx
index 7c67335ab4..31616bd3e7 100644
--- a/framework/inc/helper/otasksenumeration.hxx
+++ b/framework/inc/helper/otasksenumeration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: otasksenumeration.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index f29cbe4377..87c2cc0d83 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: persistentwindowstate.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/framework/inc/helper/popupmenucontrollerbase.hxx b/framework/inc/helper/popupmenucontrollerbase.hxx
index 18bc9c29d9..56febd15d4 100644
--- a/framework/inc/helper/popupmenucontrollerbase.hxx
+++ b/framework/inc/helper/popupmenucontrollerbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popupmenucontrollerbase.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/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index b16e90730c..29b3beb742 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertysetcontainer.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/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index ac052c593a..a551e88776 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shareablemutex.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index 0bc3f84e1e..2468cc95e1 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusindicator.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/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 848460ffb8..fc00d9999d 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusindicatorfactory.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/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index d3aecdcb42..63646821f1 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tagwindowasmodified.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx
index d952505ff4..58ff489b51 100644
--- a/framework/inc/helper/timerhelper.hxx
+++ b/framework/inc/helper/timerhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: timerhelper.hxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 5a6538409a..b1a2b3a40d 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -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: titlebarupdate.hxx,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx
index 7c45980c62..be935a7c56 100644
--- a/framework/inc/helper/titlehelper.hxx
+++ b/framework/inc/helper/titlehelper.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: titlehelper.hxx,v $
- *
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index cffe6f6777..4afbfa3a2a 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiconfigelementwrapperbase.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/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index f5d992e9ea..331bc9a6f8 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uielementwrapperbase.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/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 0eb6508bb6..5ebb6fed17 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vclstatusindicator.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/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 47b0dd969b..e0ec288b04 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wakeupthread.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/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 71f5253833..4fd3bdfbfd 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/interaction/preventduplicateinteraction.hxx
index f0cd38642e..8ddb09e45a 100644
--- a/framework/inc/interaction/preventduplicateinteraction.hxx
+++ b/framework/inc/interaction/preventduplicateinteraction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preventduplicateinteraction.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/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 737802d513..23fef608e6 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stillinteraction.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/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 5b2da2f3ef..68b76c6ffe 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configaccess.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/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index c8df521a65..8041b9e13b 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helponstartup.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 706710db4e..e972ff56e8 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: job.hxx,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/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index bcef2092a4..369e02a99a 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobconst.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 7680e942fc..95233ef1eb 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/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.7.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 8c426efa08..1f381a3d69 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobdispatch.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/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index 98d5e29230..28c1426a58 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobexecutor.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 5d5def166a..bfaa380117 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobresult.hxx,v $
- * $Revision: 1.4.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 4a34b6f49d..c59e2f79d2 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: joburl.hxx,v $
- * $Revision: 1.4.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 68d5136da3..efe043c502 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shelljob.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/framework/inc/loadstate.h b/framework/inc/loadstate.h
index bdcf841820..49e301d8d2 100644
--- a/framework/inc/loadstate.h
+++ b/framework/inc/loadstate.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loadstate.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/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index 261f839fd3..cb6e9a0d39 100644
--- a/framework/inc/macros/debug.hxx
+++ b/framework/inc/macros/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.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index b61319ef03..bb7b5434e4 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: assertion.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index 4736f67cff..275becfc37 100644
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/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/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index c008cb401d..7befac530e 100644
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filterdbg.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/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index 94b4affe5e..9afa2546ca 100644
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: logmechanism.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/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 19d510fae9..e4106a3fa8 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: memorymeasure.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index aa65222696..e8bd485218 100644
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/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.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index e4e1f8c64f..2693b6b070 100644
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: plugin.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/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index 891601058f..21f8ad20d3 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registration.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/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx
index 7adac10f1e..492389646c 100644
--- a/framework/inc/macros/debug/targeting.hxx
+++ b/framework/inc/macros/debug/targeting.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targeting.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/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx
index e9561cb626..056fae8b45 100644
--- a/framework/inc/macros/debug/timemeasure.hxx
+++ b/framework/inc/macros/debug/timemeasure.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: timemeasure.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/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
index 27e6d3eec8..9bf6090f1c 100644
--- a/framework/inc/macros/generic.hxx
+++ b/framework/inc/macros/generic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index f79d22edbe..4b95530d45 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registration.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/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 703c974fb7..5cf2478914 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xinterface.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/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index ee2880a554..fd5350a797 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xserviceinfo.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/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index e7e2f3cf2c..55ac260824 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtypeprovider.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/makefile.mk b/framework/inc/makefile.mk
index 48f6d0ab8b..e2f1bedf4e 100644
--- a/framework/inc/makefile.mk
+++ b/framework/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/framework/inc/mediadescriptor.h b/framework/inc/mediadescriptor.h
index 8daf743e76..037053ddf8 100644
--- a/framework/inc/mediadescriptor.h
+++ b/framework/inc/mediadescriptor.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/framework/inc/pch/precompiled_framework.cxx b/framework/inc/pch/precompiled_framework.cxx
index 54a269431b..833426c0ca 100644
--- a/framework/inc/pch/precompiled_framework.cxx
+++ b/framework/inc/pch/precompiled_framework.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_framework.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/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index fd211dd81e..07e54531de 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_framework.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index e246964b69..f4cf65a7cf 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: properties.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/framework/inc/protocols.h b/framework/inc/protocols.h
index 129fdf742d..12a0e9451d 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protocols.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/framework/inc/queries.h b/framework/inc/queries.h
index 0d9cbb29b1..c7a2a451c5 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: queries.h,v $
- * $Revision: 1.7.80.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index c52ec4ad2a..ece1a4ed67 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchrecordersupplier.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/framework/inc/services.h b/framework/inc/services.h
index 853553a82b..a104dd2942 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: services.h,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 358d13e966..e4fb18c648 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autorecovery.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/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index 3b7f8f904e..2752c5fe89 100644
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.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: backingcomp.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/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index fdf3c93c49..9059cf185d 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contenthandlerfactory.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/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index b8839a8c2f..6879575f8e 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -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: desktop.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/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx
index cf7b9824fe..2a54a80124 100644
--- a/framework/inc/services/detectorfactory.hxx
+++ b/framework/inc/services/detectorfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: detectorfactory.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/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 7708a8944f..b50e0f3ce5 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchhelper.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/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index b63e76ed0e..183b49d1f3 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -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: frame.hxx,v $
- *
- * $Revision: 1.41.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx
index 41945500f2..6162ec4eeb 100644
--- a/framework/inc/services/frameloaderfactory.hxx
+++ b/framework/inc/services/frameloaderfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frameloaderfactory.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/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 8955e2b19e..680ee5303f 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layoutmanager.hxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -331,7 +328,6 @@ namespace framework
             //---------------------------------------------------------------------------------------------------------
             void impl_clearUpMenuBar();
             void implts_reset( sal_Bool bAttach );
-            void implts_setMenuBarCloser(sal_Bool bCloserState);
             void implts_updateMenuBarClose();
             sal_Bool implts_resetMenuBar();
             
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index ef498b10fa..0d4f8735ce 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: license.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/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index a2a833ec9d..ed7083e70c 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: licensedlg.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc
index 7842a5112a..d287b34a2f 100644
--- a/framework/inc/services/logindialog.hrc
+++ b/framework/inc/services/logindialog.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: logindialog.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/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 4aa4cf0971..b50dc6daea 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: logindialog.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/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index f8f5996f37..1106157c32 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediatypedetectionhelper.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index cd06868614..d36e9dd765 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modulemanager.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/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index b94e1bb6a3..7c52dee0f1 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pathsettings.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/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index a8b13b682d..4d2f44840d 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pluginframe.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index bc35993b79..5e08b33a82 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sessionlistener.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 0c891e6ffb..ecfe5ccbfc 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: substitutepathvars.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/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 0614397e21..ccd522b9db 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urltransformer.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx
index 13181a1102..048bab27f7 100644
--- a/framework/inc/services/task.hxx
+++ b/framework/inc/services/task.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: task.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/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index d3f64e621c..b805df44f1 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: taskcreatorsrv.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/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 8be2c30dc1..d78f684090 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uriabbreviation.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index df7b69dc91..5f14f2e5c3 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urltransformer.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 5af49e0178..5bc781d3fe 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stdtypes.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -90,7 +87,7 @@ struct Int32HashCode
     {
         return (size_t)nValue;
     }
-};

+};
 
 struct KeyEventHashCode
 {
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 8e62e6fd3f..80a43f6df5 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabwindow.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/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 28b2098943..b73b191168 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabwinfactory.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index e1bda640d4..80cdeb959b 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targets.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/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index 79e4b5b13e..c2517d73e1 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fairrwlock.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/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index c48e264768..c95a5039a5 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gate.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h
index 3189c489be..96a7fe6df1 100644
--- a/framework/inc/threadhelp/igate.h
+++ b/framework/inc/threadhelp/igate.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: igate.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/framework/inc/threadhelp/imutex.h b/framework/inc/threadhelp/imutex.h
index 39f243f134..44ccff83a7 100644
--- a/framework/inc/threadhelp/imutex.h
+++ b/framework/inc/threadhelp/imutex.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imutex.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/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h
index 951825005e..fef21a3175 100644
--- a/framework/inc/threadhelp/inoncopyable.h
+++ b/framework/inc/threadhelp/inoncopyable.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inoncopyable.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/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h
index 89fc74dbfd..ddd01350b8 100644
--- a/framework/inc/threadhelp/irwlock.h
+++ b/framework/inc/threadhelp/irwlock.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: irwlock.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/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 269aaf89d0..4d9464d32b 100644
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itransactionmanager.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/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 138c88c3cf..e199bdb45c 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lockhelper.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/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index b0400aa076..dc680f4a55 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: readguard.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index 9fdaa0b765..b929e70c41 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resetableguard.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/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index ad19031f9a..7af1e227fa 100644
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: threadhelpbase.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index b78d1c4959..d777ecbf1e 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transactionbase.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/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index e550cf169d..d5aaf5274c 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transactionguard.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/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index ad19c1c27e..536cb86234 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transactionmanager.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/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index f96672188d..f882118b6e 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: writeguard.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/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index 4314479e91..94a4a9aec7 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globalsettings.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/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index b98ad0f03c..35b00aec14 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphicnameaccess.hxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index b7326f7e11..7e84c33284 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagemanager.hxx,v $
- * $Revision: 1.7.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 9eb927151f..8cf1e50458 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagetype.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/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 5e24d2a377..e8b5b79d1c 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleimagemanager.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/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 0de43a30cf..8631e381bc 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleuicfgsupplier.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/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 05fd57f3d8..ce71154a3b 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleuiconfigurationmanager.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index 0990715390..8c0595df4b 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uicategorydescription.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index 66ebbd0f13..6bd26b6409 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiconfigurationmanager.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/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 7d78e981dc..b8609c416d 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowstateconfiguration.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 25cb01ee3e..26e39dea28 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonstoolbarmanager.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/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index 639d68301e..9683b0e1e5 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonstoolbarwrapper.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/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index d32ea6b844..57f0ff23c6 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: buttontoolbarcontroller.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/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index ffa2d64810..33df553fa5 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: comboboxtoolbarcontroller.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/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index c4b7935448..dc4f24891f 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commandinfo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 1c120fe71e..09ad0b1938 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: complextoolbarcontroller.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/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index 3032e262c8..c112205ad9 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: constitemcontainer.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 1ab4391ddf..c5a923854f 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlmenucontroller.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/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index a5002ec624..05db7b4d9d 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dropdownboxtoolbarcontroller.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/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 385f5cc6f4..dc55589cc3 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edittoolbarcontroller.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/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 4746d09d97..b7c4cb4b28 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontmenucontroller.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/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index b111a02c35..c70b032231 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontsizemenucontroller.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/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index e4669aa236..00bff791f3 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: footermenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 377b685d69..dc5fc7eafd 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: generictoolbarcontroller.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 8440d5f706..5bda321420 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: headermenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index ce92d25d3b..5881a423ee 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagebuttontoolbarcontroller.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/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index e1933851c0..cff28fd628 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemcontainer.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/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index fcd250a37f..21d95a35ce 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langselectionmenucontroller.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/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index a4862b5b5e..ad12225afa 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langselectionstatusbarcontroller.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/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
index 32405f93df..6331af1054 100644
--- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx
+++ b/framework/inc/uielement/logoimagestatusbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: logoimagestatusbarcontroller.hxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx
index 9b716af15a..0a83a7120f 100644
--- a/framework/inc/uielement/logotextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: logotextstatusbarcontroller.hxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 8d5b3e14f1..4c4c5cddf3 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrosmenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 0832686000..f3fdc9289f 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarmanager.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/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index 1435b3db81..681028a696 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarmerger.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index f10c66afe5..ee14f19fbf 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarwrapper.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index bdeb5bc871..4de289f44e 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newmenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index 671a9f9a80..37673e5a6d 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectmenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index b3942b56c2..cb941f41e3 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: progressbarwrapper.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/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 8c646c9e6e..41378a45e0 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recentfilesmenucontroller.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 0853c40d34..c770796319 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rootitemcontainer.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/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
index 0d0b92e764..0da55f6bde 100644
--- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx
+++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpletextstatusbarcontroller.hxx,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/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index d7b73e1f5c..5cf7519cb8 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spinfieldtoolbarcontroller.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/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 9a526a42c4..66b475ca8b 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbar.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/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index bcda17c17a..ecb0df64c9 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarmanager.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 26663ace26..c8231a4f84 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarwrapper.hxx,v $
- * $Revision: 1.4.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 940fe8f1b2..c7635456f5 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusindicatorinterfacewrapper.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/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 218d7d1f17..180c02975d 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: togglebuttontoolbarcontroller.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/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx
index 7db68ee9ed..5fb0821f9c 100644
--- a/framework/inc/uielement/toolbar.hxx
+++ b/framework/inc/uielement/toolbar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbar.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/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 7ba9286122..f8f4715ef1 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarmanager.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 64e89a58fb..2fe68b6d41 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarmerger.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/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 22196995c7..97c70eae07 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarsmenucontroller.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/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 342a19ad9a..b3fcd49505 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarwrapper.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 0e72cec566..cdb883b995 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uicommanddescription.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/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 4953f2076a..f0e85e2589 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonstoolboxfactory.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/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 7c5dd1d340..a20575b09b 100755
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarcontrollerfactory.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/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index 2895bbcaba..477a2220df 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarfactory.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
index 3d9a47641c..1288f3404a 100644
--- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx
+++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popupmenucontrollerfactory.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/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
index c797771a6d..0606b6daf3 100644
--- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarcontrollerfactory.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/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index b586e10a27..88cabcebbd 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarfactory.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
index f36a6a59f5..3869e56af6 100644
--- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx
+++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarcontrollerfactory.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/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index 59f9f984f6..c93c3c4f61 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxfactory.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index 046062c388..bf63733c07 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uielementfactorymanager.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/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index 225e03e5fc..c9d75819f5 100644
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uielementfactorymanager.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/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index e633b010ba..d56ad67239 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconfigurationreader.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/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index 057a03f69c..26c2d3b938 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconfigurationwriter.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/framework/inc/xml/acceleratorconst.hxx b/framework/inc/xml/acceleratorconst.hxx
deleted file mode 100644
index 8714573e36..0000000000
--- a/framework/inc/xml/acceleratorconst.hxx
+++ /dev/null
@@ -1,95 +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: acceleratorconst.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 _FRAMEWORK_XML_ACCELERATORCONST_HXX_
-#define _FRAMEWORK_XML_ACCELERATORCONST_HXX_
-
-//_______________________________________________
-// own includes
-
-#include <general.h>
-
-//_______________________________________________
-// interface includes
-
-//_______________________________________________
-// other includes
-#include <rtl/ustring.hxx>
-
-namespace framework{
-    
-#define DOCTYPE_ACCELERATORS            DECLARE_ASCII("<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">")
-    
-#define ATTRIBUTE_TYPE_CDATA		    DECLARE_ASCII("CDATA")
-
-// items without any namespace value!
-#define ELEMENT_ACCELERATORLIS          DECLARE_ASCII("acceleratorlist")
-#define ELEMENT_ITEM				    DECLARE_ASCII("item"           )
-
-#define XMLNS_ACCEL                     DECLARE_ASCII("accel")
-#define XMLNS_XLINK	                    DECLARE_ASCII("xlink")
-
-#define ATTRIBUTE_URL                   DECLARE_ASCII("href" )
-#define ATTRIBUTE_KEYCODE               DECLARE_ASCII("code" )
-#define ATTRIBUTE_MOD_SHIFT             DECLARE_ASCII("shift")
-#define ATTRIBUTE_MOD_MOD1              DECLARE_ASCII("mod1" )
-#define ATTRIBUTE_MOD_MOD2              DECLARE_ASCII("mod2" )
-#define ATTRIBUTE_MOD_MOD3              DECLARE_ASCII("mod3" )
-
-// same items with a name space alias
-#define AL_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("accel:acceleratorlist")
-#define AL_ELEMENT_ITEM				    DECLARE_ASCII("accel:item"           )
-
-#define AL_XMLNS_ACCEL                  DECLARE_ASCII("xmlns:accel")
-#define AL_XMLNS_XLINK	                DECLARE_ASCII("xmlns:xlink")
-
-#define AL_ATTRIBUTE_URL                DECLARE_ASCII("xlink^href" )
-#define AL_ATTRIBUTE_KEYCODE            DECLARE_ASCII("accel^code" )
-#define AL_ATTRIBUTE_MOD_SHIFT          DECLARE_ASCII("accel^shift")
-#define AL_ATTRIBUTE_MOD_MOD1           DECLARE_ASCII("accel^mod1" )
-#define AL_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("accel^mod2" )
-#define AL_ATTRIBUTE_MOD_MOD3           DECLARE_ASCII("accel^mod3" )
-
-// same items with full qualified name space
-#define NS_ELEMENT_ACCELERATORLIST      DECLARE_ASCII("http://openoffice.org/2001/accel^acceleratorlist")
-#define NS_ELEMENT_ITEM                 DECLARE_ASCII("http://openoffice.org/2001/accel^item"           )
-                       
-#define NS_XMLNS_ACCEL					DECLARE_ASCII("http://openoffice.org/2001/accel")
-#define NS_XMLNS_XLINK					DECLARE_ASCII("http://www.w3.org/1999/xlink"    )
-
-#define NS_ATTRIBUTE_URL                DECLARE_ASCII("http://www.w3.org/1999/xlink^href"     )
-#define NS_ATTRIBUTE_KEYCODE            DECLARE_ASCII("http://openoffice.org/2001/accel^code" )
-#define NS_ATTRIBUTE_MOD_SHIFT          DECLARE_ASCII("http://openoffice.org/2001/accel^shift")
-#define NS_ATTRIBUTE_MOD_MOD1           DECLARE_ASCII("http://openoffice.org/2001/accel^mod1" )
-#define NS_ATTRIBUTE_MOD_MOD2           DECLARE_ASCII("http://openoffice.org/2001/accel^mod2" )
-
-} // namespace framework
-
-#endif // _FRAMEWORK_XML_ACCELERATORCONST_HXX_
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index 55f0dfe51f..0aacbdc4e9 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventsconfiguration.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/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
index 44f87697b6..8d32d5d1f9 100644
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ b/framework/inc/xml/eventsdocumenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventsdocumenthandler.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/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 613636009d..bb75947dbd 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagesconfiguration.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/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 52aa6d8e33..6d4e8d5992 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagesdocumenthandler.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx
index f24994bd40..758832ff65 100644
--- a/framework/inc/xml/menuconfiguration.hxx
+++ b/framework/inc/xml/menuconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuconfiguration.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 0ecad10d1a..67d783a40d 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menudocumenthandler.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/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 1dc04e46fb..fc83628b2e 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: saxnamespacefilter.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/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index c27c4e6c4b..86b25bf776 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbardocumenthandler.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index fa1b143645..6fe49ab801 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxdocumenthandler.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
index 11d76ab340..ff4c668ede 100644
--- a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxlayoutdocumenthandler.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 93073e4439..c398211278 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnamespaces.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/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
index 3570e3fc54..33bc2c0d0c 100644
--- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java
+++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.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: CheckXModuleManager.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/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk
index 31abe27258..bcef75fca4 100644
--- a/framework/qa/complex/ModuleManager/makefile.mk
+++ b/framework/qa/complex/ModuleManager/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 6086c3bd24..4b9ba0eb6f 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.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: EventTest.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/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk
index 1658a6db79..d3ca648b02 100644
--- a/framework/qa/complex/XUserInputInterception/makefile.mk
+++ b/framework/qa/complex/XUserInputInterception/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index 39936de4cd..a63baf116c 100644
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.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: AcceleratorsConfigurationTest.java,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/framework/qa/complex/accelerators/helper/KeyMapping.java b/framework/qa/complex/accelerators/helper/KeyMapping.java
index fd22e05912..ec538d53b6 100644
--- a/framework/qa/complex/accelerators/helper/KeyMapping.java
+++ b/framework/qa/complex/accelerators/helper/KeyMapping.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: KeyMapping.java,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
diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk
index 836b5abc88..a0d10f6881 100644
--- a/framework/qa/complex/accelerators/helper/makefile.mk
+++ b/framework/qa/complex/accelerators/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.1.2.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk
index 0b84754a2b..3af496191d 100644
--- a/framework/qa/complex/accelerators/makefile.mk
+++ b/framework/qa/complex/accelerators/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.1.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index d7bd096857..7042034e55 100755
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.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: CheckAPI.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/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk
index 2178f1eefb..4d82ba2da6 100755
--- a/framework/qa/complex/api_internal/makefile.mk
+++ b/framework/qa/complex/api_internal/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index 99088a91fb..e1e27907d9 100755
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.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: LoadDocument.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/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
index 3fe22b6adb..c8f24a9371 100755
--- a/framework/qa/complex/broken_document/makefile.mk
+++ b/framework/qa/complex/broken_document/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk
index e95e371911..f8dcaf26d2 100644
--- a/framework/qa/complex/contextMenuInterceptor/makefile.mk
+++ b/framework/qa/complex/contextMenuInterceptor/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 693ebd12d9..f63c2adef2 100755
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.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: DesktopTerminate.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/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk
index 22f1824d75..3ad4801eb0 100755
--- a/framework/qa/complex/desktop/makefile.mk
+++ b/framework/qa/complex/desktop/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index a3ea8457f3..ef612c8cc1 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.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: checkdispatchapi.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/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/helper/Interceptor.java
index 824d7f71e6..c4eec8f946 100644
--- a/framework/qa/complex/dispatches/helper/Interceptor.java
+++ b/framework/qa/complex/dispatches/helper/Interceptor.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: Interceptor.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/framework/qa/complex/dispatches/helper/makefile.mk b/framework/qa/complex/dispatches/helper/makefile.mk
index ab8ad5c1d4..be761c54fa 100644
--- a/framework/qa/complex/dispatches/helper/makefile.mk
+++ b/framework/qa/complex/dispatches/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.4.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk
index cd74271e1a..87eba000cf 100644
--- a/framework/qa/complex/dispatches/makefile.mk
+++ b/framework/qa/complex/dispatches/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index 3cc11c950d..ec7a36d3ba 100755
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.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: GetServiceWhileDisposingOffice.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/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk
index 7f686ff5f6..dac80c08af 100755
--- a/framework/qa/complex/disposing/makefile.mk
+++ b/framework/qa/complex/disposing/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 4f939ca774..a1bf20b466 100644
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.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: AutoSave.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/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 065aebc101..87617a5817 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.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: Protocol.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/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk
index 1a2e633fb4..e903c9ad5f 100644
--- a/framework/qa/complex/framework/autosave/makefile.mk
+++ b/framework/qa/complex/framework/autosave/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java
index 6e5ff031c4..a439834daf 100644
--- a/framework/qa/complex/framework/recovery/CrashThread.java
+++ b/framework/qa/complex/framework/recovery/CrashThread.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: CrashThread.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/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index 70ab117f6a..c9057c85b8 100644
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.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: KlickButtonThread.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/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 8852d47efc..0afd03b525 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.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: RecoveryTest.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/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 972f8a9d89..5ddaff8cdb 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.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: RecoveryTools.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/framework/qa/complex/framework/recovery/TimeoutThread.java b/framework/qa/complex/framework/recovery/TimeoutThread.java
index 4e30fc6d54..da3f418c65 100644
--- a/framework/qa/complex/framework/recovery/TimeoutThread.java
+++ b/framework/qa/complex/framework/recovery/TimeoutThread.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: TimeoutThread.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/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk
index 0b86efd4d0..4a9f80b4b2 100755
--- a/framework/qa/complex/framework/recovery/makefile.mk
+++ b/framework/qa/complex/framework/recovery/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/interfaces/_XComponent.java
index 32c4245bd9..e86743c7b5 100755
--- a/framework/qa/complex/imageManager/interfaces/_XComponent.java
+++ b/framework/qa/complex/imageManager/interfaces/_XComponent.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: _XComponent.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/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/interfaces/_XImageManager.java
index 375b523018..bc0a124cf3 100755
--- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java
+++ b/framework/qa/complex/imageManager/interfaces/_XImageManager.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: _XImageManager.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/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/interfaces/_XInitialization.java
index 592c7e2b2e..115f581f7e 100755
--- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java
+++ b/framework/qa/complex/imageManager/interfaces/_XInitialization.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: _XInitialization.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/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
index 1b09703160..7af00b163e 100755
--- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java
+++ b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.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: _XTypeProvider.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/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java
index 18f20c27c0..1a3936bbc6 100755
--- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.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: _XUIConfiguration.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/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java
index f7d2c31dfc..b3fb3a1e76 100755
--- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java
+++ b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.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: _XUIConfigurationPersistence.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/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk
index 49a28defb9..039eba5760 100755
--- a/framework/qa/complex/imageManager/interfaces/makefile.mk
+++ b/framework/qa/complex/imageManager/interfaces/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk
index 8537d18abc..3b508b718d 100755
--- a/framework/qa/complex/imageManager/makefile.mk
+++ b/framework/qa/complex/imageManager/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index a5f835203d..f65612e247 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.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: CheckXComponentLoader.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/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java
index 2e2c09c920..f018912a2b 100644
--- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.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: InteractionHandler.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/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java
index 25767597d6..4320462835 100644
--- a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.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: StatusIndicator.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/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java
index 9471405e39..99c12fa90b 100644
--- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.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: StreamSimulator.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/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/qa/complex/loadAllDocuments/helper/makefile.mk
index 9ea874686c..98c414c2c1 100644
--- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk
+++ b/framework/qa/complex/loadAllDocuments/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.6.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk
index 8b43eb76c1..02aacd36d2 100644
--- a/framework/qa/complex/loadAllDocuments/makefile.mk
+++ b/framework/qa/complex/loadAllDocuments/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 7e13315d5a..b264bbd558 100755
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.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: PathSettingsTest.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/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk
index 8f6ee0302f..70af7817ac 100755
--- a/framework/qa/complex/path_settings/makefile.mk
+++ b/framework/qa/complex/path_settings/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java
index fe6d51df3c..88877d8c76 100755
--- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java
+++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.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: PathSubstitutionTest.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/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk
index 453ae89d27..a266d3fa41 100755
--- a/framework/qa/complex/path_substitution/makefile.mk
+++ b/framework/qa/complex/path_substitution/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/complex/sequence/CheckSequenceOfEnum.java b/framework/qa/complex/sequence/CheckSequenceOfEnum.java
index 9ddfdc4d8b..90399c5030 100755
--- a/framework/qa/complex/sequence/CheckSequenceOfEnum.java
+++ b/framework/qa/complex/sequence/CheckSequenceOfEnum.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: CheckSequenceOfEnum.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/framework/qa/complex/sequence/makefile.mk b/framework/qa/complex/sequence/makefile.mk
index 959ea5cba5..ba18b278d7 100755
--- a/framework/qa/complex/sequence/makefile.mk
+++ b/framework/qa/complex/sequence/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.76.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk
index 69c76f3e89..0be0e52a17 100755
--- a/framework/qa/unoapi/makefile.mk
+++ b/framework/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index db62188f83..d6e596d6a4 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorcache.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 37de076226..a865516b94 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconfiguration.cxx,v $
- * $Revision: 1.7.204.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index a6b0bd7bce..9ed0e11786 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx
index 82c86c6af9..87c5717d65 100644
--- a/framework/source/accelerators/acceleratorexecute.hxx
+++ b/framework/source/accelerators/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 540a0f481a..644b41b706 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documentacceleratorconfiguration.cxx,v $
- * $Revision: 1.9.244.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index acd8d1f03f..ba103a9e27 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globalacceleratorconfiguration.cxx,v $
- * $Revision: 1.5.244.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index bb8d6ed6a7..b1d00d0ef9 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keymapping.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/makefile.mk b/framework/source/accelerators/makefile.mk
index 891ea9ca82..23a60dd187 100644
--- a/framework/source/accelerators/makefile.mk
+++ b/framework/source/accelerators/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 36599063ce..c85cb404ff 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleacceleratorconfiguration.cxx,v $
- * $Revision: 1.6.244.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 0937ee0888..f35d8ac84a 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: presethandler.cxx,v $
- * $Revision: 1.17.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index dd4bf12e05..48c45e8193 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: storageholder.cxx,v $
- * $Revision: 1.8.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
index 4fd9e7c907..5533b1f32a 100644
--- a/framework/source/application/framework.cxx
+++ b/framework/source/application/framework.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framework.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx
index 951e48f5d6..a8b7df2d74 100644
--- a/framework/source/application/login.cxx
+++ b/framework/source/application/login.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: login.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/application/makefile.mk b/framework/source/application/makefile.mk
index 69c02d3f43..96bd84de23 100644
--- a/framework/source/application/makefile.mk
+++ b/framework/source/application/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/classes/actiontriggercontainer.cxx b/framework/source/classes/actiontriggercontainer.cxx
index 95649fabd4..6152ab5f09 100644
--- a/framework/source/classes/actiontriggercontainer.cxx
+++ b/framework/source/classes/actiontriggercontainer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggercontainer.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/classes/actiontriggerpropertyset.cxx
index 6a7231685a..8c30fde137 100644
--- a/framework/source/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/classes/actiontriggerpropertyset.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggerpropertyset.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/classes/actiontriggerseparatorpropertyset.cxx
index 49936d55ee..aea4934f20 100644
--- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/classes/actiontriggerseparatorpropertyset.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggerseparatorpropertyset.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/classes/addonmenu.cxx
index 35b61510ce..7105da2d68 100644
--- a/framework/source/classes/addonmenu.cxx
+++ b/framework/source/classes/addonmenu.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonmenu.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 #include <tools/config.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/menuoptions.hxx>
-
+#include <svl/solar.hrc>
 //_________________________________________________________________________________________________________________
 //	namespace
 //_________________________________________________________________________________________________________________
@@ -67,7 +64,6 @@ using namespace ::com::sun::star::beans;
 
 // Please look at sfx2/inc/sfxsids.hrc the values are defined there. Due to build dependencies
 // we cannot include the header file.
-const USHORT SID_SFX_START           = 5000;
 const USHORT SID_HELPMENU            = (SID_SFX_START + 410);
 const USHORT SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
 
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index b94d47c988..a1b22c2de5 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonsoptions.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index e17672b4a0..b595cce880 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bmkmenu.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/converter.cxx b/framework/source/classes/converter.cxx
index 1a3e8c99d2..72fdb5d333 100644
--- a/framework/source/classes/converter.cxx
+++ b/framework/source/classes/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.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 2d10c049a8..1223b05ff5 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: droptargetlistener.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index da8abace32..3b48c71505 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framecontainer.cxx,v $
- * $Revision: 1.24.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/classes/framelistanalyzer.cxx
index 84b9e97969..80702d8108 100644
--- a/framework/source/classes/framelistanalyzer.cxx
+++ b/framework/source/classes/framelistanalyzer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framelistanalyzer.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx
index ee7d193095..43e03b6759 100644
--- a/framework/source/classes/fwkresid.cxx
+++ b/framework/source/classes/fwkresid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwkresid.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index af8319c193..f463a6c499 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingwindow.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index d8eeb18dee..0dbc626fad 100755
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FwlResId.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/classes/imagewrapper.cxx
index 7e001a9e41..b348e0cb90 100644
--- a/framework/source/classes/imagewrapper.cxx
+++ b/framework/source/classes/imagewrapper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagewrapper.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk
index c55af1cdf8..22e8a6d540 100644
--- a/framework/source/classes/makefile.mk
+++ b/framework/source/classes/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.36.82.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/classes/menuextensionsupplier.cxx
index 625ddfed93..d6ed70103b 100644
--- a/framework/source/classes/menuextensionsupplier.cxx
+++ b/framework/source/classes/menuextensionsupplier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuextensionsupplier.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/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 0836d08703..4b7c702906 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menumanager.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/classes/propertysethelper.cxx
index 5e1c2d5604..7f05c15c1d 100644
--- a/framework/source/classes/propertysethelper.cxx
+++ b/framework/source/classes/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx
index 150cae4f0a..82fded63fc 100644
--- a/framework/source/classes/protocolhandlercache.cxx
+++ b/framework/source/classes/protocolhandlercache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: protocolhandlercache.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 1371fa98eb..d9c9c558ad 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.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: resource.src,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/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/classes/rootactiontriggercontainer.cxx
index 7e18782300..9af6a4dfeb 100644
--- a/framework/source/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/classes/rootactiontriggercontainer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rootactiontriggercontainer.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/classes/sfxhelperfunctions.cxx
index f6d65257ad..e1a4f90000 100644
--- a/framework/source/classes/sfxhelperfunctions.cxx
+++ b/framework/source/classes/sfxhelperfunctions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxhelperfunctions.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 2ab4e33b50..cdf19a25a8 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: taskcreator.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/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx
index 16a13f49b1..75f77c6261 100644
--- a/framework/source/constant/containerquery.cxx
+++ b/framework/source/constant/containerquery.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: containerquery.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/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx
index e5cd73a58d..22565cc652 100644
--- a/framework/source/constant/contenthandler.cxx
+++ b/framework/source/constant/contenthandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contenthandler.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/framework/source/constant/filter.cxx b/framework/source/constant/filter.cxx
index 6ba2bf55ad..38f92a557e 100644
--- a/framework/source/constant/filter.cxx
+++ b/framework/source/constant/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.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx
index 6be05c4783..b42c1b082a 100644
--- a/framework/source/constant/frameloader.cxx
+++ b/framework/source/constant/frameloader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frameloader.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/framework/source/constant/makefile.mk b/framework/source/constant/makefile.mk
index 0f304589cd..1c050db57d 100644
--- a/framework/source/constant/makefile.mk
+++ b/framework/source/constant/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 4652b768e1..8bec3e8c8d 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: closedispatcher.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/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 0e6881601c..5f7cd37076 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchinformationprovider.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 1dfee32e85..e97ada73c2 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchprovider.cxx,v $
- * $Revision: 1.37.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx
index 707219b908..3ae47562da 100644
--- a/framework/source/dispatch/helpagentdispatcher.cxx
+++ b/framework/source/dispatch/helpagentdispatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helpagentdispatcher.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/dispatch/interaction.cxx
index 1ca62f6c46..9cca0bb922 100644
--- a/framework/source/dispatch/interaction.cxx
+++ b/framework/source/dispatch/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 1bb33a3350..2688aaf0ef 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interceptionhelper.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index df6ee29a1e..51787d1920 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loaddispatcher.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 50a0762eb9..4064179e58 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailtodispatcher.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk
index 352aa66bfd..b969d71ea9 100644
--- a/framework/source/dispatch/makefile.mk
+++ b/framework/source/dispatch/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index c7282fbcc9..1688a8be77 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menudispatcher.cxx,v $
- * $Revision: 1.23.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 0ac770a4f7..0a46de752a 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oxt_handler.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/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 507f6a998f..d9ef9ed12d 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popupmenudispatcher.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/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 63a6b625d6..e26ade6d70 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: servicehandler.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 9326181c64..48096762ec 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: closedispatcher.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,15 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
-#include <dispatch/startmoduledispatcher.hxx>

-

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

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

-    , m_xOwner           (xFrame                        )

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

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

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

-    {

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

-        if (implts_isBackingModePossible ())

-        {

-            if (implts_establishBackingMode ())

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

-    }

-

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

-::sal_Bool StartModuleDispatcher::implts_isBackingModePossible ()

-{

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

-        return sal_False;

-    

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

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

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

-    

-    FrameListAnalyzer aCheck(

-        xDesktop,

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

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

-    

-    ::sal_Bool  bIsPossible    = sal_False;

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

-    

-    if (

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

-        (   nVisibleFrames < 1              )

-       )

-    {

-        bIsPossible = sal_True;

-    }

-    

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

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

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

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

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

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

-        xSMGR->createInstanceWithArguments(SERVICENAME_STARTMODULE, lArgs),

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

+}
 
 } // namespace framework
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 2ccf84fdb0..ce3288edf2 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: systemexec.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 531d6807ee..3baeb1ab9c 100755
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowcommanddispatch.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/framework/source/helper/acceleratorinfo.cxx b/framework/source/helper/acceleratorinfo.cxx
index 27f8e00937..e3b22da241 100644
--- a/framework/source/helper/acceleratorinfo.cxx
+++ b/framework/source/helper/acceleratorinfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorinfo.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 3224803892..1102ae57ac 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actiontriggerhelper.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/configimporter.cxx b/framework/source/helper/configimporter.cxx
index a498451666..a94db6d8df 100644
--- a/framework/source/helper/configimporter.cxx
+++ b/framework/source/helper/configimporter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configimporter.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/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index cf88201459..91dbe941d2 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dockingareadefaultacceptor.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index e698d7db1d..26c18f8391 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imageproducer.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk
index 7a2fc18168..556a9829d2 100644
--- a/framework/source/helper/makefile.mk
+++ b/framework/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.34.82.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index 8e0f79b260..e70e79096e 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -1,76 +1,73 @@
-/*************************************************************************

- *

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

- *

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: langselectionstatusbarcontroller.cxx,v $

- * $Revision: 1.6.40.1 $

- *

- * This file is part of OpenOffice.org.

- *

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

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

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

- *

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

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

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

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

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

- *

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

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

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

- * for a copy of the LGPLv3 License.

- *

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

-

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

-#include "precompiled_framework.hxx"

-

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

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

-#include <tools/debug.hxx>

-#include <comphelper/processfactory.hxx>

-#include <helper/mischelper.hxx>

-#include <services.h>

-

-

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

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

-namespace framework

-{

-

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

-{

-    if (!m_xLanguageGuesser.is())

-    {

-        try

-        {

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

-                    m_xServiceManager->createInstance(

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

-                        uno::UNO_QUERY );

-        }

-        catch (uno::Exception &r)

-        {

-            (void) r;

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

-        }    

-    }

-    return m_xLanguageGuesser;

-}

-

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

-    

-} // namespace framework

-

+}
+    
+} // namespace framework
+
diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/helper/networkdomain.cxx
index b31d67173b..d1a74b16e8 100644
--- a/framework/source/helper/networkdomain.cxx
+++ b/framework/source/helper/networkdomain.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: networkdomain.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 274f3cdd6b..b0baf1bcf8 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ocomponentaccess.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index ed38666380..912d80c75d 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ocomponentenumeration.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 43f968225c..405da6d91a 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oframes.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index de7fa59eea..23a638ea4e 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: persistentwindowstate.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/popupmenucontrollerbase.cxx b/framework/source/helper/popupmenucontrollerbase.cxx
index 8b6f75aa53..9e321e653b 100644
--- a/framework/source/helper/popupmenucontrollerbase.cxx
+++ b/framework/source/helper/popupmenucontrollerbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popupmenucontrollerbase.cxx,v $
- * $Revision: 1.8.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx
index 0d3bb857e9..4f8eec9c2f 100644
--- a/framework/source/helper/propertysetcontainer.cxx
+++ b/framework/source/helper/propertysetcontainer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertysetcontainer.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/framework/source/helper/shareablemutex.cxx b/framework/source/helper/shareablemutex.cxx
index f84d42d1a5..bdc5f131aa 100644
--- a/framework/source/helper/shareablemutex.cxx
+++ b/framework/source/helper/shareablemutex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shareablemutex.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/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 2c4094b57f..9e2c1e7946 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusindicator.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/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index d9ba66fd06..ecfe81a034 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusindicatorfactory.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -438,12 +435,12 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
     Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
     if ( pWindow )
     {
-        bool bForceFrontAndFocus(false);

-        ::comphelper::ConfigurationHelper::readDirectKey(

-            xSMGR,

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

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

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

+        bool bForceFrontAndFocus(false);
+        ::comphelper::ConfigurationHelper::readDirectKey(
+            xSMGR,
+            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
+            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
+            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
             ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
 
         pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index ea6f7ca148..089cf3061e 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tagwindowasmodified.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/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 962bbbf0f1..e2250f3faa 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.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: titlebarupdate.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/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx
index 3dd9467ef2..e95617064b 100644
--- a/framework/source/helper/titlehelper.cxx
+++ b/framework/source/helper/titlehelper.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: titlehelper.cxx,v $
- *
- * $Revision: 1.4.54.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 23ac2c8a79..14673fedd8 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiconfigelementwrapperbase.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 64a08326e7..fbdfba721b 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uielementwrapperbase.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 9c46b0e082..40f278d148 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vclstatusindicator.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 38921660fa..8682dcd2ed 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wakeupthread.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 24a71a679f..2462ce455f 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorcache.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/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 57d0001217..8fa0902b2d 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconfiguration.hxx,v $
- * $Revision: 1.5.300.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index d95feb3c62..3fe8022154 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: documentacceleratorconfiguration.hxx,v $
- * $Revision: 1.7.300.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index 9c6517ac08..05515770ae 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globalacceleratorconfiguration.hxx,v $
- * $Revision: 1.4.300.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index 7b44676091..c11076efcd 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: istoragelistener.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/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index a8e25a4475..2a58e7fa61 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keymapping.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/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index e57ef45ad1..de1a652c69 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleacceleratorconfiguration.hxx,v $
- * $Revision: 1.4.300.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 4b226b106b..7131011827 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: presethandler.hxx,v $
- * $Revision: 1.9.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index dce603e7c5..b604d880d6 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: storageholder.hxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx
index 5e0fcc4964..c2307d5877 100644
--- a/framework/source/inc/constant/containerquery.hxx
+++ b/framework/source/inc/constant/containerquery.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: containerquery.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/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx
index 3a5a63bd0c..ed6c92854c 100644
--- a/framework/source/inc/constant/contenthandler.hxx
+++ b/framework/source/inc/constant/contenthandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contenthandler.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/framework/source/inc/constant/filter.hxx b/framework/source/inc/constant/filter.hxx
index 80696a2279..20f7ad48d9 100644
--- a/framework/source/inc/constant/filter.hxx
+++ b/framework/source/inc/constant/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.4.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx
index b757c5ea0a..85beec93e3 100644
--- a/framework/source/inc/constant/frameloader.hxx
+++ b/framework/source/inc/constant/frameloader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frameloader.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/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index fbd2bf61f4..b0619fb114 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loaddispatcher.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/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx
index 9b425077c4..18ddb050ec 100644
--- a/framework/source/inc/dispatch/uieventloghelper.hxx
+++ b/framework/source/inc/dispatch/uieventloghelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uieventloghelper.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index c986c7eaa8..2479e4f19a 100755
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowcommanddispatch.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 3a6f2a5b57..ff41f0f584 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: actionlockguard.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/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index d96643a380..60c3c317e0 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loadenv.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/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 8ff9f9fbe2..8af58d4c89 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loadenvexception.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/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index acb2311367..7fb01a7fd0 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targethelper.hxx,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/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 94728bcb24..b2de45fef2 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configuration.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/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 16167e39ce..1cced6e7b4 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frame.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/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx
index 4bd75a3c22..d654bb3572 100644
--- a/framework/source/inc/pattern/storages.hxx
+++ b/framework/source/inc/pattern/storages.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: storages.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/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index e23d6bf04d..49d6ddbb5e 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk
index 4ae3564c21..0767cb6b33 100644
--- a/framework/source/interaction/makefile.mk
+++ b/framework/source/interaction/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.82.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx
index ec962a724e..d032aa1f24 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/interaction/preventduplicateinteraction.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preventduplicateinteraction.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 83c7675b26..81fc2ec39c 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: QuietInteraction.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/jobs/configaccess.cxx
index 848ec30142..39ee0f9b66 100644
--- a/framework/source/jobs/configaccess.cxx
+++ b/framework/source/jobs/configaccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configaccess.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 0c47659339..af4675ed35 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helponstartup.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/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 3a0ead1ecc..e8961b0f97 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: job.cxx,v $
- * $Revision: 1.12.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx
index 2c10e35a3b..4b895c60ca 100644
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/jobs/jobconst.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobconst.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/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 4d8371877f..6d48c3c2ac 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/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.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 010123a81a..b9e7f6ee1d 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobdispatch.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 470e1fa397..5bb7acc7c9 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobexecutor.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index 2ad90b4e7b..98b657794f 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jobresult.cxx,v $
- * $Revision: 1.8.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index ec47dadb85..085fc7d466 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: joburl.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/framework/source/jobs/makefile.mk b/framework/source/jobs/makefile.mk
index 090bc3dbfc..ee5cc63766 100644
--- a/framework/source/jobs/makefile.mk
+++ b/framework/source/jobs/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 0bafb763a4..e6905f77ed 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shelljob.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e3a5a5b977..2d57da8df5 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layoutmanager.cxx,v $
- * $Revision: 1.72 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -6185,16 +6182,6 @@ sal_Bool LayoutManager::implts_resetMenuBar()
     return sal_False;
 }
 
-void LayoutManager::implts_setMenuBarCloser(sal_Bool bCloserState)
-{
-    /* SAFE AREA ----------------------------------------------------------------------------------------------- */
-    WriteGuard aWriteLock( m_aLock );
-    m_bMenuBarCloser = bCloserState;
-    aWriteLock.unlock();
-
-    implts_updateMenuBarClose();
-}
-
 sal_Int16 LayoutManager::implts_getCurrentSymbolsSize()
 {
     sal_Int16 eOptSymbolsSize( 0 );
diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk
index 3af616971a..70215a3657 100644
--- a/framework/source/layoutmanager/makefile.mk
+++ b/framework/source/layoutmanager/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 4123932556..380943b8ba 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loadenv.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/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk
index 105cc92c78..c68ad8d304 100644
--- a/framework/source/loadenv/makefile.mk
+++ b/framework/source/loadenv/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx
index c8681a5b2c..271532f7b0 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: targethelper.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/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 9ad3f696d6..11b1532981 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchrecorder.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/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 8c7b601b4a..beaaa2eb4b 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchrecordersupplier.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/recording/makefile.mk b/framework/source/recording/makefile.mk
index 770fbf7412..a13eb7b912 100644
--- a/framework/source/recording/makefile.mk
+++ b/framework/source/recording/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/register/makefile.mk b/framework/source/register/makefile.mk
index 7d7f00e945..2920cb2830 100644
--- a/framework/source/register/makefile.mk
+++ b/framework/source/register/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index 9882476b60..e9c63ac04e 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: register3rdcomponents.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index b9419068be..166f489b94 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registerlogindialog.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/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index c7ef3da666..297431d80f 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registerservices.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 2297346ae5..4cc66e56a2 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registertemp.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index f1c1856348..41dbe9b603 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -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: autorecovery.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/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index f1deffa53b..f59ea721ec 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.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: backingcomp.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/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 0a465e8e26..290b4cebc4 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingwindow.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx
index e02206cf5f..c617b5321d 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backingwindow.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index fd983ed492..6a07b7fda0 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: desktop.cxx,v $
- * $Revision: 1.64.80.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 0413cbfdbc..d6c7fe6288 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatchhelper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index aa35ad3439..08f9b171a9 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -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: frame.cxx,v $
- *
- * $Revision: 1.106.80.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index b3916da9e3..1401e3c13e 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwk_services.src,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index c34d7908d1..064c3b0ac8 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: license.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk
index a7360e854e..2978d9aacf 100644
--- a/framework/source/services/makefile.mk
+++ b/framework/source/services/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.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 74087a50bb..f1934193c4 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mediatypedetectionhelper.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx
index 30050b88fd..0fb110c3a3 100644
--- a/framework/source/services/menudocumenthandler.cxx
+++ b/framework/source/services/menudocumenthandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menudocumenthandler.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 2bb57c30ad..c6320a91c8 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modulemanager.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 8871fea734..1b619e637c 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pathsettings.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index eabcfcedf1..82e89010f6 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sessionlistener.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 3080f7cd8b..4e38983ba7 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: substitutepathvars.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/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 71136a9ac4..6775e6d478 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 363767e75f..869a65dc42 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: taskcreatorsrv.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index c7655f5cc5..c88cdf9e21 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uriabbreviation.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/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index f04827592e..8ee168bda7 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urltransformer.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/tabwin/makefile.mk b/framework/source/tabwin/makefile.mk
index 64dd01d038..6147672bdc 100644
--- a/framework/source/tabwin/makefile.mk
+++ b/framework/source/tabwin/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 72d7b4a1c5..a9fdf6f8de 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabwindow.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/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index bde6ef7524..e9a7e65cb5 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabwinfactory.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/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx
index 9539dcfc2d..c69906dacc 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/threadhelp/lockhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lockhelper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/threadhelp/makefile.mk b/framework/source/threadhelp/makefile.mk
index aa89ce09cd..be4d711379 100644
--- a/framework/source/threadhelp/makefile.mk
+++ b/framework/source/threadhelp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/threadhelp/transactionmanager.cxx b/framework/source/threadhelp/transactionmanager.cxx
index 17b06afa67..d1bb759dfc 100644
--- a/framework/source/threadhelp/transactionmanager.cxx
+++ b/framework/source/threadhelp/transactionmanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transactionmanager.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index cec8db173f..6dcb3604c1 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globalsettings.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 658d18df01..7f41169a74 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphicnameaccess.cxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 18eb67dea3..9e02fb57c3 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagemanager.cxx,v $
- * $Revision: 1.16.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 2ba2e105d3..ff99b5ae50 100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ImageManagerImpl.cxx,v $
- * $Revision: 1.16.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index e5201e9a9b..5e213f8a59 100755
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagemanager.hxx,v $
- * $Revision: 1.7.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk
index 3ef9006072..ef82e2da76 100644
--- a/framework/source/uiconfiguration/makefile.mk
+++ b/framework/source/uiconfiguration/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 2273c1d641..cd400b7e3f 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleimagemanager.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/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 8123813718..24c0f152e5 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleuicfgsupplier.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 7d2bf4fd54..20c2c8fd11 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: moduleuiconfigurationmanager.cxx,v $
- * $Revision: 1.19.208.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 739130ae4c..a3510df765 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uicategorydescription.cxx,v $
- * $Revision: 1.8.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 35b35c339e..dd4e1607c8 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiconfigurationmanager.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/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index dbce0028fb..d6c7f26b95 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UIConfigurationManagerImpl.cxx,v $
- * $Revision: 1.19.208.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
index 937aca2a9a..c5854daae9 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UIConfigurationManagerImpl.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index c97caecc01..5d5fa60f14 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: windowstateconfiguration.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index ad3c5fbfaf..63caa7380f 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonstoolbarmanager.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index da40a4ee01..8135670084 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonstoolbarwrapper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 855f1dd3f4..d98caee191 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: buttontoolbarcontroller.cxx,v $
- * $Revision: 1.8.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 937c099aaf..debde49008 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: comboboxtoolbarcontroller.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 3b5d197261..328d68fd80 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: complextoolbarcontroller.cxx,v $
- * $Revision: 1.10.26.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/uielement/constitemcontainer.cxx
index 91fb93f55c..979c6085bd 100644
--- a/framework/source/uielement/constitemcontainer.cxx
+++ b/framework/source/uielement/constitemcontainer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: constitemcontainer.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 56cbdde695..5853c7941e 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlmenucontroller.cxx,v $
- * $Revision: 1.11.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,17 +50,13 @@
 //	includes of other projects
 //_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 #include <tools/rcid.h>
 #include <vcl/image.hxx>
 #include <svtools/menuoptions.hxx>
@@ -71,9 +64,6 @@
 
 // Copied from svx
 // Function-Id's
-#define SID_LIB_START			10000
-#define SID_SVX_START           (SID_LIB_START +   0)
-
 #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4)
 #define RID_SVXIMGLIST_FMEXPL	   (RID_FORMS_START + 0)
 #define RID_SVXIMGLIST_FMEXPL_HC   (RID_FORMS_START + 2)
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index e9910d6b45..57e26caf98 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dropdownboxtoolbarcontroller.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 5faefa9282..1bd2ac8710 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edittoolbarcontroller.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 24e879b5ad..b9fddfea9d 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontmenucontroller.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/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 56a14f4ba4..c677c9b844 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontsizemenucontroller.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/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 182a6c3694..fb74197e8e 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: footermenucontroller.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/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 0a6d92975d..53ea643e37 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: generictoolbarcontroller.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 3ab8386c87..d412029188 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: headermenucontroller.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/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 954b102924..72a2ae1798 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagebuttontoolbarcontroller.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx
index b0fc5d385f..d1358e54a4 100644
--- a/framework/source/uielement/itemcontainer.cxx
+++ b/framework/source/uielement/itemcontainer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemcontainer.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index d91d389931..4b140cc17e 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langselectionmenucontroller.cxx,v $
- * $Revision: 1.6.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index d56a120c75..85def9b632 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langselectionstatusbarcontroller.cxx,v $
- * $Revision: 1.6.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index 7158ccae23..602d2dc6dd 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: logoimagestatusbarcontroller.cxx,v $
- * $Revision: 1.7.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index e11bfd1223..925127fc03 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: logotextstatusbarcontroller.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/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 65385b780c..dbd1238a9c 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrosmenucontroller.cxx,v $
- * $Revision: 1.12.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk
index 568be10c0d..da4ab3d34c 100644
--- a/framework/source/uielement/makefile.mk
+++ b/framework/source/uielement/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index b674e27d8a..4f3ba2917e 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarmanager.cxx,v $
- * $Revision: 1.52.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 9e497b62c1..51f87a400a 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarmerger.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/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index ea4af2ef58..44e133934c 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarwrapper.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index fa90f0c161..833e030a7e 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newmenucontroller.cxx,v $
- * $Revision: 1.12.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 16be5513e2..3e527d52f5 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectmenucontroller.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/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index e35aec55f6..67fed962a2 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: progressbarwrapper.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 5bf8611801..652c2b2fb2 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recentfilesmenucontroller.cxx,v $
- * $Revision: 1.9.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx
index 6275f2a7a8..c0d79b6f8b 100644
--- a/framework/source/uielement/rootitemcontainer.cxx
+++ b/framework/source/uielement/rootitemcontainer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rootitemcontainer.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index 20fdf961f0..e5fae0992f 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpletextstatusbarcontroller.cxx,v $
- * $Revision: 1.5.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 12aa429d8c..c978b91410 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spinfieldtoolbarcontroller.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index c8c1618879..502253255c 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbar.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 6c1cdf44f0..489de99dc4 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarmanager.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index d016dbac10..18bef609fa 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarwrapper.cxx,v $
- * $Revision: 1.8.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 5c11a87b24..5f9d979e36 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusindicatorinterfacewrapper.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index b803edb1c3..28d7899094 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: togglebuttontoolbarcontroller.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx
index eed4602e96..b99fed9e5f 100644
--- a/framework/source/uielement/toolbar.cxx
+++ b/framework/source/uielement/toolbar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbar.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/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 6775e21928..5698ee6352 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarmanager.cxx,v $
- * $Revision: 1.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 5c119e5559..43f9068513 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarmerger.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/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 86aad1a41c..b1f240e3f7 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarsmenucontroller.cxx,v $
- * $Revision: 1.21.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 59b696763a..f1b50ad7b2 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarwrapper.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index e13ed0e974..51aff86787 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uicommanddescription.cxx,v $
- * $Revision: 1.17.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index c41213d6d2..c324284fdc 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: addonstoolboxfactory.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 58ff92e5a8..dc2ff7e78b 100755
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ConfigurationAccess_ControllerFactory.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/makefile.mk b/framework/source/uifactory/makefile.mk
index d5805faba8..cf820e9873 100644
--- a/framework/source/uifactory/makefile.mk
+++ b/framework/source/uifactory/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index f07700c20b..e897ce5d24 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menubarfactory.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
index 5c9ccdaca2..586ada8907 100644
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: popupmenucontrollerfactory.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
index b5364b3fb7..e11b435d9a 100644
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarcontrollerfactory.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 07303c55e7..8841b7c577 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarfactory.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
index 8bff439d50..896b6b44db 100644
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarcontrollerfactory.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index 3540c81c3c..502ee251df 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxfactory.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 67e6a936b0..6579d985eb 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uielementfactorymanager.cxx,v $
- * $Revision: 1.10.12.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 7ac9f08901..fb70fdb942 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uielementfactorymanager.cxx,v $
- * $Revision: 1.10.12.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 7db40c5e73..8ab3a1bc0e 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconfigurationreader.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 6954314a54..f08a7c324d 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: acceleratorconfigurationwriter.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/xml/eventsconfiguration.cxx
index 320f94b8a6..eb79b31984 100644
--- a/framework/source/xml/eventsconfiguration.cxx
+++ b/framework/source/xml/eventsconfiguration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventsconfiguration.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/xml/eventsdocumenthandler.cxx
index f160ffe895..4cc61462dc 100644
--- a/framework/source/xml/eventsdocumenthandler.cxx
+++ b/framework/source/xml/eventsdocumenthandler.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventsdocumenthandler.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index 995da41240..55bcd3564b 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagesconfiguration.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index ceb187c322..e67ec74fa6 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imagesdocumenthandler.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk
index 2d610ca0f3..dd40af0cbe 100644
--- a/framework/source/xml/makefile.mk
+++ b/framework/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.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/xml/menuconfiguration.cxx
index 2c540fd4c3..aac1751b1a 100644
--- a/framework/source/xml/menuconfiguration.cxx
+++ b/framework/source/xml/menuconfiguration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menuconfiguration.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx
index 92bc785672..958d663379 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: menudocumenthandler.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/xml/saxnamespacefilter.cxx
index 06ba54932b..2514e67b21 100644
--- a/framework/source/xml/saxnamespacefilter.cxx
+++ b/framework/source/xml/saxnamespacefilter.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: saxnamespacefilter.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/xml/statusbarconfiguration.cxx
index 618afd6796..26853a6995 100644
--- a/framework/source/xml/statusbarconfiguration.cxx
+++ b/framework/source/xml/statusbarconfiguration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbarconfiguration.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/xml/statusbardocumenthandler.cxx
index 321239d03c..d6f4caebf0 100644
--- a/framework/source/xml/statusbardocumenthandler.cxx
+++ b/framework/source/xml/statusbardocumenthandler.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statusbardocumenthandler.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx
index 24c1e8840f..6ef6d36b94 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/xml/toolboxconfiguration.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxconfiguration.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index 279160dce2..deea79beb2 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxdocumenthandler.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/xml/toolboxlayoutdocumenthandler.cxx
index cbc5a35964..039eaffad2 100644
--- a/framework/source/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/xml/toolboxlayoutdocumenthandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolboxlayoutdocumenthandler.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/xml/xmlnamespaces.cxx
index bfe32e18eb..924fdcfef8 100644
--- a/framework/source/xml/xmlnamespaces.cxx
+++ b/framework/source/xml/xmlnamespaces.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnamespaces.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
index e341484b14..6764af8dd0 100644
--- a/framework/test/makefile.mk
+++ b/framework/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.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/test.cxx b/framework/test/test.cxx
index 2aaad82ce3..dc6633c677 100644
--- a/framework/test/test.cxx
+++ b/framework/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.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index 6c19a0d52d..744307f410 100644
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: threadtest.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
index bc9e22ba6c..833c328dc8 100644
--- a/framework/test/threadtest/makefile.mk
+++ b/framework/test/threadtest/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index 0514afd061..f1b65e5743 100644
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: threadtest.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index bdd4a8375f..8faf4e64e1 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cfgview.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
index cc418cf8bd..83782fdc4d 100644
--- a/framework/test/typecfg/makefile.mk
+++ b/framework/test/typecfg/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx
index 8977f66e00..64b32eb8b8 100644
--- a/framework/test/typecfg/typecfg.cxx
+++ b/framework/test/typecfg/typecfg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: typecfg.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index b8bc0d1960..3f86cd04ba 100644
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -2,14 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xml2xcd.cxx,v $
- *
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -297,7 +293,7 @@ void XCDGenerator::Main()
 *//*-*************************************************************************************************************/
 void XCDGenerator::impl_printCopyright()
 {
-    fprintf( stderr, "\n(c) Copyright by Sun microsystems, 2001\n" );
+    fprintf( stderr, "\n(c) Copyright 2000, 2010 Oracle and/or its affiliates.\n" );
 }
 
 //*****************************************************************************************************************
@@ -526,14 +522,10 @@ void XCDGenerator::impl_generateCopyright()
     m_aData.sBufferStandard.appendAscii( "<!-- \n"                                                                     );
     m_aData.sBufferStandard.appendAscii( "  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"           );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
-    m_aData.sBufferStandard.appendAscii( "   Copyright 2008 by Sun Microsystems, Inc.\n"                               );
+    m_aData.sBufferStandard.appendAscii( "   Copyright 2000, 2010 Oracle and/or its affiliates.\n"                               );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
     m_aData.sBufferStandard.appendAscii( "   OpenOffice.org - a multi-platform office productivity suite\n"            );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
-    m_aData.sBufferStandard.appendAscii( "   $RCSfile: xml2xcd.cxx,v $\n"                                               );
-    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
-    m_aData.sBufferStandard.appendAscii( "   $Revision: 1.12 $\n"                                                       );
-    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
     m_aData.sBufferStandard.appendAscii( "   This file is part of OpenOffice.org.\n"                                   );
     m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
     m_aData.sBufferStandard.appendAscii( "   OpenOffice.org is free software: you can redistribute it and/or modify\n" );
@@ -560,14 +552,10 @@ void XCDGenerator::impl_generateCopyright()
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"           );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
-        m_aData.sBufferAdditional.appendAscii( "  Copyright 2008 by Sun Microsystems, Inc.\n"                                );
+        m_aData.sBufferAdditional.appendAscii( "  Copyright 2000, 2010 Oracle and/or its affiliates.\n"                                );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org - a multi-platform office productivity suite\n"             );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
-        m_aData.sBufferAdditional.appendAscii( "  $RCSfile: xml2xcd.cxx,v $\n"                                                );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
-        m_aData.sBufferAdditional.appendAscii( "  $Revision: 1.12 $\n"                                                        );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  This file is part of OpenOffice.org.\n"                                    );
         m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
         m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org is free software: you can redistribute it and/or modify\n"  );
diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
index 92dbaceafa..efa5fc3fd8 100644
--- a/framework/util/guiapps/makefile.mk
+++ b/framework/util/guiapps/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/framework/util/hidother.src b/framework/util/hidother.src
index c4c5787df1..f12337cfe7 100644
--- a/framework/util/hidother.src
+++ b/framework/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index b0b074da8b..3e390826bc 100644
--- a/framework/util/makefile.mk
+++ b/framework/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.124.26.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/framework/util/makefile.pmk b/framework/util/makefile.pmk
index b239f53f45..e567ba01c1 100644
--- a/framework/util/makefile.pmk
+++ b/framework/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/framework/util/target.pmk b/framework/util/target.pmk
index 67a781dff6..857dc59d48 100644
--- a/framework/util/target.pmk
+++ b/framework/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx
index 400595e263..8ba1fd521c 100644
--- a/idl/inc/attrib.hxx
+++ b/idl/inc/attrib.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrib.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/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 64c399d69c..91219b5751 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basobj.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/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 3ab57d19bc..377597893f 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bastype.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/idl/inc/char.hxx b/idl/inc/char.hxx
index 3a4584b199..41a62badb5 100644
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: char.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/idl/inc/command.hxx b/idl/inc/command.hxx
index 792039e15a..7dc41e903f 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 4daa5b9f52..6521796197 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: database.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/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ca0d879286..fe61702c41 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 400afd54b8..3c2921750e 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hash.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/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 620cfd0a9f..89c67fee2d 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lex.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/idl/inc/makefile.mk b/idl/inc/makefile.mk
index 8165221dff..66b944a148 100644
--- a/idl/inc/makefile.mk
+++ b/idl/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/idl/inc/module.hxx b/idl/inc/module.hxx
index 0f0e83f25a..42a675f79f 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 1329afb3ad..8b112fbb0e 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx
index ecc5d04c1e..e5c867abbb 100644
--- a/idl/inc/pch/precompiled_idl.cxx
+++ b/idl/inc/pch/precompiled_idl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_idl.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/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx
index a4fd6606bc..95f3ef59a1 100644
--- a/idl/inc/pch/precompiled_idl.hxx
+++ b/idl/inc/pch/precompiled_idl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_idl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 1cd5769d56..b6770b62f7 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: slot.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/idl/inc/types.hxx b/idl/inc/types.hxx
index c8f3102848..e2c641b526 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/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/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index 38436f08ca..176a0197fa 100644
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: char.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/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 97f5960b13..d4305a0b3b 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hash.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/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index d76bc88094..a82da6cf5d 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lex.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/cmptools/makefile.mk b/idl/source/cmptools/makefile.mk
index 161c011346..bf53623dfd 100644
--- a/idl/source/cmptools/makefile.mk
+++ b/idl/source/cmptools/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 68a4706138..8e89143ed2 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basobj.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 4c9d9bb089..63e09db0aa 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bastype.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/objects/makefile.mk b/idl/source/objects/makefile.mk
index c866bce363..e141d85540 100644
--- a/idl/source/objects/makefile.mk
+++ b/idl/source/objects/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index eeb59e4279..ea690126f0 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 18a5a23894..a5bf99008b 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 28ef205d71..deded0e842 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: slot.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/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index cf84ba229b..a57d4bf554 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 88eac0b88a..bb73a14642 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: command.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 7270423829..320fd20cad 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: database.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 8e75479346..b943b56f22 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globals.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/prj/idldll.cxx b/idl/source/prj/idldll.cxx
index 78689100e5..f5fc8dab9c 100644
--- a/idl/source/prj/idldll.cxx
+++ b/idl/source/prj/idldll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: idldll.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/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk
index 944ae75c04..3e0a55a7fd 100644
--- a/idl/source/prj/makefile.mk
+++ b/idl/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 3336b9fd20..caa90f0818 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svidl.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/idl/util/idlpch.cxx b/idl/util/idlpch.cxx
index 482a9ebf98..e9a5f75fe8 100644
--- a/idl/util/idlpch.cxx
+++ b/idl/util/idlpch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: idlpch.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/idl/util/makefile.mk b/idl/util/makefile.mk
index 8adebf8655..27cc52ef27 100644
--- a/idl/util/makefile.mk
+++ b/idl/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.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/hyphdta.hxx
index 1d387206b9..1d8b9f2b16 100644
--- a/linguistic/inc/hyphdta.hxx
+++ b/linguistic/inc/hyphdta.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyphdta.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 4305d7234a..7d0f028c09 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iprcache.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/lngprophelp.hxx
index ef5e913af4..323d40bc72 100644
--- a/linguistic/inc/lngprophelp.hxx
+++ b/linguistic/inc/lngprophelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prophelp.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/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx
index 4a104eed58..c13bdd4874 100644
--- a/linguistic/inc/lngprops.hxx
+++ b/linguistic/inc/lngprops.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngprops.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/linguistic/inc/makefile.mk b/linguistic/inc/makefile.mk
index 7fa7e867c8..fa5aad7b0a 100644
--- a/linguistic/inc/makefile.mk
+++ b/linguistic/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/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx
index 5b3f4bffe4..c85981fabe 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/misc.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: misc.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/linguistic/inc/pch/precompiled_linguistic.cxx b/linguistic/inc/pch/precompiled_linguistic.cxx
index 98fc71f28d..e0de179557 100644
--- a/linguistic/inc/pch/precompiled_linguistic.cxx
+++ b/linguistic/inc/pch/precompiled_linguistic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_linguistic.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/linguistic/inc/pch/precompiled_linguistic.hxx b/linguistic/inc/pch/precompiled_linguistic.hxx
index c0ed3ac0b2..54f93806c5 100644
--- a/linguistic/inc/pch/precompiled_linguistic.hxx
+++ b/linguistic/inc/pch/precompiled_linguistic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_linguistic.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/spelldta.hxx
index 0d3022db7d..a7dc79037f 100644
--- a/linguistic/inc/spelldta.hxx
+++ b/linguistic/inc/spelldta.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelldta.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/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx
index 780389b277..9c58482870 100644
--- a/linguistic/inc/thesdta.hxx
+++ b/linguistic/inc/thesdta.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: thesdta.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
index 233bc71d16..42b8e9fe8e 100644
--- a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java
+++ b/linguistic/qa/complex/linguistic/HangulHanjaConversion.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: HangulHanjaConversion.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/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk
index b53b25c76c..75330e3c5d 100644
--- a/linguistic/qa/complex/linguistic/makefile.mk
+++ b/linguistic/qa/complex/linguistic/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.24.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/qa/unoapi/makefile.mk b/linguistic/qa/unoapi/makefile.mk
index 8bac81ca33..d24be03615 100644
--- a/linguistic/qa/unoapi/makefile.mk
+++ b/linguistic/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/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 30129b01ac..7d37935f0b 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convdic.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/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 649262ab39..b7fd841989 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convdic.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/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 37a536ba87..3c95f1b52f 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convdiclist.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/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 36416d5561..0c06871a3d 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convdiclist.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index a0efca3089..c06c6f9217 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convdicxml.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/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 1ada0a8fb8..52e99d4be1 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: convdicxml.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/linguistic/source/defs.hxx b/linguistic/source/defs.hxx
index 02d6fbd343..20fbce08e7 100644
--- a/linguistic/source/defs.hxx
+++ b/linguistic/source/defs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: defs.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 2343328aa0..ea08c32260 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dicimp.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/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 99099eb706..7bdda6b6ba 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dicimp.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/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 0c27c945af..de7c14349e 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlistimp.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/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 2ef1544629..336707ab41 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlistimp.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/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 25d8ca19b7..101c231db6 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gciterator.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 6697b8e704..1888726704 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gciterator.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 8df73a1b18..1f076f0f39 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grammarchecker.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/grammarchecker.hxx b/linguistic/source/grammarchecker.hxx
index b812c62177..7c7f6cd5aa 100644
--- a/linguistic/source/grammarchecker.hxx
+++ b/linguistic/source/grammarchecker.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grammarchecker.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index a6e3e17b7e..1cbdbe3fa2 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hhconvdic.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/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index e09d3e513d..c66974f26e 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hhconvdic.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 7a0da09b39..e617231bc5 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -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: hyphdsp.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/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 364244a3a0..564ceb6dc6 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyphdsp.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/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 7a8233d0af..e0d26b163e 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyphdta.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/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index f5d050b30a..bf3be9a28e 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iprcache.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/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 3b819154e1..d377f856e8 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngopt.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/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 695df4ac6c..918f8e203e 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngopt.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/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index c233fdcff2..c4de697767 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prophelp.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/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index 6bf6f2021f..2eaadda56f 100644
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngreg.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/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 64de21260c..82caafe02e 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngsvcmgr.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -643,15 +640,14 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
     for (sal_Int32 i = 0;  i < nLen;  ++i)
     {
         // property names look like
-        // "ServiceManager/ThesaurusList/cfg:any['de-CH']"
+        // "ServiceManager/ThesaurusList/de-CH"
 
         const OUString &rName = pPropertyNames[i];
-        sal_Int32 nKeyStart, nKeyEnd;
-        nKeyStart = rName.indexOf( A2OU("['"), 0 );
-        nKeyEnd   = rName.indexOf( A2OU("']"), nKeyStart + 2);
+        sal_Int32 nKeyStart;
+        nKeyStart = rName.lastIndexOf( '/' );
         OUString aKeyText;
-        if (nKeyStart != -1 && nKeyEnd != -1)
-            aKeyText = rName.copy( nKeyStart + 2, nKeyEnd - nKeyStart - 2);
+        if (nKeyStart != -1)
+            aKeyText = rName.copy( nKeyStart + 1 );
         DBG_ASSERT( aKeyText.getLength() != 0, "unexpected key (lang::Locale) string" );
         if (0 == rName.compareTo( aSpellCheckerList, aSpellCheckerList.getLength() ))
         {
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 7ee9ad0ba6..5ffb9defdb 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngsvcmgr.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/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index bdf0b297d2..3f68afb305 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/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.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index b45e4eca3f..039ad0dee2 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: misc.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/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index ffd54b78f8..2b5910e031 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: misc2.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/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index 870923f6d2..255295730c 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelldsp.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/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 53e5be5d17..dcb53ef57b 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelldsp.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/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 5004e84f46..c260631b74 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: spelldta.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/linguistic/source/staticmb.cxx b/linguistic/source/staticmb.cxx
index a554ceda99..e67e3e7cdb 100644
--- a/linguistic/source/staticmb.cxx
+++ b/linguistic/source/staticmb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: staticmb.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/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index e6604ae080..2cc8e536ad 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: thesdsp.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/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index baa3756b13..97259e1678 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: thesdsp.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/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx
index c196942404..6cee02b9f3 100644
--- a/linguistic/source/thesdta.cxx
+++ b/linguistic/source/thesdta.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: thesdta.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/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
index fcabbe9422..5c8cc67e85 100644
--- a/linguistic/workben/makefile.mk
+++ b/linguistic/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/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 5fe9f29cf4..40f2fa986d 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sprophelp.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx
index 6322e5a50a..30a7656acc 100644
--- a/linguistic/workben/sprophelp.hxx
+++ b/linguistic/workben/sprophelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sprophelp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index 8328dd4143..f574977cab 100644
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sreg.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 8cc3bfd8c1..d6761afbd1 100644
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sspellimp.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/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index df866183ba..c02302fdfa 100644
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sspellimp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst
index 66ba41abd6..debb9659a9 100644
--- a/officecfg/prj/d.lst
+++ b/officecfg/prj/d.lst
@@ -27,10 +27,8 @@ mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\OOoImprovement
 mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
 mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
 
-..\registry\schema\oo-ldap-attr.map %_DEST%\xml%_EXT%\registry\schema\oo-ldap-attr.map
-..\registry\schema\oo-ad-ldap-attr.map %_DEST%\xml%_EXT%\registry\schema\oo-ad-ldap-attr.map
-
-..\%__SRC%\misc\registry\data\org\openoffice\*.xcu.sample %_DEST%\xml%_EXT%\registry\data\org\openoffice\*.xcu.sample
+..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ldap.xcd.sample
+..\registry\schema\oo-ad-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ad-ldap.xcd.sample
 
 ..\%__SRC%\misc\registry\data\org\openoffice\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice
 ..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
diff --git a/officecfg/registry/component-schema.dtd b/officecfg/registry/component-schema.dtd
index 7fb3f4a1e5..17d265da91 100644
--- a/officecfg/registry/component-schema.dtd
+++ b/officecfg/registry/component-schema.dtd
@@ -1,127 +1,152 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
 <!ELEMENT oor:component-schema (info?, import*, uses*, templates?, component)>
 <!ATTLIST oor:component-schema
-    oor:name NMTOKEN #REQUIRED
-    oor:package NMTOKEN #REQUIRED
+    oor:package CDATA #REQUIRED
+    oor:name CDATA #REQUIRED
     oor:version NMTOKEN #IMPLIED
     xml:lang CDATA #IMPLIED
     xmlns:oor CDATA #FIXED "http://openoffice.org/2001/registry"
-    xmlns:xs  CDATA #FIXED "http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi CDATA #FIXED "http://www.w3.org/2001/XMLSchema-instance"
->
+    xmlns:xs CDATA #FIXED "http://www.w3.org/2001/XMLSchema">
 
 <!ELEMENT import EMPTY>
 <!ATTLIST import
-    oor:component CDATA #REQUIRED
->
+    oor:component CDATA #REQUIRED>
 
 <!ELEMENT uses EMPTY>
 <!ATTLIST uses
-    oor:component CDATA #REQUIRED
->
+    oor:component CDATA #REQUIRED>
 
-<!ELEMENT templates (info?, (group | set)*)>
-<!ELEMENT component (info?, (node-ref | group | set)*)>
+<!ELEMENT templates (info?, (set | group)*)>
+<!ATTLIST templates>
 
 <!ELEMENT info (deprecated?, author*, desc*, label*)>
+<!ATTLIST info>
 
 <!ELEMENT deprecated (#PCDATA)>
+<!ATTLIST deprecated>
 
 <!ELEMENT author (#PCDATA)>
+<!ATTLIST author>
 
 <!ELEMENT desc (#PCDATA)>
 <!ATTLIST desc
-  xml:lang CDATA #IMPLIED
->
+    xml:lang CDATA #IMPLIED>
 
 <!ELEMENT label (#PCDATA)>
 <!ATTLIST label
-  xml:lang CDATA #IMPLIED
->
+    xml:lang CDATA #IMPLIED>
 
-<!ELEMENT group (info?, (prop | node-ref | group | set)*)>
-<!ATTLIST group
-    oor:name CDATA #REQUIRED
-    oor:extensible (true | false) #IMPLIED
->
+<!ELEMENT component (info?, (set | group | prop | node-ref)*)>
+<!ATTLIST component>
 
 <!ELEMENT set (info?, item*)>
 <!ATTLIST set
     oor:name CDATA #REQUIRED
-    oor:node-type NMTOKEN #REQUIRED
-    oor:component CDATA #IMPLIED
->
+    oor:node-type CDATA #REQUIRED
+    oor:component CDATA #IMPLIED>
 
-<!ELEMENT node-ref (info?)>
-<!ATTLIST node-ref
+<!ELEMENT item EMPTY>
+<!ATTLIST item
+    oor:node-type CDATA #REQUIRED
+    oor:component CDATA #IMPLIED>
+
+<!ELEMENT group (info?, (set | group | prop | node-ref)*)>
+<!ATTLIST group
     oor:name CDATA #REQUIRED
-    oor:node-type NMTOKEN #REQUIRED
-    oor:component CDATA #IMPLIED
->
+    oor:extensible (false | true) #IMPLIED>
 
 <!ELEMENT prop (info?, constraints?, value?)>
 <!ATTLIST prop
     oor:name CDATA #REQUIRED
-    oor:type (xs:boolean | xs:short | xs:int | xs:long | xs:double | xs:string | xs:hexBinary | oor:any | oor:boolean-list | oor:short-list | oor:int-list | oor:long-list | oor:double-list | oor:string-list | oor:hexBinary-list) #REQUIRED
-    oor:localized (true | false) #IMPLIED
-    oor:nillable (true | false) #IMPLIED
->
-
-<!ELEMENT item EMPTY>
-<!ATTLIST item
-    oor:node-type NMTOKEN #REQUIRED
-    oor:component CDATA #IMPLIED
->
-
-<!ELEMENT value (#PCDATA)>
-<!ATTLIST value
-    oor:separator CDATA #IMPLIED
->
-
-<!ELEMENT constraints (enumeration*, length?, minLength?, maxLength?, minInclusive?, maxInclusive?, minExclusive?, maxExclusive?, whiteSpace?)>
+    oor:localized (false | true) #IMPLIED
+    oor:type
+        (oor:any | xs:boolean | xs:short | xs:int | xs:long | xs:double |
+         xs:string | xs:hexBinary | oor:boolean-list | oor:short-list |
+         oor:int-list | oor:long-list | oor:double-list | oor:string-list |
+         oor:hexBinary-list)
+        #REQUIRED
+    oor:nillable (false | true) #IMPLIED>
+
+<!ELEMENT constraints
+    (enumeration*, length?, minLength?, maxLength?, minInclusive?,
+     maxInclusive?, minExclusive?, maxExclusive?, whiteSpace?)>
 
 <!ELEMENT enumeration (info?)>
 <!ATTLIST enumeration
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT length (info?)>
 <!ATTLIST length
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT minLength (info?)>
 <!ATTLIST minLength
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT maxLength (info?)>
 <!ATTLIST maxLength
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT minInclusive (info?)>
 <!ATTLIST minInclusive
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT maxInclusive (info?)>
 <!ATTLIST maxInclusive
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT minExclusive (info?)>
 <!ATTLIST minExclusive
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT maxExclusive (info?)>
 <!ATTLIST maxExclusive
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
 
 <!ELEMENT whiteSpace (info?)>
 <!ATTLIST whiteSpace
-    oor:value CDATA #REQUIRED
->
+    oor:value CDATA #REQUIRED>
+
+<!ELEMENT value (#PCDATA | it | unicode)*>
+<!ATTLIST value
+    oor:separator CDATA #IMPLIED>
 
+<!ELEMENT it (#PCDATA | unicode)*>
+<!ATTLIST it>
+
+<!ELEMENT unicode EMPTY>
+<!ATTLIST unicode
+    oor:scalar NMTOKEN #REQUIRED>
+
+<!ELEMENT node-ref (info?)>
+<!ATTLIST node-ref
+    oor:name CDATA #REQUIRED
+    oor:node-type CDATA #REQUIRED
+    oor:component CDATA #IMPLIED>
diff --git a/officecfg/registry/component-schema.xsd b/officecfg/registry/component-schema.xsd
deleted file mode 100644
index cc3c18a16c..0000000000
--- a/officecfg/registry/component-schema.xsd
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.3 U (http://www.xmlspy.com) by Dirk Grobler (OpenOffice) -->
-<xs:schema targetNamespace="http://openoffice.org/2001/registry" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="qualified">
-  <xs:annotation>
-    <xs:documentation>specifies the document format for OOo configuration component schemata.</xs:documentation>
-  </xs:annotation>
-  <xs:attribute name="extensible" type="xs:boolean" use="optional" default="false">
-  <xs:annotation>
-	<xs:documentation>determines, whether a node has an extensible list of attributes or fixed list of attributes.</xs:documentation>
-  </xs:annotation>
-</xs:attribute>
-<xs:attribute name="localized" type="xs:boolean" use="optional" default="false">
-  <xs:annotation>
-	<xs:documentation>specifies, whether an attribute has or might have different values for different locales. </xs:documentation>
-  </xs:annotation>
-</xs:attribute>
-  <xs:attribute name="nillable" type="xs:boolean" use="optional" default="true">
- <xs:annotation>
-   <xs:documentation>specifies, whether it is permissible to have a 'nil' i.e., missing, node content. The default for 'nillable' is 'true'.
-If a non-optional (nillable = 'false') has no default value (given in the component schema) it must be
-explicitly specified for each user.</xs:documentation>
- </xs:annotation>
-</xs:attribute>
-  <xs:complexType name="prop">
-    <xs:annotation>
-        <xs:documentation>redefines the property type 
-                by adding documentation and type constraint elements.</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="oor:basic-prop">
-        <xs:sequence>            
-            <xs:element name="info" type="oor:info" minOccurs="0"/>
-            <xs:element name="constraints" minOccurs="0">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element name="enumeration" type="oor:constraint" minOccurs="0" maxOccurs="unbounded"/>
-                  <xs:element name="length" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="minLength" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="maxLength" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="minInclusive" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="maxInclusive" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="minExclusive" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="maxExclusive" type="oor:constraint" minOccurs="0"/>
-                  <xs:element name="whiteSpace" type="oor:constraint" minOccurs="0"/>
-                </xs:sequence>
-              </xs:complexType>
-            </xs:element>
-            <xs:element name="value" type="oor:value" minOccurs="0"/>
-        </xs:sequence>
-        <xs:attribute ref="oor:localized"/>
-        <xs:attribute ref="oor:nillable"/>
-        <xs:attribute ref="oor:type" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="group">
-    <xs:annotation>
-      <xs:documentation>type definition for group nodes</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="oor:basic-node">
-        <xs:sequence>
-          <xs:element name="info" type="oor:info" minOccurs="0"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="prop" type="oor:prop" />          
-            <xs:element name="group" type="oor:group"/>
-            <xs:element name="set" type="oor:set"/>
-            <xs:element name="node-ref" type="oor:node-ref"/>
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute ref="oor:extensible"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="set">
-    <xs:annotation>
-      <xs:documentation>type definition for set nodes</xs:documentation>
-    </xs:annotation>
-    <xs:complexContent>
-      <xs:extension base="oor:basic-node">
-        <xs:sequence>
-          <xs:element name="info" type="oor:info" minOccurs="0"/>
-          <xs:element name="item" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-              <xs:attributeGroup ref="oor:node-type-info" />
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-        <xs:attribute ref="oor:extensible"/>
-        <xs:attributeGroup ref="oor:node-type-info" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="node-ref">
-    <xs:annotation>
-      <xs:documentation>allows to define node references. A node references points to an existing templated definition. This definition will be expanded at runtime.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="info" type="oor:info" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute ref="oor:name" use="required"/>
-    <xs:attributeGroup ref="oor:node-type-info" />
-  </xs:complexType>
-  <xs:complexType name="constraint">
-    <xs:annotation>
-      <xs:documentation>basic type for constraints, which can be applied for property elements.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="info" type="oor:info" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute name="value" type="xs:anySimpleType" use="required"/>
-  </xs:complexType>
-  <xs:complexType name="info">
-    <xs:annotation>
-      <xs:documentation>type for providing human readable information.  Can be attached to any kind of component schema element.</xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="deprecated" type="xs:string" minOccurs="0">
-        <xs:annotation>
-          <xs:documentation>identifies an entry as deprecated. Can be assiciated with an explanation e.g. since when the entry is deprecated.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="author" type="xs:string" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>author(s) of the configuration entry.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="desc" minOccurs="0" maxOccurs="unbounded">
-        <xs:complexType>
-          <xs:annotation>
-            <xs:documentation>provide a human
-                        readable documentation for a schema element.</xs:documentation>
-          </xs:annotation>
-          <xs:simpleContent>
-            <xs:extension base="xs:string">
-              <xs:attribute ref="xml:lang"/>
-            </xs:extension>
-          </xs:simpleContent>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="label" minOccurs="0" maxOccurs="unbounded">
-        <xs:complexType>
-          <xs:annotation>
-            <xs:documentation>describes a title or label, 
-                        which can be reused in a console.</xs:documentation>
-          </xs:annotation>
-          <xs:simpleContent>
-            <xs:extension base="xs:string">
-              <xs:attribute ref="xml:lang"/>
-            </xs:extension>
-          </xs:simpleContent>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="component-schema">
-    <xs:annotation>
-      <xs:documentation>Root element, which encompasses the schema specification</xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="info" type="oor:info" minOccurs="0"/>
-        <xs:element name="import" minOccurs="0" maxOccurs="unbounded">
-          <xs:complexType>
-            <xs:attribute ref="oor:component" use="required"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="uses" minOccurs="0" maxOccurs="unbounded">
-          <xs:complexType>
-            <xs:attribute ref="oor:component" use="required"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="templates" minOccurs="0">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element name="group" type="oor:group">
-                  <xs:unique name="groupMember">
-                    <xs:selector xpath="group|set|node-ref|prop"/>
-                    <xs:field xpath="@oor:name"/>
-                  </xs:unique>
-                </xs:element>
-                <xs:element name="set" type="oor:set"/>
-              </xs:choice>
-            </xs:sequence>
-          </xs:complexType>
-          <xs:unique name="templatesMember">
-            <xs:selector xpath="oor:group|oor:set"/>
-            <xs:field xpath="@oor:name"/>
-          </xs:unique>
-        </xs:element>
-        <xs:element name="component">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:choice minOccurs="1" maxOccurs="unbounded">
-                <xs:element name="prop" type="oor:prop"/>
-                <xs:element name="node-ref" type="oor:node-ref"/>
-                <xs:element name="group" type="oor:group">
-                  <xs:unique name="groupMember1">
-                    <xs:selector xpath="oor:group|oor:set|oor:node-ref|oor:prop"/>
-                    <xs:field xpath="@oor:name"/>
-                  </xs:unique>
-                </xs:element>
-                <xs:element name="set" type="oor:set"/>
-              </xs:choice>
-            </xs:sequence>
-          </xs:complexType>
-          <xs:unique name="schemaMember">
-            <xs:selector xpath="oor:group|oor:set|oor:node-ref|oor:prop"/>
-            <xs:field xpath="@oor:name"/>
-          </xs:unique>
-        </xs:element>
-      </xs:sequence>
-      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute ref="oor:package"/>
-      <xs:attribute name="version" type="xs:string" use="optional">
-        <xs:annotation>
-          <xs:documentation>identifies the version of the component. The version number is build of major.minor.micro</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute ref="xml:lang" use="optional"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/officecfg/registry/component-types.xsd b/officecfg/registry/component-types.xsd
deleted file mode 100644
index 9b2f2371ce..0000000000
--- a/officecfg/registry/component-types.xsd
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:oor="http://openoffice.org/2001/registry" elementFormDefault="unqualified" attributeFormDefault="qualified">
-  <xs:annotation>
-    <xs:documentation>provides a list of standard attribute and element definitions, reused in most parts of the different OOR document types</xs:documentation>
-  </xs:annotation>
-    <xs:import namespace="http://www.w3.org/XML/1998/namespace" 
-   schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <!--List of attributes known in OOR-->
-  <xs:attribute name="name" type="xs:string" use="required">
-    <xs:annotation>
-      <xs:documentation>identifies a node or an attribute within a tree, must be unique for all siblings.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="package" type="xs:NMTOKEN" use="required">
-    <xs:annotation>
-      <xs:documentation>contains the name of the package. 
-                Package names are composed similar to java packages. 
-                Packages are used to structure component configuration data. 
-                An example of a package is 'org.openoffice', 
-                where 'org' and 'openoffice' each define a package.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="node-type" type="xs:NMTOKEN">
-    <xs:annotation>
-      <xs:documentation>identifies the template to use for the set or a node reference. </xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="component" type="xs:string" use="optional">
-    <xs:annotation>
-      <xs:documentation>specifies the component, which contains a template definition</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
- <xs:attribute name="separator" type="xs:string" default=" ">
-    <xs:annotation>
-      <xs:documentation>specifies a separator for list types. The default
-			is a blank, which is sufficient for most basic types like xs:int or
-			xs:boolean. Only in certain cases, when using a sting or a binary
-			list, the separator might differ. For example, a list of string values like build of the items 'europe' and 'south america' needs a different separator, as the usage of the default separator would result in a list of three items.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
- <xs:attribute name="type" use="optional">
-    <xs:annotation>
-      <xs:documentation>specifies the list of known basic types and their list equivalents. Is only allowed for properties.</xs:documentation>
-    </xs:annotation>
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:enumeration value="xs:boolean"/>
-        <xs:enumeration value="xs:short"/>
-        <xs:enumeration value="xs:int"/>
-        <xs:enumeration value="xs:long"/>
-        <xs:enumeration value="xs:double"/>
-        <xs:enumeration value="xs:string"/>
-        <xs:enumeration value="xs:hexBinary"/>
-        <xs:enumeration value="oor:any"/>
-        <xs:enumeration value="oor:boolean-list"/>
-        <xs:enumeration value="oor:short-list"/>
-        <xs:enumeration value="oor:int-list"/>
-        <xs:enumeration value="oor:long-list"/>
-        <xs:enumeration value="oor:double-list"/>
-        <xs:enumeration value="oor:string-list"/>
-        <xs:enumeration value="oor:hexBinary-list"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-  <xs:attributeGroup name="node-info">
-    <xs:annotation>
-      <xs:documentation>encompasses common attributes for nodes.</xs:documentation>
-    </xs:annotation>
-    <xs:attribute ref="oor:name" use="required"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="node-type-info">
-    <xs:annotation>
-      <xs:documentation>encompasses attributes for referencing a node-type.</xs:documentation>
-    </xs:annotation>
-    <xs:attribute ref="oor:node-type" use="required"/>
-    <xs:attribute ref="oor:component" use="optional"/>
-  </xs:attributeGroup>
-  <xs:attributeGroup name="prop-info">
-    <xs:annotation>
-      <xs:documentation>encompasses common attributes for properties.</xs:documentation>
-    </xs:annotation>
-    <xs:attribute ref="oor:name" use="required"/>
-  </xs:attributeGroup>
-  <!--List of list data types supported by OOR-->
-  <xs:simpleType name="boolean-list">
-    <xs:list itemType="xs:boolean"/>
-  </xs:simpleType>
-  <xs:simpleType name="short-list">
-    <xs:list itemType="xs:short"/>
-  </xs:simpleType>
-  <xs:simpleType name="int-list">
-    <xs:list itemType="xs:int"/>
-  </xs:simpleType>
-  <xs:simpleType name="long-list">
-    <xs:list itemType="xs:long"/>
-  </xs:simpleType>
-  <xs:simpleType name="double-list">
-    <xs:list itemType="xs:double"/>
-  </xs:simpleType>
-  <xs:simpleType name="string-list">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-  <xs:simpleType name="hexBinary-list">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-  <!--List of basic type definitions for all schema and instance elements known by OOR-->
-  <xs:complexType name="basic-node">
-    <xs:annotation>
-      <xs:documentation>base class for all kinds of nodes (set | group)</xs:documentation>
-    </xs:annotation>
-    <xs:attributeGroup ref="oor:node-info"/>
-  </xs:complexType>
-  <xs:complexType name="basic-prop">
-    <xs:annotation>
-      <xs:documentation>type definition for node properties</xs:documentation>
-    </xs:annotation>
-    <xs:attributeGroup ref="oor:prop-info"/>
-  </xs:complexType>
-  <xs:complexType name="value">
-    <xs:annotation>
-      <xs:documentation>type definition for value nodes.</xs:documentation>
-    </xs:annotation>
-    <xs:simpleContent>
-      <xs:extension base="oor:anyValue">
-        <xs:attribute ref="oor:separator" use="optional"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="anyValue">
-    <xs:annotation>
-      <xs:documentation>defines the list of possible basic data-types for properties.</xs:documentation>
-    </xs:annotation>
-    <xs:union memberTypes="xs:boolean xs:short xs:int xs:long xs:double xs:string xs:hexBinary oor:boolean-list oor:short-list oor:int-list oor:long-list oor:double-list oor:string-list oor:hexBinary-list"/>
-  </xs:simpleType>
-</xs:schema>
diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd
index 10c4632a91..51623f40ba 100644
--- a/officecfg/registry/component-update.dtd
+++ b/officecfg/registry/component-update.dtd
@@ -1,41 +1,119 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
 
-<!ELEMENT oor:component-data ((prop|node)*)>
+<!ELEMENT oor:component-data ((node | prop)*)>
 <!ATTLIST oor:component-data
-  oor:name NMTOKEN #REQUIRED
-  oor:package NMTOKEN #REQUIRED
-  oor:finalized (true | false) #IMPLIED
-  oor:op (modify | replace | fuse | remove | reset) #IMPLIED
-  xmlns:oor CDATA #FIXED "http://openoffice.org/2001/registry"
-  xmlns:install CDATA #FIXED "http://openoffice.org/2004/installation"
-  xmlns:xs CDATA #FIXED "http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi CDATA #FIXED "http://www.w3.org/2001/XMLSchema-instance"
->
-
-<!ELEMENT node ((prop|node)*)>
+    oor:package CDATA #REQUIRED
+    oor:name CDATA #REQUIRED
+    oor:op (modify | replace | fuse | remove) #IMPLIED
+    oor:finalized (false | true) #IMPLIED
+    xmlns:oor CDATA #FIXED "http://openoffice.org/2001/registry"
+    xmlns:xs CDATA #FIXED "http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi CDATA #FIXED "http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:install CDATA #FIXED "http://openoffice.org/2004/installation">
+
+<!ELEMENT node ((node | prop)*)>
 <!ATTLIST node
-  oor:name CDATA #REQUIRED
-  oor:component CDATA #IMPLIED
-  oor:finalized (true | false) #IMPLIED
-  oor:mandatory (true | false) #IMPLIED
-  oor:op (modify | replace | fuse | remove | reset) #IMPLIED
-  oor:node-type NMTOKEN #IMPLIED
-  install:module NMTOKEN #IMPLIED
->
+    oor:name CDATA #REQUIRED
+    oor:op (modify | replace | fuse | remove) #IMPLIED
+    oor:finalized (true | false) #IMPLIED
+    oor:mandatory (true | false) #IMPLIED
+    oor:node-type CDATA #IMPLIED
+    oor:component CDATA #IMPLIED
+    install:module CDATA #IMPLIED>
 
 <!ELEMENT prop (value*)>
 <!ATTLIST prop
-  oor:name CDATA #REQUIRED
-  oor:op (modify | replace | fuse | remove | reset) #IMPLIED
-  oor:finalized CDATA #IMPLIED
-  oor:type (xs:boolean | xs:short | xs:int | xs:long | xs:double | xs:string | xs:hexBinary | oor:boolean-list | oor:short-list | oor:int-list | oor:long-list | oor:double-list | oor:string-list | oor:hexBinary-list) #IMPLIED
-  install:module NMTOKEN #IMPLIED
->
-
-<!ELEMENT value (#PCDATA)>
+    oor:name CDATA #REQUIRED
+    oor:op (modify | replace | fuse | remove) #IMPLIED
+    oor:finalized (true | false) #IMPLIED
+    oor:type
+        (oor:any | xs:boolean | xs:short | xs:int | xs:long | xs:double |
+         xs:string | xs:hexBinary | oor:boolean-list | oor:short-list |
+         oor:int-list | oor:long-list | oor:double-list | oor:string-list |
+         oor:hexBinary-list)
+        #IMPLIED
+    install:module CDATA #IMPLIED>
+
+<!ELEMENT value (#PCDATA | it | unicode)*>
+    <!-- EMPTY  if oor:op="remove", xsi:nil="true", or oor:external is used
+         #PCDATA  if the property type is a non-list type other than xs:string
+         (#PCDATA | unicode)*  if the property type is xs:string
+         #PCDATA  or  it*  if the property type is a list type other than
+             oor:string-list
+         (#PCDATA | unicode)*  or  it*  if the property type is
+             oor:string-list -->
 <!ATTLIST value
-  xsi:nil (true | false) #IMPLIED
-  oor:separator CDATA #IMPLIED
-  xml:lang CDATA #IMPLIED
-  install:module NMTOKEN #IMPLIED
->
+    xml:lang CDATA #IMPLIED
+    oor:op (fuse | remove) #IMPLIED
+    xsi:nil (true | false) #IMPLIED
+    oor:type
+        (xs:boolean | xs:short | xs:int | xs:long | xs:double | xs:string |
+         xs:hexBinary | oor:boolean-list | oor:short-list | oor:int-list |
+         oor:long-list | oor:double-list | oor:string-list | oor:hexBinary-list)
+        #IMPLIED
+    oor:separator CDATA #IMPLIED
+    oor:external CDATA #IMPLIED
+    install:module CDATA #IMPLIED>
+    <!-- xml:lang  must only be used for localized properties; defaults to the
+             empty string
+         oor:op  defaults to "fuse"; "remove" must only be used for localized
+             properties
+         xsi:nil  defaults to "false"; "true" must only be used for nillable
+             properties
+         oor:type  is relevant for localized properties of type oor:any with
+             different value types for different locales
+         oor:separator  must only be used if the property type is a list type
+             and the element content is #PCDATA or (#PCDATA | unicode)* (and not
+             EMPTY or it*)
+         oor:external  must only be used for non-localized properties and must
+             not be used together with xsi:nil="true" -->
+
+<!ELEMENT it (#PCDATA | unicode)*>
+    <!-- #PCDATA  if the property type is a list type other than
+             oor:string-list
+         (#PCDATA | unicode)*  if the property type is oor:string-list -->
+<!ATTLIST it>
+
+<!ELEMENT unicode EMPTY>
+<!ATTLIST unicode
+    oor:scalar NMTOKEN #REQUIRED>
+        <!-- must syntactically match xs:integer and have a value in {0, ..., 8,
+             11, 12, 14, ..., 31, 65534, 65535} -->
+
+<!-- oor:items is an alternative root element to oor:component-data (in plain
+     .xcu files only; not when nested in an .xcd file), used for the user-layer
+     registrymodifications.xcu: -->
+
+<!ELEMENT oor:items (item*)>
+<!ATTLIST oor:items>
+
+<!ELEMENT item ((prop | node)*)>
+<!ATTLIST item
+    oor:path CDATA #REQUIRED>
+        <!-- the absolute path representation of a set or group node -->
diff --git a/officecfg/registry/component-update.xsd b/officecfg/registry/component-update.xsd
deleted file mode 100644
index 5e0d099473..0000000000
--- a/officecfg/registry/component-update.xsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://openoffice.org/2001/registry" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="qualified">
-	<xs:annotation>
-		<xs:documentation>defines the document format for configuration update documents.
-         Updates are increments to default documents like a component schema and contain
-         additional information for merging and access control</xs:documentation>
-	</xs:annotation>
-	<xs:redefine schemaLocation="component-types.xsd">
-		<xs:complexType name="value">
-			<xs:annotation>
-				<xs:documentation>adds the xml:lang attribute for localized information. Only the update format is allowed to contain localized data.</xs:documentation>
-			</xs:annotation>
-			<xs:simpleContent>
-				<xs:extension base="oor:value">
-					<xs:attribute ref="xml:lang"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	</xs:redefine>
-	<xs:complexType name="node">
-		<xs:annotation>
-			<xs:documentation>Identifies a node in the schema by it's name and position within the hierarchy. Overrides or adds information from the base layer. A node can be of type set or group.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="oor:basic-node">
-				<xs:choice minOccurs="0" maxOccurs="unbounded">
-					<xs:element name="node" type="oor:node"/>
-					<xs:element name="prop" type="oor:prop">
-						<xs:unique name="uniqueLang">
-							<xs:selector xpath="oor:value"/>
-							<xs:field xpath="@xml:lang"/>
-						</xs:unique>
-					</xs:element>
-				</xs:choice>
-				<xs:attributeGroup ref="oor:update-info"/>
-	            <xs:attribute ref="oor:mandatory"/>
-				<xs:attributeGroup ref="oor:node-type-info" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="prop">
-		<xs:annotation>
-			<xs:documentation>adds operational info to a property, should only be applied for dynamic properties. Dynamic properties are not available in the component schema and are added or removed during runtime.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="oor:basic-prop">
-				<xs:sequence minOccurs="0" maxOccurs="unbounded">
-					<xs:element name="value" type="oor:value" nillable="true"/>
-				</xs:sequence>
-				<xs:attributeGroup ref="oor:update-info"/>
-				<xs:attribute ref="oor:type" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:attributeGroup name="update-info">
-		<xs:attribute ref="oor:finalized"/>
-		<xs:attribute ref="oor:readonly"/>
-		<xs:attribute ref="oor:op"/>
-	</xs:attributeGroup>
-	<xs:attribute name="op" use="optional" default="modify">
-		<xs:annotation>
-			<xs:documentation>defines a list of possible operations, which are applied during merging of node fragments.</xs:documentation>
-		</xs:annotation>
-		<xs:simpleType>
-			<xs:restriction base="xs:string">
-				<xs:enumeration value="modify"/>
-				<xs:enumeration value="replace"/>
-				<xs:enumeration value="fuse"/>
-				<xs:enumeration value="remove"/>
-				<xs:enumeration value="reset"/>
-			</xs:restriction>
-		</xs:simpleType>
-	</xs:attribute>
-	<xs:attribute name="finalized" type="xs:boolean" use="optional" default="false">
-		<xs:annotation>
-			<xs:documentation>indicates that the content of a node and its descendant nodes are not allowed to be overwritten.</xs:documentation>
-		</xs:annotation>
-	</xs:attribute>
-	<xs:attribute name="mandatory" type="xs:boolean" default="false">
-		<xs:annotation>
-			<xs:documentation>specifies that a node MUST be present and can not be removed or replaced by a node during the merging process. </xs:documentation>
-		</xs:annotation>
-	</xs:attribute>
-	<xs:attribute name="readonly" type="xs:boolean" use="optional" default="false">
-		<xs:annotation>
-			<xs:documentation>determines, whether a node and its descendants are readonly or not. This is a computed attribute and can not be set by an application.</xs:documentation>
-		</xs:annotation>
-	</xs:attribute>
-	<xs:element name="component-data">
-		<xs:annotation>
-			<xs:documentation>root element of the update document.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:extension base="oor:basic-node">
-				<xs:choice minOccurs="0" maxOccurs="unbounded">
-					<xs:element name="node" type="oor:node"/>
-					<xs:element name="prop" type="oor:prop">
-						<xs:unique name="uniqueLang">
-							<xs:selector xpath="oor:value"/>
-							<xs:field xpath="@xml:lang"/>
-						</xs:unique>
-					</xs:element>
-				</xs:choice>
-				<xs:attributeGroup ref="oor:update-info"/>
-                <xs:attribute ref="oor:package"/>
-			</xs:extension>
-		</xs:complexType>
-		<xs:unique name="member">
-			<xs:selector xpath="oor:node|oor:prop"/>
-			<xs:field xpath="@oor:name"/>
-		</xs:unique>
-	</xs:element>
-</xs:schema>
diff --git a/officecfg/registry/data.dtd b/officecfg/registry/data.dtd
new file mode 100644
index 0000000000..c3f7d0a61b
--- /dev/null
+++ b/officecfg/registry/data.dtd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<!ELEMENT oor:data (dependency*, (oor:component-schema | oor:component-data)*)>
+<!ATTLIST oor:data>
+
+<!ELEMENT dependency EMPTY>
+<!ATTLIST dependency
+    file CDATA #REQUIRED>
+
+<!ENTITY % component-schema.dtd SYSTEM "component-schema.dtd">
+%component-schema.dtd;
+
+<!ENTITY % component-update.dtd SYSTEM "component-update.dtd">
+%component-update.dtd;
diff --git a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
index e8813146c4..06546894ff 100644
--- a/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/FirstStartWizard.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FirstStartWizard.xcu,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu
index 8e505f4051..2f8e44c784 100644
--- a/officecfg/registry/data/org/openoffice/Inet.xcu
+++ b/officecfg/registry/data/org/openoffice/Inet.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Inet.xcu,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,10 +26,72 @@
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
-<oor:component-data oor:name="Inet" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-data oor:name="Inet" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <node oor:name="Settings">
+    <prop oor:name="ooInetNoProxy">
+      <value install:module="macosx" oor:external=
+          "com.sun.star.configuration.backend.MacOSXBackend ooInetNoProxy"/>
+      <value install:module="unixdesktop" oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend ooInetNoProxy"/>
+      <value install:module="wnt" oor:external=
+          "com.sun.star.configuration.backend.WinInetBackend ooInetNoProxy"/>
+    </prop>
     <prop oor:name="ooInetProxyType">
       <value>1</value>
+      <value install:module="macosx" oor:external=
+          "com.sun.star.configuration.backend.MacOSXBackend ooInetProxyType"/>
+      <value install:module="unixdesktop" oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend ooInetProxyType"/>
+      <value install:module="wnt" oor:external=
+          "com.sun.star.configuration.backend.WinInetBackend ooInetProxyType"/>
+    </prop>
+    <prop oor:name="ooInetFTPProxyName">
+      <value install:module="macosx" oor:external=
+         "com.sun.star.configuration.backend.MacOSXBackend ooInetFTPProxyName"/>
+      <value install:module="unixdesktop" oor:external=
+        "com.sun.star.configuration.backend.DesktopBackend ooInetFTPProxyName"/>
+      <value install:module="wnt" oor:external=
+        "com.sun.star.configuration.backend.WinInetBackend ooInetFTPProxyName"/>
+    </prop>
+    <prop oor:name="ooInetFTPProxyPort">
+      <value install:module="macosx" oor:external=
+         "com.sun.star.configuration.backend.MacOSXBackend ooInetFTPProxyPort"/>
+      <value install:module="unixdesktop" oor:external=
+        "com.sun.star.configuration.backend.DesktopBackend ooInetFTPProxyPort"/>
+      <value install:module="wnt" oor:external=
+        "com.sun.star.configuration.backend.WinInetBackend ooInetFTPProxyPort"/>
+    </prop>
+    <prop oor:name="ooInetHTTPProxyName">
+      <value install:module="macosx" oor:external=
+        "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPProxyName"/>
+      <value install:module="unixdesktop" oor:external=
+       "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPProxyName"/>
+      <value install:module="wnt" oor:external=
+       "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPProxyName"/>
+    </prop>
+    <prop oor:name="ooInetHTTPProxyPort">
+      <value install:module="macosx" oor:external=
+        "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPProxyPort"/>
+      <value install:module="unixdesktop" oor:external=
+       "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPProxyPort"/>
+      <value install:module="wnt" oor:external=
+       "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPProxyPort"/>
+    </prop>
+    <prop oor:name="ooInetHTTPSProxyName">
+      <value install:module="macosx" oor:external=
+       "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPSProxyName"/>
+      <value install:module="unixdesktop" oor:external=
+      "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPSProxyName"/>
+      <value install:module="wnt" oor:external=
+      "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPSProxyName"/>
+    </prop>
+    <prop oor:name="ooInetHTTPSProxyPort">
+      <value install:module="macosx" oor:external=
+       "com.sun.star.configuration.backend.MacOSXBackend ooInetHTTPSProxyPort"/>
+      <value install:module="unixdesktop" oor:external=
+      "com.sun.star.configuration.backend.DesktopBackend ooInetHTTPSProxyPort"/>
+      <value install:module="wnt" oor:external=
+      "com.sun.star.configuration.backend.WinInetBackend ooInetHTTPSProxyPort"/>
     </prop>
   </node>
   <node oor:name="SearchEngines">
diff --git a/officecfg/registry/data/org/openoffice/LDAP.xcu.sample b/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
deleted file mode 100644
index b59cd7d5fe..0000000000
--- a/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: LDAP.xcu.sample,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<!-- This file is an example of an LDAP.xcu ldap configuration file.
-    
-     To use user data from LDAP in your installation, you need to provide a 
-     customized version of this file named 'LDAP.xcu'.
-
-     To customize values in this file, please replace the data within
-     <value>...</value> elements with the values for your organization.
-
-     If a certain setting is not necessary for your installation, you may remove the
-     entire 'prop' element, i.e. everything from '<prop oor:name="[SettingName]"' to 
-     the closing '</prop>'.
--->
-<oor:component-data oor:name="LDAP" oor:package="org.openoffice" 
-        xmlns:oor="http://openoffice.org/2001/registry" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<node oor:name="UserDirectory">
-  		<node oor:name="ServerDefinition">
-   			<prop oor:name="Server" oor:type="xs:string">
-    			<value>ldapserver.mycorp.com</value>
-   			</prop>
-			<prop oor:name="BaseDN" oor:type="xs:string">
-    			<value>dc=mycorp,dc=com</value>
-   			</prop>
-			<prop oor:name="Port" oor:type="xs:int">
-    			<value>389</value>
-   			</prop>
-  		</node>
-        <!-- The following settings should be omitted, if anonymous access is possible
-  		<prop oor:name="SearchUser" oor:type="xs:string"><value>MyUserLogin</value></prop>
-    	<prop oor:name="SearchPassword" oor:type="xs:string"><value>MyPassword</value></prop>
-        -->
-    	<prop oor:name="UserObjectClass" oor:type="xs:string">
-            <value>inetorgperson</value>
-   		</prop>
-    	<prop oor:name="UserUniqueAttribute" oor:type="xs:string">
-            <value>uid</value>
-   		</prop>
-        <prop oor:name="Mapping" oor:type="xs:string">
-            <value>oo-ldap</value>
-   		</prop>
-	</node>
-</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl b/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
index d99095d8fa..538a7acb27 100644
--- a/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
+++ b/officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl
@@ -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: Langpack.xcu.tmpl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 6b04763a57..18b0658cc0 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -2,14 +2,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: Common.xcu,v $
- * $Revision: 1.52 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index e37612a049..07bbfb0a60 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Calc.xcu,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index c9e64be54e..0fd3f03949 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -2,14 +2,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: Common.xcu,v $
- * $Revision: 1.52 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -103,6 +100,27 @@
           <value xml:lang="zh-TW">13</value>
     </prop>
     </node>
+    <node oor:name="FontAntiAliasing" install:module="gconflockdown">
+      <prop oor:name="Enabled">
+        <value oor:external=
+     "com.sun.star.configuration.backend.GconfBackend FontAntiAliasingEnabled"/>
+      </prop>
+      <prop oor:name="MinPixelHeight">
+        <value oor:external=
+"com.sun.star.configuration.backend.GconfBackend FontAntiAliasingMinPixelHeight"
+/>
+      </prop>
+    </node>
+    <node oor:name="Menu" install:module="gconflockdown">
+      <prop oor:name="DontHideDisabledEntry">
+        <value oor:external=
+       "com.sun.star.configuration.backend.GconfBackend DontHideDisabledEntry"/>
+      </prop>
+      <prop oor:name="ShowIconsInMenues">
+        <value oor:external=
+           "com.sun.star.configuration.backend.GconfBackend ShowIconsInMenues"/>
+      </prop>
+    </node>
   </node>
   <node oor:name="Help">
     <node oor:name="StartCenter">
@@ -549,18 +567,32 @@
     </node>
   </node>
   <node oor:name="Misc">
-    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
-      <value>false</value>
+    <prop oor:name="UseSystemFileDialog">
+      <value install:module="UseOOoFileDialogs">false</value>
+      <value install:module="gconflockdown" oor:external=
+         "com.sun.star.configuration.backend.GconfBackend UseSystemFileDialog"/>
     </prop>
     <prop oor:name="UseSystemPrintDialog"  install:module="macosx">
       <value>true</value>
     </prop>
+    <prop oor:name="SymbolSet" install:module="gconflockdown">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend SymbolSet"/>
+    </prop>
   </node>
   <node oor:name="Save">
     <node oor:name="Document">
       <prop oor:name="SaveBackwardCompatibleODF" oor:type="xs:boolean">
         <value>true</value>
       </prop>
+      <prop oor:name="CreateBackup" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend CreateBackup"/>
+      </prop>
+      <prop oor:name="WarnAlienFormat" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnAlienFormat"/>
+      </prop>
     </node>
     <node oor:name="ODF">
       <prop oor:name="DefaultVersion" oor:type="xs:short">
@@ -573,6 +605,36 @@
       <prop oor:name="HyperlinksWithCtrlClick" oor:type="xs:boolean">
         <value>true</value>
       </prop>
+      <prop oor:name="MacroSecurityLevel" install:module="gconflockdown">
+        <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend MacroSecurityLevel"/>
+      </prop>
+      <prop oor:name="RecommendPasswordProtection"
+          install:module="gconflockdown">
+        <value oor:external=
+ "com.sun.star.configuration.backend.GconfBackend RecommendPasswordProtection"/>
+      </prop>
+      <prop oor:name="RemovePersonalInfoOnSaving"
+          install:module="gconflockdown">
+        <value oor:external=
+  "com.sun.star.configuration.backend.GconfBackend RemovePersonalInfoOnSaving"/>
+      </prop>
+      <prop oor:name="WarnCreatePDF" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnCreatePDF"/>
+      </prop>
+      <prop oor:name="WarnPrintDoc" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnPrintDoc"/>
+      </prop>
+      <prop oor:name="WarnSaveOrSendDoc" install:module="gconflockdown">
+        <value oor:external=
+           "com.sun.star.configuration.backend.GconfBackend WarnSaveOrSendDoc"/>
+      </prop>
+      <prop oor:name="WarnSignDoc" install:module="gconflockdown">
+        <value oor:external=
+            "com.sun.star.configuration.backend.GconfBackend WarnSignDoc"/>
+      </prop>
     </node>
   </node>
   <node oor:name="Path">
@@ -584,4 +646,60 @@
       </prop>
     </node>
   </node>
+  <node oor:name="ExternalMailer" install:module="unixdesktop">
+    <prop oor:name="Program">
+      <value oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
+    </prop>
+  </node>
+  <node oor:name="Font">
+    <node oor:name="SourceViewFont" install:module="unixdesktop">
+      <prop oor:name="FontName">
+        <value oor:external=
+        "com.sun.star.configuration.backend.DesktopBackend SourceViewFontName"/>
+      </prop>
+      <prop oor:name="FontHeight">
+        <value oor:external=
+      "com.sun.star.configuration.backend.DesktopBackend SourceViewFontHeight"/>
+      </prop>
+    </node>
+    <node oor:name="View" install:module="gconflockdown">
+      <prop oor:name="History">
+        <value oor:external=
+             "com.sun.star.configuration.backend.GconfBackend FontViewHistory"/>
+      </prop>
+      <prop oor:name="ShowFontBoxWYSIWYG">
+        <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend ShowFontBoxWYSIWYG"/>
+      </prop>
+    </node>
+  </node>
+  <node oor:name="Accessibility" install:module="gconflockdown">
+    <prop oor:name="IsSystemFont">
+      <value oor:external=
+   "com.sun.star.configuration.backend.GconfBackend AccessibilityIsSystemFont"/>
+    </prop>
+  </node>
+  <node oor:name="Print" install:module="gconflockdown">
+    <prop oor:name="PrintingModifiesDocument">
+      <value oor:external=
+    "com.sun.star.configuration.backend.GconfBackend PrintingModifiesDocument"/>
+    </prop>
+  </node>
+  <node oor:name="Undo" install:module="gconflockdown">
+    <prop oor:name="Steps">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend UndoSteps"/>
+    </prop>
+  </node>
+  <node oor:name="_3D_Engine" install:module="gconflockdown">
+    <prop oor:name="OpenGL">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend OpenGL"/>
+    </prop>
+    <prop oor:name="OpenGL_Faster">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/>
+    </prop>
+  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
index ac5efe1d31..d8182c8361 100644
--- a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Compatibility.xcu,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/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index 9078b3ef61..613b9954d4 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DataAccess.xcu,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/officecfg/registry/data/org/openoffice/Office/Embedding.xcu b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 757876c94c..fccad65f92 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Embedding.xcu,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/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index 96de4c65a3..54bfbff2f8 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ExtensionManager.xcu,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu b/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu
index 129ff2a1dd..a430dc6e65 100755
--- a/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/FormWizard.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FormWizard.xcu,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Histories.xcu b/officecfg/registry/data/org/openoffice/Office/Histories.xcu
index f3983ce448..fcb40eb045 100644
--- a/officecfg/registry/data/org/openoffice/Office/Histories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Histories.xcu
@@ -1,36 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: Histories.xcu,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/20 09:22:37 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 2a2dd0fb35..90bbc5bf9b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Impress.xcu,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
index 6a1fe6a654..4a9c56cbe5 100644
--- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Jobs.xcu,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/officecfg/registry/data/org/openoffice/Office/Labels.xcu b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
index 4037c00908..3a006d23c5 100644
--- a/officecfg/registry/data/org/openoffice/Office/Labels.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Labels.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Labels.xcu,v $
- * $Revision: 1.9.112.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,8 +36,8 @@
             <node oor:name="L0" oor:op="replace" oor:finalized="true">
 
                 <prop oor:name="Name">
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2050 Video Spine</value>
+
+                    <value>C2050 Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -50,8 +47,8 @@
             <node oor:name="L1" oor:op="replace" oor:finalized="true">
 
                 <prop oor:name="Name">
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2050 Video Face</value>
+
+                    <value>C2050 Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -61,9 +58,8 @@
             <node oor:name="L2" oor:op="replace" oor:finalized="true">
 
                 <prop oor:name="Name">
-                    <value xml:lang="x-no-translate">true</value>
 
-                    <value xml:lang="en-US">C2070 Transfer Film for Mouse Pad</value>
+                    <value>C2070 Transfer Film for Mouse Pad</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -73,8 +69,8 @@
             <node oor:name="L3" oor:op="replace" oor:finalized="true">
 
                 <prop oor:name="Name">
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2080 Transfer Film for Puzzle</value>
+
+                    <value>C2080 Transfer Film for Puzzle</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -85,8 +81,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2090 T-Shirt Transfer Set</value>
+                    <value>C2090 T-Shirt Transfer Set</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -97,8 +92,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2160 Avery Inkjet Label</value>
+                    <value>C2160 Avery Inkjet Label</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -109,8 +103,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2163 Avery Inkjet Label</value>
+                    <value>C2163 Avery Inkjet Label</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -121,8 +114,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2165 Large Labels</value>
+                    <value>C2165 Large Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -133,8 +125,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2166 Avery 3.5&quot; Disk Label (Face only)</value>
+                    <value>C2166 Avery 3.5&quot; Disk Label (Face only)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -145,8 +136,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2241 Avery Rectangle Sticker</value>
+                    <value>C2241 Avery Rectangle Sticker</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -157,8 +147,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2243 Avery Small Round Sticker</value>
+                    <value>C2243 Avery Small Round Sticker</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -169,8 +158,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2244 Avery Big Round Sticker</value>
+                    <value>C2244 Avery Big Round Sticker</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -181,8 +169,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2246 Avery Full Page Sticker</value>
+                    <value>C2246 Avery Full Page Sticker</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -193,8 +180,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2265 Disk Labels</value>
+                    <value>C2265 Disk Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -205,8 +191,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2341 Embossed Cards A5 (Cover)</value>
+                    <value>C2341 Embossed Cards A5 (Cover)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -217,8 +202,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2341 Embossed Cards A5 (Inside)</value>
+                    <value>C2341 Embossed Cards A5 (Inside)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -229,8 +213,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2342 Embossed cards A6 (Coverl)</value>
+                    <value>C2342 Embossed cards A6 (Coverl)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -241,8 +224,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2342 Embossed Cards A6 (Inside)</value>
+                    <value>C2342 Embossed Cards A6 (Inside)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -253,8 +235,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2351 Avery A5 Greeting Card</value>
+                    <value>C2351 Avery A5 Greeting Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -265,8 +246,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2352 Avery A6 Greeting Card</value>
+                    <value>C2352 Avery A6 Greeting Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -277,8 +257,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2353 Avery Postcard</value>
+                    <value>C2353 Avery Postcard</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -289,8 +268,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2354 Avery Biz Card</value>
+                    <value>C2354 Avery Biz Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -301,8 +279,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2355 Avery Note Cards</value>
+                    <value>C2355 Avery Note Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -313,8 +290,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2356 Avery Full Page Card</value>
+                    <value>C2356 Avery Full Page Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -325,8 +301,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2357 Compliment Cards</value>
+                    <value>C2357 Compliment Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -337,8 +312,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2361 Greeting Cards (A6)</value>
+                    <value>C2361 Greeting Cards (A6)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -349,8 +323,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2364 Marbled Business Cards</value>
+                    <value>C2364 Marbled Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -361,8 +334,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2365 Marbled Business Cards</value>
+                    <value>C2365 Marbled Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -373,8 +345,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2366 Marbled Business Cards</value>
+                    <value>C2366 Marbled Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -385,8 +356,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2367 Marbled Business Cards</value>
+                    <value>C2367 Marbled Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -397,8 +367,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2370 A4 Coated Paper -110gsm</value>
+                    <value>C2370 A4 Coated Paper -110gsm</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -409,8 +378,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2371 A4 Coated Paper -160gsm</value>
+                    <value>C2371 A4 Coated Paper -160gsm</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -421,8 +389,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2374 Marbled Paper</value>
+                    <value>C2374 Marbled Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -433,8 +400,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2375 Marbled Paper</value>
+                    <value>C2375 Marbled Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -445,8 +411,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2376 Marbled Paper</value>
+                    <value>C2376 Marbled Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -457,8 +422,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2377 Marbled Paper</value>
+                    <value>C2377 Marbled Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -469,8 +433,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2378 A4 Colour Laser Paper</value>
+                    <value>C2378 A4 Colour Laser Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -481,8 +444,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2379 A4 Bright White</value>
+                    <value>C2379 A4 Bright White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -493,8 +455,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2410 Avery Self-Laminating Card</value>
+                    <value>C2410 Avery Self-Laminating Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -505,8 +466,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2420 Avery Self-Laminating Bookmark</value>
+                    <value>C2420 Avery Self-Laminating Bookmark</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -517,8 +477,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2546 Windows Decals</value>
+                    <value>C2546 Windows Decals</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -529,8 +488,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2547 Fantastic Plastic</value>
+                    <value>C2547 Fantastic Plastic</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -541,8 +499,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2651 Avery Inkjet Mini Label</value>
+                    <value>C2651 Avery Inkjet Mini Label</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -553,8 +510,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C6353 Photo Quality Gloss 4 x 6 Cards</value>
+                    <value>C6353 Photo Quality Gloss 4 x 6 Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -565,8 +521,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9146 Photo Quality Label (Full Page)</value>
+                    <value>C9146 Photo Quality Label (Full Page)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -577,8 +532,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9151 Photo Quality Label</value>
+                    <value>C9151 Photo Quality Label</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -589,8 +543,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9169 Photo Quality Label (4 per page)</value>
+                    <value>C9169 Photo Quality Label (4 per page)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -601,8 +554,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9312 Clean Edge(TM) Business Card</value>
+                    <value>C9312 Clean Edge(TM) Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -613,8 +565,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9351 Photo Quality Gloss A5 Greeting Card</value>
+                    <value>C9351 Photo Quality Gloss A5 Greeting Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -625,8 +576,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9352 Greeting Cards Glossy A6</value>
+                    <value>C9352 Greeting Cards Glossy A6</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -637,8 +587,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9353 Photo Quality Gloss Postcards</value>
+                    <value>C9353 Photo Quality Gloss Postcards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -649,8 +598,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9354 Photo Quality Gloss Business Cards</value>
+                    <value>C9354 Photo Quality Gloss Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -661,8 +609,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9355 Post Cards</value>
+                    <value>C9355 Post Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -673,8 +620,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9356 Photo Quality A4 Card Sheet</value>
+                    <value>C9356 Photo Quality A4 Card Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -685,8 +631,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9362 Business Cards Glossy</value>
+                    <value>C9362 Business Cards Glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -697,8 +642,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9372 Photo Paper Glossy  9 x 13</value>
+                    <value>C9372 Photo Paper Glossy  9 x 13</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -709,8 +653,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9373 Photo Gloss Paper</value>
+                    <value>C9373 Photo Gloss Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -721,8 +664,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9374 Photo Quality Glossy Inkjet Card</value>
+                    <value>C9374 Photo Quality Glossy Inkjet Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -733,8 +675,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9405 Avery T-Shirt Transfer Sheets</value>
+                    <value>C9405 Avery T-Shirt Transfer Sheets</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -745,8 +686,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9406 Avery T-Shirt Transfer Sheets</value>
+                    <value>C9406 Avery T-Shirt Transfer Sheets</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -757,8 +697,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9430 Photo Quality Glossy A4 Inkjet Paper</value>
+                    <value>C9430 Photo Quality Glossy A4 Inkjet Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -769,8 +708,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9431 Photo Quality Glossy Paper - 160gsm</value>
+                    <value>C9431 Photo Quality Glossy Paper - 160gsm</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -781,8 +719,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9433 Inkjet Glossy Double Sided Paper</value>
+                    <value>C9433 Inkjet Glossy Double Sided Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -793,8 +730,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9434 Photo Cards Glossy</value>
+                    <value>C9434 Photo Cards Glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -805,8 +741,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9612 CD-R Business Card</value>
+                    <value>C9612 CD-R Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -817,8 +752,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9660 Full Face CD/DVD Labels</value>
+                    <value>C9660 Full Face CD/DVD Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -829,8 +763,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">COPT210 Copier Transparency</value>
+                    <value>COPT210 Copier Transparency</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -841,8 +774,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">IJT310 Inkjet Transparency - 90microns</value>
+                    <value>IJT310 Inkjet Transparency - 90microns</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -853,8 +785,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">IJT311 Inkjet Transparency - 120 microns</value>
+                    <value>IJT311 Inkjet Transparency - 120 microns</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -865,8 +796,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J40063 Address</value>
+                    <value>J40063 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -877,8 +807,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J40065 Parcel</value>
+                    <value>J40065 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -889,8 +818,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J400DK 3.5&quot; Diskette - Face Only</value>
+                    <value>J400DK 3.5&quot; Diskette - Face Only</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -901,8 +829,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J400SL 35mm Slide</value>
+                    <value>J400SL 35mm Slide</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -913,8 +840,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J400VF Video Face</value>
+                    <value>J400VF Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -925,8 +851,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J400VS Video Spine</value>
+                    <value>J400VS Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -937,8 +862,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8156 Address</value>
+                    <value>J8156 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -949,8 +873,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8157 Address</value>
+                    <value>J8157 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -961,8 +884,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8158 Address</value>
+                    <value>J8158 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -973,8 +895,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8159 Address</value>
+                    <value>J8159 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -985,8 +906,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8160 Address</value>
+                    <value>J8160 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -997,8 +917,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8161 Address</value>
+                    <value>J8161 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1009,8 +928,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8162 Address</value>
+                    <value>J8162 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1021,8 +939,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8163 Address</value>
+                    <value>J8163 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1033,8 +950,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8164 Address</value>
+                    <value>J8164 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1045,8 +961,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8165 Parcel</value>
+                    <value>J8165 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1057,8 +972,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8166 Parcel</value>
+                    <value>J8166 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1069,8 +983,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8167 Shipping</value>
+                    <value>J8167 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1081,8 +994,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8168 Shipping</value>
+                    <value>J8168 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1093,8 +1005,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8169 Parcel</value>
+                    <value>J8169 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1105,8 +1016,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8170 Collect/Filing</value>
+                    <value>J8170 Collect/Filing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1117,8 +1027,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8171 Lever Arch Labels - White</value>
+                    <value>J8171 Lever Arch Labels - White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1129,8 +1038,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8173 Address</value>
+                    <value>J8173 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1141,8 +1049,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8359 Address</value>
+                    <value>J8359 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1153,8 +1060,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8360 Address</value>
+                    <value>J8360 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1165,8 +1071,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8361 Address</value>
+                    <value>J8361 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1177,8 +1082,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8362 Address</value>
+                    <value>J8362 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1189,8 +1093,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8363 Address</value>
+                    <value>J8363 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1201,8 +1104,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8364 Address</value>
+                    <value>J8364 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1213,8 +1115,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8365 Parcel</value>
+                    <value>J8365 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1225,8 +1126,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8366 Parcel</value>
+                    <value>J8366 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1237,8 +1137,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8367 Shipping</value>
+                    <value>J8367 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1249,8 +1148,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8368 Shipping</value>
+                    <value>J8368 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1261,8 +1159,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8369 Parcel</value>
+                    <value>J8369 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1273,8 +1170,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8371 Lever Arch</value>
+                    <value>J8371 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1285,8 +1181,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8414 Clean Edge (TM) Business Card</value>
+                    <value>J8414 Clean Edge (TM) Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1297,8 +1192,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8415 Greeting Cards Maxi (A6)</value>
+                    <value>J8415 Greeting Cards Maxi (A6)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1309,8 +1203,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8423 Name Card</value>
+                    <value>J8423 Name Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1321,8 +1214,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8431 CD Case Insert - Cover</value>
+                    <value>J8431 CD Case Insert - Cover</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1333,8 +1225,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8432 CD Case Insert - Tray</value>
+                    <value>J8432 CD Case Insert - Tray</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1345,8 +1236,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8433 CD Envelope</value>
+                    <value>J8433 CD Envelope</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1357,8 +1247,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8434 Inkjet CD Inserts - Cover Section</value>
+                    <value>J8434 Inkjet CD Inserts - Cover Section</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1369,8 +1258,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8434 Inkjet CD Inserts - Tray Section</value>
+                    <value>J8434 Inkjet CD Inserts - Tray Section</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1381,8 +1269,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8435 CD Case Insert Cover Section</value>
+                    <value>J8435 CD Case Insert Cover Section</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1393,8 +1280,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8435 CD Case Insert Tray Section</value>
+                    <value>J8435 CD Case Insert Tray Section</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1405,8 +1291,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8436 CD Case Spine Labels</value>
+                    <value>J8436 CD Case Spine Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1417,8 +1302,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8440 Zip(TM) Disk Card Insert - Panels</value>
+                    <value>J8440 Zip(TM) Disk Card Insert - Panels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1429,8 +1313,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8560 Clear Address</value>
+                    <value>J8560 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1441,8 +1324,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8562 Clear Address</value>
+                    <value>J8562 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1453,8 +1335,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8563 Clear Address</value>
+                    <value>J8563 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1465,8 +1346,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8565 Clear Parcel</value>
+                    <value>J8565 Clear Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1477,8 +1357,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8567 Clear A4 Labels</value>
+                    <value>J8567 Clear A4 Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1489,8 +1368,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8570 Full Face CD/DVD Labels - Clear Inkjet</value>
+                    <value>J8570 Full Face CD/DVD Labels - Clear Inkjet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1501,8 +1379,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8587 Inkjet Transparencies</value>
+                    <value>J8587 Inkjet Transparencies</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1513,8 +1390,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8612 CD-R Business Card</value>
+                    <value>J8612 CD-R Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1525,8 +1401,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8651 Mini Address</value>
+                    <value>J8651 Mini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1537,8 +1412,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8654 Miini Address</value>
+                    <value>J8654 Miini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1549,8 +1423,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8655 Audio Cassette</value>
+                    <value>J8655 Audio Cassette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1561,8 +1434,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8656 35 mm Slide</value>
+                    <value>J8656 35 mm Slide</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1573,8 +1445,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8657 35 mm Slides/Small Items</value>
+                    <value>J8657 35 mm Slides/Small Items</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1585,8 +1456,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8658 Mini Labels - Removable</value>
+                    <value>J8658 Mini Labels - Removable</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1597,8 +1467,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8659 Mini Labels - Removable</value>
+                    <value>J8659 Mini Labels - Removable</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1609,8 +1478,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8666 3.5&quot; Diskette - Face Only</value>
+                    <value>J8666 3.5&quot; Diskette - Face Only</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1621,8 +1489,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8667 Mini Disk Label - Face</value>
+                    <value>J8667 Mini Disk Label - Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1633,8 +1500,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8667 Mini Disk Label - Spine</value>
+                    <value>J8667 Mini Disk Label - Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1645,8 +1511,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8668 Labels for Zip (TM.) Disk</value>
+                    <value>J8668 Labels for Zip (TM.) Disk</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1657,8 +1522,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8671 Video Face</value>
+                    <value>J8671 Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1669,8 +1533,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8674 Video Spine</value>
+                    <value>J8674 Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1681,8 +1544,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8676 Full Face CD/DVD Labels</value>
+                    <value>J8676 Full Face CD/DVD Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1693,8 +1555,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8701 Lever Arch</value>
+                    <value>J8701 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1705,8 +1566,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8702 Lever Arch</value>
+                    <value>J8702 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1717,8 +1577,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8766 3.5&quot; Diskette - Face Only</value>
+                    <value>J8766 3.5&quot; Diskette - Face Only</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1729,8 +1588,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8770 Full Face CD/DVD Labels</value>
+                    <value>J8770 Full Face CD/DVD Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1741,8 +1599,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8771 Video Face</value>
+                    <value>J8771 Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1753,8 +1610,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8774 Video Spine</value>
+                    <value>J8774 Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1765,8 +1621,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8776 Full Face CD/DVD Labels - Holographic</value>
+                    <value>J8776 Full Face CD/DVD Labels - Holographic</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1777,8 +1632,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8777 Full Face CD/DVD Labels - Silver</value>
+                    <value>J8777 Full Face CD/DVD Labels - Silver</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1789,8 +1643,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8778 Full Face CD/DVD Labels - Gold</value>
+                    <value>J8778 Full Face CD/DVD Labels - Gold</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1801,8 +1654,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8867 Printable Magnets - Full Sheet</value>
+                    <value>J8867 Printable Magnets - Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1813,8 +1665,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8871 Printable Magnets</value>
+                    <value>J8871 Printable Magnets</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1825,8 +1676,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8875 Printable Magnets</value>
+                    <value>J8875 Printable Magnets</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1837,8 +1687,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J9124 Inkjet Labels, Glossy</value>
+                    <value>J9124 Inkjet Labels, Glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1849,8 +1698,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L30063 Address</value>
+                    <value>L30063 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1861,8 +1709,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L30065 Parcel</value>
+                    <value>L30065 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1873,8 +1720,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L300DK 3.5&quot; Diskette - Face Only</value>
+                    <value>L300DK 3.5&quot; Diskette - Face Only</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1885,8 +1731,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L300SL 35mm Slide</value>
+                    <value>L300SL 35mm Slide</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1897,8 +1742,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L300VF Video Face</value>
+                    <value>L300VF Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1909,8 +1753,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L300VS Video Spine</value>
+                    <value>L300VS Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1921,8 +1764,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6008 Silver Heavy Duty Labels</value>
+                    <value>L6008 Silver Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1933,8 +1775,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6009 Silver Heavy Duty Labels</value>
+                    <value>L6009 Silver Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1945,8 +1786,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6011 Silver Heavy Duty Labels</value>
+                    <value>L6011 Silver Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1957,8 +1797,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6012 Silver Heavy Duty Labels</value>
+                    <value>L6012 Silver Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1969,8 +1808,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6112 Anti Tamper Labels</value>
+                    <value>L6112 Anti Tamper Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1981,8 +1819,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6113 Anti Tamper Labels</value>
+                    <value>L6113 Anti Tamper Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -1993,8 +1830,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L6114 Anti Tamper Labels</value>
+                    <value>L6114 Anti Tamper Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2005,8 +1841,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7051 Heavy Duty Labels Mini</value>
+                    <value>L7051 Heavy Duty Labels Mini</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2017,8 +1852,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7060 White Heavy Duty Labels</value>
+                    <value>L7060 White Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2029,8 +1863,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7063 White Heavy Duty Labels</value>
+                    <value>L7063 White Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2041,8 +1874,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7067 White Heavy Duty Labels</value>
+                    <value>L7067 White Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2053,8 +1885,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7068 White Heavy Duty Labels</value>
+                    <value>L7068 White Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2065,8 +1896,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7069 White Heavy Duty Labels</value>
+                    <value>L7069 White Heavy Duty Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2077,8 +1907,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7156 Address</value>
+                    <value>L7156 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2089,8 +1918,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7157 Address</value>
+                    <value>L7157 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2101,8 +1929,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7158 Address</value>
+                    <value>L7158 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2113,8 +1940,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7159 Address</value>
+                    <value>L7159 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2125,8 +1951,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7160 Address</value>
+                    <value>L7160 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2137,8 +1962,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7161 Address</value>
+                    <value>L7161 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2149,8 +1973,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7162 Address</value>
+                    <value>L7162 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2161,8 +1984,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7163 Address</value>
+                    <value>L7163 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2173,8 +1995,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7164 Address</value>
+                    <value>L7164 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2185,8 +2006,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7165 Parcel</value>
+                    <value>L7165 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2197,8 +2017,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7166 Parcel</value>
+                    <value>L7166 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2209,8 +2028,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7167 Shipping</value>
+                    <value>L7167 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2221,8 +2039,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7168 Shipping</value>
+                    <value>L7168 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2233,8 +2050,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7169 Parcel</value>
+                    <value>L7169 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2245,8 +2061,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7170 Eurofolio</value>
+                    <value>L7170 Eurofolio</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2257,8 +2072,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7171 Lever Arch - White</value>
+                    <value>L7171 Lever Arch - White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2269,8 +2083,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7171B Lever Arch Labels - Blue</value>
+                    <value>L7171B Lever Arch Labels - Blue</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2281,8 +2094,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7171G Lever Arch Labels - Green</value>
+                    <value>L7171G Lever Arch Labels - Green</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2293,8 +2105,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7171R Lever Arch Labels - Red</value>
+                    <value>L7171R Lever Arch Labels - Red</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2305,8 +2116,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7172 Ring Binder</value>
+                    <value>L7172 Ring Binder</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2317,8 +2127,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7173 Shipping</value>
+                    <value>L7173 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2329,8 +2138,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7176 Labels for 60mm Box File</value>
+                    <value>L7176 Labels for 60mm Box File</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2341,8 +2149,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7177 Address</value>
+                    <value>L7177 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2353,8 +2160,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7178 Labels for 40mm Box File</value>
+                    <value>L7178 Labels for 40mm Box File</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2365,8 +2171,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7179 Labels for 25mm Box File</value>
+                    <value>L7179 Labels for 25mm Box File</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2377,8 +2182,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7263 Fluorescent Yellow Address</value>
+                    <value>L7263 Fluorescent Yellow Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2389,8 +2193,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7363 Address</value>
+                    <value>L7363 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2401,8 +2204,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7400 Suspended Files (Cupboard)</value>
+                    <value>L7400 Suspended Files (Cupboard)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2413,8 +2215,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7408 Suspended Files (Drawer)</value>
+                    <value>L7408 Suspended Files (Drawer)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2425,8 +2226,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7409 Suspension Tab Card Inserts</value>
+                    <value>L7409 Suspension Tab Card Inserts</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2437,8 +2237,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-5 IndexMaker  5 part - Labels</value>
+                    <value>L7410-5 IndexMaker  5 part - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2449,8 +2248,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-5 IndexMaker  5 part - Contents Sheet</value>
+                    <value>L7410-5 IndexMaker  5 part - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2461,8 +2259,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-6 IndexMaker  6 part - Labels</value>
+                    <value>L7410-6 IndexMaker  6 part - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2473,8 +2270,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-6 IndexMaker  6 part - Contents Sheet</value>
+                    <value>L7410-6 IndexMaker  6 part - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2485,8 +2281,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-10 IndexMaker 10 part - Labels</value>
+                    <value>L7410-10 IndexMaker 10 part - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2497,8 +2292,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-10 IndexMaker 10 part - Contents Sheet</value>
+                    <value>L7410-10 IndexMaker 10 part - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2509,8 +2303,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-12 IndexMaker 12 part - Labels</value>
+                    <value>L7410-12 IndexMaker 12 part - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2521,8 +2314,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-12 IndexMaker 12 part - Contents Sheet</value>
+                    <value>L7410-12 IndexMaker 12 part - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2533,8 +2325,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-5 ReadyIndex 1-5 Index - Contents Sheet</value>
+                    <value>L7411-5 ReadyIndex 1-5 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2545,8 +2336,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-6 ReadyIndex 1-6 Index - Contents Sheet</value>
+                    <value>L7411-6 ReadyIndex 1-6 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2557,8 +2347,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-10 ReadyIndex 1-10 Index - Contents Sheet</value>
+                    <value>L7411-10 ReadyIndex 1-10 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2569,8 +2358,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-12 ReadyIndex 1-12 Index - Contents Sheet</value>
+                    <value>L7411-12 ReadyIndex 1-12 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2581,8 +2369,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-15 ReadyIndex 1-15 Index - Contents Sheet</value>
+                    <value>L7411-15 ReadyIndex 1-15 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2593,8 +2380,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-20 ReadyIndex 1-20 Index - Contents Sheet</value>
+                    <value>L7411-20 ReadyIndex 1-20 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2605,8 +2391,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-31 ReadyIndex 1-31 Index - Contents Sheet</value>
+                    <value>L7411-31 ReadyIndex 1-31 Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2617,8 +2402,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-AZ ReadyIndex A-Z Index - Contents Sheet</value>
+                    <value>L7411-AZ ReadyIndex A-Z Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2629,8 +2413,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-JD ReadyIndex Jan-Dec Index - Contents Sheet</value>
+                    <value>L7411-JD ReadyIndex Jan-Dec Index - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2641,8 +2424,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-5 Insertable Tab Dividers -  5 Tabs</value>
+                    <value>L7412-5 Insertable Tab Dividers -  5 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2653,8 +2435,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-6 Insertable Tab Dividers -  6 Tabs</value>
+                    <value>L7412-6 Insertable Tab Dividers -  6 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2665,8 +2446,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-8 Insertable Tab Dividers -  8 Tabs</value>
+                    <value>L7412-8 Insertable Tab Dividers -  8 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2677,8 +2457,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-10 Insertable Tab Dividers - 10 Tabs</value>
+                    <value>L7412-10 Insertable Tab Dividers - 10 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2689,8 +2468,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-12 Insertable Tab Dividers - 12 Tabs</value>
+                    <value>L7412-12 Insertable Tab Dividers - 12 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2701,8 +2479,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7413 Business Card</value>
+                    <value>L7413 Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2713,8 +2490,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7414 Business Card</value>
+                    <value>L7414 Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2725,8 +2501,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7415 Business Card</value>
+                    <value>L7415 Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2737,8 +2512,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-5 IndexMaker  5 part (Unpunched) - Labels</value>
+                    <value>L7416-5 IndexMaker  5 part (Unpunched) - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2749,8 +2523,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-5 IndexMaker  5 part (Unpunched) - Contents Sheet</value>
+                    <value>L7416-5 IndexMaker  5 part (Unpunched) - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2761,8 +2534,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-6 IndexMaker  6 part - Extra Wide - Labels</value>
+                    <value>L7416-6 IndexMaker  6 part - Extra Wide - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2773,8 +2545,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-6 IndexMaker  6 part - Extra Wide - Contents Sheet</value>
+                    <value>L7416-6 IndexMaker  6 part - Extra Wide - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2785,8 +2556,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-10 IndexMaker 10 part (Unpunched) - Labels</value>
+                    <value>L7416-10 IndexMaker 10 part (Unpunched) - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2797,8 +2567,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-10 IndexMaker 10 part (Unpunched) - Contents Sheet</value>
+                    <value>L7416-10 IndexMaker 10 part (Unpunched) - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2809,8 +2578,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-12 IndexMaker 12 part - Extra Wide - Labels</value>
+                    <value>L7416-12 IndexMaker 12 part - Extra Wide - Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2821,8 +2589,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7416-12 IndexMaker 12 part - Extra Wide - Contents Sheet</value>
+                    <value>L7416-12 IndexMaker 12 part - Extra Wide - Contents Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2833,8 +2600,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7417 Business Card</value>
+                    <value>L7417 Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2845,8 +2611,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7418 Name Badge</value>
+                    <value>L7418 Name Badge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2857,8 +2622,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7419 Business Card</value>
+                    <value>L7419 Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2869,8 +2633,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7420-5 Direct Print Dividers</value>
+                    <value>L7420-5 Direct Print Dividers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2881,8 +2644,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7420-6 Direct Print Dividers</value>
+                    <value>L7420-6 Direct Print Dividers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2893,8 +2655,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7420-8 Direct Print Dividers</value>
+                    <value>L7420-8 Direct Print Dividers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2905,8 +2666,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7421 Post Card</value>
+                    <value>L7421 Post Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2917,8 +2677,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7422 Suspension Tab Card Inserts</value>
+                    <value>L7422 Suspension Tab Card Inserts</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2929,8 +2688,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7423 Delegate Card - Embossed</value>
+                    <value>L7423 Delegate Card - Embossed</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2941,8 +2699,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7424 Lever Arch Labels</value>
+                    <value>L7424 Lever Arch Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2953,8 +2710,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7425 Lever Arch Labels</value>
+                    <value>L7425 Lever Arch Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2965,8 +2721,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7426 Note Card</value>
+                    <value>L7426 Note Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2977,8 +2732,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7451-5 ReadyIndex  5 Index (Unnumbered) - Contents</value>
+                    <value>L7451-5 ReadyIndex  5 Index (Unnumbered) - Contents</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -2989,8 +2743,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7451-10 ReadyIndex 10 Index (Unnumbered) - Contents</value>
+                    <value>L7451-10 ReadyIndex 10 Index (Unnumbered) - Contents</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3001,8 +2754,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7551 Clear Mini Address</value>
+                    <value>L7551 Clear Mini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3013,8 +2765,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7552 Clear Mini</value>
+                    <value>L7552 Clear Mini</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3025,8 +2776,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7553 Clear Mini</value>
+                    <value>L7553 Clear Mini</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3037,8 +2787,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7560 Clear Address</value>
+                    <value>L7560 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3049,8 +2798,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7562 Clear Address</value>
+                    <value>L7562 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3061,8 +2809,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7563 Clear Address</value>
+                    <value>L7563 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3073,8 +2820,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7565 Clear Parcel</value>
+                    <value>L7565 Clear Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3085,8 +2831,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7567 Clear A4 Labels</value>
+                    <value>L7567 Clear A4 Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3097,8 +2842,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7568 Clear A5 Labels</value>
+                    <value>L7568 Clear A5 Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3109,8 +2853,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7587 Laser Transparencies</value>
+                    <value>L7587 Laser Transparencies</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3121,8 +2864,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7630 Circular</value>
+                    <value>L7630 Circular</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3133,8 +2875,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7650 Circular</value>
+                    <value>L7650 Circular</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3145,8 +2886,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7651 Mini Address</value>
+                    <value>L7651 Mini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3157,8 +2897,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7651/PF Mini Address</value>
+                    <value>L7651/PF Mini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3169,8 +2908,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7651/YF Mini Address</value>
+                    <value>L7651/YF Mini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3181,8 +2919,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7652 Miini Address</value>
+                    <value>L7652 Miini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3193,8 +2930,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7653 Mini</value>
+                    <value>L7653 Mini</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3205,8 +2941,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7654 Miini Address</value>
+                    <value>L7654 Miini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3217,8 +2952,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7655 Audio Cassette</value>
+                    <value>L7655 Audio Cassette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3229,8 +2963,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7656 35 mm Slide</value>
+                    <value>L7656 35 mm Slide</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3241,8 +2974,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7657 Mini Labels - Removable - Laser</value>
+                    <value>L7657 Mini Labels - Removable - Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3253,8 +2985,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7658 Mini Labels - Removable - Laser</value>
+                    <value>L7658 Mini Labels - Removable - Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3265,8 +2996,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7663 5.25&quot; Diskette</value>
+                    <value>L7663 5.25&quot; Diskette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3277,8 +3007,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7664 3.5&quot; Diskette - Wraparound</value>
+                    <value>L7664 3.5&quot; Diskette - Wraparound</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3289,8 +3018,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7665 Mini Data Cartridge</value>
+                    <value>L7665 Mini Data Cartridge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3301,8 +3029,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7666 3.5&quot; Diskette - Face Only</value>
+                    <value>L7666 3.5&quot; Diskette - Face Only</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3313,8 +3040,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7667 Standard Data Cartridge</value>
+                    <value>L7667 Standard Data Cartridge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3325,8 +3051,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7668 Labels for Zip(TM) Disk</value>
+                    <value>L7668 Labels for Zip(TM) Disk</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3337,8 +3062,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7669 Labels for SuperDisk (TM )</value>
+                    <value>L7669 Labels for SuperDisk (TM )</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3349,8 +3073,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7670 Circular - Fluorescent Yellow</value>
+                    <value>L7670 Circular - Fluorescent Yellow</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3361,8 +3084,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7671 Video Face</value>
+                    <value>L7671 Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3373,8 +3095,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7674 Video Spine</value>
+                    <value>L7674 Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3385,8 +3106,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7675 4mm Data Cartridge</value>
+                    <value>L7675 4mm Data Cartridge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3397,8 +3117,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7676 Full Face CD/DVD Labels - Black &amp; White</value>
+                    <value>L7676 Full Face CD/DVD Labels - Black &amp; White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3409,8 +3128,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7680 Mini Address - Gold</value>
+                    <value>L7680 Mini Address - Gold</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3421,8 +3139,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7701 Lever Arch</value>
+                    <value>L7701 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3433,8 +3150,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7702 Lever Arch</value>
+                    <value>L7702 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3445,8 +3161,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7760 Full Face CD/DVD Labels - Colour Laser</value>
+                    <value>L7760 Full Face CD/DVD Labels - Colour Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3457,8 +3172,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7765 Presentation/Photo - Glossy Colour Laser</value>
+                    <value>L7765 Presentation/Photo - Glossy Colour Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3469,8 +3183,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7767 Presentation/Photo - Glossy Colour Laser</value>
+                    <value>L7767 Presentation/Photo - Glossy Colour Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3481,8 +3194,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7768 Presentation/Photo - Glossy Colour Laser</value>
+                    <value>L7768 Presentation/Photo - Glossy Colour Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3493,8 +3205,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7769 Presentation/Photo - Glossy Colour Laser</value>
+                    <value>L7769 Presentation/Photo - Glossy Colour Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3505,8 +3216,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7901 Organizer Page</value>
+                    <value>L7901 Organizer Page</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3517,8 +3227,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7902 Organizer Page (A5)</value>
+                    <value>L7902 Organizer Page (A5)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3529,8 +3238,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7905 Compliment Slip</value>
+                    <value>L7905 Compliment Slip</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3541,8 +3249,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">LPT110 Laser/Copier Transparency - 100micron</value>
+                    <value>LPT110 Laser/Copier Transparency - 100micron</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3553,8 +3260,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">LPT111 Laser/Copier Transparency - 100micron</value>
+                    <value>LPT111 Laser/Copier Transparency - 100micron</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3568,8 +3274,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2412 Laminated Cards, large</value>
+                    <value>C2412 Laminated Cards, large</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3580,8 +3285,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2413 Laminated Cards</value>
+                    <value>C2413 Laminated Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3592,8 +3296,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2414 Laminated Cards</value>
+                    <value>C2414 Laminated Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3604,8 +3307,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C24412 Laminated Cards, large</value>
+                    <value>C24412 Laminated Cards, large</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3616,8 +3318,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C25446 A5 Sheet</value>
+                    <value>C25446 A5 Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3628,8 +3329,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C25447 A5 Sheet</value>
+                    <value>C25447 A5 Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3640,8 +3340,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2546 Windows Decals</value>
+                    <value>C2546 Windows Decals</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3652,8 +3351,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2547 Fantastic Plastic</value>
+                    <value>C2547 Fantastic Plastic</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3664,8 +3362,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C91131 Business Cards</value>
+                    <value>C91131 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3676,8 +3373,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C91149 Business Cards</value>
+                    <value>C91149 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3688,8 +3384,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9167 A4 Sheet</value>
+                    <value>C9167 A4 Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3700,8 +3395,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9169 Glossy Photo Quality Labels</value>
+                    <value>C9169 Glossy Photo Quality Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3712,8 +3406,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9356 Photo Quality A4 Card Sheet</value>
+                    <value>C9356 Photo Quality A4 Card Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3724,8 +3417,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21013 Business Cards</value>
+                    <value>J21013 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3736,8 +3428,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21015 Business Cards</value>
+                    <value>J21015 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3748,8 +3439,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21016 Business Cards</value>
+                    <value>J21016 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3760,8 +3450,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21031 Business Cards</value>
+                    <value>J21031 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3772,8 +3461,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21033 Business Cards</value>
+                    <value>J21033 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3784,8 +3472,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21131 Business Cards</value>
+                    <value>J21131 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3796,8 +3483,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21141 Greeting Cards</value>
+                    <value>J21141 Greeting Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3808,8 +3494,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J21149 Business Cards</value>
+                    <value>J21149 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3820,8 +3505,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J2356 A4 Sheet</value>
+                    <value>J2356 A4 Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3832,8 +3516,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8359 Address</value>
+                    <value>J8359 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3844,8 +3527,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8360 Address</value>
+                    <value>J8360 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3856,8 +3538,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8361 Address</value>
+                    <value>J8361 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3868,8 +3549,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8362 Address</value>
+                    <value>J8362 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3880,8 +3560,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8363 Address</value>
+                    <value>J8363 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3892,8 +3571,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8365 Address</value>
+                    <value>J8365 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3904,8 +3582,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8367 Shipping A4</value>
+                    <value>J8367 Shipping A4</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3916,8 +3593,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8368 Shipping A5</value>
+                    <value>J8368 Shipping A5</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3928,8 +3604,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8369 Parcel</value>
+                    <value>J8369 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3940,8 +3615,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8371 Lever Arch</value>
+                    <value>J8371 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3952,8 +3626,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8751 Mini Address</value>
+                    <value>J8751 Mini Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3964,8 +3637,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8756 35 mm Slide</value>
+                    <value>J8756 35 mm Slide</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3976,8 +3648,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8766 3.5&quot; Diskette</value>
+                    <value>J8766 3.5&quot; Diskette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -3988,8 +3659,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8771 Video Face</value>
+                    <value>J8771 Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4000,8 +3670,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8774 Video Spine</value>
+                    <value>J8774 Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4012,8 +3681,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J88911 Address</value>
+                    <value>J88911 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4024,8 +3692,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J88915 Address</value>
+                    <value>J88915 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4036,8 +3703,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J88919 Address</value>
+                    <value>J88919 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4048,8 +3714,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J88923 Address</value>
+                    <value>J88923 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4060,8 +3725,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J88927 Address</value>
+                    <value>J88927 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4072,8 +3736,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J88935 Address</value>
+                    <value>J88935 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4084,8 +3747,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7159 Address</value>
+                    <value>L7159 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4096,8 +3758,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7160 Address</value>
+                    <value>L7160 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4108,8 +3769,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7161 Address</value>
+                    <value>L7161 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4120,8 +3780,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7162 Address</value>
+                    <value>L7162 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4132,8 +3791,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7163 Address</value>
+                    <value>L7163 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4144,8 +3802,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7164 Address</value>
+                    <value>L7164 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4156,8 +3813,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7165 Parcel</value>
+                    <value>L7165 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4168,8 +3824,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7166 Parcel</value>
+                    <value>L7166 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4180,8 +3835,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7167 Shipping</value>
+                    <value>L7167 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4192,8 +3846,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7168 Shipping</value>
+                    <value>L7168 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4204,8 +3857,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7169 Parcel</value>
+                    <value>L7169 Parcel</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4216,8 +3868,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7170 Eurofolio</value>
+                    <value>L7170 Eurofolio</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4228,8 +3879,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7171 Lever Arch</value>
+                    <value>L7171 Lever Arch</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4240,8 +3890,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7172 Ring Binder</value>
+                    <value>L7172 Ring Binder</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4252,8 +3901,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7173 Address</value>
+                    <value>L7173 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4264,8 +3912,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7651 Mini Adress</value>
+                    <value>L7651 Mini Adress</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4276,8 +3923,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7656 35 mm Slide</value>
+                    <value>L7656 35 mm Slide</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4288,8 +3934,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7664 3.5&quot; Diskette - Wraparound</value>
+                    <value>L7664 3.5&quot; Diskette - Wraparound</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4300,8 +3945,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7665 Mini Data Cartridge</value>
+                    <value>L7665 Mini Data Cartridge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4312,8 +3956,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7666 3.5&quot; Diskette</value>
+                    <value>L7666 3.5&quot; Diskette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4324,8 +3967,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7667 Standard Data Cartridge</value>
+                    <value>L7667 Standard Data Cartridge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4336,8 +3978,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7668 Labels for Zip(TM) Disk</value>
+                    <value>L7668 Labels for Zip(TM) Disk</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4348,8 +3989,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7671 Video Face</value>
+                    <value>L7671 Video Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4360,8 +4000,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7674 Video Spine</value>
+                    <value>L7674 Video Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4372,8 +4011,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L78382 Address</value>
+                    <value>L78382 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4384,8 +4022,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L78383 Address</value>
+                    <value>L78383 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4396,8 +4033,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L78384 Address</value>
+                    <value>L78384 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4408,8 +4044,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L78386 Address</value>
+                    <value>L78386 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4420,8 +4055,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L78387 Address</value>
+                    <value>L78387 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4432,8 +4066,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L78388 Address</value>
+                    <value>L78388 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4444,8 +4077,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M21131 Business Cards</value>
+                    <value>M21131 Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4456,8 +4088,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M8167 A4 Sheet</value>
+                    <value>M8167 A4 Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4468,8 +4099,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88173 Address</value>
+                    <value>M88173 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4480,8 +4110,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88175 Address</value>
+                    <value>M88175 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4492,8 +4121,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88177 Address</value>
+                    <value>M88177 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4504,8 +4132,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88179 Address</value>
+                    <value>M88179 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4516,8 +4143,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88183 Address</value>
+                    <value>M88183 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4528,8 +4154,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88185 Address</value>
+                    <value>M88185 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4540,8 +4165,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88187 Address</value>
+                    <value>M88187 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4552,8 +4176,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">M88315 Address</value>
+                    <value>M88315 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4564,8 +4187,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">P78204 Address</value>
+                    <value>P78204 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4576,8 +4198,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">P78261 Address</value>
+                    <value>P78261 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4588,8 +4209,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">P78270 Address</value>
+                    <value>P78270 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4600,8 +4220,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">P78275 Address</value>
+                    <value>P78275 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4615,8 +4234,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5167 Return Address</value>
+                    <value>5167 Return Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4627,8 +4245,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5267 Return Address</value>
+                    <value>5267 Return Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4639,8 +4256,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5160 Address</value>
+                    <value>5160 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4651,8 +4267,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5260 Address</value>
+                    <value>5260 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4663,8 +4278,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5960 Address</value>
+                    <value>5960 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4675,8 +4289,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5159 Address</value>
+                    <value>5159 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4687,8 +4300,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5161 Address</value>
+                    <value>5161 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4699,8 +4311,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5261 Address</value>
+                    <value>5261 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4711,8 +4322,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5961 Address</value>
+                    <value>5961 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4723,8 +4333,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5162 Address</value>
+                    <value>5162 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4735,8 +4344,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5262 Address</value>
+                    <value>5262 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4747,8 +4355,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5922 Address</value>
+                    <value>5922 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4759,8 +4366,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5962 Address</value>
+                    <value>5962 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4771,8 +4377,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5163 Address / Shipping</value>
+                    <value>5163 Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4783,8 +4388,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5263 Address / Shipping</value>
+                    <value>5263 Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4795,8 +4399,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5963 Address / Shipping</value>
+                    <value>5963 Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4807,8 +4410,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5164 Address / Shipping</value>
+                    <value>5164 Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4819,8 +4421,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5264 Address / Shipping</value>
+                    <value>5264 Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4831,8 +4432,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5168 Shipping</value>
+                    <value>5168 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4843,8 +4443,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5667 Clear Return Address</value>
+                    <value>5667 Clear Return Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4855,8 +4454,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5660 Clear Address</value>
+                    <value>5660 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4867,8 +4465,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5930 Clear Address</value>
+                    <value>5930 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4879,8 +4476,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5661 Clear Address</value>
+                    <value>5661 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4891,8 +4487,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5662 Clear Address</value>
+                    <value>5662 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4903,8 +4498,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5663 Clear Address</value>
+                    <value>5663 Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4915,8 +4509,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5664 Clear Address / Shipping</value>
+                    <value>5664 Clear Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4927,8 +4520,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5165 Full Sheet</value>
+                    <value>5165 Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4939,8 +4531,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5265 Full Sheet</value>
+                    <value>5265 Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4951,8 +4542,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5266 File Folder-Assorted</value>
+                    <value>5266 File Folder-Assorted</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4963,8 +4553,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5066 File Folder-Red</value>
+                    <value>5066 File Folder-Red</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4975,8 +4564,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5166 File Folder-Orange</value>
+                    <value>5166 File Folder-Orange</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4987,8 +4575,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5366 File Folder-White</value>
+                    <value>5366 File Folder-White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -4999,8 +4586,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5666 File Folder-Purple</value>
+                    <value>5666 File Folder-Purple</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5011,8 +4597,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5766 File Folder-Blue</value>
+                    <value>5766 File Folder-Blue</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5023,8 +4608,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5866 File Folder-Green</value>
+                    <value>5866 File Folder-Green</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5035,8 +4619,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5966 File Folder-Yellow</value>
+                    <value>5966 File Folder-Yellow</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5047,8 +4630,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5293 Round</value>
+                    <value>5293 Round</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5059,8 +4641,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5294 Round</value>
+                    <value>5294 Round</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5071,8 +4652,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5196 3-1/2&quot; Diskette - White</value>
+                    <value>5196 3-1/2&quot; Diskette - White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5083,8 +4663,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5096 3-1/2&quot; Diskette - Red</value>
+                    <value>5096 3-1/2&quot; Diskette - Red</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5095,8 +4674,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5896 3-1/2&quot; Diskette - Blue</value>
+                    <value>5896 3-1/2&quot; Diskette - Blue</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5107,8 +4685,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5197 5-1/4 Diskette - White</value>
+                    <value>5197 5-1/4 Diskette - White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5119,8 +4696,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5198 Audio Cassette</value>
+                    <value>5198 Audio Cassette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5131,8 +4707,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5199 Video Cassette Face</value>
+                    <value>5199 Video Cassette Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5143,8 +4718,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5199 Video Cassette Spine</value>
+                    <value>5199 Video Cassette Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5155,8 +4729,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5925 White Laser Labels for Zip Disks (bottom spine)</value>
+                    <value>5925 White Laser Labels for Zip Disks (bottom spine)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5167,8 +4740,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5925 White Laser Labels for Zip Disks (face)</value>
+                    <value>5925 White Laser Labels for Zip Disks (face)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5179,8 +4751,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5925 White Laser Labels for Zip Disks (top spine)</value>
+                    <value>5925 White Laser Labels for Zip Disks (top spine)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5191,8 +4762,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5931 White CD/DVD Labels for Lasers (face)</value>
+                    <value>5931 White CD/DVD Labels for Lasers (face)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5203,8 +4773,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5931 White CD/DVD Labels for Lasers (spines)</value>
+                    <value>5931 White CD/DVD Labels for Lasers (spines)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5215,8 +4784,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5970 Fluorescent Laser - Magenta</value>
+                    <value>5970 Fluorescent Laser - Magenta</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5227,8 +4795,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5971 Fluorescent Laser - Green</value>
+                    <value>5971 Fluorescent Laser - Green</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5239,8 +4806,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5972 Fluorescent Laser - Yellow</value>
+                    <value>5972 Fluorescent Laser - Yellow</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5251,8 +4817,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5975 Fluorescent Laser - Full Sheet Assorted</value>
+                    <value>5975 Fluorescent Laser - Full Sheet Assorted</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5263,8 +4828,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5979 Fluorescent Laser - Assorted</value>
+                    <value>5979 Fluorescent Laser - Assorted</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5275,8 +4839,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5980 Pastel Laser - Blue</value>
+                    <value>5980 Pastel Laser - Blue</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5287,8 +4850,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5997 Videotape Face</value>
+                    <value>5997 Videotape Face</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5299,8 +4861,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5997 Videotape Spine</value>
+                    <value>5997 Videotape Spine</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5311,8 +4872,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5998 Audio Tape</value>
+                    <value>5998 Audio Tape</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5323,8 +4883,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5395 Name Badge - White</value>
+                    <value>5395 Name Badge - White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5335,8 +4894,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5095 Name Badge - Red</value>
+                    <value>5095 Name Badge - Red</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5347,8 +4905,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5895 Name Badge - Blue</value>
+                    <value>5895 Name Badge - Blue</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5359,8 +4916,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5371 Business Card - White</value>
+                    <value>5371 Business Card - White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5371,8 +4927,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5871 Laser Business Card</value>
+                    <value>5871 Laser Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5383,8 +4938,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5376 Business Card - Ivory</value>
+                    <value>5376 Business Card - Ivory</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5395,8 +4949,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5377 Business Card - Gray</value>
+                    <value>5377 Business Card - Gray</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5407,8 +4960,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5911 Business Card</value>
+                    <value>5911 Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5419,8 +4971,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5383 Name Tag Kit</value>
+                    <value>5383 Name Tag Kit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5431,8 +4982,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5390 Name Tag Refill</value>
+                    <value>5390 Name Tag Refill</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5443,8 +4993,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5883 Name Tag Kit - Blue</value>
+                    <value>5883 Name Tag Kit - Blue</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5455,8 +5004,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5384 Name Tag Kit</value>
+                    <value>5384 Name Tag Kit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5467,8 +5015,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5392 Name Tag Refill</value>
+                    <value>5392 Name Tag Refill</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5479,8 +5026,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5385 Rotary Card - Small</value>
+                    <value>5385 Rotary Card - Small</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5491,8 +5037,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5386 Rotary Card - Large</value>
+                    <value>5386 Rotary Card - Large</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5503,8 +5048,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5388 Index Card</value>
+                    <value>5388 Index Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5515,8 +5059,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5389 Post Card</value>
+                    <value>5389 Post Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5527,8 +5070,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5305 Laser Tent Cards Med.</value>
+                    <value>5305 Laser Tent Cards Med.</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5539,8 +5081,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5309 Laser Tent Cards Large</value>
+                    <value>5309 Laser Tent Cards Large</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5551,8 +5092,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5315 Laser Note Cards</value>
+                    <value>5315 Laser Note Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5563,8 +5103,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5361 Laminated ID Cards</value>
+                    <value>5361 Laminated ID Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5575,8 +5114,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5361 Laminated ID Cards-Single Card</value>
+                    <value>5361 Laminated ID Cards-Single Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5587,8 +5125,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5362 Laminated Name Badges</value>
+                    <value>5362 Laminated Name Badges</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5599,8 +5136,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5362 Laminated N. Badges-Single Card</value>
+                    <value>5362 Laminated N. Badges-Single Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5611,8 +5147,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5364 Laminated Rotary Index Cards</value>
+                    <value>5364 Laminated Rotary Index Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5623,8 +5158,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5364 Laminated Rotary Index-Single Card</value>
+                    <value>5364 Laminated Rotary Index-Single Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5635,8 +5169,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74520 Name Badge Inserts - 3&quot; x 4&quot;</value>
+                    <value>74520 Name Badge Inserts - 3&quot; x 4&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5647,8 +5180,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74540 Name Badge Inserts - 3&quot; x 4&quot;</value>
+                    <value>74540 Name Badge Inserts - 3&quot; x 4&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5659,8 +5191,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74541 Name Badge Inserts - 3&quot; x 4&quot;</value>
+                    <value>74541 Name Badge Inserts - 3&quot; x 4&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5671,8 +5202,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74550 Name Badge Inserts - 2 1/4&quot; x 3 1/2&quot;</value>
+                    <value>74550 Name Badge Inserts - 2 1/4&quot; x 3 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5683,8 +5213,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74552 Name Badge Inserts - 2&quot; x 3&quot;</value>
+                    <value>74552 Name Badge Inserts - 2&quot; x 3&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5695,8 +5224,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74558 Name Badge Inserts - 2&quot; x 3&quot;</value>
+                    <value>74558 Name Badge Inserts - 2&quot; x 3&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5707,8 +5235,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74650 Name Badge Inserts - 2 1/4&quot; x 3 1/2&quot;</value>
+                    <value>74650 Name Badge Inserts - 2 1/4&quot; x 3 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5719,8 +5246,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">74651 Name Badge Inserts - 2 1/4&quot; x 3 1/2&quot;</value>
+                    <value>74651 Name Badge Inserts - 2 1/4&quot; x 3 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5731,8 +5257,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8160 Ink Jet Address</value>
+                    <value>8160 Ink Jet Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5743,8 +5268,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8460 Ink Jet Address</value>
+                    <value>8460 Ink Jet Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5755,8 +5279,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8461 Ink Jet Address</value>
+                    <value>8461 Ink Jet Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5767,8 +5290,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8161 Ink Jet Address</value>
+                    <value>8161 Ink Jet Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5779,8 +5301,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8162 Ink Jet Address</value>
+                    <value>8162 Ink Jet Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5791,8 +5312,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8462 Ink Jet Address</value>
+                    <value>8462 Ink Jet Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5803,8 +5323,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8163 Ink Jet Address / Shipping</value>
+                    <value>8163 Ink Jet Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5815,8 +5334,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8463 Ink Jet Address / Shipping</value>
+                    <value>8463 Ink Jet Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5827,8 +5345,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8464 Ink Jet Address / Shipping</value>
+                    <value>8464 Ink Jet Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5839,8 +5356,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8923 Ink Jet Address / Shipping</value>
+                    <value>8923 Ink Jet Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5851,8 +5367,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8164 Ink Jet Address / Shipping</value>
+                    <value>8164 Ink Jet Address / Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5863,8 +5378,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8165 Ink Jet Full Sheet</value>
+                    <value>8165 Ink Jet Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5875,8 +5389,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8465 Ink Jet Full Sheet</value>
+                    <value>8465 Ink Jet Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5887,8 +5400,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8166 Ink Jet File Folder-Assorted</value>
+                    <value>8166 Ink Jet File Folder-Assorted</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5899,8 +5411,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8366 Ink Jet File Folder-White</value>
+                    <value>8366 Ink Jet File Folder-White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5911,8 +5422,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8167 Ink Jet Return Address</value>
+                    <value>8167 Ink Jet Return Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5923,8 +5433,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8196 Ink Jet 3-1/2&quot; Diskette</value>
+                    <value>8196 Ink Jet 3-1/2&quot; Diskette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5935,8 +5444,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8250 Ink Jet Label for Color Printing</value>
+                    <value>8250 Ink Jet Label for Color Printing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5947,8 +5455,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8252 Ink Jet Label for Color Printing</value>
+                    <value>8252 Ink Jet Label for Color Printing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5959,8 +5466,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8253 Ink Jet Label for Color Printing</value>
+                    <value>8253 Ink Jet Label for Color Printing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5971,8 +5477,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8254 Ink Jet Label for Color Printing</value>
+                    <value>8254 Ink Jet Label for Color Printing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5983,8 +5488,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8255 Ink Jet Label for Color Printing </value>
+                    <value>8255 Ink Jet Label for Color Printing </value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -5995,8 +5499,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8257 Ink Jet Return Address for Color Printing</value>
+                    <value>8257 Ink Jet Return Address for Color Printing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6007,8 +5510,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8309 Tent Card Large</value>
+                    <value>8309 Tent Card Large</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6019,8 +5521,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8315 Ink Jet Note Cards</value>
+                    <value>8315 Ink Jet Note Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6031,8 +5532,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8316 Ink Jet Greeting Card (Portrait)*</value>
+                    <value>8316 Ink Jet Greeting Card (Portrait)*</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6043,8 +5543,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8316 Ink Jet Greeting Card (Landscape)*</value>
+                    <value>8316 Ink Jet Greeting Card (Landscape)*</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6055,8 +5554,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8324 Ink Jet Brochures</value>
+                    <value>8324 Ink Jet Brochures</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6067,8 +5565,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8371 Ink Jet Business Card</value>
+                    <value>8371 Ink Jet Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6079,8 +5576,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8385 Rotary Card - Small</value>
+                    <value>8385 Rotary Card - Small</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6091,8 +5587,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8387 Ink Jet Postcard - 4-up</value>
+                    <value>8387 Ink Jet Postcard - 4-up</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6103,8 +5598,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8388 Index Card</value>
+                    <value>8388 Index Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6115,8 +5609,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8871 Clean Edge Business Cards (IJ)</value>
+                    <value>8871 Clean Edge Business Cards (IJ)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6127,8 +5620,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8376 Ink Jet Business Card - Ivory</value>
+                    <value>8376 Ink Jet Business Card - Ivory</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6139,8 +5631,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8377 Ink Jet Business Card - Gray</value>
+                    <value>8377 Ink Jet Business Card - Gray</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6151,8 +5642,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8660 Ink Jet Clear Address</value>
+                    <value>8660 Ink Jet Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6163,8 +5653,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8662 Ink Jet Clear Address</value>
+                    <value>8662 Ink Jet Clear Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6175,8 +5664,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8663 Ink Jet Clear Address/Shipping</value>
+                    <value>8663 Ink Jet Clear Address/Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6187,8 +5675,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8665 Ink Jet Clear Full Sheet</value>
+                    <value>8665 Ink Jet Clear Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6199,8 +5686,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8667 Ink Jet Clear Address Labels</value>
+                    <value>8667 Ink Jet Clear Address Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6211,8 +5697,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8925 White Inkjet Labels for Zip Disks (bottom spine)</value>
+                    <value>8925 White Inkjet Labels for Zip Disks (bottom spine)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6223,8 +5708,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8925 White Inkjet Labels for Zip Disks (face)</value>
+                    <value>8925 White Inkjet Labels for Zip Disks (face)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6235,8 +5719,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8925 White Inkjet Labels for Zip Disks (top spine)</value>
+                    <value>8925 White Inkjet Labels for Zip Disks (top spine)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6247,8 +5730,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8931 White CD/DVD Jewel Case Insert (spines)</value>
+                    <value>8931 White CD/DVD Jewel Case Insert (spines)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6259,8 +5741,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8931 White CD/DVD Jewel Case Inserts (cover)</value>
+                    <value>8931 White CD/DVD Jewel Case Inserts (cover)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6271,8 +5752,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8931 White CD/DVD Jewel Case Inserts (tray)</value>
+                    <value>8931 White CD/DVD Jewel Case Inserts (tray)</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6283,8 +5763,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8931 White CD/DVD Labels for Inkjet Printers</value>
+                    <value>8931 White CD/DVD Labels for Inkjet Printers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6295,8 +5774,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11161 Ready Index ExtraWide 5 Tab</value>
+                    <value>11161 Ready Index ExtraWide 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6307,8 +5785,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11163 Ready Index ExtraWide 8 Tab</value>
+                    <value>11163 Ready Index ExtraWide 8 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6319,8 +5796,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11165 Ready Index ExtraWide 10 Tab</value>
+                    <value>11165 Ready Index ExtraWide 10 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6331,8 +5807,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11526 Direct Print Custom Dividers 5 Tab Single Set</value>
+                    <value>11526 Direct Print Custom Dividers 5 Tab Single Set</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6343,8 +5818,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11527 Direct Print Custom Dividers 8 Tab Single Set</value>
+                    <value>11527 Direct Print Custom Dividers 8 Tab Single Set</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6355,8 +5829,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11171 Easy Edit Ready Index - 5 Tabs</value>
+                    <value>11171 Easy Edit Ready Index - 5 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6367,8 +5840,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11172 Easy Edit Ready Index - 8 Tabs</value>
+                    <value>11172 Easy Edit Ready Index - 8 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6379,8 +5851,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11173 Easy Edit Ready Index - 10 Tabs</value>
+                    <value>11173 Easy Edit Ready Index - 10 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6391,8 +5862,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11251 Clear Label/Index Maker Presentation Kit 5 Tab</value>
+                    <value>11251 Clear Label/Index Maker Presentation Kit 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6403,8 +5873,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11251 Clear Label/Index Maker Spine Label 1/4&quot; or 5/16&quot;</value>
+                    <value>11251 Clear Label/Index Maker Spine Label 1/4&quot; or 5/16&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6415,8 +5884,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11251 Clear Label/Index Maker Spine Label 3/8&quot; or 1/2&quot;</value>
+                    <value>11251 Clear Label/Index Maker Spine Label 3/8&quot; or 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6427,8 +5895,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11251 Clear Label/Index Maker Spine Label 5/8&quot; or 3/4&quot;</value>
+                    <value>11251 Clear Label/Index Maker Spine Label 5/8&quot; or 3/4&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6439,8 +5906,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11251 Clear Label/Index Maker Spine Label 1&quot; or Larger</value>
+                    <value>11251 Clear Label/Index Maker Spine Label 1&quot; or Larger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6451,8 +5917,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11253 Clear Label/Index Maker Narrow 5 Tab</value>
+                    <value>11253 Clear Label/Index Maker Narrow 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6463,8 +5928,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11253 Clear Label/Index Maker Spine Label 1/4&quot; or 5/16&quot;</value>
+                    <value>11253 Clear Label/Index Maker Spine Label 1/4&quot; or 5/16&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6475,8 +5939,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11253 Clear Label/Index Maker Spine Label 3/8&quot; or 1/2&quot;</value>
+                    <value>11253 Clear Label/Index Maker Spine Label 3/8&quot; or 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6487,8 +5950,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11253 Clear Label/Index Maker Spine Label 5/8&quot; or 3/4&quot;</value>
+                    <value>11253 Clear Label/Index Maker Spine Label 5/8&quot; or 3/4&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6499,8 +5961,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11253 Clear Label/Index Maker Spine Label 1&quot; or Larger</value>
+                    <value>11253 Clear Label/Index Maker Spine Label 1&quot; or Larger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6511,8 +5972,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11260 Ready Index Landscape - 5 Tabs</value>
+                    <value>11260 Ready Index Landscape - 5 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6523,8 +5983,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">11261 Ready Index Landscape - 8 Tabs</value>
+                    <value>11261 Ready Index Landscape - 8 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6535,8 +5994,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">12260 Ready Index Landscape - 5 Tabs</value>
+                    <value>12260 Ready Index Landscape - 5 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6547,8 +6005,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">12261 Ready Index Landscape - 8 Tabs</value>
+                    <value>12261 Ready Index Landscape - 8 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6559,8 +6016,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Index Maker 3 Tab</value>
+                    <value>Index Maker 3 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6571,8 +6027,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Index Maker 5 Tab</value>
+                    <value>Index Maker 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6583,8 +6038,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Index Maker 8 Tab</value>
+                    <value>Index Maker 8 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6595,8 +6049,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Hidden Tab 5 Tab</value>
+                    <value>Hidden Tab 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6607,8 +6060,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Hidden Tab 8 Tab</value>
+                    <value>Hidden Tab 8 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6619,8 +6071,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Hidden Tab 10 Tab</value>
+                    <value>Hidden Tab 10 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6631,8 +6082,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Prof. Ready Index Spine Insert 1&quot;</value>
+                    <value>Prof. Ready Index Spine Insert 1&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6643,8 +6093,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Prof. Ready Index Spine Insert 1 1/2&quot;</value>
+                    <value>Prof. Ready Index Spine Insert 1 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6655,8 +6104,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Prof. Ready Index Spine Insert 2&quot;</value>
+                    <value>Prof. Ready Index Spine Insert 2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6667,8 +6115,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Prof. Ready Index Spine Insert 3&quot;</value>
+                    <value>Prof. Ready Index Spine Insert 3&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6679,8 +6126,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Ready Index 5 Tab</value>
+                    <value>Ready Index 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6691,8 +6137,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Ready Index 8 Tab</value>
+                    <value>Ready Index 8 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6703,8 +6148,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Ready Index 10 Tab</value>
+                    <value>Ready Index 10 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6715,8 +6159,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Ready Index 12 Tab</value>
+                    <value>Ready Index 12 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6727,8 +6170,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Ready Index 15 Tab</value>
+                    <value>Ready Index 15 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6739,8 +6181,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">WorkSaver Divider 5 Tabs</value>
+                    <value>WorkSaver Divider 5 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6751,8 +6192,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">WorkSaver Divider 8 Tabs</value>
+                    <value>WorkSaver Divider 8 Tabs</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6763,8 +6203,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">WorkSaver Inserts 1/3 Cut</value>
+                    <value>WorkSaver Inserts 1/3 Cut</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6775,8 +6214,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">WorkSaver Inserts 1/5 Cut</value>
+                    <value>WorkSaver Inserts 1/5 Cut</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6787,8 +6225,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Self Adhesive Index Tab 1&quot;</value>
+                    <value>Self Adhesive Index Tab 1&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6799,8 +6236,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Self Adhesive Index Tab 1 1/2&quot;</value>
+                    <value>Self Adhesive Index Tab 1 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6811,8 +6247,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Self Adhesive Index Tab 2&quot;</value>
+                    <value>Self Adhesive Index Tab 2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6823,8 +6258,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Protect &apos;n Tab - 5 Tab</value>
+                    <value>Protect &apos;n Tab - 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6835,8 +6269,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">Protect &apos;n Tab - 8 Tab</value>
+                    <value>Protect &apos;n Tab - 8 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6847,8 +6280,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Asst.Spines Insert 1&quot;</value>
+                    <value>TitleFrames Asst.Spines Insert 1&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6859,8 +6291,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Asst.Spines Insert 1 1/2&quot;</value>
+                    <value>TitleFrames Asst.Spines Insert 1 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6871,8 +6302,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Asst.Spines Insert 2&quot;</value>
+                    <value>TitleFrames Asst.Spines Insert 2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6883,8 +6313,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Asst. Spines Insert 3&quot;</value>
+                    <value>TitleFrames Asst. Spines Insert 3&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6895,8 +6324,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Cover - 1&quot;</value>
+                    <value>TitleFrames Cover - 1&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6907,8 +6335,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Spine - 1&quot;</value>
+                    <value>TitleFrames Spine - 1&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6919,8 +6346,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Cover - 1 1/2&quot;</value>
+                    <value>TitleFrames Cover - 1 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6931,8 +6357,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">TitleFrames Spine - 1 1/2&quot;</value>
+                    <value>TitleFrames Spine - 1 1/2&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6943,8 +6368,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2160 Addressing</value>
+                    <value>2160 Addressing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6955,8 +6379,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2162 Addressing</value>
+                    <value>2162 Addressing</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6967,8 +6390,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2163 Address/Shipping</value>
+                    <value>2163 Address/Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6979,8 +6401,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2164 Shipping</value>
+                    <value>2164 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -6991,8 +6412,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2180 File Folder-Assorted</value>
+                    <value>2180 File Folder-Assorted</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7003,8 +6423,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2181 File Folder-White</value>
+                    <value>2181 File Folder-White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7015,8 +6434,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2186 3.5&quot; Diskette-White</value>
+                    <value>2186 3.5&quot; Diskette-White</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7027,8 +6445,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6490 Remove &apos;Em 3.5&quot; Diskette-Face Only Labels</value>
+                    <value>6490 Remove &apos;Em 3.5&quot; Diskette-Face Only Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7039,8 +6456,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6466 Remove &apos;Em File Folder Labels</value>
+                    <value>6466 Remove &apos;Em File Folder Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7051,8 +6467,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6460 Remove &apos;Em Address Labels</value>
+                    <value>6460 Remove &apos;Em Address Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7063,8 +6478,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6464 Remove &apos;Em Shipping Labels</value>
+                    <value>6464 Remove &apos;Em Shipping Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7075,8 +6489,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6465 Removable Laser - Full Sheet</value>
+                    <value>6465 Removable Laser - Full Sheet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7087,8 +6500,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6467 Removable Laser - Small Multi-Purpose</value>
+                    <value>6467 Removable Laser - Small Multi-Purpose</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7099,8 +6511,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6503 Remove&apos;em white laser 8 1/2&quot; x 11&quot;</value>
+                    <value>6503 Remove&apos;em white laser 8 1/2&quot; x 11&quot;</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7111,8 +6522,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5824 CD-Recordable Labels</value>
+                    <value>5824 CD-Recordable Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7123,8 +6533,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5836 MtgCreator Portfolio Label</value>
+                    <value>5836 MtgCreator Portfolio Label</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7135,8 +6544,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5836 MtgCreator Divider 5 Tab</value>
+                    <value>5836 MtgCreator Divider 5 Tab</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7147,8 +6555,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3111 Square Stickers</value>
+                    <value>3111 Square Stickers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7159,8 +6566,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3112 Small Round Stickers</value>
+                    <value>3112 Small Round Stickers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7171,8 +6577,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3114 Full Page Stickers</value>
+                    <value>3114 Full Page Stickers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7183,8 +6588,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3248 Glossy Photo Quality Postcard</value>
+                    <value>3248 Glossy Photo Quality Postcard</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7195,8 +6599,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3251 Feather Edge Greeting Card</value>
+                    <value>3251 Feather Edge Greeting Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7207,8 +6610,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3252 Vellum Overlay Greeting Card</value>
+                    <value>3252 Vellum Overlay Greeting Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7219,8 +6621,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3254 Glossy Photo Quality Print-to-the-Edge Greeting Card</value>
+                    <value>3254 Glossy Photo Quality Print-to-the-Edge Greeting Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7231,8 +6632,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3256 White Embossed Note Cards</value>
+                    <value>3256 White Embossed Note Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7243,8 +6643,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3259 Ivory Embossed Note Card</value>
+                    <value>3259 Ivory Embossed Note Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7255,8 +6654,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3260 Ivory Embossed Half-Fold Card</value>
+                    <value>3260 Ivory Embossed Half-Fold Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7267,8 +6665,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3261 White Large Labels</value>
+                    <value>3261 White Large Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7279,8 +6676,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3261 White Small Labels</value>
+                    <value>3261 White Small Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7291,8 +6687,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3261 White Return Address Labels</value>
+                    <value>3261 White Return Address Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7303,8 +6698,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3263 White Postcard</value>
+                    <value>3263 White Postcard</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7315,8 +6709,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3265 White Half-Fold Card</value>
+                    <value>3265 White Half-Fold Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7327,8 +6720,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3266 White Quarter-Fold Card</value>
+                    <value>3266 White Quarter-Fold Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7339,8 +6731,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3268 White Note Card</value>
+                    <value>3268 White Note Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7351,8 +6742,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3274 White Big Round Stickers</value>
+                    <value>3274 White Big Round Stickers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7363,8 +6753,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3274 White Small Round Stickers</value>
+                    <value>3274 White Small Round Stickers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7375,8 +6764,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3274 White Square Stickers</value>
+                    <value>3274 White Square Stickers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7387,8 +6775,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3269 Glossy Photo Quality Half-Fold Cards</value>
+                    <value>3269 Glossy Photo Quality Half-Fold Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7399,8 +6786,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8313 Glossy Photo Quality 4&quot; x 6&quot; Card</value>
+                    <value>8313 Glossy Photo Quality 4&quot; x 6&quot; Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7411,8 +6797,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8314 Glossy Photo Quality 8-1/2&quot; x 11&quot; Card</value>
+                    <value>8314 Glossy Photo Quality 8-1/2&quot; x 11&quot; Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7423,8 +6808,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8373 Glossy Photo Quality Business Card</value>
+                    <value>8373 Glossy Photo Quality Business Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7435,8 +6819,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8389 Glossy Photo Quality Postcard</value>
+                    <value>8389 Glossy Photo Quality Postcard</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7447,8 +6830,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8763 Glossy Photo Quality Labels</value>
+                    <value>8763 Glossy Photo Quality Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7459,8 +6841,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8769 Glossy Photo Quality Labels</value>
+                    <value>8769 Glossy Photo Quality Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7471,8 +6852,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3273 White Print-to-the-Edge Greeting Cards</value>
+                    <value>3273 White Print-to-the-Edge Greeting Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7483,8 +6863,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3277 Textured Canvas for Ink Jet Printers</value>
+                    <value>3277 Textured Canvas for Ink Jet Printers</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7495,8 +6874,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8317 Embossed Ink Jet Note Card - Ivory</value>
+                    <value>8317 Embossed Ink Jet Note Card - Ivory</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7507,8 +6885,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8384 Photo Quality Brochures</value>
+                    <value>8384 Photo Quality Brochures</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7519,8 +6896,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">53220 Glossy 4x6 Photo Paper</value>
+                    <value>53220 Glossy 4x6 Photo Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7531,8 +6907,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">53221 Glossy 5x7 Photo Paper</value>
+                    <value>53221 Glossy 5x7 Photo Paper</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7543,8 +6918,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5881 Color Laser Business Cards</value>
+                    <value>5881 Color Laser Business Cards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7555,8 +6929,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5884 Glossy Color Laser Brochures</value>
+                    <value>5884 Glossy Color Laser Brochures</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7567,8 +6940,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5889 Color Laser Postcards</value>
+                    <value>5889 Color Laser Postcards</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7579,8 +6951,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">8877 Ink Jet Business Card - Gray</value>
+                    <value>8877 Ink Jet Business Card - Gray</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7591,8 +6962,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6873 Color Laser Address Labels</value>
+                    <value>6873 Color Laser Address Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7603,8 +6973,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6879 Color Laser Address Labels</value>
+                    <value>6879 Color Laser Address Labels</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7615,8 +6984,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4207 Price Marking</value>
+                    <value>4207 Price Marking</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7627,8 +6995,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4144 Address</value>
+                    <value>4144 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7639,8 +7006,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4021 Address</value>
+                    <value>4021 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7651,8 +7017,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4145 Address</value>
+                    <value>4145 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7663,8 +7028,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4013 Address</value>
+                    <value>4013 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7675,8 +7039,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">R-4013 Address</value>
+                    <value>R-4013 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7687,8 +7050,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4030 Address</value>
+                    <value>4030 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7699,8 +7061,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4031 Address</value>
+                    <value>4031 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7711,8 +7072,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4029 Address</value>
+                    <value>4029 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7723,8 +7083,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4060 Address</value>
+                    <value>4060 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7735,8 +7094,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4065 Address</value>
+                    <value>4065 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7747,8 +7105,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4143 Address</value>
+                    <value>4143 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7759,8 +7116,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4066 Address</value>
+                    <value>4066 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7771,8 +7127,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4146 Address</value>
+                    <value>4146 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7783,8 +7138,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4014 Address</value>
+                    <value>4014 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7795,8 +7149,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4032 Address</value>
+                    <value>4032 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7807,8 +7160,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4033 Address</value>
+                    <value>4033 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7819,8 +7171,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4022 Address</value>
+                    <value>4022 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7831,8 +7182,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4162 Address-Clear</value>
+                    <value>4162 Address-Clear</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7843,8 +7193,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4601 Address-Clear</value>
+                    <value>4601 Address-Clear</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7855,8 +7204,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4161 Shipping-Red Border</value>
+                    <value>4161 Shipping-Red Border</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7867,8 +7215,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4088 Shipping</value>
+                    <value>4088 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7879,8 +7226,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4076 Shipping</value>
+                    <value>4076 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7891,8 +7237,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4110 Shipping</value>
+                    <value>4110 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7903,8 +7248,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4027 File Folder / Address</value>
+                    <value>4027 File Folder / Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7915,8 +7259,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4255 File Folder</value>
+                    <value>4255 File Folder</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7927,8 +7270,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4266 File Folder-Assorted</value>
+                    <value>4266 File Folder-Assorted</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7939,8 +7281,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4163 Piggyback</value>
+                    <value>4163 Piggyback</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7951,8 +7292,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4160 Name Badge</value>
+                    <value>4160 Name Badge</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7963,8 +7303,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4241 3-1/2&quot; Diskette</value>
+                    <value>4241 3-1/2&quot; Diskette</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7975,8 +7314,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4166 Index Card</value>
+                    <value>4166 Index Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7987,8 +7325,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4167 Post Card</value>
+                    <value>4167 Post Card</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -7999,8 +7336,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4037 Address</value>
+                    <value>4037 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8011,8 +7347,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4020 Address</value>
+                    <value>4020 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8023,8 +7358,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4109 Address</value>
+                    <value>4109 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8035,8 +7369,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4018 Address - Removable</value>
+                    <value>4018 Address - Removable</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8047,8 +7380,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4062 Address</value>
+                    <value>4062 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8059,8 +7391,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4035 Address</value>
+                    <value>4035 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8071,8 +7402,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4052 Data Storage</value>
+                    <value>4052 Data Storage</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8083,8 +7413,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4067 Address</value>
+                    <value>4067 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8095,8 +7424,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4019 Address - Removable</value>
+                    <value>4019 Address - Removable</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8107,8 +7435,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4015 Address</value>
+                    <value>4015 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8119,8 +7446,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4090 Address</value>
+                    <value>4090 Address</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8131,8 +7457,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4043 Shipping</value>
+                    <value>4043 Shipping</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8146,8 +7471,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2493 Inkjet-Photo-Papier, blanko</value>
+                    <value>2493 Inkjet-Photo-Papier, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8158,8 +7482,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2494 Inkjet-Photo-Papier, blanko</value>
+                    <value>2494 Inkjet-Photo-Papier, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8170,8 +7493,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">2495 Inkjet-Photo-Papier, blanko</value>
+                    <value>2495 Inkjet-Photo-Papier, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8182,8 +7504,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32010 Visitenkarten, blanko</value>
+                    <value>32010 Visitenkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8194,8 +7515,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32011 Visitenkarten, blanko, schnittgestanzt</value>
+                    <value>32011 Visitenkarten, blanko, schnittgestanzt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8206,8 +7526,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32012 Visitenkarten, blanko, schnittgestanzt</value>
+                    <value>32012 Visitenkarten, blanko, schnittgestanzt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8218,8 +7537,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32014 Inkjet-Visitenkarten, blanko</value>
+                    <value>32014 Inkjet-Visitenkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8230,8 +7548,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32017 Doppel-Visitenkarten, blanko</value>
+                    <value>32017 Doppel-Visitenkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8242,8 +7559,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32020 Visitenkarten, marmoriert</value>
+                    <value>32020 Visitenkarten, marmoriert</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8254,8 +7570,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32021 Visitenkarten, marmoriert</value>
+                    <value>32021 Visitenkarten, marmoriert</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8266,8 +7581,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32022 Visitenkarten, marmoriert</value>
+                    <value>32022 Visitenkarten, marmoriert</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8278,8 +7592,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32023 Visitenkarten, marmoriert</value>
+                    <value>32023 Visitenkarten, marmoriert</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8290,8 +7603,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32029 Visitenkarten, blanko, Glossy</value>
+                    <value>32029 Visitenkarten, blanko, Glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8302,8 +7614,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32030 Visitenkarten, Blue Wave</value>
+                    <value>32030 Visitenkarten, Blue Wave</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8314,8 +7625,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32031 Visitenkarten, Paradise</value>
+                    <value>32031 Visitenkarten, Paradise</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8326,8 +7636,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32032 Visitenkarten, Sahara</value>
+                    <value>32032 Visitenkarten, Sahara</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8338,8 +7647,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32036 Visitenkarten, Cosmic</value>
+                    <value>32036 Visitenkarten, Cosmic</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8350,8 +7658,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32040 Visitenkarten, blanko</value>
+                    <value>32040 Visitenkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8362,8 +7669,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32060 Inkjet Bütten-Papier, Cream</value>
+                    <value>32060 Inkjet Bütten-Papier, Cream</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8374,8 +7680,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32061 Inkjet Bütten-Papier, Aqua</value>
+                    <value>32061 Inkjet Bütten-Papier, Aqua</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8386,8 +7691,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32062 Inkjet Bütten-Papier, Jade</value>
+                    <value>32062 Inkjet Bütten-Papier, Jade</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8398,8 +7702,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32063 Inkjet Bütten-Papier, Sand</value>
+                    <value>32063 Inkjet Bütten-Papier, Sand</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8410,8 +7713,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32064 Inkjet-Papier, Leinenstruktur</value>
+                    <value>32064 Inkjet-Papier, Leinenstruktur</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8422,8 +7724,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32065 Inkjet-Papier, Hammerschlag</value>
+                    <value>32065 Inkjet-Papier, Hammerschlag</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8434,8 +7735,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32080 Marmoriertes Papier</value>
+                    <value>32080 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8446,8 +7746,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32081 Marmoriertes Papier</value>
+                    <value>32081 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8458,8 +7757,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32082 Marmoriertes Papier</value>
+                    <value>32082 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8470,8 +7768,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32083 Marmoriertes Papier</value>
+                    <value>32083 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8482,8 +7779,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32098 Urkunde marmoriert, Text rot</value>
+                    <value>32098 Urkunde marmoriert, Text rot</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8494,8 +7790,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32099 Urkunde marmoriert, Text gold</value>
+                    <value>32099 Urkunde marmoriert, Text gold</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8506,8 +7801,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32250 CD-Einleger, blanko</value>
+                    <value>32250 CD-Einleger, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8518,8 +7812,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32251 Inkjet-CD-Einleger</value>
+                    <value>32251 Inkjet-CD-Einleger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8530,8 +7823,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32252 Postkarte, blanko</value>
+                    <value>32252 Postkarte, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8542,8 +7834,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32253 Tischkarte, blanko</value>
+                    <value>32253 Tischkarte, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8554,8 +7845,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32254 Karteikarte, blanko</value>
+                    <value>32254 Karteikarte, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8566,8 +7856,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32255 Cassetten-Einleger, blanko</value>
+                    <value>32255 Cassetten-Einleger, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8578,8 +7867,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32256 Video-Einleger, blanko</value>
+                    <value>32256 Video-Einleger, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8590,8 +7878,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32257 Tischkarte lang, blanko</value>
+                    <value>32257 Tischkarte lang, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8602,8 +7889,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32258 Regalschilder</value>
+                    <value>32258 Regalschilder</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8614,8 +7900,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32286 Inkjet-Glückwunschkarten, blanko</value>
+                    <value>32286 Inkjet-Glückwunschkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8626,8 +7911,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32287 Inkjet-Glückwunschkarten, blanko</value>
+                    <value>32287 Inkjet-Glückwunschkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8638,8 +7922,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32288 Inkjet-Glückwunschkarten, blanko</value>
+                    <value>32288 Inkjet-Glückwunschkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8650,8 +7933,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">32289 Inkjet-Glückwunschkarten, blanko</value>
+                    <value>32289 Inkjet-Glückwunschkarten, blanko</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8662,8 +7944,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9312 Glossy Visitenkarten, schnittgestanzt</value>
+                    <value>C9312 Glossy Visitenkarten, schnittgestanzt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8674,8 +7955,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3415 Kreise</value>
+                    <value>3415 Kreise</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8686,8 +7966,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3416 Kreise</value>
+                    <value>3416 Kreise</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8698,8 +7977,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3418 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3418 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8710,8 +7988,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3420 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3420 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8722,8 +7999,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3421 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3421 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8734,8 +8010,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3422 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3422 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8746,8 +8021,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3423 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3423 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8758,8 +8032,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3424 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3424 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8770,8 +8043,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3425 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3425 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8782,8 +8054,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3426 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3426 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8794,8 +8065,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3427 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3427 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8806,8 +8076,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3448 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3448 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8818,8 +8087,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3449 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3449 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8830,8 +8098,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3450 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3450 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8842,8 +8109,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3451 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3451 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8854,8 +8120,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3452 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3452 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8866,8 +8131,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3453 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3453 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8878,8 +8142,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3454 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3454 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8890,8 +8153,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3455 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3455 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8902,8 +8164,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3456 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3456 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8914,8 +8175,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3457 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3457 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8926,8 +8186,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3458 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3458 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8938,8 +8197,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3459 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3459 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8950,8 +8208,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3470 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3470 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8962,8 +8219,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3471 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3471 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8974,8 +8230,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3472 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3472 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8986,8 +8241,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3473 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3473 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -8998,8 +8252,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3474 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3474 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9010,8 +8263,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3475 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3475 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9022,8 +8274,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3477 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3477 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9034,8 +8285,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3478 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3478 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9046,8 +8296,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3479 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3479 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9058,8 +8307,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3481 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3481 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9070,8 +8318,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3483 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3483 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9082,8 +8329,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3484 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3484 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9094,8 +8340,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3489 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3489 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9106,8 +8351,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3490 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3490 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9118,8 +8362,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3651 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3651 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9130,8 +8373,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3652 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3652 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9142,8 +8384,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3653 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3653 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9154,8 +8395,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3654 CD-Etiketten</value>
+                    <value>3654 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9166,8 +8406,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3655 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3655 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9178,8 +8417,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3657 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3657 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9190,8 +8428,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3658 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3658 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9202,8 +8439,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3659 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3659 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9214,8 +8450,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3660 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3660 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9226,8 +8461,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3661 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3661 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9238,8 +8472,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3662 Ordnerrücken-Etiketten, schmal</value>
+                    <value>3662 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9250,8 +8483,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3663 Ordnerrücken-Etiketten, breit</value>
+                    <value>3663 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9262,8 +8494,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3664 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3664 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9274,8 +8505,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3665 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3665 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9286,8 +8516,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3666 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3666 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9298,8 +8527,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3667 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3667 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9310,8 +8538,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3668 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3668 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9322,8 +8549,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3669 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>3669 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9334,8 +8560,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3674 Computer-Etiketten</value>
+                    <value>3674 Computer-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9346,8 +8571,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3675 Computer-Etiketten</value>
+                    <value>3675 Computer-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9358,8 +8582,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3676 Computer-Etiketten</value>
+                    <value>3676 Computer-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9370,8 +8593,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3677 Computer-Etiketten, für 3,5&quot; Disk.</value>
+                    <value>3677 Computer-Etiketten, für 3,5&quot; Disk.</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9382,8 +8604,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3684 Computer-Etiketten, für 3,5&quot; Disk.</value>
+                    <value>3684 Computer-Etiketten, für 3,5&quot; Disk.</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9394,8 +8615,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3685 Computer-Etiketten, für 3,5&quot; Disk.</value>
+                    <value>3685 Computer-Etiketten, für 3,5&quot; Disk.</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9406,8 +8626,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3686 Computer-Etiketten, für 3,5&quot; Disk.</value>
+                    <value>3686 Computer-Etiketten, für 3,5&quot; Disk.</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9418,8 +8637,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3687 Computer-Etiketten, für 3,5&quot; Disk.</value>
+                    <value>3687 Computer-Etiketten, für 3,5&quot; Disk.</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9430,8 +8648,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3688 Ordnerrücken-Etiketten, breit</value>
+                    <value>3688 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9442,8 +8659,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3689 Ordnerrücken-Etiketten, schmal</value>
+                    <value>3689 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9454,8 +8670,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3691 Ordnerrücken-Etiketten, breit</value>
+                    <value>3691 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9466,8 +8681,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3692 Ordnerrücken-Etiketten, breit</value>
+                    <value>3692 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9478,8 +8692,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3693 Ordnerrücken-Etiketten, breit</value>
+                    <value>3693 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9490,8 +8703,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3694 Ordnerrücken-Etiketten, breit</value>
+                    <value>3694 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9502,8 +8714,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3696 Ordnerrücken-Etiketten, schmal</value>
+                    <value>3696 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9514,8 +8725,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3697 Ordnerrücken-Etiketten, schmal</value>
+                    <value>3697 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9526,8 +8736,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3698 Ordnerrücken-Etiketten, schmal</value>
+                    <value>3698 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9538,8 +8747,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3699 Ordnerrücken-Etiketten, schmal</value>
+                    <value>3699 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9550,8 +8758,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4720 Transparente Etiketten</value>
+                    <value>4720 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9562,8 +8769,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4721 Transparente Etiketten</value>
+                    <value>4721 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9574,8 +8780,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4722 Transparente Etiketten</value>
+                    <value>4722 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9586,8 +8791,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4723 Transparente Etiketten</value>
+                    <value>4723 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9598,8 +8802,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4730 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4730 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9610,8 +8813,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4731 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4731 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9622,8 +8824,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4732 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4732 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9634,8 +8835,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4733 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4733 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9646,8 +8846,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4734 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4734 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9658,8 +8857,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4735 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4735 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9670,8 +8868,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4736 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4736 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9682,8 +8879,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4737 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4737 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9694,8 +8890,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4738 Disketten-Etiketten, Stick+Lift</value>
+                    <value>4738 Disketten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9706,8 +8901,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4739 Disketten-Etiketten, Stick+Lift</value>
+                    <value>4739 Disketten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9718,8 +8912,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4740 Disketten-Etiketten, Stick+Lift</value>
+                    <value>4740 Disketten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9730,8 +8923,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4741 Disketten-Etiketten, Stick+Lift</value>
+                    <value>4741 Disketten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9742,8 +8934,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4742 Video-Etiketten, Stick+Lift</value>
+                    <value>4742 Video-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9754,8 +8945,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4743 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4743 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9766,8 +8956,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4744 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4744 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9778,8 +8967,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4745 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>4745 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9790,8 +8978,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4746 Video-Etiketten, Stick+Lift</value>
+                    <value>4746 Video-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9802,8 +8989,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4747 Etiketten für ZIP-Disketten</value>
+                    <value>4747 Etiketten für ZIP-Disketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9814,8 +9000,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4748 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4748 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9826,8 +9011,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4749 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4749 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9838,8 +9022,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4750 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4750 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9850,8 +9033,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4751 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4751 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9862,8 +9044,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4752 Ordnerrücken-Etiketten, breit</value>
+                    <value>4752 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9874,8 +9055,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4753 Ordnerrücken-Etiketten, breit</value>
+                    <value>4753 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9886,8 +9066,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4754 Ordnerrücken-Etiketten, breit</value>
+                    <value>4754 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9898,8 +9077,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4755 Ordnerrücken-Etiketten, breit</value>
+                    <value>4755 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9910,8 +9088,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4756 Hängeordner-Etiketten, schmal</value>
+                    <value>4756 Hängeordner-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9922,8 +9099,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4757 Hängeordner-Etiketten, breit</value>
+                    <value>4757 Hängeordner-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9934,8 +9110,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4758 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4758 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9946,8 +9121,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4759 Ordnerrücken-Etiketten, breit</value>
+                    <value>4759 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9958,8 +9132,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4760 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4760 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9970,8 +9143,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4761 Ordnerrücken-Etiketten, breit</value>
+                    <value>4761 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9982,8 +9154,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4762 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4762 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -9994,8 +9165,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4763 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4763 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10006,8 +9176,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4764 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4764 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10018,8 +9187,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4765 Ordnerrücken-Etiketten, schmal</value>
+                    <value>4765 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10030,8 +9198,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4766 Ordnerrücken-Etiketten, breit</value>
+                    <value>4766 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10042,8 +9209,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4767 Ordnerrücken-Etiketten, breit</value>
+                    <value>4767 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10054,8 +9220,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4768 Ordnerrücken-Etiketten, breit</value>
+                    <value>4768 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10066,8 +9231,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4769 Ordnerrücken-Etiketten, breit</value>
+                    <value>4769 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10078,8 +9242,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4770 Transparente Etiketten</value>
+                    <value>4770 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10090,8 +9253,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4771 Transparente Etiketten</value>
+                    <value>4771 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10102,8 +9264,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4772 Transparente Etiketten</value>
+                    <value>4772 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10114,8 +9275,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4773 Wetterfeste Etiketten</value>
+                    <value>4773 Wetterfeste Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10126,8 +9286,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4774 Wetterfeste Etiketten</value>
+                    <value>4774 Wetterfeste Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10138,8 +9297,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4775 Wetterfeste Etiketten</value>
+                    <value>4775 Wetterfeste Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10150,8 +9308,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4776 Wetterfeste Etiketten</value>
+                    <value>4776 Wetterfeste Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10162,8 +9319,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4777 Transparente Etiketten</value>
+                    <value>4777 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10174,8 +9330,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4780 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>4780 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10186,8 +9341,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4781 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>4781 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10198,8 +9352,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4782 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>4782 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10210,8 +9363,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4784 Namens-Etiketten</value>
+                    <value>4784 Namens-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10222,8 +9374,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4790 Inkjet-Etiketten, rund</value>
+                    <value>4790 Inkjet-Etiketten, rund</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10234,8 +9385,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4791 Inkjet-Etiketten</value>
+                    <value>4791 Inkjet-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10246,8 +9396,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4792 Inkjet-Etiketten</value>
+                    <value>4792 Inkjet-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10258,8 +9407,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4793 Inkjet-Etiketten</value>
+                    <value>4793 Inkjet-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10270,8 +9418,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4794 Inkjet-Etiketten</value>
+                    <value>4794 Inkjet-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10282,8 +9429,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4795 Inkjet-Etiketten</value>
+                    <value>4795 Inkjet-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10294,8 +9440,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4798 Disketten-Etiketten Photo-Qualität</value>
+                    <value>4798 Disketten-Etiketten Photo-Qualität</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10306,8 +9451,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">4799 Inkjet-Etiketten, oval</value>
+                    <value>4799 Inkjet-Etiketten, oval</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10318,8 +9462,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6002 Neon-Etiketten</value>
+                    <value>6002 Neon-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10330,8 +9473,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6003 Neon-Etiketten</value>
+                    <value>6003 Neon-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10342,8 +9484,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6004 Neon-Etiketten</value>
+                    <value>6004 Neon-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10354,8 +9495,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6005 Neon-Etiketten</value>
+                    <value>6005 Neon-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10366,8 +9506,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6006 Neon-Etiketten</value>
+                    <value>6006 Neon-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10378,8 +9517,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6008 Typenschild-Etiketten</value>
+                    <value>6008 Typenschild-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10390,8 +9528,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6009 Typenschild-Etiketten</value>
+                    <value>6009 Typenschild-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10402,8 +9539,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6011 Typenschild-Etiketten</value>
+                    <value>6011 Typenschild-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10414,8 +9550,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6012 Typenschild-Etiketten</value>
+                    <value>6012 Typenschild-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10426,8 +9561,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6013 Typenschild-Etiketten</value>
+                    <value>6013 Typenschild-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10438,8 +9572,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6014 Etiketten für CD-Hüllen</value>
+                    <value>6014 Etiketten für CD-Hüllen</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10450,8 +9583,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6015 CD-Etiketten incl. Zentrierhilfe</value>
+                    <value>6015 CD-Etiketten incl. Zentrierhilfe</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10462,8 +9594,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6019 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>6019 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10474,8 +9605,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6020 Dia-Etiketten, Stick+Lift</value>
+                    <value>6020 Dia-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10486,8 +9616,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6021 Sichtreiter-Etiketten, Stick+Lift</value>
+                    <value>6021 Sichtreiter-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10498,8 +9627,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6022 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>6022 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10510,8 +9638,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6023 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>6023 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10522,8 +9649,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6024 Inkjet+Laser+Kopier-Etiketten Stick+Lift, </value>
+                    <value>6024 Inkjet+Laser+Kopier-Etiketten Stick+Lift, </value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10534,8 +9660,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6025 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>6025 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10546,8 +9671,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6026 Disketten-Etiketten, Stick+Lift</value>
+                    <value>6026 Disketten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10558,8 +9682,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6029 Disketten-Etiketten, Stick+Lift</value>
+                    <value>6029 Disketten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10570,8 +9693,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6030 Cassetten-Etiketten, Stick+Lift</value>
+                    <value>6030 Cassetten-Etiketten, Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10582,8 +9704,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6031 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
+                    <value>6031 Inkjet+Laser+Kopier-Etiketten Stick+Lift</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10594,8 +9715,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6036 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>6036 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10606,8 +9726,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6037 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>6037 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10618,8 +9737,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6038 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>6038 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10630,8 +9748,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6039 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>6039 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10642,8 +9759,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6040 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>6040 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10654,8 +9770,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6041 Inkjet+Laser+Kopier-Etiketten</value>
+                    <value>6041 Inkjet+Laser+Kopier-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10666,8 +9781,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6043 CD-Etiketten</value>
+                    <value>6043 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10678,8 +9792,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6044 CD-Etiketten</value>
+                    <value>6044 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10690,8 +9803,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6045 CD-Etiketten</value>
+                    <value>6045 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10702,8 +9814,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6046 CD-Etiketten</value>
+                    <value>6046 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10714,8 +9825,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6047 CD-Etiketten</value>
+                    <value>6047 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10726,8 +9836,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6058 Ordnerrücken-Etiketten, schmal</value>
+                    <value>6058 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10738,8 +9847,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6059 Ordnerrücken-Etiketten, breit</value>
+                    <value>6059 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10750,8 +9858,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6060 Ordnerrücken-Etiketten, schmal</value>
+                    <value>6060 Ordnerrücken-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10762,8 +9869,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6061 Ordnerrücken-Etiketten, breit</value>
+                    <value>6061 Ordnerrücken-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10774,8 +9880,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6074 Inkjet-Glossy-CD-Etiketten</value>
+                    <value>6074 Inkjet-Glossy-CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10786,8 +9891,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6077 Inkjet-Glossy-Etiketten</value>
+                    <value>6077 Inkjet-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10798,8 +9902,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6078 Inkjet-Glossy-Etiketten</value>
+                    <value>6078 Inkjet-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10810,8 +9913,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6079 Inkjet-Glossy-Etiketten, oval</value>
+                    <value>6079 Inkjet-Glossy-Etiketten, oval</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10822,8 +9924,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6080 Inkjet-Glossy-Etiketten</value>
+                    <value>6080 Inkjet-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10834,8 +9935,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6081 Inkjet-Glossy-Etiketten</value>
+                    <value>6081 Inkjet-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10846,8 +9946,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6082 Inkjet-Glossy-CD-Etiketten</value>
+                    <value>6082 Inkjet-Glossy-CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10858,8 +9957,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6083 Inkjet-Glossy-Etiketten</value>
+                    <value>6083 Inkjet-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10870,8 +9968,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6090 Korrektur- und Abdeck-Etiketten</value>
+                    <value>6090 Korrektur- und Abdeck-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10882,8 +9979,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6091 Korrektur- und Abdeck-Etiketten</value>
+                    <value>6091 Korrektur- und Abdeck-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10894,8 +9990,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6092 Korrektur- und Abdeck-Etiketten</value>
+                    <value>6092 Korrektur- und Abdeck-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10906,8 +10001,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6093 Korrektur- und Abdeck-Etiketten</value>
+                    <value>6093 Korrektur- und Abdeck-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10918,8 +10012,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6094 Korrektur- und Abdeck-Etiketten</value>
+                    <value>6094 Korrektur- und Abdeck-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10930,8 +10023,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6102 Farbige Folien-Etiketten</value>
+                    <value>6102 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10942,8 +10034,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6103 Farbige Folien-Etiketten</value>
+                    <value>6103 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10954,8 +10045,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6104 Farbige Folien-Etiketten</value>
+                    <value>6104 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10966,8 +10056,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6105 Farbige Folien-Etiketten</value>
+                    <value>6105 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10978,8 +10067,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6106 Farbige Folien-Etiketten</value>
+                    <value>6106 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -10990,8 +10078,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6107 Farbige Folien-Etiketten</value>
+                    <value>6107 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11002,8 +10089,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6108 Farbige Folien-Etiketten</value>
+                    <value>6108 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11014,8 +10100,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6109 Farbige Folien-Etiketten</value>
+                    <value>6109 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11026,8 +10111,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6110 Farbige Folien-Etiketten</value>
+                    <value>6110 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11038,8 +10122,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6111 Farbige Folien-Etiketten</value>
+                    <value>6111 Farbige Folien-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11050,8 +10133,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6112 Sicherheits-Etiketten</value>
+                    <value>6112 Sicherheits-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11062,8 +10144,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6113 Sicherheits-Etiketten</value>
+                    <value>6113 Sicherheits-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11074,8 +10155,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6114 Sicherheits-Etiketten</value>
+                    <value>6114 Sicherheits-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11086,8 +10166,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6115 CD-Etiketten</value>
+                    <value>6115 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11098,8 +10177,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6116 MiniDisc-Etiketten</value>
+                    <value>6116 MiniDisc-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11110,8 +10188,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6117 CD-Etiketten</value>
+                    <value>6117 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11122,8 +10199,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">6118 CD-Etiketten</value>
+                    <value>6118 CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11134,8 +10210,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7767 Farblaser-Glossy-Etiketten</value>
+                    <value>L7767 Farblaser-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11146,8 +10221,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7768 Farblaser-Glossy-Etiketten</value>
+                    <value>L7768 Farblaser-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11158,8 +10232,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7769 Farblaser-Glossy-Etiketten</value>
+                    <value>L7769 Farblaser-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11170,8 +10243,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7765 Farblaser-Glossy-Etiketten</value>
+                    <value>L7765 Farblaser-Glossy-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11182,8 +10254,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9660 SuperSize Inkjet-Glossy-CD-Etiketten</value>
+                    <value>C9660 SuperSize Inkjet-Glossy-CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11194,8 +10265,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7760 SuperSize Farblaser-Glossy-CD-Etiketten</value>
+                    <value>L7760 SuperSize Farblaser-Glossy-CD-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11206,8 +10276,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8776 Inkjet-Stardust-CD-Etiketten*</value>
+                    <value>J8776 Inkjet-Stardust-CD-Etiketten*</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11218,8 +10287,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8871 Inkjet-Magnet-Schilder**</value>
+                    <value>J8871 Inkjet-Magnet-Schilder**</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11230,8 +10298,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8875 Inkjet-Magnet-Schilder**</value>
+                    <value>J8875 Inkjet-Magnet-Schilder**</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11242,8 +10309,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8867 Inkjet-Magnet-Schilder**</value>
+                    <value>J8867 Inkjet-Magnet-Schilder**</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11254,8 +10320,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2166 Etikett rechteckig</value>
+                    <value>C2166 Etikett rechteckig</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11266,8 +10331,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2243 Etikett rund, klein</value>
+                    <value>C2243 Etikett rund, klein</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11278,8 +10342,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2351 Glückwunschkarten A5</value>
+                    <value>C2351 Glückwunschkarten A5</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11290,8 +10353,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2354 Visitenkarten bis zum Rand</value>
+                    <value>C2354 Visitenkarten bis zum Rand</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11302,8 +10364,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2355 Glückwunschkarten Standard</value>
+                    <value>C2355 Glückwunschkarten Standard</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11314,8 +10375,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2410 Clubkarten laminiert</value>
+                    <value>C2410 Clubkarten laminiert</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11326,8 +10386,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2651 Etikett rechteckig, klein</value>
+                    <value>C2651 Etikett rechteckig, klein</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11338,8 +10397,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9405 T-Shirt Transferfolie</value>
+                    <value>C9405 T-Shirt Transferfolie</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11350,8 +10408,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2547 Fantastic Plastic</value>
+                    <value>C2547 Fantastic Plastic</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11362,8 +10419,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2070 Transfer-Folie für Mousepad</value>
+                    <value>C2070 Transfer-Folie für Mousepad</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11374,8 +10430,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2090 T-Shirt Transfer-Folie</value>
+                    <value>C2090 T-Shirt Transfer-Folie</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11386,8 +10441,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2080 Transfer-Folie für Puzzles</value>
+                    <value>C2080 Transfer-Folie für Puzzles</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11398,8 +10452,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8416 Einladungskarten mit Klebeverschluss</value>
+                    <value>J8416 Einladungskarten mit Klebeverschluss</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11410,8 +10463,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2546 Fensterbilder</value>
+                    <value>C2546 Fensterbilder</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11422,8 +10474,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9660 CD-Etiketten, glossy, Super-Size</value>
+                    <value>C9660 CD-Etiketten, glossy, Super-Size</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11434,8 +10485,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8770 CD-Etiketten, Super-Ssize</value>
+                    <value>J8770 CD-Etiketten, Super-Ssize</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11446,8 +10496,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2050 Video-Etiketten, seitlich</value>
+                    <value>C2050 Video-Etiketten, seitlich</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11458,8 +10507,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2050 Video-Etiketten, oben</value>
+                    <value>C2050 Video-Etiketten, oben</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11470,8 +10518,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8666 Disketten-Etiketten</value>
+                    <value>J8666 Disketten-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11482,8 +10529,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J9124 Photo-Etiketten, 13 x 18</value>
+                    <value>J9124 Photo-Etiketten, 13 x 18</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11494,8 +10540,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7424 Ordner-Etiketten, breit</value>
+                    <value>L7424 Ordner-Etiketten, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11506,8 +10551,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7425 Ordner-Etiketten, schmal</value>
+                    <value>L7425 Ordner-Etiketten, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11518,8 +10562,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8587 Inkjet-Folie</value>
+                    <value>J8587 Inkjet-Folie</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11530,8 +10573,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7587 Laser-Folie</value>
+                    <value>L7587 Laser-Folie</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11542,8 +10584,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9431 Photo-Papier, glossy</value>
+                    <value>C9431 Photo-Papier, glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11554,8 +10595,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9434 Photo-Karton, glossy</value>
+                    <value>C9434 Photo-Karton, glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11566,8 +10606,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9372 Photo-Papier, glossy, 9 x 13</value>
+                    <value>C9372 Photo-Papier, glossy, 9 x 13</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11578,8 +10617,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2371 Inkjet-Papier</value>
+                    <value>C2371 Inkjet-Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11590,8 +10628,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2370 Inkjet-Papier</value>
+                    <value>C2370 Inkjet-Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11602,8 +10639,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2374 Marmoriertes Papier</value>
+                    <value>C2374 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11614,8 +10650,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2375 Marmoriertes Papier</value>
+                    <value>C2375 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11626,8 +10661,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2376 Marmoriertes Papier</value>
+                    <value>C2376 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11638,8 +10672,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2377 Marmoriertes Papier</value>
+                    <value>C2377 Marmoriertes Papier</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11650,8 +10683,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9355 Postkarten, Vorderseite</value>
+                    <value>C9355 Postkarten, Vorderseite</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11662,8 +10694,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9355 Postkarten, Rückseite</value>
+                    <value>C9355 Postkarten, Rückseite</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11674,8 +10705,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">J8435 CD-Einleger</value>
+                    <value>J8435 CD-Einleger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11686,8 +10716,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9362 Visitenkarten, glossy</value>
+                    <value>C9362 Visitenkarten, glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11698,8 +10727,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2364 Marmorierte Visitenkarten</value>
+                    <value>C2364 Marmorierte Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11710,8 +10738,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2365 Marmorierte Visitenkarten</value>
+                    <value>C2365 Marmorierte Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11722,8 +10749,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2366 Marmorierte Visitenkarten</value>
+                    <value>C2366 Marmorierte Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11734,8 +10760,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C2367 Marmorierte Visitenkarten</value>
+                    <value>C2367 Marmorierte Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11746,8 +10771,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">C9352 Glückwunschkarten A6, glossy</value>
+                    <value>C9352 Glückwunschkarten A6, glossy</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11758,8 +10782,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7159 Laser-Etiketten</value>
+                    <value>L7159 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11770,8 +10793,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7160 Laser-Etiketten</value>
+                    <value>L7160 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11782,8 +10804,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7161 Laser-Etiketten</value>
+                    <value>L7161 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11794,8 +10815,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7162 Laser-Etiketten</value>
+                    <value>L7162 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11806,8 +10826,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7163 Laser-Etiketten</value>
+                    <value>L7163 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11818,8 +10837,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7164 Laser-Etiketten</value>
+                    <value>L7164 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11830,8 +10848,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7165 Laser-Etiketten</value>
+                    <value>L7165 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11842,8 +10859,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7166 Laser-Etiketten</value>
+                    <value>L7166 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11854,8 +10870,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7167 Laser-Etiketten</value>
+                    <value>L7167 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11866,8 +10881,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7168 Laser-Etiketten</value>
+                    <value>L7168 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11878,8 +10892,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7169 Laser-Etiketten</value>
+                    <value>L7169 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11890,8 +10903,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7173 Laser-Etiketten</value>
+                    <value>L7173 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11902,8 +10914,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7651 Laser-Etiketten</value>
+                    <value>L7651 Laser-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11914,8 +10925,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-10 Etiketten Register - Etikettenbogen 10</value>
+                    <value>L7410-10 Etiketten Register - Etikettenbogen 10</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11926,8 +10936,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-10 Etiketten Register - Inhaltsblatt 10-t</value>
+                    <value>L7410-10 Etiketten Register - Inhaltsblatt 10-t</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11938,8 +10947,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-12 Etiketten Register - Etikettenbogen 12</value>
+                    <value>L7410-12 Etiketten Register - Etikettenbogen 12</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11950,8 +10958,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-12 Etiketten Register - Inhaltsblatt 12-t</value>
+                    <value>L7410-12 Etiketten Register - Inhaltsblatt 12-t</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11962,8 +10969,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-5 Etiketten Register - Etikettenbogen 5-t</value>
+                    <value>L7410-5 Etiketten Register - Etikettenbogen 5-t</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11974,8 +10980,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7410-5 Etiketten Register - Inhaltsblatt 5-tei</value>
+                    <value>L7410-5 Etiketten Register - Inhaltsblatt 5-tei</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11986,8 +10991,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-10 Zahlen Register - Inhaltsblatt 1-10</value>
+                    <value>L7411-10 Zahlen Register - Inhaltsblatt 1-10</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -11998,8 +11002,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-12 Zahlen Register - Inhaltsblatt 1-12</value>
+                    <value>L7411-12 Zahlen Register - Inhaltsblatt 1-12</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12010,8 +11013,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-15 Zahlen Register - Inhaltsblatt 1-15</value>
+                    <value>L7411-15 Zahlen Register - Inhaltsblatt 1-15</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12022,8 +11024,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-20 Zahlen Register - Inhaltsblatt 1-20</value>
+                    <value>L7411-20 Zahlen Register - Inhaltsblatt 1-20</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12034,8 +11035,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-31 Zahlen Register - Inhaltsblatt 1-31</value>
+                    <value>L7411-31 Zahlen Register - Inhaltsblatt 1-31</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12046,8 +11046,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-5 Zahlen Register - Inhaltsblatt 1-5</value>
+                    <value>L7411-5 Zahlen Register - Inhaltsblatt 1-5</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12058,8 +11057,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-AZ A-Z Register - Inhaltsblatt</value>
+                    <value>L7411-AZ A-Z Register - Inhaltsblatt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12070,8 +11068,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7411-JD Monats Register - Inhaltsblatt Jan - D</value>
+                    <value>L7411-JD Monats Register - Inhaltsblatt Jan - D</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12082,8 +11079,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-10 Einsteckschilder für Register 10-teilig</value>
+                    <value>L7412-10 Einsteckschilder für Register 10-teilig</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12094,8 +11090,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-12 Einsteckschilder für Register 12-teilig</value>
+                    <value>L7412-12 Einsteckschilder für Register 12-teilig</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12106,8 +11101,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">L7412-5 Einsteckschilder für Register 5-teilig</value>
+                    <value>L7412-5 Einsteckschilder für Register 5-teilig</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12118,8 +11112,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5129061 Trennstreifen </value>
+                    <value>5129061 Trennstreifen </value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12130,8 +11123,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3600 Computer-Etikett</value>
+                    <value>3600 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12142,8 +11134,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3601 Computer-Etikett</value>
+                    <value>3601 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12154,8 +11145,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3602 Computer-Etikett</value>
+                    <value>3602 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12166,8 +11156,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3603 Computer-Etikett</value>
+                    <value>3603 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12178,8 +11167,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3604 Computer-Etikett</value>
+                    <value>3604 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12190,8 +11178,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3605 Computer-Etikett</value>
+                    <value>3605 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12202,8 +11189,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3606 Computer-Etikett</value>
+                    <value>3606 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12214,8 +11200,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3607 Computer-Etikett</value>
+                    <value>3607 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12226,8 +11211,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3608 Computer-Etikett</value>
+                    <value>3608 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12238,8 +11222,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3609 Computer-Etikett</value>
+                    <value>3609 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12250,8 +11233,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3610 Computer-Etikett</value>
+                    <value>3610 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12262,8 +11244,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3611 Computer-Etikett</value>
+                    <value>3611 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12274,8 +11255,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3612 Computer-Etikett</value>
+                    <value>3612 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12286,8 +11266,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3613 Computer-Etikett</value>
+                    <value>3613 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12298,8 +11277,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3614 Computer-Etikett</value>
+                    <value>3614 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12310,8 +11288,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3615 Computer-Etikett</value>
+                    <value>3615 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12322,8 +11299,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3617 Computer-Etikett</value>
+                    <value>3617 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12334,8 +11310,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3620 Computer-Etikett</value>
+                    <value>3620 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12346,8 +11321,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3621 Computer-Etikett</value>
+                    <value>3621 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12358,8 +11332,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3623 Computer-Etikett</value>
+                    <value>3623 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12370,8 +11343,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3633 Computer-Etikett</value>
+                    <value>3633 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12382,8 +11354,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3634 Computer-Etikett, schnittgestanzt</value>
+                    <value>3634 Computer-Etikett, schnittgestanzt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12394,8 +11365,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3635 Computer-Etikett</value>
+                    <value>3635 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12406,8 +11376,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3643 Computer-Etikett</value>
+                    <value>3643 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12418,8 +11387,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3645 Computer-Etikett</value>
+                    <value>3645 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12430,8 +11398,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3646 Computer-Etikett</value>
+                    <value>3646 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12442,8 +11409,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3647 Computer-Etikett</value>
+                    <value>3647 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12454,8 +11420,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3648 Computer-Etikett, ablösbar</value>
+                    <value>3648 Computer-Etikett, ablösbar</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12466,8 +11431,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3674 Computer-Etikett</value>
+                    <value>3674 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12478,8 +11442,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3675 Computer-Etikett</value>
+                    <value>3675 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12490,8 +11453,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">3676 Computer-Etikett</value>
+                    <value>3676 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12502,8 +11464,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5100 Computer-Etikett</value>
+                    <value>5100 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12514,8 +11475,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5101 Computer-Etikett</value>
+                    <value>5101 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12526,8 +11486,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5103 Computer-Etikett</value>
+                    <value>5103 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12538,8 +11497,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5104 Computer-Etikett</value>
+                    <value>5104 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12550,8 +11508,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5105 Computer-Etikett</value>
+                    <value>5105 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12562,8 +11519,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5106 Computer-Etikett</value>
+                    <value>5106 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12574,8 +11530,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5107 Computer-Etikett</value>
+                    <value>5107 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12586,8 +11541,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5108 Computer-Etikett</value>
+                    <value>5108 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12598,8 +11552,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5109 Computer-Etikett</value>
+                    <value>5109 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12610,8 +11563,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5110 Computer-Etikett</value>
+                    <value>5110 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12622,8 +11574,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5111 Computer-Etikett</value>
+                    <value>5111 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12634,8 +11585,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5112 Computer-Etikett</value>
+                    <value>5112 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12646,8 +11596,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5121 Computer-Etikett</value>
+                    <value>5121 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12658,8 +11607,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5122 Computer-Etikett</value>
+                    <value>5122 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12670,8 +11618,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5123 Computer-Etikett</value>
+                    <value>5123 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12682,8 +11629,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5124 Computer-Etikett</value>
+                    <value>5124 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12694,8 +11640,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5130 Computer-Etikett</value>
+                    <value>5130 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12706,8 +11651,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5131 Computer-Etikett</value>
+                    <value>5131 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12718,8 +11662,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5132 Computer-Etikett</value>
+                    <value>5132 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12730,8 +11673,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5133 Computer-Etikett</value>
+                    <value>5133 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12742,8 +11684,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5137 Computer-Etikett</value>
+                    <value>5137 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12754,8 +11695,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5140 Computer-Etikett</value>
+                    <value>5140 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12766,8 +11706,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5141 Computer-Etikett</value>
+                    <value>5141 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12778,8 +11717,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5142 Computer-Etikett</value>
+                    <value>5142 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12790,8 +11728,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5143 Computer-Etikett</value>
+                    <value>5143 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12802,8 +11739,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5145 Computer-Etikett</value>
+                    <value>5145 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12814,8 +11750,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5146 Computer-Etikett</value>
+                    <value>5146 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12826,8 +11761,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5147 Computer-Etikett</value>
+                    <value>5147 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12838,8 +11772,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5160 Computer-Etikett</value>
+                    <value>5160 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12850,8 +11783,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5161 Computer-Etikett</value>
+                    <value>5161 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12862,8 +11794,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5162 Computer-Etikett</value>
+                    <value>5162 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12874,8 +11805,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5163 Computer-Etikett</value>
+                    <value>5163 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12886,8 +11816,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5164 Computer-Etikett</value>
+                    <value>5164 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12898,8 +11827,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5170 Computer-Etikett</value>
+                    <value>5170 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12910,8 +11838,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">5171 Computer-Etikett</value>
+                    <value>5171 Computer-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12925,8 +11852,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083200/6 Adressetikett</value>
+                    <value>083200/6 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12937,8 +11863,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083200/6 Adressetikett</value>
+                    <value>083200/6 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12949,8 +11874,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083203/0 Adressetikett</value>
+                    <value>083203/0 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12961,8 +11885,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083204/8 Adressetikett</value>
+                    <value>083204/8 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12973,8 +11896,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083205/5 Diskettenetikett</value>
+                    <value>083205/5 Diskettenetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12985,8 +11907,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083207/1 Adressetikett</value>
+                    <value>083207/1 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -12997,8 +11918,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083215/4 Diskettenetikett</value>
+                    <value>083215/4 Diskettenetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13009,8 +11929,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083216/2 CD-ROM-Etikett</value>
+                    <value>083216/2 CD-ROM-Etikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13021,8 +11940,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083217/0 Adressetikett</value>
+                    <value>083217/0 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13033,8 +11951,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083219/6 Adressetikett</value>
+                    <value>083219/6 Adressetikett</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13045,8 +11962,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083220/4 Adressetikett Laser</value>
+                    <value>083220/4 Adressetikett Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13057,8 +11973,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083221/2 Adressetikett Laser</value>
+                    <value>083221/2 Adressetikett Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13069,8 +11984,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083222/0 Adressetikett Laser</value>
+                    <value>083222/0 Adressetikett Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13081,8 +11995,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083224/6 Diskettenetikett Laser</value>
+                    <value>083224/6 Diskettenetikett Laser</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13093,8 +12006,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083230/3 Adressetikett Inkjet</value>
+                    <value>083230/3 Adressetikett Inkjet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13105,8 +12017,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083231/1 Adressetikett Inkjet</value>
+                    <value>083231/1 Adressetikett Inkjet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13117,8 +12028,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083234/5 Diskettenetikett Inkjet</value>
+                    <value>083234/5 Diskettenetikett Inkjet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13129,8 +12039,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083240/2 Adressetik. Laser+InkJet</value>
+                    <value>083240/2 Adressetik. Laser+InkJet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13141,8 +12050,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083244/4 Diskettenetik.Laser+InkJet</value>
+                    <value>083244/4 Diskettenetik.Laser+InkJet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13153,8 +12061,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083250/1 Adressetiketten</value>
+                    <value>083250/1 Adressetiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13165,8 +12072,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083251/9 Ordner-Etiketten, 8 cm</value>
+                    <value>083251/9 Ordner-Etiketten, 8 cm</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13177,8 +12083,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083252/7 Ordner-Etiketten, 5 cm</value>
+                    <value>083252/7 Ordner-Etiketten, 5 cm</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13189,8 +12094,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083253/5 Neonetiketten</value>
+                    <value>083253/5 Neonetiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13201,8 +12105,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083254/3 Transparente Etiketten</value>
+                    <value>083254/3 Transparente Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13213,8 +12116,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083255/0 Diskettenetiketten</value>
+                    <value>083255/0 Diskettenetiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13225,8 +12127,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">83256/8a Videoetiketten 0</value>
+                    <value>83256/8a Videoetiketten 0</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13237,8 +12138,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">83256/8b Videoetiketten 0</value>
+                    <value>83256/8b Videoetiketten 0</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13249,8 +12149,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083257/6 Diaetiketten</value>
+                    <value>083257/6 Diaetiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13261,8 +12160,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083258/4 Farbdruck-Etiketten</value>
+                    <value>083258/4 Farbdruck-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13273,8 +12171,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">502041/7 Visitenkarten</value>
+                    <value>502041/7 Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13285,8 +12182,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value>
-                    <value xml:lang="en-US">083271/7 Ordnerrückeneinsteckschilder</value>
+                    <value>083271/7 Ordnerrückeneinsteckschilder</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -13296,987 +12192,987 @@
         </node>
         <node oor:name="Herma A4" oor:op="replace">
 
-            <node oor:name="L0" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4093 SuperPrint CD-Etikett, gold</value></prop>
+            <node oor:name="L0" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4093 SuperPrint CD-Etikett, gold</value></prop>
                 <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-            <node oor:name="L1" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4094 SuperPrint CD-Etikett, silber</value></prop>
+            <node oor:name="L1" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4094 SuperPrint CD-Etikett, silber</value></prop>
                 <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-            <node oor:name="L2" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4097 SuperPrint Silberfolie</value></prop>
+            <node oor:name="L2" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4097 SuperPrint Silberfolie</value></prop>
                 <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-            <node oor:name="L3" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4098 SuperPrint Silberfolie</value></prop>
+            <node oor:name="L3" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4098 SuperPrint Silberfolie</value></prop>
                 <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-            <node oor:name="L4" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4099 SuperPrint Silberfolie</value></prop>
+            <node oor:name="L4" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4099 SuperPrint Silberfolie</value></prop>
                 <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-            <node oor:name="L5" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4100 SuperPrint Goldfolie</value></prop>
+            <node oor:name="L5" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4100 SuperPrint Goldfolie</value></prop>
                 <prop oor:name="Measure"><value>S;3302;1693;3048;1693;721;1303;6;16</value></prop></node>
-            <node oor:name="L6" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4101 SuperPrint Goldfolie</value></prop>
+            <node oor:name="L6" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4101 SuperPrint Goldfolie</value></prop>
                 <prop oor:name="Measure"><value>S;4318;1270;4318;1030;1864;1000;4;22</value></prop></node>
-            <node oor:name="L7" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4102 SuperPrint Goldfolie</value></prop>
+            <node oor:name="L7" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4102 SuperPrint Goldfolie</value></prop>
                 <prop oor:name="Measure"><value>S;4830;2540;4830;2540;840;880;4;11</value></prop></node>
-            <node oor:name="L8" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4103 SuperPrint Goldfolie</value></prop>
+            <node oor:name="L8" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4103 SuperPrint Goldfolie</value></prop>
                 <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-            <node oor:name="L9" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4104 SuperPrint Goldfolie</value></prop>
+            <node oor:name="L9" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4104 SuperPrint Goldfolie</value></prop>
                 <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L10" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4105 SuperPrint Goldfolie, Kreise 60 mm</value></prop>
+<node oor:name="L10" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4105 SuperPrint Goldfolie, Kreise 60 mm</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L11" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4106 SuperPrint Goldfolie, oval</value></prop>
+<node oor:name="L11" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4106 SuperPrint Goldfolie, oval</value></prop>
     <prop oor:name="Measure"><value>S;6350;4656;5842;4233;1229;1093;3;6</value></prop></node>
-<node oor:name="L12" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4107 SuperPrint Goldfolie, A4</value></prop>
+<node oor:name="L12" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4107 SuperPrint Goldfolie, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L13" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4108 SuperPrint Goldfolie</value></prop>
+<node oor:name="L13" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4108 SuperPrint Goldfolie</value></prop>
     <prop oor:name="Measure"><value>S;2794;1000;2540;1000;848;1350;7;27</value></prop></node>
-<node oor:name="L14" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4109 SuperPrint Goldfolie, oval</value></prop>
+<node oor:name="L14" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4109 SuperPrint Goldfolie, oval</value></prop>
     <prop oor:name="Measure"><value>S;4572;2963;4064;2540;1610;1727;4;9</value></prop></node>
-<node oor:name="L15" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4110 SuperPrint Silberfolie</value></prop>
+<node oor:name="L15" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4110 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;3302;1693;3048;1693;721;1303;6;16</value></prop></node>
-<node oor:name="L16" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4111 SuperPrint Silberfolie</value></prop>
+<node oor:name="L16" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4111 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;4318;1270;4318;1030;1864;1000;4;22</value></prop></node>
-<node oor:name="L17" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4112 SuperPrint Silberfolie</value></prop>
+<node oor:name="L17" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4112 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L18" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4113 SuperPrint Silberfolie</value></prop>
+<node oor:name="L18" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4113 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L19" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4114 SuperPrint Silberfolie</value></prop>
+<node oor:name="L19" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4114 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L20" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4115 SuperPrint Silberfolie, Kreise 60 mm</value></prop>
+<node oor:name="L20" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4115 SuperPrint Silberfolie, Kreise 60 mm</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L21" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4116 SuperPrint Silberfolie, oval</value></prop>
+<node oor:name="L21" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4116 SuperPrint Silberfolie, oval</value></prop>
     <prop oor:name="Measure"><value>S;6350;4656;5842;4233;1229;1093;3;6</value></prop></node>
-<node oor:name="L22" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4117 SuperPrint Silberfolie, A4</value></prop>
+<node oor:name="L22" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4117 SuperPrint Silberfolie, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L23" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4118 SuperPrint Silberfolie</value></prop>
+<node oor:name="L23" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4118 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;2794;1000;2540;1000;848;1350;7;27</value></prop></node>
-<node oor:name="L24" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4119 SuperPrint Silberfolie</value></prop>
+<node oor:name="L24" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4119 SuperPrint Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;6604;1693;6350;1693;721;1303;3;16</value></prop></node>
-<node oor:name="L25" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4200 SuperPrint weiß</value></prop>
+<node oor:name="L25" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4200 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4830;3387;4830;3387;840;1302;4;8</value></prop></node>
-<node oor:name="L26" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4201 SuperPrint Sichtreiteretiketten, weiß</value></prop>
+<node oor:name="L26" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4201 SuperPrint Sichtreiteretiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;1693;4572;1693;975;1306;4;16</value></prop></node>
-<node oor:name="L27" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4202 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L27" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4202 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;6604;847;6350;847;721;1298;3;32</value></prop></node>
-<node oor:name="L28" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4203 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L28" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4203 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656;6350;4656;721;882;3;6</value></prop></node>
-<node oor:name="L29" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4204 SuperPrint 3,5"-Disketten, gelb</value></prop>
+<node oor:name="L29" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4204 SuperPrint 3,5"-Disketten, gelb</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L30" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4205 SuperPrint 3,5"-Disketten, rot</value></prop>
+<node oor:name="L30" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4205 SuperPrint 3,5"-Disketten, rot</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L31" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4206 SuperPrint 3,5"-Disketten, blau</value></prop>
+<node oor:name="L31" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4206 SuperPrint 3,5"-Disketten, blau</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L32" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4207 SuperPrint 3,5"-Disketten, grün</value></prop>
+<node oor:name="L32" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4207 SuperPrint 3,5"-Disketten, grün</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L33" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4208 SuperPrint Musik-Cassetten, weiß</value></prop>
+<node oor:name="L33" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4208 SuperPrint Musik-Cassetten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9154;4233;8900;4233;1475;2150;2;6</value></prop></node>
-<node oor:name="L34" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4209 SuperPrint weiß, z.B. für Regalbeschriftung, ablösbar</value></prop>
+<node oor:name="L34" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4209 SuperPrint weiß, z.B. für Regalbeschriftung, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;9854;1693;9600;1693;773;1306;2;16</value></prop></node>
-<node oor:name="L35" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4210 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L35" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4210 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;3810;1270;3810;1270;975;880;5;22</value></prop></node>
-<node oor:name="L36" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4211 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L36" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4211 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;2794;1693;2540;1693;848;1306;7;16</value></prop></node>
-<node oor:name="L37" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4212 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L37" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4212 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;3810;2120;3810;2120;975;1070;5;13</value></prop></node>
-<node oor:name="L38" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4226 SuperPrint weiß, deckend</value></prop>
+<node oor:name="L38" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4226 SuperPrint weiß, deckend</value></prop>
     <prop oor:name="Measure"><value>S;4826;1693;4826;1693;848;1306;4;16</value></prop></node>
-<node oor:name="L39" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4227 SuperPrint weiß, deckend</value></prop>
+<node oor:name="L39" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4227 SuperPrint weiß, deckend</value></prop>
     <prop oor:name="Measure"><value>S;6460;3387;6460;3387;810;1303;3;8</value></prop></node>
-<node oor:name="L40" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4228 SuperPrint weiß, deckend</value></prop>
+<node oor:name="L40" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4228 SuperPrint weiß, deckend</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2151;2;6</value></prop></node>
-<node oor:name="L41" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4229 SuperPrint weiß, deckend</value></prop>
+<node oor:name="L41" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4229 SuperPrint weiß, deckend</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L42" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4230 SuperPrint weiß, deckend</value></prop>
+<node oor:name="L42" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4230 SuperPrint weiß, deckend</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L43" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4232 SuperPrint Sicherheits-/Verschlussetiketten, weiß</value></prop>
+<node oor:name="L43" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4232 SuperPrint Sicherheits-/Verschlussetiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L44" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4233 SuperPrint Sicherheits-/Verschlussetiketten, weiß</value></prop>
+<node oor:name="L44" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4233 SuperPrint Sicherheits-/Verschlussetiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L45" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4234 SuperPrint Sicherheits-/Verschlussetiketten, weiß</value></prop>
+<node oor:name="L45" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4234 SuperPrint Sicherheits-/Verschlussetiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4600;4600;4000;4000;1600;1350;4;6</value></prop></node>
-<node oor:name="L46" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4249 SuperPrint weiß</value></prop>
+<node oor:name="L46" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4249 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;19960;14350;19960;14350;520;500;1;2</value></prop></node>
-<node oor:name="L47" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4250 SuperPrint weiß</value></prop>
+<node oor:name="L47" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4250 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10190;13900;9910;13900;450;950;2;2</value></prop></node>
-<node oor:name="L48" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4252 SuperPrint weiß</value></prop>
+<node oor:name="L48" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4252 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;19960;28910;19960;28910;520;395;1;1</value></prop></node>
-<node oor:name="L49" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4256 SuperPrint gelb</value></prop>
+<node oor:name="L49" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4256 SuperPrint gelb</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L50" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4257 SuperPrint rot</value></prop>
+<node oor:name="L50" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4257 SuperPrint rot</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L51" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4258 SuperPrint blau</value></prop>
+<node oor:name="L51" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4258 SuperPrint blau</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L52" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4259 SuperPrint grün</value></prop>
+<node oor:name="L52" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4259 SuperPrint grün</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L53" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4262 SuperPrint weiß</value></prop>
+<node oor:name="L53" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4262 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6460;3387;6460;3387;810;1303;3;8</value></prop></node>
-<node oor:name="L54" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4263 SuperPrint weiß</value></prop>
+<node oor:name="L54" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4263 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3387;7000;3387;0;1303;3;8</value></prop></node>
-<node oor:name="L55" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4264 SuperPrint weiß</value></prop>
+<node oor:name="L55" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4264 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;3387;10500;3387;0;1303;2;8</value></prop></node>
-<node oor:name="L56" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4265 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L56" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4265 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656;6350;4656;721;882;3;6</value></prop></node>
-<node oor:name="L57" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4266 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L57" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4266 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;7200;6350;7200;721;450;3;4</value></prop></node>
-<node oor:name="L58" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4267 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L58" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4267 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3387;9906;3387;467;1303;2;8</value></prop></node>
-<node oor:name="L59" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4268 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L59" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4268 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;5700;9906;5700;467;600;2;5</value></prop></node>
-<node oor:name="L60" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4269 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L60" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4269 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L61" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4270 SuperPrint weiß</value></prop>
+<node oor:name="L61" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4270 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;3810;2120;3810;2120;975;1070;5;13</value></prop></node>
-<node oor:name="L62" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4271 SuperPrint weiß</value></prop>
+<node oor:name="L62" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4271 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;1693;4826;1693;848;1306;4;16</value></prop></node>
-<node oor:name="L63" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4272 SuperPrint weiß</value></prop>
+<node oor:name="L63" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4272 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L64" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4273 SuperPrint weiß</value></prop>
+<node oor:name="L64" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4273 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;5250;2120;5250;2120;0;0;4;14</value></prop></node>
-<node oor:name="L65" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4275 SuperPrint weiß</value></prop>
+<node oor:name="L65" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4275 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;2540;6600;2540;600;880;3;11</value></prop></node>
-<node oor:name="L66" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4278 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L66" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4278 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;5080;7000;5080;0;2150;3;5</value></prop></node>
-<node oor:name="L67" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4279 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L67" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4279 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;6773;7000;6773;0;1303;3;4</value></prop></node>
-<node oor:name="L68" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4280 SuperPrint weiß</value></prop>
+<node oor:name="L68" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4280 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;6773;9652;6773;848;1303;2;4</value></prop></node>
-<node oor:name="L69" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4281 SuperPrint weiß</value></prop>
+<node oor:name="L69" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4281 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;5080;10500;5080;0;2150;2;5</value></prop></node>
-<node oor:name="L70" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4282 SuperPrint weiß, A5</value></prop>
+<node oor:name="L70" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4282 SuperPrint weiß, A5</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L71" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4283 SuperPrint für schmale Ordner, weiß</value></prop>
+<node oor:name="L71" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4283 SuperPrint für schmale Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L72" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4284 SuperPrint für breite Ordner, weiß</value></prop>
+<node oor:name="L72" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4284 SuperPrint für breite Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L73" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4290 SuperPrint für schmale Ordner, weiß</value></prop>
+<node oor:name="L73" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4290 SuperPrint für schmale Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;3400;19200;3400;900;1250;1;8</value></prop></node>
-<node oor:name="L74" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4291 SuperPrint für breite Ordner, weiß</value></prop>
+<node oor:name="L74" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4291 SuperPrint für breite Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;5900;19200;5900;900;3050;1;4</value></prop></node>
-<node oor:name="L75" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4292 SuperPrint für schmale Ordner, gelb</value></prop>
+<node oor:name="L75" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4292 SuperPrint für schmale Ordner, gelb</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L76" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4293 SuperPrint für schmale Ordner, rot</value></prop>
+<node oor:name="L76" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4293 SuperPrint für schmale Ordner, rot</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L77" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4294 SuperPrint für schmale Ordner, blau</value></prop>
+<node oor:name="L77" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4294 SuperPrint für schmale Ordner, blau</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L78" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4295 SuperPrint für schmale Ordner, grün</value></prop>
+<node oor:name="L78" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4295 SuperPrint für schmale Ordner, grün</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L79" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4296 SuperPrint für breite Ordner, gelb</value></prop>
+<node oor:name="L79" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4296 SuperPrint für breite Ordner, gelb</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L80" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4297 SuperPrint für breite Ordner, rot</value></prop>
+<node oor:name="L80" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4297 SuperPrint für breite Ordner, rot</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L81" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4298 SuperPrint für breite Ordner, blau</value></prop>
+<node oor:name="L81" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4298 SuperPrint für breite Ordner, blau</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L82" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4299 SuperPrint für breite Ordner, grün</value></prop>
+<node oor:name="L82" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4299 SuperPrint für breite Ordner, grün</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L83" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4333 SuperPrint weiß </value></prop>
+<node oor:name="L83" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4333 SuperPrint weiß </value></prop>
     <prop oor:name="Measure"><value>S;2794;1000;2540;1000;848;1350;7;27</value></prop></node>
-<node oor:name="L84" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4334 SuperPrint weiß </value></prop>
+<node oor:name="L84" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4334 SuperPrint weiß </value></prop>
     <prop oor:name="Measure"><value>S;2794;1693;2540;1693;848;1306;7;16</value></prop></node>
-<node oor:name="L85" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4336 SuperPrint weiß </value></prop>
+<node oor:name="L85" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4336 SuperPrint weiß </value></prop>
     <prop oor:name="Measure"><value>S;3810;1693;3556;1693;1102;1306;5;16</value></prop></node>
-<node oor:name="L86" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4343 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L86" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4343 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;2041;1000;1780;1000;425,5;1350;10;27</value></prop></node>
-<node oor:name="L87" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4344 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L87" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4344 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;2794;1000;2540;1000;848;1350;7;27</value></prop></node>
-<node oor:name="L88" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4345 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L88" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4345 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;3810;1693;3556;1693;1102;1306;5;16</value></prop></node>
-<node oor:name="L89" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4346 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L89" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4346 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L90" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4347 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L90" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4347 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L91" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4348 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L91" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4348 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;9854;4233;9600;4233;773;2150;2;6</value></prop></node>
-<node oor:name="L92" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4349 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L92" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4349 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L93" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4350 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L93" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4350 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;9854;6350;9600;6350;773;2150;2;4</value></prop></node>
-<node oor:name="L94" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4351 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L94" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4351 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L95" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4352 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L95" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4352 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L96" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4353 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L96" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4353 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L97" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4354 SuperPrint 3,5"-Disketten, farbig sortiert</value></prop>
+<node oor:name="L97" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4354 SuperPrint 3,5"-Disketten, farbig sortiert</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L98" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4355 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L98" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4355 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;6773;7000;6773;2500;1304;2;4</value></prop></node>
-<node oor:name="L99" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4356 SuperPrint 3,5"-Disketten, farbig sortiert</value></prop>
+<node oor:name="L99" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4356 SuperPrint 3,5"-Disketten, farbig sortiert</value></prop>
     <prop oor:name="Measure"><value>S;9000;6773;7000;6773;2500;1304;2;4</value></prop></node>
-<node oor:name="L100" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4357 SuperPrint weiß</value></prop>
+<node oor:name="L100" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4357 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4850;2540;4850;2540;800;2150;4;10</value></prop></node>
-<node oor:name="L101" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4358 SuperPrint Oval, weiß, ablösbar</value></prop>
+<node oor:name="L101" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4358 SuperPrint Oval, weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656,7;6350;4233;721;1093;3;6</value></prop></node>
-<node oor:name="L102" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4359 SuperPrint weiß</value></prop>
+<node oor:name="L102" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4359 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;6773;9652;6773;848;1303;2;4</value></prop></node>
-<node oor:name="L103" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4360 SuperPrint weiß</value></prop>
+<node oor:name="L103" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4360 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3600;7000;3600;0;450;3;8</value></prop></node>
-<node oor:name="L104" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4361 SuperPrint weiß</value></prop>
+<node oor:name="L104" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4361 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4125;7000;4125;0;412,5;3;7</value></prop></node>
-<node oor:name="L105" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4362 SuperPrint weiß</value></prop>
+<node oor:name="L105" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4362 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4125;10500;4125;0;412,5;2;7</value></prop></node>
-<node oor:name="L106" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4363 SuperPrint weiß</value></prop>
+<node oor:name="L106" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4363 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4800;10500;4800;0;450;2;6</value></prop></node>
-<node oor:name="L107" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4364 SuperPrint weiß</value></prop>
+<node oor:name="L107" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4364 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;14400;10500;14400;0;450;2;2</value></prop></node>
-<node oor:name="L108" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4366 SuperPrint gelb, Ecken abgerundet</value></prop>
+<node oor:name="L108" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4366 SuperPrint gelb, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L109" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4367 SuperPrint rot, Ecken abgerundet</value></prop>
+<node oor:name="L109" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4367 SuperPrint rot, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L110" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4368 SuperPrint blau, Ecken abgerundet</value></prop>
+<node oor:name="L110" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4368 SuperPrint blau, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L111" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4369 SuperPrint grün, Ecken abgerundet</value></prop>
+<node oor:name="L111" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4369 SuperPrint grün, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L112" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4373 SuperPrint CD-Cover, weiß</value></prop>
+<node oor:name="L112" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4373 SuperPrint CD-Cover, weiß</value></prop>
     <prop oor:name="Measure"><value>S;12150;14550;12150;11750;4425;1700;1;2</value></prop></node>
-<node oor:name="L113" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4374 SuperPrint CD-Etikett, transparente Folie</value></prop>
+<node oor:name="L113" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4374 SuperPrint CD-Etikett, transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L114" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4375 SuperPrint transparente Folie</value></prop>
+<node oor:name="L114" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4375 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L115" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4376 SuperPrint transparente Folie</value></prop>
+<node oor:name="L115" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4376 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L116" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4377 SuperPrint witterungsbeständig, weiß</value></prop>
+<node oor:name="L116" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4377 SuperPrint witterungsbeständig, weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L117" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4378 SuperPrint witterungsbeständig, weiß</value></prop>
+<node oor:name="L117" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4378 SuperPrint witterungsbeständig, weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L118" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4379 SuperPrint witterungsbeständig, weiß</value></prop>
+<node oor:name="L118" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4379 SuperPrint witterungsbeständig, weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L119" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4380 SuperPrint Oval, weiß</value></prop>
+<node oor:name="L119" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4380 SuperPrint Oval, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4572;2963;4064;2540;1610;1727;4;9</value></prop></node>
-<node oor:name="L120" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4385 SuperPrint Kreise 10 mm, weiß, ablösbar</value></prop>
+<node oor:name="L120" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4385 SuperPrint Kreise 10 mm, weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;1270;1270;1000;1000;1110;1650;15;21</value></prop></node>
-<node oor:name="L121" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4386 SuperPrint Kreise 20 mm, weiß, ablösbar</value></prop>
+<node oor:name="L121" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4386 SuperPrint Kreise 20 mm, weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;2254;2254;2000;2000;1611;1453;8;12</value></prop></node>
-<node oor:name="L122" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4387 SuperPrint Kreise 30 mm, weiß</value></prop>
+<node oor:name="L122" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4387 SuperPrint Kreise 30 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3254;3254;3000;3000;865;1961;6;8</value></prop></node>
-<node oor:name="L123" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4388 SuperPrint Tiefkühletiketten, weiß</value></prop>
+<node oor:name="L123" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4388 SuperPrint Tiefkühletiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3810;2120;3810;2120;975;1070;5;13</value></prop></node>
-<node oor:name="L124" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4389 SuperPrint Tiefkühletiketten, weiß</value></prop>
+<node oor:name="L124" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4389 SuperPrint Tiefkühletiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L125" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4390 SuperPrint weiß</value></prop>
+<node oor:name="L125" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4390 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L126" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4391 SuperPrint weiß</value></prop>
+<node oor:name="L126" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4391 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L127" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4392 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L127" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4392 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;5250;2970;5250;2970;0;0;4;10</value></prop></node>
-<node oor:name="L128" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4393 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L128" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4393 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;10500;4125;10500;4125;0;412,5;2;7</value></prop></node>
-<node oor:name="L129" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4394 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L129" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4394 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;10500;14400;10500;14400;0;450;2;2</value></prop></node>
-<node oor:name="L130" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4396 SuperPrint gelb, A6</value></prop>
+<node oor:name="L130" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4396 SuperPrint gelb, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L131" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4397 SuperPrint rot, A6</value></prop>
+<node oor:name="L131" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4397 SuperPrint rot, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L132" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4398 SuperPrint blau, A6</value></prop>
+<node oor:name="L132" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4398 SuperPrint blau, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L133" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4399 SuperPrint grün, A6</value></prop>
+<node oor:name="L133" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4399 SuperPrint grün, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L134" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4401 SuperPrint gelb, A4</value></prop>
+<node oor:name="L134" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4401 SuperPrint gelb, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L135" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4402 SuperPrint rot, A4</value></prop>
+<node oor:name="L135" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4402 SuperPrint rot, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L136" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4403 SuperPrint blau, A4</value></prop>
+<node oor:name="L136" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4403 SuperPrint blau, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L137" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4404 SuperPrint grün, A4</value></prop>
+<node oor:name="L137" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4404 SuperPrint grün, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L138" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4406 SuperPrint gelb</value></prop>
+<node oor:name="L138" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4406 SuperPrint gelb</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L139" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4407 SuperPrint rot</value></prop>
+<node oor:name="L139" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4407 SuperPrint rot</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L140" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4408 SuperPrint blau</value></prop>
+<node oor:name="L140" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4408 SuperPrint blau</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L141" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4409 SuperPrint grün</value></prop>
+<node oor:name="L141" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4409 SuperPrint grün</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L142" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4414 SuperPrint weiß</value></prop>
+<node oor:name="L142" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4414 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3600;7000;3600;0;450;3;8</value></prop></node>
-<node oor:name="L143" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4415 SuperPrint weiß</value></prop>
+<node oor:name="L143" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4415 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4125;7000;4125;0;412,5;3;7</value></prop></node>
-<node oor:name="L144" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4416 SuperPrint weiß</value></prop>
+<node oor:name="L144" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4416 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4125;10500;4125;0;412,5;2;7</value></prop></node>
-<node oor:name="L145" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4417 SuperPrint weiß</value></prop>
+<node oor:name="L145" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4417 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4800;10500;4800;0;450;2;6</value></prop></node>
-<node oor:name="L146" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4418 SuperPrint Namensetiketten Acetatseide, rot</value></prop>
+<node oor:name="L146" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4418 SuperPrint Namensetiketten Acetatseide, rot</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L147" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4419 SuperPrint Namensetiketten Acetatseide, blau</value></prop>
+<node oor:name="L147" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4419 SuperPrint Namensetiketten Acetatseide, blau</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L148" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4421 SuperPrint gelb</value></prop>
+<node oor:name="L148" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4421 SuperPrint gelb</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L149" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4422 SuperPrint rot</value></prop>
+<node oor:name="L149" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4422 SuperPrint rot</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L150" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4423 SuperPrint blau</value></prop>
+<node oor:name="L150" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4423 SuperPrint blau</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L151" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4424 SuperPrint grün</value></prop>
+<node oor:name="L151" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4424 SuperPrint grün</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L152" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4425 SuperPrint weiß</value></prop>
+<node oor:name="L152" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4425 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;5700;10500;5700;0;600;2;5</value></prop></node>
-<node oor:name="L153" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4426 SuperPrint weiß</value></prop>
+<node oor:name="L153" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4426 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;7000;10500;7000;0;850;2;4</value></prop></node>
-<node oor:name="L154" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4427 SuperPrint weiß</value></prop>
+<node oor:name="L154" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4427 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;3500;10500;3500;0;850;2;8</value></prop></node>
-<node oor:name="L155" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4428 SuperPrint weiß, A4</value></prop>
+<node oor:name="L155" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4428 SuperPrint weiß, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L156" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4429 SuperPrint weiß</value></prop>
+<node oor:name="L156" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4429 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3500;7000;3500;0;850;3;8</value></prop></node>
-<node oor:name="L157" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4450 SuperPrint weiß</value></prop>
+<node oor:name="L157" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4450 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3200;7000;3200;0;450;3;9</value></prop></node>
-<node oor:name="L158" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4451 SuperPrint weiß</value></prop>
+<node oor:name="L158" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4451 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4125;7000;4125;0;412,5;3;7</value></prop></node>
-<node oor:name="L159" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4452 SuperPrint weiß</value></prop>
+<node oor:name="L159" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4452 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4125;10500;4125;0;412,5;2;7</value></prop></node>
-<node oor:name="L160" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4453 SuperPrint weiß</value></prop>
+<node oor:name="L160" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4453 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3600;7000;3600;0;450;3;8</value></prop></node>
-<node oor:name="L161" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4454 SuperPrint weiß</value></prop>
+<node oor:name="L161" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4454 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;14400;10500;14400;0;450;2;2</value></prop></node>
-<node oor:name="L162" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4455 SuperPrint weiß</value></prop>
+<node oor:name="L162" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4455 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;2540;7000;2540;0;880;3;11</value></prop></node>
-<node oor:name="L163" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4456 SuperPrint weiß</value></prop>
+<node oor:name="L163" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4456 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;2970;7000;2970;0;0;3;10</value></prop></node>
-<node oor:name="L164" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4457 SuperPrint weiß</value></prop>
+<node oor:name="L164" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4457 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4800;10500;4800;0;450;2;6</value></prop></node>
-<node oor:name="L165" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4458 SuperPrint weiß</value></prop>
+<node oor:name="L165" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4458 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;20000;29700;20000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L166" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4459 SuperPrint weiß</value></prop>
+<node oor:name="L166" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4459 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;1693;7000;1693;0;460;3;17</value></prop></node>
-<node oor:name="L167" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4461 SuperPrint weiß</value></prop>
+<node oor:name="L167" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4461 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;5250;2970;5250;2970;0;0;4;10</value></prop></node>
-<node oor:name="L168" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4462 SuperPrint weiß</value></prop>
+<node oor:name="L168" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4462 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L169" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4464 SuperPrint weiß</value></prop>
+<node oor:name="L169" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4464 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L170" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4465 SuperPrint transparente Folie</value></prop>
+<node oor:name="L170" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4465 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L171" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4466 SuperPrint gelb</value></prop>
+<node oor:name="L171" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4466 SuperPrint gelb</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L172" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4467 SuperPrint rot</value></prop>
+<node oor:name="L172" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4467 SuperPrint rot</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L173" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4468 SuperPrint blau</value></prop>
+<node oor:name="L173" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4468 SuperPrint blau</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L174" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4469 SuperPrint grün</value></prop>
+<node oor:name="L174" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4469 SuperPrint grün</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L175" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4470 SuperPrint weiß</value></prop>
+<node oor:name="L175" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4470 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;7425;10500;7425;0;0;2;4</value></prop></node>
-<node oor:name="L176" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4471 SuperPrint CD-Etikett, weiß</value></prop>
+<node oor:name="L176" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4471 SuperPrint CD-Etikett, weiß</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L177" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4472 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L177" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4472 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;8128;13970;7874;13970;2499;880;2;2</value></prop></node>
-<node oor:name="L178" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4473 SuperPrint weiß</value></prop>
+<node oor:name="L178" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4473 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4100;7000;4100;0;500;3;7</value></prop></node>
-<node oor:name="L179" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4474 SuperPrint weiß</value></prop>
+<node oor:name="L179" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4474 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4850;2540;4850;2540;800;2150;4;10</value></prop></node>
-<node oor:name="L180" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4475 SuperPrint weiß</value></prop>
+<node oor:name="L180" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4475 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4100;10500;4100;0;500;2;7</value></prop></node>
-<node oor:name="L181" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4476 SuperPrint Kreise 40 mm, weiß</value></prop>
+<node oor:name="L181" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4476 SuperPrint Kreise 40 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4600;4600;4000;4000;1600;1350;4;6</value></prop></node>
-<node oor:name="L182" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4477 SuperPrint Kreise 60 mm, weiß</value></prop>
+<node oor:name="L182" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4477 SuperPrint Kreise 60 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L183" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4478 SuperPrint Kreise 85 mm, weiß</value></prop>
+<node oor:name="L183" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4478 SuperPrint Kreise 85 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9500;9500;8500;8500;1500;1100;2;3</value></prop></node>
-<node oor:name="L184" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4479 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L184" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4479 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;8890;3387;1229;1303;2;8</value></prop></node>
-<node oor:name="L185" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4606 SuperPrint weiß</value></prop>
+<node oor:name="L185" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4606 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;3810;2120;3810;2120;975;1070;5;13</value></prop></node>
-<node oor:name="L186" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4607 SuperPrint weiß</value></prop>
+<node oor:name="L186" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4607 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;1693;4826;1693;848;1306;4;16</value></prop></node>
-<node oor:name="L187" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4608 SuperPrint weiß</value></prop>
+<node oor:name="L187" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4608 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L188" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4609 SuperPrint weiß</value></prop>
+<node oor:name="L188" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4609 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;5250;2120;5250;2120;0;0;4;14</value></prop></node>
-<node oor:name="L189" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4610 SuperPrint weiß</value></prop>
+<node oor:name="L189" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4610 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;5250;2970;5250;2970;0;0;4;10</value></prop></node>
-<node oor:name="L190" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4611 SuperPrint weiß</value></prop>
+<node oor:name="L190" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4611 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;1693;7000;1693;0;460;3;17</value></prop></node>
-<node oor:name="L191" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4612 SuperPrint weiß</value></prop>
+<node oor:name="L191" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4612 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;2970;7000;2970;0;0;3;10</value></prop></node>
-<node oor:name="L192" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4613 SuperPrint weiß</value></prop>
+<node oor:name="L192" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4613 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;2540;6600;2540;600;880;3;11</value></prop></node>
-<node oor:name="L193" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4614 SuperPrint weiß</value></prop>
+<node oor:name="L193" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4614 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L194" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4615 SuperPrint weiß</value></prop>
+<node oor:name="L194" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4615 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L195" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4616 SuperPrint weiß</value></prop>
+<node oor:name="L195" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4616 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4243;7000;4243;0;0;3;7</value></prop></node>
-<node oor:name="L196" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4617 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L196" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4617 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;6773;7000;6773;0;1303;3;4</value></prop></node>
-<node oor:name="L197" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4618 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L197" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4618 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;5080;7000;5080;0;2150;3;5</value></prop></node>
-<node oor:name="L198" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4619 SuperPrint weiß</value></prop>
+<node oor:name="L198" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4619 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;9652;3387;848;1303;2;8</value></prop></node>
-<node oor:name="L199" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4620 SuperPrint weiß</value></prop>
+<node oor:name="L199" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4620 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;3712,5;10500;3712,5;0;0;2;8</value></prop></node>
-<node oor:name="L200" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4623 SuperPrint weiß</value></prop>
+<node oor:name="L200" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4623 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2151;2;6</value></prop></node>
-<node oor:name="L201" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4624 SuperPrint weiß</value></prop>
+<node oor:name="L201" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4624 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;6773;9652;6773;848;1303;2;4</value></prop></node>
-<node oor:name="L202" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4625 SuperPrint weiß</value></prop>
+<node oor:name="L202" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4625 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L203" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4626 SuperPrint weiß</value></prop>
+<node oor:name="L203" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4626 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;7425;10500;7425;0;0;2;4</value></prop></node>
-<node oor:name="L204" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4627 SuperPrint weiß, A6</value></prop>
+<node oor:name="L204" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4627 SuperPrint weiß, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L205" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4628 SuperPrint weiß, A5</value></prop>
+<node oor:name="L205" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4628 SuperPrint weiß, A5</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L206" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4629 SuperPrint weiß</value></prop>
+<node oor:name="L206" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4629 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;5080;10500;5080;0;2150;2;5</value></prop></node>
-<node oor:name="L207" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4631 SuperPrint weiß</value></prop>
+<node oor:name="L207" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4631 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L208" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4654 SuperPrint weiß</value></prop>
+<node oor:name="L208" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4654 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;3900;10500;3900;0;1200;2;7</value></prop></node>
-<node oor:name="L209" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4664 SuperPrint Lohnsteueretikett,perforiert mit Klebestreifen, weiß </value></prop>
+<node oor:name="L209" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4664 SuperPrint Lohnsteueretikett,perforiert mit Klebestreifen, weiß </value></prop>
     <prop oor:name="Measure"><value>S;10500;3900;10500;3900;0;1200;2;7</value></prop></node>
-<node oor:name="L210" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4666 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L210" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4666 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;880;2;6</value></prop></node>
-<node oor:name="L211" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4667 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L211" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4667 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L212" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4668 SuperPrint weiß</value></prop>
+<node oor:name="L212" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4668 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4243;7000;4243;0;0;3;7</value></prop></node>
-<node oor:name="L213" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4669 SuperPrint weiß</value></prop>
+<node oor:name="L213" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4669 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L214" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4670 SuperPrint weiß</value></prop>
+<node oor:name="L214" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4670 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L215" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4672 SuperPrint weiß</value></prop>
+<node oor:name="L215" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4672 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;9652;3387;848;1303;2;8</value></prop></node>
-<node oor:name="L216" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4674 SuperPrint weiß</value></prop>
+<node oor:name="L216" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4674 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L217" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4676 SuperPrint weiß, A6</value></prop>
+<node oor:name="L217" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4676 SuperPrint weiß, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L218" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4677 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L218" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4677 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L219" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4678 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L219" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4678 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3810;9906;3810;467;1515;2;7</value></prop></node>
-<node oor:name="L220" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4680 SuperPrint transparente Folie</value></prop>
+<node oor:name="L220" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4680 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L221" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4681 SuperPrint transparente Folie</value></prop>
+<node oor:name="L221" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4681 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L222" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4682 SuperPrint transparente Folie</value></prop>
+<node oor:name="L222" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4682 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L223" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4683 SuperPrint transparente Folie, A5</value></prop>
+<node oor:name="L223" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4683 SuperPrint transparente Folie, A5</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L224" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4684 SuperPrint transparente Folie</value></prop>
+<node oor:name="L224" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4684 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;5250;2970;5250;2970;0;0;4;10</value></prop></node>
-<node oor:name="L225" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4685 SuperPrint transparente Folie</value></prop>
+<node oor:name="L225" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4685 SuperPrint transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L226" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4686 SuperPrint Kreise 40 mm, transparent</value></prop>
+<node oor:name="L226" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4686 SuperPrint Kreise 40 mm, transparent</value></prop>
     <prop oor:name="Measure"><value>S;4600;4600;4000;4000;1600;1350;4;6</value></prop></node>
-<node oor:name="L227" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4690 SuperPrint weiße Folie</value></prop>
+<node oor:name="L227" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4690 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L228" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4691 SuperPrint weiße Folie</value></prop>
+<node oor:name="L228" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4691 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L229" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4692 SuperPrint weiße Folie</value></prop>
+<node oor:name="L229" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4692 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L230" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4693 SuperPrint weiße Folie, A5</value></prop>
+<node oor:name="L230" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4693 SuperPrint weiße Folie, A5</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L231" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4694 SuperPrint weiße Folie</value></prop>
+<node oor:name="L231" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4694 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;5250;2970;5250;2970;0;0;4;10</value></prop></node>
-<node oor:name="L232" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4695 SuperPrint weiße Folie</value></prop>
+<node oor:name="L232" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4695 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;7000;3712,5;7000;3712,5;0;0;3;8</value></prop></node>
-<node oor:name="L233" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4696 SuperPrint weiße Folie</value></prop>
+<node oor:name="L233" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4696 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L234" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4697 SuperPrint weiße Folie</value></prop>
+<node oor:name="L234" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4697 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L235" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4698 SuperPrint weiße Folie</value></prop>
+<node oor:name="L235" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4698 SuperPrint weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L236" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4810 InkPrint Special weiß</value></prop>
+<node oor:name="L236" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4810 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;3810;2120;3810;2120;975;1070;5;13</value></prop></node>
-<node oor:name="L237" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4811 InkPrint Special weiß</value></prop>
+<node oor:name="L237" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4811 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;1693;4826;1693;848;1303;4;16</value></prop></node>
-<node oor:name="L238" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4812 InkPrint Special weiß</value></prop>
+<node oor:name="L238" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4812 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L239" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4814 InkPrint Special weiß</value></prop>
+<node oor:name="L239" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4814 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L240" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4815 InkPrint Special weiß</value></prop>
+<node oor:name="L240" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4815 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;9652;3387;848;1303;2;8</value></prop></node>
-<node oor:name="L241" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4816 InkPrint Special weiß</value></prop>
+<node oor:name="L241" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4816 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;4230;9652;4230;848;2150;2;6</value></prop></node>
-<node oor:name="L242" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4817 InkPrint Special weiß</value></prop>
+<node oor:name="L242" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4817 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;6773;9652;6773;848;1303;2;4</value></prop></node>
-<node oor:name="L243" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4819 InkPrint Special weiß</value></prop>
+<node oor:name="L243" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4819 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L244" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4820 InkPrint Special weiß</value></prop>
+<node oor:name="L244" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4820 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L245" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4821 InkPrint Special 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L245" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4821 InkPrint Special 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;6773;6600;6773;600;1303;3;4</value></prop></node>
-<node oor:name="L246" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4822 InkPrint Special weiß</value></prop>
+<node oor:name="L246" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4822 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;9652;3387;848;1303;2;8</value></prop></node>
-<node oor:name="L247" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4823 InkPrint Special weiß</value></prop>
+<node oor:name="L247" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4823 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;4230;9652;4230;848;2150;2;6</value></prop></node>
-<node oor:name="L248" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4824 InkPrint Special weiß</value></prop>
+<node oor:name="L248" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4824 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L249" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4825 InkPrint Special für schmale Ordner, weiß</value></prop>
+<node oor:name="L249" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4825 InkPrint Special für schmale Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L250" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4826 InkPrint Special für breite Ordner, weiß</value></prop>
+<node oor:name="L250" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4826 InkPrint Special für breite Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L251" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4827 InkPrint Special Videocassette, Rücken, weiß</value></prop>
+<node oor:name="L251" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4827 InkPrint Special Videocassette, Rücken, weiß</value></prop>
     <prop oor:name="Measure"><value>S;14732;2000;14732;2000;3134;1850;1;13</value></prop></node>
-<node oor:name="L252" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4828 InkPrint Special Videocassette, Front, weiß</value></prop>
+<node oor:name="L252" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4828 InkPrint Special Videocassette, Front, weiß</value></prop>
     <prop oor:name="Measure"><value>S;8128;4656;7874;4656;2499;882;2;6</value></prop></node>
-<node oor:name="L253" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4829 InkPrint Special Diabeschriftung, weiß</value></prop>
+<node oor:name="L253" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4829 InkPrint Special Diabeschriftung, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4572;847;4318;847;1483;1298;4;32</value></prop></node>
-<node oor:name="L254" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4830 InkPrint Special für schmale Ordner, lang, weiß</value></prop>
+<node oor:name="L254" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4830 InkPrint Special für schmale Ordner, lang, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L255" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4831 InkPrint Special für breite Ordner, lang, weiß</value></prop>
+<node oor:name="L255" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4831 InkPrint Special für breite Ordner, lang, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L256" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4841 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L256" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4841 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L257" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4842 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L257" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4842 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L258" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4843 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L258" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4843 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L259" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4844 InkPrint Special transparente Folie, A4</value></prop>
+<node oor:name="L259" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4844 InkPrint Special transparente Folie, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L260" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4845 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L260" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4845 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L261" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4846 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L261" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4846 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L262" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4847 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L262" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4847 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L263" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4848 InkPrint Special CD-Etikett, transparente Folie</value></prop>
+<node oor:name="L263" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4848 InkPrint Special CD-Etikett, transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L264" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4851 InkPrint Special weiße Folie</value></prop>
+<node oor:name="L264" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4851 InkPrint Special weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L265" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4852 InkPrint Special weiße Folie</value></prop>
+<node oor:name="L265" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4852 InkPrint Special weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L266" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4853 InkPrint Special weiße Folie</value></prop>
+<node oor:name="L266" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4853 InkPrint Special weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L267" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4854 InkPrint Special weiße Folie, A4</value></prop>
+<node oor:name="L267" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4854 InkPrint Special weiße Folie, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L268" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4864 InkPrint Special wetterfeste Folie, weiß</value></prop>
+<node oor:name="L268" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4864 InkPrint Special wetterfeste Folie, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L269" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4865 InkPrint Special wetterfeste Folie, weiß</value></prop>
+<node oor:name="L269" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4865 InkPrint Special wetterfeste Folie, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9854;13970;9600;13970;773;880;2;2</value></prop></node>
-<node oor:name="L270" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4866 InkPrint Special wetterfeste Folie, weiß</value></prop>
+<node oor:name="L270" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4866 InkPrint Special wetterfeste Folie, weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L271" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4867 InkPrint Special wetterfeste Folie, weiß, oval</value></prop>
+<node oor:name="L271" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4867 InkPrint Special wetterfeste Folie, weiß, oval</value></prop>
     <prop oor:name="Measure"><value>S;9398;6773;8890;6350;1356;1515;2;4</value></prop></node>
-<node oor:name="L272" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5051 SuperPrint weiß</value></prop>
+<node oor:name="L272" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5051 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L273" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5052 SuperPrint weiß</value></prop>
+<node oor:name="L273" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5052 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;5250;2120;5250;2120;0;0;4;14</value></prop></node>
-<node oor:name="L274" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5053 SuperPrint weiß</value></prop>
+<node oor:name="L274" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5053 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L275" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5054 SuperPrint weiß</value></prop>
+<node oor:name="L275" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5054 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4243;7000;4243;0;0;3;7</value></prop></node>
-<node oor:name="L276" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5055 SuperPrint 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L276" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5055 SuperPrint 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;5080;7000;5080;0;2150;3;5</value></prop></node>
-<node oor:name="L277" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5056 SuperPrint weiß</value></prop>
+<node oor:name="L277" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5056 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;850;2151;2;6</value></prop></node>
-<node oor:name="L278" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5057 SuperPrint weiß</value></prop>
+<node oor:name="L278" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5057 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L279" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5058 SuperPrint gelb</value></prop>
+<node oor:name="L279" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5058 SuperPrint gelb</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L280" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5059 SuperPrint rot</value></prop>
+<node oor:name="L280" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5059 SuperPrint rot</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L281" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5060 SuperPrint blau</value></prop>
+<node oor:name="L281" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5060 SuperPrint blau</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L282" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5061 SuperPrint grün</value></prop>
+<node oor:name="L282" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5061 SuperPrint grün</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L283" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5062 SuperPrint weiß</value></prop>
+<node oor:name="L283" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5062 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;10500;7425;10500;7425;0;0;2;4</value></prop></node>
-<node oor:name="L284" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5063 SuperPrint weiß, A6</value></prop>
+<node oor:name="L284" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5063 SuperPrint weiß, A6</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L285" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5064 SuperPrint weiß, A5</value></prop>
+<node oor:name="L285" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5064 SuperPrint weiß, A5</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L286" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5065 SuperPrint weiß, A4</value></prop>
+<node oor:name="L286" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5065 SuperPrint weiß, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L287" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5066 SuperPrint Kreise 40 mm, weiß</value></prop>
+<node oor:name="L287" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5066 SuperPrint Kreise 40 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4600;4600;4000;4000;1600;1350;4;6</value></prop></node>
-<node oor:name="L288" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5067 SuperPrint Kreise 60 mm, weiß</value></prop>
+<node oor:name="L288" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5067 SuperPrint Kreise 60 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L289" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5068 SuperPrint Kreise 85 mm, weiß</value></prop>
+<node oor:name="L289" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5068 SuperPrint Kreise 85 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9500;9500;8500;8500;1500;1100;2;3</value></prop></node>
-<node oor:name="L290" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5069 SuperPrint Videocassette, Rücken, weiß</value></prop>
+<node oor:name="L290" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5069 SuperPrint Videocassette, Rücken, weiß</value></prop>
     <prop oor:name="Measure"><value>S;14732;2000;14732;2000;3134;1850;1;13</value></prop></node>
-<node oor:name="L291" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5070 SuperPrint Videocassette, Front, weiß</value></prop>
+<node oor:name="L291" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5070 SuperPrint Videocassette, Front, weiß</value></prop>
     <prop oor:name="Measure"><value>S;8128;4656;7874;4656;2499;882;2;6</value></prop></node>
-<node oor:name="L292" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5071 SuperPrint Diabeschriftung, weiß</value></prop>
+<node oor:name="L292" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5071 SuperPrint Diabeschriftung, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4572;847;4318;847;1483;1298;4;32</value></prop></node>
-<node oor:name="L293" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5072 SuperPrint Pfeile, gelb</value></prop>
+<node oor:name="L293" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5072 SuperPrint Pfeile, gelb</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;9144;2540;1102;1938;2;6</value></prop></node>
-<node oor:name="L294" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5073 SuperPrint Pfeile, rot</value></prop>
+<node oor:name="L294" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5073 SuperPrint Pfeile, rot</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;9144;2540;1102;1938;2;6</value></prop></node>
-<node oor:name="L295" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5074 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
+<node oor:name="L295" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5074 SuperPrint weiß, Ecken abgerundet, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L296" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5075 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L296" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5075 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3387;9906;3387;467;1303;2;8</value></prop></node>
-<node oor:name="L297" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5076 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L297" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5076 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3810;9906;3810;467;1515;2;7</value></prop></node>
-<node oor:name="L298" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5077 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L298" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5077 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L299" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5078 SuperPrint CD-Box-Etiketten, weiß</value></prop>
+<node oor:name="L299" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5078 SuperPrint CD-Box-Etiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;11430;550;11430;550;4785;1650;1;48</value></prop></node>
-<node oor:name="L300" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5079 SuperPrint CD-Etikett, weiß</value></prop>
+<node oor:name="L300" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5079 SuperPrint CD-Etikett, weiß</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L301" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5080 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L301" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5080 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;5250;2120;5250;2120;0;0;4;14</value></prop></node>
-<node oor:name="L302" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5081 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L302" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5081 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;10500;4243;10500;4243;0;0;2;7</value></prop></node>
-<node oor:name="L303" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5082 SuperPrint weiß, ablösbar</value></prop>
+<node oor:name="L303" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5082 SuperPrint weiß, ablösbar</value></prop>
     <prop oor:name="Measure"><value>S;10500;14850;10500;14850;0;0;2;2</value></prop></node>
-<node oor:name="L304" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5083 SuperPrint CD-Etikett, gelb</value></prop>
+<node oor:name="L304" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5083 SuperPrint CD-Etikett, gelb</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L305" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5084 SuperPrint CD-Etikett, rot</value></prop>
+<node oor:name="L305" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5084 SuperPrint CD-Etikett, rot</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L306" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5085 SuperPrint CD-Etikett, blau</value></prop>
+<node oor:name="L306" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5085 SuperPrint CD-Etikett, blau</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L307" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5086 SuperPrint CD-Etikett, grün</value></prop>
+<node oor:name="L307" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5086 SuperPrint CD-Etikett, grün</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L308" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5087 SuperPrint ZIP-Disketten, weiß</value></prop>
+<node oor:name="L308" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5087 SuperPrint ZIP-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6175;5000;5900;5000;1375;2350;3;5</value></prop></node>
-<node oor:name="L309" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5088 SuperPrint für schmale Ordner, farbig sort.</value></prop>
+<node oor:name="L309" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5088 SuperPrint für schmale Ordner, farbig sort.</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L310" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5089 SuperPrint für breite Ordner, farbig sort.</value></prop>
+<node oor:name="L310" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5089 SuperPrint für breite Ordner, farbig sort.</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L311" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5090 SuperPrint für schmale Ordner, weiß</value></prop>
+<node oor:name="L311" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5090 SuperPrint für schmale Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L312" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5091 SuperPrint für schmale Ordner, gelb</value></prop>
+<node oor:name="L312" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5091 SuperPrint für schmale Ordner, gelb</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L313" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5092 SuperPrint für schmale Ordner, rot</value></prop>
+<node oor:name="L313" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5092 SuperPrint für schmale Ordner, rot</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L314" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5093 SuperPrint für schmale Ordner, blau</value></prop>
+<node oor:name="L314" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5093 SuperPrint für schmale Ordner, blau</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L315" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5094 SuperPrint für schmale Ordner, grün</value></prop>
+<node oor:name="L315" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5094 SuperPrint für schmale Ordner, grün</value></prop>
     <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1550;1;7</value></prop></node>
-<node oor:name="L316" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5095 SuperPrint für breite Ordner, weiß</value></prop>
+<node oor:name="L316" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5095 SuperPrint für breite Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L317" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5096 SuperPrint für breite Ordner, gelb</value></prop>
+<node oor:name="L317" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5096 SuperPrint für breite Ordner, gelb</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L318" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5097 SuperPrint für breite Ordner, rot</value></prop>
+<node oor:name="L318" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5097 SuperPrint für breite Ordner, rot</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L319" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5098 SuperPrint für breite Ordner, blau</value></prop>
+<node oor:name="L319" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5098 SuperPrint für breite Ordner, blau</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L320" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5099 SuperPrint für breite Ordner, grün</value></prop>
+<node oor:name="L320" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5099 SuperPrint für breite Ordner, grün</value></prop>
     <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;2650;1;4</value></prop></node>
-<node oor:name="L321" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5123 SuperPrint für breite Ordner, weiß</value></prop>
+<node oor:name="L321" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5123 SuperPrint für breite Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;5900;19200;5900;900;3050;1;4</value></prop></node>
-<node oor:name="L322" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5124 SuperPrint für breite Ordner, gelb</value></prop>
+<node oor:name="L322" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5124 SuperPrint für breite Ordner, gelb</value></prop>
     <prop oor:name="Measure"><value>S;19200;5900;19200;5900;900;3050;1;4</value></prop></node>
-<node oor:name="L323" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5125 SuperPrint für breite Ordner, rot</value></prop>
+<node oor:name="L323" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5125 SuperPrint für breite Ordner, rot</value></prop>
     <prop oor:name="Measure"><value>S;19200;5900;19200;5900;900;3050;1;4</value></prop></node>
-<node oor:name="L324" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5126 SuperPrint für breite Ordner, blau</value></prop>
+<node oor:name="L324" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5126 SuperPrint für breite Ordner, blau</value></prop>
     <prop oor:name="Measure"><value>S;19200;5900;19200;5900;900;3050;1;4</value></prop></node>
-<node oor:name="L325" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5127 SuperPrint für breite Ordner, grün</value></prop>
+<node oor:name="L325" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5127 SuperPrint für breite Ordner, grün</value></prop>
     <prop oor:name="Measure"><value>S;19200;5900;19200;5900;900;3050;1;4</value></prop></node>
-<node oor:name="L326" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5128 SuperPrint für schmale Ordner, lang, farbig sort.</value></prop>
+<node oor:name="L326" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5128 SuperPrint für schmale Ordner, lang, farbig sort.</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L327" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5129 SuperPrint für breite Ordner, lang, farbig sort.</value></prop>
+<node oor:name="L327" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5129 SuperPrint für breite Ordner, lang, farbig sort.</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L328" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5130 SuperPrint für schmale Ordner, lang, weiß</value></prop>
+<node oor:name="L328" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5130 SuperPrint für schmale Ordner, lang, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L329" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5131 SuperPrint für schmale Ordner, lang, gelb</value></prop>
+<node oor:name="L329" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5131 SuperPrint für schmale Ordner, lang, gelb</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L330" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5132 SuperPrint für schmale Ordner, lang, rot</value></prop>
+<node oor:name="L330" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5132 SuperPrint für schmale Ordner, lang, rot</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L331" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5133 SuperPrint für schmale Ordner, lang, blau</value></prop>
+<node oor:name="L331" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5133 SuperPrint für schmale Ordner, lang, blau</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L332" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5134 SuperPrint für schmale Ordner, lang, grün</value></prop>
+<node oor:name="L332" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5134 SuperPrint für schmale Ordner, lang, grün</value></prop>
     <prop oor:name="Measure"><value>S;3800;29700;3800;29700;1000;0;5;1</value></prop></node>
-<node oor:name="L333" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5135 SuperPrint für breite Ordner, lang, weiß</value></prop>
+<node oor:name="L333" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5135 SuperPrint für breite Ordner, lang, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L334" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5136 SuperPrint für breite Ordner, lang, gelb</value></prop>
+<node oor:name="L334" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5136 SuperPrint für breite Ordner, lang, gelb</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L335" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5137 SuperPrint für breite Ordner, lang, rot</value></prop>
+<node oor:name="L335" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5137 SuperPrint für breite Ordner, lang, rot</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L336" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5138 SuperPrint für breite Ordner, lang, blau</value></prop>
+<node oor:name="L336" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5138 SuperPrint für breite Ordner, lang, blau</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L337" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5139 SuperPrint für breite Ordner, lang, grün</value></prop>
+<node oor:name="L337" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5139 SuperPrint für breite Ordner, lang, grün</value></prop>
     <prop oor:name="Measure"><value>S;6100;29700;6100;29700;1350;0;3;1</value></prop></node>
-<node oor:name="L338" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5140 SuperPrint neon-gelb</value></prop>
+<node oor:name="L338" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5140 SuperPrint neon-gelb</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L339" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5141 SuperPrint neon-orange</value></prop>
+<node oor:name="L339" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5141 SuperPrint neon-orange</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L340" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5142 SuperPrint neon-pink</value></prop>
+<node oor:name="L340" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5142 SuperPrint neon-pink</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L341" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5143 SuperPrint neon-grün</value></prop>
+<node oor:name="L341" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5143 SuperPrint neon-grün</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L342" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5144 SuperPrint neon-gelb</value></prop>
+<node oor:name="L342" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5144 SuperPrint neon-gelb</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L343" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5145 SuperPrint neon-orange</value></prop>
+<node oor:name="L343" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5145 SuperPrint neon-orange</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L344" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5146 SuperPrint neon-pink</value></prop>
+<node oor:name="L344" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5146 SuperPrint neon-pink</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L345" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5147 SuperPrint neon-grün</value></prop>
+<node oor:name="L345" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5147 SuperPrint neon-grün</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L346" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5148 SuperPrint neon-gelb, A4</value></prop>
+<node oor:name="L346" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5148 SuperPrint neon-gelb, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L347" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5149 SuperPrint neon-orange, A4</value></prop>
+<node oor:name="L347" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5149 SuperPrint neon-orange, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L348" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5150 SuperPrint neon-pink, A4</value></prop>
+<node oor:name="L348" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5150 SuperPrint neon-pink, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L349" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5151 SuperPrint neon-grün, A4</value></prop>
+<node oor:name="L349" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5151 SuperPrint neon-grün, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L350" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5152 SuperPrint neon-gelb, Kreise 60 mm</value></prop>
+<node oor:name="L350" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5152 SuperPrint neon-gelb, Kreise 60 mm</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L351" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5153 SuperPrint neon-orange, Kreise 60 mm</value></prop>
+<node oor:name="L351" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5153 SuperPrint neon-orange, Kreise 60 mm</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L352" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5154 SuperPrint neon-pink, Kreise 60 mm</value></prop>
+<node oor:name="L352" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5154 SuperPrint neon-pink, Kreise 60 mm</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L353" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5155 SuperPrint neon-grün, Kreise 60 mm</value></prop>
+<node oor:name="L353" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5155 SuperPrint neon-grün, Kreise 60 mm</value></prop>
     <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1800;3;4</value></prop></node>
-<node oor:name="L354" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5158 SuperPrint für schmale Ordner, lang, weiß</value></prop>
+<node oor:name="L354" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5158 SuperPrint für schmale Ordner, lang, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3400;29700;3400;29700;2000;0;5;1</value></prop></node>
-<node oor:name="L355" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5159 SuperPrint für breite Ordner, lang, weiß</value></prop>
+<node oor:name="L355" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5159 SuperPrint für breite Ordner, lang, weiß</value></prop>
     <prop oor:name="Measure"><value>S;5900;29700;5900;29700;1650;0;3;1</value></prop></node>
-<node oor:name="L356" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5160 SuperPrint für schmale Ordner, weiß</value></prop>
+<node oor:name="L356" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5160 SuperPrint für schmale Ordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;19200;3400;19200;3400;900;1250;1;8</value></prop></node>
-<node oor:name="L357" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5161 SuperPrint für schmale Ordner, gelb</value></prop>
+<node oor:name="L357" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5161 SuperPrint für schmale Ordner, gelb</value></prop>
     <prop oor:name="Measure"><value>S;19200;3400;19200;3400;900;1250;1;8</value></prop></node>
-<node oor:name="L358" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5162 SuperPrint für schmale Ordner, rot</value></prop>
+<node oor:name="L358" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5162 SuperPrint für schmale Ordner, rot</value></prop>
     <prop oor:name="Measure"><value>S;19200;3400;19200;3400;900;1250;1;8</value></prop></node>
-<node oor:name="L359" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5163 SuperPrint für schmale Ordner, blau</value></prop>
+<node oor:name="L359" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5163 SuperPrint für schmale Ordner, blau</value></prop>
     <prop oor:name="Measure"><value>S;19200;3400;19200;3400;900;1250;1;8</value></prop></node>
-<node oor:name="L360" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5164 SuperPrint für schmale Ordner, grün</value></prop>
+<node oor:name="L360" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5164 SuperPrint für schmale Ordner, grün</value></prop>
     <prop oor:name="Measure"><value>S;19200;3400;19200;3400;900;1250;1;8</value></prop></node>
-<node oor:name="L361" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5165 SuperPrint für schmale Hängeordner, weiß</value></prop>
+<node oor:name="L361" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5165 SuperPrint für schmale Hängeordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3400;29700;3400;29700;2000;0;5;1</value></prop></node>
-<node oor:name="L362" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5166 SuperPrint für breite Hängeordner, weiß</value></prop>
+<node oor:name="L362" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5166 SuperPrint für breite Hängeordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;5800;29700;5800;29700;1800;0;3;1</value></prop></node>
-<node oor:name="L363" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5167 SuperPrint für breite Hängeordner, weiß</value></prop>
+<node oor:name="L363" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5167 SuperPrint für breite Hängeordner, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6300;29700;6300;29700;1050;0;3;1</value></prop></node>
-<node oor:name="L364" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8619 SuperPrint Mini-CD-Etiketten, weiß</value></prop>
+<node oor:name="L364" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8619 SuperPrint Mini-CD-Etiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9200;8950;7800;7800;2000;2000;2;3</value></prop></node>
-<node oor:name="L365" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8631 SuperPrint weiß</value></prop>
+<node oor:name="L365" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8631 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L366" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8632 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L366" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8632 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L367" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8633 SuperPrint weiß</value></prop>
+<node oor:name="L367" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8633 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L368" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8634 SuperPrint weiß</value></prop>
+<node oor:name="L368" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8634 SuperPrint weiß</value></prop>
     <prop oor:name="Measure"><value>S;7000;4243;7000;4243;0;0;3;7</value></prop></node>
-<node oor:name="L369" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8635 SuperPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L369" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8635 SuperPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3810;9906;3810;467;1515;2;7</value></prop></node>
-<node oor:name="L370" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8636 SuperPrint weiß, A5</value></prop>
+<node oor:name="L370" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8636 SuperPrint weiß, A5</value></prop>
     <prop oor:name="Measure"><value>S;21000;14850;21000;14850;0;0;1;2</value></prop></node>
-<node oor:name="L371" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8637 SuperPrint weiß, A4</value></prop>
+<node oor:name="L371" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8637 SuperPrint weiß, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L372" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8650 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L372" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8650 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L373" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8651 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L373" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8651 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;8890;3387;1229;1303;2;8</value></prop></node>
-<node oor:name="L374" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8652 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L374" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8652 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;882;2;6</value></prop></node>
-<node oor:name="L375" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8653 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L375" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8653 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L376" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8654 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L376" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8654 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;13970;9600;13970;773;880;2;2</value></prop></node>
-<node oor:name="L377" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8655 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L377" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8655 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L378" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8680 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L378" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8680 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L379" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8681 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L379" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8681 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;882;2;6</value></prop></node>
-<node oor:name="L380" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8682 ColorPrint weiß, Ecken abgerundet</value></prop>
+<node oor:name="L380" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8682 ColorPrint weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L381" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8683 ColorPrint CD-Etikett, weiß</value></prop>
+<node oor:name="L381" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8683 ColorPrint CD-Etikett, weiß</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L382" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8800 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L382" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8800 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6096;3387;5334;3387;1737;1303;3;8</value></prop></node>
-<node oor:name="L383" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8801 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L383" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8801 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L384" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8802 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L384" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8802 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656;6350;4656;721;882;3;6</value></prop></node>
-<node oor:name="L385" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8803 InkPrint Special 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L385" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8803 InkPrint Special 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L386" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8804 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L386" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8804 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;8890;3387;1229;1303;2;8</value></prop></node>
-<node oor:name="L387" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8805 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L387" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8805 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;882;2;6</value></prop></node>
-<node oor:name="L388" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8806 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L388" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8806 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L389" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8807 InkPrint Special weiß, z.B. Paketadresse, ca. A6</value></prop>
+<node oor:name="L389" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8807 InkPrint Special weiß, z.B. Paketadresse, ca. A6</value></prop>
     <prop oor:name="Measure"><value>S;9854;13970;9600;13970;773;880;2;2</value></prop></node>
-<node oor:name="L390" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8808 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L390" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8808 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3387;9906;3387;467;1303;2;8</value></prop></node>
-<node oor:name="L391" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8809 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L391" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8809 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3810;9906;3810;467;1515;2;7</value></prop></node>
-<node oor:name="L392" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8810 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L392" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8810 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L393" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8811 InkPrint Special weiß, ca. DIN A5</value></prop>
+<node oor:name="L393" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8811 InkPrint Special weiß, ca. DIN A5</value></prop>
     <prop oor:name="Measure"><value>S;19200;13970;19200;13970;900;880;1;2</value></prop></node>
-<node oor:name="L394" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8830 InkPrint Special weiß, z.B. für Preisauszeichnung</value></prop>
+<node oor:name="L394" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8830 InkPrint Special weiß, z.B. für Preisauszeichnung</value></prop>
     <prop oor:name="Measure"><value>S;2794;847;2540;847;848;1303;7;32</value></prop></node>
-<node oor:name="L395" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8831 InkPrint Special weiß, quadratisch</value></prop>
+<node oor:name="L395" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8831 InkPrint Special weiß, quadratisch</value></prop>
     <prop oor:name="Measure"><value>S;3048;2540;2540;2540;1610;880;6;11</value></prop></node>
-<node oor:name="L396" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8832 InkPrint Special weiß, z.B. für Preisauszeichnung</value></prop>
+<node oor:name="L396" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8832 InkPrint Special weiß, z.B. für Preisauszeichnung</value></prop>
     <prop oor:name="Measure"><value>S;3302;1693;3048;1693;721;1303;6;16</value></prop></node>
-<node oor:name="L397" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8833 InkPrint Special weiß</value></prop>
+<node oor:name="L397" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8833 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;3810;2120;3810;2120;975;1070;5;13</value></prop></node>
-<node oor:name="L398" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8834 InkPrint Special weiß</value></prop>
+<node oor:name="L398" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8834 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;4830;1693;4830;1693;840;1330;4;16</value></prop></node>
-<node oor:name="L399" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8835 InkPrint Special weiß</value></prop>
+<node oor:name="L399" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8835 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;4830;2540;4830;2540;840;880;4;11</value></prop></node>
-<node oor:name="L400" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8836 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L400" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8836 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6096;3387;5334;3387;1737;1303;3;8</value></prop></node>
-<node oor:name="L401" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8837 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L401" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8837 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;2540;6350;2540;721;880;3;11</value></prop></node>
-<node oor:name="L402" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8838 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L402" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8838 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L403" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8839 InkPrint Special 3,5"-Disketten, weiß</value></prop>
+<node oor:name="L403" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8839 InkPrint Special 3,5"-Disketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L404" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8840 InkPrint Special weiß, Visitenkartenformat</value></prop>
+<node oor:name="L404" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8840 InkPrint Special weiß, Visitenkartenformat</value></prop>
     <prop oor:name="Measure"><value>S;8890;5080;8382;5080;1864;2150;2;5</value></prop></node>
-<node oor:name="L405" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8841 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L405" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8841 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;8890;3387;1229;1303;2;8</value></prop></node>
-<node oor:name="L406" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8842 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L406" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8842 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;882;2;6</value></prop></node>
-<node oor:name="L407" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8843 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
+<node oor:name="L407" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8843 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
     <prop oor:name="Measure"><value>S;9854;847;9600;847;773;1303;2;32</value></prop></node>
-<node oor:name="L408" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8844 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
+<node oor:name="L408" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8844 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
     <prop oor:name="Measure"><value>S;9854;1693;9600;1693;773;1303;2;16</value></prop></node>
-<node oor:name="L409" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8845 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L409" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8845 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L410" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8846 InkPrint Special weiß</value></prop>
+<node oor:name="L410" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8846 InkPrint Special weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;6773;9652;6773;848;1303;2;4</value></prop></node>
-<node oor:name="L411" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8847 InkPrint Special weiß, Paketadresse, ca. A6</value></prop>
+<node oor:name="L411" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8847 InkPrint Special weiß, Paketadresse, ca. A6</value></prop>
     <prop oor:name="Measure"><value>S;9854;13970;9600;13970;773;880;2;2</value></prop></node>
-<node oor:name="L412" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8848 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
+<node oor:name="L412" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8848 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
     <prop oor:name="Measure"><value>S;19200;847;19200;847;900;1303;1;32</value></prop></node>
-<node oor:name="L413" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8849 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
+<node oor:name="L413" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8849 InkPrint Special weiß, z.B. für Regalbeschriftung</value></prop>
     <prop oor:name="Measure"><value>S;19200;1693;19200;1693;900;1303;1;16</value></prop></node>
-<node oor:name="L414" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8850 InkPrint Special weiß, ca. DIN A5</value></prop>
+<node oor:name="L414" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8850 InkPrint Special weiß, ca. DIN A5</value></prop>
     <prop oor:name="Measure"><value>S;19200;13970;19200;13970;900;880;1;2</value></prop></node>
-<node oor:name="L415" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8851 InkPrint Special Kreise 32 mm, weiß</value></prop>
+<node oor:name="L415" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8851 InkPrint Special Kreise 32 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3810;3810;3200;3200;1280;1820;5;7</value></prop></node>
-<node oor:name="L416" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8852 InkPrint Special Kreise 63,5 mm, weiß</value></prop>
+<node oor:name="L416" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8852 InkPrint Special Kreise 63,5 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;6773;6350;6350;721;1516;3;4</value></prop></node>
-<node oor:name="L417" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8853 InkPrint Special Oval, weiß</value></prop>
+<node oor:name="L417" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8853 InkPrint Special Oval, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6350;4656;5842;4233;1229;1093;3;6</value></prop></node>
-<node oor:name="L418" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8854 InkPrint Special Oval, weiß</value></prop>
+<node oor:name="L418" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8854 InkPrint Special Oval, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9398;6773;8890;6350;1356;1515;2;4</value></prop></node>
-<node oor:name="L419" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8855 InkPrint Special abgeschrägte Ecken, weiß</value></prop>
+<node oor:name="L419" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8855 InkPrint Special abgeschrägte Ecken, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;6773;8890;6773;1229;1303;2;4</value></prop></node>
-<node oor:name="L420" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8856 InkPrint Special Registeretiketten, weiß</value></prop>
+<node oor:name="L420" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8856 InkPrint Special Registeretiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3048;4656;2540;4230;1610;1092;6;6</value></prop></node>
-<node oor:name="L421" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8857 InkPrint Special Sterne 63,5 mm, weiß</value></prop>
+<node oor:name="L421" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8857 InkPrint Special Sterne 63,5 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;6773;6350;6350;721;1516;3;4</value></prop></node>
-<node oor:name="L422" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8858 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L422" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8858 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656;6350;4656;721;882;3;6</value></prop></node>
-<node oor:name="L423" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8859 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L423" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8859 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3387;9906;3387;467;1303;2;8</value></prop></node>
-<node oor:name="L424" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8860 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L424" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8860 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;3810;9906;3810;467;1515;2;7</value></prop></node>
-<node oor:name="L425" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8861 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L425" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8861 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;5700;9906;5700;467;600;2;5</value></prop></node>
-<node oor:name="L426" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8862 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L426" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8862 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L427" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8863 InkPrint Special Kreise 40 mm, weiß</value></prop>
+<node oor:name="L427" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8863 InkPrint Special Kreise 40 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4600;4600;4000;4000;1600;1350;4;6</value></prop></node>
-<node oor:name="L428" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8864 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L428" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8864 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L429" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8865 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L429" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8865 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L430" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8866 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L430" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8866 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;4233;9600;4233;773;2150;2;6</value></prop></node>
-<node oor:name="L431" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8867 InkPrint Special weiß, Ecken abgerundet</value></prop>
+<node oor:name="L431" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8867 InkPrint Special weiß, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;6350;9600;6350;773;2150;2;4</value></prop></node>
-<node oor:name="L432" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8868 InkPrint Special Sonderform, weiß</value></prop>
+<node oor:name="L432" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8868 InkPrint Special Sonderform, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656,7;6350;4233;721;1093;3;6</value></prop></node>
-<node oor:name="L433" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8869 InkPrint Special Oval, weiß</value></prop>
+<node oor:name="L433" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8869 InkPrint Special Oval, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656,7;6350;4233;721;1093;3;6</value></prop></node>
-<node oor:name="L434" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8870 InkPrint Special Oval, weiß</value></prop>
+<node oor:name="L434" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8870 InkPrint Special Oval, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9854;6773;9600;6350;773;1515;2;4</value></prop></node>
-<node oor:name="L435" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8886 InkPrint Special Glossy-Qualität, Fotos 10x15, Two-in-one</value></prop>
+<node oor:name="L435" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8886 InkPrint Special Glossy-Qualität, Fotos 10x15, Two-in-one</value></prop>
     <prop oor:name="Measure"><value>S;15000;14800;15000;10000;3000;2450;1;2</value></prop></node>
-<node oor:name="L436" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8887 InkPrint Special Glossy-Qualität, Paßfoto-Format, Two-in-one</value></prop>
+<node oor:name="L436" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8887 InkPrint Special Glossy-Qualität, Paßfoto-Format, Two-in-one</value></prop>
     <prop oor:name="Measure"><value>S;4100;5100;3500;4500;2600;2400;4;5</value></prop></node>
-<node oor:name="L437" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8888 InkPrint Special Glossy-Qualität, CD-Cover-Etikett, weiß</value></prop>
+<node oor:name="L437" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8888 InkPrint Special Glossy-Qualität, CD-Cover-Etikett, weiß</value></prop>
     <prop oor:name="Measure"><value>S;12150;14550;12150;11750;4425;1700;1;2</value></prop></node>
-<node oor:name="L438" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8889 InkPrint Special Glossy-Qualität,Visitenkartenetikett, weiß</value></prop>
+<node oor:name="L438" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8889 InkPrint Special Glossy-Qualität,Visitenkartenetikett, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9600;5500;8300;5200;1550;1250;2;5</value></prop></node>
-<node oor:name="L439" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8890 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L439" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8890 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L440" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8891 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L440" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8891 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;3387;8890;3387;1229;1303;2;8</value></prop></node>
-<node oor:name="L441" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8892 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L441" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8892 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;882;2;6</value></prop></node>
-<node oor:name="L442" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8893 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L442" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8893 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L443" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8894 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L443" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8894 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9854;13970;9600;13970;773;880;2;2</value></prop></node>
-<node oor:name="L444" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8895 InkPrint Special Glossy-Qualität, weiß</value></prop>
+<node oor:name="L444" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8895 InkPrint Special Glossy-Qualität, weiß</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L445" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8896 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L445" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8896 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;6604;5079;6350;4656;721;2363,5;3;5</value></prop></node>
-<node oor:name="L446" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8897 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L446" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8897 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9398;6773;8890;6350;1356;1515;2;4</value></prop></node>
-<node oor:name="L447" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8898 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L447" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8898 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;9398;13123;8890;12700;1356;1932;2;2</value></prop></node>
-<node oor:name="L448" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8899 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
+<node oor:name="L448" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8899 InkPrint Special Glossy-Qualität, Ecken abgerundet</value></prop>
     <prop oor:name="Measure"><value>S;17800;13300;17800;12700;1600;1843;1;2</value></prop></node>
-<node oor:name="L449" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8900 InkPrint Special Glossy-Qualität, CD-Etikett, weiß</value></prop>
+<node oor:name="L449" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8900 InkPrint Special Glossy-Qualität, CD-Etikett, weiß</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L450" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8901 InkPrint Special Glossy-Qualität, oval</value></prop>
+<node oor:name="L450" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8901 InkPrint Special Glossy-Qualität, oval</value></prop>
     <prop oor:name="Measure"><value>S;6604;4656;6350;4233;721;1093;3;6</value></prop></node>
-<node oor:name="L451" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8939 InkPrint Special Mini-CD-Etiketten, weiß</value></prop>
+<node oor:name="L451" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8939 InkPrint Special Mini-CD-Etiketten, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9200;8950;7800;7800;2000;2000;2;3</value></prop></node>
-<node oor:name="L452" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8961 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L452" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8961 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L453" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8962 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L453" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8962 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L454" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8963 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L454" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8963 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L455" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8964 InkPrint Special transparente Folie, A4</value></prop>
+<node oor:name="L455" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8964 InkPrint Special transparente Folie, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L456" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8965 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L456" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8965 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2116,7;4572;2116,7;975;2150;4;12</value></prop></node>
-<node oor:name="L457" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8966 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L457" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8966 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1515;3;9</value></prop></node>
-<node oor:name="L458" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8967 InkPrint Special transparente Folie</value></prop>
+<node oor:name="L458" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8967 InkPrint Special transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;9854;5080;9600;5080;773;2150;2;5</value></prop></node>
-<node oor:name="L459" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8968 InkPrint Special CD-Etikett, transparente Folie</value></prop>
+<node oor:name="L459" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8968 InkPrint Special CD-Etikett, transparente Folie</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L460" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8971 InkPrint Special weiße Folie</value></prop>
+<node oor:name="L460" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8971 InkPrint Special weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L461" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8972 InkPrint Special weiße Folie</value></prop>
+<node oor:name="L461" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8972 InkPrint Special weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L462" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8973 InkPrint Special weiße Folie</value></prop>
+<node oor:name="L462" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8973 InkPrint Special weiße Folie</value></prop>
     <prop oor:name="Measure"><value>S;9652;4233;9652;4233;848;2150;2;6</value></prop></node>
-<node oor:name="L463" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8974 InkPrint Special weiße Folie, A4</value></prop>
+<node oor:name="L463" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8974 InkPrint Special weiße Folie, A4</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L464" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8981 InkPrint Special Goldfolie</value></prop>
+<node oor:name="L464" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8981 InkPrint Special Goldfolie</value></prop>
     <prop oor:name="Measure"><value>S;4826;2540;4826;2540;848;880;4;11</value></prop></node>
-<node oor:name="L465" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8982 InkPrint Special Goldfolie</value></prop>
+<node oor:name="L465" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8982 InkPrint Special Goldfolie</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L466" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8983 SuperPrint Goldfolie, oval</value></prop>
+<node oor:name="L466" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8983 SuperPrint Goldfolie, oval</value></prop>
     <prop oor:name="Measure"><value>S;4572;2963;4064;2540;1610;1727;4;9</value></prop></node>
-<node oor:name="L467" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8984 InkPrint Special CD-Etikett, gold</value></prop>
+<node oor:name="L467" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8984 InkPrint Special CD-Etikett, gold</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L468" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8991 InkPrint Special Silberfolie</value></prop>
+<node oor:name="L468" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8991 InkPrint Special Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;6600;3387;6600;3387;600;1303;3;8</value></prop></node>
-<node oor:name="L469" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8992 InkPrint Special Silberfolie</value></prop>
+<node oor:name="L469" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8992 InkPrint Special Silberfolie</value></prop>
     <prop oor:name="Measure"><value>S;21000;29700;21000;29700;0;0;1;1</value></prop></node>
-<node oor:name="L470" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8993 SuperPrint Silberfolie, oval</value></prop>
+<node oor:name="L470" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8993 SuperPrint Silberfolie, oval</value></prop>
     <prop oor:name="Measure"><value>S;4572;2963;4064;2540;1610;1727;4;9</value></prop></node>
-<node oor:name="L471" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8994 InkPrint Special CD-Etikett, silber</value></prop>
+<node oor:name="L471" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8994 InkPrint Special CD-Etikett, silber</value></prop>
     <prop oor:name="Measure"><value>S;11600;14800;11600;11600;4700;1650;1;2</value></prop></node>
-<node oor:name="L472" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4639a SuperPrint BETACAM SP/U-MATIC, Cassette (Front), weiß</value></prop>
+<node oor:name="L472" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4639a SuperPrint BETACAM SP/U-MATIC, Cassette (Front), weiß</value></prop>
     <prop oor:name="Measure"><value>S;10160;6773;9906;6773;467;1303;2;4</value></prop></node>
-<node oor:name="L473" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4639b SuperPrint BETACAM SP/U-MATIC, Cassette (Rücken), weiß</value></prop>
+<node oor:name="L473" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4639b SuperPrint BETACAM SP/U-MATIC, Cassette (Rücken), weiß</value></prop>
     <prop oor:name="Measure"><value>S;14000;1693;14000;1693;3500;1306;1;16</value></prop></node>
-<node oor:name="L474" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4640a SuperPrint Maxi Data Cartridge, weiß</value></prop>
+<node oor:name="L474" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4640a SuperPrint Maxi Data Cartridge, weiß</value></prop>
     <prop oor:name="Measure"><value>S;13400;6770;13400;6770;3800;1310;1;4</value></prop></node>
-<node oor:name="L475" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4640b SuperPrint Maxi Data Cartridge (Hülle), weiß</value></prop>
+<node oor:name="L475" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4640b SuperPrint Maxi Data Cartridge (Hülle), weiß</value></prop>
     <prop oor:name="Measure"><value>S;13400;1270;13400;1270;3800;1515;1;21</value></prop></node>
-<node oor:name="L476" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4641a SuperPrint Data Cartridge 4 mm, weiß</value></prop>
+<node oor:name="L476" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4641a SuperPrint Data Cartridge 4 mm, weiß</value></prop>
     <prop oor:name="Measure"><value>S;6096;2120;5334;2120;1737;1070;3;13</value></prop></node>
-<node oor:name="L477" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4641b SuperPrint Data Cartridge 4 mm (Hülle), weiß</value></prop>
+<node oor:name="L477" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4641b SuperPrint Data Cartridge 4 mm (Hülle), weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;3810;6350;3810;721;1515;3;7</value></prop></node>
-<node oor:name="L478" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4642a SuperPrint MiniData Cartridge, weiß</value></prop>
+<node oor:name="L478" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4642a SuperPrint MiniData Cartridge, weiß</value></prop>
     <prop oor:name="Measure"><value>S;8800;2400;7300;2400;2450;1650;2;11</value></prop></node>
-<node oor:name="L479" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4642b SuperPrint MiniData Cartridge (Hülle), weiß</value></prop>
+<node oor:name="L479" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4642b SuperPrint MiniData Cartridge (Hülle), weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;1000;7500;1000;2250;1850;2;26</value></prop></node>
-<node oor:name="L480" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4643a SuperPrint Magneto Optical Disk 3,5", weiß</value></prop>
+<node oor:name="L480" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4643a SuperPrint Magneto Optical Disk 3,5", weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;6773;7000;6773;2500;1304;2;4</value></prop></node>
-<node oor:name="L481" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4643b SuperPrint Magneto Optical Disk 3,5" (Hülle), weiß</value></prop>
+<node oor:name="L481" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4643b SuperPrint Magneto Optical Disk 3,5" (Hülle), weiß</value></prop>
     <prop oor:name="Measure"><value>S;9800;12400;8800;10400;1200;3450;2;2</value></prop></node>
-<node oor:name="L482" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4646a SuperPrint Mini Digital Video, weiß</value></prop>
+<node oor:name="L482" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4646a SuperPrint Mini Digital Video, weiß</value></prop>
     <prop oor:name="Measure"><value>S;4572;847;4318;847;1483;1298;4;32</value></prop></node>
-<node oor:name="L483" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4646b SuperPrint Mini Digital Video (Hülle), weiß</value></prop>
+<node oor:name="L483" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4646b SuperPrint Mini Digital Video (Hülle), weiß</value></prop>
     <prop oor:name="Measure"><value>S;6604;2540;6350;2540;721;880;3;11</value></prop></node>
-<node oor:name="L484" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4647a SuperPrint Video 8, Hi-8, Data Cartridge 8mm, weiß </value></prop>
+<node oor:name="L484" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4647a SuperPrint Video 8, Hi-8, Data Cartridge 8mm, weiß </value></prop>
     <prop oor:name="Measure"><value>S;9000;1000;7500;1000;2250;1850;2;26</value></prop></node>
-<node oor:name="L485" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4647b SuperPrint Video 8, Hi-8, Data Cartridge 8 mm (Hülle), weiß</value></prop>
+<node oor:name="L485" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4647b SuperPrint Video 8, Hi-8, Data Cartridge 8 mm (Hülle), weiß</value></prop>
     <prop oor:name="Measure"><value>S;9652;4656;8890;4656;1229;882;2;6</value></prop></node>
-<node oor:name="L486" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4648a SuperPrint VHS-C, SVHS-C, Cassette (Rücken) weiß</value></prop>
+<node oor:name="L486" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4648a SuperPrint VHS-C, SVHS-C, Cassette (Rücken) weiß</value></prop>
     <prop oor:name="Measure"><value>S;4826;1200;4318;1200;1102;1050;4;23</value></prop></node>
-<node oor:name="L487" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4648b SuperPrint VHS-C, SVHS-C, Cassette (Front), weiß</value></prop>
+<node oor:name="L487" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4648b SuperPrint VHS-C, SVHS-C, Cassette (Front), weiß</value></prop>
     <prop oor:name="Measure"><value>S;6350;3810;5842;3810;1229;1515;3;7</value></prop></node>
-<node oor:name="L488" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4649a SuperPrint MiniDisk, weiß</value></prop>
+<node oor:name="L488" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4649a SuperPrint MiniDisk, weiß</value></prop>
     <prop oor:name="Measure"><value>S;3600;5500;3600;5200;1500;1250;5;5</value></prop></node>
-<node oor:name="L489" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">4649b SuperPrint MiniDisk-Hülle, weiß</value></prop>
+<node oor:name="L489" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>4649b SuperPrint MiniDisk-Hülle, weiß</value></prop>
     <prop oor:name="Measure"><value>S;9000;5080;7000;5080;2500;2150;2;5</value></prop></node>
-<node oor:name="L490" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">5116 taillierte Ringetiketten für Schmuck, weiß</value></prop>  
+<node oor:name="L490" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>5116 taillierte Ringetiketten für Schmuck, weiß</value></prop>  
     <prop oor:name="Measure"><value>S;5900;1400;4900;1000;2150;1050;3;20</value>
   </prop>
 </node>		
@@ -14284,280 +13180,280 @@
         </node>
         <node oor:name="Herma A5" oor:op="replace">
 
-            <node oor:name="L0" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8600 A5 Kreise 10 mm, weiß, ablösbar</value></prop>
+            <node oor:name="L0" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8600 A5 Kreise 10 mm, weiß, ablösbar</value></prop>
                 <prop oor:name="Measure"><value>S;1270;1270;1000;1000;1110;1210;15;10</value></prop></node>
-            <node oor:name="L1" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8601 A5 Kreise 20 mm, weiß, ablösbar</value></prop>
+            <node oor:name="L1" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8601 A5 Kreise 20 mm, weiß, ablösbar</value></prop>
                 <prop oor:name="Measure"><value>S;2300;2300;2000;2000;1450;675;8;6</value></prop></node>
-            <node oor:name="L2" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8602 A5 Kreise 60 mm, gelb, ablösbar</value></prop>
+            <node oor:name="L2" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8602 A5 Kreise 60 mm, gelb, ablösbar</value></prop>
                 <prop oor:name="Measure"><value>S;6700;6700;6000;6000;800;1075;3;2</value></prop></node>
-            <node oor:name="L3" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8603 A5 weiß, Ecken abgerundet, ablösbar</value></prop>
+            <node oor:name="L3" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8603 A5 weiß, Ecken abgerundet, ablösbar</value></prop>
                 <prop oor:name="Measure"><value>S;1524;850;1270;850;721;1050;13;15</value></prop></node>
-            <node oor:name="L4" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8604 A5 weiß, Ecken abgerundet, ablösbar</value></prop>
+            <node oor:name="L4" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8604 A5 weiß, Ecken abgerundet, ablösbar</value></prop>
                 <prop oor:name="Measure"><value>S;2034;1000;1780;1000;457;1425;10;12</value></prop></node>
-            <node oor:name="L5" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8605 A5 weiß, Ecken abgerundet, ablösbar</value></prop>
+            <node oor:name="L5" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8605 A5 weiß, Ecken abgerundet, ablösbar</value></prop>
                 <prop oor:name="Measure"><value>S;2794;1693;2540;1693;848;1499,5;7;7</value></prop></node>
-            <node oor:name="L6" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8606 A5 Diabeschriftung, weiß</value></prop>
+            <node oor:name="L6" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8606 A5 Diabeschriftung, weiß</value></prop>
                 <prop oor:name="Measure"><value>S;4826;1000;4572;1000;975;1425;4;12</value></prop></node>
-            <node oor:name="L7" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8607 A5 Sichtreiteretiketten, weiß</value></prop>
+            <node oor:name="L7" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8607 A5 Sichtreiteretiketten, weiß</value></prop>
                 <prop oor:name="Measure"><value>S;4826;1693;4572;1693;975;1499,5;4;7</value></prop></node>
-            <node oor:name="L8" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8608 A5 weiß, Ecken abgerundet</value></prop>
+            <node oor:name="L8" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8608 A5 weiß, Ecken abgerundet</value></prop>
                 <prop oor:name="Measure"><value>S;6604;2963,3;6350;2963,3;721;1499,5;3;4</value></prop></node>
-            <node oor:name="L9" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8609 A5 weiß, Ecken abgerundet</value></prop>
+            <node oor:name="L9" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8609 A5 weiß, Ecken abgerundet</value></prop>
                 <prop oor:name="Measure"><value>S;9854;4233;9600;4233;773;1075,5;2;3</value></prop></node>
-            <node oor:name="L10" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8610 A5 weiß, Ecken abgerundet</value></prop>
+            <node oor:name="L10" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8610 A5 weiß, Ecken abgerundet</value></prop>
                 <prop oor:name="Measure"><value>S;9854;6350;9600;6350;773;1075;2;2</value></prop></node>
-            <node oor:name="L11" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8611 A5 3,5"-Disketten, farbig sortiert</value></prop>
+            <node oor:name="L11" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8611 A5 3,5"-Disketten, farbig sortiert</value></prop>
                 <prop oor:name="Measure"><value>S;9000;6773;7000;6773;2500;652;2;2</value></prop></node>
-            <node oor:name="L12" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8612 A5 Videoetiketten, Front, weiß</value></prop>
+            <node oor:name="L12" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8612 A5 Videoetiketten, Front, weiß</value></prop>
                 <prop oor:name="Measure"><value>S;8128;4646;7874;4646;2499;2769;2;2</value></prop></node>
-            <node oor:name="L13" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8613 A5 Videoetiketten, Rücken, weiß</value></prop>
+            <node oor:name="L13" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8613 A5 Videoetiketten, Rücken, weiß</value></prop>
                 <prop oor:name="Measure"><value>S;14732;1693;14732;1693;3134;1499,5;1;7</value></prop></node>
-            <node oor:name="L14" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8614 A5 Musik-Cassetten, weiß</value></prop>
+            <node oor:name="L14" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8614 A5 Musik-Cassetten, weiß</value></prop>
                 <prop oor:name="Measure"><value>S;9154;4233;8900;4233;1473;1075,5;2;3</value></prop></node>
-            <node oor:name="L15" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8615 A5 für schmale Ordner, farbig sortiert</value></prop>
+            <node oor:name="L15" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8615 A5 für schmale Ordner, farbig sortiert</value></prop>
                 <prop oor:name="Measure"><value>S;19200;3800;19200;3800;900;1725;1;3</value></prop></node>
-            <node oor:name="L16" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8616 A5 für breite Ordner, farbig sortiert</value></prop>
+            <node oor:name="L16" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8616 A5 für breite Ordner, farbig sortiert</value></prop>
                 <prop oor:name="Measure"><value>S;19200;6100;19200;6100;900;1325;1;2</value></prop></node>
         </node>
         <node oor:name="Herma endlos" oor:op="replace">
 
-<node oor:name="L0" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8001 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L0" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8001 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;2540;8890;2300;1105;0;1;1</value></prop></node>
-<node oor:name="L1" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8002 Endlosetiketten 3-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L1" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8002 Endlosetiketten 3-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;2794;1693;2540;1453;1486;0;3;1</value></prop></node>
-<node oor:name="L2" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8003 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L2" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8003 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;3810;2117;3556;1900;1867;0;2;1</value></prop></node>
-<node oor:name="L3" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8004 Endlosetiketten 2-bahnig, Diabeschriftung</value></prop>
+<node oor:name="L3" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8004 Endlosetiketten 2-bahnig, Diabeschriftung</value></prop>
     <prop oor:name="Measure"><value>C;4572;1270;4318;1030;1105;0;2;1</value></prop></node>
-<node oor:name="L4" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8005 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L4" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8005 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;4064;2540;3810;2300;1613;0;2;1</value></prop></node>
-<node oor:name="L5" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8006 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L5" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8006 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;4318;1693;4064;1453;1359;0;2;1</value></prop></node>
-<node oor:name="L6" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8007 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L6" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8007 Endlosetiketten 2-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;4572;3810;4318;3570;1105;0;2;1</value></prop></node>
-<node oor:name="L7" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8008 Endlosetiketten 1-bahnig, 3,5"-Diskette, weiß</value></prop>
+<node oor:name="L7" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8008 Endlosetiketten 1-bahnig, 3,5"-Diskette, weiß</value></prop>
     <prop oor:name="Measure"><value>C;7112;7620;7112;6960;1994;0;1;1</value></prop></node>
-<node oor:name="L8" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8009 Endlosetiketten 1-bahnig, Namensetiketten, Acetatseide</value></prop>
+<node oor:name="L8" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8009 Endlosetiketten 1-bahnig, Namensetiketten, Acetatseide</value></prop>
     <prop oor:name="Measure"><value>C;7000;2540;7000;2300;1500;0;1;1</value></prop></node>
-<node oor:name="L9" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8010 Endlosetiketten 1-bahnig, 3,5"-Diskette, weiß, Front</value></prop>
+<node oor:name="L9" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8010 Endlosetiketten 1-bahnig, 3,5"-Diskette, weiß, Front</value></prop>
     <prop oor:name="Measure"><value>C;7112;5080;7112;4840;1444;0;1;1</value></prop></node>
-<node oor:name="L10" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8011 Endlosetiketten 1-bahnig, 3,5"-Diskette, gelb</value></prop>
+<node oor:name="L10" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8011 Endlosetiketten 1-bahnig, 3,5"-Diskette, gelb</value></prop>
     <prop oor:name="Measure"><value>C;7112;7620;7112;6960;1994;0;1;1</value></prop></node>
-<node oor:name="L11" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8012 Endlosetiketten 1-bahnig, 3,5"-Diskette, rot</value></prop>
+<node oor:name="L11" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8012 Endlosetiketten 1-bahnig, 3,5"-Diskette, rot</value></prop>
     <prop oor:name="Measure"><value>C;7112;7620;7112;6960;1994;0;1;1</value></prop></node>
-<node oor:name="L12" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8013 Endlosetiketten 1-bahnig, 3,5"-Diskette, blau</value></prop>
+<node oor:name="L12" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8013 Endlosetiketten 1-bahnig, 3,5"-Diskette, blau</value></prop>
     <prop oor:name="Measure"><value>C;7112;7620;7112;6960;1994;0;1;1</value></prop></node>
-<node oor:name="L13" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8014 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L13" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8014 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;6858;3810;6858;3570;1571;0;1;1</value></prop></node>
-<node oor:name="L14" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8015 Endlosetiketten 1-bahnig, 3,5"-Diskette, grün</value></prop>
+<node oor:name="L14" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8015 Endlosetiketten 1-bahnig, 3,5"-Diskette, grün</value></prop>
     <prop oor:name="Measure"><value>C;7112;7620;7112;6960;1994;0;1;1</value></prop></node>
-<node oor:name="L15" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8021 Endlosetiketten 2-bahnig, gelb</value></prop>
+<node oor:name="L15" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8021 Endlosetiketten 2-bahnig, gelb</value></prop>
     <prop oor:name="Measure"><value>C;4064;2540;3810;2300;1613;0;2;1</value></prop></node>
-<node oor:name="L16" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8022 Endlosetiketten 2-bahnig, rot</value></prop>
+<node oor:name="L16" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8022 Endlosetiketten 2-bahnig, rot</value></prop>
     <prop oor:name="Measure"><value>C;4064;2540;3810;2300;1613;0;2;1</value></prop></node>
-<node oor:name="L17" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8036 Endlosetiketten 2-bahnig, ablösbar</value></prop>
+<node oor:name="L17" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8036 Endlosetiketten 2-bahnig, ablösbar</value></prop>
     <prop oor:name="Measure"><value>C;4064;2540;3810;2300;1613;0;2;1</value></prop></node>
-<node oor:name="L18" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8040 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L18" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8040 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L19" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8041 Endlosetiketten 1-bahnig, gelb</value></prop>
+<node oor:name="L19" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8041 Endlosetiketten 1-bahnig, gelb</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L20" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8042 Endlosetiketten 1-bahnig, rot</value></prop>
+<node oor:name="L20" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8042 Endlosetiketten 1-bahnig, rot</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L21" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8043 Endlosetiketten 1-bahnig, blau</value></prop>
+<node oor:name="L21" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8043 Endlosetiketten 1-bahnig, blau</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L22" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8045 Endlosetiketten 1-bahnig, grün</value></prop>
+<node oor:name="L22" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8045 Endlosetiketten 1-bahnig, grün</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L23" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8050 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L23" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8050 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;5080;8890;4840;1105;0;1;1</value></prop></node>
-<node oor:name="L24" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8060 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L24" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8060 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L25" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8061 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L25" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8061 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;5080;8890;4840;1105;0;1;1</value></prop></node>
-<node oor:name="L26" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8066 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L26" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8066 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;3810;10160;3570;1170;0;1;1</value></prop></node>
-<node oor:name="L27" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8067 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L27" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8067 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10668;3810;10668;3570;916;0;1;1</value></prop></node>
-<node oor:name="L28" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8068 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L28" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8068 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L29" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8069 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L29" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8069 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10668;5080;10668;4840;916;0;1;1</value></prop></node>
-<node oor:name="L30" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8070 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L30" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8070 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;11176;5080;11176;4840;1162;0;1;1</value></prop></node>
-<node oor:name="L31" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8071 Endlosetiketten 1-bahnig, Videocassetten</value></prop>
+<node oor:name="L31" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8071 Endlosetiketten 1-bahnig, Videocassetten</value></prop>
     <prop oor:name="Measure"><value>C;14732;2540;14732;1900;1134;0;1;1</value></prop></node>
-<node oor:name="L32" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8072 Endlosetiketten 1-bahnig, Querperforation, weiß</value></prop>
+<node oor:name="L32" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8072 Endlosetiketten 1-bahnig, Querperforation, weiß</value></prop>
     <prop oor:name="Measure"><value>C;14732;10160;14732;9920;1134;0;1;1</value></prop></node>
-<node oor:name="L33" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8073 Endlosetiketten 1-bahnig, Querperforation, gelb</value></prop>
+<node oor:name="L33" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8073 Endlosetiketten 1-bahnig, Querperforation, gelb</value></prop>
     <prop oor:name="Measure"><value>C;14732;10160;14732;9920;1134;0;1;1</value></prop></node>
-<node oor:name="L34" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8074 Endlosetiketten 1-bahnig, Querperforation, rot</value></prop>
+<node oor:name="L34" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8074 Endlosetiketten 1-bahnig, Querperforation, rot</value></prop>
     <prop oor:name="Measure"><value>C;14732;10160;14732;9920;1134;0;1;1</value></prop></node>
-<node oor:name="L35" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8104 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L35" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8104 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;8890;5080;8890;4840;1105;0;1;1</value></prop></node>
-<node oor:name="L36" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8111 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L36" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8111 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L37" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8112 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L37" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8112 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;10160;3810;10160;3570;1170;0;1;1</value></prop></node>
-<node oor:name="L38" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8113 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L38" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8113 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L39" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8116 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L39" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8116 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;11176;5080;11176;4840;1162;0;1;1</value></prop></node>
-<node oor:name="L40" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8121 Endlosetiketten 1-bahnig, gelb</value></prop>
+<node oor:name="L40" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8121 Endlosetiketten 1-bahnig, gelb</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L41" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8122 Endlosetiketten 1-bahnig, rot</value></prop>
+<node oor:name="L41" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8122 Endlosetiketten 1-bahnig, rot</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L42" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8123 Endlosetiketten 1-bahnig, blau</value></prop>
+<node oor:name="L42" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8123 Endlosetiketten 1-bahnig, blau</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L43" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8125 Endlosetiketten 1-bahnig, grün</value></prop>
+<node oor:name="L43" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8125 Endlosetiketten 1-bahnig, grün</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L44" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8158 Endlosetiketten 1-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L44" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8158 Endlosetiketten 1-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;7366;1270;7366;1030;1317;0;1;1</value></prop></node>
-<node oor:name="L45" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8160 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L45" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8160 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;2540;8890;2300;1105;0;1;1</value></prop></node>
-<node oor:name="L46" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8161 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L46" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8161 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L47" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8162 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L47" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8162 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;3810;10160;3570;1170;0;1;1</value></prop></node>
-<node oor:name="L48" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8163 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L48" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8163 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L49" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8164 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L49" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8164 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;2540;10160;2300;1170;0;1;1</value></prop></node>
-<node oor:name="L50" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8166 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L50" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8166 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;11176;5080;11176;4840;1162;0;1;1</value></prop></node>
-<node oor:name="L51" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8167 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L51" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8167 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;3810;10160;3570;1713;0;2;1</value></prop></node>
-<node oor:name="L52" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8168 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L52" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8168 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;5080;10160;4840;2213;0;2;1</value></prop></node>
-<node oor:name="L53" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8169 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L53" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8169 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;2540;10160;2300;1213;0;2;1</value></prop></node>
-<node oor:name="L54" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8170 Endlosetiketten 1-bahnig, ablösbar</value></prop>
+<node oor:name="L54" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8170 Endlosetiketten 1-bahnig, ablösbar</value></prop>
     <prop oor:name="Measure"><value>C;8890;2540;8890;2300;1105;0;1;1</value></prop></node>
-<node oor:name="L55" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8171 Endlosetiketten 1-bahnig, ablösbar</value></prop>
+<node oor:name="L55" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8171 Endlosetiketten 1-bahnig, ablösbar</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L56" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8172 Endlosetiketten 1-bahnig, ablösbar</value></prop>
+<node oor:name="L56" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8172 Endlosetiketten 1-bahnig, ablösbar</value></prop>
     <prop oor:name="Measure"><value>C;6858;3810;6858;3570;1571;0;1;1</value></prop></node>
-<node oor:name="L57" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8173 Endlosetiketten 1-bahn., Querperforation, ablösbar</value></prop>
+<node oor:name="L57" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8173 Endlosetiketten 1-bahn., Querperforation, ablösbar</value></prop>
     <prop oor:name="Measure"><value>C;14732;7620;14732;7380;1134;0;1;1</value></prop></node>
-<node oor:name="L58" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8178 Endlosetiketten 1-bahnig, schnittgestanzt</value></prop>
+<node oor:name="L58" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8178 Endlosetiketten 1-bahnig, schnittgestanzt</value></prop>
     <prop oor:name="Measure"><value>C;9500;3810;9500;3810;1000;0;1;1</value></prop></node>
-<node oor:name="L59" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8179 Endlosetiketten 1-bahnig, schnittgestanzt</value></prop>
+<node oor:name="L59" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8179 Endlosetiketten 1-bahnig, schnittgestanzt</value></prop>
     <prop oor:name="Measure"><value>C;15200;5080;15200;5080;900;0;1;1</value></prop></node>
-<node oor:name="L60" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8181 Endlosetiketten 1-bahnig, gelb</value></prop>
+<node oor:name="L60" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8181 Endlosetiketten 1-bahnig, gelb</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L61" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8182 Endlosetiketten 1-bahnig, rot</value></prop>
+<node oor:name="L61" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8182 Endlosetiketten 1-bahnig, rot</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L62" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8183 Endlosetiketten 1-bahnig, blau</value></prop>
+<node oor:name="L62" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8183 Endlosetiketten 1-bahnig, blau</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L63" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8185 Endlosetiketten 1-bahnig, grün</value></prop>
+<node oor:name="L63" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8185 Endlosetiketten 1-bahnig, grün</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L64" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8200 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L64" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8200 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;7874;2540;7874;2300;1063;0;1;1</value></prop></node>
-<node oor:name="L65" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8201 Endlosetiketten 1-bahnig, 3,5"-Diskette, Front</value></prop>
+<node oor:name="L65" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8201 Endlosetiketten 1-bahnig, 3,5"-Diskette, Front</value></prop>
     <prop oor:name="Measure"><value>C;7112;5080;7112;4840;1444;0;1;1</value></prop></node>
-<node oor:name="L66" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8202 Endlosetiketten 1-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L66" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8202 Endlosetiketten 1-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;7366;1270;7366;1030;1317;0;1;1</value></prop></node>
-<node oor:name="L67" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8203 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L67" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8203 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;7620;10160;7380;1170;0;1;1</value></prop></node>
-<node oor:name="L68" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8204 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L68" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8204 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;5080;8890;4840;1105;0;1;1</value></prop></node>
-<node oor:name="L69" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8207 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L69" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8207 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;6858;3810;6858;3570;881;0;1;1</value></prop></node>
-<node oor:name="L70" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8209 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L70" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8209 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10668;3810;10668;3570;916;0;1;1</value></prop></node>
-<node oor:name="L71" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8210 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L71" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8210 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;2540;8890;2300;1105;0;1;1</value></prop></node>
-<node oor:name="L72" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8211 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L72" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8211 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8890;3810;8890;3570;1105;0;1;1</value></prop></node>
-<node oor:name="L73" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8212 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L73" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8212 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;3810;10160;3570;1170;0;1;1</value></prop></node>
-<node oor:name="L74" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8213 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L74" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8213 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;5080;10160;4840;1170;0;1;1</value></prop></node>
-<node oor:name="L75" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8214 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L75" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8214 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10160;2540;10160;2300;1170;0;1;1</value></prop></node>
-<node oor:name="L76" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8215 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L76" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8215 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;11176;3810;11176;3570;1162;0;1;1</value></prop></node>
-<node oor:name="L77" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8216 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L77" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8216 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;11176;5080;11176;4840;1162;0;1;1</value></prop></node>
-<node oor:name="L78" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8217 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L78" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8217 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;12700;2540;12700;2300;1150;0;1;1</value></prop></node>
-<node oor:name="L79" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8218 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L79" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8218 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;12700;3810;12700;3570;1150;0;1;1</value></prop></node>
-<node oor:name="L80" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8219 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L80" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8219 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;13460;2117;13460;1900;1200;0;1;1</value></prop></node>
-<node oor:name="L81" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8220 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L81" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8220 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;9144;3810;8890;3570;1108;0;2;1</value></prop></node>
-<node oor:name="L82" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8221 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L82" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8221 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;9144;2540;8890;2300;1108;0;2;1</value></prop></node>
-<node oor:name="L83" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8222 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L83" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8222 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;5334;3810;5080;3570;1043;0;2;1</value></prop></node>
-<node oor:name="L84" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8223 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L84" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8223 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;4064;2540;3810;2300;1613;0;2;1</value></prop></node>
-<node oor:name="L85" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8225 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L85" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8225 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;3810;10160;3570;1213;0;2;1</value></prop></node>
-<node oor:name="L86" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8226 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L86" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8226 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;9144;5080;8890;4840;1108;0;2;1</value></prop></node>
-<node oor:name="L87" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8227 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L87" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8227 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;5080;10160;4840;1213;0;2;1</value></prop></node>
-<node oor:name="L88" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8228 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L88" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8228 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;4064;1270;3810;1030;1613;0;2;1</value></prop></node>
-<node oor:name="L89" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8229 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L89" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8229 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;5334;2540;5080;2300;1043;0;2;1</value></prop></node>
-<node oor:name="L90" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8230 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L90" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8230 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;9144;2540;8890;2300;1211;0;3;1</value></prop></node>
-<node oor:name="L91" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8231 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L91" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8231 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;9144;3810;8890;3570;1211;0;3;1</value></prop></node>
-<node oor:name="L92" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8232 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L92" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8232 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;3810;10160;3570;1156;0;3;1</value></prop></node>
-<node oor:name="L93" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8233 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L93" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8233 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10922;5080;10668;4840;1244;0;3;1</value></prop></node>
-<node oor:name="L94" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8234 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L94" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8234 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;9144;5080;8890;4840;1211;0;3;1</value></prop></node>
-<node oor:name="L95" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8235 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L95" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8235 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;11430;5080;11176;4840;1232;0;3;1</value></prop></node>
-<node oor:name="L96" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8236 Endlosetiketten 3-bahnig, mit Querperforation</value></prop>
+<node oor:name="L96" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8236 Endlosetiketten 3-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;7112;3810;6858;3570;1209;0;3;1</value></prop></node>
-<node oor:name="L97" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8237 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L97" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8237 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10922;3810;10668;3570;1244;0;3;1</value></prop></node>
-<node oor:name="L98" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8238 Endlosetiketten 3-bahnig</value></prop>
+<node oor:name="L98" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8238 Endlosetiketten 3-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10414;5080;10160;4840;1156;0;3;1</value></prop></node>
-<node oor:name="L99" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8240 Endlosetiketten 4-bahnig</value></prop>
+<node oor:name="L99" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8240 Endlosetiketten 4-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;7620;3810;7366;3570;1087;0;4;1</value></prop></node>
-<node oor:name="L100" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8241 Endlosetiketten 4-bahnig</value></prop>
+<node oor:name="L100" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8241 Endlosetiketten 4-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8382;2540;8128;2300;1213;0;4;1</value></prop></node>
-<node oor:name="L101" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8242 Endlosetiketten 4-bahnig</value></prop>
+<node oor:name="L101" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8242 Endlosetiketten 4-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8382;3810;8128;3570;1213;0;4;1</value></prop></node>
-<node oor:name="L102" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8243 Endlosetiketten 4-bahnig</value></prop>
+<node oor:name="L102" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8243 Endlosetiketten 4-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;8382;5080;8128;4840;1213;0;4;1</value></prop></node>
-<node oor:name="L103" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8245 Endlosetiketten 4-bahnig</value></prop>
+<node oor:name="L103" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8245 Endlosetiketten 4-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;5334;2540;5080;2300;1209;0;4;1</value></prop></node>
-<node oor:name="L104" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8246 Endlosetiketten 4-bahnig</value></prop>
+<node oor:name="L104" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8246 Endlosetiketten 4-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;5334;3810;5080;3570;1209;0;4;1</value></prop></node>
-<node oor:name="L105" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8265 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L105" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8265 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;12700;5080;12700;4840;1150;0;1;1</value></prop></node>
-<node oor:name="L106" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8266 Endlosetiketten 2-bahnig</value></prop>
+<node oor:name="L106" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8266 Endlosetiketten 2-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;12954;5080;12700;4840;1173;0;2;1</value></prop></node>
-<node oor:name="L107" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8267 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L107" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8267 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;7874;3810;7874;3570;1063;0;1;1</value></prop></node>
-<node oor:name="L108" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8268 Endlosetiketten 3-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L108" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8268 Endlosetiketten 3-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;2794;1693;2540;1453;1486;0;3;1</value></prop></node>
-<node oor:name="L109" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8002 Endlosetiketten 3-bahnig, Kennzeichnung</value></prop>
+<node oor:name="L109" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8002 Endlosetiketten 3-bahnig, Kennzeichnung</value></prop>
     <prop oor:name="Measure"><value>C;2794;1693;2540;1453;1486;0;3;1</value></prop></node>
-<node oor:name="L110" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8269 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L110" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8269 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;21082;15240;21082;15000;1209;0;1;1</value></prop></node>
-<node oor:name="L111" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8290 Endlosetiketten 2-bahnig, mit Querperforation</value></prop>
+<node oor:name="L111" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8290 Endlosetiketten 2-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;14986;10160;14732;9920;1141;0;2;1</value></prop></node>
-<node oor:name="L112" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8291 Endlosetiketten 1-bahnig, 3,5"-Diskette</value></prop>
+<node oor:name="L112" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8291 Endlosetiketten 1-bahnig, 3,5"-Diskette</value></prop>
     <prop oor:name="Measure"><value>C;7112;7620;7112;6960;1994;0;1;1</value></prop></node>
-<node oor:name="L113" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8292 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L113" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8292 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;14732;10160;14732;9920;1134;0;1;1</value></prop></node>
-<node oor:name="L114" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8293 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L114" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8293 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;14732;5080;14732;4840;1134;0;1;1</value></prop></node>
-<node oor:name="L115" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8294 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
+<node oor:name="L115" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8294 Endlosetiketten 1-bahnig, mit Querperforation</value></prop>
     <prop oor:name="Measure"><value>C;14732;7620;14732;7380;1134;0;1;1</value></prop></node>
-<node oor:name="L116" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8295 Endlosetiketten 8-bahnig</value></prop>
+<node oor:name="L116" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8295 Endlosetiketten 8-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;4064;1270;3810;1030;1371;0;8;1</value></prop></node>
-<node oor:name="L117" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8296 Endlosetiketten 1-bahnig</value></prop>
+<node oor:name="L117" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8296 Endlosetiketten 1-bahnig</value></prop>
     <prop oor:name="Measure"><value>C;10668;5080;10668;4840;916;0;1;1</value></prop></node>
-<node oor:name="L118" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value xml:lang="x-no-translate">true</value><value xml:lang="en-US">8299 Endlosetiketten 1-bahnig, 5,25"-Diskette, ablösbar</value></prop>
+<node oor:name="L118" oor:op="replace" oor:finalized="true"><prop oor:name="Name"><value>8299 Endlosetiketten 1-bahnig, 5,25"-Diskette, ablösbar</value></prop>
     <prop oor:name="Measure"><value>C;7112;3386;7112;3146;1444;0;1;1</value></prop></node>
     </node>
         <node oor:name="Leitz" oor:op="replace">
@@ -14566,7 +13462,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1680 Kartonrückenschilder, breit</value>
+                    <value>1680 Kartonrückenschilder, breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14577,7 +13473,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1681 Kartonrückenschilder, schmal</value>
+                    <value>1681 Kartonrückenschilder, schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14588,7 +13484,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1685 Papierrückenschilder selbstkl., breit</value>
+                    <value>1685 Papierrückenschilder selbstkl., breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14599,7 +13495,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1686 Papierrückenschilder selbstkl., schmal</value>
+                    <value>1686 Papierrückenschilder selbstkl., schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14610,7 +13506,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1687 Papierrückenschilder selbstkl., breit</value>
+                    <value>1687 Papierrückenschilder selbstkl., breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14621,7 +13517,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1688 Papierrückenschilder selbstkl., schmal</value>
+                    <value>1688 Papierrückenschilder selbstkl., schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14632,7 +13528,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">6098 Papierrückenschilder selbstkl., breit</value>
+                    <value>6098 Papierrückenschilder selbstkl., breit</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14643,7 +13539,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">6099 Papierrückenschilder selbstkl., schmal</value>
+                    <value>6099 Papierrückenschilder selbstkl., schmal</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14654,7 +13550,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">1900 Blanko-Schildchen</value>
+                    <value>1900 Blanko-Schildchen</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14665,7 +13561,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">2466 Blanko-Schildchen</value>
+                    <value>2466 Blanko-Schildchen</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14676,7 +13572,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">6010 Blanko-Schildchen</value>
+                    <value>6010 Blanko-Schildchen</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14687,7 +13583,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">6643 Beschriftungsschilder, selbstklebend </value>
+                    <value>6643 Beschriftungsschilder, selbstklebend </value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14701,7 +13597,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP001 Tischkarten blanko weiß</value>
+                    <value>DP001 Tischkarten blanko weiß</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14712,7 +13608,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP002 Tischkarten konturgestanzt</value>
+                    <value>DP002 Tischkarten konturgestanzt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14723,7 +13619,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DE115 Design-Etiketten</value>
+                    <value>DE115 Design-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14734,7 +13630,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DE141 Design-Etiketten</value>
+                    <value>DE141 Design-Etiketten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14745,7 +13641,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP750 CD-Einleger</value>
+                    <value>LP750 CD-Einleger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14756,7 +13652,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DD300 CD-Einleger</value>
+                    <value>DD300 CD-Einleger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14767,7 +13663,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DD405 CD-Einleger</value>
+                    <value>DD405 CD-Einleger</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14778,7 +13674,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP755 CD-Booklet</value>
+                    <value>LP755 CD-Booklet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14789,7 +13685,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DD450 CD-Booklet</value>
+                    <value>DD450 CD-Booklet</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14800,7 +13696,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP839/DP939 Design-Visitenkarten</value>
+                    <value>DP839/DP939 Design-Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14811,7 +13707,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP835/DP935 Design-Visitenkarten gestanzt</value>
+                    <value>DP835/DP935 Design-Visitenkarten gestanzt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14822,7 +13718,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP836/DP936 Design-Visitenkarten</value>
+                    <value>DP836/DP936 Design-Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14833,7 +13729,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP837/DP937 Design-Visitenkarten gestanzt, m. abger. Ecken</value>
+                    <value>DP837/DP937 Design-Visitenkarten gestanzt, m. abger. Ecken</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14844,7 +13740,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">DP838/DP938 Design-Klapp-Visitenkarten</value>
+                    <value>DP838/DP938 Design-Klapp-Visitenkarten</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14855,7 +13751,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP781 Regalschild</value>
+                    <value>LP781 Regalschild</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14866,7 +13762,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP731 Ordner-Einsteckschild</value>
+                    <value>LP731 Ordner-Einsteckschild</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14877,7 +13773,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP734 Ordner-Einsteckschild</value>
+                    <value>LP734 Ordner-Einsteckschild</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14888,7 +13784,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP710 Postkarte bedruckt</value>
+                    <value>LP710 Postkarte bedruckt</value>
                 </prop>
                 <prop oor:name="Measure">
 
@@ -14899,7 +13795,7 @@
 
                 <prop oor:name="Name">
 
-                    <value xml:lang="x-no-translate">true</value><value xml:lang="en-US">LP711 Postkarte</value>
+                    <value>LP711 Postkarte</value>
                 </prop>
                 <prop oor:name="Measure">
 
diff --git a/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu b/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
index a4e8b48031..d48521411e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Linguistic.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Linguistic.xcu,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Logging.xcu b/officecfg/registry/data/org/openoffice/Office/Logging.xcu
index f15cf830a8..799a6f34c7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Logging.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Logging.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Logging.xcu,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Math.xcu b/officecfg/registry/data/org/openoffice/Office/Math.xcu
index a9939fa4c4..3acc948129 100644
--- a/officecfg/registry/data/org/openoffice/Office/Math.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Math.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Math.xcu,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 06fc5bdcef..bb062d94a8 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Paths.xcu,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -226,6 +223,13 @@
             </prop>
         </node>
     </node>
-
+    <node oor:name="Variables">
+        <prop oor:name="Work">
+            <value install:module="macosx" oor:external=
+           "com.sun.star.configuration.backend.MacOSXBackend WorkPathVariable"/>
+            <value install:module="unixdesktop" oor:external=
+          "com.sun.star.configuration.backend.DesktopBackend WorkPathVariable"/>
+        </prop>
+    </node>
 </oor:component-data>
 
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index a6efdca81f..52db8cb5de 100644
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProtocolHandler.xcu,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/officecfg/registry/data/org/openoffice/Office/Recovery.xcu b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
new file mode 100644
index 0000000000..efe80701a6
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<oor:component-data xmlns:install="http://openoffice.org/2004/installation"
+    xmlns:oor="http://openoffice.org/2001/registry"
+    oor:package="org.openoffice.Office" oor:name="Recovery">
+  <node oor:name="AutoSave" install:module="gconflockdown">
+    <prop oor:name="Enabled">
+      <value oor:external=
+          "com.sun.star.configuration.backend.GconfBackend AutoSaveEnabled"/>
+    </prop>
+    <prop oor:name="TimeIntervall">
+      <value oor:external=
+       "com.sun.star.configuration.backend.GconfBackend AutoSaveTimeIntervall"/>
+    </prop>
+  </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/SFX.xcu b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
index 2a185f707a..f9429c3899 100644
--- a/officecfg/registry/data/org/openoffice/Office/SFX.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/SFX.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SFX.xcu,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/officecfg/registry/data/org/openoffice/Office/Scripting.xcu b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
index 0c7b9a52e4..2512fbea63 100644
--- a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Scripting.xcu,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/Security.xcu b/officecfg/registry/data/org/openoffice/Office/Security.xcu
index 40c5f32433..5de66a0a81 100644
--- a/officecfg/registry/data/org/openoffice/Office/Security.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Security.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Security.xcu,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu b/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
index c78486f75d..f039454d3e 100644
--- a/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/TableWizard.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TableWizard.xcu,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/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
index dee2c35616..d2d3d05741 100644
--- a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TypeDetection.xcu,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/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 55104521ff..48f51ebbef 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UI.xcu,v $
- * $Revision: 1.38.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index a0e225ec2e..8ba1a72b81 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BasicIDEWindowState.xcu,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -116,7 +113,7 @@
                     
                 </prop>
                 <prop oor:name="Docked" oor:type="xs:boolean">
-                    <value>False</value>
+                    <value>false</value>
                 </prop>
                 <prop oor:name="Visible" oor:type="xs:boolean">
                     <value>true</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 4cf86e66c2..b3ddf0ce33 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CalcWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
index cc40843f4d..d69c481fa7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
@@ -656,6 +656,29 @@
                     <value xml:lang="en-US">Number of lines in combination chart</value>
                 </prop>
             </node>
+            <node oor:name=".uno:TextAttributes" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Te~xt...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Description...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:RenameObject" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Name...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:LineArrowEnd" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Line Ends with Arrow</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
         </node>
         
         <!-- menu items with sub menu -->
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
index 23f1c338bc..2397810ed2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartWindowState.xcu,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,6 +59,20 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/drawbar" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Drawing</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
         </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 46a68a088c..d57d1b3b4d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Controller.xcu,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -223,15 +220,81 @@
       </node>
       <node oor:name="c3" oor:op="replace">
         <prop oor:name="Command">
-            <value>.uno:ChartElementSelector</value>
+          <value>.uno:ChartElementSelector</value>
         </prop>
         <prop oor:name="Module">
-            <value>com.sun.star.chart2.ChartDocument</value>
+          <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-            <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
+          <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
         </prop>
-    </node>
+      </node>
+      <node oor:name="c4" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:BasicShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c5" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:SymbolShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c6" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ArrowShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c7" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FlowChartShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c8" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:CalloutShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c9" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:StarShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="StatusBar">
       <node oor:name="c1" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 0e029adec7..385617f693 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DrawWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index f609501573..68aca6182a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Effects.xcu,v $
- * $Revision: 1.9.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
index 0884a72d84..701e868b2d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Factories.xcu,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
index 350d7bd493..92a9f2cb6a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GenericCategories.xcu,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0dced3ed2f..ab40f205c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2,14 +2,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: GenericCommands.xcu,v $
- * $Revision: 1.72.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index bc52e1136d..735fcd0204 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ImpressWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
index 398c22e394..f7b9bddf2f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MathWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
index ffffbd94fd..cd81c0db8b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
@@ -2,14 +2,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: StartModuleCommands.xcu,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
index eb08ac6444..82e076875b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StartModuleWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index 2a15526000..c62f6324c7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WriterFormWindowState.xcu,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index aeb443e3eb..3988e6dcd6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WriterGlobalWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index c5a6cbca1c..d7303336e3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WriterReportWindowState.xcu,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index 93433e6efe..49c862fb92 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WriterWebWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 12cc7a9de0..ec708174a6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WriterWindowState.xcu,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/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 202ec117d8..841514c25f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsWindowState.xcu,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
index 2393152ea0..7979878e3a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index 9cff446871..73d9f0fa4a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Views.xcu,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
index b3566f11d3..a660d9f0d9 100644
--- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WebWizard.xcu,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/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index b21f880402..d19e9e5d78 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Writer.xcu,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/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index e8753721d6..5cd876f75b 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.112.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,6 +74,8 @@ MODULEFILES= \
     Common-base.xcu   \
     Common-math.xcu   \
     Common-unx.xcu   \
+    Common-unixdesktop.xcu \
+    Common-gconflockdown.xcu \
     Common-macosx.xcu   \
     Common-wnt.xcu   \
     Common-UseOOoFileDialogs.xcu \
@@ -88,6 +86,7 @@ MODULEFILES= \
     Common-korea.xcu   \
     Paths-macosx.xcu    \
     Paths-unxwnt.xcu    \
+    Paths-unixdesktop.xcu \
     Writer-cjk.xcu \
     Writer-javamail.xcu \
     Impress-ogltrans.xcu \
@@ -98,8 +97,8 @@ MODULEFILES= \
     Embedding-math.xcu   \
     Embedding-base.xcu   \
     Embedding-writer.xcu \
-    UI-brand.xcu
-
+    UI-brand.xcu \
+    Recovery-gconflockdown.xcu
 
 LOCALIZEDFILES= \
     Accelerators.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 3664843292..2b5945bffd 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -2,14 +2,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: Setup.xcu,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -329,7 +326,7 @@
                     <value >swform</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: Form Design</value>
+                    <value>Base: Form Design</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryWindowStateConfigRef">
                     <value >WriterFormWindowState</value>
@@ -364,7 +361,7 @@
                     <value>swreport</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: Report Design</value>
+                    <value>Base: Report Design</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryWindowStateConfigRef">
                     <value>WriterReportWindowState</value>
@@ -402,8 +399,7 @@
                     <value >swxform</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">XML Form Document</value>
-                    <value xml:lang="de">XML Formulardokumente</value>
+                    <value>XML Form Document</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryWindowStateConfigRef">
                     <value >XFormsWindowState</value>
@@ -473,7 +469,7 @@
                     <value >GenericCategories</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: Relation Design</value>
+                    <value>Base: Relation Design</value>
                 </prop>
             </node>
             <node oor:name="com.sun.star.sdb.QueryDesign" oor:op="replace" install:module="base">
@@ -498,7 +494,7 @@
                     <value >GenericCategories</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: Query Design</value>
+                    <value>Base: Query Design</value>
                 </prop>
             </node>
             <node oor:name="com.sun.star.sdb.ViewDesign" oor:op="replace" install:module="base">
@@ -523,7 +519,7 @@
                     <value >GenericCategories</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: View Design</value>
+                    <value>Base: View Design</value>
                 </prop>
             </node>
       <node oor:name="com.sun.star.sdb.TableDesign" oor:op="replace" install:module="base">
@@ -548,7 +544,7 @@
                     <value >GenericCategories</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: Table Design</value>
+                    <value>Base: Table Design</value>
                 </prop>
             </node>
             <node oor:name="com.sun.star.sdb.DataSourceBrowser" oor:op="replace" install:module="base">
@@ -573,7 +569,7 @@
                     <value >GenericCategories</value>
                 </prop>
                 <prop oor:name="ooSetupFactoryUIName">
-                    <value xml:lang="en-US">Base: Data View</value>
+                    <value>Base: Data View</value>
                 </prop>
             </node>
             <node oor:name="com.sun.star.sdb.TableDataView" oor:op="replace" install:module="base">
diff --git a/officecfg/registry/data/org/openoffice/System.xcu b/officecfg/registry/data/org/openoffice/System.xcu
new file mode 100644
index 0000000000..9e3ae0ea77
--- /dev/null
+++ b/officecfg/registry/data/org/openoffice/System.xcu
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
+    oor:package="org.openoffice" oor:name="System">
+  <node oor:name="L10N">
+    <prop oor:name="Locale">
+      <value oor:external=
+          "com.sun.star.configuration.backend.LocaleBackend Locale"/>
+    </prop>
+    <prop oor:name="UILocale">
+      <value oor:external=
+          "com.sun.star.configuration.backend.LocaleBackend UILocale"/>
+    </prop>
+    <prop oor:name="SystemLocale">
+      <value oor:external=
+          "com.sun.star.configuration.backend.LocaleBackend SystemLocale"/>
+    </prop>
+  </node>
+</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
index 7d5956d72f..1ac4f3baa6 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UISort.xcu,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
index 80f1a89bec..f09ab7502a 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/data/org/openoffice/UserProfile.xcu b/officecfg/registry/data/org/openoffice/UserProfile.xcu
index f94a294f7f..4934c05e97 100644
--- a/officecfg/registry/data/org/openoffice/UserProfile.xcu
+++ b/officecfg/registry/data/org/openoffice/UserProfile.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UserProfile.xcu,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,5 +34,12 @@
   <prop oor:name="fathersname" oor:type="xs:string">
    <value/>
   </prop>
+  <prop oor:name="givenname" install:module="gconflockdown">
+    <value oor:external=
+        "com.sun.star.configuration.backend.GconfBackend givenname"/>
+  </prop>
+  <prop oor:name="sn" install:module="gconflockdown">
+    <value oor:external="com.sun.star.configuration.backend.GconfBackend sn"/>
+  </prop>
  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 8b6297b966..ef9c7a3bcc 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -26,16 +26,20 @@
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
-<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <node oor:name="Settings">
     <node oor:name="Accessibility" oor:op="replace">
       <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
         <value>false</value>
+        <value install:module="unixdesktop" oor:external=
+       "com.sun.star.configuration.backend.DesktopBackend EnableATToolSupport"/>
       </prop>
     </node>
     <node oor:name="DesktopManagement" oor:op="replace">
       <prop oor:name="DisablePrinting" oor:type="xs:string" oor:op="replace">
         <value>false</value>
+        <value install:module="gconflockdown" oor:external=
+            "com.sun.star.configuration.backend.GconfBackend DisablePrinting"/>
       </prop>
     </node>
     <node oor:name="Transfer" oor:op="replace">
@@ -1549,7 +1553,6 @@
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>바탕</value>
-          <value></value>
         </prop>
         <prop oor:name="SubstFontsPS">
           <value></value>
diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
index e2b1d26856..b51285af50 100644
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -42,12 +38,16 @@ PACKAGE=org.openoffice
 XCUFILES= \
     Inet.xcu \
     Setup.xcu \
+    System.xcu \
     VCL.xcu \
     FirstStartWizard.xcu \
     UserProfile.xcu \
     Interaction.xcu
 
 MODULEFILES= \
+    Inet-macosx.xcu \
+    Inet-unixdesktop.xcu \
+    Inet-wnt.xcu \
     Setup-brand.xcu \
     Setup-writer.xcu   \
     Setup-calc.xcu   \
@@ -56,22 +56,15 @@ MODULEFILES= \
     Setup-base.xcu   \
     Setup-math.xcu \
     Setup-report.xcu \
-    Setup-start.xcu
+    Setup-start.xcu \
+    UserProfile-gconflockdown.xcu \
+    VCL-gconflockdown.xcu \
+    VCL-unixdesktop.xcu
 
 LOCALIZEDFILES=Setup.xcu
 
-SAMPLEFILES= \
-    LDAP.xcu.sample
-
 .INCLUDE :  target.mk
 
 LANGUAGEPACKS=$(MISC)$/registry$/spool$/Langpack-{$(alllangiso)}.xcu
-SAMPLETARGETS=$(MISC)$/registry$/data$/$(PACKAGEDIR)$/{$(SAMPLEFILES)}
 
 ALLTAR : $(LANGUAGEPACKS)
-ALLTAR : $(SAMPLETARGETS)
-
-$(SAMPLETARGETS) : $(SAMPLEFILES)
-    -$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index 988a4755af..314363368e 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Configuration.xcu,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/officecfg/registry/data/org/openoffice/ucb/makefile.mk b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
index 0ae3a5547f..fccb0e97ab 100644
--- a/officecfg/registry/data/org/openoffice/ucb/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/ucb/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/makefile.mk b/officecfg/registry/makefile.mk
index f42752fe94..bc6f3080d0 100644
--- a/officecfg/registry/makefile.mk
+++ b/officecfg/registry/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/schema/makefile.mk b/officecfg/registry/schema/makefile.mk
index e36776d7d5..d735d03c84 100644
--- a/officecfg/registry/schema/makefile.mk
+++ b/officecfg/registry/schema/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/schema/oo-ad-ldap-attr.map b/officecfg/registry/schema/oo-ad-ldap-attr.map
deleted file mode 100644
index 497ec66ce4..0000000000
--- a/officecfg/registry/schema/oo-ad-ldap-attr.map
+++ /dev/null
@@ -1,50 +0,0 @@
-# User.givenName
-org.openoffice.UserProfile/Data/givenname = givenName
-
-# User.sn
-org.openoffice.UserProfile/Data/sn = sn
-
-# User.initials
-org.openoffice.UserProfile/Data/initials = initials
-
-# User.street
-org.openoffice.UserProfile/Data/street = street,postalAddress 
-
-# User.l (city)
-org.openoffice.UserProfile/Data/l = l
-
-# User.st (state)
-org.openoffice.UserProfile/Data/st = st
-
-# User.postalCode
-org.openoffice.UserProfile/Data/postalcode = postalCode
-
-# User.c (country)
-org.openoffice.UserProfile/Data/c = c,co
-
-# User.department (company)
-org.openoffice.UserProfile/Data/o = department
-
-# deprecated -- no LDAP corollary
-org.openoffice.UserProfile/Data/position =
-
-# User.title
-org.openoffice.UserProfile/Data/title = title
-
-# User.homePhone
-org.openoffice.UserProfile/Data/homephone = homePhone
-
-# User.telephoneNumber 
-org.openoffice.UserProfile/Data/telephonenumber = telephoneNumber
-
-# UserfacsimileTelephoneNumber
-org.openoffice.UserProfile/Data/facsimiletelephonenumber = facsimileTelephoneNumber
-
-# User.mail
-org.openoffice.UserProfile/Data/mail = mail
-
-# Deprecated
-#UserGroup =
-
-
-
diff --git a/officecfg/registry/schema/oo-ad-ldap.xcd.sample b/officecfg/registry/schema/oo-ad-ldap.xcd.sample
new file mode 100644
index 0000000000..edc50fb637
--- /dev/null
+++ b/officecfg/registry/schema/oo-ad-ldap.xcd.sample
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<!-- This file is an example of an LDAP configuration file.
+
+     To use user data from LDAP in your installation, you need to provide a
+     customized version of this file, removing the ".sample" suffix.
+
+     This sample file is designed to work with a Windows Active Directory
+     Server.  There is another sample file designed to work with a Sun Java
+     System Directory Server.  Only one of those files should be activated by
+     removing its ".sample" suffix.
+
+     To customize values in this file, replace the data within <value>...
+     </value> elements flagged as "CUSTOMIZE" with the values for your
+     organization.  If a certain setting is not necessary for your installation,
+     you can remove the compelete corresponding <value>...</value> element.
+-->
+
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+  <dependency file="main"/>
+  <oor:component-data oor:package="org.openoffice" oor:name="LDAP">
+    <node oor:name="UserDirectory">
+      <prop oor:name="SearchUser">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyUserLogin</value> -->
+      </prop>
+      <prop oor:name="SearchPassword">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyPassword</value> -->
+      </prop>
+      <prop oor:name="UserObjectClass">
+        <!-- CUSTOMIZE --><value>inetorgperson</value>
+      </prop>
+      <prop oor:name="UserUniqueAttribute">
+        <!-- CUSTOMIZE --><value>uid</value>
+      </prop>
+      <node oor:name="ServerDefinition">
+        <prop oor:name="Server">
+          <!-- CUSTOMIZE --><value>ldapserver.mycorp.com</value>
+        </prop>
+        <prop oor:name="Port">
+          <!-- CUSTOMIZE --><value>389</value>
+        </prop>
+        <prop oor:name="BaseDN">
+          <!-- CUSTOMIZE --><value>dc=mycorp,dc=com</value>
+        </prop>
+      </node>
+    </node>
+  </oor:component-data>
+  <oor:component-data oor:package="org.openoffice" oor:name="UserProfile">
+    <node oor:name="Data">
+      <prop oor:name="o">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe department"/>
+      </prop>
+      <prop oor:name="givenname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe givenname"/>
+      </prop>
+      <prop oor:name="sn">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe sn"/>
+      </prop>
+      <prop oor:name="initials">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe initials"/>
+      </prop>
+      <prop oor:name="street">
+        <value oor:external=
+   "com.sun.star.configuration.backend.LdapUserProfileBe street,postalAddress"/>
+      </prop>
+      <prop oor:name="l">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe l"/>
+      </prop>
+      <prop oor:name="st">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe st"/>
+      </prop>
+      <prop oor:name="postalcode">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe postalCode"/>
+      </prop>
+      <prop oor:name="c">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe c,co"/>
+      </prop>
+      <prop oor:name="title">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe title"/>
+      </prop>
+      <prop oor:name="position">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe position"/>
+      </prop>
+      <prop oor:name="homephone">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe homePhone"/>
+      </prop>
+      <prop oor:name="telephonenumber">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe telephoneNumber"/>
+      </prop>
+      <prop oor:name="facsimiletelephonenumber">
+        <value oor:external=
+ "com.sun.star.configuration.backend.LdapUserProfileBe facsimileTelephoneNumber"
+/>
+      </prop>
+      <prop oor:name="mail">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe mail"/>
+      </prop>
+      <!--
+      <prop oor:name="fathersname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+      <!--
+      <prop oor:name="apartment">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+    </node>
+  </oor:component-data>
+</oor:data>
diff --git a/officecfg/registry/schema/oo-ldap-attr.map b/officecfg/registry/schema/oo-ldap-attr.map
deleted file mode 100644
index 61046f2bb8..0000000000
--- a/officecfg/registry/schema/oo-ldap-attr.map
+++ /dev/null
@@ -1,50 +0,0 @@
-# inetOrgPerson.givenName
-org.openoffice.UserProfile/Data/givenname = givenname
-
-# person.sn
-org.openoffice.UserProfile/Data/sn = sn
-
-# inetOrgPerson.initials
-org.openoffice.UserProfile/Data/initials = initials
-
-# organizationalPerson.street
-org.openoffice.UserProfile/Data/street = street,postalAddress,streetAddress 
-
-# organizationalPerson.l (city)
-org.openoffice.UserProfile/Data/l = l
-
-# organizationalPerson.st (state)
-org.openoffice.UserProfile/Data/st = st
-
-# organizationalPerson.postalCode
-org.openoffice.UserProfile/Data/postalcode = postalcode
-
-# country.c (country)
-org.openoffice.UserProfile/Data/c = 
-
-# organizationalPerson.o (company)
-org.openoffice.UserProfile/Data/o = o,organizationName
-
-# deprecated -- no LDAP corollary
-org.openoffice.UserProfile/Data/position =
-
-# organizationalPerson.title
-org.openoffice.UserProfile/Data/title = title
-
-# inetOrgPerson.homePhone
-org.openoffice.UserProfile/Data/homephone = homephone
-
-# organizationalPerson.telephoneNumber 
-org.openoffice.UserProfile/Data/telephonenumber = telephonenumber
-
-# organizationalPerson.facsimileTelephoneNumber
-org.openoffice.UserProfile/Data/facsimiletelephonenumber = facsimiletelephonenumber,officeFax
-
-# inetOrgPerson.mail
-org.openoffice.UserProfile/Data/mail = mail
-
-# Deprecated
-#UserGroup =
-
-
-
diff --git a/officecfg/registry/schema/oo-ldap.xcd.sample b/officecfg/registry/schema/oo-ldap.xcd.sample
new file mode 100644
index 0000000000..8e9271a44d
--- /dev/null
+++ b/officecfg/registry/schema/oo-ldap.xcd.sample
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<!-- This file is an example of an LDAP configuration file.
+
+     To use user data from LDAP in your installation, you need to provide a
+     customized version of this file, removing the ".sample" suffix.
+
+     This sample file is designed to work with a Sun Java System Directory
+     Server.  There is another sample file designed to work with a Windows
+     Active Directory Server.  Only one of those files should be activated by
+     removing its ".sample" suffix.
+
+     To customize values in this file, replace the data within <value>...
+     </value> elements flagged as "CUSTOMIZE" with the values for your
+     organization.  If a certain setting is not necessary for your installation,
+     you can remove the compelete corresponding <value>...</value> element.
+-->
+
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+  <dependency file="main"/>
+  <oor:component-data oor:package="org.openoffice" oor:name="LDAP">
+    <node oor:name="UserDirectory">
+      <prop oor:name="SearchUser">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyUserLogin</value> -->
+      </prop>
+      <prop oor:name="SearchPassword">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyPassword</value> -->
+      </prop>
+      <prop oor:name="UserObjectClass">
+        <!-- CUSTOMIZE --><value>inetorgperson</value>
+      </prop>
+      <prop oor:name="UserUniqueAttribute">
+        <!-- CUSTOMIZE --><value>uid</value>
+      </prop>
+      <node oor:name="ServerDefinition">
+        <prop oor:name="Server">
+          <!-- CUSTOMIZE --><value>ldapserver.mycorp.com</value>
+        </prop>
+        <prop oor:name="Port">
+          <!-- CUSTOMIZE --><value>389</value>
+        </prop>
+        <prop oor:name="BaseDN">
+          <!-- CUSTOMIZE --><value>dc=mycorp,dc=com</value>
+        </prop>
+      </node>
+    </node>
+  </oor:component-data>
+  <oor:component-data oor:package="org.openoffice" oor:name="UserProfile">
+    <node oor:name="Data">
+      <prop oor:name="o">
+        <value oor:external=
+     "com.sun.star.configuration.backend.LdapUserProfileBe o,organizationName"/>
+      </prop>
+      <prop oor:name="givenname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe givenname"/>
+      </prop>
+      <prop oor:name="sn">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe sn"/>
+      </prop>
+      <prop oor:name="initials">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe initials"/>
+      </prop>
+      <prop oor:name="street">
+        <value oor:external=
+"com.sun.star.configuration.backend.LdapUserProfileBe street,postalAddress,streetAddress"
+/>
+      </prop>
+      <prop oor:name="l">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe l"/>
+      </prop>
+      <prop oor:name="st">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe st"/>
+      </prop>
+      <prop oor:name="postalcode">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe postalcode"/>
+      </prop>
+      <!--
+      <prop oor:name="c">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+      <prop oor:name="title">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe title"/>
+      </prop>
+      <prop oor:name="position">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe position"/>
+      </prop>
+      <prop oor:name="homephone">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe homephone"/>
+      </prop>
+      <prop oor:name="telephonenumber">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe telephonenumber"/>
+      </prop>
+      <prop oor:name="facsimiletelephonenumber">
+        <value oor:external=
+"com.sun.star.configuration.backend.LdapUserProfileBe facsimiletelephonenumber,officeFax"
+/>
+      </prop>
+      <prop oor:name="mail">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe mail"/>
+      </prop>
+      <!--
+      <prop oor:name="fathersname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+      <!--
+      <prop oor:name="apartment">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+    </node>
+  </oor:component-data>
+</oor:data>
diff --git a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
index bfbe4a4b24..3f6da6a5b6 100644
--- a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs
@@ -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: FirstStartWizard.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs b/officecfg/registry/schema/org/openoffice/Inet.xcs
index 2d4e9246cd..b555c3f635 100644
--- a/officecfg/registry/schema/org/openoffice/Inet.xcs
+++ b/officecfg/registry/schema/org/openoffice/Inet.xcs
@@ -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: Inet.xcs,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/officecfg/registry/schema/org/openoffice/LDAP.xcs b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index ef851d0f22..dd5e79833a 100644
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
@@ -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: LDAP.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +54,7 @@
 			</prop>
 			<prop oor:name="UserUniqueAttribute" oor:type="xs:string"><info><desc>Name of User entity unique attribute in LDAP repository</desc></info>
 			</prop>
-			<prop oor:name="Mapping" oor:type="xs:string"><info><desc>Name of OOo to LDAP mapping file</desc></info>
+			<prop oor:name="Mapping" oor:type="xs:string"><info><desc>Obsolete and unused</desc></info>
             </prop>
 			<node-ref oor:name="ServerDefinition" oor:node-type="ServerDefinition">
 				<info><desc>Specifies the LDAP related settings</desc></info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs b/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
index c8472ce6e9..379f7cbb25 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs
@@ -1,89 +1,81 @@
-<?xml version="1.0"?>

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

- *

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

- *

- *  $RCSfile: Accelerators.xcs,v $

- *

- *  $Revision: 1.1.2.6 $

- *

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

- *

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

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

- *

- *

- *    GNU Lesser General Public License Version 2.1

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

- *    Copyright 2005 by Sun Microsystems, Inc.

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

- *

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

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

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

- *

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

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

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

- *    Lesser General Public License for more details.

- *

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

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

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

- *    MA  02111-1307  USA

- *

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

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

-    <info>

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

-    </info>

-	<templates>

-		<group oor:name="Key">		

-            <info>

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

-            </info>	

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

-				<info>

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

-				</info>

-            </prop>	

-		</group>

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

-            <info>

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

-            </info>		

-		</set>

-	</templates>

-	<component>

-	    <group oor:name="PrimaryKeys">

-	        <info>

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

-	        </info>

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

-	            <info>

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

-	            </info>

-	        </set>

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

-	            <info>

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

-	            </info>

-	        </set>	        

-	    </group>

-	    <group oor:name="SecondaryKeys">

-	        <info>

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

-	        </info>

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

-	            <info>

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

-	            </info>

-	        </set>

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

-	            <info>

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

-	            </info>

-	        </set>	        

-	    </group>	    

-	</component>

-</oor:component-schema>

+<?xml version="1.0"?>
+<!--***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************ -->
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Accelerators" oor:package="org.openoffice.Office" xml:lang="en-US">
+    <info>
+        <desc>Configuration of Accelerators replacing the old not XCU-based configuration</desc>
+    </info>
+	<templates>
+		<group oor:name="Key">		
+            <info>
+                <desc>document the Key format</desc>
+            </info>	
+            <prop oor:name="Command" oor:type="xs:string" oor:localized="true">
+				<info>
+					<desc>e.g..uno:About</desc>
+				</info>
+            </prop>	
+		</group>
+		<set oor:name="Module" oor:node-type="Key">
+            <info>
+                <desc>point to a module of OOo</desc>
+            </info>		
+		</set>
+	</templates>
+	<component>
+	    <group oor:name="PrimaryKeys">
+	        <info>
+	            <desc>contains the preferred keys</desc>
+	        </info>
+	        <set oor:name="Global" oor:node-type="Key">
+	            <info>
+				    <desc>Defined as key-values pairs</desc>
+	            </info>
+	        </set>
+	        <set oor:name="Modules" oor:node-type="Module">
+	            <info>
+				    <desc>containing the modules of OOo, defined as key-values pairs</desc>
+	            </info>
+	        </set>	        
+	    </group>
+	    <group oor:name="SecondaryKeys">
+	        <info>
+	            <desc>contains the secondary keys</desc>
+	        </info>
+	        <set oor:name="Global" oor:node-type="Key">
+	            <info>
+				    <desc>Defined as key-values pairs</desc>
+	            </info>
+	        </set>
+	        <set oor:name="Modules" oor:node-type="Module">
+	            <info>
+				    <desc>containing the modules of OOo, defined as key-values pairs</desc>
+	            </info>
+	        </set>	        
+	    </group>	    
+	</component>
+</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
index 75a041e4e3..3e2c61b09d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs
@@ -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: Addons.xcs,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/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 1ab6b58b4d..6daeaf69a8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -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: Calc.xcs,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/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs b/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
index d10d2f5067..35bd2722e1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs
@@ -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: CalcAddIns.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
index 5680a89f8a..8989c0f7c2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
@@ -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: Chart.xcs,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,8 @@
 					<desc>Specifies a list of color values to be used for the first n series, where n is the size of the list. For i &gt; n the color used is equal to entry number i modulo n in the list. You should keep the size of the list at 12. Also note that the values are interpreted as unsigned 32bit values, although it is possible to get negative (signed) numbers in this list when being displayed in decimal.</desc>
 					<label>Chart colors</label>
 				</info>
-				<value>0x004586 0xff420e 0xffd320 0x579d1c 0x7e0021 0x83caff 0x314004 0xaecf00 0x4b1f6f 0xff950e 0xc5000b 0x0084d1</value>
+				<value>17798 16728590 16765728 5741852 8257569 8637183 3227652 11456256 4923247 16749838 12910603 34001</value>
+                                <!-- 0x004586 0xff420e 0xffd320 0x579d1c 0x7e0021 0x83caff 0x314004 0xaecf00 0x4b1f6f 0xff950e 0xc5000b 0x0084d1 -->
 			</prop>
 		</group>
 	</component>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
index 7b77b8b7e0..209b0a1851 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Commands.xcs
@@ -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: Commands.xcs,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/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 1b3e6085d1..cd95db59e0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Common.xcs,v $
- * $Revision: 1.156.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1316,25 +1313,25 @@
 				</info>
 				<value>true</value>
 			</prop>
-			<prop oor:name="ChangeFraction" oor:type="xs:boolean">
+			<prop oor:name="ChangeDash" oor:type="xs:boolean">
 				<!-- OldPath: AutoCorrect/Options/All -->
 				<!-- OldLocation: Soffice.cfg -->
-				<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options  Replace 1/2... -->
+				<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Replace dashes -->
 				<info>
 					<author>OS</author>
-					<desc>Specifies if character combinations for fractions should be replaced with a corresponding single character.</desc>
-					<label>Replace fractions</label>
+					<desc>Specifies if minus signs should be replaced by dashes automatically.</desc>
+					<label>Replace dashes</label>
 				</info>
 				<value>true</value>
 			</prop>
-			<prop oor:name="ChangeDash" oor:type="xs:boolean">
+			<prop oor:name="AddNonBreakingSpace" oor:type="xs:boolean">
 				<!-- OldPath: AutoCorrect/Options/All -->
 				<!-- OldLocation: Soffice.cfg -->
-				<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Replace dashes -->
+				<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Add non-breaking space -->
 				<info>
-					<author>OS</author>
-					<desc>Specifies if minus signs should be replaced by dashes automatically.</desc>
-					<label>Replace dashes</label>
+					<author>cedricbosdo</author>
+					<desc>Adds a non-breaking space before the characters :;!? in french.</desc>
+					<label>Add non-breaking space</label>
 				</info>
 				<value>true</value>
 			</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 4904dc2e86..1e1c800a50 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -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: Compatibility.xcs,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/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index 3755945df3..a29bf76221 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -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: DataAccess.xcs,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/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
index d0b54e7149..de5c9525ae 100755
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
@@ -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: DataAccess.xcs,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/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
index 906bbe5108..d0fce09a91 100755
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index c7e4f71c67..e133b7a5a9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -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: Draw.xcs,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/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
index 3e3d974513..a8652d720b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
@@ -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: Embedding.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/Events.xcs b/officecfg/registry/schema/org/openoffice/Office/Events.xcs
index 4d7ee71a10..6b0eb2d19f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Events.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Events.xcs
@@ -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: Events.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
index 7105c0be5d..5f2f451f7b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
@@ -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: ExtendedColorScheme.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
index 12deac11d5..de26a3ae14 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
@@ -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: ExtensionManager.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs
index 7e9dc3a260..b97b46122f 100755
--- a/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/FormWizard.xcs
@@ -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: FormWizard.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
index 7b496838a1..db5da3f67c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs
@@ -1,36 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $RCSfile: Histories.xcs,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/20 09:22:37 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index bfa2e7dce4..a5a703c048 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -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: Impress.xcs,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/officecfg/registry/schema/org/openoffice/Office/Java.xcs b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
index 588bdb36cb..06666ad4a6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
@@ -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: Java.xcs,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/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
index 104914d12d..a9b4cdc70f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
@@ -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: Jobs.xcs,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/officecfg/registry/schema/org/openoffice/Office/Labels.xcs b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
index 1400d1d763..c8eec73838 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
@@ -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: Labels.xcs,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/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 99bee988ab..220d94c89d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -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: Linguistic.xcs,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/officecfg/registry/schema/org/openoffice/Office/Logging.xcs b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
index 5c2f2f1b4f..2fda9ea6aa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Logging.xcs
@@ -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: Logging.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index d0d8ad0041..c1f9e8aa96 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -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: Math.xcs,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/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
index 1504d979b5..db7b694b5b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
index 85815e9a96..f1c4cab212 100644
--- a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
@@ -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: OptionsDialog.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
index c68efa3d78..fe9620cf81 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
@@ -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: Paths.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
index 566c5f70a4..0feb152457 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
@@ -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: ProtocolHandler.xcs,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/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
index a4640918ff..f424180c76 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Recovery.xcs
@@ -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: Recovery.xcs,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/officecfg/registry/schema/org/openoffice/Office/SFX.xcs b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
index bea23e5c57..496381d36e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/SFX.xcs
@@ -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: SFX.xcs,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/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
index fb6f5b75b9..b77cb00f8c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
@@ -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: Scripting.xcs,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/officecfg/registry/schema/org/openoffice/Office/Security.xcs b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
index 823280e1e0..d66d539fa9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Security.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Security.xcs
@@ -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: Security.xcs,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/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
index f601ca5673..c4c2ecdc3b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
@@ -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: Substitution.xcs,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/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
index 58670782df..85ec176423 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
@@ -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: TabBrowse.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
index 980cec077a..5479453aed 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs
@@ -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: TableWizard.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
index 8fbc468225..eabd4a8094 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
@@ -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: TypeDetection.xcs,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/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index 48368c263b..48d018d7bb 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -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: UI.xcs,v $
- * $Revision: 1.30.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
index 473b05def6..a7b3c2b02c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
@@ -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: BaseWindowState.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
index 404296b612..04a554578a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
@@ -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: BasicIDECommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
index b94c23e5f3..2b98a81576 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
@@ -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: BasicIDEWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
index bdf5ead9e5..c0fe1abc68 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
@@ -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: BibliographyCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
index ce9f5d4940..0cb6022d21 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
@@ -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: BibliographyWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
index 8b49958056..ab8a986db7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
@@ -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: CalcCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
index 5b31badc04..6f13b54589 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
@@ -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: CalcWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
index 9c86bfa67b..7830975c4c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs
@@ -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: Category.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
index a61d7fc933..f94c262438 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
@@ -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: ChartCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
index 41d0751868..8df1302813 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
@@ -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: ChartWindowState.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
index 23fb895254..38ee3a2e4c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
@@ -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: Commands.xcs,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/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
index c36bafc9db..5d45bcce7a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs
@@ -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: Controller.xcs,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/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
index 96a17dbf54..7af6774dc9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
@@ -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: DbBrowserWindowState.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
index 339daf19f5..d01098d2c3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
@@ -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: DbQueryWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
index 718de0125e..a007de1118 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
@@ -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: DbRelationWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
index 05e8ccc7ce..90ddd2abfe 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
@@ -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: DbTableDataWindowState.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
index 289972eb29..0619bf296a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
@@ -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: DbTableWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
index 01ad1b82dd..372b64465e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
@@ -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: DbuCommands.xcs,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/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
index 3212fe4096..3ae166d234 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
@@ -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: DrawImpressCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
index c764bbf344..4bb0543371 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
@@ -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: DrawWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
index 90c9a9885f..b89f2dec03 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs
@@ -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: Effects.xcs,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/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
index 3475cbacc1..958d10cac5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs
@@ -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: Factories.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
index 31de64f2c1..63e36d1eda 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
@@ -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: GenericCategories.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
index 039daffdce..779bcc5925 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GenericCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
index 9faaecb096..b9104649a6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
@@ -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: GlobalSettings.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
index 3a70589dac..48331f37ee 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
@@ -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: ImpressWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
index 9de5501f8f..f79a2ebde6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
@@ -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: MathCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
index 0e14c3360f..f7a16d9e49 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
@@ -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: MathWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
index e76dfd3905..8e82d2e03b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StartModuleCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
index e04b9ab2d3..7bf3ec8294 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
@@ -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: StartModuleWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
index 8343678f13..68535d1fc6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
@@ -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: Factories.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
index 96bd9b23dc..39545cab23 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
@@ -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: WindowState.xcs,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/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
index 20328cc99a..d2af2b1ce5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
@@ -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: WriterCommands.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
index 7051df46da..22e05e161c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
@@ -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: WriterFormWindowState.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
index cb11531af5..abf68bdeca 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
@@ -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: WriterGlobalWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
index 991b3a13b5..4424ce1cbc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
@@ -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: WriterReportWindowState.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
index 2d7633265f..96a2a834b2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
@@ -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: WriterWebWindowState.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
index db7281c0c1..87854b9a5f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
@@ -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: WriterWindowState.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
index fb3e7272a3..13d864751f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
@@ -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: XFormsWindowState.xcs,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
index cd4518bf19..e5b949b08c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/schema/org/openoffice/Office/Views.xcs b/officecfg/registry/schema/org/openoffice/Office/Views.xcs
index 9f0904903a..58afd94a92 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Views.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Views.xcs
@@ -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: Views.xcs,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/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
index c92b63c103..bd46f61937 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
@@ -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: WebWizard.xcs,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index cb22883eba..4a3c2c02c3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -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: Writer.xcs,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -4392,25 +4389,25 @@
 						</info>
 						<value>true</value>
 					</prop>
-					<prop oor:name="ChangeFraction" oor:type="xs:boolean">
+					<prop oor:name="ChangeDash" oor:type="xs:boolean">
 						<!-- OldPath: Writer/AutoFormat/Options -->
 						<!-- OldLocation: Soffice.cfg -->
-						<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options  Replace 1/2... -->
+						<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Replace dashes -->
 						<info>
 							<author>OS</author>
-							<desc>Specifies if character combinations for fractions are replaced with a corresponding single character.</desc>
-							<label>Replace fractions</label>
+							<desc>Specifies if dashes are replaced automatically.</desc>
+							<label>Replace dashes</label>
 						</info>
 						<value>true</value>
 					</prop>
-					<prop oor:name="ChangeDash" oor:type="xs:boolean">
+					<prop oor:name="AddNonBreakingSpace" oor:type="xs:boolean">
 						<!-- OldPath: Writer/AutoFormat/Options -->
 						<!-- OldLocation: Soffice.cfg -->
-						<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Replace dashes -->
+						<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Add non-breaking space -->
 						<info>
-							<author>OS</author>
-							<desc>Specifies if dashes are replaced automatically.</desc>
-							<label>Replace dashes</label>
+							<author>cedricbosdo</author>
+							<desc>Adds a non-breaking space before the characters :!;? in french.</desc>
+							<label>Add non-breaking space</label>
 						</info>
 						<value>true</value>
 					</prop>
@@ -4436,17 +4433,6 @@
 						</info>
 						<value>true</value>
 					</prop>
-					<prop oor:name="ReplaceQuote" oor:type="xs:boolean">
-						<!-- OldPath: Writer/AutoFormat/Options -->
-						<!-- OldLocation: Soffice.cfg -->
-						<!-- UIHints: Tools  AutoCorrect/AutoFormat  Options  Replace Standard Quotes... -->
-						<info>
-							<author>OS</author>
-							<desc>Specifies if standard quotes are replaced with custom quotes.</desc>
-							<label>Replace standard quotes with custom quotes</label>
-						</info>
-						<value>true</value>
-					</prop>
 					<prop oor:name="CombineParagraphs" oor:type="xs:boolean">
 						<!-- OldPath: Writer/AutoFormat/Options -->
 						<!-- OldLocation: Soffice.cfg -->
@@ -4810,22 +4796,22 @@
 						<label>Accept with</label>
 					</info>
 					<constraints>
-						<enumeration oor:value="0x405">
+						<enumeration oor:value="1029"> <!-- 0x405 -->
 							<info>
 								<desc>KeyEnd</desc>
 							</info>
 						</enumeration>
-						<enumeration oor:value="0x500">
+						<enumeration oor:value="1280"> <!-- 0x500 -->
 							<info>
 								<desc>KeyReturn</desc>
 							</info>
 						</enumeration>
-						<enumeration oor:value="0x403">
+						<enumeration oor:value="1027"> <!-- 0x403 -->
 							<info>
 								<desc>KeyRight</desc>
 							</info>
 						</enumeration>
-						<enumeration oor:value="0x504">
+						<enumeration oor:value="1284"> <!-- 0x504 -->
 							<info>
 								<desc>KeySpace</desc>
 							</info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index ebb9fca309..8738d9db21 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -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: WriterWeb.xcs,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/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
index 320ec8eed2..c59b2d8721 100644
--- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.112.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index ad6b4d9ce4..9e5551bda1 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -3,13 +3,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Setup.xcs,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/System.xcs b/officecfg/registry/schema/org/openoffice/System.xcs
index f0cd6618b5..4d432659d5 100644
--- a/officecfg/registry/schema/org/openoffice/System.xcs
+++ b/officecfg/registry/schema/org/openoffice/System.xcs
@@ -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: System.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
index 34a6f02e44..c92f93f79d 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
@@ -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: Filter.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
index 4f10574193..c6762465b8 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs
@@ -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: GraphicFilter.xcs,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
index 8e7751f01b..62e3bd508f 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs
@@ -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: Misc.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
index ed690648dc..43e6693fc1 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
@@ -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: Types.xcs,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
index a943bae5c5..a39002b310 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs
@@ -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: UISort.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
index e22c7c6f7a..e2279a42f7 100644
--- a/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/schema/org/openoffice/UserProfile.xcs b/officecfg/registry/schema/org/openoffice/UserProfile.xcs
index e76d4ec7b5..1ff7c0aa05 100644
--- a/officecfg/registry/schema/org/openoffice/UserProfile.xcs
+++ b/officecfg/registry/schema/org/openoffice/UserProfile.xcs
@@ -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: UserProfile.xcs,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/officecfg/registry/schema/org/openoffice/VCL.xcs b/officecfg/registry/schema/org/openoffice/VCL.xcs
index eadca0a141..1132461ff1 100644
--- a/officecfg/registry/schema/org/openoffice/VCL.xcs
+++ b/officecfg/registry/schema/org/openoffice/VCL.xcs
@@ -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: VCL.xcs,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/officecfg/registry/schema/org/openoffice/makefile.mk b/officecfg/registry/schema/org/openoffice/makefile.mk
index 9754501407..f928e447f4 100644
--- a/officecfg/registry/schema/org/openoffice/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
index 2b497e218a..049ccc9492 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs
@@ -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: Configuration.xcs,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/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs b/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
index a64ec04607..3366253166 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs
@@ -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: Hierarchy.xcs,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/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
index 0cbc20eaff..ea6de5b80a 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
@@ -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: Configuration.xcs,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/officecfg/registry/schema/org/openoffice/ucb/Store.xcs b/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
index 0041ee0ca2..ee439c9e02 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
+++ b/officecfg/registry/schema/org/openoffice/ucb/Store.xcs
@@ -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: Store.xcs,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/officecfg/registry/schema/org/openoffice/ucb/makefile.mk b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
index 269bdded29..d35de7a73f 100644
--- a/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index fd03d973cf..339c6685fa 100644
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
@@ -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: alllang.xsl,v $
- 
-  $Revision: 1.14 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
@@ -316,6 +312,9 @@
 			<xsl:when test="not ($dataval)">
 				<xsl:value-of select="true()"/>
 			</xsl:when>
+            <xsl:when test="$dataval/@oor:external">
+                <xsl:value-of select="false()"/>
+            </xsl:when>
 			<xsl:when test="not ($schemaval)">
 				<xsl:choose>
 					<xsl:when test="$dataval/@xsi:nil='true'">
diff --git a/officecfg/util/component-conf.gen b/officecfg/util/component-conf.gen
index a82dded02d..1882c60b8a 100644
--- a/officecfg/util/component-conf.gen
+++ b/officecfg/util/component-conf.gen
@@ -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: component-conf.gen,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/util/component-ldif.gen b/officecfg/util/component-ldif.gen
index f1099674d1..4b0fffeaa5 100644
--- a/officecfg/util/component-ldif.gen
+++ b/officecfg/util/component-ldif.gen
@@ -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: component-ldif.gen,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/util/component-map.gen b/officecfg/util/component-map.gen
index e58b90eb69..3285c5d659 100644
--- a/officecfg/util/component-map.gen
+++ b/officecfg/util/component-map.gen
@@ -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: component-map.gen,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl
index bdf7c1ba25..d918431c75 100644
--- a/officecfg/util/data_val.xsl
+++ b/officecfg/util/data_val.xsl
@@ -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: data_val.xsl,v $
- 
-  $Revision: 1.10 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <!-- ************************************************************************************** -->
@@ -206,9 +202,6 @@
             <xsl:if test="following-sibling::value[@install:module=$module and @xml:lang=$lang]">
                 <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has multiple values for module <xsl:value-of select="$module"/> and locale <xsl:value-of select="$lang"/>!</xsl:message>
             </xsl:if>
-            <xsl:if test="../value[not(@install:module)]">
-                <xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has values both with and without module. This is currently not supported. Please contact jb@openoffice.org, if you need this!</xsl:message>
-            </xsl:if>
             <xsl:if test="not(preceding-sibling::value/@install:module)">
                 <xsl:message>ATTENTION: Property '<xsl:value-of select="$path"/>' has different values for different modules. Make sure the modules are mutually exclusive!</xsl:message>
             </xsl:if>
diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
index d022c92537..d6c6ddf16f 100644
--- a/officecfg/util/makefile.mk
+++ b/officecfg/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/util/makefile.pmk b/officecfg/util/makefile.pmk
index aa6bcb6548..28316b4267 100644
--- a/officecfg/util/makefile.pmk
+++ b/officecfg/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.36 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/officecfg/util/resource.xsl b/officecfg/util/resource.xsl
index 3343808fb4..83bc04db2b 100644
--- a/officecfg/util/resource.xsl
+++ b/officecfg/util/resource.xsl
@@ -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: resource.xsl,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl
index f7379d13f1..6d58e97ccc 100644
--- a/officecfg/util/schema_trim.xsl
+++ b/officecfg/util/schema_trim.xsl
@@ -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: schema_trim.xsl,v $
- 
-  $Revision: 1.10 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/officecfg/util/schema_val.xsl b/officecfg/util/schema_val.xsl
index 09655938d8..f8147d82b6 100644
--- a/officecfg/util/schema_val.xsl
+++ b/officecfg/util/schema_val.xsl
@@ -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: schema_val.xsl,v $
- 
-  $Revision: 1.11 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
  ************************************************************************ -->
 
 <xsl:transform  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/oovbaapi/genconstidl/ApiSymbols.dtd b/oovbaapi/genconstidl/ApiSymbols.dtd
index 596d27dcf6..28fb539870 100644
--- a/oovbaapi/genconstidl/ApiSymbols.dtd
+++ b/oovbaapi/genconstidl/ApiSymbols.dtd
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: ApiSymbols.dtd,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!ELEMENT api (element)+>
diff --git a/oovbaapi/genconstidl/access.api b/oovbaapi/genconstidl/access.api
index 07de65e57d..6abbcf1f36 100644
--- a/oovbaapi/genconstidl/access.api
+++ b/oovbaapi/genconstidl/access.api
@@ -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: access.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/adodb.api b/oovbaapi/genconstidl/adodb.api
index 35dfff8a3c..e36a2cb40d 100644
--- a/oovbaapi/genconstidl/adodb.api
+++ b/oovbaapi/genconstidl/adodb.api
@@ -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: adodb.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/api-to-idl.pl b/oovbaapi/genconstidl/api-to-idl.pl
index ac7498ca7b..33e28e2c73 100644
--- a/oovbaapi/genconstidl/api-to-idl.pl
+++ b/oovbaapi/genconstidl/api-to-idl.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: api-to-idl.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/oovbaapi/genconstidl/dao.api b/oovbaapi/genconstidl/dao.api
index 40f857fa51..9f32fa07c2 100644
--- a/oovbaapi/genconstidl/dao.api
+++ b/oovbaapi/genconstidl/dao.api
@@ -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: dao.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/excel.api b/oovbaapi/genconstidl/excel.api
index 55aa629197..6e61db1249 100644
--- a/oovbaapi/genconstidl/excel.api
+++ b/oovbaapi/genconstidl/excel.api
@@ -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: excel.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/makefile.mk b/oovbaapi/genconstidl/makefile.mk
index 6f2036cfde..be9fc931f3 100644
--- a/oovbaapi/genconstidl/makefile.mk
+++ b/oovbaapi/genconstidl/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/oovbaapi/genconstidl/msforms.api b/oovbaapi/genconstidl/msforms.api
index 5b98a29ff1..a604330776 100644
--- a/oovbaapi/genconstidl/msforms.api
+++ b/oovbaapi/genconstidl/msforms.api
@@ -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: msforms.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/oovbaconsts.xsl b/oovbaapi/genconstidl/oovbaconsts.xsl
index e4bfc61d40..417cfd51ec 100644
--- a/oovbaapi/genconstidl/oovbaconsts.xsl
+++ b/oovbaapi/genconstidl/oovbaconsts.xsl
@@ -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: oovbaconsts.xsl,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/oovbaapi/genconstidl/powerpoint.api b/oovbaapi/genconstidl/powerpoint.api
index d041313f08..cd417af4a6 100644
--- a/oovbaapi/genconstidl/powerpoint.api
+++ b/oovbaapi/genconstidl/powerpoint.api
@@ -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: powerpoint.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/stdole.api b/oovbaapi/genconstidl/stdole.api
index 3c871e1107..aefe25a9ee 100644
--- a/oovbaapi/genconstidl/stdole.api
+++ b/oovbaapi/genconstidl/stdole.api
@@ -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: stdole.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/vba.api b/oovbaapi/genconstidl/vba.api
index cdbd78ac9f..bbbe1a0fc1 100644
--- a/oovbaapi/genconstidl/vba.api
+++ b/oovbaapi/genconstidl/vba.api
@@ -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: vba.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/genconstidl/word.api b/oovbaapi/genconstidl/word.api
index d9c18cd823..9951e2a206 100644
--- a/oovbaapi/genconstidl/word.api
+++ b/oovbaapi/genconstidl/word.api
@@ -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: word.api,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 ====================================================================== -->
 
 <!-- *** Do not edit, this file will be generated *** -->
diff --git a/oovbaapi/ooo/vba/ControlProvider.idl b/oovbaapi/ooo/vba/ControlProvider.idl
index 4db6ce82fd..a6c47131a5 100644
--- a/oovbaapi/ooo/vba/ControlProvider.idl
+++ b/oovbaapi/ooo/vba/ControlProvider.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XGlobals.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl b/oovbaapi/ooo/vba/XApplicationBase.idl
index b99c416563..bfcc75ecca 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XApplicationBase_idl__
diff --git a/oovbaapi/ooo/vba/XAssistant.idl b/oovbaapi/ooo/vba/XAssistant.idl
index 8ca89d0c80..dd6e762ab5 100644
--- a/oovbaapi/ooo/vba/XAssistant.idl
+++ b/oovbaapi/ooo/vba/XAssistant.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XAssistant_idl__
diff --git a/oovbaapi/ooo/vba/XCollection.idl b/oovbaapi/ooo/vba/XCollection.idl
index 48949471b3..b984bccd64 100644
--- a/oovbaapi/ooo/vba/XCollection.idl
+++ b/oovbaapi/ooo/vba/XCollection.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XCollection.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XCommandBar.idl b/oovbaapi/ooo/vba/XCommandBar.idl
index e0b178181d..9ec666fcdd 100644
--- a/oovbaapi/ooo/vba/XCommandBar.idl
+++ b/oovbaapi/ooo/vba/XCommandBar.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBar_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBarButton.idl b/oovbaapi/ooo/vba/XCommandBarButton.idl
index c93f236c15..edbd0920bd 100644
--- a/oovbaapi/ooo/vba/XCommandBarButton.idl
+++ b/oovbaapi/ooo/vba/XCommandBarButton.idl
@@ -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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBarButton_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBarControl.idl b/oovbaapi/ooo/vba/XCommandBarControl.idl
index c40394e29d..5bf7aeb700 100644
--- a/oovbaapi/ooo/vba/XCommandBarControl.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControl.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBarControl_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBarControls.idl b/oovbaapi/ooo/vba/XCommandBarControls.idl
index 5495432739..5a2e9a4645 100644
--- a/oovbaapi/ooo/vba/XCommandBarControls.idl
+++ b/oovbaapi/ooo/vba/XCommandBarControls.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBarControls_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBarPopup.idl b/oovbaapi/ooo/vba/XCommandBarPopup.idl
index cfcecfe6b4..b90d3ba6f5 100644
--- a/oovbaapi/ooo/vba/XCommandBarPopup.idl
+++ b/oovbaapi/ooo/vba/XCommandBarPopup.idl
@@ -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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBarPopup_idl__
diff --git a/oovbaapi/ooo/vba/XCommandBars.idl b/oovbaapi/ooo/vba/XCommandBars.idl
index 42e78a53ca..0197cb2f19 100644
--- a/oovbaapi/ooo/vba/XCommandBars.idl
+++ b/oovbaapi/ooo/vba/XCommandBars.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XCommandBars_idl__
diff --git a/oovbaapi/ooo/vba/XControlProvider.idl b/oovbaapi/ooo/vba/XControlProvider.idl
index cd0c68d1cf..afffe8edbb 100644
--- a/oovbaapi/ooo/vba/XControlProvider.idl
+++ b/oovbaapi/ooo/vba/XControlProvider.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XGlobals.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XDialogBase.idl b/oovbaapi/ooo/vba/XDialogBase.idl
index 7954364e74..ee5c8330cb 100644
--- a/oovbaapi/ooo/vba/XDialogBase.idl
+++ b/oovbaapi/ooo/vba/XDialogBase.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDialog.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XDialogsBase.idl b/oovbaapi/ooo/vba/XDialogsBase.idl
index 7a33e82002..a194006709 100644
--- a/oovbaapi/ooo/vba/XDialogsBase.idl
+++ b/oovbaapi/ooo/vba/XDialogsBase.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDialogs.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XDocumentBase.idl b/oovbaapi/ooo/vba/XDocumentBase.idl
index 1e4c7f5737..5845d8b4b5 100644
--- a/oovbaapi/ooo/vba/XDocumentBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentBase.idl
@@ -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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XDocumentBase_idl__
diff --git a/oovbaapi/ooo/vba/XDocumentProperties.idl b/oovbaapi/ooo/vba/XDocumentProperties.idl
index 2bf926c3b6..cd5c80964e 100644
--- a/oovbaapi/ooo/vba/XDocumentProperties.idl
+++ b/oovbaapi/ooo/vba/XDocumentProperties.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDocument.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XDocumentProperty.idl b/oovbaapi/ooo/vba/XDocumentProperty.idl
index 1357b1ef72..b0f1a2c5c6 100644
--- a/oovbaapi/ooo/vba/XDocumentProperty.idl
+++ b/oovbaapi/ooo/vba/XDocumentProperty.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDocument.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XDocumentsBase.idl b/oovbaapi/ooo/vba/XDocumentsBase.idl
index 25a2a7ce64..1ce6725660 100644
--- a/oovbaapi/ooo/vba/XDocumentsBase.idl
+++ b/oovbaapi/ooo/vba/XDocumentsBase.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDocumentsBase.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index dc9e3ab4c8..5c3ea226a2 100644
--- a/oovbaapi/ooo/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XErrObject.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XFontBase.idl b/oovbaapi/ooo/vba/XFontBase.idl
index 93f8d25203..1310ca67b1 100644
--- a/oovbaapi/ooo/vba/XFontBase.idl
+++ b/oovbaapi/ooo/vba/XFontBase.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XGlobalsBase.idl b/oovbaapi/ooo/vba/XGlobalsBase.idl
index f3465b08bd..c04a2029bd 100644
--- a/oovbaapi/ooo/vba/XGlobalsBase.idl
+++ b/oovbaapi/ooo/vba/XGlobalsBase.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XGlobals.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XHelperInterface.idl b/oovbaapi/ooo/vba/XHelperInterface.idl
index a669ae5529..6adfdbee24 100644
--- a/oovbaapi/ooo/vba/XHelperInterface.idl
+++ b/oovbaapi/ooo/vba/XHelperInterface.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XHelperInterface.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XPageSetupBase.idl b/oovbaapi/ooo/vba/XPageSetupBase.idl
index c69c251996..db5a1499a8 100644
--- a/oovbaapi/ooo/vba/XPageSetupBase.idl
+++ b/oovbaapi/ooo/vba/XPageSetupBase.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/XPropValue.idl b/oovbaapi/ooo/vba/XPropValue.idl
index dd57eb2a26..bdb1f89e18 100644
--- a/oovbaapi/ooo/vba/XPropValue.idl
+++ b/oovbaapi/ooo/vba/XPropValue.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPropValue.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
index 4a1bca88a3..5ca644c12d 100644
--- a/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
+++ b/oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XVBAToOOEventDescGen.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,8 +38,8 @@
 module ooo {  module vba { 
 interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface
 {
-    sequence< com::sun::star::script::ScriptEventDescriptor >  getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sLibModName, [in] sequence< string > handlerExts );
-    com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl );
+    sequence< com::sun::star::script::ScriptEventDescriptor >  getEventDescriptions( [in] com::sun::star::uno::XInterface xControl, [in] string sCodeName );
+    com::sun::star::script::XScriptEventsSupplier getEventSupplier( [in] com::sun::star::uno::XInterface xControl, [in] string sCodeName );
 };
 
 }; };
diff --git a/oovbaapi/ooo/vba/XWindowBase.idl b/oovbaapi/ooo/vba/XWindowBase.idl
index 63b95982ff..6c35904662 100644
--- a/oovbaapi/ooo/vba/XWindowBase.idl
+++ b/oovbaapi/ooo/vba/XWindowBase.idl
@@ -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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_XHelperWindow_idl__
diff --git a/oovbaapi/ooo/vba/constants/makefile.mk b/oovbaapi/ooo/vba/constants/makefile.mk
index fa9cdaddc1..a41f6e98a2 100644
--- a/oovbaapi/ooo/vba/constants/makefile.mk
+++ b/oovbaapi/ooo/vba/constants/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/oovbaapi/ooo/vba/excel/Globals.idl b/oovbaapi/ooo/vba/excel/Globals.idl
index f06be2bf56..334bcff1bb 100644
--- a/oovbaapi/ooo/vba/excel/Globals.idl
+++ b/oovbaapi/ooo/vba/excel/Globals.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/Hyperlink.idl b/oovbaapi/ooo/vba/excel/Hyperlink.idl
index 7f2058a6c3..e3cf458b98 100644
--- a/oovbaapi/ooo/vba/excel/Hyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/Hyperlink.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/excel/Range.idl b/oovbaapi/ooo/vba/excel/Range.idl
index 89891d6ee3..f8639b8901 100644
--- a/oovbaapi/ooo/vba/excel/Range.idl
+++ b/oovbaapi/ooo/vba/excel/Range.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/TextFrame.idl b/oovbaapi/ooo/vba/excel/TextFrame.idl
index 2b6b5cd31f..26a4481e98 100644
--- a/oovbaapi/ooo/vba/excel/TextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/TextFrame.idl
@@ -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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/excel/Window.idl b/oovbaapi/ooo/vba/excel/Window.idl
index ac907156fa..e13f8b6732 100644
--- a/oovbaapi/ooo/vba/excel/Window.idl
+++ b/oovbaapi/ooo/vba/excel/Window.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/excel/Workbook.idl b/oovbaapi/ooo/vba/excel/Workbook.idl
index 6aa4fb353c..a3ea43e1f7 100644
--- a/oovbaapi/ooo/vba/excel/Workbook.idl
+++ b/oovbaapi/ooo/vba/excel/Workbook.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Workbook.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/Worksheet.idl b/oovbaapi/ooo/vba/excel/Worksheet.idl
index 303d302ead..4d7189c361 100644
--- a/oovbaapi/ooo/vba/excel/Worksheet.idl
+++ b/oovbaapi/ooo/vba/excel/Worksheet.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Worksheet.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index ec7c119047..8cbebe6b7e 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XApplication.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XAxes.idl b/oovbaapi/ooo/vba/excel/XAxes.idl
index 220f5f050f..06d7c7f073 100644
--- a/oovbaapi/ooo/vba/excel/XAxes.idl
+++ b/oovbaapi/ooo/vba/excel/XAxes.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XAxes.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XAxis.idl b/oovbaapi/ooo/vba/excel/XAxis.idl
index 1b79ff4ba3..0183d3bccc 100644
--- a/oovbaapi/ooo/vba/excel/XAxis.idl
+++ b/oovbaapi/ooo/vba/excel/XAxis.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XAxis.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XAxisTitle.idl b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
index 48fd559b47..559a6e26e0 100644
--- a/oovbaapi/ooo/vba/excel/XAxisTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XAxisTitle.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XAxisTitle.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XBorder.idl b/oovbaapi/ooo/vba/excel/XBorder.idl
index 86e7e98978..c25c15f7f6 100644
--- a/oovbaapi/ooo/vba/excel/XBorder.idl
+++ b/oovbaapi/ooo/vba/excel/XBorder.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XBorder.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XBorders.idl b/oovbaapi/ooo/vba/excel/XBorders.idl
index f90e11bd05..1cf3233227 100644
--- a/oovbaapi/ooo/vba/excel/XBorders.idl
+++ b/oovbaapi/ooo/vba/excel/XBorders.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XBorders.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XCharacters.idl b/oovbaapi/ooo/vba/excel/XCharacters.idl
index 29ce05a01b..e5ea29de03 100644
--- a/oovbaapi/ooo/vba/excel/XCharacters.idl
+++ b/oovbaapi/ooo/vba/excel/XCharacters.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XCharacters.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XChart.idl b/oovbaapi/ooo/vba/excel/XChart.idl
index 055e939239..01db5bd38b 100644
--- a/oovbaapi/ooo/vba/excel/XChart.idl
+++ b/oovbaapi/ooo/vba/excel/XChart.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XChart.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XChartObject.idl b/oovbaapi/ooo/vba/excel/XChartObject.idl
index 335d41198c..782f97f11d 100644
--- a/oovbaapi/ooo/vba/excel/XChartObject.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObject.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XChartObject.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XChartObjects.idl b/oovbaapi/ooo/vba/excel/XChartObjects.idl
index e5cb4e3252..9f2a4a148c 100644
--- a/oovbaapi/ooo/vba/excel/XChartObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XChartObjects.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XChartObjects.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XChartTitle.idl b/oovbaapi/ooo/vba/excel/XChartTitle.idl
index 69b03b3125..66b5921867 100644
--- a/oovbaapi/ooo/vba/excel/XChartTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XChartTitle.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XChartTitle.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XCharts.idl b/oovbaapi/ooo/vba/excel/XCharts.idl
index 129adad6b4..c04189bb7f 100644
--- a/oovbaapi/ooo/vba/excel/XCharts.idl
+++ b/oovbaapi/ooo/vba/excel/XCharts.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XCharts.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XComment.idl b/oovbaapi/ooo/vba/excel/XComment.idl
index 0a9e926a09..f5271e20f5 100644
--- a/oovbaapi/ooo/vba/excel/XComment.idl
+++ b/oovbaapi/ooo/vba/excel/XComment.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XComment.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XComments.idl b/oovbaapi/ooo/vba/excel/XComments.idl
index 641b63d97e..23df436e9c 100644
--- a/oovbaapi/ooo/vba/excel/XComments.idl
+++ b/oovbaapi/ooo/vba/excel/XComments.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XComments.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XDataLabel.idl b/oovbaapi/ooo/vba/excel/XDataLabel.idl
index 5d1a0cd020..ae2f06070b 100644
--- a/oovbaapi/ooo/vba/excel/XDataLabel.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabel.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDataLabel.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XDataLabels.idl b/oovbaapi/ooo/vba/excel/XDataLabels.idl
index 91dfcefea0..59e22713a2 100644
--- a/oovbaapi/ooo/vba/excel/XDataLabels.idl
+++ b/oovbaapi/ooo/vba/excel/XDataLabels.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDataLabels.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XDialog.idl b/oovbaapi/ooo/vba/excel/XDialog.idl
index c9900f432e..3d4fc78e49 100644
--- a/oovbaapi/ooo/vba/excel/XDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XDialog.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDialog.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XDialogs.idl b/oovbaapi/ooo/vba/excel/XDialogs.idl
index 9daa8308cc..92828c3708 100644
--- a/oovbaapi/ooo/vba/excel/XDialogs.idl
+++ b/oovbaapi/ooo/vba/excel/XDialogs.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDialogs.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XFont.idl b/oovbaapi/ooo/vba/excel/XFont.idl
index b3fc95b548..40cddb57b5 100644
--- a/oovbaapi/ooo/vba/excel/XFont.idl
+++ b/oovbaapi/ooo/vba/excel/XFont.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XFormat.idl b/oovbaapi/ooo/vba/excel/XFormat.idl
index 4dd52ca158..7b3622ecc5 100644
--- a/oovbaapi/ooo/vba/excel/XFormat.idl
+++ b/oovbaapi/ooo/vba/excel/XFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormat.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XFormatCondition.idl b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
index ff68906f32..f3ea093098 100644
--- a/oovbaapi/ooo/vba/excel/XFormatCondition.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatCondition.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormatCondition.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XFormatConditions.idl b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
index 8bf32f2e1f..14b7ba3b69 100644
--- a/oovbaapi/ooo/vba/excel/XFormatConditions.idl
+++ b/oovbaapi/ooo/vba/excel/XFormatConditions.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormatConditions.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XGlobals.idl b/oovbaapi/ooo/vba/excel/XGlobals.idl
index 05e6f02a44..c54740a613 100644
--- a/oovbaapi/ooo/vba/excel/XGlobals.idl
+++ b/oovbaapi/ooo/vba/excel/XGlobals.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XGlobals.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XHPageBreak.idl b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
index 62c8cda9af..befeaf7d7c 100644
--- a/oovbaapi/ooo/vba/excel/XHPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreak.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/excel/XHPageBreaks.idl b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
index 01f023ba41..f7bd1e760b 100644
--- a/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XHPageBreaks.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/excel/XHyperlink.idl b/oovbaapi/ooo/vba/excel/XHyperlink.idl
index b72bb0ab71..8ee5ddf938 100644
--- a/oovbaapi/ooo/vba/excel/XHyperlink.idl
+++ b/oovbaapi/ooo/vba/excel/XHyperlink.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_excel_XHyperlink_idl__
diff --git a/oovbaapi/ooo/vba/excel/XInterior.idl b/oovbaapi/ooo/vba/excel/XInterior.idl
index 9386a13c41..2d3a9120bf 100644
--- a/oovbaapi/ooo/vba/excel/XInterior.idl
+++ b/oovbaapi/ooo/vba/excel/XInterior.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XInterior.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index ea281aa029..6397e7a9c2 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XName.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XNames.idl b/oovbaapi/ooo/vba/excel/XNames.idl
index 353fd817eb..457917c171 100644
--- a/oovbaapi/ooo/vba/excel/XNames.idl
+++ b/oovbaapi/ooo/vba/excel/XNames.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XNames.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XOLEObject.idl b/oovbaapi/ooo/vba/excel/XOLEObject.idl
index c12248eb9f..fbabb9478c 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObject.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObject.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XOLEObject.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XOLEObjects.idl b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
index 7266ba31cc..c007c6c629 100644
--- a/oovbaapi/ooo/vba/excel/XOLEObjects.idl
+++ b/oovbaapi/ooo/vba/excel/XOLEObjects.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XOLEObjects.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XOutline.idl b/oovbaapi/ooo/vba/excel/XOutline.idl
index ed412e8933..e0515818d8 100644
--- a/oovbaapi/ooo/vba/excel/XOutline.idl
+++ b/oovbaapi/ooo/vba/excel/XOutline.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XOutline.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XPageBreak.idl b/oovbaapi/ooo/vba/excel/XPageBreak.idl
index f8e12a734a..30e2087aa0 100644
--- a/oovbaapi/ooo/vba/excel/XPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XPageBreak.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 6a0832856f..70a1ae88c7 100644
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/excel/XPane.idl b/oovbaapi/ooo/vba/excel/XPane.idl
index 74635c6867..f3e74f87d9 100644
--- a/oovbaapi/ooo/vba/excel/XPane.idl
+++ b/oovbaapi/ooo/vba/excel/XPane.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPane.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XPivotCache.idl b/oovbaapi/ooo/vba/excel/XPivotCache.idl
index 9d5d8d29d4..65fd014e18 100644
--- a/oovbaapi/ooo/vba/excel/XPivotCache.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotCache.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPivotCache.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XPivotTable.idl b/oovbaapi/ooo/vba/excel/XPivotTable.idl
index e77cc3beb7..4d625c38b0 100644
--- a/oovbaapi/ooo/vba/excel/XPivotTable.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTable.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPivotTable.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XPivotTables.idl b/oovbaapi/ooo/vba/excel/XPivotTables.idl
index 28849ef756..4c1029064d 100644
--- a/oovbaapi/ooo/vba/excel/XPivotTables.idl
+++ b/oovbaapi/ooo/vba/excel/XPivotTables.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPivotTables.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XRange.idl b/oovbaapi/ooo/vba/excel/XRange.idl
index 5e59bf498b..afb1de6d4d 100644
--- a/oovbaapi/ooo/vba/excel/XRange.idl
+++ b/oovbaapi/ooo/vba/excel/XRange.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XRange.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XSeries.idl b/oovbaapi/ooo/vba/excel/XSeries.idl
index fc95826428..d891b6b126 100644
--- a/oovbaapi/ooo/vba/excel/XSeries.idl
+++ b/oovbaapi/ooo/vba/excel/XSeries.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XSeries.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
index 429c7f3bec..f143f86723 100644
--- a/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
+++ b/oovbaapi/ooo/vba/excel/XSeriesCollection.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XSeriesCollection.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XStyle.idl b/oovbaapi/ooo/vba/excel/XStyle.idl
index 542e73c3fe..2668d7e8bf 100644
--- a/oovbaapi/ooo/vba/excel/XStyle.idl
+++ b/oovbaapi/ooo/vba/excel/XStyle.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XStyle.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XStyles.idl b/oovbaapi/ooo/vba/excel/XStyles.idl
index 69fd3bbf0a..bbce40f104 100644
--- a/oovbaapi/ooo/vba/excel/XStyles.idl
+++ b/oovbaapi/ooo/vba/excel/XStyles.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XStyles.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XTextFrame.idl b/oovbaapi/ooo/vba/excel/XTextFrame.idl
index 4962be54d2..159f838479 100644
--- a/oovbaapi/ooo/vba/excel/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/excel/XTextFrame.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XTextFrame.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XTitle.idl b/oovbaapi/ooo/vba/excel/XTitle.idl
index 11013f298e..22c8232aaf 100644
--- a/oovbaapi/ooo/vba/excel/XTitle.idl
+++ b/oovbaapi/ooo/vba/excel/XTitle.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XTitle.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XVPageBreak.idl b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
index c4a750207e..38ac2f4427 100644
--- a/oovbaapi/ooo/vba/excel/XVPageBreak.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreak.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XVPageBreak.idl,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/oovbaapi/ooo/vba/excel/XVPageBreaks.idl b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
index 654d3367bc..eab4a8f00e 100644
--- a/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
+++ b/oovbaapi/ooo/vba/excel/XVPageBreaks.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XVPageBreaks.idl,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/oovbaapi/ooo/vba/excel/XValidation.idl b/oovbaapi/ooo/vba/excel/XValidation.idl
index dd1ef46202..20baa16d67 100644
--- a/oovbaapi/ooo/vba/excel/XValidation.idl
+++ b/oovbaapi/ooo/vba/excel/XValidation.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XValidation.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWindow.idl b/oovbaapi/ooo/vba/excel/XWindow.idl
index 89fee31b85..47b3846248 100644
--- a/oovbaapi/ooo/vba/excel/XWindow.idl
+++ b/oovbaapi/ooo/vba/excel/XWindow.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWindow.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWindows.idl b/oovbaapi/ooo/vba/excel/XWindows.idl
index 1d1d196ecd..6a8472a255 100644
--- a/oovbaapi/ooo/vba/excel/XWindows.idl
+++ b/oovbaapi/ooo/vba/excel/XWindows.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWindows.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 99b55f4a3c..e35b661a44 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWorkbook.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWorkbooks.idl b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
index fb6a40b1f6..721411b987 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbooks.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbooks.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWorkbooks.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 905239b48d..c592858bd1 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWorksheet.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
index dba0487952..4f9915711d 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheetFunction.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWorksheetFunction.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XWorksheets.idl b/oovbaapi/ooo/vba/excel/XWorksheets.idl
index 7010ab4aa6..bf898476bf 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheets.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheets.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWorksheets.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
index 38eaf83d84..b1a5ec059f 100644
--- a/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
+++ b/oovbaapi/ooo/vba/excel/XlBuildInDialog.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XlBuildInDialog.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/excel/makefile.mk b/oovbaapi/ooo/vba/excel/makefile.mk
index 4ffa89f94c..c31531af83 100644
--- a/oovbaapi/ooo/vba/excel/makefile.mk
+++ b/oovbaapi/ooo/vba/excel/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/oovbaapi/ooo/vba/makefile.mk b/oovbaapi/ooo/vba/makefile.mk
index f137e419f6..e79d348116 100644
--- a/oovbaapi/ooo/vba/makefile.mk
+++ b/oovbaapi/ooo/vba/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
index b1abcc7966..e7532e3cb2 100644
--- a/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
+++ b/oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MSFormReturnTypes.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XButton.idl b/oovbaapi/ooo/vba/msforms/XButton.idl
index 5469863424..ddfd3dae0c 100644
--- a/oovbaapi/ooo/vba/msforms/XButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XButton.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XButton.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XColorFormat.idl b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
index 35ead4e0d4..53c85d98e5 100644
--- a/oovbaapi/ooo/vba/msforms/XColorFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XColorFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XColorFormat.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 42fb76a045..8581392dd1 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XComboBox.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XControl.idl b/oovbaapi/ooo/vba/msforms/XControl.idl
index cef5ff25bd..c3a050b068 100644
--- a/oovbaapi/ooo/vba/msforms/XControl.idl
+++ b/oovbaapi/ooo/vba/msforms/XControl.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XControl.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XControls.idl b/oovbaapi/ooo/vba/msforms/XControls.idl
index b6abd88384..5f475157e6 100644
--- a/oovbaapi/ooo/vba/msforms/XControls.idl
+++ b/oovbaapi/ooo/vba/msforms/XControls.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/msforms/XFillFormat.idl b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
index 8dd4afd3da..866a2831fc 100644
--- a/oovbaapi/ooo/vba/msforms/XFillFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XFillFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFillFormat.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XGroupBox.idl b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
index 0280736fc2..f26c07ff50 100644
--- a/oovbaapi/ooo/vba/msforms/XGroupBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XGroupBox.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XGroupBox_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XImage.idl b/oovbaapi/ooo/vba/msforms/XImage.idl
index 1136af6a26..bc6af54c36 100644
--- a/oovbaapi/ooo/vba/msforms/XImage.idl
+++ b/oovbaapi/ooo/vba/msforms/XImage.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/msforms/XLabel.idl b/oovbaapi/ooo/vba/msforms/XLabel.idl
index 35e10c8258..60427f6e4e 100644
--- a/oovbaapi/ooo/vba/msforms/XLabel.idl
+++ b/oovbaapi/ooo/vba/msforms/XLabel.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XLabel.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XLineFormat.idl b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
index bfa2c8fb6a..9f17bc3190 100644
--- a/oovbaapi/ooo/vba/msforms/XLineFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XLineFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XLineFormat.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 2ff4d6d670..627c5418bf 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XMultiPage.idl b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
index 98795989b1..f4763fdbc7 100644
--- a/oovbaapi/ooo/vba/msforms/XMultiPage.idl
+++ b/oovbaapi/ooo/vba/msforms/XMultiPage.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XMultiPage_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XPages.idl b/oovbaapi/ooo/vba/msforms/XPages.idl
index 06f237646a..e329a7208c 100644
--- a/oovbaapi/ooo/vba/msforms/XPages.idl
+++ b/oovbaapi/ooo/vba/msforms/XPages.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XPage_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
index f6baecd5de..a2a7bded98 100644
--- a/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
+++ b/oovbaapi/ooo/vba/msforms/XPictureFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPictureFormat.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XProgressBar.idl b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
index bf7e6a4347..bbdcf60df9 100644
--- a/oovbaapi/ooo/vba/msforms/XProgressBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XProgressBar.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XProgressBar_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XRadioButton.idl b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
index 3821f830ee..d115a59628 100644
--- a/oovbaapi/ooo/vba/msforms/XRadioButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XRadioButton.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XRadioButton.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XScrollBar.idl b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
index 2566a9ef1b..48c710a26b 100644
--- a/oovbaapi/ooo/vba/msforms/XScrollBar.idl
+++ b/oovbaapi/ooo/vba/msforms/XScrollBar.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XScrollBar_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl b/oovbaapi/ooo/vba/msforms/XShape.idl
index 90047e642b..e8682a6d8e 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XShape.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XShapeRange.idl b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
index 0ae1883d26..d5b0df20ea 100644
--- a/oovbaapi/ooo/vba/msforms/XShapeRange.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapeRange.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XShapeRange.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XShapes.idl b/oovbaapi/ooo/vba/msforms/XShapes.idl
index 7d7e26d422..9fdf6a80ae 100644
--- a/oovbaapi/ooo/vba/msforms/XShapes.idl
+++ b/oovbaapi/ooo/vba/msforms/XShapes.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XShapes.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XSpinButton.idl b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
index b7d154baf4..15001c2e6b 100644
--- a/oovbaapi/ooo/vba/msforms/XSpinButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XSpinButton.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XSpinButton_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XTextBox.idl b/oovbaapi/ooo/vba/msforms/XTextBox.idl
index ab877756d7..c3574924d0 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBox.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XTextBox.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
index 7d2b589874..c27087d56e 100644
--- a/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextBoxShape.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XTextBoxShape_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XTextFrame.idl b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
index b702ecfa8e..0366dfef8f 100644
--- a/oovbaapi/ooo/vba/msforms/XTextFrame.idl
+++ b/oovbaapi/ooo/vba/msforms/XTextFrame.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XTextFrame.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/msforms/XToggleButton.idl b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
index 4ff8fb0be3..b151eb2c62 100644
--- a/oovbaapi/ooo/vba/msforms/XToggleButton.idl
+++ b/oovbaapi/ooo/vba/msforms/XToggleButton.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XToggleButton_idl__
diff --git a/oovbaapi/ooo/vba/msforms/XUserForm.idl b/oovbaapi/ooo/vba/msforms/XUserForm.idl
index 076db018df..21ee17c464 100644
--- a/oovbaapi/ooo/vba/msforms/XUserForm.idl
+++ b/oovbaapi/ooo/vba/msforms/XUserForm.idl
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * 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., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 #ifndef __ooo_vba_msforms_XUserForm_idl__
diff --git a/oovbaapi/ooo/vba/msforms/makefile.mk b/oovbaapi/ooo/vba/msforms/makefile.mk
index 012cc7b91a..61d2675af7 100644
--- a/oovbaapi/ooo/vba/msforms/makefile.mk
+++ b/oovbaapi/ooo/vba/msforms/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/oovbaapi/ooo/vba/word/XAddin.idl b/oovbaapi/ooo/vba/word/XAddin.idl
index 7139013179..898ff728f2 100644
--- a/oovbaapi/ooo/vba/word/XAddin.idl
+++ b/oovbaapi/ooo/vba/word/XAddin.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XAddins.idl b/oovbaapi/ooo/vba/word/XAddins.idl
index b1cf10bf11..f2936c93af 100644
--- a/oovbaapi/ooo/vba/word/XAddins.idl
+++ b/oovbaapi/ooo/vba/word/XAddins.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XApplication.idl b/oovbaapi/ooo/vba/word/XApplication.idl
index 8e8403085d..e6cde02f81 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XApplication.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XAutoTextEntries.idl b/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
index 117bf0e516..af3522f142 100644
--- a/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
+++ b/oovbaapi/ooo/vba/word/XAutoTextEntries.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XAutoTextEntry.idl b/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
index 37ce70136a..69788308af 100644
--- a/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
+++ b/oovbaapi/ooo/vba/word/XAutoTextEntry.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XBookmark.idl b/oovbaapi/ooo/vba/word/XBookmark.idl
index dd78d73380..a37ece6aae 100644
--- a/oovbaapi/ooo/vba/word/XBookmark.idl
+++ b/oovbaapi/ooo/vba/word/XBookmark.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XBookmarks.idl b/oovbaapi/ooo/vba/word/XBookmarks.idl
index df4019e3a9..8220090a23 100644
--- a/oovbaapi/ooo/vba/word/XBookmarks.idl
+++ b/oovbaapi/ooo/vba/word/XBookmarks.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XBorder.idl b/oovbaapi/ooo/vba/word/XBorder.idl
index c417fe2c34..16d645d2ef 100644
--- a/oovbaapi/ooo/vba/word/XBorder.idl
+++ b/oovbaapi/ooo/vba/word/XBorder.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XBorder.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XBorders.idl b/oovbaapi/ooo/vba/word/XBorders.idl
index 284ffd0b67..9fbe1f0fc7 100644
--- a/oovbaapi/ooo/vba/word/XBorders.idl
+++ b/oovbaapi/ooo/vba/word/XBorders.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XBorders.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XDialog.idl b/oovbaapi/ooo/vba/word/XDialog.idl
index 9c31fa78e8..ece567b05a 100644
--- a/oovbaapi/ooo/vba/word/XDialog.idl
+++ b/oovbaapi/ooo/vba/word/XDialog.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDialog.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XDialogs.idl b/oovbaapi/ooo/vba/word/XDialogs.idl
index 92c58ad41e..43425d0020 100644
--- a/oovbaapi/ooo/vba/word/XDialogs.idl
+++ b/oovbaapi/ooo/vba/word/XDialogs.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDialogs.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XDocument.idl b/oovbaapi/ooo/vba/word/XDocument.idl
index 7c4e3abd98..4b55552856 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XDocument.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XDocuments.idl b/oovbaapi/ooo/vba/word/XDocuments.idl
index ef6d09ba0b..46b7643d4f 100644
--- a/oovbaapi/ooo/vba/word/XDocuments.idl
+++ b/oovbaapi/ooo/vba/word/XDocuments.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XField.idl b/oovbaapi/ooo/vba/word/XField.idl
index 19d3d3b34c..d610da631c 100644
--- a/oovbaapi/ooo/vba/word/XField.idl
+++ b/oovbaapi/ooo/vba/word/XField.idl
@@ -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: XField.idl,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: jsc $ $Date: 2007/02/09 08:35:01 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/word/XFields.idl b/oovbaapi/ooo/vba/word/XFields.idl
index 78266ace3f..e4517debde 100644
--- a/oovbaapi/ooo/vba/word/XFields.idl
+++ b/oovbaapi/ooo/vba/word/XFields.idl
@@ -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: XFields.idl,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: jsc $ $Date: 2007/02/09 08:45:13 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/word/XFind.idl b/oovbaapi/ooo/vba/word/XFind.idl
index e42ac6f940..970c01e2a1 100644
--- a/oovbaapi/ooo/vba/word/XFind.idl
+++ b/oovbaapi/ooo/vba/word/XFind.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XFont.idl b/oovbaapi/ooo/vba/word/XFont.idl
index 53fc1bb753..b9e9364363 100644
--- a/oovbaapi/ooo/vba/word/XFont.idl
+++ b/oovbaapi/ooo/vba/word/XFont.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XGlobals.idl b/oovbaapi/ooo/vba/word/XGlobals.idl
index 9198ee6c13..45b52fc2fb 100644
--- a/oovbaapi/ooo/vba/word/XGlobals.idl
+++ b/oovbaapi/ooo/vba/word/XGlobals.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XGlobals.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XHeaderFooter.idl b/oovbaapi/ooo/vba/word/XHeaderFooter.idl
index 7dd1a39ec9..0b28a1128e 100644
--- a/oovbaapi/ooo/vba/word/XHeaderFooter.idl
+++ b/oovbaapi/ooo/vba/word/XHeaderFooter.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XOptions.idl b/oovbaapi/ooo/vba/word/XOptions.idl
index 13bb65ebfc..009a220dde 100644
--- a/oovbaapi/ooo/vba/word/XOptions.idl
+++ b/oovbaapi/ooo/vba/word/XOptions.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XPageSetup.idl b/oovbaapi/ooo/vba/word/XPageSetup.idl
index ca8e944607..480d95e3c4 100644
--- a/oovbaapi/ooo/vba/word/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/word/XPageSetup.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XPane.idl b/oovbaapi/ooo/vba/word/XPane.idl
index db506dd634..dbd20e05b8 100644
--- a/oovbaapi/ooo/vba/word/XPane.idl
+++ b/oovbaapi/ooo/vba/word/XPane.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XPanes.idl b/oovbaapi/ooo/vba/word/XPanes.idl
index ba0154c604..8eaa18ec23 100644
--- a/oovbaapi/ooo/vba/word/XPanes.idl
+++ b/oovbaapi/ooo/vba/word/XPanes.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XParagraph.idl b/oovbaapi/ooo/vba/word/XParagraph.idl
index 79ad7ae83a..057875d7e7 100644
--- a/oovbaapi/ooo/vba/word/XParagraph.idl
+++ b/oovbaapi/ooo/vba/word/XParagraph.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XParagraphFormat.idl b/oovbaapi/ooo/vba/word/XParagraphFormat.idl
index df6d584345..9b00a38009 100644
--- a/oovbaapi/ooo/vba/word/XParagraphFormat.idl
+++ b/oovbaapi/ooo/vba/word/XParagraphFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XParagraphs.idl b/oovbaapi/ooo/vba/word/XParagraphs.idl
index d5b916a168..039ea06b6c 100644
--- a/oovbaapi/ooo/vba/word/XParagraphs.idl
+++ b/oovbaapi/ooo/vba/word/XParagraphs.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XRange.idl b/oovbaapi/ooo/vba/word/XRange.idl
index 47e688e64c..868613c6af 100644
--- a/oovbaapi/ooo/vba/word/XRange.idl
+++ b/oovbaapi/ooo/vba/word/XRange.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XReplacement.idl b/oovbaapi/ooo/vba/word/XReplacement.idl
index daae501598..2d6dcd2840 100644
--- a/oovbaapi/ooo/vba/word/XReplacement.idl
+++ b/oovbaapi/ooo/vba/word/XReplacement.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XSection.idl b/oovbaapi/ooo/vba/word/XSection.idl
index c79a24b352..325ddf5dc8 100644
--- a/oovbaapi/ooo/vba/word/XSection.idl
+++ b/oovbaapi/ooo/vba/word/XSection.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XSections.idl b/oovbaapi/ooo/vba/word/XSections.idl
index 6e9d2a2ee3..5e50c9b738 100644
--- a/oovbaapi/ooo/vba/word/XSections.idl
+++ b/oovbaapi/ooo/vba/word/XSections.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XSelection.idl b/oovbaapi/ooo/vba/word/XSelection.idl
index 44026da26a..053cbc67e1 100644
--- a/oovbaapi/ooo/vba/word/XSelection.idl
+++ b/oovbaapi/ooo/vba/word/XSelection.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XStyle.idl b/oovbaapi/ooo/vba/word/XStyle.idl
index af19517265..b89798d30b 100644
--- a/oovbaapi/ooo/vba/word/XStyle.idl
+++ b/oovbaapi/ooo/vba/word/XStyle.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XStyles.idl b/oovbaapi/ooo/vba/word/XStyles.idl
index 312551a4bb..1262869ac5 100644
--- a/oovbaapi/ooo/vba/word/XStyles.idl
+++ b/oovbaapi/ooo/vba/word/XStyles.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XSystem.idl b/oovbaapi/ooo/vba/word/XSystem.idl
index 5a23f5604f..f8c29a5db5 100644
--- a/oovbaapi/ooo/vba/word/XSystem.idl
+++ b/oovbaapi/ooo/vba/word/XSystem.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XTable.idl b/oovbaapi/ooo/vba/word/XTable.idl
index f677da6bd1..235067c4bf 100644
--- a/oovbaapi/ooo/vba/word/XTable.idl
+++ b/oovbaapi/ooo/vba/word/XTable.idl
@@ -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: XTable.idl,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: jsc $ $Date: 2007/02/09 08:35:01 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/word/XTables.idl b/oovbaapi/ooo/vba/word/XTables.idl
index f09f27fb78..c561e3a2ca 100644
--- a/oovbaapi/ooo/vba/word/XTables.idl
+++ b/oovbaapi/ooo/vba/word/XTables.idl
@@ -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: XTables.idl,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.1 $
+ * This file is part of OpenOffice.org.
  *
- *  last change: $Author: jsc $ $Date: 2007/02/09 08:45:13 $
+ * OpenOffice.org is free software: you can redistribute it 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.
  *
  ************************************************************************/
 
diff --git a/oovbaapi/ooo/vba/word/XTemplate.idl b/oovbaapi/ooo/vba/word/XTemplate.idl
index a2bd1d724a..0a5f0ed38c 100644
--- a/oovbaapi/ooo/vba/word/XTemplate.idl
+++ b/oovbaapi/ooo/vba/word/XTemplate.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XVariable.idl b/oovbaapi/ooo/vba/word/XVariable.idl
index c31897a194..2ac0b55504 100644
--- a/oovbaapi/ooo/vba/word/XVariable.idl
+++ b/oovbaapi/ooo/vba/word/XVariable.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XVariables.idl b/oovbaapi/ooo/vba/word/XVariables.idl
index d219669fd6..2f070795f0 100644
--- a/oovbaapi/ooo/vba/word/XVariables.idl
+++ b/oovbaapi/ooo/vba/word/XVariables.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XView.idl b/oovbaapi/ooo/vba/word/XView.idl
index 1800d683e4..c01e087e2a 100644
--- a/oovbaapi/ooo/vba/word/XView.idl
+++ b/oovbaapi/ooo/vba/word/XView.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/oovbaapi/ooo/vba/word/XWindow.idl b/oovbaapi/ooo/vba/word/XWindow.idl
index 91984eb80c..225a92381c 100644
--- a/oovbaapi/ooo/vba/word/XWindow.idl
+++ b/oovbaapi/ooo/vba/word/XWindow.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWindow.idl,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/XWrapFormat.idl b/oovbaapi/ooo/vba/word/XWrapFormat.idl
index 386feb320f..15ff956ea3 100644
--- a/oovbaapi/ooo/vba/word/XWrapFormat.idl
+++ b/oovbaapi/ooo/vba/word/XWrapFormat.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XWrapFormat.idl,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/ooo/vba/word/makefile.mk b/oovbaapi/ooo/vba/word/makefile.mk
index a5b2e64e57..e3a19e6784 100644
--- a/oovbaapi/ooo/vba/word/makefile.mk
+++ b/oovbaapi/ooo/vba/word/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/oovbaapi/util/makefile.mk b/oovbaapi/util/makefile.mk
index e5ccb5da5f..9c33577abf 100644
--- a/oovbaapi/util/makefile.mk
+++ b/oovbaapi/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oovbaapi/util/makefile.pmk b/oovbaapi/util/makefile.pmk
index 9ea2da2c1e..e8f7cf4976 100644
--- a/oovbaapi/util/makefile.pmk
+++ b/oovbaapi/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/readlicense_oo/docs/readme/makefile.mk b/readlicense_oo/docs/readme/makefile.mk
index d55f1cbdc1..efe349d4ba 100755
--- a/readlicense_oo/docs/readme/makefile.mk
+++ b/readlicense_oo/docs/readme/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/readlicense_oo/html/makefile.mk b/readlicense_oo/html/makefile.mk
index 795f912514..332d23dec8 100644
--- a/readlicense_oo/html/makefile.mk
+++ b/readlicense_oo/html/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 1b2e1de513..88974113e6 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -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: makefile.pmk,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml
index 92e457b7fc..14bb4d2639 100755
--- a/scripting/examples/java/build.xml
+++ b/scripting/examples/java/build.xml
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: build.xml,v $
- 
-  $Revision: 1.14 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <project name="Scripting Framework Java Examples" default="all" basedir=".">
   <!-- =================== Environmental Properties ======================= -->
diff --git a/scripting/examples/java/makefile.mk b/scripting/examples/java/makefile.mk
index b8138c755a..06ba88868c 100755
--- a/scripting/examples/java/makefile.mk
+++ b/scripting/examples/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/examples/makefile.mk b/scripting/examples/makefile.mk
index f071060f02..577547cca8 100755
--- a/scripting/examples/makefile.mk
+++ b/scripting/examples/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/inc/makefile.mk b/scripting/inc/makefile.mk
index 86fcaf1b7f..1d23c96ac7 100644
--- a/scripting/inc/makefile.mk
+++ b/scripting/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/scripting/inc/pch/precompiled_scripting.cxx b/scripting/inc/pch/precompiled_scripting.cxx
index e518ff1764..ff35b12afe 100644
--- a/scripting/inc/pch/precompiled_scripting.cxx
+++ b/scripting/inc/pch/precompiled_scripting.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_scripting.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/scripting/inc/pch/precompiled_scripting.hxx b/scripting/inc/pch/precompiled_scripting.hxx
index f057e4d215..183e6a5ca6 100644
--- a/scripting/inc/pch/precompiled_scripting.hxx
+++ b/scripting/inc/pch/precompiled_scripting.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_scripting.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index c3bc4541ab..8b3d4479ce 100644
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SecurityDialog.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/scripting/java/build.xml b/scripting/java/build.xml
index 985af1b87f..9436917f24 100755
--- a/scripting/java/build.xml
+++ b/scripting/java/build.xml
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: build.xml,v $
- 
-  $Revision: 1.36.20.1 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <project name="Scipting Framework" default="all" basedir=".">
 
diff --git a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
index fb01001cb2..f59088d6cb 100644
--- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
+++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.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: DialogFactory.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/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 8c46eb323d..f2fe01bab6 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.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: ParcelBrowseNode.java,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/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index 4d9858065e..1f91e9cf68 100644
--- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.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: PkgProviderBrowseNode.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/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index e88c8f26c7..597789c062 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.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: ProviderBrowseNode.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/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index af733956d3..1c05308ab5 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.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: ScriptBrowseNode.java,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/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
index bd9a9206ab..084d35b749 100644
--- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
+++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.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: DeployedUnoPackagesDB.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/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index e07e47003d..f72e721b3e 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.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: Parcel.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/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 29fd3b6980..4ae5b7f0e9 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.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: ParcelContainer.java,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/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 5571fcc0c2..5758684d52 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.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: ParcelDescriptor.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/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
index 0cfd4ef319..fe06c189bc 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.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: ParsedScriptUri.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/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index 00f8f266f5..f69fa9dc51 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.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: ScriptEntry.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/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 6e53f64289..72fc5f35c8 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.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: ScriptMetaData.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/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 4611b8e452..ac3988e8da 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.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: UnoPkgContainer.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/scripting/java/com/sun/star/script/framework/container/XMLParser.java b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
index 166434e07f..0ee2c2eaef 100644
--- a/scripting/java/com/sun/star/script/framework/container/XMLParser.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParser.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: XMLParser.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/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
index 9bd593fb04..bc19d79011 100644
--- a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.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: XMLParserFactory.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/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index e51b872e16..7b3930a8cb 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.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: UCBStreamHandler.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/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index 4481890415..61c07e4cd5 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.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: XInputStreamImpl.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/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
index 6bd802c926..11c046d214 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.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: XInputStreamWrapper.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/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index e03c6348e2..8f681786f2 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.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: XOutputStreamWrapper.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/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index 311bc0018e..bc77b62951 100644
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.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: XStorageHelper.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/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index b2962a4fc5..36ece04b56 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.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: ClassLoaderFactory.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/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
index df746b1605..6c8db78a7a 100644
--- a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.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: EditorScriptContext.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/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java b/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java
index fedde4715b..ff3d5e4fc3 100755
--- a/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java
+++ b/scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.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: NoSuitableClassLoaderException.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/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 75fb9a67e5..4b18ac7e88 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.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: PathUtils.java,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/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index ac01c7f4d0..c88da58df8 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.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: ScriptContext.java,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/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index bc92168f09..ec3a6b9233 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.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: ScriptProvider.java,v $
- * $Revision: 1.13.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index 1a5f884476..b1288d7e93 100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.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: PlainSourceView.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/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index a177b82616..3a2ff76bc9 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptEditorForBeanShell.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/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index cb8a350141..3120487935 100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.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: ScriptProviderForBeanShell.java,v $
- * $Revision: 1.11.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index 60edbd0848..a0328b3710 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptSourceModel.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/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
index 6b565040dc..ecc8eea747 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptSourceView.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/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java b/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java
index 4f88938f33..70ef7ad4ef 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
index 10fb74d322..d6bed5c82c 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.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: ScriptDescriptor.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/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 948c711f2a..c89285ffdf 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.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: ScriptProviderForJava.java,v $
- * $Revision: 1.10.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
index e5662d3412..55358d4bb1 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.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: ScriptProxy.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/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
index ac2c41e01b..06594a9e01 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.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: StrictResolver.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/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 801511744d..46ccea6931 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptEditorForJavaScript.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/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index 69bec65f7e..a90e4bc41a 100755
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.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: ScriptProviderForJavaScript.java,v $
- * $Revision: 1.10.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
index 9b3255e6be..6a5a81bf97 100755
--- a/scripting/java/makefile.mk
+++ b/scripting/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
index 5fa88ac930..872cbbf5c0 100644
--- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java
+++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.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: CommandLineTools.java,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/scripting/java/org/openoffice/idesupport/LocalOffice.java b/scripting/java/org/openoffice/idesupport/LocalOffice.java
index 741cbcdfe0..58d8e24e74 100644
--- a/scripting/java/org/openoffice/idesupport/LocalOffice.java
+++ b/scripting/java/org/openoffice/idesupport/LocalOffice.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: LocalOffice.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/scripting/java/org/openoffice/idesupport/OfficeDocument.java b/scripting/java/org/openoffice/idesupport/OfficeDocument.java
index c6053336d3..dacb55d141 100644
--- a/scripting/java/org/openoffice/idesupport/OfficeDocument.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeDocument.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: OfficeDocument.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/scripting/java/org/openoffice/idesupport/OfficeInstallation.java b/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
index 0a1422e37a..151e58289b 100644
--- a/scripting/java/org/openoffice/idesupport/OfficeInstallation.java
+++ b/scripting/java/org/openoffice/idesupport/OfficeInstallation.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: OfficeInstallation.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/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
index 67cc9dae0f..43bf4c21df 100644
--- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java
+++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.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: SVersionRCFile.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/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
index 8693e60315..73b9f59d24 100644
--- a/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.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: AllFilesFilter.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/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
index a94b0408d3..b6e4b166c2 100644
--- a/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.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: BinaryOnlyFilter.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/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
index ac6a136817..6874ff1d3d 100644
--- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.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: ExceptParcelFilter.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/scripting/java/org/openoffice/idesupport/filter/FileFilter.java b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
index c3b04459f6..64db62176a 100644
--- a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java
+++ b/scripting/java/org/openoffice/idesupport/filter/FileFilter.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: FileFilter.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/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
index 8c69660575..fd8906cdee 100644
--- a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
+++ b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.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: LocalOfficeImpl.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/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java b/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
index 0960b64fda..a0850d0d28 100644
--- a/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.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: ConfigurePanel.java,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/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
index b6a09ee761..3c216b5723 100644
--- a/scripting/java/org/openoffice/idesupport/ui/MethodPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/MethodPanel.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: MethodPanel.java,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/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
index aaf78231db..44b80cf0a9 100644
--- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java
+++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.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: ScriptPanel.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/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java
index fe9f411038..2821bbb92b 100644
--- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java
+++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.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: Manifest.java,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/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
index c7fa501ccd..312a10abd0 100644
--- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java
+++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.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: ParcelZipper.java,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/scripting/java/org/openoffice/netbeans/editor/JavaKit.java b/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
index 97373f9592..380ad7e80e 100644
--- a/scripting/java/org/openoffice/netbeans/editor/JavaKit.java
+++ b/scripting/java/org/openoffice/netbeans/editor/JavaKit.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: JavaKit.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/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
index 24f4c85509..6e62c567f7 100644
--- a/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java
+++ b/scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.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: NetBeansSourceView.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/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
index 81bd395f3a..37d921c680 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.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: BuildParcelAction.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/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
index 2ebd7c7686..0f9e8848af 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.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: CompileParcelAction.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
index d6b369fff7..cdc7b3762d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.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: ConfigureParcelAction.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/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
index 69db5710c0..a8ecfef010 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.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: DeployParcelAction.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/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
index a2c635def4..71601fa0c5 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.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: MountDocumentAction.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/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
index ab2c90481b..5420ef4eeb 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.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: MountParcelAction.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/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
index 36bc3f77ad..0f422605ad 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.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: OfficeDocumentCookie.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/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
index d04e8673b9..b05601d5f3 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.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: OfficeDocumentSupport.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
index 61aa9c4a64..b9500a2ad4 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.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: ParcelCookie.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
index 687ed21ae6..515f8e968c 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.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: ParcelDescriptorEditorSupport.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
index d90bb33a6a..3e6bcbfff1 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.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: ParcelDescriptorParserCookie.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
index 27095c618e..71bc99f6c4 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.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: ParcelDescriptorParserSupport.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
index 3e357ea892..205b0637e2 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.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: ParcelFolderCookie.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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
index e1e20e3654..41d1b8434d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.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: ParcelFolderSupport.java,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/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
index 5d0f29d8de..ff032b327d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.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: ParcelSupport.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/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
index ed3b88c12d..ebe65e0714 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.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: OpenOfficeDocFileSystem.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/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
index 88daba6998..6ed5ec5a8c 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.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: OpenOfficeDocFileSystemBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
index 350b8dcfe0..530ec93b1b 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.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: OfficeDocumentDataLoader.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/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
index 11abecaf84..353bf3959d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.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: OfficeDocumentDataLoaderBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
index d5419d5039..bba51237d4 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.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: OfficeDocumentDataNode.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/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
index 7ca784017b..96df06251f 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.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: OfficeDocumentDataObject.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
index 8cd2fec77a..b5088f2a91 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.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: ParcelContentsFolder.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
index 53bbe050d2..edc51685af 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.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: ParcelContentsFolderDataLoader.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
index 52f5023a24..d8ed1c5be5 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.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: ParcelContentsFolderDataLoaderBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
index f9cef0f545..ed6a8b9cd5 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.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: ParcelDataLoader.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
index d6cc53b7b7..05766a4d50 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.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: ParcelDataLoaderBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
index 8ae74deba4..d69d085299 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.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: ParcelDataNode.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
index 41232bf9ce..49135e1ef9 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.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: ParcelDataObject.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
index aef136c4d9..7eb439c535 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.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: ParcelDescriptorDataLoader.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
index 0b9480a2ee..e742c4bd51 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.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: ParcelDescriptorDataLoaderBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
index f5ef51ff21..8e60eefd67 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.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: ParcelDescriptorDataNode.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
index b4757d805f..1c95351cef 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.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: ParcelDescriptorDataObject.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
index 0a11906625..e77c59ff4b 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.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: ParcelFolder.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
index ede3d4c0e1..cfca5cce8d 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.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: ParcelFolderDataLoader.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/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
index 4b4de463b1..2d166eb084 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.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: ParcelFolderDataLoaderBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
index c20faf45f1..e921991a14 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.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: OfficeDocumentChildren.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/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
index fb38ecfe7c..95ee695a57 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.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: ParcelDescriptorChildren.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/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
index bab06aeb29..91f953cc97 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.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: ScriptNode.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/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
index 3a1bb8cb68..f493d03618 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.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: OfficeSettings.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/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
index 68350857bf..1e88c42d55 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.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: OfficeSettingsBeanInfo.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/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
index 5ca772920d..baaacc524c 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.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: FrameworkJarChecker.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/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
index 806c83d6c2..e0cf728a47 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.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: ManifestParser.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/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
index 6b61bdef30..fa048d3bb1 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.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: NagDialog.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/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
index bd126fefc6..a5fa15bc01 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.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: OfficeModule.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/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
index ae294a1df6..25f2af5a8f 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.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: PackageRemover.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/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
index 78f698ed6a..62f06c8a33 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.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: ZipMounter.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/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
index 7550109854..aac32cafee 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.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: JavaScriptIterator.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/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
index fd0871f242..0039387df1 100644
--- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java
+++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.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: ParcelContentsIterator.java,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/scripting/prj/build.lst b/scripting/prj/build.lst
index 26b905b1ab..fc332384e0 100644
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,8 +1,9 @@
-tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
+tc	scripting	:	oovbaapi bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
 tc	scripting									usr1	-	all	tc1_mkout NULL
 tc	scripting\inc								nmake	-	all	tc1_inc NULL
 tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
 tc	scripting\source\basprov				nmake	-	all	tc1_scriptingbasprov tc1_inc NULL
+tc	scripting\source\vbaevents				nmake	-	all	tc1_scriptingvbaevents tc1_inc NULL
 tc	scripting\source\dlgprov				nmake	-	all	tc1_scriptingdlgprov tc1_inc NULL
 tc	scripting\source\stringresource			nmake	-	all	tc1_scriptingstringresource tc1_inc NULL
 tc	scripting\source\pyprov				nmake	-	all	tc1_scriptingpyprov tc1_inc NULL
@@ -10,4 +11,4 @@ tc	scripting\source\protocolhandler			nmake	-	all	tc1_scriptingprotocolhandler t
 tc	scripting\java						nmake	-	all	tc1_scriptingjava tc1_scriptingprovider tc1_scriptingprotocolhandler NULL
 tc	scripting\examples\java				nmake	-	all	tc1_scriptingexamplesjava tc1_scriptingjava  NULL
 tc	scripting\examples				nmake	-	all	tc1_scriptingexamples tc1_scriptingexamplesjava  tc1_inc NULL
-tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
+tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index c00d18e774..0df822404d 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: baslibnode.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/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index e42b6cd799..fb74315660 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: baslibnode.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/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index dae5689373..49e85cceca 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmethnode.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/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 1ddb7c2885..0ef02816dc 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmethnode.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/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index f9fe5a40a7..687fea3584 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmodnode.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/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index ab4ab3714b..5b2e50b124 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmodnode.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/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 562e60514c..c616371276 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basprov.cxx,v $
- * $Revision: 1.21.6.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 9dea63dd1b..9ef21da4d0 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basprov.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/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 2fedb5f7a3..620e249362 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basscript.cxx,v $
- * $Revision: 1.16.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 7f7db4173b..a524c186b2 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basscript.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/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk
index 2b6fe7faa3..1555a74926 100644
--- a/scripting/source/basprov/makefile.mk
+++ b/scripting/source/basprov/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 60d53d1562..992e670e8d 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgevtatt.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -121,19 +118,21 @@ namespace dlgprov
     DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel ) : DialogScriptListenerImpl( rxContext )
     {
         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
+        Sequence< Any > args(1);
         if ( xSMgr.is() )
         {
-            Sequence< Any > args(1);
             args[0] <<= xModel;
             mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) ), args, m_xContext ), UNO_QUERY );
         }
         if ( rxControl.is() )
         {
-            Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY );
             try
             {
+                Reference< XPropertySet > xProps( rxControl->getModel(), UNO_QUERY_THROW );
                 xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= msDialogCodeName;
-            }
+                xProps.set( mxListener, UNO_QUERY_THROW );
+                xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ), args[ 0 ] );
+            } 
             catch( const Exception& )
             {
                 DBG_UNHANDLED_EXCEPTION();
@@ -199,7 +198,7 @@ namespace dlgprov
         return it->second;
     }
 #ifdef FAKE_VBA_EVENT_SUPPORT
-    Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl )
+    Reference< XScriptEventsSupplier > DialogEventsAttacherImpl::getFakeVbaEventsSupplier( const Reference< XControl >& xControl, rtl::OUString& sControlName )
     {
         Reference< XScriptEventsSupplier > xEventsSupplier;
         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
@@ -207,8 +206,7 @@ namespace dlgprov
         {
             Reference< ooo::vba::XVBAToOOEventDescGen > xVBAToOOEvtDesc( xSMgr->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) ), m_xContext ), UNO_QUERY );
             if ( xVBAToOOEvtDesc.is() )
-                xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl ), UNO_QUERY );
-
+                xEventsSupplier.set( xVBAToOOEvtDesc->getEventSupplier( xControl, sControlName ), UNO_QUERY );
         }
         return xEventsSupplier;
     }
@@ -314,6 +312,20 @@ namespace dlgprov
         // go over all objects
         const Reference< XInterface >* pObjects = Objects.getConstArray();
         sal_Int32 nObjCount = Objects.getLength();
+#ifdef FAKE_VBA_EVENT_SUPPORT
+        Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog	
+        rtl::OUString sDialogCodeName;
+        if ( xDlgControl.is() )
+        {
+            Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY );
+            try
+            {
+                xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sDialogCodeName;  
+            }
+            catch( Exception& ){}
+        }
+#endif
+    
         for ( sal_Int32 i = 0; i < nObjCount; ++i )
         {
             // We know that we have to do with instances of XControl.
@@ -328,7 +340,7 @@ namespace dlgprov
             Reference< XScriptEventsSupplier > xEventsSupplier( xControlModel, UNO_QUERY );
             attachEventsToControl( xControl, xEventsSupplier, Helper );
 #ifdef FAKE_VBA_EVENT_SUPPORT
-            xEventsSupplier.set( getFakeVbaEventsSupplier( xControl ) );
+            xEventsSupplier.set( getFakeVbaEventsSupplier( xControl, sDialogCodeName ) );
             attachEventsToControl( xControl, xEventsSupplier, Helper );
 #endif
         }
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index b78dad826b..7e7e23f747 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgevtatt.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,6 +43,9 @@
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
 
 #include <hash_map>
+
+#define FAKE_VBA_EVENT_SUPPORT 1 
+
 //.........................................................................
 namespace dlgprov
 {
@@ -71,7 +71,7 @@ namespace dlgprov
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher;
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException );
 #ifdef FAKE_VBA_EVENT_SUPPORT
-        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl );
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName );
 #endif
         void  SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
     public:
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index c22f5a9e97..41a37d65e3 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgprov.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/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index d0a5c6bf55..098e1d9378 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgprov.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/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
index da1c88fdd6..0ad861d5c2 100644
--- a/scripting/source/dlgprov/makefile.mk
+++ b/scripting/source/dlgprov/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -71,3 +67,15 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+# ------------------------------------------------------------------
+
+ALLTAR : \
+        $(MISC)$/$(TARGET).don \
+
+$(SLOFILES) : $(MISC)$/$(TARGET).don
+
+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+        echo $@
+ 
diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx
index 6d2d227e93..cb955d910e 100644
--- a/scripting/source/inc/bcholder.hxx
+++ b/scripting/source/inc/bcholder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bcholder.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/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx
index 0f9a664dca..44e03b67cd 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MiscUtils.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/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx
index cd4d6c83f0..5799fe95c0 100644
--- a/scripting/source/inc/util/scriptingconstants.hxx
+++ b/scripting/source/inc/util/scriptingconstants.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scriptingconstants.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/scripting/source/inc/util/util.hxx b/scripting/source/inc/util/util.hxx
index ff869023b7..84d51f85d8 100644
--- a/scripting/source/inc/util/util.hxx
+++ b/scripting/source/inc/util/util.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: util.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/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk
index 35440668f6..c782c1a188 100644
--- a/scripting/source/protocolhandler/makefile.mk
+++ b/scripting/source/protocolhandler/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 8a009c342b..388be37eb7 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scripthandler.cxx,v $
- * $Revision: 1.29.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 61ba5b4002..a7e7bea384 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scripthandler.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/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 641ca09a59..b4f3709b72 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ActiveMSPList.cxx,v $
- * $Revision: 1.16.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 26c0b166d4..526c2522aa 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ActiveMSPList.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/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 9dd4de69bb..7593eb3cde 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BrowseNodeFactoryImpl.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/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 95611f46a0..f41af8b2fa 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: BrowseNodeFactoryImpl.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/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 2d3176e97f..fcaaf00877 100755
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MasterScriptProvider.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/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index d8d39a6421..4484c6cef6 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MasterScriptProvider.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/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 851485fd42..4ca5ebebd3 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MasterScriptProviderFactory.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/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index f3c8827fa5..6954c850c1 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MasterScriptProviderFactory.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/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index a9473aa6f7..040dfdd437 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProviderCache.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/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index b739ee70b1..59c4f7ac26 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProviderCache.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/scripting/source/provider/ScriptImpl.cxx b/scripting/source/provider/ScriptImpl.cxx
index ba6e0f2047..a2715e72e9 100644
--- a/scripting/source/provider/ScriptImpl.cxx
+++ b/scripting/source/provider/ScriptImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptImpl.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/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index 9ffc7e0683..9aa019daad 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptImpl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx
index 43d20b5bfe..724b8c5a76 100755
--- a/scripting/source/provider/ScriptingContext.cxx
+++ b/scripting/source/provider/ScriptingContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptingContext.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/scripting/source/provider/ScriptingContext.hxx b/scripting/source/provider/ScriptingContext.hxx
index 6b25062703..726a2aa3d4 100644
--- a/scripting/source/provider/ScriptingContext.hxx
+++ b/scripting/source/provider/ScriptingContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptingContext.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/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 8b9e3ac9da..978115d881 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index 15230b2670..73f5103918 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/provider/makefile.mk b/scripting/source/provider/makefile.mk
index 44bae77830..a63ae078d8 100644
--- a/scripting/source/provider/makefile.mk
+++ b/scripting/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.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index c8f7b67652..f9c2f0f70b 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -37,6 +37,7 @@ from email import Encoders
 from email.Header import Header
 from email.MIMEMultipart import MIMEMultipart
 from email.Utils import formatdate
+from email.Utils import formataddr
 
 import sys, smtplib, imaplib, poplib
 
@@ -123,8 +124,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
 		bccrecipients = xMailMessage.getBccRecipients()
 		if dbg:
 			print >> sys.stderr, "PyMailSMPTService subject", subject
-			print >> sys.stderr, "PyMailSMPTService from", sendername.encode('utf-8')
-                        print >> sys.stderr, "PyMailSMTPService from", sendermail
+			print >> sys.stderr, "PyMailSMPTService from", sendername.encode('utf-8'), sendermail
+                        print >> sys.stderr, "PyMailSMTPService from", formataddr((sendername.encode('utf-8'), sendermail))
 			print >> sys.stderr, "PyMailSMPTService send to", recipients
 
 		attachments = xMailMessage.getAttachments()
@@ -149,10 +150,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
 		else:
 			msg = textmsg
 
-		hdr = Header(sendername, 'utf-8')
-                hdr.append('<'+sendermail+'>','us-ascii')
                 msg['Subject'] = subject
-		msg['From'] = hdr
+		msg['From'] = formataddr((sendername.encode('utf-8'), sendermail))
 		msg['To'] = COMMASPACE.join(recipients)
 		if len(ccrecipients):
 			msg['Cc'] = COMMASPACE.join(ccrecipients)
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index 991d82248e..3c02785951 100644
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
index 5e6bd1cd94..610ac5f9db 100644
--- a/scripting/source/pyprov/officehelper.py
+++ b/scripting/source/pyprov/officehelper.py
@@ -2,14 +2,10 @@
 ### *
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: officehelper.py,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/source/runtimemgr/ScriptExecDialog.hrc b/scripting/source/runtimemgr/ScriptExecDialog.hrc
index 42c9d37492..e4d65665bc 100644
--- a/scripting/source/runtimemgr/ScriptExecDialog.hrc
+++ b/scripting/source/runtimemgr/ScriptExecDialog.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: ScriptExecDialog.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/scripting/source/runtimemgr/ScriptExecDialog.src b/scripting/source/runtimemgr/ScriptExecDialog.src
index 319c1b950e..1daf2ea698 100644
--- a/scripting/source/runtimemgr/ScriptExecDialog.src
+++ b/scripting/source/runtimemgr/ScriptExecDialog.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: ScriptExecDialog.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/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 6d26a2465c..ffb2a52d88 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptNameResolverImpl.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/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
index 1a60a4b4c0..ef52e47ebf 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptNameResolverImpl.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/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index 0aba98b504..6fa510c65e 100755
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptRuntimeManager.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/scripting/source/runtimemgr/ScriptRuntimeManager.hxx b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
index a628b267f3..6bd25f5d04 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptRuntimeManager.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/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx
index 158ce5d601..9a5105b576 100644
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageBridge.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/scripting/source/runtimemgr/StorageBridge.hxx b/scripting/source/runtimemgr/StorageBridge.hxx
index 52d7d52782..54f3f8551b 100644
--- a/scripting/source/runtimemgr/StorageBridge.hxx
+++ b/scripting/source/runtimemgr/StorageBridge.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageBridge.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/scripting/source/runtimemgr/StorageBridgeFactory.cxx b/scripting/source/runtimemgr/StorageBridgeFactory.cxx
index 47536de3cd..47fbdf22a6 100644
--- a/scripting/source/runtimemgr/StorageBridgeFactory.cxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.cxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageBridgeFactory.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/scripting/source/runtimemgr/StorageBridgeFactory.hxx b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
index 80c6349d59..5e8dc69608 100644
--- a/scripting/source/runtimemgr/StorageBridgeFactory.hxx
+++ b/scripting/source/runtimemgr/StorageBridgeFactory.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StorageBridgeFactory.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/scripting/source/runtimemgr/makefile.mk b/scripting/source/runtimemgr/makefile.mk
index 9c9822bf22..d802fd240a 100644
--- a/scripting/source/runtimemgr/makefile.mk
+++ b/scripting/source/runtimemgr/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/source/storage/ScriptData.hxx b/scripting/source/storage/ScriptData.hxx
index 104dfc4b4b..2e1866b93a 100644
--- a/scripting/source/storage/ScriptData.hxx
+++ b/scripting/source/storage/ScriptData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptData.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/scripting/source/storage/ScriptElement.cxx b/scripting/source/storage/ScriptElement.cxx
index 1efb00ca33..86ef4a8b2c 100644
--- a/scripting/source/storage/ScriptElement.cxx
+++ b/scripting/source/storage/ScriptElement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptElement.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/scripting/source/storage/ScriptElement.hxx b/scripting/source/storage/ScriptElement.hxx
index 79c49968e5..64084004ed 100644
--- a/scripting/source/storage/ScriptElement.hxx
+++ b/scripting/source/storage/ScriptElement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptElement.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/scripting/source/storage/ScriptInfo.cxx b/scripting/source/storage/ScriptInfo.cxx
index ece5c3ff92..0d8aa511fb 100644
--- a/scripting/source/storage/ScriptInfo.cxx
+++ b/scripting/source/storage/ScriptInfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptInfo.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/scripting/source/storage/ScriptInfo.hxx b/scripting/source/storage/ScriptInfo.hxx
index 56a603b189..3de01df8a7 100644
--- a/scripting/source/storage/ScriptInfo.hxx
+++ b/scripting/source/storage/ScriptInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptInfo.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/scripting/source/storage/ScriptInfoImpl.hxx b/scripting/source/storage/ScriptInfoImpl.hxx
index c23a06ec57..e715be8b49 100644
--- a/scripting/source/storage/ScriptInfoImpl.hxx
+++ b/scripting/source/storage/ScriptInfoImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptInfoImpl.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/scripting/source/storage/ScriptMetadataImporter.cxx b/scripting/source/storage/ScriptMetadataImporter.cxx
index fbdb95b5c2..502ce6aab4 100644
--- a/scripting/source/storage/ScriptMetadataImporter.cxx
+++ b/scripting/source/storage/ScriptMetadataImporter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptMetadataImporter.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/scripting/source/storage/ScriptMetadataImporter.hxx b/scripting/source/storage/ScriptMetadataImporter.hxx
index 04dea9caa3..74daf4eb04 100644
--- a/scripting/source/storage/ScriptMetadataImporter.hxx
+++ b/scripting/source/storage/ScriptMetadataImporter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptMetadataImporter.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/scripting/source/storage/ScriptSecurityManager.cxx b/scripting/source/storage/ScriptSecurityManager.cxx
index f84dbbec6d..a17759a6de 100755
--- a/scripting/source/storage/ScriptSecurityManager.cxx
+++ b/scripting/source/storage/ScriptSecurityManager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptSecurityManager.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/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx
index 2222720459..39fede0118 100755
--- a/scripting/source/storage/ScriptSecurityManager.hxx
+++ b/scripting/source/storage/ScriptSecurityManager.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptSecurityManager.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/scripting/source/storage/ScriptStorage.cxx b/scripting/source/storage/ScriptStorage.cxx
index 7329acc131..7919904c40 100644
--- a/scripting/source/storage/ScriptStorage.cxx
+++ b/scripting/source/storage/ScriptStorage.cxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptStorage.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/scripting/source/storage/ScriptStorage.hxx b/scripting/source/storage/ScriptStorage.hxx
index de49d14943..fce94d8a3a 100644
--- a/scripting/source/storage/ScriptStorage.hxx
+++ b/scripting/source/storage/ScriptStorage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptStorage.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/scripting/source/storage/ScriptStorageManager.cxx b/scripting/source/storage/ScriptStorageManager.cxx
index ff4b2bebe3..1ba7c7187a 100644
--- a/scripting/source/storage/ScriptStorageManager.cxx
+++ b/scripting/source/storage/ScriptStorageManager.cxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptStorageManager.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/scripting/source/storage/ScriptStorageManager.hxx b/scripting/source/storage/ScriptStorageManager.hxx
index 13bfeae392..4cabe11772 100644
--- a/scripting/source/storage/ScriptStorageManager.hxx
+++ b/scripting/source/storage/ScriptStorageManager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptStorageManager.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/scripting/source/storage/ScriptURI.cxx b/scripting/source/storage/ScriptURI.cxx
index 3ddede9747..ad68531027 100644
--- a/scripting/source/storage/ScriptURI.cxx
+++ b/scripting/source/storage/ScriptURI.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptURI.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/scripting/source/storage/ScriptURI.hxx b/scripting/source/storage/ScriptURI.hxx
index bb686428fa..bbfe170c56 100644
--- a/scripting/source/storage/ScriptURI.hxx
+++ b/scripting/source/storage/ScriptURI.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ScriptURI.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/scripting/source/storage/XMLElement.cxx b/scripting/source/storage/XMLElement.cxx
index f6dcf3b4b3..9d218460bf 100644
--- a/scripting/source/storage/XMLElement.cxx
+++ b/scripting/source/storage/XMLElement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLElement.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/scripting/source/storage/XMLElement.hxx b/scripting/source/storage/XMLElement.hxx
index 375912c2f6..07cd4e8d5e 100644
--- a/scripting/source/storage/XMLElement.hxx
+++ b/scripting/source/storage/XMLElement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLElement.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/scripting/source/storage/makefile.mk b/scripting/source/storage/makefile.mk
index a6f06369a3..7ba35edf06 100644
--- a/scripting/source/storage/makefile.mk
+++ b/scripting/source/storage/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk
index 970a0c5d7b..afb07fddfa 100644
--- a/scripting/source/stringresource/makefile.mk
+++ b/scripting/source/stringresource/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 82f63b0fe9..330ae8397b 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stringresource.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/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 62756e48aa..81ee75f057 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stringresource.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/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
new file mode 100755
index 0000000000..589aec94c2
--- /dev/null
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -0,0 +1,1042 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: eventhelper.cxx,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_scripting.hxx"
+#include <comphelper/processfactory.hxx>
+#include <comphelper/uno3.hxx>
+#include <comphelper/proparrhlp.hxx>
+#include <comphelper/propertycontainer.hxx>
+
+#include <ooo/vba/XVBAToOOEventDescGen.hpp>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XIntrospection.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+
+#include <com/sun/star/frame/XModel.hpp>
+
+#include <com/sun/star/script/XLibraryContainer.hpp>
+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
+#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
+
+#include <com/sun/star/drawing/XControlShape.hpp>
+
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/MouseEvent.hpp>
+#include <com/sun/star/awt/XFixedText.hpp> //liuchen 2009-6-5
+#include <com/sun/star/awt/XTextComponent.hpp> //liuchen 2009-6-5
+#include <com/sun/star/awt/XComboBox.hpp> //liuchen 2009-6-18
+#include <com/sun/star/awt/XRadioButton.hpp> //liuchen 2009-7-30
+
+#include <msforms/ReturnInteger.hpp>
+
+#include <sfx2/objsh.hxx>
+#include <basic/sbstar.hxx>
+#include <basic/basmgr.hxx>
+#include <basic/sbmeth.hxx>
+#include <basic/sbmod.hxx>
+#include <basic/sbx.hxx>
+
+
+
+
+// for debug
+#include <comphelper/anytostring.hxx>
+
+
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include <com/sun/star/script/XScriptListener.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <comphelper/evtmethodhelper.hxx>
+
+#include <set>
+#include <list>
+#include <hash_map>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::script;
+using namespace ::com::sun::star::uno;
+using namespace ::ooo::vba;
+
+#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))//liuchen 2009-6-8
+#define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0);
+
+// Some constants 
+const static rtl::OUString DELIM = rtl::OUString::createFromAscii( "::" );
+const static sal_Int32 DELIMLEN = DELIM.getLength();
+
+#if 0
+void dumpListeners( const Reference< beans::XIntrospection >& xIntrospection, const Reference<XInterface>& xIfc)
+{
+    Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
+    if ( xIntrospection.is() )
+    {
+        xIntrospectionAccess = xIntrospection->inspect( 
+            makeAny( xIfc ) );
+        Sequence< Type > aControlListeners = 
+            xIntrospectionAccess->getSupportedListeners();
+        sal_Int32 nLength = aControlListeners.getLength();
+             
+        for ( sal_Int32 i = 0; i< nLength; ++i )
+        {
+            Type& listType = aControlListeners[ i ];
+            rtl::OUString sFullTypeName = listType.getTypeName();
+            rtl::OUString sTypeName = listType.getTypeName();
+            sal_Int32 lastDotIndex = -1;
+            if ( ( lastDotIndex = sFullTypeName.lastIndexOf( '.' ) ) > -1 )
+            {
+                sTypeName = sFullTypeName.copy( lastDotIndex + 1 );    
+            } 
+            Sequence< ::rtl::OUString > sMeths = comphelper::getEventMethodsForType( listType );    
+            sal_Int32 sMethLen = sMeths.getLength();
+            for ( sal_Int32 j=0 ; j < sMethLen; ++j )
+            {
+                OSL_TRACE("**Listener [%d] Type[%s] Method[%s]",j,
+                    rtl::OUStringToOString( sTypeName, 
+                        RTL_TEXTENCODING_UTF8 ).getStr(),
+                    rtl::OUStringToOString( sMeths[ j ], 
+                        RTL_TEXTENCODING_UTF8 ).getStr() );
+            }
+        }
+       
+    }
+}
+
+void dumpEvent( const ScriptEvent& evt )
+{
+    OSL_TRACE("dumpEvent: Source %s",
+        rtl::OUStringToOString( comphelper::anyToString( makeAny(evt.Source)), 
+            RTL_TEXTENCODING_UTF8 ).getStr() );
+
+    OSL_TRACE("dumpEvent: ScriptType %s",
+        rtl::OUStringToOString( evt.ScriptType, 
+            RTL_TEXTENCODING_UTF8 ).getStr() );
+    
+    OSL_TRACE("dumpEvent: ScriptCode %s",
+        rtl::OUStringToOString( evt.ScriptCode, 
+            RTL_TEXTENCODING_UTF8 ).getStr() );
+
+    OSL_TRACE("dumpEvent: ListenerType %s",
+        rtl::OUStringToOString( evt.ListenerType.getTypeName(), 
+            RTL_TEXTENCODING_UTF8 ).getStr() );
+    
+    OSL_TRACE("dumpEvent: Listener methodname %s",
+        rtl::OUStringToOString( evt.MethodName, 
+            RTL_TEXTENCODING_UTF8 ).getStr() );
+
+    OSL_TRACE("dumpEvent: arguments;");
+    sal_Int32 nLen = evt.Arguments.getLength();
+    for ( sal_Int32 index=0; index < nLen; ++index )
+    {
+        OSL_TRACE("\t [%d] %s", index, 
+        rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[ index ] ), 
+            RTL_TEXTENCODING_UTF8 ).getStr() );
+
+    }
+}
+
+#endif
+
+bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params )
+{
+    if ( !( params.getLength() > 0 ) ||
+        !( params[ 0 ] >>= evt ) )
+        return false;
+    return true;
+}
+
+bool isMouseEventOk( awt::MouseEvent& evt, const Sequence< Any >& params )
+{
+    if ( !( params.getLength() > 0 ) ||
+        !( params[ 0 ] >>= evt ) )
+        return false;
+    return true;
+}
+
+Sequence< Any > ooMouseEvtToVBADblClick( const Sequence< Any >& params )
+{
+    Sequence< Any > translatedParams;
+    awt::MouseEvent evt;
+
+    if ( !( isMouseEventOk(evt, params)) || 
+        (evt.ClickCount != 2) )
+        return Sequence< Any >(); 
+    // give back orig params, this will signal that the event is good
+    return params;
+}
+
+Sequence< Any > ooMouseEvtToVBAMouseEvt( const Sequence< Any >& params )
+{
+    Sequence< Any > translatedParams;
+    awt::MouseEvent evt;
+
+    if ( !isMouseEventOk(evt, params) )
+        return Sequence< Any >(); 
+
+    translatedParams.realloc(4);
+
+    // Buttons
+    translatedParams[ 0 ] <<= evt.Buttons;
+    // Shift
+    translatedParams[ 1 ] <<= evt.Modifiers;
+    // X
+    translatedParams[ 2 ] <<= evt.X;
+    // Y
+    translatedParams[ 3 ] <<= evt.Y;
+    return translatedParams;
+}
+
+Sequence< Any > ooKeyPressedToVBAKeyPressed( const Sequence< Any >& params )
+{
+    Sequence< Any > translatedParams;
+    awt::KeyEvent evt;
+
+    if ( !isKeyEventOk( evt, params ) )
+        return Sequence< Any >(); 
+
+    translatedParams.realloc(1);
+
+    msforms::ReturnInteger keyCode;
+    keyCode.Value = evt.KeyCode; 
+    translatedParams[0] <<= keyCode;
+    return  translatedParams;
+}
+
+Sequence< Any > ooKeyPressedToVBAKeyUpDown( const Sequence< Any >& params )
+{
+    Sequence< Any > translatedParams;
+    awt::KeyEvent evt;
+
+    if ( !isKeyEventOk( evt, params ) )
+        return Sequence< Any >(); 
+
+    translatedParams.realloc(2);
+
+    msforms::ReturnInteger keyCode;
+    sal_Int8 shift = sal::static_int_cast<sal_Int8>( evt.Modifiers );
+
+    // #TODO check whether values from OOO conform to values generated from vba
+    keyCode.Value = evt.KeyCode; 
+    translatedParams[0] <<= keyCode;
+    translatedParams[1] <<= shift;
+    return  translatedParams;
+}
+
+typedef Sequence< Any > (*Translator)(const Sequence< Any >&);
+
+//liuchen 2009-6-23
+//expand the "TranslateInfo" struct to support more kinds of events 
+struct TranslateInfo
+{
+    rtl::OUString sVBAName; //vba event name
+    Translator toVBA;       //the method to convert OO event parameters to VBA event parameters	
+    bool (*ApproveRule)(const ScriptEvent& evt, void* pPara); //this method is used to determine which types of controls should execute the event 
+    void *pPara;			//Parameters for the above approve method
+};
+
+
+typedef std::hash_map< rtl::OUString, 
+std::list< TranslateInfo >, 
+::rtl::OUStringHash,
+::std::equal_to< ::rtl::OUString > > EventInfoHash;
+
+//liuchen 2009-6-23
+struct TranslatePropMap
+{
+    rtl::OUString sEventInfo;   //OO event name
+    TranslateInfo aTransInfo;   
+};
+ 
+bool ApproveAll(const ScriptEvent& evt, void* pPara); //allow all types of controls to execute the event
+bool ApproveType(const ScriptEvent& evt, void* pPara); //certain types of controls should execute the event, those types are given by pPara
+bool DenyType(const ScriptEvent& evt, void* pPara);    //certain types of controls should not execute the event, those types are given by pPara
+bool DenyMouseDrag(const ScriptEvent& evt, void* pPara); //used for VBA MouseMove event when "Shift" key is pressed
+
+struct TypeList
+{
+    uno::Type* pTypeList;
+    int nListLength;
+};
+
+Type typeXFixedText = GET_TYPE(awt::XFixedText)
+Type typeXTextComponent = GET_TYPE(awt::XTextComponent)
+Type typeXComboBox = GET_TYPE(awt::XComboBox)
+Type typeXRadioButton = GET_TYPE(awt::XRadioButton)
+
+
+TypeList fixedTextList = {&typeXFixedText, 1};
+TypeList textCompList = {&typeXTextComponent, 1};
+TypeList radioButtonList = {&typeXRadioButton, 1};
+TypeList comboBoxList = {&typeXComboBox, 1};
+
+//this array stores the OO event to VBA event translation info
+static TranslatePropMap aTranslatePropMap_Impl[] = 
+{
+    // actionPerformed ooo event
+    { MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Click"), NULL, ApproveAll, NULL } },	
+    { MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Change"), NULL, DenyType, (void*)(&radioButtonList) } },  //liuchen 2009-7-30, OptionalButton_Change event is not the same as OptionalButton_Click event
+
+    // itemStateChanged ooo event
+    { MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Click"), NULL, ApproveType, (void*)(&comboBoxList) } },  //liuchen, add to support VBA ComboBox_Click event
+    { MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveType, (void*)(&radioButtonList) } }, //liuchen 2009-7-30, OptionalButton_Change event should be triggered when the button state is changed
+    
+    // changed ooo event
+    { MAP_CHAR_LEN("changed"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },	
+
+    // focusGained ooo event
+    { MAP_CHAR_LEN("focusGained"), { MAP_CHAR_LEN("_GotFocus"), NULL, ApproveAll, NULL } },
+
+    // focusLost ooo event
+    { MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_LostFocus"), NULL, ApproveAll, NULL } },
+    { MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_Exit"), NULL, ApproveType, (void*)(&textCompList) } }, //liuchen, add to support VBA TextBox_Exit event
+
+    // adjustmentValueChanged ooo event
+    { MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Scroll"), NULL, ApproveAll, NULL } },
+    { MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },
+
+    // textChanged ooo event
+    { MAP_CHAR_LEN("textChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveAll, NULL } },
+
+    // keyReleased ooo event
+    { MAP_CHAR_LEN("keyReleased"), { MAP_CHAR_LEN("_KeyUp"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
+
+    // mouseReleased ooo event
+    { MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_Click"), ooMouseEvtToVBAMouseEvt, ApproveType, (void*)(&fixedTextList) } }, //liuchen, add to support VBA Label_Click event
+    { MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_MouseUp"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
+
+    // mousePressed ooo event
+    { MAP_CHAR_LEN("mousePressed"), { MAP_CHAR_LEN("_MouseDown"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
+    { MAP_CHAR_LEN("mousePressed"), { MAP_CHAR_LEN("_DblClick"), ooMouseEvtToVBADblClick, ApproveAll, NULL } },
+
+    // mouseMoved ooo event	
+    { MAP_CHAR_LEN("mouseMoved"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
+    { MAP_CHAR_LEN("mouseDragged"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, DenyMouseDrag, NULL } }, //liuchen, add to support VBA MouseMove event when the "Shift" key is pressed
+
+    // keyPressed ooo event
+    { MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyDown"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
+    { MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyPress"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } }
+};
+
+EventInfoHash& getEventTransInfo()
+{
+    static bool initialised = false;
+    static EventInfoHash eventTransInfo;
+    if ( !initialised )
+    {
+        rtl::OUString sEventInfo = MAP_CHAR_LEN("");
+        TranslatePropMap* pTransProp = aTranslatePropMap_Impl;
+        int nCount = sizeof(aTranslatePropMap_Impl) / sizeof(aTranslatePropMap_Impl[0]);
+
+        int i = 0;
+        while (i < nCount)
+        {		
+            sEventInfo = pTransProp->sEventInfo;
+            std::list< TranslateInfo > infoList;
+            do
+            {									
+                infoList.push_back( pTransProp->aTransInfo );
+                pTransProp++;
+                i++;
+            }while(i < nCount && sEventInfo == pTransProp->sEventInfo);
+            eventTransInfo[sEventInfo] = infoList;			
+        }	
+        initialised = true;
+    }
+    return eventTransInfo;
+}
+//liuchen 2009-6-23 end
+
+// Helper class
+
+class ScriptEventHelper
+{
+public:
+    ScriptEventHelper( const Reference< XInterface >& xControl );
+    Sequence< ScriptEventDescriptor > createEvents( const rtl::OUString& sCodeName );   
+    Sequence< rtl::OUString > getEventListeners();
+private:
+    Reference< XComponentContext > m_xCtx;
+    Reference< XInterface > m_xControl;
+};
+
+bool
+eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const ::rtl::OUString& sCodeName )
+{
+    // format of ControlListener is TypeName::methodname e.g.
+    // "com.sun.star.awt.XActionListener::actionPerformed" or
+    // "XActionListener::actionPerformed
+
+    ::rtl::OUString sMethodName;
+    ::rtl::OUString sTypeName;
+    sal_Int32 nDelimPos = rEventMethod.indexOf( DELIM );
+    if ( nDelimPos == -1 )
+    {
+        return false;
+    }
+    sMethodName = rEventMethod.copy( nDelimPos + DELIMLEN );
+    sTypeName = rEventMethod.copy( 0, nDelimPos );
+            
+    EventInfoHash& infos = getEventTransInfo();
+
+    // Only create an ScriptEventDescriptor for an event we can translate
+    // or emulate
+    if ( sMethodName.getLength() 
+         && sTypeName.getLength()
+         && ( infos.find( sMethodName ) != infos.end() ) )
+    {
+        // just fill in CodeName, when the event fires the other 
+    // info is gathered from the event source to determine what
+    // event handler we try to call
+        evtDesc.ScriptCode = sCodeName;
+        evtDesc.ListenerType = sTypeName;
+        evtDesc.EventMethod = sMethodName;
+
+        // set this it VBAInterop, ensures that it doesn't
+        // get persisted or shown in property editors
+        evtDesc.ScriptType = rtl::OUString::createFromAscii(
+            "VBAInterop" );	
+        return true;
+    }
+    return false;
+
+}
+
+ScriptEventHelper::ScriptEventHelper( const Reference< XInterface >& xControl ) : m_xControl( xControl )
+{
+    Reference < beans::XPropertySet > xProps(
+        ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+    m_xCtx.set( xProps->getPropertyValue( rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), 
+        uno::UNO_QUERY_THROW );
+}
+
+Sequence< rtl::OUString > 
+ScriptEventHelper::getEventListeners()
+{
+    Reference< lang::XMultiComponentFactory > xMFac( 
+        m_xCtx->getServiceManager(), UNO_QUERY );
+    std::list< rtl::OUString > eventMethods;
+
+    if ( xMFac.is() )
+    {
+        Reference< beans::XIntrospection > xIntrospection( 
+            xMFac->createInstanceWithContext( rtl::OUString( 
+                RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection"  ) ), m_xCtx ), UNO_QUERY );
+#if 0
+        dumpListeners( xIntrospection, m_xControl );
+        dumpListeners( xIntrospection, m_xControl->getModel() );
+#endif 
+        Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
+    if  ( xIntrospection.is() )
+    {
+            xIntrospectionAccess = xIntrospection->inspect( 
+                makeAny( m_xControl ) );
+            Sequence< Type > aControlListeners = 
+                xIntrospectionAccess->getSupportedListeners();
+            sal_Int32 nLength = aControlListeners.getLength();             
+            for ( sal_Int32 i = 0; i< nLength; ++i )
+            {
+                Type& listType = aControlListeners[ i ];
+                rtl::OUString sFullTypeName = listType.getTypeName();
+                Sequence< ::rtl::OUString > sMeths = 
+                    comphelper::getEventMethodsForType( listType );    
+                sal_Int32 sMethLen = sMeths.getLength();
+                for ( sal_Int32 j=0 ; j < sMethLen; ++j )
+                {
+                    rtl::OUString sEventMethod = sFullTypeName;
+                    sEventMethod += DELIM;
+                    sEventMethod += sMeths[ j ];
+                    eventMethods.push_back( sEventMethod );
+                }
+            }
+            
+        }
+    }
+
+    Sequence< rtl::OUString > sEventMethodNames( eventMethods.size() );
+    std::list< rtl::OUString >::const_iterator it = eventMethods.begin();
+    rtl::OUString* pDest = sEventMethodNames.getArray();
+
+    for ( ; it != eventMethods.end(); ++it, ++pDest )
+        *pDest = *it;         
+
+    return sEventMethodNames;
+}
+
+Sequence< ScriptEventDescriptor > 
+ScriptEventHelper::createEvents( const rtl::OUString& sCodeName )
+{
+    Sequence< rtl::OUString > aControlListeners = getEventListeners();
+    rtl::OUString* pSrc = aControlListeners.getArray();
+    sal_Int32 nLength = aControlListeners.getLength();             
+
+    Sequence< ScriptEventDescriptor > aDest( nLength );
+    sal_Int32 nEvts = 0; 
+    for ( sal_Int32 i = 0; i< nLength; ++i, ++pSrc )
+    {
+        // from getListeners eventName is of form
+        // "com.sun.star.awt.XActionListener::actionPerformed"
+        // we need to strip "com.sun.star.awt." from that for form
+        // controls
+        ScriptEventDescriptor evtDesc;
+        if ( eventMethodToDescriptor( *pSrc, evtDesc, sCodeName ) )
+        {
+            sal_Int32 dIndex = nEvts;
+            ++nEvts;
+            if ( nEvts > aDest.getLength() )
+                aDest.realloc( nEvts );// should never happen
+            aDest[ dIndex ] = evtDesc;
+        }
+    }
+    aDest.realloc( nEvts );
+
+    return aDest;
+}
+
+
+typedef ::cppu::WeakImplHelper1< container::XNameContainer > NameContainer_BASE;
+
+class ReadOnlyEventsNameContainer : public NameContainer_BASE
+{
+public:
+    ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName );
+    // XNameContainer
+
+    virtual void SAL_CALL insertByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException)
+    {
+        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
+ 
+    }
+    virtual void SAL_CALL removeByName( const ::rtl::OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
+    {
+        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
+    }
+
+    // XNameReplace
+    virtual void SAL_CALL replaceByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
+    {
+        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
+ 
+    }
+                                                                                
+    // XNameAccess
+    virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException);
+    virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (RuntimeException);
+
+    // XElementAccess
+    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException)
+    { return getCppuType(static_cast< const rtl::OUString * >(0) ); }
+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException)
+    { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); }
+private:
+
+typedef std::hash_map< rtl::OUString, Any, ::rtl::OUStringHash,
+::std::equal_to< ::rtl::OUString > > EventSupplierHash;
+
+    EventSupplierHash m_hEvents;
+};
+
+ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< rtl::OUString >& eventMethods, const rtl::OUString& sCodeName )
+{
+    const rtl::OUString* pSrc = eventMethods.getConstArray();
+    sal_Int32 nLen = eventMethods.getLength();
+    for ( sal_Int32 index = 0; index < nLen; ++index, ++pSrc )
+    {
+        Any aDesc;
+        ScriptEventDescriptor evtDesc;
+        if (  eventMethodToDescriptor( *pSrc, evtDesc, sCodeName ) )
+        {
+            aDesc <<= evtDesc; 
+            m_hEvents[ *pSrc ] = aDesc;
+        }
+    }
+}
+
+Any SAL_CALL 
+ReadOnlyEventsNameContainer::getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException){
+    EventSupplierHash::const_iterator it = m_hEvents.find( aName );
+    if ( it == m_hEvents.end() )
+        throw container::NoSuchElementException();
+    return it->second;
+}
+
+Sequence< ::rtl::OUString > SAL_CALL 
+ReadOnlyEventsNameContainer::getElementNames(  ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > names(m_hEvents.size());
+    rtl::OUString* pDest = names.getArray();
+    EventSupplierHash::const_iterator it = m_hEvents.begin();
+    EventSupplierHash::const_iterator it_end = m_hEvents.end();
+    for ( sal_Int32 index = 0; it != it_end; ++index, ++pDest, ++it )
+        *pDest = it->first;
+    return names;
+}
+
+sal_Bool SAL_CALL 
+ReadOnlyEventsNameContainer::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException)
+{
+    EventSupplierHash::const_iterator it = m_hEvents.find( aName );
+    if ( it == m_hEvents.end() )
+        return sal_False;
+    return sal_True;
+}
+
+typedef ::cppu::WeakImplHelper1< XScriptEventsSupplier > EventsSupplier_BASE;
+
+class ReadOnlyEventsSupplier : public EventsSupplier_BASE
+{
+public:
+    ReadOnlyEventsSupplier( const Sequence< ::rtl::OUString >& eventMethods, const rtl::OUString& sCodeName )
+    { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); }
+    
+    // XScriptEventSupplier
+    virtual Reference< container::XNameContainer > SAL_CALL getEvents(  ) throw (RuntimeException){ return m_xNameContainer; }
+private:
+    Reference< container::XNameContainer > m_xNameContainer;
+};
+
+typedef ::cppu::WeakImplHelper2< XScriptListener, lang::XInitialization > EventListener_BASE;
+
+#define EVENTLSTNR_PROPERTY_ID_MODEL         1
+#define EVENTLSTNR_PROPERTY_MODEL            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) )
+
+class EventListener : public EventListener_BASE
+    ,public ::comphelper::OMutexAndBroadcastHelper
+    ,public ::comphelper::OPropertyContainer
+    ,public ::comphelper::OPropertyArrayUsageHelper< EventListener >
+
+{
+    
+public:
+    EventListener( const Reference< XComponentContext >& rxContext );
+    // XEventListener
+    virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( RuntimeException );
+    using cppu::OPropertySetHelper::disposing;
+
+    // XScriptListener
+    virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException);
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException);
+    // XPropertySet
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);    
+    // XInitialization
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException);
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+    {
+        OPropertyContainer::setFastPropertyValue( nHandle, rValue );
+    if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
+            setShellFromModel();
+    }
+
+protected:
+    // OPropertySetHelper
+    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(  );
+
+    // OPropertyArrayUsageHelper
+    virtual ::cppu::IPropertyArrayHelper* createArrayHelper(  ) const;
+
+private:
+    void setShellFromModel();
+    void firing_Impl( const  ScriptEvent& evt, Any *pSyncRet=NULL ) throw( RuntimeException );
+
+    Reference< XComponentContext > m_xContext;
+    Reference< frame::XModel > m_xModel;
+    SfxObjectShell* mpShell;
+    
+};
+
+EventListener::EventListener( const Reference< XComponentContext >& rxContext ) :
+OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), mpShell( 0 )
+{
+    registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
+        beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) );
+
+}
+
+void
+EventListener::setShellFromModel()
+{
+    // reset mpShell
+    mpShell = 0;
+    SfxObjectShell* pShell = SfxObjectShell::GetFirst();
+    while ( m_xModel.is() && pShell )
+    {
+        if ( pShell->GetModel() == m_xModel )
+        {
+            mpShell = pShell;
+            break;
+        }
+        pShell = SfxObjectShell::GetNext( *pShell );
+    }    
+}
+
+//XEventListener
+void
+EventListener::disposing(const lang::EventObject&)  throw( RuntimeException )
+{
+}
+
+//XScriptListener
+
+void SAL_CALL 
+EventListener::firing(const ScriptEvent& evt) throw(RuntimeException)
+{
+    firing_Impl( evt );
+}
+
+Any SAL_CALL 
+EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException)
+{
+    Any ret;
+    firing_Impl( evt, &ret );
+    return ret;
+}
+
+// XInitialization
+void SAL_CALL 
+EventListener::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
+{
+    if ( aArguments.getLength() == 1 )
+        aArguments[0] >>= m_xModel;
+    OSL_TRACE("EventListener::initialize() args %d m_xModel %d", aArguments.getLength(), m_xModel.is() );
+}
+
+// XInterface
+
+IMPLEMENT_FORWARD_XINTERFACE2( EventListener, EventListener_BASE, OPropertyContainer )
+
+// XTypeProvider
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( EventListener, EventListener_BASE, OPropertyContainer )
+
+// OPropertySetHelper
+
+::cppu::IPropertyArrayHelper& 
+EventListener::getInfoHelper(  )
+{
+    return *getArrayHelper();
+}
+
+// OPropertyArrayUsageHelper
+
+::cppu::IPropertyArrayHelper* 
+EventListener::createArrayHelper(  ) const
+{
+    Sequence< beans::Property > aProps;
+    describeProperties( aProps );
+    return new ::cppu::OPropertyArrayHelper( aProps );
+}
+
+// XPropertySet
+Reference< beans::XPropertySetInfo > 
+EventListener::getPropertySetInfo(  ) throw (RuntimeException)
+{
+    Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+    return xInfo;
+}
+
+//liuchen 2009-6-23
+//decide if the control should execute the event
+bool ApproveAll(const ScriptEvent&, void* )
+{
+    return true;
+}
+
+//for the given control type in evt.Arguments[0], look for if it appears in the type list in pPara
+bool FindControl(const ScriptEvent& evt, void* pPara)
+{
+    lang::EventObject aEvent;
+    evt.Arguments[ 0 ] >>= aEvent;
+    uno::Reference< uno::XInterface > xInterface( aEvent.Source, uno::UNO_QUERY );
+
+    TypeList* pTypeListInfo = static_cast<TypeList*>(pPara);
+    Type* pType = pTypeListInfo->pTypeList;
+    int nLen = pTypeListInfo->nListLength;
+
+    for (int i = 0; i < nLen; i++)
+    {
+        if ( xInterface->queryInterface( *pType ).hasValue() )
+        {
+            return true;
+        }
+        pType++;
+    }
+
+    return false;
+}
+
+//if the the given control type in evt.Arguments[0] appears in the type list in pPara, then approve the execution
+bool ApproveType(const ScriptEvent& evt, void* pPara)
+{
+    return FindControl(evt, pPara);
+}
+
+//if the the given control type in evt.Arguments[0] appears in the type list in pPara, then deny the execution
+bool DenyType(const ScriptEvent& evt, void* pPara)
+{
+    return !FindControl(evt, pPara);
+}
+
+//when mouse is moving, either the mouse button is pressed or some key is pressed can trigger the OO mouseDragged event,
+//the former should be denyed, and the latter allowed, only by doing so can the VBA MouseMove event when the "Shift" key is 
+//pressed can be correctly triggered
+bool DenyMouseDrag(const ScriptEvent& evt, void* )
+{
+    awt::MouseEvent aEvent;
+    evt.Arguments[ 0 ] >>= aEvent;
+    if (aEvent.Buttons == 0 )
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+
+//liuchen 2009-6-23
+// EventListener
+
+void
+EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(RuntimeException)
+{
+    OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
+    static const ::rtl::OUString vbaInterOp =
+        ::rtl::OUString::createFromAscii("VBAInterop");
+
+    // let default handlers deal with non vba stuff
+    if ( !evt.ScriptType.equals( vbaInterOp ) )
+        return;
+    lang::EventObject aEvent;
+    evt.Arguments[ 0 ] >>= aEvent;
+    OSL_TRACE("Argument[0] is  %s", rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[0] ), RTL_TEXTENCODING_UTF8 ).getStr() );
+    OSL_TRACE("Getting Control");
+    uno::Reference< awt::XControl > xControl( aEvent.Source, uno::UNO_QUERY_THROW );
+    OSL_TRACE("Getting properties");
+    uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
+
+    rtl::OUString sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserForm") );
+    OSL_TRACE("Getting Name");
+
+    uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY );
+    if ( !xDlg.is() )
+        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sName;
+    //dumpEvent( evt );
+    EventInfoHash& infos = getEventTransInfo();
+    EventInfoHash::const_iterator eventInfo_it = infos.find( evt.MethodName );
+    EventInfoHash::const_iterator it_end = infos.end();
+    if ( eventInfo_it == it_end )
+    {
+        OSL_TRACE("Bogus event for %s",
+            rtl::OUStringToOString( evt.ScriptType, RTL_TEXTENCODING_UTF8 ).getStr() );
+        return;
+    }
+
+    uno::Reference< script::provider::XScriptProviderSupplier > xSPS( m_xModel, uno::UNO_QUERY );
+    uno::Reference< script::provider::XScriptProvider > xScriptProvider;
+    if ( xSPS.is() )
+        xScriptProvider =  xSPS->getScriptProvider();
+    if ( xScriptProvider.is() && mpShell )
+    {
+        std::list< TranslateInfo > matchingMethods;
+        std::list< TranslateInfo >::const_iterator txInfo =
+            eventInfo_it->second.begin();
+        std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end();
+        rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Standard.").concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
+       
+        StarBASIC* pBasic = mpShell->GetBasic();
+        SbModule* pModule = pBasic->FindModule( evt.ScriptCode );
+        for ( ; pModule && txInfo != txInfo_end; ++txInfo )
+        {
+            // see if we have a match for the handlerextension
+            // where ScriptCode is methodname_handlerextension 
+            rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName ); 
+            
+            OSL_TRACE("*** trying to invoke %s ",
+                rtl::OUStringToOString( sTemp, RTL_TEXTENCODING_UTF8 ).getStr() );
+            SbMethod* pMeth = static_cast< SbMethod* >( pModule->Find( sTemp, SbxCLASS_METHOD ) );
+            if ( pMeth )
+            {
+                //liuchen 2009-6-8
+                if (! txInfo->ApproveRule(evt, txInfo->pPara) )
+                {
+                    continue;
+                }
+                //liuchen 2009-6-8
+                // !! translate arguments & emulate events where necessary 
+                Sequence< Any > aArguments;
+                if  ( (*txInfo).toVBA )
+                    aArguments = (*txInfo).toVBA( evt.Arguments );
+                else
+                    aArguments = evt.Arguments;
+                if ( aArguments.getLength() )
+                {
+                    // call basic event handlers for event
+
+                    static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
+                    static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document"); 
+
+                    // create script url
+                    rtl::OUString url = part1 + sMacroLoc + sTemp + part2;
+                 
+                    OSL_TRACE("script url = %s",
+                        rtl::OUStringToOString( url, 
+                            RTL_TEXTENCODING_UTF8 ).getStr() );
+                    Sequence< sal_Int16 > aOutArgsIndex;
+                    Sequence< Any > aOutArgs;
+                    try
+                    {
+                        uno::Reference< script::provider::XScript > xScript = xScriptProvider->getScript( url );
+                        if ( xScript.is() )
+                           xScript->invoke( aArguments, aOutArgsIndex, aOutArgs  );
+                    }
+                    catch ( uno::Exception& e )
+                    {
+                        OSL_TRACE("event script raised %s", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+                    }
+               } 
+           }
+       }
+    }
+}
+
+typedef ::cppu::WeakImplHelper1< XVBAToOOEventDescGen > VBAToOOEventDescGen_BASE;
+
+
+class VBAToOOEventDescGen : public VBAToOOEventDescGen_BASE
+{
+public:
+    VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext );
+
+    // XVBAToOOEventDescGen
+    virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const Reference< XInterface >& control, const rtl::OUString& sCodeName ) throw (RuntimeException);
+    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException);
+private:
+    Reference< XComponentContext > m_xContext;
+  
+};
+
+VBAToOOEventDescGen::VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ):m_xContext( rxContext ) {}
+
+Sequence< ScriptEventDescriptor > SAL_CALL 
+VBAToOOEventDescGen::getEventDescriptions( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName ) throw (RuntimeException)
+{
+    ScriptEventHelper evntHelper( xControl ); 
+    return evntHelper.createEvents( sCodeName ); 
+}
+
+Reference< XScriptEventsSupplier > SAL_CALL 
+VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const rtl::OUString& sCodeName  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    ScriptEventHelper evntHelper( xControl ); 
+    Reference< XScriptEventsSupplier > xSupplier = 
+        new ReadOnlyEventsSupplier( 
+            evntHelper.getEventListeners(), sCodeName ) ;
+    return xSupplier;
+}
+
+// Component related 
+
+namespace evtlstner
+{
+    ::rtl::OUString SAL_CALL getImplementationName()
+    {
+        static ::rtl::OUString* pImplName = 0;
+        if ( !pImplName )
+        {
+            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+            if ( !pImplName )
+            {
+                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.EventListener" ) );
+                pImplName = &aImplName;
+            }
+        }
+        return *pImplName;
+    }
+
+    uno::Reference< XInterface > SAL_CALL create(
+    Reference< XComponentContext > const & xContext )
+    SAL_THROW( () )
+    {
+        return static_cast< lang::XTypeProvider * >( new EventListener( xContext ) );
+    }
+
+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    {
+        const ::rtl::OUString strName( ::evtlstner::getImplementationName() );
+        return Sequence< ::rtl::OUString >( &strName, 1 );
+    }	
+}
+namespace ooevtdescgen 
+{
+    ::rtl::OUString SAL_CALL getImplementationName()
+    {
+        static ::rtl::OUString* pImplName = 0;
+        if ( !pImplName )
+        {
+            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+            if ( !pImplName )
+            {
+                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAToOOEventDesc" ) );
+                pImplName = &aImplName;
+            }
+        }
+        return *pImplName;
+    }
+
+    uno::Reference< XInterface > SAL_CALL create(
+        Reference< XComponentContext > const & xContext )
+        SAL_THROW( () )
+    {
+        return static_cast< lang::XTypeProvider * >( new VBAToOOEventDescGen( xContext ) );
+    }
+
+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    {
+        const ::rtl::OUString strName( ::ooevtdescgen::getImplementationName() );
+        return Sequence< ::rtl::OUString >( &strName, 1 );
+    }	
+}
diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk b/scripting/source/vbaevents/makefile.mk
index 54dc3d59a7..227da45f9f 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk
+++ b/scripting/source/vbaevents/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.0 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -29,64 +29,65 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..$/..$/..
-PRJNAME=shell
-TARGET=ooofiltproxy
-LIBTARGET=NO
+PRJ=..$/..
+
+PRJNAME=scripting
+TARGET=vbaevents
+.IF "$(ENABLE_VBA)"!="YES"
+dummy:
+        @echo "not building vbaevents..."
+.ENDIF
+
+VISIBILITY_HIDDEN=TRUE
+NO_BSYMBOLIC=	TRUE
 ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-DYNAMIC_CRT=
-UWINAPILIB=
+COMP1TYPELIST=$(TARGET)
+COMPRDB=$(SOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+DLLPRE =
 
-CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-CDEFS+=-D_WIN32_IE=0x501
+# ------------------------------------------------------------------
 
-# --- Files --------------------------------------------------------
+#.INCLUDE :  ..$/cppumaker.mk
 
-SLOFILES=$(SLO)$/ooofiltproxy.obj
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(OLE32LIB)\
-     $(ADVAPO32LIB)\
-     $(COMCTL32LIB)\
-     $(UUIDLIB)\
-     $(SHELL32LIB)\
-     $(KERNEL32LIB)
+SLOFILES= \
+        $(SLO)$/service.obj \
+        $(SLO)$/eventhelper.obj
 
-SHL1DEPN=
-SHL1OBJS=$(SLOFILES)
+SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
+SHL1IMPLIB=     i$(TARGET)
+
+SHL1VERSIONMAP=$(TARGET).map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.IF "$(BUILD_X64)"!=""
-#------------- x64 stuff ----------------
-USE_DEFFILE_X64=TRUE
-CFLAGS_X64+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-CDEFS_X64+=-D_WIN32_IE=0x501
-
-SLOFILES_X64=$(SLO_X64)$/ooofiltproxy.obj
-SHL1TARGET_X64=$(TARGET)
-SHL1STDLIBS_X64=$(OLE32LIB_X64)\
-     $(ADVAPO32LIB_X64)\
-     $(COMCTL32LIB_X64)\
-     $(UUIDLIB_X64)\
-     $(SHELL32LIB_X64)\
-     $(KERNEL32LIB_X64)\
-     $(MSVCRT_X64)
-
-SHL1DEPN_X64=
-SHL1OBJS_X64=$(SLO_X64)$/ooofiltproxy.obj
-SHL1DEF_X64=$(MISC_X64)$/$(TARGET).def
-DEF1NAME_X64=$(TARGET)
-DEF1EXPORTFILE_X64=exports.dxp
-.ENDIF # "$(BUILD_X64)"!=""
+                                                                              
+SHL1STDLIBS= \
+                $(CPPUHELPERLIB) \
+        $(BASICLIB) \
+        $(COMPHELPERLIB) \
+        $(SFXLIB) \
+                $(CPPULIB) \
+                $(TOOLSLIB) \
+                $(SALLIB)
+                                                                              
+SHL1DEPN=
+SHL1LIBS=$(SLB)$/$(TARGET).lib
 
 # --- Targets ------------------------------------------------------
 
-.INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
-.INCLUDE :	tg_wntx64.mk
+
+# ------------------------------------------------------------------
+
+ALLTAR : \
+        $(MISC)$/$(TARGET).don \
+
+$(SLOFILES) : $(MISC)$/$(TARGET).don
+
+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+        echo $@
+ 
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx
new file mode 100755
index 0000000000..ea2c44f1dc
--- /dev/null
+++ b/scripting/source/vbaevents/service.cxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: service.cxx,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_scripting.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+
+// =============================================================================
+// component exports
+// =============================================================================
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
+namespace evtlstner
+{
+    // =============================================================================
+    // component operations
+    // =============================================================================
+
+    uno::Reference< XInterface > SAL_CALL create(
+        Reference< XComponentContext > const & xContext )
+        SAL_THROW( () );
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString SAL_CALL getImplementationName();
+
+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
+
+    Reference<XInterface> SAL_CALL create(
+        Sequence<Any> const &, Reference<XComponentContext> const & );
+} // end evtlstner
+
+namespace ooevtdescgen
+{
+    // =============================================================================
+    // component operations
+    // =============================================================================
+
+    uno::Reference< XInterface > SAL_CALL create(
+        Reference< XComponentContext > const & xContext )
+        SAL_THROW( () );
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString SAL_CALL getImplementationName();
+
+    Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
+
+    Reference<XInterface> SAL_CALL create(
+        Sequence<Any> const &, Reference<XComponentContext> const & );
+} // end ooevtdescgen
+
+
+
+    // =============================================================================
+
+    const ::cppu::ImplementationEntry s_component_entries [] =
+    {
+        {
+            ::evtlstner::create, ::evtlstner::getImplementationName,
+            ::evtlstner::getSupportedServiceNames, 
+            ::cppu::createSingleComponentFactory,
+            0, 0
+        },
+        {
+            ::ooevtdescgen::create, ::ooevtdescgen::getImplementationName,
+            ::ooevtdescgen::getSupportedServiceNames, 
+            ::cppu::createSingleComponentFactory,
+            0, 0
+        },
+        { 0, 0, 0, 0, 0, 0 }
+    };
+
+extern "C"
+{
+    SAL_DLLPUBLIC_EXPORT  void SAL_CALL component_getImplementationEnvironment( 
+        const sal_Char ** ppEnvTypeName, uno_Environment ** )
+    {
+        OSL_TRACE("In component_getImplementationEnv");
+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    }
+
+    SAL_DLLPUBLIC_EXPORT  sal_Bool SAL_CALL component_writeInfo( 
+        lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
+    {
+        OSL_TRACE("In component_writeInfo");
+        if ( ::cppu::component_writeInfoHelper(
+            pServiceManager, pRegistryKey, s_component_entries ) )
+            return sal_True;
+        return sal_False;
+    }
+
+    SAL_DLLPUBLIC_EXPORT  void * SAL_CALL component_getFactory( 
+        const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
+        registry::XRegistryKey * pRegistryKey )
+    {
+        OSL_TRACE("In component_getFactory");
+        return ::cppu::component_getFactoryHelper( 
+            pImplName, pServiceManager, pRegistryKey, s_component_entries );
+    }
+}
diff --git a/configmgr/util/configmgr.map b/scripting/source/vbaevents/vbaevents.map
index ad92fbe03e..737cddbfe3 100644..100755
--- a/configmgr/util/configmgr.map
+++ b/scripting/source/vbaevents/vbaevents.map
@@ -1,8 +1,9 @@
-CFGMGR_2_0 {
+OOO_1.1 {
     global:
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
+        component_writeInfo;
+
     local:
         *;
 };
diff --git a/scripting/source/vbaevents/vbaevents.xml b/scripting/source/vbaevents/vbaevents.xml
new file mode 100755
index 0000000000..875a24643e
--- /dev/null
+++ b/scripting/source/vbaevents/vbaevents.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <module-name>vbaevents</module-name>
+    
+    <component-description>
+        <author>Noel Power </author>
+        <name>ooo.vba.EventListener</name>
+        <description>Event listener to handle ooo events and to translate them to calls to basic macros ala Button_Click etc.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="drafts"/>
+        <supported-service>ooo.vba.EventListener</supported-service>
+        <type>com.sun.star.uno.XComponentContext</type>        
+    </component-description>
+    
+    <project-build-dependency>cppuhelper</project-build-dependency>
+    <project-build-dependency>cppu</project-build-dependency>
+    <project-build-dependency>sal</project-build-dependency>
+
+    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
+    <runtime-module-dependency>cppu3</runtime-module-dependency>
+    <runtime-module-dependency>sal3</runtime-module-dependency>
+    
+</module-description>
diff --git a/scripting/util/ant.pmk b/scripting/util/ant.pmk
index 927ceb249b..3d605c8d17 100755
--- a/scripting/util/ant.pmk
+++ b/scripting/util/ant.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: ant.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/scripting/util/makefile.mk b/scripting/util/makefile.mk
index 82184a33df..f18970f164 100644
--- a/scripting/util/makefile.mk
+++ b/scripting/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/scripting/util/makefile.pmk b/scripting/util/makefile.pmk
index b8240f7f32..e588b95fdb 100755
--- a/scripting/util/makefile.pmk
+++ b/scripting/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/scripting/util/target.pmk b/scripting/util/target.pmk
index 6c98ccf500..d6b1006fda 100755
--- a/scripting/util/target.pmk
+++ b/scripting/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/workben/build.xml b/scripting/workben/build.xml
index 1ba7b9666d..10bc6f864d 100755
--- a/scripting/workben/build.xml
+++ b/scripting/workben/build.xml
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: build.xml,v $
- 
-  $Revision: 1.31.20.1 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <project name="Scipting Framework Installer" default="jar" basedir=".">
 
diff --git a/scripting/workben/ifc/scripting/ScriptingUtils.java b/scripting/workben/ifc/scripting/ScriptingUtils.java
index cc1569aa6b..5339f785b3 100644
--- a/scripting/workben/ifc/scripting/ScriptingUtils.java
+++ b/scripting/workben/ifc/scripting/ScriptingUtils.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: ScriptingUtils.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/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index baf987c33a..1b0e2345a0 100644
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.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: SecurityDialogUtil.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/scripting/workben/ifc/scripting/_XFunction.java b/scripting/workben/ifc/scripting/_XFunction.java
index 65af406629..8e16a6ed18 100644
--- a/scripting/workben/ifc/scripting/_XFunction.java
+++ b/scripting/workben/ifc/scripting/_XFunction.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: _XFunction.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/scripting/workben/ifc/scripting/_XFunctionProvider.java b/scripting/workben/ifc/scripting/_XFunctionProvider.java
index 7e30c27cfc..3847bc3593 100644
--- a/scripting/workben/ifc/scripting/_XFunctionProvider.java
+++ b/scripting/workben/ifc/scripting/_XFunctionProvider.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: _XFunctionProvider.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/scripting/workben/ifc/scripting/_XScriptInfo.java b/scripting/workben/ifc/scripting/_XScriptInfo.java
index f3ccfbb546..ddf503169e 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfo.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfo.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: _XScriptInfo.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/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index 88a3faa877..a554aac0e2 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.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: _XScriptInfoAccess.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/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index ea886f851a..d2bd4cf03e 100644
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.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: _XScriptInvocation.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/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index ac62362b85..76b02a1f6a 100644
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.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: _XScriptNameResolver.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/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index f66f3efda6..9456625fe2 100644
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.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: _XScriptSecurity.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/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
index 1413f3043a..0c9e16cd73 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.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: _XScriptStorageManager.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/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
index d33f9aea7b..bed0e779f3 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.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: _XScriptStorageRefresh.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/scripting/workben/ifc/scripting/makefile.mk b/scripting/workben/ifc/scripting/makefile.mk
index 472c8d15a1..15c8492d8d 100644
--- a/scripting/workben/ifc/scripting/makefile.mk
+++ b/scripting/workben/ifc/scripting/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/scripting/workben/installer/ExceptionTraceHelper.java b/scripting/workben/installer/ExceptionTraceHelper.java
index 54c7f59598..041239963e 100644
--- a/scripting/workben/installer/ExceptionTraceHelper.java
+++ b/scripting/workben/installer/ExceptionTraceHelper.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: ExceptionTraceHelper.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/scripting/workben/installer/Scripting.xcs b/scripting/workben/installer/Scripting.xcs
index fcb6b99e7c..efac107699 100644
--- a/scripting/workben/installer/Scripting.xcs
+++ b/scripting/workben/installer/Scripting.xcs
@@ -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: Scripting.xcs,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/workben/makefile.mk b/scripting/workben/makefile.mk
index 9c3e1aa0e4..cefad97914 100755
--- a/scripting/workben/makefile.mk
+++ b/scripting/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java
index 85d8150798..aafa62afe9 100644
--- a/scripting/workben/mod/_scripting/Dispatch.java
+++ b/scripting/workben/mod/_scripting/Dispatch.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: Dispatch.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/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java
index 01f13a3428..f7ebf5d7d3 100644
--- a/scripting/workben/mod/_scripting/Function.java
+++ b/scripting/workben/mod/_scripting/Function.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: Function.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/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java
index a34aa1958e..f0be633eb5 100644
--- a/scripting/workben/mod/_scripting/FunctionProvider.java
+++ b/scripting/workben/mod/_scripting/FunctionProvider.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: FunctionProvider.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/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java
index 2908c947b2..6162b515d6 100644
--- a/scripting/workben/mod/_scripting/ScriptInfo.java
+++ b/scripting/workben/mod/_scripting/ScriptInfo.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: ScriptInfo.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/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
index 0979faba70..bf154d7647 100644
--- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java
+++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.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: ScriptRuntimeManager.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/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java
index 19c8471b7e..616d282640 100644
--- a/scripting/workben/mod/_scripting/ScriptStorage.java
+++ b/scripting/workben/mod/_scripting/ScriptStorage.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: ScriptStorage.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/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java
index 528ac129c3..255d676144 100644
--- a/scripting/workben/mod/_scripting/ScriptStorageManager.java
+++ b/scripting/workben/mod/_scripting/ScriptStorageManager.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: ScriptStorageManager.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/scripting/workben/mod/_scripting/TestDataLoader.java b/scripting/workben/mod/_scripting/TestDataLoader.java
index 55d1824ef3..0b1814eda3 100644
--- a/scripting/workben/mod/_scripting/TestDataLoader.java
+++ b/scripting/workben/mod/_scripting/TestDataLoader.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: TestDataLoader.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/scripting/workben/mod/_scripting/makefile.mk b/scripting/workben/mod/_scripting/makefile.mk
index 4abfea1ea0..9d9e05d601 100644
--- a/scripting/workben/mod/_scripting/makefile.mk
+++ b/scripting/workben/mod/_scripting/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sfx2/inc/QuerySaveDocument.hxx b/sfx2/inc/QuerySaveDocument.hxx
index c0c523c7ab..fefd7226ce 100644
--- a/sfx2/inc/QuerySaveDocument.hxx
+++ b/sfx2/inc/QuerySaveDocument.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: QuerySaveDocument.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/sfx2/inc/about.hxx b/sfx2/inc/about.hxx
index 88df8f6221..a7c76d09f1 100644
--- a/sfx2/inc/about.hxx
+++ b/sfx2/inc/about.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: about.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 6bd705ecf3..7c6d924a90 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: arrdecl.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/sfx2/inc/basmgr.hxx b/sfx2/inc/basmgr.hxx
index ab0ef97bfe..d961042d2f 100644
--- a/sfx2/inc/basmgr.hxx
+++ b/sfx2/inc/basmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basmgr.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/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index cd4a70cc5c..f2e0a88cd7 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bitset.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
index 3d938f46df..35ea5acf1c 100644
--- a/sfx2/inc/brokenpackageint.hxx
+++ b/sfx2/inc/brokenpackageint.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: brokenpackageint.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/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index d544401cec..e629a239f3 100644
--- a/sfx2/inc/configmgr.hxx
+++ b/sfx2/inc/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/dinfedt.hxx
index 7e6a4fc198..ab2ea95d5d 100644
--- a/sfx2/inc/dinfedt.hxx
+++ b/sfx2/inc/dinfedt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dinfedt.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/docinsert.hxx
index ef45af05e9..0f10e2c638 100644
--- a/sfx2/inc/docinsert.hxx
+++ b/sfx2/inc/docinsert.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docinsert.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 708841de7d..8b84c0a028 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docvor.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/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc
index b2a71c788d..948a063eb6 100644
--- a/sfx2/inc/filedlghelper.hrc
+++ b/sfx2/inc/filedlghelper.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: filedlghelper.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/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index a5ecdc95f7..aa9b7e5cee 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmload.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/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index c9a2cc507e..74c55471f7 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwkhelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index f1de3d8fea..b3321ddc94 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guisaveas.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/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index a593f0824e..b6469d6546 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: idpool.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx
index 7d70d6042f..3000a07722 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index c144b76e45..ce945eb671 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imgmgr.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/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 9f08127071..c50e3a87ed 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/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.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/mailmodelapi.hxx
index 97378338ee..ba305a02ae 100644
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/mailmodelapi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmodelapi.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk
index 7a0c0ac21e..b7aa547e2c 100644
--- a/sfx2/inc/makefile.mk
+++ b/sfx2/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/sfx2/inc/mieclip.hxx b/sfx2/inc/mieclip.hxx
index 2baafe3176..735000aa1a 100644
--- a/sfx2/inc/mieclip.hxx
+++ b/sfx2/inc/mieclip.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mieclip.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx
index a5423b8784..16be97df92 100644
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/minfitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minfitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index b3256bc789..5667f8b011 100644
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgnodei.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index d8234f8edd..5aa02dfa23 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orgmgr.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/pch/precompiled_sfx2.cxx b/sfx2/inc/pch/precompiled_sfx2.cxx
index 6995bd140c..4fbd4f6759 100644
--- a/sfx2/inc/pch/precompiled_sfx2.cxx
+++ b/sfx2/inc/pch/precompiled_sfx2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_sfx2.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index e01770d935..6e6ada026d 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_sfx2.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/sfx2/inc/progind.hxx b/sfx2/inc/progind.hxx
index 03e73ce8d2..aee1db6654 100644
--- a/sfx2/inc/progind.hxx
+++ b/sfx2/inc/progind.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: progind.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
index 55789c575b..0e03cd8d61 100644
--- a/sfx2/inc/resmgr.hxx
+++ b/sfx2/inc/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
index 1f0d3d38e4..e108912a67 100644
--- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
+++ b/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentMetadataAccess.hxx,v $
- * $Revision: 1.1.2.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/sfx2/inc/sfx2/Metadatable.hxx
index d96e6c030d..fb5c2cce13 100644
--- a/sfx2/inc/sfx2/Metadatable.hxx
+++ b/sfx2/inc/sfx2/Metadatable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SwMetadatable.hxx,v $
- * $Revision: 1.1.2.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/sfx2/inc/sfx2/XmlIdRegistry.hxx
index 0ae6fbb751..6efd21cfba 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/sfx2/inc/sfx2/XmlIdRegistry.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XmlIdRegistry.hxx,v $
- * $Revision: 1.1.2.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 5bafc76fc6..18c3735d1c 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.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/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index 9a331ad46a..e6f565ba1c 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 8b187a5416..e8f7feaacf 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basedlgs.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 85442c1cc8..6eab21e0b7 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bindings.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx
index 14bad0d08b..1ad1da83c2 100644
--- a/sfx2/inc/sfx2/chalign.hxx
+++ b/sfx2/inc/sfx2/chalign.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chalign.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index e9b7bc7cde..d93999d99b 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: childwin.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index 984925d95e..80e0265ff3 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.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: cntids.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/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx
index 59c680ff37..66fd1dfc06 100644
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/sfx2/inc/sfx2/controlwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlwrapper.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index 2f40d77ac9..a939dc331e 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ctrlitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc
index 32e1341634..653bf74647 100644
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/sfx2/inc/sfx2/dialogs.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialogs.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 27f7433929..45a087b8b6 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dinfdlg.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/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 9a13785e20..97027bf3c5 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatch.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@ class SfxViewFrame;
 class SfxBindings;
 class SfxItemSet;
 class SfxPopupMenuManager;
-
+class SfxModule;
 struct SfxDispatcher_Impl;
 struct SfxPlugInInfo_Impl;
 
@@ -202,7 +199,7 @@ public:
 
     SfxShell*			GetShell(USHORT nIdx) const;
     SfxViewFrame*       GetFrame() const;
-
+    SfxModule*		GetModule() const;
     // caller has to clean up the Manager on his own
     static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos );
 
diff --git a/sfx2/inc/sfx2/dllapi.h b/sfx2/inc/sfx2/dllapi.h
index d9c7959e55..3833cf93d5 100644
--- a/sfx2/inc/sfx2/dllapi.h
+++ b/sfx2/inc/sfx2/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
@@ -40,4 +37,6 @@
 #define SFX2_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
+#define SFX2_DLLPRIVATE SAL_DLLPRIVATE
+
 #endif
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index f410d711c2..87fa15db4d 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfac.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 63e98f0dd1..e6961a1a1b 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfile.hxx,v $
- * $Revision: 1.8.118.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index 4eee23f75f..f7ed7db1af 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfilt.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/docinf.hxx b/sfx2/inc/sfx2/docinf.hxx
index f3542a90b3..214a238125 100644
--- a/sfx2/inc/sfx2/docinf.hxx
+++ b/sfx2/inc/sfx2/docinf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docinf.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/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 5e2e598ebe..1ba7dcd3ea 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx
index 1b45385f0a..aef8dd64a5 100644
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/sfx2/inc/sfx2/docmacromode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docmacromode.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
index 2dcf9c1c6b..5b9ae8cc74 100644
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/sfx2/inc/sfx2/docstoragemodifylistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docstoragemodifylistener.hxx,v $
- * $Revision: 1.4.28.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 1dbb67b8c8..415eb058b7 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 3e9bb3b15a..60dd1ae473 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctempl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 267b94ccc2..976fbb1666 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: event.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index e9001ca642..bf434c1d62 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: evntconf.hxx,v $
- * $Revision: 1.3.28.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index b22f1137d7..16f23d9552 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fcontnr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index c809fac259..aff1ff8d49 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filedlghelper.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index f61faa829d..fe47d4674b 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frame.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index 9de4ab3dc3..1a3413fd30 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmdescr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index 0241b173d6..0091b6e3ac 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmhtml.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx
index 4f115cbf06..e4b134e39a 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/sfx2/inc/sfx2/frmhtmlw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmhtmlw.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx
index 7812b3f5bb..792f2208ce 100644
--- a/sfx2/inc/sfx2/genlink.hxx
+++ b/sfx2/inc/sfx2/genlink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: genlink.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index 0a9b97940e..a908bb75cd 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hintpost.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx
index 18a82738c6..baa5844918 100644
--- a/sfx2/inc/sfx2/imgdef.hxx
+++ b/sfx2/inc/sfx2/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx
index 10dee3a4b6..1e00d474fa 100644
--- a/sfx2/inc/sfx2/ipclient.hxx
+++ b/sfx2/inc/sfx2/ipclient.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ipclient.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/sfx2/inc/sfx2/itemconnect.hxx
index de5d1c0774..5f662b92bf 100644
--- a/sfx2/inc/sfx2/itemconnect.hxx
+++ b/sfx2/inc/sfx2/itemconnect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemconnect.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index d7f05ae699..7204588cfb 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemwrapper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx
index 0eab118c30..080735a7ce 100644
--- a/sfx2/inc/sfx2/layout-post.hxx
+++ b/sfx2/inc/sfx2/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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx
index bb8935c926..6ed1592f8c 100644
--- a/sfx2/inc/sfx2/layout-pre.hxx
+++ b/sfx2/inc/sfx2/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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx
index 4b84083f81..605df887d3 100644
--- a/sfx2/inc/sfx2/layout-tabdlg.hxx
+++ b/sfx2/inc/sfx2/layout-tabdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabdlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index f71809aac1..836a762f95 100644
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.hxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 #ifndef _SFX2_LAYOUT_HXX
 #define _SFX2_LAYOUT_HXX
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index bf79f78569..f17ed58a0c 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkmgr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,9 +34,15 @@
 #include <svl/svarray.hxx>
 
 class SfxObjectShell;
+class Graphic;
+class Size;
 
 namespace sfx2
 {
+    // Damit der Link ueber den Status der zu ladenen Grafik informierten werden
+    // verschickt das FileObject ein SvData, mit der FormatId
+    // "RegisterStatusInfoId" und ein einem String als Datentraeger. Dieser
+    // enthaelt den folgenden enum.
 
 class SvBaseLink;
 class SvBaseLinkRef;
@@ -50,7 +53,7 @@ SV_DECL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr, 1, 1 )
 typedef SvLinkSource* SvLinkSourcePtr;
 SV_DECL_PTRARR( SvLinkSources, SvLinkSourcePtr, 1, 1 )
 
-class SFX2_DLLPUBLIC SvLinkManager
+class SFX2_DLLPUBLIC LinkManager
 {
     SvBaseLinks		aLinkTbl;
     SvLinkSources aServerTbl;
@@ -60,8 +63,17 @@ protected:
     BOOL 		InsertLink( SvBaseLink* pLink, USHORT nObjType, USHORT nUpdateType,
                             const String* pName = 0 );
 public:
-                SvLinkManager();
-    virtual		~SvLinkManager();
+
+    enum LinkState
+    {
+        STATE_LOAD_OK,
+        STATE_LOAD_ERROR,
+        STATE_LOAD_ABORT
+    };
+
+                LinkManager( SfxObjectShell * pCacheCont );
+                ~LinkManager();
+
     SfxObjectShell*    GetPersist() const              { return pPersist; }
     void        SetPersist( SfxObjectShell * p )   { pPersist = p; }
 
@@ -78,14 +90,24 @@ public:
                 // falls am Link schon alles eingestellt ist !
     BOOL 		InsertDDELink( SvBaseLink* );
 
+    // den Link mit einem PseudoObject verbinden und in die Liste eintragen
+    BOOL InsertFileLink( sfx2::SvBaseLink&,
+                        USHORT nFileType,
+                        const String& rTxt,
+                        const String* pFilterNm = 0,
+                        const String* pRange = 0 );
+
+            // falls am Link schon alles eingestellt ist !
+    BOOL InsertFileLink( sfx2::SvBaseLink& );
+
                 // erfrage die Strings fuer den Dialog
-    virtual BOOL GetDisplayNames( const SvBaseLink *,
+    BOOL GetDisplayNames( const SvBaseLink *,
                                     String* pType,
                                     String* pFile = 0,
                                     String* pLink = 0,
                                     String* pFilter = 0 ) const;
 
-    virtual SvLinkSourceRef CreateObj( SvBaseLink* );
+    SvLinkSourceRef CreateObj( SvBaseLink* );
 
     void 		UpdateAllLinks( BOOL bAskUpdate = TRUE,
                                 BOOL bCallErrHdl = TRUE,
@@ -105,10 +127,28 @@ public:
     void 		RemoveServer( USHORT nPos, USHORT nCnt = 1 )
                 {	aServerTbl.Remove( nPos, nCnt ); }
 
+    // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
+    // (ist zur Zeit nur fuer die FileLinks interressant!)
+    void CancelTransfers();
+
+    static void SetTransferPriority( sfx2::SvBaseLink& rLink, USHORT nPrio );
+
+    // um Status Informationen aus dem FileObject an den BaseLink zu
+    // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
+    // dann die entsprechenden Informationen als String.
+    // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
+    // - das braucht Informationen ueber Load/Abort/Error
+    static ULONG  RegisterStatusInfoId();
+
+    // if the mimetype says graphic/bitmap/gdimetafile then get the
+    // graphic from the Any. Return says no errors
+    static BOOL GetGraphicFromAny( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue,
+                                Graphic& rGrf );				
+
 private:
-                // diese Methoden gibts nicht!
-                SvLinkManager( const SvLinkManager& );
-                SvLinkManager& operator=( const SvLinkManager& );
+                LinkManager( const LinkManager& );
+                LinkManager& operator=( const LinkManager& );
 };
 
 // Trenner im LinkName fuer die DDE-/File-/Grafik- Links
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx
index 7838760ca1..ae8d119da1 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/sfx2/inc/sfx2/linksrc.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linksrc.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx
index 65ec501cb8..a71941175c 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/sfx2/inc/sfx2/lnkbase.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lnkbase.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@ namespace sfx2
 {
 
 struct ImplBaseLinkData;
-class SvLinkManager;
+class LinkManager;
 class SvLinkSource;
 class FileDialogHelper;
 
@@ -82,7 +79,7 @@ struct BaseLink_Impl;
 class SFX2_DLLPUBLIC SvBaseLink : public SvRefBase
 {
 private:
-    friend class SvLinkManager;
+    friend class LinkManager;
     friend class SvLinkSource;
 
     SvLinkSourceRef			xObj;
@@ -148,9 +145,9 @@ public:
     ULONG  			GetContentType() const;
     BOOL 			SetContentType( ULONG nType );
 
-    SvLinkManager*          GetLinkManager();
-    const SvLinkManager*    GetLinkManager() const;
-    void                    SetLinkManager( SvLinkManager* _pMgr );
+    LinkManager*          GetLinkManager();
+    const LinkManager*    GetLinkManager() const;
+    void                    SetLinkManager( LinkManager* _pMgr );
 
     BOOL			Update();
     void			Disconnect();
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 35db4e8cd2..e0e1ddd375 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrconf.hxx,v $
- * $Revision: 1.4.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index c1a02a3855..03695d245a 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macropg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index e3aedd1b8d..8180a69766 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mgetempl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index 49a41c7ada..e7bb535004 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minarray.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index cad565fbe1..ded6144173 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minstack.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index fd06202cd3..5da722138f 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mnuitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 8a9aca1364..b54047b3d5 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mnumgr.hxx,v $
- * $Revision: 1.4.84.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -105,11 +102,11 @@ private:
     DECL_LINK( SelectHdl, void * );
     Menu*				pSVMenu;
 
-private:

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

-                        SfxPopupMenuManager( const SfxPopupMenuManager& );

-                        SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );

-

+private:
+                        // only declared, but not defined: don't allow copying
+                        SfxPopupMenuManager( const SfxPopupMenuManager& );
+                        SfxPopupMenuManager& operator=( const SfxPopupMenuManager& );
+
 public:
                         SfxPopupMenuManager( const ResId&, SfxBindings& );
                         SfxPopupMenuManager( PopupMenu*, SfxBindings& );
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index fc704e6e47..c6b5b523c3 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,9 +33,10 @@
 #include <sfx2/shell.hxx>
 #include <sfx2/imgdef.hxx>
 #include <sal/types.h>
+#include <vcl/fldunit.hxx>
+
 class ImageList;
 
-class SfxAcceleratorManager;
 class SfxBindings;
 class SfxObjectFactory;
 class ModalDialog;
@@ -96,6 +94,8 @@ public:
     BOOL						IsActive() const;
 
     static SfxModule*           GetActiveModule( SfxViewFrame* pFrame=NULL );
+    static FieldUnit			GetCurrentFieldUnit();
+    FieldUnit					GetFieldUnit() const;
 
 //#if 0 // _SOLAR__PRIVATE
     SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 4dd824e2fd..453231f075 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msg.hxx,v $
- * $Revision: 1.4.82.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index 9b14354e17..71b5c76ab0 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgpool.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx
index bf2f221278..a391d06ccc 100644
--- a/sfx2/inc/sfx2/navigat.hxx
+++ b/sfx2/inc/sfx2/navigat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigat.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 88050adf69..9b2c4d1c58 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: new.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index 24bed2e317..ac0c148e3f 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newstyle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index ca4a9ad1a2..82c80f7111 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objface.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index 98bb320569..ac1d0663a6 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 55e68fabdd..97196ad3c4 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objsh.hxx,v $
- * $Revision: 1.14.72.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -95,7 +92,6 @@ class GDIMetaFile;
 class Bitmap;
 class INetURLObject;
 class IndexBitSet;
-class SfxAcceleratorManager;
 class JobSetup;
 class Size;
 class Point;
@@ -770,6 +766,8 @@ public:
     SAL_DLLPRIVATE SfxObjectShell* GetParentShellByModel_Impl();
 
     // configuration items
+    SAL_DLLPRIVATE SfxEventConfigItem_Impl* GetEventConfig_Impl( sal_Bool bForce=sal_False );
+    SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl();
     SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
index 03969bcebf..f6ea2aad1b 100644
--- a/sfx2/inc/sfx2/objuno.hxx
+++ b/sfx2/inc/sfx2/objuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objuno.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index ea52c28087..bfa3015d97 100644
--- a/svx/inc/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opengrf.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,17 +24,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_OPENGRF_HXX
-#define _SVX_OPENGRF_HXX
+#ifndef _SFX2_OPENGRF_HXX
+#define _SFX2_OPENGRF_HXX
 
 #include <memory>		// auto_ptr
 #include <svtools/filter.hxx>
-#include "svx/svxdllapi.h"
-
+#include <sfx2/dllapi.h>
 
 struct  SvxOpenGrf_Impl;
 
-class SVX_DLLPUBLIC SvxOpenGraphicDialog
+class SFX2_DLLPUBLIC SvxOpenGraphicDialog
 {
 public:
     SvxOpenGraphicDialog	( const String& rTitle );
@@ -64,8 +60,8 @@ public:
     void					SetDialogHelpId( const INT32 _nHelpId );
 private:
     // disable copy and assignment	
-    SVX_DLLPRIVATE SvxOpenGraphicDialog	(const SvxOpenGraphicDialog&);
-    SVX_DLLPRIVATE SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & );
+    SFX2_DLLPRIVATE SvxOpenGraphicDialog	(const SvxOpenGraphicDialog&);
+    SFX2_DLLPRIVATE SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & );
     
     const std::auto_ptr< SvxOpenGrf_Impl >	mpImpl;
 };
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index d3d4ff2eaa..e6cbed2f98 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passwd.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx
index 84600cc073..64cbcb2226 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/sfx2/inc/sfx2/printer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index 0295736f01..62cc555d4f 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printopt.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index c98e70b8c7..038f9d188a 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prnmon.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 121520976b..e9681d5de5 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index e205f67d7b..15252453ac 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querystatus.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 5aba53bfd6..6893725a22 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: request.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 45669204cf..573b6944e1 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.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: sfx.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/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 73b0d4e7c0..566e45a599 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxbasecontroller.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index ab058b5a61..52fe2c14bf 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.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: sfxbasemodel.hxx,v $
- *
- * $Revision: 1.13.28.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index 2f1b4676ad..a3653ef65b 100644
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxdefs.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 5b76e6a9ec..b6eaeb9c0d 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxdlg.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@ struct TransferableObjectDescriptor;
 
 namespace sfx2
 {
-    class SvLinkManager;
+    class LinkManager;
 }
 
 namespace com { namespace sun { namespace star { namespace frame {
@@ -115,9 +112,10 @@ public:
 
 namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
 
-class SFX2_DLLPUBLIC SfxAbstractDialogFactory : public VclAbstractDialogFactory
+class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialogFactory
 {
 public:
+                                        virtual ~SfxAbstractDialogFactory();	// needed for export of vtable
     static SfxAbstractDialogFactory* 	Create();
     virtual VclAbstractDialog*          CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
     virtual VclAbstractDialog*          CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const String& rParameter ) = 0;
@@ -141,7 +139,7 @@ public:
     virtual VclAbstractDialog*          CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
     virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent )=0;
-    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
+    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
     virtual VclAbstractDialog *         CreateSvxScriptOrgDialog( Window* pParent,  const String& rLanguage ) = 0;
 
     virtual AbstractScriptSelectorDialog*
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index ae8e3d0ea0..f039b8bd0e 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxhtml.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -84,8 +81,6 @@ public:
             LanguageType& eNumLang, const String& aValStr,
             const String& aNumStr, SvNumberFormatter& rFormatter );
 
-    static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader );
-
 protected:
 
     // Start eines File-Downloads. Dieser erfolgt synchron oder asynchron.
@@ -124,9 +119,6 @@ protected:
     // Default (auch ohne Iterator) ist JavaScript
     ScriptType GetScriptType( SvKeyValueIterator* ) const;
     const String& GetScriptTypeString( SvKeyValueIterator* ) const;
-
-    BOOL SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader );
-
 };
 
 inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/sfx2/inc/sfx2/sfxmodelfactory.hxx
index a0cc08ce78..ac22ef41df 100644
--- a/sfx2/inc/sfx2/sfxmodelfactory.hxx
+++ b/sfx2/inc/sfx2/sfxmodelfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxmodelfactory.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index fd150e7cc4..3d6f742a81 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxsids.hrc,v $
- * $Revision: 1.12.104.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,92 +29,25 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
-
-#define SID_SFX_START                5000
-#define SID_SFX_END                  8999
-
-#ifndef _CNTIDS_HRC
 #include <sfx2/cntids.hrc>
-#endif
+#include <svl/memberid.hrc>
 
 // Please be careful:
 // Changing just one part here doesn't add new
 // docking windows automatically!
 //
-#define SID_DOCKWIN_START			9800
-#define SID_DOCKWIN_0				9800
-#define SID_DOCKWIN_1				9801
-#define SID_DOCKWIN_2				9802
-#define SID_DOCKWIN_3				9803
-#define SID_DOCKWIN_4				9804
-#define SID_DOCKWIN_5				9805
-#define SID_DOCKWIN_6				9806
-#define SID_DOCKWIN_7				9807
-#define SID_DOCKWIN_8				9808
-#define SID_DOCKWIN_9				9809
-/*
-#define SID_DOCKWIN_10				9810
-#define SID_DOCKWIN_11				9811
-#define SID_DOCKWIN_12				9812
-#define SID_DOCKWIN_13				9813
-#define SID_DOCKWIN_14				9814
-#define SID_DOCKWIN_15				9815
-#define SID_DOCKWIN_16				9816
-#define SID_DOCKWIN_17				9817
-#define SID_DOCKWIN_18				9818
-#define SID_DOCKWIN_19				9819
-#define SID_DOCKWIN_20				9820
-#define SID_DOCKWIN_21				9821
-#define SID_DOCKWIN_22				9822
-#define SID_DOCKWIN_23				9823
-#define SID_DOCKWIN_24				9824
-#define SID_DOCKWIN_25				9825
-#define SID_DOCKWIN_26				9826
-#define SID_DOCKWIN_27				9827
-#define SID_DOCKWIN_28				9828
-#define SID_DOCKWIN_29				9829
-*/
-#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_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_Sa_START                28000
-#define SID_Sa_END                  28999
-
-#define SID_Sb_START                29000
-#define SID_Sb_END                  29999
-
-#define SID_OBJ_START               30000
-#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_OBJ4_START              (SID_OBJ_START + 1024)
-#define SID_OBJ5_START              (SID_OBJ_START + 1280)
-#define SID_OBJ6_START              (SID_OBJ_START + 1536)
-#define SID_OBJ7_START              (SID_OBJ_START + 1792)
-#define SID_OBJ_END(nStart)         (nStart+255)
-
-#define SID_SIM_START               SID_OBJ0_START
-#define SID_SCH_START               SID_OBJ1_START
-#define SID_SMA_START               SID_OBJ2_START
-#define SID_BASICIDE_START          SID_OBJ3_START
+
+#define SID_DOCKWIN_0				SID_DOCKWIN_START
+#define SID_DOCKWIN_1				SID_DOCKWIN_START+1
+#define SID_DOCKWIN_2				SID_DOCKWIN_START+2
+#define SID_DOCKWIN_3				SID_DOCKWIN_START+3
+#define SID_DOCKWIN_4				SID_DOCKWIN_START+4
+#define SID_DOCKWIN_5				SID_DOCKWIN_START+5
+#define SID_DOCKWIN_6				SID_DOCKWIN_START+6
+#define SID_DOCKWIN_7				SID_DOCKWIN_START+7
+#define SID_DOCKWIN_8				SID_DOCKWIN_START+8
+#define SID_DOCKWIN_9				SID_DOCKWIN_START+9
 
 //=========================================================================
 
@@ -795,19 +725,6 @@
 #define SID_SFXNODES_ATTACHLIST             (SID_SFXNODES_START + 41)
 #define SID_SFXNODES_END                    SID_SFXNODES_ATTACHLIST
 
-#define SID_OPTIONS_START               (SID_LIB_START +    2000)
-#define SID_OPTIONS_FIRSTFREE           99
-#define SID_OPTIONS_END                 (SID_OPTIONS_START + 100)
-
-#define SID_SBA_START                   (SID_LIB_START	+	2101)
-#define SID_SBA_END                     (SID_SBA_START	+	 149)
-
-#define SID_DBACCESS_START				(SID_LIB_START		+    2251)
-#define SID_DBACCESS_END				(SID_DBACCESS_START	+     200)
-
-#define SID_RPTUI_START                 (SID_LIB_START      +    2452)
-#define SID_RPTUI_END                   (SID_RPTUI_START    +     197)
-
 // SaveTabPage
 #define SID_ATTR_DOCINFO                (SID_OPTIONS_START +  0)
 #define SID_ATTR_BACKUP                 (SID_OPTIONS_START +  1)
@@ -933,30 +850,6 @@
 
 // slot IDs from SVX (svxids.hrc) ---------------------------------------------
 
-#define SID_SVX_START                       (SID_LIB_START +   0)
-
-#define SID_ATTR_CHAR                       (SID_SVX_START +   6)
-#define SID_ATTR_CHAR_FONT                  (SID_SVX_START +   7)
-#define SID_ATTR_CHAR_POSTURE               (SID_SVX_START +   8)
-#define SID_ATTR_CHAR_WEIGHT                (SID_SVX_START +   9)
-#define SID_ATTR_CHAR_SHADOWED              (SID_SVX_START +  10)
-#define SID_ATTR_CHAR_WORDLINEMODE          (SID_SVX_START +  11)
-#define SID_ATTR_CHAR_CONTOUR               (SID_SVX_START +  12)
-#define SID_ATTR_CHAR_STRIKEOUT             (SID_SVX_START +  13)
-#define SID_ATTR_CHAR_UNDERLINE             (SID_SVX_START +  14)
-#define SID_ATTR_CHAR_FONTHEIGHT            (SID_SVX_START +  15)
-#define SID_ATTR_CHAR_PROPSIZE              (SID_SVX_START +  16)
-#define SID_ATTR_CHAR_COLOR                 (SID_SVX_START +  17)
-#define SID_ATTR_CHAR_KERNING               (SID_SVX_START +  18)
-#define SID_ATTR_CHAR_CASEMAP               (SID_SVX_START +  19)
-#define SID_ATTR_CHAR_LANGUAGE              (SID_SVX_START +  20)
-#define SID_ATTR_CHAR_ESCAPEMENT            (SID_SVX_START +  21)
-#define SID_ATTR_CHAR_FONTLIST              (SID_SVX_START +  22)
-// Temp-Id f"ur FontMapType
-#define SID_ATTR_CHAR_MAPTYPE               (SID_SVX_START +  64)
-// zusaetzlich f"ur die Ext-Zeichen-TabPage
-#define SID_ATTR_CHAR_AUTOKERN              (SID_SVX_START +  67)
-#define SID_ATTR_CHAR_OVERLINE              (SID_SVX_START +  68)
 #define SID_ZOOM_TOOLBOX                    (SID_SVX_START +  96)
 #define SID_ZOOM_OUT                        (SID_SVX_START +  97)
 #define SID_ZOOM_IN                         (SID_SVX_START +  98)
@@ -1091,30 +984,6 @@
 
 #define SID_ATTR_CHAR_FILLCOLOR		    	(SID_SFX_START + 1551)
 
-#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
-
-// SvxSizeItem
-#define MID_SIZE_SIZE       0
-#define MID_SIZE_WIDTH      1
-#define MID_SIZE_HEIGHT     2
-
 // SfxScriptOrganizerItem
 #define MID_SCRIPT_ORGANIZER_LANGUAGE       1 // Don't use zero for MID's. It's forbidden to do it!
 
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index fc0c800071..6a44d24f4a 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxstatuslistener.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 2ddce731e6..2953b95644 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxuno.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 7c10f81007..9d2ef73d5f 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shell.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/sfx2/inc/sfx2/signaturestate.hxx
index a75114ea98..0bdfeef560 100644
--- a/sfx2/inc/sfx2/signaturestate.hxx
+++ b/sfx2/inc/sfx2/signaturestate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: signaturestate.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/srchdefs.hxx b/sfx2/inc/sfx2/srchdefs.hxx
deleted file mode 100644
index ebc03c6ac2..0000000000
--- a/sfx2/inc/sfx2/srchdefs.hxx
+++ /dev/null
@@ -1,52 +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: srchdefs.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 _SFX_SRCHDEFS_HXX_
-#define _SFX_SRCHDEFS_HXX_
-
-
-#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)
-
-
-#endif
-
diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx
deleted file mode 100644
index b8df62e0c6..0000000000
--- a/sfx2/inc/sfx2/srchitem.hxx
+++ /dev/null
@@ -1,306 +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: srchitem.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 _SFX_SRCHITEM_HXX
-#define _SFX_SRCHITEM_HXX
-
-#include "sal/config.h"
-#include "sfx2/dllapi.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 <sfx2/msg.hxx>
-#include <sfx2/srchdefs.hxx>
-
-// defines ---------------------------------------------------------------
-
-// Kommandos
-#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)
-
-// Suche in (fuer Calc)
-#define		SVX_SEARCHIN_FORMULA		((sal_uInt16)0)
-#define		SVX_SEARCHIN_VALUE			((sal_uInt16)1)
-#define		SVX_SEARCHIN_NOTE			((sal_uInt16)2)
-
-// Applicationsflag
-#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 ---------------------------------------------------
-
-//#ifdef ITEMID_SEARCH
-
-/*	[Beschreibung]
-
-    In diesem Item werden alle Such-Attribute gespeichert.
-*/
-class SFX2_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 /*= ITEMID_SEARCH*/ );
-    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
-
-//#endif
-
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 5d7c8d4245..f8dff35c4d 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styfitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index 4e144f8ca2..d4f49c8184 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styledlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 050b135486..6f84e0cc15 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabdlg.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -248,8 +245,8 @@ namespace sfx { class ItemConnectionBase; }
 class SFX2_DLLPUBLIC SfxTabPage: public TabPage
 {
 friend class SfxTabDialog;
-    #if ENABLE_LAYOUT

-     friend class layout::SfxTabDialog;

+    #if ENABLE_LAYOUT
+     friend class layout::SfxTabDialog;
     #endif
 
 private:
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 0d530d4114..600b051170 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxctrl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index c59d1ff062..6cd9846744 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index b83bddad56..52c24dd827 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoctitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/sfx2/inc/sfx2/userinputinterception.hxx
index 5b4d075953..318c8c8ee3 100644
--- a/sfx2/inc/sfx2/userinputinterception.hxx
+++ b/sfx2/inc/sfx2/userinputinterception.hxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: userinputinterception.hxx,v $
-*
-* $Revision: 1.2 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 #ifndef USERINPUTINTERCEPTION_HXX
 #define USERINPUTINTERCEPTION_HXX
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 62ef33ebde..06e6b9dcae 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewfrm.hxx,v $
- * $Revision: 1.5.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 4f18658ca5..3e633d0605 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewsh.hxx,v $
- * $Revision: 1.5.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfxbasic.hxx b/sfx2/inc/sfxbasic.hxx
index fbf97ce76c..89971b072f 100644
--- a/sfx2/inc/sfxbasic.hxx
+++ b/sfx2/inc/sfxbasic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxbasic.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index 261b9f895b..3e61b8ee18 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxhelp.hxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,6 +47,7 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
 private:
     SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow );
     SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
+    SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId );
 
     SAL_DLLPRIVATE String GetHelpModuleName_Impl();
     SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName );
diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfxresid.hxx
index b424205633..aa3a13b37b 100644
--- a/sfx2/inc/sfxresid.hxx
+++ b/sfx2/inc/sfxresid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxresid.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/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 4d5e4c2218..61c8894d08 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sorgitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index e5ad040803..384f075f01 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx
index c3ee01bd5f..94261e54ca 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/stbitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stbitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx
index 8c721391d7..fdff95cf61 100644
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/tplpitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tplpitem.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/sfx2/inc/viewfac.hxx b/sfx2/inc/viewfac.hxx
index ca19c8eacc..0ab7159ae2 100644
--- a/sfx2/inc/viewfac.hxx
+++ b/sfx2/inc/viewfac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewfac.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/sfx2/prj/d.lst b/sfx2/prj/d.lst
index 7a73fc3e0a..0748aa19cd 100644
--- a/sfx2/prj/d.lst
+++ b/sfx2/prj/d.lst
@@ -22,111 +22,25 @@ mkdir: %_DEST%\inc%_EXT%\sfx2
 ..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid
 ..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml
 ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv
-..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h
+
+..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h
+..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx
+..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc
 
 ..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi
 ..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi
-..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx
-..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx
-..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx
 ..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx
-..\inc\sfx2\chalign.hxx %_DEST%\inc%_EXT%\sfx2\chalign.hxx
-..\inc\sfx2\childwin.hxx %_DEST%\inc%_EXT%\sfx2\childwin.hxx
-..\inc\sfx2\ctrlitem.hxx %_DEST%\inc%_EXT%\sfx2\ctrlitem.hxx
-..\inc\sfx2\dispatch.hxx %_DEST%\inc%_EXT%\sfx2\dispatch.hxx
-..\inc\sfx2\dinfdlg.hxx %_DEST%\inc%_EXT%\sfx2\dinfdlg.hxx
 ..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx
-..\inc\sfx2\docinf.hxx %_DEST%\inc%_EXT%\sfx2\docinf.hxx
-..\inc\sfx2\docfac.hxx %_DEST%\inc%_EXT%\sfx2\docfac.hxx
-..\inc\sfx2\docfile.hxx %_DEST%\inc%_EXT%\sfx2\docfile.hxx
-..\inc\sfx2\docfilt.hxx %_DEST%\inc%_EXT%\sfx2\docfilt.hxx
-..\inc\sfx2\dockwin.hxx %_DEST%\inc%_EXT%\sfx2\dockwin.hxx
-..\inc\sfx2\doctempl.hxx %_DEST%\inc%_EXT%\sfx2\doctempl.hxx
-..\inc\sfx2\doctdlg.hxx %_DEST%\inc%_EXT%\sfx2\doctdlg.hxx
-..\inc\sfx2\event.hxx %_DEST%\inc%_EXT%\sfx2\event.hxx
-..\inc\sfx2\evntconf.hxx %_DEST%\inc%_EXT%\sfx2\evntconf.hxx
-..\inc\sfx2\filedlghelper.hxx %_DEST%\inc%_EXT%\sfx2\filedlghelper.hxx
-..\inc\sfx2\fcontnr.hxx %_DEST%\inc%_EXT%\sfx2\fcontnr.hxx
-..\inc\sfx2\frame.hxx %_DEST%\inc%_EXT%\sfx2\frame.hxx
-..\inc\sfx2\frmdescr.hxx %_DEST%\inc%_EXT%\sfx2\frmdescr.hxx
-..\inc\sfx2\frmhtml.hxx %_DEST%\inc%_EXT%\sfx2\frmhtml.hxx
-..\inc\sfx2\frmhtmlw.hxx %_DEST%\inc%_EXT%\sfx2\frmhtmlw.hxx
-..\inc\sfx2\genlink.hxx %_DEST%\inc%_EXT%\sfx2\genlink.hxx
-..\inc\sfx2\hintpost.hxx %_DEST%\inc%_EXT%\sfx2\hintpost.hxx
 ..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx
-..\inc\sfx2\imgdef.hxx %_DEST%\inc%_EXT%\sfx2\imgdef.hxx
-..\inc\sfx2\ipclient.hxx %_DEST%\inc%_EXT%\sfx2\ipclient.hxx
-..\inc\sfx2\macrconf.hxx %_DEST%\inc%_EXT%\sfx2\macrconf.hxx
-..\inc\sfx2\mgetempl.hxx %_DEST%\inc%_EXT%\sfx2\mgetempl.hxx
 ..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx
-..\inc\sfx2\minarray.hxx %_DEST%\inc%_EXT%\sfx2\minarray.hxx
 ..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx
-..\inc\sfx2\minstack.hxx %_DEST%\inc%_EXT%\sfx2\minstack.hxx
-..\inc\sfx2\mnuitem.hxx %_DEST%\inc%_EXT%\sfx2\mnuitem.hxx
-..\inc\sfx2\module.hxx %_DEST%\inc%_EXT%\sfx2\module.hxx
-..\inc\sfx2\msg.hxx %_DEST%\inc%_EXT%\sfx2\msg.hxx
-..\inc\sfx2\mnumgr.hxx %_DEST%\inc%_EXT%\sfx2\mnumgr.hxx
-..\inc\sfx2\newstyle.hxx %_DEST%\inc%_EXT%\sfx2\newstyle.hxx
-..\inc\sfx2\new.hxx %_DEST%\inc%_EXT%\sfx2\new.hxx
-..\inc\sfx2\navigat.hxx %_DEST%\inc%_EXT%\sfx2\navigat.hxx
-..\inc\sfx2\msgpool.hxx %_DEST%\inc%_EXT%\sfx2\msgpool.hxx
-..\inc\sfx2\passwd.hxx %_DEST%\inc%_EXT%\sfx2\passwd.hxx
-..\inc\sfx2\prnmon.hxx %_DEST%\inc%_EXT%\sfx2\prnmon.hxx
-..\inc\sfx2\objface.hxx %_DEST%\inc%_EXT%\sfx2\objface.hxx
-..\inc\sfx2\objitem.hxx %_DEST%\inc%_EXT%\sfx2\objitem.hxx
-..\inc\sfx2\signaturestate.hxx %_DEST%\inc%_EXT%\sfx2\signaturestate.hxx
-..\inc\sfx2\docmacromode.hxx %_DEST%\inc%_EXT%\sfx2\docmacromode.hxx
-..\inc\sfx2\userinputinterception.hxx %_DEST%\inc%_EXT%\sfx2\userinputinterception.hxx
-..\inc\sfx2\docstoragemodifylistener.hxx %_DEST%\inc%_EXT%\sfx2\docstoragemodifylistener.hxx
-..\inc\sfx2\sfxmodelfactory.hxx %_DEST%\inc%_EXT%\sfx2\sfxmodelfactory.hxx
-..\inc\sfx2\objsh.hxx %_DEST%\inc%_EXT%\sfx2\objsh.hxx
-..\inc\sfx2\printer.hxx %_DEST%\inc%_EXT%\sfx2\printer.hxx
-..\inc\sfx2\printopt.hxx %_DEST%\inc%_EXT%\sfx2\printopt.hxx
-..\inc\sfx2\progress.hxx %_DEST%\inc%_EXT%\sfx2\progress.hxx
-..\inc\sfx2\request.hxx %_DEST%\inc%_EXT%\sfx2\request.hxx
-..\inc\sfx2\sfx.hrc %_DEST%\inc%_EXT%\sfx2\sfx.hrc
-..\inc\sfx2\sfxdefs.hxx %_DEST%\inc%_EXT%\sfx2\sfxdefs.hxx
 ..\inc\sfxhelp.hxx %_DEST%\inc%_EXT%\sfx2\sfxhelp.hxx
-..\inc\sfx2\sfxhtml.hxx %_DEST%\inc%_EXT%\sfx2\sfxhtml.hxx
-..\inc\sfx2\sfxsids.hrc %_DEST%\inc%_EXT%\sfx2\sfxsids.hrc
-..\inc\sfx2\shell.hxx %_DEST%\inc%_EXT%\sfx2\shell.hxx
 ..\inc\stbitem.hxx %_DEST%\inc%_EXT%\sfx2\stbitem.hxx
-..\inc\sfx2\styfitem.hxx %_DEST%\inc%_EXT%\sfx2\styfitem.hxx
-..\inc\sfx2\styledlg.hxx %_DEST%\inc%_EXT%\sfx2\styledlg.hxx
-..\inc\sfx2\tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\tabdlg.hxx
-..\inc\sfx2\tbxctrl.hxx %_DEST%\inc%_EXT%\sfx2\tbxctrl.hxx
-..\inc\sfx2\templdlg.hxx %_DEST%\inc%_EXT%\sfx2\templdlg.hxx
 ..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx
-..\inc\sfx2\viewfrm.hxx %_DEST%\inc%_EXT%\sfx2\viewfrm.hxx
-..\inc\sfx2\viewsh.hxx %_DEST%\inc%_EXT%\sfx2\viewsh.hxx
 ..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx
-..\inc\sfx2\appuno.hxx %_DEST%\inc%_EXT%\sfx2\appuno.hxx
-..\inc\sfx2\sfxuno.hxx %_DEST%\inc%_EXT%\sfx2\sfxuno.hxx
-..\inc\sfx2\sfxbasemodel.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasemodel.hxx
-..\inc\sfx2\sfxbasecontroller.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasecontroller.hxx
-..\inc\sfx2\unoctitm.hxx %_DEST%\inc%_EXT%\sfx2\unoctitm.hxx
-..\inc\sfx2\srchitem.hxx %_DEST%\inc%_EXT%\sfx2\srchitem.hxx
-..\inc\sfx2\srchdefs.hxx %_DEST%\inc%_EXT%\sfx2\srchdefs.hxx
-..\inc\sfx2\cntids.hrc %_DEST%\inc%_EXT%\sfx2\cntids.hrc
 ..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx
 ..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx
-..\inc\sfx2\sfxdlg.hxx %_DEST%\inc%_EXT%\sfx2\sfxdlg.hxx
-..\inc\sfx2\dialogs.hrc %_DEST%\inc%_EXT%\sfx2\dialogs.hrc
-..\inc\sfx2\itemwrapper.hxx %_DEST%\inc%_EXT%\sfx2\itemwrapper.hxx
-..\inc\sfx2\controlwrapper.hxx %_DEST%\inc%_EXT%\sfx2\controlwrapper.hxx
-..\inc\sfx2\itemconnect.hxx %_DEST%\inc%_EXT%\sfx2\itemconnect.hxx
-..\inc\sfx2\lnkbase.hxx %_DEST%\inc%_EXT%\sfx2\lnkbase.hxx
-..\inc\sfx2\linkmgr.hxx %_DEST%\inc%_EXT%\sfx2\linkmgr.hxx
-..\inc\sfx2\linksrc.hxx %_DEST%\inc%_EXT%\sfx2\linksrc.hxx
-..\inc\sfx2\querystatus.hxx %_DEST%\inc%_EXT%\sfx2\querystatus.hxx
-..\inc\sfx2\sfxstatuslistener.hxx %_DEST%\inc%_EXT%\sfx2\sfxstatuslistener.hxx
 ..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx
 ..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx
 ..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx
-..\inc\sfx2\layout.hxx %_DEST%\inc%_EXT%\sfx2\layout.hxx
-..\inc\sfx2\layout-tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\layout-tabdlg.hxx
-..\inc\sfx2\layout-post.hxx %_DEST%\inc%_EXT%\sfx2\layout-post.hxx
-..\inc\sfx2\layout-pre.hxx %_DEST%\inc%_EXT%\sfx2\layout-pre.hxx
-..\inc\sfx2\XmlIdRegistry.hxx %_DEST%\inc%_EXT%\sfx2\XmlIdRegistry.hxx
-..\inc\sfx2\DocumentMetadataAccess.hxx %_DEST%\inc%_EXT%\sfx2\DocumentMetadataAccess.hxx
-..\inc\sfx2\Metadatable.hxx %_DEST%\inc%_EXT%\sfx2\Metadatable.hxx
+
diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
index 57740db29e..6ab5400ec4 100644
--- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
+++ b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.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: CheckGlobalEventBroadcaster_writer1.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/sfx2/qa/complex/DocHelper/DialogThread.java b/sfx2/qa/complex/DocHelper/DialogThread.java
index 3ea568f0c8..19f5b32d3e 100644
--- a/sfx2/qa/complex/DocHelper/DialogThread.java
+++ b/sfx2/qa/complex/DocHelper/DialogThread.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: DialogThread.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/sfx2/qa/complex/DocHelper/WriterHelper.java b/sfx2/qa/complex/DocHelper/WriterHelper.java
index a7dbe76316..7b393677f7 100644
--- a/sfx2/qa/complex/DocHelper/WriterHelper.java
+++ b/sfx2/qa/complex/DocHelper/WriterHelper.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: WriterHelper.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/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/DocHelper/makefile.mk
index 2f14197c36..6b6ac9191c 100644
--- a/sfx2/qa/complex/DocHelper/makefile.mk
+++ b/sfx2/qa/complex/DocHelper/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/DocumentMetaData.java
index c08531a697..de3b22f299 100644
--- a/sfx2/qa/complex/DocumentMetaData.java
+++ b/sfx2/qa/complex/DocumentMetaData.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: DocumentMetaData.java,v $
- * $Revision: 1.3.170.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/DocumentMetadataAccessTest.java
index 86848ac4bf..767d74dd23 100644
--- a/sfx2/qa/complex/DocumentMetadataAccessTest.java
+++ b/sfx2/qa/complex/DocumentMetadataAccessTest.java
@@ -1,14 +1,11 @@
 /*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 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
  *
- * $RCSfile: DocumentMetadataAccessTest.java,v $
- *
- * $Revision: 1.1.2.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +22,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
+ *
  ************************************************************************/
 
 package complex.framework;
diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java
index 6a6281a574..2f818b972b 100644
--- a/sfx2/qa/complex/docinfo/DocumentProperties.java
+++ b/sfx2/qa/complex/docinfo/DocumentProperties.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: DocumentProperties.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/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk
index 7c074ccbe8..18cfdb5344 100644
--- a/sfx2/qa/complex/docinfo/makefile.mk
+++ b/sfx2/qa/complex/docinfo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/makefile.mk
index 5c0006df9e..b8bc897fcc 100644
--- a/sfx2/qa/complex/makefile.mk
+++ b/sfx2/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.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/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java
index c50650c4f1..8d58ca7f14 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.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: StandaloneDocumentInfoTest.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/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
index a239b32481..89840e1cd4 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.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: StandaloneDocumentInfoUnitTest.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/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/standalonedocumentinfo/Test01.java
index 67c45b50ce..16b85b3913 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/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/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java
index 1a846a1ec7..697bf726d9 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java
+++ b/sfx2/qa/complex/standalonedocumentinfo/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/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
index 850fc305d5..c65556aeb7 100644
--- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
+++ b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.134.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk
index 9d5403bb7c..3b078237f1 100644
--- a/sfx2/qa/unoapi/makefile.mk
+++ b/sfx2/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/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 5da69fa977..a230036695 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appslots.sdi,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 6fb1b161b2..bae825f8b7 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 716505e4c8..8b11c49e73 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk
index 3e353b67b9..c02e51eb69 100644
--- a/sfx2/sdi/makefile.mk
+++ b/sfx2/sdi/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 643389259e..7bc57471c9 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi
index 8ee8f099fb..fc78c60a65 100644
--- a/sfx2/sdi/sfxslots.sdi
+++ b/sfx2/sdi/sfxslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 1919f3d7a6..1bf1625e94 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -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
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 3d475142f8..66d06cfce2 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.cxx,v $
- * $Revision: 1.112 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 112c5c4506..1f9c125fb4 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.hrc,v $
- * $Revision: 1.49 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -258,6 +255,18 @@
 #define STR_DDE_ERROR                           (RID_SFX_APP_START + 193)
 #define RID_SECURITY_WARNING_NO_HYPERLINKS      (RID_SFX_APP_START + 194)
 
+#define RID_SVXSTR_FILELINK                     (RID_SFX_APP_START + 195)
+#define RID_SVXSTR_GRAFIKLINK                   (RID_SFX_APP_START + 196)
+#define RID_SVXSTR_EDITGRFLINK                  (RID_SFX_APP_START + 197)
+
+// strings for error messsages of OpenGraphics dialog
+#define RID_SVXSTR_GRFILTER_OPENERROR		    (RID_SFX_APP_START + 198)
+#define RID_SVXSTR_GRFILTER_IOERROR			    (RID_SFX_APP_START + 199)
+#define RID_SVXSTR_GRFILTER_FORMATERROR		    (RID_SFX_APP_START + 200)
+#define RID_SVXSTR_GRFILTER_VERSIONERROR	    (RID_SFX_APP_START + 201)
+#define RID_SVXSTR_GRFILTER_FILTERERROR		    (RID_SFX_APP_START + 202)
+#define RID_SVXSTR_GRFILTER_TOOBIG			    (RID_SFX_APP_START + 203)
+
 #define MD_DDE_LINKEDIT                         (RID_SFX_APP_START + 1)
 
 #endif // #ifndef _SFX_APP_HRC
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 797b0dc7ba..e1c43c072e 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.src,v $
- * $Revision: 1.122 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1056,3 +1053,42 @@ Image IMG_MISSING_4
 {
     ImageBitmap = Bitmap { File = "sn064.bmp" ; };
 };
+
+String RID_SVXSTR_FILELINK
+{
+    Text [ en-US ] = "Document" ;
+};
+String RID_SVXSTR_GRAFIKLINK
+{
+    Text [ en-US ] = "Graphic" ;
+};
+String RID_SVXSTR_EDITGRFLINK
+{
+    Text [ en-US ] = "Link graphics" ;
+};
+
+String RID_SVXSTR_GRFILTER_OPENERROR
+{
+    Text [ en-US ] = "Graphics file cannot be opened" ;
+};
+String RID_SVXSTR_GRFILTER_IOERROR
+{
+    Text [ en-US ] = "Graphics file cannot be read" ;
+};
+String RID_SVXSTR_GRFILTER_FORMATERROR
+{
+    Text [ en-US ] = "Unknown graphics format" ;
+};
+String RID_SVXSTR_GRFILTER_VERSIONERROR
+{
+    Text [ en-US ] = "This version of the graphics file is not supported" ;
+};
+String RID_SVXSTR_GRFILTER_FILTERERROR
+{
+    Text [ en-US ] = "Graphics filter not found" ;
+};
+String RID_SVXSTR_GRFILTER_TOOBIG
+{
+    Text [ en-US ] = "Not enough memory to insert graphic" ;
+};
+
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index b004ef1a87..641991cf67 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appbas.cxx,v $
- * $Revision: 1.52 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -89,7 +86,7 @@
 
 #define ITEMID_SEARCH SID_SEARCH_ITEM
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <vos/socket.hxx>
 
 #define SFX_TYPEMAP
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index f6369b1d2a..8283a89379 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appbaslib.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/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 81affa9c99..44b970e82b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appcfg.cxx,v $
- * $Revision: 1.74 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index f201ba79ab..dc3e6c4bf3 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appchild.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/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index ae6dff6d61..7936110356 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdata.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 26a76218f0..789de8b425 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdde.cxx,v $
- * $Revision: 1.19.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 5345a050aa..045f9a2fea 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appinit.cxx,v $
- * $Revision: 1.65 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -276,8 +273,6 @@ FASTBOOL SfxApplication::Initialize_Impl()
     new SfxErrorHandler(
         RID_SO_ERROR_HANDLER, ERRCODE_AREA_SO, ERRCODE_AREA_SO_END);
     new SfxErrorHandler(
-        (RID_SJ_START +1), ERRCODE_AREA_JAVA, ERRCODE_AREA_JAVA_END);
-    new SfxErrorHandler(
         RID_BASIC_START, ERRCODE_AREA_SBX, ERRCODE_AREA_SBX_END );
 
     // diverse Pointer
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index f4e3dea030..aee82150a8 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appmain.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/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index edfb3f3813..e7eb75f99b 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appmisc.cxx,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index c796c2d681..b7cf7129bd 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appopen.cxx,v $
- * $Revision: 1.121.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index ba1d9c9600..7c41c802bb 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appquit.cxx,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index a436f592b2..37ca1f5e5e 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appreg.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/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index aee67d6e33..c079a5a5f0 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appserv.cxx,v $
- * $Revision: 1.78 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -552,8 +549,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
         case SID_CRASH :
         {
-            GetpApp()->Exception( EXC_SYSTEM );
-            abort();
+            // Provoke a crash:
+            char * crash = 0;
+            *crash = 0;
+            break;
         }
 
         case SID_SHOW_IME_STATUS_WINDOW:
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 1908ee5c3a..a5d587a229 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appuno.cxx,v $
- * $Revision: 1.131 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 605af8e770..639fe81c9a 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: childwin.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/sfx2/source/appl/dde.hrc b/sfx2/source/appl/dde.hrc
index 05300a3974..63fa89ce2e 100644
--- a/sfx2/source/appl/dde.hrc
+++ b/sfx2/source/appl/dde.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: dde.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/sfx2/source/appl/dde.src b/sfx2/source/appl/dde.src
index 9c62559b0c..9b87bb94e6 100644
--- a/sfx2/source/appl/dde.src
+++ b/sfx2/source/appl/dde.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: dde.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/svx/source/svxlink/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 050396dfa1..158fbb3365 100644
--- a/svx/source/svxlink/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fileobj.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,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_sfx2.hxx"
+
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/urlobj.hxx>
@@ -39,9 +37,6 @@
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/progress.hxx>
-#ifndef _SFX_INTERNO_HXX
-//#include <sfx2/interno.hxx>
-#endif
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sot/exchange.hxx>
@@ -51,14 +46,11 @@
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
-
+#include <sfx2/linkmgr.hxx>
+#include <sfx2/opengrf.hxx>
+#include "sfxresid.hxx"
 #include "fileobj.hxx"
-#include "linkmgr.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#include "xoutbmp.hxx"
-#include "opengrf.hxx"
-#include "svx/impgrf.hxx"
+#include "app.hrc"
 
 namespace css = ::com::sun::star;
 
@@ -327,15 +319,14 @@ BOOL SvFileObject::LoadFile_Impl()
 
     // Grafik ist fertig, also DataChanged von der Statusaederung schicken:
     SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
-                        ? STATE_LOAD_ERROR : STATE_LOAD_OK );
-
+                        ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
     return TRUE;
 }
 
 
 BOOL SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 {
-    GraphicFilter* pGF = GetGrfFilter();
+    GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
 
     const USHORT nFilter = sFilter.Len() && pGF->GetImportFormatCount()
                             ? pGF->GetImportFormatNumber( sFilter )
@@ -470,7 +461,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
             {
                 nType = FILETYPE_GRF;       // falls noch nicht gesetzt
 
-                SvxOpenGraphicDialog aDlg(ResId(RID_SVXSTR_EDITGRFLINK, DIALOG_MGR()));
+                SvxOpenGraphicDialog aDlg(SfxResId(RID_SVXSTR_EDITGRFLINK));
                 aDlg.EnableLink(sal_False);
                 aDlg.SetPath( sFile, sal_True );
                 aDlg.SetCurrentFilter( sTmpFilter );
@@ -537,7 +528,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
             // Grafik ist fertig, also DataChanged von der Status-
             // aederung schicken:
         pThis->bDataReady = TRUE;
-        pThis->SendStateChg_Impl( STATE_LOAD_OK );
+        pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK );
 
             // und dann nochmal die Daten senden
         pThis->NotifyDataChanged();
@@ -616,8 +607,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
     {
         // Grafik ist fertig, also DataChanged von der Status-
         // aederung schicken:
-        pThis->SendStateChg_Impl( pStrm->GetError() ? STATE_LOAD_ERROR
-                                                    : STATE_LOAD_OK );
+        pThis->SendStateChg_Impl( pStrm->GetError() ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
     }
 
     pThis->bInNewData = FALSE;
@@ -696,19 +686,19 @@ void SvFileObject::CancelTransfers()
         // nicht noch mal aufsetzen
         bLoadAgain = FALSE;
         bDataReady = bLoadError = bWaitForData = TRUE;
-        SendStateChg_Impl( STATE_LOAD_ABORT );
+        SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT );
     }
 }
 
 
-void SvFileObject::SendStateChg_Impl( LinkState nState )
+void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState )
 {
     if( !bStateChangeCalled && HasDataLinks() )
     {
         css::uno::Any aAny;
         aAny <<= rtl::OUString::valueOf( (sal_Int32)nState );
         DataChanged( SotExchange::GetFormatName(
-                        SvxLinkManager::RegisterStatusInfoId()), aAny );
+                        sfx2::LinkManager::RegisterStatusInfoId()), aAny );
         bStateChangeCalled = TRUE;
     }
 }
diff --git a/svx/source/svxlink/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 476977cbc4..98fa3ae622 100644
--- a/svx/source/svxlink/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fileobj.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 #include <tools/string.hxx>
 #include <sfx2/linksrc.hxx>
 #include <sfx2/docfile.hxx>
-#include "linkmgr.hxx"
+#include <sfx2/linkmgr.hxx>
 
 class Graphic;
 struct Impl_DownLoadData;
@@ -65,7 +62,7 @@ class SvFileObject : public sfx2::SvLinkSource
 
     BOOL GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
     BOOL LoadFile_Impl();
-    void SendStateChg_Impl( LinkState nState );
+    void SendStateChg_Impl( sfx2::LinkManager::LinkState nState );
 
     DECL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef* );
     DECL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void* );
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index d17d126ce9..76b58f1048 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fwkhelper.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index 3af1175a6b..40d43948e0 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helpdispatch.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/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index a8cfa85e42..706a67d5c3 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helpdispatch.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 981752c5d8..ced2134917 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helpinterceptor.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/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 7bc10c3139..5fe4addcb3 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helpinterceptor.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/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 9c2a7996e3..07bae5d8d7 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/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.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 4c0ef295c0..2885f60bb9 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imestatuswindow.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/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index b26a1c9075..cbfe2c4748 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imestatuswindow.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/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index a74e9def57..8db6fb93dd 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impldde.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/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 65792f9f0e..eab554c46d 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impldde.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 4306340dfc..4511e428e5 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linkmgr2.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,37 +28,54 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-
-#include <tools/debug.hxx>
 #include <sfx2/linkmgr.hxx>
-
+#include <com/sun/star/document/UpdateDocMode.hpp>
+#include <sfx2/objsh.hxx>
+#include <svl/urihelper.hxx>
+#include <sot/formats.hxx>
+#include <tools/urlobj.hxx>
+#include <sot/exchange.hxx>
+#include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/lnkbase.hxx>
-//#include <sfx2/linksrc.hxx>
+#include <sfx2/app.hxx>
+#include <vcl/graph.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <unotools/localfilehelper.hxx>
+#include <i18npool/mslangid.hxx>
+#include <sfx2/request.hxx>
+
+#include "fileobj.hxx"
 #include "impldde.hxx"
-//#include "svuidlg.hrc"
-//#include "iface.hxx"
-
 #include "app.hrc"
 #include "sfxresid.hxx"
 
 #define _SVSTDARR_STRINGSDTOR
-
 #include <svl/svstdarr.hxx>
 
-
 namespace sfx2
 {
 
+class SvxInternalLink : public sfx2::SvLinkSource
+{
+public:
+    SvxInternalLink() {}
+
+    virtual BOOL Connect( sfx2::SvBaseLink* );
+};
+
+
 SV_IMPL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr )
 
-SvLinkManager::SvLinkManager()
-    : pPersist( 0 )
+LinkManager::LinkManager(SfxObjectShell* p)
+    : pPersist( p )
 {
 }
 
 
-SvLinkManager::~SvLinkManager()
+LinkManager::~LinkManager()
 {
     SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData();
     for( USHORT n = aLinkTbl.Count(); n; --n, ++ppRef )
@@ -77,12 +91,12 @@ SvLinkManager::~SvLinkManager()
 
 
 /************************************************************************
-|*    SvLinkManager::Remove()
+|*    LinkManager::Remove()
 |*
 |*    Beschreibung
 *************************************************************************/
 
-void SvLinkManager::Remove( SvBaseLink *pLink )
+void LinkManager::Remove( SvBaseLink *pLink )
 {
     // keine Links doppelt einfuegen
     int bFound = FALSE;
@@ -110,7 +124,7 @@ void SvLinkManager::Remove( SvBaseLink *pLink )
 }
 
 
-void SvLinkManager::Remove( USHORT nPos, USHORT nCnt )
+void LinkManager::Remove( USHORT nPos, USHORT nCnt )
 {
     if( nCnt && nPos < aLinkTbl.Count() )
     {
@@ -132,7 +146,7 @@ void SvLinkManager::Remove( USHORT nPos, USHORT nCnt )
 }
 
 
-BOOL SvLinkManager::Insert( SvBaseLink* pLink )
+BOOL LinkManager::Insert( SvBaseLink* pLink )
 {
     // keine Links doppelt einfuegen
     for( USHORT n = 0; n < aLinkTbl.Count(); ++n )
@@ -152,7 +166,7 @@ BOOL SvLinkManager::Insert( SvBaseLink* pLink )
 }
 
 
-BOOL SvLinkManager::InsertLink( SvBaseLink * pLink,
+BOOL LinkManager::InsertLink( SvBaseLink * pLink,
                                 USHORT nObjType,
                                 USHORT nUpdateMode,
                                 const String* pName )
@@ -166,7 +180,7 @@ BOOL SvLinkManager::InsertLink( SvBaseLink * pLink,
 }
 
 
-BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink,
+BOOL LinkManager::InsertDDELink( SvBaseLink * pLink,
                                     const String& rServer,
                                     const String& rTopic,
                                     const String& rItem )
@@ -183,7 +197,7 @@ BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink,
 }
 
 
-BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink )
+BOOL LinkManager::InsertDDELink( SvBaseLink * pLink )
 {
     DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
@@ -197,34 +211,70 @@ BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink )
 
 
 // erfrage die Strings fuer den Dialog
-BOOL SvLinkManager::GetDisplayNames( const SvBaseLink * pLink,
+BOOL LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                                         String* pType,
                                         String* pFile,
                                         String* pLinkStr,
-                                        String* /*pFilter*/ ) const
+                                        String* pFilter ) const
 {
     BOOL bRet = FALSE;
-    String aLN = pLink->GetLinkSourceName();
-    if( aLN.Len() != 0 && pLink->GetObjType() == OBJECT_CLIENT_DDE )
+    const String sLNm( pLink->GetLinkSourceName() );
+    if( sLNm.Len() )
     {
-        USHORT nTmp = 0;
-        String sCmd( aLN );
-        String sServer( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
-        String sTopic( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
-
-        if( pType )
-            *pType = sServer;
-        if( pFile )
-            *pFile = sTopic;
-        if( pLinkStr )
-            *pLinkStr = sCmd.Copy( nTmp );
-        bRet = TRUE;
+        switch( pLink->GetObjType() )
+        {
+            case OBJECT_CLIENT_FILE:
+            case OBJECT_CLIENT_GRF:
+            case OBJECT_CLIENT_OLE:
+                {
+                    USHORT nPos = 0;
+                    String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
+                    String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
+
+                    if( pFile )
+                        *pFile = sFile;
+                    if( pLinkStr )
+                        *pLinkStr = sRange;
+                    if( pFilter )
+                        *pFilter = sLNm.Copy( nPos );
+
+                    if( pType )
+                    {
+                        sal_uInt16 nObjType = pLink->GetObjType();
+                        *pType = String( SfxResId(
+                                    ( OBJECT_CLIENT_FILE == nObjType || OBJECT_CLIENT_OLE == nObjType )
+                                            ? RID_SVXSTR_FILELINK
+                                            : RID_SVXSTR_GRAFIKLINK ));
+                    }
+                    bRet = TRUE;
+                }
+                break;
+            case OBJECT_CLIENT_DDE:
+                {
+                    USHORT nTmp = 0;
+                    String sCmd( sLNm );
+                    String sServer( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
+                    String sTopic( sCmd.GetToken( 0, cTokenSeperator, nTmp ) );
+
+                    if( pType )
+                        *pType = sServer;
+                    if( pFile )
+                        *pFile = sTopic;
+                    if( pLinkStr )
+                        *pLinkStr = sCmd.Copy( nTmp );
+                    bRet = TRUE;
+                }
+                break;
+            default:
+                break;
+        }
     }
+    
     return bRet;
 }
 
 
-void SvLinkManager::UpdateAllLinks( 
+void LinkManager::UpdateAllLinks( 
     BOOL bAskUpdate, 
     BOOL /*bCallErrHdl*/,
     BOOL bUpdateGrfLinks, 
@@ -287,14 +337,24 @@ void SvLinkManager::UpdateAllLinks(
 |*    Beschreibung
 *************************************************************************/
 
-SvLinkSourceRef SvLinkManager::CreateObj( SvBaseLink * pLink )
+SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
 {
-    if( OBJECT_CLIENT_DDE == pLink->GetObjType() )
-        return new SvDDEObject();
-    return SvLinkSourceRef();
+    switch( pLink->GetObjType() )
+    {
+        case OBJECT_CLIENT_FILE:
+        case OBJECT_CLIENT_GRF:
+        case OBJECT_CLIENT_OLE:
+            return new SvFileObject;
+        case OBJECT_INTERN:
+            return new SvxInternalLink;
+        case OBJECT_CLIENT_DDE:
+            return new SvDDEObject;
+        default:
+            return SvLinkSourceRef();
+       }
 }
 
-BOOL SvLinkManager::InsertServer( SvLinkSource* pObj )
+BOOL LinkManager::InsertServer( SvLinkSource* pObj )
 {
     // keine doppelt einfuegen
     if( !pObj || USHRT_MAX != aServerTbl.GetPos( pObj ) )
@@ -305,7 +365,7 @@ BOOL SvLinkManager::InsertServer( SvLinkSource* pObj )
 }
 
 
-void SvLinkManager::RemoveServer( SvLinkSource* pObj )
+void LinkManager::RemoveServer( SvLinkSource* pObj )
 {
     USHORT nPos = aServerTbl.GetPos( pObj );
     if( USHRT_MAX != nPos )
@@ -327,6 +387,259 @@ void MakeLnkName( String& rName, const String* pType, const String& rFile,
         ((rName += cTokenSeperator ) += *pFilter).EraseLeadingChars().EraseTrailingChars();
 }
 
+BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
+                                    USHORT nFileType,
+                                    const String& rFileNm,
+                                    const String* pFilterNm,
+                                    const String* pRange )
+{
+    if( !( OBJECT_CLIENT_SO & rLink.GetObjType() ))
+        return FALSE;
+
+    String sCmd( rFileNm );
+    sCmd += ::sfx2::cTokenSeperator;
+    if( pRange )
+        sCmd += *pRange;
+    if( pFilterNm )
+        ( sCmd += ::sfx2::cTokenSeperator ) += *pFilterNm;
+
+    return InsertLink( &rLink, nFileType, sfx2::LINKUPDATE_ONCALL, &sCmd );
+}
+
+BOOL LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
+{
+    if( OBJECT_CLIENT_FILE == ( OBJECT_CLIENT_FILE & rLink.GetObjType() ))
+        return InsertLink( &rLink, rLink.GetObjType(), sfx2::LINKUPDATE_ONCALL );
+    return FALSE;
+}
+
+// eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
+// (ist zur Zeit nur fuer die FileLinks interressant!)
+void LinkManager::CancelTransfers()
+{
+    SvFileObject* pFileObj;
+    sfx2::SvBaseLink* pLnk;
+
+    const sfx2::SvBaseLinks& rLnks = GetLinks();
+    for( USHORT n = rLnks.Count(); n; )
+        if( 0 != ( pLnk = &(*rLnks[ --n ])) &&
+            OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
+            0 != ( pFileObj = (SvFileObject*)pLnk->GetObj() ) )
+//			0 != ( pFileObj = (SvFileObject*)SvFileObject::ClassFactory()->
+//									CastAndAddRef( pLnk->GetObj() )) )
+            pFileObj->CancelTransfers();
+}
+
+void LinkManager::SetTransferPriority( sfx2::SvBaseLink& /*rLink*/, USHORT /*nPrio*/ )
+{
+//	SvFileObject* pFileObj =
+//		(SvFileObject*)SvFileObject::ClassFactory()->
+//									CastAndAddRef( rLink.GetObj() );
+//			OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & rLink.GetObjType()) ?
+//				(SvFileObject*)rLink.GetObj() : 0;
+}
+
+
+    // um Status Informationen aus dem FileObject an den BaseLink zu
+    // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
+    // dann die entsprechenden Informationen als String.
+    // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
+    // - das braucht Informationen ueber Load/Abort/Error
+ULONG LinkManager::RegisterStatusInfoId()
+{
+    static ULONG nFormat = 0;
+
+    if( !nFormat )
+    {
+// wie sieht die neue Schnittstelle aus?
+//		nFormat = Exchange::RegisterFormatName( "StatusInfo vom SvxInternalLink" );
+        nFormat = SotExchange::RegisterFormatName(
+                    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
+                                "StatusInfo vom SvxInternalLink" )));
+    }
+    return nFormat;
+}
+
+// ----------------------------------------------------------------------
+
+BOOL LinkManager::GetGraphicFromAny( const String& rMimeType,
+                                const ::com::sun::star::uno::Any & rValue,
+                                Graphic& rGrf )
+{
+    BOOL bRet = FALSE;
+    ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
+    if( rValue.hasValue() && ( rValue >>= aSeq ) )
+    {
+        SvMemoryStream aMemStm( (void*)aSeq.getConstArray(), aSeq.getLength(),
+                                STREAM_READ );
+        aMemStm.Seek( 0 );
+
+        switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
+        {
+        case SOT_FORMATSTR_ID_SVXB:
+            {
+                aMemStm >> rGrf;
+                bRet = TRUE;
+            }
+            break;
+        case FORMAT_GDIMETAFILE:
+            {
+                GDIMetaFile aMtf;
+                aMtf.Read( aMemStm );
+                rGrf = aMtf;
+                bRet = TRUE;
+            }
+            break;
+        case FORMAT_BITMAP:
+            {
+                Bitmap aBmp;
+                aMemStm >> aBmp;
+                rGrf = aBmp;
+                bRet = TRUE;
+            }
+            break;
+        }
+    }
+    return bRet;
+}
+
+
+// ----------------------------------------------------------------------
+String lcl_DDE_RelToAbs( const String& rTopic, const String& rBaseURL )
+{
+    String sRet;
+    INetURLObject aURL( rTopic );
+    if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
+        utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rBaseURL, sRet );
+    if( !sRet.Len() )
+        sRet = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), rTopic, URIHelper::GetMaybeFileHdl(), true );
+    return sRet;
+}
+
+BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
+{
+    SfxObjectShell* pFndShell = 0;
+    USHORT nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
+    String sTopic, sItem, sReferer;
+    if( pLink->GetLinkManager() &&
+        pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sTopic, &sItem )
+        && sTopic.Len() )
+    {
+        // erstmal nur ueber die DocumentShells laufen und die mit dem
+        // Namen heraussuchen:
+
+        com::sun::star::lang::Locale aLocale;
+        MsLangId::convertLanguageToLocale( LANGUAGE_SYSTEM, aLocale );
+        CharClass aCC( aLocale );
+        
+        String sNm( sTopic ), sTmp;
+        aCC.toLower( sNm );
+
+        TypeId aType( TYPE(SfxObjectShell) );
+
+        BOOL bFirst = TRUE;
+        SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
+        if( pShell && pShell->GetMedium() )
+        {
+            sReferer = pShell->GetMedium()->GetBaseURL();
+            SFX_ITEMSET_ARG( pShell->GetMedium()->GetItemSet(), pItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False );
+            if ( pItem )
+                nUpdateMode = pItem->GetValue();
+        }
+
+        String sNmURL( lcl_DDE_RelToAbs( sTopic, sReferer ) );
+        aCC.toLower( sNmURL );
+
+        if ( !pShell )
+        {
+            bFirst = FALSE;
+            pShell = SfxObjectShell::GetFirst( &aType, sal_False );
+        }
+
+        while( pShell )
+        {
+            if( !sTmp.Len() )
+            {
+                sTmp = pShell->GetTitle( SFX_TITLE_FULLNAME );
+                sTmp = lcl_DDE_RelToAbs(sTmp, sReferer );
+            }
+
+
+            aCC.toLower( sTmp );
+            if( sTmp == sNmURL )		// die wollen wir haben
+            {
+                pFndShell = pShell;
+                break;
+            }
+
+            if( bFirst )
+            {
+                bFirst = FALSE;
+                pShell = SfxObjectShell::GetFirst( &aType, sal_False );
+            }
+            else
+                pShell = SfxObjectShell::GetNext( *pShell, &aType, sal_False );
+
+            sTmp.Erase();
+        }
+    }
+
+    // empty topics are not allowed - which document is it
+    if( !sTopic.Len() )
+        return FALSE;
+
+    if( !pFndShell )
+    {
+        // dann versuche die Datei zu laden:
+        INetURLObject aURL( sTopic );
+        INetProtocol eOld = aURL.GetProtocol();
+        aURL.SetURL( sTopic = lcl_DDE_RelToAbs( sTopic, sReferer ) );
+        if( INET_PROT_NOT_VALID != eOld ||
+            INET_PROT_HTTP != aURL.GetProtocol() )
+        {
+            SfxStringItem aName( SID_FILE_NAME, sTopic );
+            SfxBoolItem aMinimized(SID_MINIMIZED, TRUE);
+            SfxBoolItem aHidden(SID_HIDDEN, TRUE);
+            SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+            SfxStringItem aReferer( SID_REFERER, sReferer );
+            SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode );
+            SfxBoolItem aReadOnly(SID_DOC_READONLY, TRUE);
+
+            // #i14200# (DDE-link crashes wordprocessor)
+            SfxAllItemSet aArgs( SFX_APP()->GetPool() );
+            aArgs.Put(aReferer);
+            aArgs.Put(aTarget);
+            aArgs.Put(aHidden);
+            aArgs.Put(aMinimized);
+            aArgs.Put(aName);
+            aArgs.Put(aUpdate);
+            aArgs.Put(aReadOnly);
+            pFndShell = SfxObjectShell::CreateAndLoadObject( aArgs );
+        }
+    }
+
+    BOOL bRet = FALSE;
+    if( pFndShell )
+    {
+        sfx2::SvLinkSource* pNewSrc = pFndShell->DdeCreateLinkSource( sItem );
+        if( pNewSrc )
+        {
+            bRet = TRUE;
+
+            ::com::sun::star::datatransfer::DataFlavor aFl;
+            SotExchange::GetFormatDataFlavor( pLink->GetContentType(), aFl );
+
+            pLink->SetObj( pNewSrc );
+            pNewSrc->AddDataAdvise( pLink, aFl.MimeType,
+                                sfx2::LINKUPDATE_ONCALL == pLink->GetUpdateMode()
+                                    ? ADVISEMODE_ONLYONCE
+                                    : 0 );
+        }
+    }
+    return bRet;
+}
+
+
 }
 
 
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index f3565bdb55..01503faee9 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linksrc.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 9b7a92fff0..ea8a803418 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lnkbase2.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,19 +34,12 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/msgbox.hxx>
-
 #include <sfx2/linkmgr.hxx>
-//#include "svuidlg.hrc"
-//#include "iface.hxx"
 #include <vcl/svapp.hxx>
-//#include <soerr.hxx>
-
 #include "app.hrc"
 #include "sfxresid.hxx"
 #include <sfx2/filedlghelper.hxx>
-
 #include <tools/debug.hxx>
-
 #include <svl/svdde.hxx>
 
 using namespace ::com::sun::star::uno;
@@ -66,7 +56,7 @@ class  ImplDdeItem;
 struct BaseLink_Impl
 {
     Link                m_aEndEditLink;
-    SvLinkManager*      m_pLinkMgr;
+    LinkManager*      m_pLinkMgr;
     Window*             m_pParentWin;
     FileDialogHelper*   m_pFileDlg;
     bool                m_bIsConnect;
@@ -472,17 +462,17 @@ BOOL SvBaseLink::SetContentType( ULONG nType )
     return FALSE;
 }
 
-SvLinkManager* SvBaseLink::GetLinkManager()
+LinkManager* SvBaseLink::GetLinkManager()
 {
     return pImpl->m_pLinkMgr;
 }
 
-const SvLinkManager* SvBaseLink::GetLinkManager() const
+const LinkManager* SvBaseLink::GetLinkManager() const
 {
     return pImpl->m_pLinkMgr;
 }
 
-void SvBaseLink::SetLinkManager( SvLinkManager* _pMgr )
+void SvBaseLink::SetLinkManager( LinkManager* _pMgr )
 {
     pImpl->m_pLinkMgr = _pMgr;
 }
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
index 48d1258e28..72ac94a9b3 100644
--- a/sfx2/source/appl/makefile.mk
+++ b/sfx2/source/appl/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.56 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -93,6 +89,7 @@ SFX_OBJECTS = \
     $(SLO)$/appuno.obj \
     $(SLO)$/appbaslib.obj \
     $(SLO)$/childwin.obj \
+    $(SLO)$/fileobj.obj			\
     $(SLO)$/helpdispatch.obj \
     $(SLO)$/helpinterceptor.obj \
     $(SLO)$/imagemgr.obj\
@@ -103,6 +100,7 @@ SFX_OBJECTS = \
         $(SLO)$/lnkbase2.obj \
     $(SLO)$/module.obj \
     $(SLO)$/newhelp.obj \
+    $(SLO)$/opengrf.obj			\
     $(SLO)$/sfxdll.obj \
     $(SLO)$/sfxhelp.obj \
     $(SLO)$/sfxpicklist.obj \
@@ -143,8 +141,10 @@ EXCEPTIONSFILES=\
     $(SLO)$/appmisc.obj			\
     $(SLO)$/appinit.obj			\
     $(SLO)$/appcfg.obj			\
+    $(SLO)$/fileobj.obj			\
     $(SLO)$/helpinterceptor.obj	\
     $(SLO)$/newhelp.obj			\
+    $(SLO)$/opengrf.obj			\
     $(SLO)$/sfxhelp.obj			\
     $(SLO)$/shutdownicon.obj	\
     $(SLO)$/shutdowniconw32.obj \
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index a25f25c01f..e56a5e561c 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/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.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,6 +48,7 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <svl/intitem.hxx>
 
 #define SfxModule
 #include "sfxslots.hxx"
@@ -411,3 +409,29 @@ SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame )
         pSh = pFrame->GetObjectShell();
     return pSh ? pSh->GetModule() : 0;
 }
+
+FieldUnit SfxModule::GetCurrentFieldUnit()
+{
+    FieldUnit eUnit = FUNIT_INCH;
+    SfxModule* pModule = GetActiveModule();
+    if ( pModule )
+    {
+        const SfxPoolItem* pItem = pModule->GetItem( SID_ATTR_METRIC );
+        DBG_ASSERT( pItem, "GetFieldUnit(): no item" );
+        if ( pItem )
+            eUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue();
+    }
+    else
+        DBG_ERRORFILE( "GetModuleFieldUnit(): no module found" );
+    return eUnit;
+}
+
+FieldUnit SfxModule::GetFieldUnit() const
+{
+    FieldUnit eUnit = FUNIT_INCH;
+    const SfxPoolItem* pItem = GetItem( SID_ATTR_METRIC );
+    DBG_ASSERT( pItem, "GetFieldUnit(): no item" );
+    if ( pItem )
+        eUnit = (FieldUnit)( (SfxUInt16Item*)pItem )->GetValue();
+    return eUnit;
+}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5b073ab83c..ecf471ce68 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newhelp.cxx,v $
- * $Revision: 1.130 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc
index 7bfc1e3f2d..d6c179a45b 100644
--- a/sfx2/source/appl/newhelp.hrc
+++ b/sfx2/source/appl/newhelp.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: newhelp.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/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index a36e45f0c5..1e0b83c2c5 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newhelp.hxx,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/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 5dbd8033b1..cb89ed9231 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.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: newhelp.src,v $
- * $Revision: 1.97 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 6ca40f2486..5e05ff45aa 100644
--- a/svx/source/dialog/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opengrf.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_sfx2.hxx"
+
 #include <tools/urlobj.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -47,24 +45,16 @@
 #include <com/sun/star/ui/dialogs/XFilePreview.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <svl/urihelper.hxx>
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
-#endif
 #include <svtools/transfer.hxx>
-#include <svx/svdograf.hxx>
 #include <sot/formats.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svx/dialmgr.hxx>
-#include "opengrf.hxx"
-
-#include <svx/dialogs.hrc>
-#include "impgrf.hrc"
-
+#include <sfx2/opengrf.hxx>
+#include "app.hrc"
+#include "sfxresid.hxx"
 
 //-----------------------------------------------------------------------------
 
@@ -126,8 +116,6 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog()
 }
 
 
-GraphicFilter* GetGrfFilter();
-
 short SvxOpenGraphicDialog::Execute()
 {
     USHORT 	nImpRet;
@@ -138,7 +126,7 @@ short SvxOpenGraphicDialog::Execute()
     {
         if( GetPath().Len() )
         {
-            GraphicFilter*	pFilter = GetGrfFilter();
+            GraphicFilter*	pFilter = GraphicFilter::GetGraphicFilter();
             INetURLObject aObj( GetPath() );
 
             // check whether we can load the graphic
@@ -180,7 +168,7 @@ short SvxOpenGraphicDialog::Execute()
             // could not load?
             if ( nFound == USHRT_MAX )
             {
-                WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, SVX_RESSTR( SvxOpenGrfErr2ResId(nImpRet) ) );
+                WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, String( SfxResId( SvxOpenGrfErr2ResId(nImpRet) ) ) );
                 bQuitLoop = aWarningBox.Execute()==RET_RETRY ? FALSE : TRUE;
             }
             else
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index 9a07e1dcea..2f1afe28b8 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: panelist.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index 1fabfa52fa..6802197ee2 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.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: sfx.src,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/sfx2/source/appl/sfxdll.cxx b/sfx2/source/appl/sfxdll.cxx
index 1d788dba42..3635770b38 100644
--- a/sfx2/source/appl/sfxdll.cxx
+++ b/sfx2/source/appl/sfxdll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxdll.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/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 32a7b1490c..cd163bc058 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -1,14 +1,11 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxhelp.cxx,v $
- * $Revision: 1.82.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,9 +35,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
@@ -60,13 +55,11 @@
 #include <tools/urlobj.hxx>
 #include <unotools/configmgr.hxx>
 #include <ucbhelper/content.hxx>
-
 #include <unotools/pathoptions.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
 #include <unotools/bootstrap.hxx>
-
 #include <rtl/uri.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/ehdl.hxx>
@@ -76,16 +69,13 @@
 #define _SVSTDARR_ULONGSSORT
 #include <svl/svstdarr.hxx>
 
-#include <sfx2/sfxsids.hrc>
-#include <sfx2/app.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/msgpool.hxx>
 #include "newhelp.hxx"
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
 #include "sfxresid.hxx"
 #include "helper.hxx"
 #include "app.hrc"
+#include <sfx2/sfxuno.hxx>
+#include <vcl/svapp.hxx>
+#include <sfx2/frame.hxx>
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -132,7 +122,8 @@ rtl::OUString HelpLocaleString()
         Any aLocale =
             ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty(
                ::utl::ConfigManager::LOCALE );
-        bool bOk = (aLocale >>= aLocaleStr);
+        aLocale >>= aLocaleStr;
+        bool bOk = aLocaleStr.getLength() != 0;
         if ( bOk )
         {
             rtl::OUString aBaseInstallPath;
@@ -967,26 +958,39 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN
     return aURL;
 }
 
-void SfxHelp::OpenHelpAgent( SfxFrame *pFrame, ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId )
 {
-    if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
-    {
         SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
         if ( pHelp )
-        {
-            SfxHelpOptions_Impl *pOpt = pHelp->pImp->GetOptions();
+            pHelp->OpenHelpAgent( nHelpId );
+}
+
+void SfxHelp::OpenHelpAgent( ULONG nHelpId )
+{
+    if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
+    {
+//		SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
+//		if ( pHelp )
+//		{
+            SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
             if ( !pOpt->HasId( nHelpId ) )
                 return;
 
             try
             {
                 URL aURL;
-                aURL.Complete = pHelp->CreateHelpURL_Impl( nHelpId, pHelp->GetHelpModuleName_Impl() );
+                aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() );
                 Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
                     ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY );
                 xTrans->parseStrict(aURL);
 
-                Reference< XDispatchProvider > xDispProv( pFrame->GetTopFrame().GetFrameInterface(), UNO_QUERY );
+                Reference < XFrame > xCurrentFrame;
+                Reference < XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
+                    DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
+                if ( xDesktop.is() )
+                    xCurrentFrame = xDesktop->getCurrentFrame();
+
+                Reference< XDispatchProvider > xDispProv( xCurrentFrame, UNO_QUERY );
                 Reference< XDispatch > xHelpDispatch;
                 if ( xDispProv.is() )
                     xHelpDispatch = xDispProv->queryDispatch(
@@ -1001,7 +1005,7 @@ void SfxHelp::OpenHelpAgent( SfxFrame *pFrame, ULONG nHelpId )
             {
                 DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
             }
-        }
+//		}
     }
 }
 
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index fd75cc04e3..af3f346b2b 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxpicklist.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/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 985af75b1f..5eb2d3df79 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shutdownicon.cxx,v $
- * $Revision: 1.64 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx
index d4876acb5d..a4595949b1 100644
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ b/sfx2/source/appl/shutdowniconOs2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shutdowniconOs2.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/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 27aa37e05c..14f12c79b5 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.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: shutdowniconaqua.mm,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 80df524dbe..e9e5ba6123 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shutdowniconw32.cxx,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 2737b019c3..89b52ac0c6 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: workwin.cxx,v $
- * $Revision: 1.75 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 128374225b..52798f01f5 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xpackcreator.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/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx
index 5fb195a838..ea8bcc647d 100644
--- a/sfx2/source/appl/xpackcreator.hxx
+++ b/sfx2/source/appl/xpackcreator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xpackcreator.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
index d8d1fd95fe..36e304715b 100644
--- a/sfx2/source/bastyp/bastyp.hrc
+++ b/sfx2/source/bastyp/bastyp.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: bastyp.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/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src
index 63f5a3e742..3000584403 100644
--- a/sfx2/source/bastyp/bastyp.src
+++ b/sfx2/source/bastyp/bastyp.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: bastyp.src,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/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 34aa3efdf8..f304291eaa 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bitset.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/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 80a0652524..c42e49d49e 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltfnc.cxx,v $
- * $Revision: 1.79 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src
index a95d246e91..a22ef47379 100644
--- a/sfx2/source/bastyp/fltfnc.src
+++ b/sfx2/source/bastyp/fltfnc.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: fltfnc.src,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 0ec1bd03f8..bb830f9926 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltlst.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/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 797562bc54..dc802419ca 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltlst.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/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index bae22d228f..1ea0c00aeb 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmhtml.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 5371f0697d..bb5cd5cc01 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmhtmlw.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/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 80ac52b902..0b698070da 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/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.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -552,9 +549,17 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
             }
         }
     }
-    catch( uno::Exception& )
-    {
-        DBG_ERRORFILE( "GetResultSet: Any other exception" );
+    catch( uno::Exception& e )
+    {
+        (void) e;
+        DBG_ERRORFILE(
+            rtl::OUStringToOString(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "GetResultSet: Any other exception: ")) +
+                 e.Message),
+                RTL_TEXTENCODING_UTF8).
+            getStr());
     }
 
     if ( pList )
diff --git a/sfx2/source/bastyp/makefile.mk b/sfx2/source/bastyp/makefile.mk
index 926107a6e9..75c0cace40 100644
--- a/sfx2/source/bastyp/makefile.mk
+++ b/sfx2/source/bastyp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index b21c8771a6..5f1aed0c73 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mieclip.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/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 592e20f15b..3fa4ddf68e 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minarray.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/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index 8b7482d955..822d337797 100644
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: misc.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/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index e354c80f5f..9fd7a95a3c 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/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.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 59c25f1910..eb73fee75a 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxhtml.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -357,40 +354,6 @@ IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG )
     return 0;
 }
 
-rtl_TextEncoding SfxHTMLParser::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 = SfxHTMLParser::GetEncodingByMIME( aKV.GetValue() );
-                }
-            }
-        }
-    }
-    return eRet;
-}
-
-BOOL SfxHTMLParser::SetEncodingByHTTPHeader(
-                                SvKeyValueIterator *pHTTPHeader )
-{
-    BOOL bRet = FALSE;
-    rtl_TextEncoding eEnc = SfxHTMLParser::GetEncodingByHttpHeader( pHTTPHeader );
-    if(RTL_TEXTENCODING_DONTKNOW != eEnc)
-    {
-        SetSrcEncoding( eEnc );
-        bRet = TRUE;
-    }
-    return bRet;
-}
-
 void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
 {
     aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_JAVASCRIPT);
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 0e1447945f..471f75294a 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxresid.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/sfx2/source/config/config.hrc b/sfx2/source/config/config.hrc
index 156bc72999..ef4e36f6b4 100644
--- a/sfx2/source/config/config.hrc
+++ b/sfx2/source/config/config.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: config.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/sfx2/source/config/config.src b/sfx2/source/config/config.src
index cbd3bbf3ad..8aea35b874 100644
--- a/sfx2/source/config/config.src
+++ b/sfx2/source/config/config.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: config.src,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/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 385260dce6..13b1bda03c 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: evntconf.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/config/makefile.mk b/sfx2/source/config/makefile.mk
index cf2e07e0b5..d090babd15 100644
--- a/sfx2/source/config/makefile.mk
+++ b/sfx2/source/config/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index b5f6735a99..ef0c1e80c3 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bindings.cxx,v $
- * $Revision: 1.53.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index a4fe8e70db..99dd04f3d4 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ctrlitem.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/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index ec8d306fb5..2549af2a6a 100644..100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dispatch.cxx,v $
- * $Revision: 1.56.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -3171,3 +3168,14 @@ sal_uInt32 SfxDispatcher::GetDisableFlags() const
     return pImp->nDisableFlags;
 }
 
+SfxModule* SfxDispatcher::GetModule() const
+{
+    for ( sal_uInt16 nShell = 0;; ++nShell )
+    {
+        SfxShell *pSh = GetShell(nShell);
+        if ( pSh == NULL )
+            return 0;
+        if ( pSh->ISA(SfxModule) )
+            return (SfxModule*) pSh;
+    }
+}
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index baee95519f..d3a5604307 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macrconf.cxx,v $
- * $Revision: 1.25.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 2afd8d6d55..da904d4a20 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macro.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/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk
index 9d936549b5..86797589e3 100644
--- a/sfx2/source/control/makefile.mk
+++ b/sfx2/source/control/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.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,7 +64,6 @@ SLOFILES = \
         $(SLO)$/sfxstatuslistener.obj \
     $(SLO)$/shell.obj \
     $(SLO)$/sorgitm.obj \
-    $(SLO)$/srchitem.obj \
     $(SLO)$/statcach.obj \
         $(SLO)$/unoctitm.obj
 
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index fa940283e1..a998e85584 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: minfitem.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/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 46e961b71d..95ab30d49e 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msg.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/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 33c78f2e0d..e6b11ada9b 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msgpool.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/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index cf8d66f448..687d29be79 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objface.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/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 7a66ad2a33..8fb40e460b 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: querystatus.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/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 9ece5694e8..5dd20c34f0 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: request.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/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index ee054cf1f6..67bf846dbc 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxstatuslistener.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 42f22050d1..7fabce6297 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shell.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/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index d2fe9eb43b..3a14ccc588 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sorgitm.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/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx
deleted file mode 100644
index 22b1342244..0000000000
--- a/sfx2/source/control/srchitem.cxx
+++ /dev/null
@@ -1,665 +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: srchitem.cxx,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-// include ---------------------------------------------------------------
-
-#ifndef __SBX_SBXVARIABLE_HXX
-#include <basic/sbxvar.hxx>
-#endif
-#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>
-
-#ifndef GCC
-#endif
-
-#define _SVX_SRCHITEM_CXX
-
-#include <sfx2/sfxsids.hrc>
-#define ITEMID_SEARCH	SID_SEARCH_ITEM
-#include <sfx2/srchitem.hxx>
-
-#include <sfx2/sfxuno.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( DEFINE_CONST_UNICODE("SearchWords") );
-    sal_Bool bTemp = false;
-    aAny >>= bTemp ;
-    SetWordOnly( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchCaseSensitive") );
-    aAny >>= bTemp ;
-    SetExact( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchBackwards") );
-    aAny >>= bTemp ;
-    SetBackward( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchInSelection") );
-    aAny >>= bTemp ;
-    SetSelection( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchRegularExpression") );
-    aAny >>= bTemp ;
-    SetRegExp( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarity") );
-    aAny >>= bTemp ;
-    SetLevenshtein( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarityRelax") );
-    aAny >>= bTemp ;
-    SetLEVRelaxed( bTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarityExchange") );
-    sal_Int16 nTemp = 0;
-    aAny >>= nTemp ;
-    SetLEVOther( nTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarityRemove") );
-    aAny >>= nTemp ;
-    SetLEVShorter( nTemp );
-    aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("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( DEFINE_CONST_UNICODE("SearchWords"), aAny );
-    aAny <<= GetExact() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchCaseSensitive"), aAny );
-    aAny <<= GetBackward() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchBackwards"), aAny );
-    aAny <<= GetSelection() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchInSelection"), aAny );
-    aAny <<= GetRegExp() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchRegularExpression"), aAny );
-    aAny <<= IsLevenshtein() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarity"), aAny );
-    aAny <<= IsLEVRelaxed() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarityRelax"), aAny );
-    aAny <<= GetLEVOther() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarityExchange"), aAny );
-    aAny <<= GetLEVShorter() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("SearchSimilarityRemove"), aAny );
-    aAny <<= GetLEVLonger() ;
-    rDescr->setPropertyValue( DEFINE_CONST_UNICODE("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/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 0ab6f3532d..3c4d89f801 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statcach.cxx,v $
- * $Revision: 1.36.180.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 030d342f6d..8159fc8430 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoctitm.cxx,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index bae0b9c171..770de189b4 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: about.cxx,v $
- * $Revision: 1.41.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index f7f3f7b14e..ac65fa0300 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: alienwarn.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc
index fb00a3cb2f..f4778f4700 100644
--- a/sfx2/source/dialog/alienwarn.hrc
+++ b/sfx2/source/dialog/alienwarn.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: alienwarn.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/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index 9be25ff919..1d3bd34c44 100644
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.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: alienwarn.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/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index bdb0b08bb2..c96fa7008b 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basedlgs.cxx,v $
- * $Revision: 1.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 1d0e4c9066..9bf64ae1e7 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialog.hrc,v $
- * $Revision: 1.32.70.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index c50b17436c..7f0aec0106 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialog.src,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e5b555d977..e1d0307af7 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dinfdlg.cxx,v $
- * $Revision: 1.43.42.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index 6f3be56b59..e91c8fb6eb 100644
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.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: dinfdlg.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/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 429124b9bf..84a5b55ba3 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.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: dinfdlg.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/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 5cc3da113b..bf91cb091d 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dinfedt.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/sfx2/source/dialog/dinfedt.hrc b/sfx2/source/dialog/dinfedt.hrc
index 46daa159cb..3df1dcd845 100644
--- a/sfx2/source/dialog/dinfedt.hrc
+++ b/sfx2/source/dialog/dinfedt.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: dinfedt.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/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src
index 234c91fe3d..ebc18731f7 100644
--- a/sfx2/source/dialog/dinfedt.src
+++ b/sfx2/source/dialog/dinfedt.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: dinfedt.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/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 0793554c14..c090ccc532 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/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.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 850878c42f..5ca70ef53e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filedlghelper.cxx,v $
- * $Revision: 1.144 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src
index ef5bd04e83..2b071a2f78 100644
--- a/sfx2/source/dialog/filedlghelper.src
+++ b/sfx2/source/dialog/filedlghelper.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: filedlghelper.src,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/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index abcd3125a1..2d20b2eca6 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filedlgimpl.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/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 47a75137d8..3c249b2b1e 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtergrouping.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx
index f8c2acf8da..e65c64025c 100644
--- a/sfx2/source/dialog/filtergrouping.hxx
+++ b/sfx2/source/dialog/filtergrouping.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtergrouping.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/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx
index 07f20b0801..b5926fdeb6 100644
--- a/sfx2/source/dialog/intro.cxx
+++ b/sfx2/source/dialog/intro.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: intro.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/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index add294746a..7662d2c276 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemconnect.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/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index d2f47233e5..cea40e602d 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmodel.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/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index 9434c0008f..bedb057c7e 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmodelapi.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/sfx2/source/dialog/mailwindow.src b/sfx2/source/dialog/mailwindow.src
index 00e3db644e..c54d513393 100644
--- a/sfx2/source/dialog/mailwindow.src
+++ b/sfx2/source/dialog/mailwindow.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: mailwindow.src,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/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index 230bbe432a..87ef0f1a7a 100644
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.43 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5a69e4e2fe..85ead19fec 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mgetempl.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/sfx2/source/dialog/mgetempl.hrc b/sfx2/source/dialog/mgetempl.hrc
index 1d0f0e4a19..950b748a88 100644
--- a/sfx2/source/dialog/mgetempl.hrc
+++ b/sfx2/source/dialog/mgetempl.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: mgetempl.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/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 96734c30d5..49cfb04cd0 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.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: mgetempl.src,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/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 348ddc6412..4335893e30 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigat.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/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 642c87d75a..b4feb533bb 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newstyle.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/sfx2/source/dialog/newstyle.hrc b/sfx2/source/dialog/newstyle.hrc
index 5d690f7fe1..1720c39599 100644
--- a/sfx2/source/dialog/newstyle.hrc
+++ b/sfx2/source/dialog/newstyle.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: newstyle.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/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index e522dfa24e..b691c64fa7 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.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: newstyle.src,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/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 3a454d45f4..747560edba 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: partwnd.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/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 23fe8c98ba..0999ae5436 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passwd.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/sfx2/source/dialog/passwd.hrc b/sfx2/source/dialog/passwd.hrc
index 112695a1e2..7c96e131d6 100644
--- a/sfx2/source/dialog/passwd.hrc
+++ b/sfx2/source/dialog/passwd.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: passwd.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/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src
index c7fbaafcdb..b95c14cba0 100644
--- a/sfx2/source/dialog/passwd.src
+++ b/sfx2/source/dialog/passwd.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: passwd.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/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index c73874f646..b31b67127f 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printopt.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/printopt.hrc b/sfx2/source/dialog/printopt.hrc
index 86d79c0cd2..2551baf686 100644
--- a/sfx2/source/dialog/printopt.hrc
+++ b/sfx2/source/dialog/printopt.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: printopt.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/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index d1daf1b07a..d5b1602e13 100644
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.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: printopt.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/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index fc95e472a8..c38b879d5b 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recfloat.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/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 3d6d672902..f87e521a29 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.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: recfloat.src,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/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index 91e7cc3394..ee78454bad 100644..100755
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxdlg.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,5 +36,9 @@
 
 SfxAbstractDialogFactory* SfxAbstractDialogFactory::Create()
 {
-    return (SfxAbstractDialogFactory*) VclAbstractDialogFactory::Create();
+    return dynamic_cast <SfxAbstractDialogFactory*>( VclAbstractDialogFactory::Create() );
+}
+
+SfxAbstractDialogFactory::~SfxAbstractDialogFactory()
+{
 }
diff --git a/sfx2/source/dialog/sfxurl.cxx b/sfx2/source/dialog/sfxurl.cxx
index 29a8b388d8..7a0d3784ec 100644
--- a/sfx2/source/dialog/sfxurl.cxx
+++ b/sfx2/source/dialog/sfxurl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxurl.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/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 0dac077921..e1a1c9fadd 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 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/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index 1abd1ffa36..2a24ec384d 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.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/sfx2/source/dialog/srchdlg.hrc b/sfx2/source/dialog/srchdlg.hrc
index 69a15f6ac6..e5267db2ae 100644
--- a/sfx2/source/dialog/srchdlg.hrc
+++ b/sfx2/source/dialog/srchdlg.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.hrc,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/srchdlg.src b/sfx2/source/dialog/srchdlg.src
index 5008685523..aaa367b1b1 100644
--- a/sfx2/source/dialog/srchdlg.src
+++ b/sfx2/source/dialog/srchdlg.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.src,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 941e611549..6c5d9f9997 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styfitem.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/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index bedb46152b..998d912e11 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styledlg.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/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index e026d8eb94..5bb4a26fcf 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabdlg.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 9195925359..97310b04b1 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: templdlg.cxx,v $
- * $Revision: 1.58.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index f63a40fc3f..60167fda76 100644
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.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: templdlg.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/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index f1e1ba4671..6bb33ca207 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.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: templdlg.src,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/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index fa0e93d1d0..0438ef4d15 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tplcitem.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/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index 5b7a8d796a..fc67ac6646 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tplpitem.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/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index fe75d4d0c1..b291b09eb7 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: versdlg.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/sfx2/source/dialog/versdlg.hrc b/sfx2/source/dialog/versdlg.hrc
index 9c140fab6c..e39a783164 100644
--- a/sfx2/source/dialog/versdlg.hrc
+++ b/sfx2/source/dialog/versdlg.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: versdlg.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/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src
index f77f4ee3af..5e0f35cf65 100644
--- a/sfx2/source/dialog/versdlg.src
+++ b/sfx2/source/dialog/versdlg.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: versdlg.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/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 112183a4ef..bf6782ef7e 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentMetadataAccess.cxx,v $
- * $Revision: 1.1.2.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 433b2512df..f14be1db2c 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SwMetadatable.cxx,v $
- * $Revision: 1.1.2.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index ad1c4bb5c2..e4cafbe615 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: QuerySaveDocument.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/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index b3e446a34c..2a6a582ca8 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SfxDocumentMetaData.cxx,v $
- * $Revision: 1.10.32.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
index 8a98a1f8bd..05b7ffa731 100644
--- a/sfx2/source/doc/applet.cxx
+++ b/sfx2/source/doc/applet.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: applet.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/sfx2/source/doc/commitlistener.cxx b/sfx2/source/doc/commitlistener.cxx
index b29dac5962..73e0d10683 100644
--- a/sfx2/source/doc/commitlistener.cxx
+++ b/sfx2/source/doc/commitlistener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commitlistener.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/sfx2/source/doc/commitlistener.hxx b/sfx2/source/doc/commitlistener.hxx
index 503affae32..bffcd508d4 100644
--- a/sfx2/source/doc/commitlistener.hxx
+++ b/sfx2/source/doc/commitlistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: commitlistener.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/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index eba39492f3..0f6dd6b94a 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doc.hrc,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index c914d9fe29..8386febfae 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doc.src,v $
- * $Revision: 1.94 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index e67be63803..e0c75790d0 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfac.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/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e5c6b35f9e..5ce6c7cdfe 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfile.cxx,v $
- * $Revision: 1.203.50.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index d8b6d23b8d..b4ae994786 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docfilt.cxx,v $
- * $Revision: 1.23.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index d1e7203e0c..15f231795e 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docinf.cxx,v $
- * $Revision: 1.54.174.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 629c54a1dc..6866d9a718 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docinsert.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/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 8d96c08a51..613d90cb17 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docmacromode.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/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 5d3ebf483d..a1b3eb9393 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docstoragemodifylistener.cxx,v $
- * $Revision: 1.4.28.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index a0258f2e8c..ee404b98ae 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctdlg.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/sfx2/source/doc/doctdlg.hrc b/sfx2/source/doc/doctdlg.hrc
index 0a8154d65d..e01a0cfefa 100644
--- a/sfx2/source/doc/doctdlg.hrc
+++ b/sfx2/source/doc/doctdlg.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: doctdlg.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/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src
index dad236a2c5..ee878a85ca 100644
--- a/sfx2/source/doc/doctdlg.src
+++ b/sfx2/source/doc/doctdlg.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: doctdlg.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/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index bb7d15d0b5..770c4f9127 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctempl.cxx,v $
- * $Revision: 1.76 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/doctempl.src b/sfx2/source/doc/doctempl.src
index c8cf0b996f..de5e0baa40 100644
--- a/sfx2/source/doc/doctempl.src
+++ b/sfx2/source/doc/doctempl.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: doctempl.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/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index c8f7704061..72fe259c12 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctemplates.cxx,v $
- * $Revision: 1.42.84.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index 7aed8f4f72..9710df98d1 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctemplateslocal.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index 90138a891c..5b3feb30cd 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctemplateslocal.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index e93f59857f..7f93fdd43b 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docvor.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/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc
index dafc8bcb43..2009f980e5 100644
--- a/sfx2/source/doc/docvor.hrc
+++ b/sfx2/source/doc/docvor.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: docvor.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/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index 844ffe97bb..a471a42e89 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.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: docvor.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/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 2cf885323c..cffc983b88 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmdescr.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 42235cf2af..e05deb7ccf 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphhelp.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index 294fbcdb04..f5d05df95d 100644
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphhelp.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/graphhelp.src b/sfx2/source/doc/graphhelp.src
index e9a5559110..cb9555a0da 100644
--- a/sfx2/source/doc/graphhelp.src
+++ b/sfx2/source/doc/graphhelp.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: graphhelp.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/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index de934f5548..cbbed369fc 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guisaveas.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -840,8 +837,8 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
     ::rtl::OUString aAdjustToType;
 
     // bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format
-    if ( !(( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED )) && 

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

+    if ( !(( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED )) && 
+        ( bSetStandardName || GetStorable()->hasLocation() ))
     {
         uno::Sequence< beans::PropertyValue > aOldFilterProps;
         ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault(
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 071c69a77b..f8db2447cd 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iframe.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
index 66fd03175a..7da456ebaa 100644
--- a/sfx2/source/doc/makefile.mk
+++ b/sfx2/source/doc/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index bcef29a045..c5343a0b42 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: new.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/sfx2/source/doc/new.hrc b/sfx2/source/doc/new.hrc
index 37f0bd61a3..8df0a392e4 100644
--- a/sfx2/source/doc/new.hrc
+++ b/sfx2/source/doc/new.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: new.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/sfx2/source/doc/new.src b/sfx2/source/doc/new.src
index 54d5c8d77a..dc7bcac962 100644
--- a/sfx2/source/doc/new.src
+++ b/sfx2/source/doc/new.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: new.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/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 5e64168774..1fedf8da9e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objcont.cxx,v $
- * $Revision: 1.78 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -713,11 +710,8 @@ BOOL SfxObjectShell::Remove
         String aName(pMySheet->GetName());
         String aEmpty;
         SfxStyleFamily  eFamily = pMySheet->GetFamily();
-        if (pMySheet)
-        {
-            pMyPool->Remove(pMySheet);
-            bRet = TRUE;
-        }
+        pMyPool->Remove(pMySheet);
+        bRet = TRUE;
 
         SfxStyleSheetBase* pTestSheet = pMyPool->First();
         while (pTestSheet)
@@ -738,20 +732,10 @@ BOOL SfxObjectShell::Remove
 
             pTestSheet = pMyPool->Next();
         }
-        if(bRet)
-            SetModified( TRUE );
-    }
-/*
-    else if (nIdx1 == CONTENT_CONFIG)
-    {
-        if (GetConfigManager()->RemoveItem(nIdx2))
-        {
-            SetModified(TRUE);
-            bRet = TRUE;
-            SFX_APP()->GetDispatcher_Impl()->Update_Impl(TRUE);
-        }
+
+        SetModified( TRUE );
     }
-*/
+
     return bRet;
 }
 
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 530fc144d9..868f337102 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objembed.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/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 7a08e1b887..a53a985350 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objitem.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/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 90f77bfd11..3cb2177833 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objmisc.cxx,v $
- * $Revision: 1.102.104.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 45f42e8fdd..fe63ba6524 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objserv.cxx,v $
- * $Revision: 1.106 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b8bc640127..1181499f5c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objstor.cxx,v $
- * $Revision: 1.212.44.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 367325208d..ac45ef594d 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objuno.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 8ad08f7118..2298b93486 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objxtor.cxx,v $
- * $Revision: 1.85 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index c0424c2260..3a27d38879 100755
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleprops.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 7ed7655278..0fddd50de0 100755
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: oleprops.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/opostponedtruncationstream.cxx b/sfx2/source/doc/opostponedtruncationstream.cxx
index b69b54325b..364a4d5a65 100644
--- a/sfx2/source/doc/opostponedtruncationstream.cxx
+++ b/sfx2/source/doc/opostponedtruncationstream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opostponedtruncationstream.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/sfx2/source/doc/opostponedtruncationstream.hxx b/sfx2/source/doc/opostponedtruncationstream.hxx
index d44c122c6a..ce60cdf2e0 100644
--- a/sfx2/source/doc/opostponedtruncationstream.hxx
+++ b/sfx2/source/doc/opostponedtruncationstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opostponedtruncationstream.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/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 6bb9659a62..62e81893d4 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ownsubfilterservice.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 4a8a7e3d77..e8b92b7285 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: plugin.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/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index ec3491f182..b446b11777 100755
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printhelper.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index e49628ceb1..6e0e2d0fd8 100755
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printhelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index d430205a83..c0989dc055 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx
index 71f709db06..0805dd73fc 100644
--- a/sfx2/source/doc/querytemplate.hxx
+++ b/sfx2/source/doc/querytemplate.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index 45d0dc9a77..cee3bfecb8 100755..100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shutdowniconw32.cxx,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 09e6f4fdc8..7a5f630659 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxbasemodel.cxx,v $
- * $Revision: 1.139.2.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index ac7af73a8f..6f9545e244 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxmodelfactory.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/sfx2/source/explorer/makefile.mk b/sfx2/source/explorer/makefile.mk
index dd70d7a60b..75a15ebdb8 100644
--- a/sfx2/source/explorer/makefile.mk
+++ b/sfx2/source/explorer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index a76f0d0bbe..0cd3162a27 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nochaos.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/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx
index e9554397cf..871ed19d5e 100644
--- a/sfx2/source/inc/SfxDocumentMetaData.hxx
+++ b/sfx2/source/inc/SfxDocumentMetaData.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SfxDocumentMetaData.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index 20dd3e5cc3..c358a4a93b 100644
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: alienwarn.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx
index 9aa4aecee0..cb08763ace 100644
--- a/sfx2/source/inc/appbas.hxx
+++ b/sfx2/source/inc/appbas.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appbas.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index 73924ce5a5..6d327efb01 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appbaslib.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/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index b02902eca0..96aafcfbf7 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: appdata.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/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
index 73c9092ff5..54ae8865c3 100644
--- a/sfx2/source/inc/applet.hxx
+++ b/sfx2/source/inc/applet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: applet.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/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx
index f1937e40e5..0b6b46bd57 100644
--- a/sfx2/source/inc/doctemplates.hxx
+++ b/sfx2/source/inc/doctemplates.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: doctemplates.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/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index e6a2c96608..b8c1adba42 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventsupplier.hxx,v $
- * $Revision: 1.14.28.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/fltfnc.hxx b/sfx2/source/inc/fltfnc.hxx
index 77048f039f..40facd03fa 100644
--- a/sfx2/source/inc/fltfnc.hxx
+++ b/sfx2/source/inc/fltfnc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltfnc.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index 13a4084c20..64b0b8a3a1 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltoptint.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 78f9071c41..78e04c0fdf 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/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/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 9185f0c114..618b61b54c 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/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.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/hexplwnd.hxx b/sfx2/source/inc/hexplwnd.hxx
index 51577b16cf..84a0ccdfbc 100644
--- a/sfx2/source/inc/hexplwnd.hxx
+++ b/sfx2/source/inc/hexplwnd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hexplwnd.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index f67ec1f591..f3e69c2a97 100644
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iframe.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/intro.hxx b/sfx2/source/inc/intro.hxx
index 8f0f424aae..3b6119a6f0 100644
--- a/sfx2/source/inc/intro.hxx
+++ b/sfx2/source/inc/intro.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: intro.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index 03a7634aae..2a94f1ac67 100644
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mailmodel.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx
index 889fabf280..53b7ebe684 100644
--- a/sfx2/source/inc/mnucfga.hxx
+++ b/sfx2/source/inc/mnucfga.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mnucfga.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx
index 6544287c77..ccd56e0252 100644
--- a/sfx2/source/inc/nfltdlg.hxx
+++ b/sfx2/source/inc/nfltdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nfltdlg.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/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index 9f000f4eaf..457063d3f8 100644
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nochaos.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx
index 4d49203134..3adea607c9 100644
--- a/sfx2/source/inc/objmnctl.hxx
+++ b/sfx2/source/inc/objmnctl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objmnctl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index f55e8479a0..e0220316f7 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objshimp.hxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,6 @@ struct MarkData_Impl
 
 class SfxFrame;
 class SfxToolBoxConfig;
-class SfxAcceleratorManager;
 class SfxBasicManagerHolder;
 
 struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
diff --git a/sfx2/source/inc/openflag.hxx b/sfx2/source/inc/openflag.hxx
index e77699cdee..00600c5a10 100644
--- a/sfx2/source/inc/openflag.hxx
+++ b/sfx2/source/inc/openflag.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openflag.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx
index 0e2b7173a0..a85ae8b305 100644
--- a/sfx2/source/inc/ownsubfilterservice.hxx
+++ b/sfx2/source/inc/ownsubfilterservice.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ownsubfilterservice.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 5ed45b420a..b515357562 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: partwnd.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index f2dbfbdb03..bdb7a157c9 100644
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: plugin.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/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index bd5aa42e55..dfb1f1776c 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preview.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index f056c66407..53cf9d2cff 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recfloat.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/sfx2/source/inc/referers.hxx b/sfx2/source/inc/referers.hxx
index 921b4cbf26..78885cdd5b 100644
--- a/sfx2/source/inc/referers.hxx
+++ b/sfx2/source/inc/referers.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: referers.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 932204440a..b1bd94dce0 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.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: sfxlocal.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/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 618bb0b2c1..3839ef48c2 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxpicklist.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 5524a9093c..4560408512 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxtypes.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/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 8efe390558..b7328def13 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxurlrelocator.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index be428d898b..7f3ebde79d 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: slotserv.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/speakerdlg.hxx b/sfx2/source/inc/speakerdlg.hxx
deleted file mode 100644
index e3af356b45..0000000000
--- a/sfx2/source/inc/speakerdlg.hxx
+++ /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: speakerdlg.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 _SPEAKERDLG_HXX
-#define _SPEAKERDLG_HXX
-
-#ifndef _GOODIES_RECOGNIZER_HXX_
-#include <goodies/recognizer.hxx>
-#endif
-
-#ifndef _DIALOG_HXX
-#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX
-#include <vcl/lstbox.hxx>
-#endif
-
-// ---------------
-// - SfxSpeakerDlg -
-// ---------------
-
-class SfxSpeakerDlg: public ModalDialog
-{
-    OKButton		aBtnOK;
-    CancelButton	aBtnCancel;
-    ListBox         aListBox;
-    CharSet         aCharSet;
-
-    OSpeakerManagerRef m_aSpeakerMgr;
-
-public:
-
-    SfxSpeakerDlg(Window *pParent, OSpeakerManagerRef& aSpeakerMgr);
-    ~SfxSpeakerDlg();
-
-    virtual short Execute();
-};
-
-
-#endif // _SPEAKER_HXX
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index b1fe78e1a9..7a6d4fc823 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/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.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 630b4b6ee6..fd23e99857 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: statcach.hxx,v $
- * $Revision: 1.10.180.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index f7f7740264..a5e24e2ce9 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: templdgi.hxx,v $
- * $Revision: 1.18.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index 82ef3edd69..a13abfbcd3 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tplcitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/tplcomp.hxx b/sfx2/source/inc/tplcomp.hxx
index 27951183da..572e571793 100644
--- a/sfx2/source/inc/tplcomp.hxx
+++ b/sfx2/source/inc/tplcomp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tplcomp.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 96fb175769..edac2017a0 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: versdlg.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/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index f939ac775d..3d7e02d1a1 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.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: virtmenu.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/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 8735e24b90..65aa99d822 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: workwin.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/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 7b9eaab53e..e026dc6356 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inettbc.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/inet/makefile.mk b/sfx2/source/inet/makefile.mk
index 0460834fdd..9347e68a2c 100644
--- a/sfx2/source/inet/makefile.mk
+++ b/sfx2/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/sfx2/source/layout/factory.cxx b/sfx2/source/layout/factory.cxx
index fa5c99e031..6d6c01c935 100644
--- a/sfx2/source/layout/factory.cxx
+++ b/sfx2/source/layout/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: tabdlg.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk
index 24caa81ac6..a11ba76a15 100644
--- a/sfx2/source/layout/makefile.mk
+++ b/sfx2/source/layout/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/sfx2/source/layout/sfxdialog.cxx b/sfx2/source/layout/sfxdialog.cxx
index ebd28de8e6..1c8c7c2080 100644
--- a/sfx2/source/layout/sfxdialog.cxx
+++ b/sfx2/source/layout/sfxdialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabdlg.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index 92454ae62f..382d9744c8 100644
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabdlg.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx
index 767cb14dfa..ececd9f88c 100644
--- a/sfx2/source/layout/sfxtabpage.cxx
+++ b/sfx2/source/layout/sfxtabpage.cxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 #include <sfx2/layout.hxx>
 
diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
index 57a02ceef9..d3b209fc4a 100644
--- a/sfx2/source/menu/makefile.mk
+++ b/sfx2/source/menu/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc
index f9bab4e599..71f5b60507 100644
--- a/sfx2/source/menu/menu.hrc
+++ b/sfx2/source/menu/menu.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: menu.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/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src
index 61bb39972b..a84198917d 100644
--- a/sfx2/source/menu/menu.src
+++ b/sfx2/source/menu/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.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index db8e535d0d..31181f5806 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mnuitem.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 356582c7ac..0ac68900c4 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mnumgr.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index 85829a5338..e396c196fd 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objmnctl.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/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index b5f83fbcd8..7a06bc08aa 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: virtmenu.cxx,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1256,36 +1253,6 @@ String SfxVirtualMenu::GetItemHelpText( USHORT nSlotId ) const
 }
 
 //--------------------------------------------------------------------
-/*
-void SfxVirtualMenu::InvalidateKeyCodes()
-{
-    DBG_ASSERT( pSVMenu, "invalidating key of incomplete menu" );
-
-    SfxApplication* pSfxApp = SFX_APP();
-    SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    SfxAcceleratorManager* pAccMgr = pViewFrame->GetViewShell()->GetAccMgr_Impl();
-    SfxAcceleratorManager* pAppAccel = pSfxApp->GetAppAccel_Impl();
-    if ( !pAccMgr )
-        pAccMgr = pAppAccel;
-
-    for ( USHORT nPos = 0; nPos < pSVMenu->GetItemCount(); ++nPos )
-    {
-        USHORT nId = pSVMenu->GetItemId(nPos);
-        SfxVirtualMenu *pPopup = GetPopupMenu(nId);
-//        if ( pPopup )
-//            pPopup->InvalidateKeyCodes();
-//        else if ( nId )
-        if ( nId && !pSVMenu->GetPopupMenu( nId ) )
-        {
-            KeyCode aCode = pAccMgr->GetKeyCode( nId );
-            if ( !aCode.GetCode() && pAccMgr != pAppAccel )
-                aCode = pAppAccel->GetKeyCode( nId );
-            pSVMenu->SetAccelKey( nId, aCode );
-        }
-    }
-} */
-
-//--------------------------------------------------------------------
 
 // set the checkmark of the specified item
 
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 6066377ef3..3818a49e8f 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventsupplier.cxx,v $
- * $Revision: 1.36.12.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 9b8d8885c6..12e78bd90f 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hintpost.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/sfx2/source/notify/makefile.mk b/sfx2/source/notify/makefile.mk
index b63d4f16ae..e2ddde40f9 100644
--- a/sfx2/source/notify/makefile.mk
+++ b/sfx2/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk
index b5c4f1f5fb..f99c8fcdaa 100644
--- a/sfx2/source/statbar/makefile.mk
+++ b/sfx2/source/statbar/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 7aa9ac545e..0dc0a63a1e 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stbitem.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 3013dcf9a0..f201538d64 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imgmgr.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/toolbox/makefile.mk b/sfx2/source/toolbox/makefile.mk
index bedc92c424..ce4f011e60 100644
--- a/sfx2/source/toolbox/makefile.mk
+++ b/sfx2/source/toolbox/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index fe3ce95119..4e095eff9d 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxitem.cxx,v $
- * $Revision: 1.70.80.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 942caa75ad..3b34d147e4 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frame.cxx,v $
- * $Revision: 1.55.142.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 0015b27983..c9876ce1f0 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: topfrm.cxx,v $
- * $Revision: 1.97 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 1b6a1d535e..f59b80b84c 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmload.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/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 4382139794..b327bce801 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impframe.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/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index a36ed74f70..eb41088cd1 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ipclient.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/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk
index 6ddff24426..9c257f4c9f 100644
--- a/sfx2/source/view/makefile.mk
+++ b/sfx2/source/view/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.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index ede50724b4..dc15f39280 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orgmgr.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/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 95242562c5..afae6aba59 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: printer.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/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index 1b82a143a1..d84e4a006e 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prnmon.cxx,v $
- * $Revision: 1.25.46.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 90d0d5e9cf..339e1bfcad 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sfxbasecontroller.cxx,v $
- * $Revision: 1.76 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index ac3740dce4..a710bb5bab 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -1,31 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: userinputinterception.cxx,v $
-*
-* $Revision: 1.2 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ***********************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 47229be67c..167566555c 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.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: view.hrc,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/view.hxx b/sfx2/source/view/view.hxx
index bfad2d2431..e6daf9484d 100644
--- a/sfx2/source/view/view.hxx
+++ b/sfx2/source/view/view.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: view.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 45f0ef949b..ca066ea63d 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.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: view.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/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 594273aa51..57187cda67 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewfac.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/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6f195f4d86..8eb2fcfa4f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewfrm.cxx,v $
- * $Revision: 1.136.8.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 80197caa27..cde08f292b 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: topfrm.cxx,v $
- * $Revision: 1.97 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 68a3300978..1622cf5443 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewimp.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/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 8a0a8e8ef9..b167034362 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewprn.cxx,v $
- * $Revision: 1.36.84.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index abead98dfb..93b6e7f308 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewsh.cxx,v $
- * $Revision: 1.82.98.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index 2486b6da66..18e302d995 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/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.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index 10b70b1a13..2d93e7692d 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/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.54 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sfx2/util/makefile.pmk b/sfx2/util/makefile.pmk
index 2e0009b87e..03817cd477 100644
--- a/sfx2/util/makefile.pmk
+++ b/sfx2/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/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index 1c0ec1ad15..d481731892 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basereader.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@ public:
 protected: // protected because its only an implementation relevant class
     CBaseReader( const std::string& DocumentName );
 
-    CBaseReader( void* stream, zlib_filefunc_def* fa );

+    CBaseReader( void* stream, zlib_filefunc_def* fa );
 
     virtual void start_document();
     
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx
index 90f154ce6a..ef55c1eea3 100644
--- a/shell/inc/internal/columninfo.hxx
+++ b/shell/inc/internal/columninfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: columninfo.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/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index caf33f39a3..041717da13 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/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.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index 37a0a474f6..14dedc3439 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contentreader.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,7 +40,7 @@ public:
     //CContentReader( const std::string& DocumentName );
     CContentReader( const std::string& DocumentName, LocaleSet_t const & DocumentLocale );
 
-    CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );

+    CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );
 
 
     /** Get the chunkbuffer.
diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx
index 82ffafd704..f6ff22600d 100644
--- a/shell/inc/internal/dbgmacros.hxx
+++ b/shell/inc/internal/dbgmacros.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbgmacros.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/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
index 4afbf87daa..83dce8b75d 100644
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fileextensions.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/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index ab275c22b8..791251053a 100644
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: global.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/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx
index 48e1cbc0ab..fa3c3b699c 100644
--- a/shell/inc/internal/i_xml_parser_event_handler.hxx
+++ b/shell/inc/internal/i_xml_parser_event_handler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: i_xml_parser_event_handler.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/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx
index 857f980bfb..c5e8b8eaa9 100644
--- a/shell/inc/internal/infotips.hxx
+++ b/shell/inc/internal/infotips.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: infotips.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/shell/inc/internal/iso8601_converter.hxx b/shell/inc/internal/iso8601_converter.hxx
index d2b70b42ed..cc190a1489 100644
--- a/shell/inc/internal/iso8601_converter.hxx
+++ b/shell/inc/internal/iso8601_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: iso8601_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/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index 3a494cd34b..417c69c656 100644..100755
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: metainforeader.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@ public:
 
     CMetaInfoReader( const std::string& DocumentName );
 
-    CMetaInfoReader( void* stream, zlib_filefunc_def* fa);

+    CMetaInfoReader( void* stream, zlib_filefunc_def* fa);
 
     /** check if the Tag is in the target meta.xml file.
 
diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx
new file mode 100755
index 0000000000..2b1b50255c
--- /dev/null
+++ b/shell/inc/internal/propertyhdl.hxx
@@ -0,0 +1,126 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: PropertyHdl.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 PROPERTYHDL_HXX_INCLUDED
+#define PROPERTYHDL_HXX_INCLUDED
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable:4917)
+#endif
+#include <shlobj.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+// {AE424E85-F6DF-4910-A6A9-438797986431}
+const CLSID CLSID_PROPERTY_HANDLER = 
+{ 0xae424e85, 0xf6df, 0x4910, { 0xa6, 0xa9, 0x43, 0x87, 0x97, 0x98, 0x64, 0x31 } };
+
+class CMetaInfoReader;
+
+class CPropertyHdl : public IPropertyStore,
+                     public IPropertyStoreCapabilities,
+                     public IInitializeWithStream
+{
+public:
+             CPropertyHdl(long RefCnt = 1);
+    virtual ~CPropertyHdl();
+
+    //-----------------------------
+    // IUnknown methods
+    //-----------------------------
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface( 
+            REFIID riid,
+            void __RPC_FAR *__RPC_FAR *ppvObject );
+    virtual ULONG STDMETHODCALLTYPE AddRef( void );
+    virtual ULONG STDMETHODCALLTYPE Release( void );
+
+    //-----------------------------
+    // IPropertyStore
+    //-----------------------------
+    virtual HRESULT STDMETHODCALLTYPE GetCount( DWORD *pcProps );
+    virtual HRESULT STDMETHODCALLTYPE GetAt( DWORD iProp, PROPERTYKEY *pkey );
+    virtual HRESULT STDMETHODCALLTYPE GetValue( REFPROPERTYKEY key, PROPVARIANT *pPropVar );
+    virtual HRESULT STDMETHODCALLTYPE SetValue( REFPROPERTYKEY key, REFPROPVARIANT propVar );
+    virtual HRESULT STDMETHODCALLTYPE Commit();
+
+    //-----------------------------
+    // IPropertyStoreCapabilities
+    //-----------------------------
+    virtual HRESULT STDMETHODCALLTYPE IsPropertyWritable( REFPROPERTYKEY key );
+
+    //-----------------------------
+    // IInitializeWithStream
+    //-----------------------------
+    virtual HRESULT STDMETHODCALLTYPE Initialize(IStream *pStream, DWORD grfMode);
+
+private:
+    void        LoadProperties( CMetaInfoReader *pMetaInfoReader );
+    HRESULT     GetItemData( CMetaInfoReader *pMetaInfoReader, UINT nIndex, PROPVARIANT *pVarData );
+
+private:
+    long m_RefCnt;
+    IPropertyStoreCache* m_pCache;
+};
+
+class CClassFactory : public IClassFactory
+{
+public:
+    CClassFactory( const CLSID& clsid );
+    virtual ~CClassFactory();
+
+    //-----------------------------
+    // IUnknown methods
+    //-----------------------------
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface( 
+            REFIID riid,
+            void __RPC_FAR *__RPC_FAR *ppvObject);
+    virtual ULONG STDMETHODCALLTYPE AddRef( void );
+    virtual ULONG STDMETHODCALLTYPE Release( void );
+
+    //-----------------------------
+    // IClassFactory methods
+    //-----------------------------
+    virtual HRESULT STDMETHODCALLTYPE CreateInstance( 
+            IUnknown __RPC_FAR *pUnkOuter,
+            REFIID riid,
+            void __RPC_FAR *__RPC_FAR *ppvObject);
+
+    virtual HRESULT STDMETHODCALLTYPE LockServer( BOOL fLock );
+    static bool IsLocked();
+
+private:
+    long  m_RefCnt;
+    CLSID m_Clsid;
+    static long  s_ServerLocks;
+};
+
+#endif 
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx
index ec3457522c..96b23f53fa 100644
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/internal/propsheets.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propsheets.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/shell/inc/internal/registry.hxx b/shell/inc/internal/registry.hxx
index 76aba703d1..ac80b9b9c6 100644
--- a/shell/inc/internal/registry.hxx
+++ b/shell/inc/internal/registry.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registry.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/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx
index 0806d9df6e..fc4291622e 100644..100755
--- a/shell/inc/internal/shlxthdl.hxx
+++ b/shell/inc/internal/shlxthdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shlxthdl.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/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx
new file mode 100755
index 0000000000..d7eb99bd18
--- /dev/null
+++ b/shell/inc/internal/stream_helper.hxx
@@ -0,0 +1,35 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2010 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.
+ *
+ ************************************************************************/
+
+#ifndef STREAM_HELPER_HXX_INCLUDED
+#define STREAM_HELPER_HXX_INCLUDED
+
+#include "internal/types.hxx"
+
+IStream* PrepareIStream( IStream* pStream, zlib_filefunc_def &zFileFunc );
+
+#endif
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx
index 32334ee40a..be731025da 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/internal/thumbviewer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: thumbviewer.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/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 7de20446f7..e87e432340 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,8 +33,8 @@
 #include <utility>
 #include <vector>
 #include <stack>
-#include <external/zlib/zlib.h>

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

+#include <external/zlib/zlib.h>
+#include <external/zlib/ioapi.h>
 
 
 typedef std::vector<std::wstring> StringList_t;
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index aed96260c3..7ae7de59be 100644..100755
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: utilities.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/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 7e47195f08..11c95fb82d 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_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: xml_parser.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/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 5efbcdf130..4a25208e80 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zipfile.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,9 +32,9 @@
 #define _WINDOWS
 #endif
 
-

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

-

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

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

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

+    ZipFile(void* stream, zlib_filefunc_def* fa);
 
         
     /** Destroys a zip file
diff --git a/shell/inc/kde_headers.h b/shell/inc/kde_headers.h
index 75c362967d..384ab826e6 100644
--- a/shell/inc/kde_headers.h
+++ b/shell/inc/kde_headers.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kde_headers.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/shell/inc/makefile.mk b/shell/inc/makefile.mk
index ae070770d8..c297cb4f77 100644
--- a/shell/inc/makefile.mk
+++ b/shell/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/shell/inc/pch/precompiled_shell.cxx b/shell/inc/pch/precompiled_shell.cxx
index 1a2e3ae46c..3519ce1924 100644
--- a/shell/inc/pch/precompiled_shell.cxx
+++ b/shell/inc/pch/precompiled_shell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_shell.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/shell/inc/pch/precompiled_shell.hxx b/shell/inc/pch/precompiled_shell.hxx
index 7f22a98298..e913476388 100644
--- a/shell/inc/pch/precompiled_shell.hxx
+++ b/shell/inc/pch/precompiled_shell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_shell.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index 0fdf024096..9a5bf35dde 100644..100755
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -22,7 +22,8 @@ sl    shell\source\win32\shlxthandler\propsheets   nmake   -   w   sl_win32_shlx
 sl    shell\source\win32\shlxthandler\infotips     nmake   -   w   sl_win32_shlxthandler_infotips  sl_inc NULL
 sl    shell\source\win32\shlxthandler\columninfo   nmake   -   w   sl_win32_shlxthandler_columninfo  sl_inc NULL
 sl    shell\source\win32\shlxthandler\thumbviewer  nmake   -   w   sl_win32_shlxthandler_thumbviewer sl_inc NULL
-sl    shell\source\win32\shlxthandler              nmake   -   w   sl_win32_shlxthandler sl_win32_lngconv.w sl_win32_shlxthandler_res.w sl_win32_shlxthandler_util.w sl_all_zipfile.w sl_all_ooofilereader.w sl_win32_shlxthandler_propsheets.w sl_win32_shlxthandler_infotips.w sl_win32_shlxthandler_columninfo.w sl_win32_shlxthandler_thumbviewer.w sl_inc NULL
+sl    shell\source\win32\shlxthandler\prophdl      nmake   -   w   sl_win32_shlxthandler_prophdl sl_win32_shlxthandler_ooofilt.w sl_inc NULL
+sl    shell\source\win32\shlxthandler              nmake   -   w   sl_win32_shlxthandler sl_win32_lngconv.w sl_win32_shlxthandler_res.w sl_win32_shlxthandler_util.w sl_all_zipfile.w sl_all_ooofilereader.w sl_win32_shlxthandler_propsheets.w sl_win32_shlxthandler_infotips.w sl_win32_shlxthandler_columninfo.w sl_win32_shlxthandler_thumbviewer.w sl_win32_shlxthandler_prophdl.w sl_inc sl_win32_shlxthandler_ooofilt.w NULL
 sl    shell\source\backends\localebe               nmake   -   all sl_backends_localebe sl_inc NULL
 sl    shell\source\backends\wininetbe              nmake   -   w   sl_backends_wininetbe sl_inc NULL
 sl    shell\source\backends\macbe                  nmake   -   u   sl_backends_macbe sl_inc NULL
@@ -31,4 +32,3 @@ sl    shell\source\backends\kdebe                  nmake   -   u   sl_backends_k
 sl    shell\source\backends\kde4be                 nmake   -   u   sl_backends_kde4be sl_inc NULL
 sl    shell\source\backends\desktopbe              nmake   -   u   sl_backends_desktopbe sl_inc NULL
 sl    shell\source\win32\shlxthandler\ooofilt      nmake   -   w   sl_win32_shlxthandler_ooofilt sl_all_zipfile.w sl_all_ooofilereader.w sl_win32_shlxthandler_util.w sl_all sl_inc NULL
-sl    shell\source\win32\shlxthandler\ooofilt\proxy nmake   -   w   sl_win32_ooofiltproxy sl_inc NULL 
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index eee13ef34f..ea8be0bbaf 100755..100644
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -7,6 +7,7 @@
 ..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin%_EXT%\shlxthdl_x64.dll
 ..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin%_EXT%\ooofiltproxy_x64.dll
 ..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin%_EXT%\ooofilt_x64.dll
+..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin%_EXT%\propertyhdl_x64.dll
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 
diff --git a/shell/qa/i_xml_parser_event_handler.hxx b/shell/qa/i_xml_parser_event_handler.hxx
index e6a0de16a1..f1727bfaec 100644
--- a/shell/qa/i_xml_parser_event_handler.hxx
+++ b/shell/qa/i_xml_parser_event_handler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: i_xml_parser_event_handler.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/shell/qa/makefile.mk b/shell/qa/makefile.mk
index e935abd1c0..a9047f97cf 100755
--- a/shell/qa/makefile.mk
+++ b/shell/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/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index 314e7f9134..72c8428079 100755
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recent_docs.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/shell/source/all/makefile.mk b/shell/source/all/makefile.mk
index 623aad6d69..66b185132f 100755
--- a/shell/source/all/makefile.mk
+++ b/shell/source/all/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -69,5 +65,9 @@ SLOFILES_X64=$(SLO_X64)$/xml_parser.obj
 
 .INCLUDE :  set_wntx64.mk
 .INCLUDE :  target.mk
+.IF "$(OS)" == "WNT" 
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE 
+.ENDIF 
 .INCLUDE :  tg_wntx64.mk
 
diff --git a/shell/source/all/ooofilereader/autostyletag.cxx b/shell/source/all/ooofilereader/autostyletag.cxx
index a334ab3a58..a0d8a185e4 100644
--- a/shell/source/all/ooofilereader/autostyletag.cxx
+++ b/shell/source/all/ooofilereader/autostyletag.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autostyletag.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/shell/source/all/ooofilereader/autostyletag.hxx b/shell/source/all/ooofilereader/autostyletag.hxx
index ace48e97b7..1b5660c707 100644
--- a/shell/source/all/ooofilereader/autostyletag.hxx
+++ b/shell/source/all/ooofilereader/autostyletag.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: autostyletag.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/shell/source/all/ooofilereader/basereader.cxx b/shell/source/all/ooofilereader/basereader.cxx
index d8d95c3e89..65ce293fb4 100644
--- a/shell/source/all/ooofilereader/basereader.cxx
+++ b/shell/source/all/ooofilereader/basereader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basereader.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,14 +47,14 @@ m_ZipFile( DocumentName )
 //
 //------------------------------
 
-CBaseReader::CBaseReader(void * sw, zlib_filefunc_def* fa):

-m_ZipFile( sw , fa )

-{

-}

-

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

-//

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

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

-CBaseReader( stream, fa )

-{

-try

-    {

-        m_DefaultLocale = DocumentLocale;

-        Initialize( DOC_CONTENT_NAME );

-    }

-    catch(xml_parser_exception&

-    #if OSL_DEBUG_LEVEL > 0

-    ex

-    #endif

-    )

-    {

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

-    }

-    catch(...)

-    {

-        ENSURE(false, "Unknown error");

-    }

-}

+CContentReader::CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa ) :
+CBaseReader( stream, fa )
+{
+try
+    {
+        m_DefaultLocale = DocumentLocale;
+        Initialize( DOC_CONTENT_NAME );
+    }
+    catch(xml_parser_exception&
+    #if OSL_DEBUG_LEVEL > 0
+    ex
+    #endif
+    )
+    {
+        ENSURE(false, ex.what());
+    }
+    catch(...)
+    {
+        ENSURE(false, "Unknown error");
+    }
+}
 
 
 /** destructor.
diff --git a/shell/source/all/ooofilereader/dummytag.hxx b/shell/source/all/ooofilereader/dummytag.hxx
index ce5c02b7b6..7f6fb8036f 100644
--- a/shell/source/all/ooofilereader/dummytag.hxx
+++ b/shell/source/all/ooofilereader/dummytag.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dummytag.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/shell/source/all/ooofilereader/itag.hxx b/shell/source/all/ooofilereader/itag.hxx
index 1b5cc76910..a25c885b3f 100644
--- a/shell/source/all/ooofilereader/itag.hxx
+++ b/shell/source/all/ooofilereader/itag.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itag.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/shell/source/all/ooofilereader/keywordstag.cxx b/shell/source/all/ooofilereader/keywordstag.cxx
index aaddfe8166..88e7573766 100644
--- a/shell/source/all/ooofilereader/keywordstag.cxx
+++ b/shell/source/all/ooofilereader/keywordstag.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keywordstag.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/shell/source/all/ooofilereader/keywordstag.hxx b/shell/source/all/ooofilereader/keywordstag.hxx
index 54cd89c041..4f287bfb81 100644
--- a/shell/source/all/ooofilereader/keywordstag.hxx
+++ b/shell/source/all/ooofilereader/keywordstag.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: keywordstag.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/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk
index b893db45d8..bf6365526e 100644
--- a/shell/source/all/ooofilereader/makefile.mk
+++ b/shell/source/all/ooofilereader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -85,5 +81,9 @@ LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+.IF "$(OS)" == "WNT" 
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE 
+.ENDIF
 .INCLUDE :	tg_wntx64.mk
 
diff --git a/shell/source/all/ooofilereader/metainforeader.cxx b/shell/source/all/ooofilereader/metainforeader.cxx
index e179d9ab14..fd5376c5c5 100644
--- a/shell/source/all/ooofilereader/metainforeader.cxx
+++ b/shell/source/all/ooofilereader/metainforeader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: metainforeader.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -80,48 +77,48 @@ CBaseReader( DocumentName )
     }
 }
 
-CMetaInfoReader::CMetaInfoReader( void* stream, zlib_filefunc_def* fa) :

-CBaseReader( stream, fa)

-{

-try

-    {

-        m_pKeywords_Builder = new CKeywordsTag( );

-        m_pSimple_Builder = new CSimpleTag( );

-        m_pDummy_Builder   = new CDummyTag( );

-

-        //retrieve all infomation that is useful

-        m_AllMetaInfo[META_INFO_AUTHOR]               = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_TITLE]                = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_SUBJECT]              = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_KEYWORDS]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_DESCRIPTION]          = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_DOCUMENT_STATISTIC]   = EMPTY_XML_TAG;

-

-        m_AllMetaInfo[META_INFO_GENERATOR]            = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_CREATION]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_CREATOR]              = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_MODIFIED]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_LANGUAGE]             = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_DOCUMENT_NUMBER]      = EMPTY_XML_TAG;

-        m_AllMetaInfo[META_INFO_EDITING_TIME]         = EMPTY_XML_TAG;

-

-        Initialize( META_CONTENT_NAME );

-    }

-    catch(xml_parser_exception&

-    #if OSL_DEBUG_LEVEL > 0

-    ex

-    #endif

-    )

-    {

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

-    }

-    catch(...)

-    {

-        ENSURE(false, "Unknown error");

-    }

-

-}

-

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

+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 
 
@@ -54,5 +50,9 @@ SLOFILES_X64=$(SLO_X64)$/zipfile.obj\
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+.IF "$(OS)" == "WNT" 
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE 
+.ENDIF
 .INCLUDE :	tg_wntx64.mk
 
diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx
index 7a270dd3e8..3dbcfb0483 100644
--- a/shell/source/all/zipfile/zipexcptn.cxx
+++ b/shell/source/all/zipfile/zipexcptn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zipexcptn.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/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx
index d5b6ef6e06..e043b954fc 100644
--- a/shell/source/all/zipfile/zipfile.cxx
+++ b/shell/source/all/zipfile/zipfile.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zipfile.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,10 +76,10 @@ bool ZipFile::IsZipFile(const std::string& /*FileName*/)
     return true;
 }
 
-bool ZipFile::IsZipFile(void* /*stream*/)

-{

-    return true;

-}

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

-{

-    return true;

-}

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

-{

-    fa->opaque = stream;

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

-

-    if (0 == m_uzFile)

-        throw IOException(-1);

-}

+ZipFile::ZipFile(void* stream, zlib_filefunc_def* fa) 
+{
+    fa->opaque = stream;
+    m_uzFile = unzOpen2((const char *)NULL, fa);
+
+    if (0 == m_uzFile)
+        throw IOException(-1);
+}
 
 
 /** Destroys a zip file
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
new file mode 100644
index 0000000000..21371755b4
--- /dev/null
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -0,0 +1,290 @@
+/*************************************************************************
+*
+* 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_shell.hxx"
+#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XVetoableChangeListener.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XCurrentContext.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "osl/diagnose.h"
+#include "rtl/string.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/current_context.hxx"
+#include "uno/lbnames.h"
+
+namespace {
+
+namespace css = com::sun::star;
+
+rtl::OUString SAL_CALL getDefaultImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.backend.DesktopBackend"));
+}
+
+css::uno::Sequence< rtl::OUString > SAL_CALL getDefaultSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.backend.DesktopBackend"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+class Default:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::beans::XPropertySet >,
+    private boost::noncopyable
+{
+public:
+    Default() {}
+
+private:
+    virtual ~Default() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return getDefaultImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; }
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return getDefaultSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+    getPropertySetInfo() throw (css::uno::RuntimeException)
+    { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
+
+    virtual void SAL_CALL setPropertyValue(
+        rtl::OUString const &, css::uno::Any const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+    virtual css::uno::Any SAL_CALL getPropertyValue(
+        rtl::OUString const & PropertyName)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL addPropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removePropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL addVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+};
+
+void Default::setPropertyValue(rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
+}
+
+css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    if (PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    {
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    }
+    throw css::beans::UnknownPropertyException(
+        PropertyName, static_cast< cppu::OWeakObject * >(this));
+}
+
+css::uno::Reference< css::uno::XInterface > createBackend(
+    css::uno::Reference< css::uno::XComponentContext > const & context,
+    rtl::OUString const & name)
+{
+    try {
+        return css::uno::Reference< css::lang::XMultiComponentFactory >(
+            context->getServiceManager(), css::uno::UNO_SET_THROW)->
+            createInstanceWithContext(name, context);
+    } catch (css::uno::RuntimeException &) {
+        // Assuming these exceptions are real errors:
+        throw;
+    } catch (css::uno::Exception & e) {
+        // Assuming these exceptions indicate that the service is not installed:
+        OSL_TRACE(
+            "createInstance(%s) failed with %s",
+            rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr(),
+            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        return css::uno::Reference< css::uno::XInterface >();
+    }
+}
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
+    css::uno::Reference< css::uno::XComponentContext > const & context)
+{
+    rtl::OUString desktop;
+    css::uno::Reference< css::uno::XCurrentContext > current(
+        css::uno::getCurrentContext());
+    if (current.is()) {
+        current->getValueByName(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
+            desktop;
+    }
+    // Fall back to the default if the specific backend is not available:
+    css::uno::Reference< css::uno::XInterface > backend;
+    if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"))) {
+        backend = createBackend(
+            context,
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.backend.GconfBackend")));
+    } else if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE"))) {
+        backend = createBackend(
+            context,
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.backend.KDEBackend")));
+    } else if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE4"))) {
+        backend = createBackend(
+            context,
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.backend.KDE4Backend")));
+    }
+    return backend.is()
+        ? backend : static_cast< cppu::OWeakObject * >(new Default);
+}
+
+static cppu::ImplementationEntry const services[] = {
+    { &createInstance, &getDefaultImplementationName,
+      &getDefaultSupportedServiceNames, &cppu::createSingleComponentFactory, 0,
+      0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
+}
diff --git a/shell/source/backends/desktopbe/desktopbe.xml b/shell/source/backends/desktopbe/desktopbe.xml
deleted file mode 100644
index 78156ad468..0000000000
--- a/shell/source/backends/desktopbe/desktopbe.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>desktopbe</module-name>
-    <component-description>
-        <author> Jan Holesovsky </author>
-        <name>com.sun.star.comp.configuration.backend.DesktopBackend</name>
-        <description> The shared gconf/KDE backend; will load GconfBackend or
-        KDEBackend depending on the desktop environment.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.comp.configuration.backend.DesktopBackend</supported-service>		
-        <supported-service>com.sun.star.comp.configuration.backend.PlatformBackend</supported-service>		
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/backends/desktopbe/desktopbe1-ucd.txt b/shell/source/backends/desktopbe/desktopbe1-ucd.txt
index c1df460103..fd874a82ea 100644
--- a/shell/source/backends/desktopbe/desktopbe1-ucd.txt
+++ b/shell/source/backends/desktopbe/desktopbe1-ucd.txt
@@ -2,8 +2,5 @@
 ImplementationName=com.sun.star.comp.configuration.backend.DesktopBackend
 ComponentName=desktopbe1.uno.so
 LoaderName=com.sun.star.loader.SharedLibrary
-[Data]
-SupportedComponents=org.openoffice.VCL;org.openoffice.Inet;org.openoffice.Office.Common;org.openoffice.Office.Paths;org.openoffice.UserProfile;org.openoffice.Office.Recovery;org.openoffice.Setup
 [SupportedServices]
 com.sun.star.configuration.backend.DesktopBackend
-com.sun.star.configuration.backend.PlatformBackend
diff --git a/shell/source/backends/desktopbe/desktopbecdef.cxx b/shell/source/backends/desktopbe/desktopbecdef.cxx
deleted file mode 100644
index 3d668c53dc..0000000000
--- a/shell/source/backends/desktopbe/desktopbecdef.cxx
+++ /dev/null
@@ -1,205 +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: desktopbecdef.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_shell.hxx"
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XSCHEMASUPPLIER_HPP_
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#endif
-#include <com/sun/star/registry/XRegistryKey.hpp>
-
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <cppuhelper/implementationentry.hxx>
-#endif
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include "uno/current_context.hxx"
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-//==============================================================================
-
-static uno::Reference<uno::XInterface> SAL_CALL createDesktopBackend(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    try {
-        uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
-        
-        if (xCurrentContext.is())
-        {
-            uno::Any aValue = xCurrentContext->getValueByName(
-                rtl::OUString::createFromAscii( "system.desktop-environment" ) );
-        
-            rtl::OUString aDesktopEnvironment;
-            if ( aValue >>= aDesktopEnvironment )
-            {
-                rtl::OUString aDesktopService;
-                if ( aDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
-                    aDesktopService = rtl::OUString::createFromAscii( "com.sun.star.configuration.backend.GconfBackend" );
-                else if ( aDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
-                    aDesktopService = rtl::OUString::createFromAscii( "com.sun.star.configuration.backend.KDEBackend" );
-                else
-                    return uno::Reference<uno::XInterface>(); 
-
-                uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-                if( xServiceManager.is() )
-                {
-                    return uno::Reference< backend::XSingleLayerStratum >::query(
-                            xServiceManager->createInstanceWithContext( aDesktopService, xContext) );
-                }
-            }
-        }
-    } catch (uno::RuntimeException e) {
-    }    
-
-    return uno::Reference<uno::XInterface>(); 
-}
-
-static rtl::OUString SAL_CALL getBackendName(void) {
-    return rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.DesktopBackend") );
-}
-
-static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void) 
-{
-    uno::Sequence<rtl::OUString> aServices(2) ;
-    aServices[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.DesktopBackend")) ;
-    aServices[1] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.PlatformBackend")) ;
-
-    return aServices ;
-}
-
-static uno::Sequence<rtl::OUString> SAL_CALL getSupportedComponents(void)
-{
-    const sal_Int32 nComponents = 7;
-
-    uno::Sequence<rtl::OUString> aSupportedComponentsList(nComponents) ;
-
-    aSupportedComponentsList[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.VCL")) ;
-    aSupportedComponentsList[1] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Inet")) ;
-    aSupportedComponentsList[2] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common")) ;
-    aSupportedComponentsList[3] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")) ;
-
-    aSupportedComponentsList[4] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.UserProfile")) ;
-    aSupportedComponentsList[5] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")) ;
-    aSupportedComponentsList[6] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")) ;
-
-    return aSupportedComponentsList ;
-}
-//==============================================================================
-
-static const cppu::ImplementationEntry kImplementations_entries[] = 
-{
-    {
-        createDesktopBackend,
-        getBackendName,
-        getBackendServiceNames,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL, NULL, NULL, NULL, NULL, 0 }
-} ;
-//------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-                                            const sal_Char **aEnvTypeName,
-                                            uno_Environment ** /* aEnvironment */)
-{
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */,
-                                                 void *pRegistryKey)
-{
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + getBackendName()
-            );
-            
-            // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( 
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-            );
-            
-            uno::Sequence<rtl::OUString> sServiceNames = getBackendServiceNames();
-            for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            // Register supported components            
-            uno::Reference<XRegistryKey> xComponentKey = xImplKey->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/DATA/SupportedComponents") )
-            );
-        
-            xComponentKey->setAsciiListValue( getSupportedComponents() );
-
-            return sal_True;
-        }
-        
-        catch( InvalidRegistryException& )
-        {                       
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");           
-        }
-    }
-    
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" void *component_getFactory(const sal_Char *aImplementationName,
-                                      void *aServiceManager,
-                                      void *aRegistryKey)
-{
-    return cppu::component_getFactoryHelper(
-        aImplementationName,
-        aServiceManager,
-        aRegistryKey,
-        kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
diff --git a/shell/source/backends/desktopbe/exports.map b/shell/source/backends/desktopbe/exports.map
deleted file mode 100644
index ba501f9ae0..0000000000
--- a/shell/source/backends/desktopbe/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk
index b6bcd3d959..29260821d5 100644
--- a/shell/source/backends/desktopbe/makefile.mk
+++ b/shell/source/backends/desktopbe/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
@@ -27,49 +23,31 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=shell
-TARGET=desktopbe
+#***********************************************************************/
 
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
+PRJ = ../../..
+PRJNAME = shell
+TARGET = desktopbe
 
-COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
-UNOUCROUT=$(OUT)$/inc$/$(TARGET)
-INCPRE=$(UNOUCROUT)
+ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
-# --- Settings ---
+.INCLUDE: settings.mk
 
-.INCLUDE : settings.mk
-
-UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt
-
-# no "lib" prefix
 DLLPRE =
 
-# --- Files ---
-
-SLOFILES=\
-    $(SLO)$/desktopbecdef.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET)1.uno   
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+SLOFILES = $(SLO)/desktopbackend.obj
 
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-        
-SHL1VERSIONMAP=exports.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
+SHL1IMPLIB = i$(SHL1TARGET)
+SHL1OBJS = $(SLOFILES)
+SHL1STDLIBS = \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(SALLIB)
+SHL1TARGET = desktopbe1.uno
+SHL1USE_EXPORTS = name
+DEF1NAME = $(SHL1TARGET)
 
-# --- Targets ---
+UNIXTEXT = $(MISC)/desktopbe1-ucd.txt
 
-.INCLUDE : target.mk
+.INCLUDE: target.mk
diff --git a/shell/source/backends/gconfbe/exports.map b/shell/source/backends/gconfbe/exports.map
deleted file mode 100644
index ba501f9ae0..0000000000
--- a/shell/source/backends/gconfbe/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/shell/source/backends/gconfbe/gconflayer.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index f6ad4fe776..e2347572ee 100644
--- a/shell/source/backends/gconfbe/gconflayer.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -1,81 +1,102 @@
 /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: gconflayer.cxx,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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
+*
+* 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_shell.hxx"
-#include "gconflayer.hxx"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <osl/security.hxx>
-#include <osl/file.hxx>
-#include <osl/thread.h>
-#include <com/sun/star/uno/Sequence.hxx>
+#include "sal/config.h"
 
 #include <string.h>
 
-using namespace rtl;
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "osl/file.hxx"
+#include "osl/security.hxx"
+#include "osl/thread.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/ustrbuf.hxx"
 
-//==============================================================================
+#include "gconfaccess.hxx"
 
-GconfLayer::GconfLayer( const uno::Reference<uno::XComponentContext>& xContext,
-    const ConfigurationValue pConfigurationValuesList[],
-    const sal_Int32 nConfigurationValues,
-    const char * pPreloadValuesList[] )
-    :m_pConfigurationValuesList( pConfigurationValuesList )
-    ,m_nConfigurationValues( nConfigurationValues )
-    ,m_pPreloadValuesList( pPreloadValuesList )
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService( RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber" ) );
+#define GCONF_PROXY_MODE_KEY "/system/proxy/mode"
+#define GCONF_AUTO_SAVE_KEY  "/apps/openoffice/auto_save"
 
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext( k_sLayerDescriberService, xContext ) );
-    }
-    else
+namespace gconfaccess {
+
+namespace {
+
+namespace css = com::sun::star ;
+namespace uno = css::uno ;
+using namespace rtl;
+
+GConfClient* getGconfClient()
+{
+    static GConfClient* mClient= 0;
+    if (mClient == NULL)
     {
-        OSL_TRACE( "Could not retrieve ServiceManager" );
-    }
-}
+        /* initialize glib object type library */
+        g_type_init();
+    
+        GError* aError = NULL;
+        if (!gconf_init(0, NULL, &aError))
+        {
+            rtl::OUStringBuffer msg;
+            msg.appendAscii("GconfBackend:GconfLayer: Cannot Initialize Gconf connection - " );
+            msg.appendAscii(aError->message);
+            
+            g_error_free(aError); 
+            aError = NULL;
+            throw uno::RuntimeException(msg.makeStringAndClear(),NULL);
+        }
+    
+        mClient = gconf_client_get_default();
+        if (!mClient)
+        {
+            throw uno::RuntimeException(rtl::OUString::createFromAscii
+                ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
+        }
 
-//------------------------------------------------------------------------------
+        static const char * const PreloadValuesList[] =
+        {
+            "/desktop/gnome/interface",
+            "/system/proxy",
+            "/system/http_proxy/host",
+            "/desktop/gnome/url-handlers/mailto",
+#ifdef ENABLE_LOCKDOWN
+            "/apps/openoffice",
+            "/desktop/gnome/lockdown",
+            "/apps/openoffice/lockdown",
+#endif // ENABLE_LOCKDOWN
+            NULL
+        };
+        int i = 0;
+        while( PreloadValuesList[i] != NULL )
+            gconf_client_preload( mClient, PreloadValuesList[i++], GCONF_CLIENT_PRELOAD_ONELEVEL, NULL );
+    } 
+
+    return mClient;
+}
 
 static OUString xdg_user_dir_lookup (const char *type)
 {
@@ -376,13 +397,12 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
 
 //------------------------------------------------------------------------------
 
-sal_Bool SAL_CALL isDependencySatisfied( const ConfigurationValue aValue )
+sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const ConfigurationValue aValue )
 {
     switch( aValue.nDependsOn )
     {
         case SETTING_PROXY_MODE:
         {
-            GConfClient* aClient = GconfBackend::getGconfClient();
             GConfValue* aGconfValue = gconf_client_get( aClient, GCONF_PROXY_MODE_KEY, NULL );
 
             if ( aGconfValue != NULL ) 
@@ -449,116 +469,381 @@ sal_Bool SAL_CALL isDependencySatisfied( const ConfigurationValue aValue )
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+}
 
-void SAL_CALL GconfLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler )
-    throw ( backend::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException )
+ConfigurationValue const ConfigurationValues[] =
 {
-    if( ! m_xLayerContentDescriber.is() )
     {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
+        SETTING_ENABLE_ACCESSIBILITY,
+        "/desktop/gnome/interface/accessibility",
+        "EnableATToolSupport",
+        sal_True,
+        SETTINGS_LAST
+    },
 
-    uno::Sequence<backend::PropertyInfo> aPropInfoList( m_nConfigurationValues );
-    sal_Int32 nProperties = 0;
+    {
+        SETTING_PROXY_MODE,
+        GCONF_PROXY_MODE_KEY,
+        "ooInetProxyType",
+        sal_True,
+        SETTINGS_LAST
+    },
 
-    GConfClient* aClient = GconfBackend::getGconfClient();
-    GConfValue* aGconfValue;
-    int i = 0;
+    {
+        SETTING_PROXY_HTTP_HOST,
+        "/system/http_proxy/host",
+        "ooInetHTTPProxyName",
+        sal_False,
+        SETTING_PROXY_MODE
+    },
 
-    while( m_pPreloadValuesList[i] != NULL )
-        gconf_client_preload( aClient, m_pPreloadValuesList[i++], GCONF_CLIENT_PRELOAD_ONELEVEL, NULL );
+    {
+        SETTING_PROXY_HTTP_PORT,
+        "/system/http_proxy/port",
+        "ooInetHTTPProxyPort",
+        sal_False,
+        SETTING_PROXY_MODE
+    },
+
+     {
+        SETTING_PROXY_HTTPS_HOST,
+        "/system/proxy/secure_host",
+        "ooInetHTTPSProxyName",
+        sal_False,
+        SETTING_PROXY_MODE
+    },
 
-    for( i = 0; i < m_nConfigurationValues; i++ )
     {
-        if( ( m_pConfigurationValuesList[i].nDependsOn != SETTINGS_LAST ) && !isDependencySatisfied( m_pConfigurationValuesList[i] ) )
-            continue;
+        SETTING_PROXY_HTTPS_PORT,
+        "/system/proxy/secure_port",
+        "ooInetHTTPSProxyPort",
+        sal_False,
+        SETTING_PROXY_MODE
+    },
 
-        aGconfValue = gconf_client_get( aClient, m_pConfigurationValuesList[i].GconfItem, NULL );
+    {
+        SETTING_PROXY_FTP_HOST,
+        "/system/proxy/ftp_host",
+        "ooInetFTPProxyName",
+        sal_False,
+        SETTING_PROXY_MODE
+    },
 
-        if( aGconfValue != NULL )
-        {
-            aPropInfoList[nProperties].Name      = rtl::OUString::createFromAscii( m_pConfigurationValuesList[i].OOoConfItem );
-            aPropInfoList[nProperties].Type      = rtl::OUString::createFromAscii( m_pConfigurationValuesList[i].OOoConfValueType );
-            aPropInfoList[nProperties].Protected = m_pConfigurationValuesList[i].bLocked;
+    {
+        SETTING_PROXY_FTP_PORT,
+        "/system/proxy/ftp_port",
+        "ooInetFTPProxyPort",
+        sal_False,
+        SETTING_PROXY_MODE
+    },
+    
+    {
+        SETTING_NO_PROXY_FOR,
+        "/system/http_proxy/ignore_hosts",
+        "ooInetNoProxy",
+        sal_True,
+        SETTING_PROXY_MODE
+    },
 
-            if( m_pConfigurationValuesList[i].bNeedsTranslation )
-                aPropInfoList[nProperties].Value = translateToOOo( m_pConfigurationValuesList[i], aGconfValue );
-            else
-                aPropInfoList[nProperties].Value = makeAnyOfGconfValue( aGconfValue );
+    {
+        SETTING_MAILER_PROGRAM,
+        "/desktop/gnome/url-handlers/mailto/command",
+        "ExternalMailer",
+        sal_True,
+        SETTINGS_LAST
+    },
+    {
+        SETTING_SOURCEVIEWFONT_NAME,
+        "/desktop/gnome/interface/monospace_font_name",
+        "SourceViewFontName",
+        sal_True,
+        SETTINGS_LAST
+    },
+    {
+        SETTING_SOURCEVIEWFONT_HEIGHT,
+        "/desktop/gnome/interface/monospace_font_name",
+        "SourceViewFontHeight",
+        sal_True,
+        SETTINGS_LAST
+    },
 
-            gconf_value_free( aGconfValue );
+    {
+        SETTING_WORK_DIRECTORY,
+        "/desktop/gnome/url-handlers/mailto/command", // dummy
+        "WorkPathVariable",
+        sal_True,
+        SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked
+    },
 
-            nProperties++;
-        }
-    }
+#ifdef ENABLE_LOCKDOWN
+    {
+        SETTING_WRITER_DEFAULT_DOC_FORMAT,
+        "/apps/openoffice/writer_default_document_format",
+        "TextDocumentSetupFactoryDefaultFilter",
+        sal_False,
+        SETTINGS_LAST
+    },
 
-    if( nProperties > 0 )
     {
-        aPropInfoList.realloc( nProperties );
-        m_xLayerContentDescriber->describeLayer( xHandler, aPropInfoList );
-    }
-}
+        SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
+        "/apps/openoffice/impress_default_document_format",
+        "PresentationDocumentSetupFactoryDefaultFilter",
+        sal_False,
+        SETTINGS_LAST
+    },
 
-//------------------------------------------------------------------------------
+    {
+        SETTING_CALC_DEFAULT_DOC_FORMAT,
+        "/apps/openoffice/calc_default_document_format",
+        "SpreadsheetDocumentSetupFactoryDefaultFilter",
+        sal_False,
+        SETTINGS_LAST
+    },
 
-rtl::OUString SAL_CALL GconfLayer::getTimestamp( void )
-    throw (uno::RuntimeException)
-{
-    // Return a hash of the values as timestamp to avoid regenerating 
-    // the binary cache on each office launch.
-    rtl::OStringBuffer aTimeStamp;
+    {
+        SETTING_AUTO_SAVE,
+        GCONF_AUTO_SAVE_KEY,
+        "AutoSaveEnabled",
+        sal_False,
+        SETTINGS_LAST
+    },
 
-    // Make sure the timestamp differs from beta
-    sal_Int32 nHashCode = 0;
-    
-    GConfClient* aClient = GconfBackend::getGconfClient();
-    GConfValue* aGconfValue;
-    int i = 0;
+    {
+        SETTING_AUTO_SAVE_INTERVAL,
+        "/apps/openoffice/auto_save_interval",
+        "AutoSaveTimeIntervall",
+        sal_False,
+        SETTING_AUTO_SAVE
+    },
+
+    {
+        SETTING_USER_GIVENNAME,
+        "/desktop/gnome/url-handlers/mailto/command", // dummy
+        "givenname",
+        sal_True,
+        SETTING_USER_GIVENNAME
+    },
+
+    {
+        SETTING_USER_SURNAME,
+        "/desktop/gnome/url-handlers/mailto/command", // dummy
+        "sn",
+        sal_True,
+        SETTING_USER_SURNAME
+    },
+
+    {
+        SETTING_DISABLE_PRINTING,
+        "/desktop/gnome/lockdown/disable_printing",
+        "DisablePrinting",
+        sal_True,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_USE_SYSTEM_FILE_DIALOG,
+        "/apps/openoffice/use_system_file_dialog",
+        "UseSystemFileDialog",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_PRINTING_MODIFIES_DOCUMENT,
+        "/apps/openoffice/printing_modifies_doc",
+        "PrintingModifiesDocument",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_SHOW_ICONS_IN_MENUS,
+        "/apps/openoffice/show_menu_icons",
+        "ShowIconsInMenues",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_SHOW_INACTIVE_MENUITEMS,
+        "/apps/openoffice/show_menu_inactive_items",
+        "DontHideDisabledEntry",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_SHOW_FONT_PREVIEW,
+        "/apps/openoffice/show_font_preview",
+        "ShowFontBoxWYSIWYG",
+        sal_False,
+        SETTINGS_LAST
+    },
 
-    while( m_pPreloadValuesList[i] != NULL )
-        gconf_client_preload( aClient, m_pPreloadValuesList[i++], GCONF_CLIENT_PRELOAD_ONELEVEL, NULL );
+    {
+        SETTING_SHOW_FONT_HISTORY,
+        "/apps/openoffice/show_font_history",
+        "FontViewHistory",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_ENABLE_OPENGL,
+        "/apps/openoffice/use_opengl",
+        "OpenGL",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_OPTIMIZE_OPENGL,
+        "/apps/openoffice/optimize_opengl",
+        "OpenGL_Faster",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_USE_SYSTEM_FONT,
+        "/apps/openoffice/use_system_font",
+        "AccessibilityIsSystemFont",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_USE_FONT_ANTI_ALIASING,
+        "/apps/openoffice/use_font_anti_aliasing",
+        "FontAntiAliasingEnabled",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
+        "/apps/openoffice/font_anti_aliasing_min_pixel",
+        "FontAntiAliasingMinPixelHeight",
+        sal_True,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_WARN_CREATE_PDF,
+        "/apps/openoffice/lockdown/warn_info_create_pdf",
+        "WarnCreatePDF",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_WARN_PRINT_DOC,
+        "/apps/openoffice/lockdown/warn_info_printing",
+        "WarnPrintDoc",
+        sal_False,
+        SETTINGS_LAST
+    },
 
-    for( i = 0; i < m_nConfigurationValues; i++ )
     {
-        aGconfValue = gconf_client_get( aClient, m_pConfigurationValuesList[i].GconfItem, NULL );
+        SETTING_WARN_SAVEORSEND_DOC,
+        "/apps/openoffice/lockdown/warn_info_saving",
+        "WarnSaveOrSendDoc",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_WARN_SIGN_DOC,
+        "/apps/openoffice/lockdown/warn_info_signing",
+        "WarnSignDoc",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_REMOVE_PERSONAL_INFO,
+        "/apps/openoffice/lockdown/remove_personal_info_on_save",
+        "Scripting/RemovePersonalInfoOnSaving",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_RECOMMEND_PASSWORD,
+        "/apps/openoffice/lockdown/recommend_password_on_save",
+        "RecommendPasswordProtection",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_UNDO_STEPS,
+        "/apps/openoffice/undo_steps",
+        "UndoSteps",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_SYMBOL_SET,
+        "/apps/openoffice/icon_size",
+        "SymbolSet",
+        sal_True,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_MACRO_SECURITY_LEVEL,
+        "/apps/openoffice/lockdown/macro_security_level",
+        "MacroSecurityLevel",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_CREATE_BACKUP,
+        "/apps/openoffice/create_backup",
+        "CreateBackup",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+    {
+        SETTING_WARN_ALIEN_FORMAT,
+        "/apps/openoffice/warn_alien_format",
+        "WarnAlienFormat",
+        sal_False,
+        SETTINGS_LAST
+    },
+
+#endif // ENABLE_LOCKDOWN
+};
+
+std::size_t const nConfigurationValues =
+    sizeof ConfigurationValues / sizeof ConfigurationValues[0];
+
+css::beans::Optional< css::uno::Any > getValue(ConfigurationValue const & data)
+{
+    GConfClient* aClient = getGconfClient();
+    GConfValue* aGconfValue;
+    if( ( data.nDependsOn == SETTINGS_LAST ) || isDependencySatisfied( aClient, data ) )
+    {
+        aGconfValue = gconf_client_get( aClient, data.GconfItem, NULL );
 
         if( aGconfValue != NULL )
         {
-            switch( aGconfValue->type )
-            {
-                case GCONF_VALUE_BOOL:
-                    nHashCode ^= (sal_Int32) !gconf_value_get_bool( aGconfValue );
-                    break;
-
-                case GCONF_VALUE_INT:
-                    nHashCode ^= (sal_Int32) gconf_value_get_int( aGconfValue );
-                    break;
-
-                case GCONF_VALUE_STRING:
-                    nHashCode ^= (sal_Int32) g_str_hash( gconf_value_get_string( aGconfValue ) );
-                    break;
-
-                case GCONF_VALUE_LIST:
-                    if( GCONF_VALUE_STRING == gconf_value_get_list_type( aGconfValue ) )
-                    {
-                        GSList *list = gconf_value_get_list( aGconfValue );
-                        for(; list; list = g_slist_next(list))
-                            nHashCode ^= (sal_Int32) g_str_hash( gconf_value_get_string((GConfValue *) list->data) );
-                        break;
-                    }
-                    
-                default:
-                    fprintf( stderr, "getTimestamp: Type not handled.\n" );
-                    break;
-            }
-            nHashCode = (nHashCode << 5) - nHashCode;
+            css::uno::Any value;
+            if( data.bNeedsTranslation )
+                value = translateToOOo( data, aGconfValue );
+            else
+                value = makeAnyOfGconfValue( aGconfValue );
+
             gconf_value_free( aGconfValue );
+
+            return css::beans::Optional< css::uno::Any >(true, value);
         }
     }
+    return css::beans::Optional< css::uno::Any >();
+}
 
-    return rtl::OUString::valueOf( nHashCode );
 }
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
new file mode 100644
index 0000000000..6406b4419e
--- /dev/null
+++ b/shell/source/backends/gconfbe/gconfaccess.hxx
@@ -0,0 +1,119 @@
+/*************************************************************************
+*
+* 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_SHELL_SOURCE_BACKENDS_GCONFBE_GCONFACCESS_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_GCONFACCESS_HXX
+
+#include "sal/config.h"
+
+#include <cstddef>
+
+#include "com/sun/star/beans/Optional.hpp"
+#include "gconf/gconf-client.h"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+} } } }
+
+namespace gconfaccess {
+
+enum ConfigurationSetting
+{
+    SETTING_PROXY_MODE,
+    SETTING_PROXY_HTTP_HOST,
+    SETTING_PROXY_HTTP_PORT,
+    SETTING_PROXY_HTTPS_HOST,
+    SETTING_PROXY_HTTPS_PORT,
+    SETTING_PROXY_FTP_HOST,
+    SETTING_PROXY_FTP_PORT,
+    SETTING_NO_PROXY_FOR,
+    SETTING_ENABLE_ACCESSIBILITY,
+    SETTING_MAILER_PROGRAM,
+    SETTING_WORK_DIRECTORY,
+    SETTING_SOURCEVIEWFONT_NAME,
+    SETTING_SOURCEVIEWFONT_HEIGHT,
+    SETTING_USER_GIVENNAME,
+    SETTING_USER_SURNAME,
+
+#ifdef ENABLE_LOCKDOWN
+
+    SETTING_DISABLE_PRINTING,
+    SETTING_USE_SYSTEM_FILE_DIALOG,
+    SETTING_PRINTING_MODIFIES_DOCUMENT,
+    SETTING_SHOW_ICONS_IN_MENUS,
+    SETTING_SHOW_INACTIVE_MENUITEMS,
+    SETTING_SHOW_FONT_PREVIEW,
+    SETTING_SHOW_FONT_HISTORY,
+    SETTING_ENABLE_OPENGL,
+    SETTING_OPTIMIZE_OPENGL,
+    SETTING_SAVE_DOCUMENT_WINDOWS,
+    SETTING_SAVE_DOCUMENT_VIEW_INFO,
+    SETTING_USE_SYSTEM_FONT,
+    SETTING_USE_FONT_ANTI_ALIASING,
+    SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
+    SETTING_WARN_CREATE_PDF,
+    SETTING_WARN_PRINT_DOC,
+    SETTING_WARN_SAVEORSEND_DOC,
+    SETTING_WARN_SIGN_DOC,
+    SETTING_REMOVE_PERSONAL_INFO,
+    SETTING_RECOMMEND_PASSWORD,
+    SETTING_UNDO_STEPS,
+    SETTING_SYMBOL_SET,
+    SETTING_MACRO_SECURITY_LEVEL,
+    SETTING_CREATE_BACKUP,
+    SETTING_WARN_ALIEN_FORMAT,
+    SETTING_AUTO_SAVE,
+    SETTING_AUTO_SAVE_INTERVAL,
+    SETTING_WRITER_DEFAULT_DOC_FORMAT,
+    SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
+    SETTING_CALC_DEFAULT_DOC_FORMAT,
+
+#endif // ENABLE_LOCKDOWN
+
+    SETTINGS_LAST
+};
+
+struct ConfigurationValue
+{
+    const ConfigurationSetting nSettingId;    
+    const gchar *GconfItem;
+    const char *OOoConfItem;
+    const sal_Bool bNeedsTranslation;
+    const ConfigurationSetting nDependsOn;
+};
+
+extern ConfigurationValue const ConfigurationValues[];
+
+extern std::size_t const nConfigurationValues;
+
+com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
+    ConfigurationValue const & data);
+
+}
+
+#endif
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index 4918eeadba..122d1cad02 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -1,1010 +1,239 @@
 /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: gconfbackend.cxx,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.
- *
- ************************************************************************/
+*
+* 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_shell.hxx"
-
-#include "gconfbackend.hxx"
-#include "gconflayer.hxx"
-#include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-
-#ifndef INCLUDED_VECTOR
-#include <vector>
-#define INCLUDED_VECTOR
-#endif
-#include <osl/process.h>
-#include <osl/time.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/byteseq.h>
-
-#include <stdio.h>
-
-#ifdef ENABLE_LOCKDOWN
-// each entry should have an identifying ConfigurationSetting
-static const ConfigurationValue SetupConfigurationValuesList[] =
-{
-    {
-        SETTING_WRITER_DEFAULT_DOC_FORMAT,
-        "/apps/openoffice/writer_default_document_format",
-        "org.openoffice.Setup/Office/Factories/com.sun.star.text.TextDocument/ooSetupFactoryDefaultFilter",
-        "string",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
-        "/apps/openoffice/impress_default_document_format",
-        "org.openoffice.Setup/Office/Factories/com.sun.star.presentation.PresentationDocument/ooSetupFactoryDefaultFilter",
-        "string",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_CALC_DEFAULT_DOC_FORMAT,
-        "/apps/openoffice/calc_default_document_format",
-        "org.openoffice.Setup/Office/Factories/com.sun.star.sheet.SpreadsheetDocument/ooSetupFactoryDefaultFilter",
-        "string",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-};
-#endif // ENABLE_LOCKDOWN
-
-#ifdef ENABLE_LOCKDOWN
-// each entry should have an identifying ConfigurationSetting
-static const ConfigurationValue RecoveryConfigurationValuesList[] =
-{
-    {
-        SETTING_AUTO_SAVE,
-        GCONF_AUTO_SAVE_KEY,
-        "org.openoffice.Office.Recovery/AutoSave/Enabled",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_AUTO_SAVE_INTERVAL,
-        "/apps/openoffice/auto_save_interval",
-        "org.openoffice.Office.Recovery/AutoSave/TimeIntervall",
-        "int",
-        sal_False,
-        sal_False,
-        SETTING_AUTO_SAVE
-    },
-};
-#endif // ENABLE_LOCKDOWN
-
-/*
- * This should be in a different backend actually, but this has to wait ..
- */
-
-#ifdef ENABLE_LOCKDOWN
-// each entry should have an identifying ConfigurationSetting
-static const ConfigurationValue UserProfileConfigurationValuesList[] =
-{
-    {
-        SETTING_USER_GIVENNAME,
-        "/desktop/gnome/url-handlers/mailto/command", // dummy, needed for getTimestamp
-        "org.openoffice.UserProfile/Data/givenname",
-        "string",
-        sal_False,
-        sal_True,
-        SETTING_USER_GIVENNAME
-    },
-
-    {
-        SETTING_USER_SURNAME,
-        "/desktop/gnome/url-handlers/mailto/command", // dummy, needed for getTimestamp
-        "org.openoffice.UserProfile/Data/sn",
-        "string",
-        sal_False,
-        sal_True,
-        SETTING_USER_SURNAME
-    },
-};
-#endif // ENABLE_LOCKDOWN
-
-// each entry should have an identifying ConfigurationSetting
-static const ConfigurationValue VCLConfigurationValuesList[] =
-{
-    {
-        SETTING_ENABLE_ACCESSIBILITY,
-        "/desktop/gnome/interface/accessibility",
-        "org.openoffice.VCL/Settings/Accessibility/EnableATToolSupport",
-        "string",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-
-#ifdef ENABLE_LOCKDOWN
-
-    {
-        SETTING_DISABLE_PRINTING,
-        "/desktop/gnome/lockdown/disable_printing",
-        "org.openoffice.VCL/Settings/DesktopManagement/DisablePrinting",
-        "string",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-
-#endif // ENABLE_LOCKDOWN
-
-};
-
-// each entry should have an identifying ConfigurationSetting
-static const ConfigurationValue InetConfigurationValuesList[] =
-{
-    {
-        SETTING_PROXY_MODE,
-        GCONF_PROXY_MODE_KEY,
-        "org.openoffice.Inet/Settings/ooInetProxyType",
-        "int",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_PROXY_HTTP_HOST,
-        "/system/http_proxy/host",
-        "org.openoffice.Inet/Settings/ooInetHTTPProxyName",
-        "string",
-        sal_False,
-        sal_False,
-        SETTING_PROXY_MODE
-    },
-
-    {
-        SETTING_PROXY_HTTP_PORT,
-        "/system/http_proxy/port",
-        "org.openoffice.Inet/Settings/ooInetHTTPProxyPort",
-        "int",
-        sal_False,
-        sal_False,
-        SETTING_PROXY_MODE
-    },
-
-     {
-        SETTING_PROXY_HTTPS_HOST,
-        "/system/proxy/secure_host",
-        "org.openoffice.Inet/Settings/ooInetHTTPSProxyName",
-        "string",
-        sal_False,
-        sal_False,
-        SETTING_PROXY_MODE
-    },
-
-    {
-        SETTING_PROXY_HTTPS_PORT,
-        "/system/proxy/secure_port",
-        "org.openoffice.Inet/Settings/ooInetHTTPSProxyPort",
-        "int",
-        sal_False,
-        sal_False,
-        SETTING_PROXY_MODE
-    },
-
-    {
-        SETTING_PROXY_FTP_HOST,
-        "/system/proxy/ftp_host",
-        "org.openoffice.Inet/Settings/ooInetFTPProxyName",
-        "string",
-        sal_False,
-        sal_False,
-        SETTING_PROXY_MODE
-    },
-
-    {
-        SETTING_PROXY_FTP_PORT,
-        "/system/proxy/ftp_port",
-        "org.openoffice.Inet/Settings/ooInetFTPProxyPort",
-        "int",
-        sal_False,
-        sal_False,
-        SETTING_PROXY_MODE
-    },
-    
-    {
-        SETTING_NO_PROXY_FOR,
-        "/system/http_proxy/ignore_hosts",
-        "org.openoffice.Inet/Settings/ooInetNoProxy",
-        "string",
-        sal_False,
-        sal_True,
-        SETTING_PROXY_MODE
-    },
-};
-
-// each entry should have an identifying ConfigurationSetting
-static const ConfigurationValue CommonConfigurationValuesList[] =
-{
-    {
-        SETTING_MAILER_PROGRAM,
-        "/desktop/gnome/url-handlers/mailto/command",
-        "org.openoffice.Office.Common/ExternalMailer/Program",
-        "string",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-    {
-        SETTING_SOURCEVIEWFONT_NAME,
-        "/desktop/gnome/interface/monospace_font_name",
-        "org.openoffice.Office.Common/Font/SourceViewFont/FontName",
-        "string",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-    {
-        SETTING_SOURCEVIEWFONT_HEIGHT,
-        "/desktop/gnome/interface/monospace_font_name",
-        "org.openoffice.Office.Common/Font/SourceViewFont/FontHeight",
-        "short",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-
-#ifdef ENABLE_LOCKDOWN
-
-    {
-        SETTING_USE_SYSTEM_FILE_DIALOG,
-        "/apps/openoffice/use_system_file_dialog",
-        "org.openoffice.Office.Common/Misc/UseSystemFileDialog",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_DISABLE_UI_CUSTOMIZATION,
-        "/apps/openoffice/lockdown/disable_ui_customization",
-        "org.openoffice.Office.Common/Misc/DisableUICustomization",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_PRINTING_MODIFIES_DOCUMENT,
-        "/apps/openoffice/printing_modifies_doc",
-        "org.openoffice.Office.Common/Print/PrintingModifiesDocument",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_SHOW_ICONS_IN_MENUS,
-        "/apps/openoffice/show_menu_icons",
-        "org.openoffice.Office.Common/View/Menu/ShowIconsInMenues",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_SHOW_INACTIVE_MENUITEMS,
-        "/apps/openoffice/show_menu_inactive_items",
-        "org.openoffice.Office.Common/View/Menu/DontHideDisabledEntry",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_SHOW_FONT_PREVIEW,
-        "/apps/openoffice/show_font_preview",
-        "org.openoffice.Office.Common/Font/View/ShowFontBoxWYSIWYG",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_SHOW_FONT_HISTORY,
-        "/apps/openoffice/show_font_history",
-        "org.openoffice.Office.Common/Font/View/History",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_ENABLE_OPENGL,
-        "/apps/openoffice/use_opengl",
-        "org.openoffice.Office.Common/_3D_Engine/OpenGL",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_OPTIMIZE_OPENGL,
-        "/apps/openoffice/optimize_opengl",
-        "org.openoffice.Office.Common/_3D_Engine/OpenGL_Faster",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_USE_SYSTEM_FONT,
-        "/apps/openoffice/use_system_font",
-        "org.openoffice.Office.Common/Accessibility/IsSystemFont",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_USE_FONT_ANTI_ALIASING,
-        "/apps/openoffice/use_font_anti_aliasing",
-        "org.openoffice.Office.Common/View/FontAntiAliasing/Enabled",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
-        "/apps/openoffice/font_anti_aliasing_min_pixel",
-        "org.openoffice.Office.Common/View/FontAntiAliasing/MinPixelHeight",
-        "short",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_WARN_CREATE_PDF,
-        "/apps/openoffice/lockdown/warn_info_create_pdf",
-        "org.openoffice.Office.Common/Security/Scripting/WarnCreatePDF",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_WARN_PRINT_DOC,
-        "/apps/openoffice/lockdown/warn_info_printing",
-        "org.openoffice.Office.Common/Security/Scripting/WarnPrintDoc",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_WARN_SAVEORSEND_DOC,
-        "/apps/openoffice/lockdown/warn_info_saving",
-        "org.openoffice.Office.Common/Security/Scripting/WarnSaveOrSendDoc",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_WARN_SIGN_DOC,
-        "/apps/openoffice/lockdown/warn_info_signing",
-        "org.openoffice.Office.Common/Security/Scripting/WarnSignDoc",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_REMOVE_PERSONAL_INFO,
-        "/apps/openoffice/lockdown/remove_personal_info_on_save",
-        "org.openoffice.Office.Common/Security/Scripting/RemovePersonalInfoOnSaving",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_RECOMMEND_PASSWORD,
-        "/apps/openoffice/lockdown/recommend_password_on_save",
-        "org.openoffice.Office.Common/Security/Scripting/RecommendPasswordProtection",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_UNDO_STEPS,
-        "/apps/openoffice/undo_steps",
-        "org.openoffice.Office.Common/Undo/Steps",
-        "int",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_SYMBOL_SET,
-        "/apps/openoffice/icon_size",
-        "org.openoffice.Office.Common/Misc/SymbolSet",
-        "short",
-        sal_False,
-        sal_True,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_MACRO_SECURITY_LEVEL,
-        "/apps/openoffice/lockdown/macro_security_level",
-        "org.openoffice.Office.Common/Security/Scripting/MacroSecurityLevel",
-        "int",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_CREATE_BACKUP,
-        "/apps/openoffice/create_backup",
-        "org.openoffice.Office.Common/Save/Document/CreateBackup",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-    {
-        SETTING_WARN_ALIEN_FORMAT,
-        "/apps/openoffice/warn_alien_format",
-        "org.openoffice.Office.Common/Save/Document/WarnAlienFormat",
-        "boolean",
-        sal_False,
-        sal_False,
-        SETTINGS_LAST
-    },
-
-#endif // ENABLE_LOCKDOWN
-
-};
-
-static const ConfigurationValue PathsConfigurationValuesList[] =
-{
-    {
-        SETTING_WORK_DIRECTORY,
-        "/desktop/gnome/url-handlers/mailto/command", // dummy, needed for getTimestamp
-        "org.openoffice.Office.Paths/Variables/Work",
-        "string",
-        sal_False,
-        sal_True,
-        SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked
-    },
-};
-
-#ifdef ENABLE_LOCKDOWN
-static const char * SetupPreloadValuesList[] =
-{
-    "/apps/openoffice",
-    NULL
-};
-#endif // ENABLE_LOCKDOWN
-
-#ifdef ENABLE_LOCKDOWN
-static const char * RecoveryPreloadValuesList[] =
-{
-    "/apps/openoffice",
-    NULL
-};
-#endif // ENABLE_LOCKDOWN
-
-#ifdef ENABLE_LOCKDOWN
-static const char * UserProfilePreloadValuesList[] =
-{
-    NULL
-};
-#endif // ENABLE_LOCKDOWN
-
-static const char * VCLPreloadValuesList[] =
-{
-    "/desktop/gnome/interface",
-#ifdef ENABLE_LOCKDOWN
-    "/desktop/gnome/lockdown",
-#endif // ENABLE_LOCKDOWN
-    NULL
-};
-
-static const char * InetPreloadValuesList[] =
-{
-    "/system/proxy",
-    "/system/http_proxy/host",
-    NULL
-};
-
-static const char * CommonPreloadValuesList[] =
-{
-    "/desktop/gnome/url-handlers/mailto",
-#ifdef ENABLE_LOCKDOWN
-    "/apps/openoffice/lockdown",
-    "/apps/openoffice",
-#endif // ENABLE_LOCKDOWN
-    NULL
-};
-
-static const char * PathsPreloadValuesList[] =
-{
-    NULL
-};
-
-//==============================================================================
-
-/*
-void ONotificationThread::run()
-{
-    mLoop= NULL;
-    //Need to start a GMain loop for notifications to work
-    mLoop=g_main_loop_new(g_main_context_default(),FALSE);
-    g_main_loop_run(mLoop);
-} ; 
-
-*/
-
-//------------------------------------------------------------------------------
-
-GconfBackend* GconfBackend::mInstance= 0;
-
-GconfBackend* GconfBackend::createInstance(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    if(mInstance == 0)
-    {
-        mInstance = new GconfBackend (xContext);
-    }
-    
-    return mInstance;
-}
-
-//------------------------------------------------------------------------------
-
-GconfBackend::GconfBackend(const uno::Reference<uno::XComponentContext>& xContext)
-        throw (backend::BackendAccessException)
-    : BackendBase(mMutex), m_xContext(xContext)
-//    , mNotificationThread(NULL)
-          
-        
-{
+#include "sal/config.h"
+
+#include <cstddef>
+
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XVetoableChangeListener.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XCurrentContext.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/current_context.hxx"
+#include "uno/lbnames.h"
+
+#include "gconfaccess.hxx"
+#include "orbit.h"
+
+namespace {
+
+namespace css = com::sun::star;
+
+rtl::OUString SAL_CALL getServiceImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.backend.GconfBackend"));
 }
 
-//------------------------------------------------------------------------------
-
-GconfBackend::~GconfBackend(void) {
-  
-    
-//    delete (mNotificationThread);
-    GconfBackend::mClient = NULL;
-
+css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.backend.GconfBackend"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
-//------------------------------------------------------------------------------
-
-GConfClient* GconfBackend::mClient= 0;
-
-
-GConfClient* GconfBackend::getGconfClient()
-{
-    
-    if (mClient == NULL)
-    {
-        /* initialize glib object type library */
-        g_type_init();
-    
-        GError* aError = NULL;
-        if (!gconf_init(0, NULL, &aError))
-        {
-            rtl::OUStringBuffer msg;
-            msg.appendAscii("GconfBackend:GconfLayer: Cannot Initialize Gconf connection - " );
-            msg.appendAscii(aError->message);
-            
-            g_error_free(aError); 
-            aError = NULL;
-            throw uno::RuntimeException(msg.makeStringAndClear(),NULL);
-        }
-    
-        mClient = gconf_client_get_default();
-        if (!mClient)
-        {
-            throw uno::RuntimeException(rtl::OUString::createFromAscii
-                ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
-        }
-    } 
-
-    return mClient;
-}
-
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XLayer> SAL_CALL GconfBackend::getLayer(
-    const rtl::OUString& aComponent, const rtl::OUString& /*aTimestamp*/)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException)
-{
-    uno::Reference<backend::XLayer> xLayer;
-    
-    if( aComponent.equalsAscii("org.openoffice.Office.Common" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 CommonConfigurationValuesList,
-                                 G_N_ELEMENTS( CommonConfigurationValuesList ),
-                                 CommonPreloadValuesList );
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Inet" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 InetConfigurationValuesList,
-                                 G_N_ELEMENTS( InetConfigurationValuesList ),
-                                 InetPreloadValuesList );
-    }
-    else if( aComponent.equalsAscii("org.openoffice.VCL" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 VCLConfigurationValuesList,
-                                 G_N_ELEMENTS( VCLConfigurationValuesList ),
-                                 VCLPreloadValuesList );
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Office.Paths" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 PathsConfigurationValuesList,
-                                 G_N_ELEMENTS( PathsConfigurationValuesList ),
-                                 PathsPreloadValuesList );
-    }
+class Service:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::beans::XPropertySet >,
+    private boost::noncopyable
+{
+public:
+    Service();
+
+private:
+    virtual ~Service() {}
+
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return getServiceImplementationName(); }
+
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; }
+
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return getServiceSupportedServiceNames(); }
+
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+    getPropertySetInfo() throw (css::uno::RuntimeException)
+    { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
+
+    virtual void SAL_CALL setPropertyValue(
+        rtl::OUString const &, css::uno::Any const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+    virtual css::uno::Any SAL_CALL getPropertyValue(
+        rtl::OUString const & PropertyName)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL addPropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removePropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL addVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    bool enabled_;
+};
 
-#ifdef ENABLE_LOCKDOWN
-    else if( aComponent.equalsAscii("org.openoffice.UserProfile" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 UserProfileConfigurationValuesList,
-                                 G_N_ELEMENTS( UserProfileConfigurationValuesList ),
-                                 UserProfilePreloadValuesList );
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Office.Recovery" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 RecoveryConfigurationValuesList,
-                                 G_N_ELEMENTS( RecoveryConfigurationValuesList ),
-                                 RecoveryPreloadValuesList );
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Setup" ) )
-    {
-        xLayer = new GconfLayer( m_xContext,
-                                 SetupConfigurationValuesList,
-                                 G_N_ELEMENTS( SetupConfigurationValuesList ),
-                                 SetupPreloadValuesList );
+Service::Service(): enabled_(false) {
+    css::uno::Reference< css::uno::XCurrentContext > context(
+        css::uno::getCurrentContext());
+    if (context.is()) {
+        rtl::OUString desktop;
+        context->getValueByName(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
+            desktop;
+        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")) &&
+            ((orbit_major_version == 2 && orbit_minor_version >= 8) ||
+             orbit_major_version > 2);
+            // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
     }
-#endif // ENABLE_LOCKDOWN
-    
-    return xLayer;
 }
 
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-GconfBackend::getUpdatableLayer(const rtl::OUString& /*aComponent*/) 
-    throw (backend::BackendAccessException,lang::NoSupportException,	   
-           lang::IllegalArgumentException)
+void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
 {
-    throw lang::NoSupportException( rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("GconfBackend: No Update Operation allowed, Read Only access") ),
-        *this) ; 
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-//------------------------------------------------------------------------------
-
-// currently not used
-#if 0
-static void
-keyChangedCallback(GConfClient* aClient,
-                   guint aID,
-                   GConfEntry* aEntry,
-                   gpointer aBackend)
+css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
 {
-
-    OSL_TRACE("In KeyChangedCallback Function");
-    rtl::OUString aGconfKey= rtl::OUString::createFromAscii(aEntry->key);
-    GconfBackend * aGconfBe = (GconfBackend*) aBackend;
-    
-    aGconfBe->notifyListeners(aGconfKey);
-
-}
-
-//------------------------------------------------------------------------------
-
-void GconfBackend::notifyListeners(const rtl::OUString& /*aGconfKey*/)
-{
-/*
-    //look up associated component from Map using GconfKey
-    KeyMappingTable::iterator aIter;
-    rtl::OUString aComponent; 
-    for( aIter= mKeyMap.begin(); aIter != mKeyMap.end(); aIter++)
-    {
-        if (aIter->second.mGconfName == aGconfKey)
-        {
-            aComponent = aIter->first;
-            break;
-        }
-    
-    }    
-    
-  
-    //Need to store updated layer TimeStamp as Gconf library
-    //has no access to TimeStamp via its api
-    TimeValue aTimeValue ={0,0} ;
-    osl_getSystemTime(&aTimeValue);
-   
-    oslDateTime aLayerTS;
-    rtl::OUString aTimeStamp;
-
-    if (osl_getDateTimeFromTimeValue(&aTimeValue, &aLayerTS)) {
-        sal_Char asciiStamp [20] ;
-
-        sprintf(asciiStamp, "%04d%02d%02d%02d%02d%02dZ",
-                aLayerTS.Year, aLayerTS.Month, aLayerTS.Day,
-                aLayerTS.Hours, aLayerTS.Minutes, aLayerTS.Seconds) ;
-        aTimeStamp = rtl::OUString::createFromAscii(asciiStamp) ;
-    }
-
-    
-    TSMappingTable::iterator aTSIter;
-    aTSIter = mTSMap.find(aComponent);
-    if (aTSIter == mTSMap.end())
-    { 
-        mTSMap.insert(TSMappingTable::value_type(aComponent,aTimeStamp));
-    }
-    else
-    {
-        aTSIter->second = aTimeStamp;
-    
-    }
-    typedef ListenerList::iterator LLIter;
-    typedef std::pair<LLIter, LLIter> BFRange;
-    BFRange aRange = mListenerList.equal_range(aComponent);
-    while (aRange.first != aRange.second)
-    {
-        LLIter cur = aRange.first++;       
-        backend::ComponentChangeEvent aEvent;
-        aEvent.Component = aComponent;
-        aEvent.Source = *this;
-        cur->second->componentDataChanged(aEvent);
-    
-    }
-*/
-} 
-#endif
-
-//------------------------------------------------------------------------------
-void SAL_CALL GconfBackend::addChangesListener( 
-    const uno::Reference<backend::XBackendChangesListener>& xListener,
-    const rtl::OUString& aComponent)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-/*
-    osl::MutexGuard aGuard(mMutex);
-    
-    GConfClient* aClient = getGconfClient();
-    
-    ListenerList::iterator aIter;
-    aIter = mListenerList.find(aComponent);
-    if (aIter == mListenerList.end())
-    {
-        typedef KeyMappingTable::iterator KMTIter;
-        typedef std::pair<KMTIter, KMTIter> BFRange;
-        
-        BFRange aRange = mKeyMap.equal_range(aComponent);
-    
-        while (aRange.first != aRange.second)
-        {
-            KMTIter cur = aRange.first++;
-            
-            sal_Int32 nIndex = cur->second.mGconfName.lastIndexOf('/');  
-            rtl::OUString aDirectory = cur->second.mGconfName.copy(0, nIndex);
-            rtl::OString aDirectoryStr= rtl::OUStringToOString(aDirectory, RTL_TEXTENCODING_ASCII_US);
-            GError* aError = NULL;
-            gconf_client_add_dir(aClient,
-                                 aDirectoryStr.getStr(),
-                                 GCONF_CLIENT_PRELOAD_NONE,
-                                 &aError);
-            
-            if(aError != NULL)
-            {
-                OSL_TRACE("GconfBackend:: Cannot register listener for Component %s", 
-                    rtl::OUStringToOString(aComponent, RTL_TEXTENCODING_ASCII_US).getStr() );
-            }
-            
-            rtl::OString aKey =  rtl::OUStringToOString(cur->second.mGconfName,                    
-                                                        RTL_TEXTENCODING_ASCII_US);
-            
-            GConfClientNotifyFunc aNotifyFunc = &keyChangedCallback;
-            sal_uInt32 aID = gconf_client_notify_add(
-                                                    aClient,
-                                                    aKey.getStr(),
-                                                    aNotifyFunc,
-                                                    this,
-                                                    NULL,
-                                                    &aError);
-            if(aError != NULL)
-            {
-                OSL_TRACE("GconfBackend:: Cannot register listener for Component %s", 
-                    rtl::OUStringToOString(aComponent, RTL_TEXTENCODING_ASCII_US).getStr() );
-            }
-
-       
-            
-        }    
-        
-    }
-*/
-
-/*    
-    if (mNotificationThread == NULL)
-    {
-        
-        mNotificationThread = new ONotificationThread();
-        
-        if ( mNotificationThread == NULL)
-        {
-          OSL_ENSURE(false,"Could not start Notification Thread ");
-        }
-        else
+    for (std::size_t i = 0; i < gconfaccess::nConfigurationValues; ++i) {
+        if (PropertyName.equalsAscii(
+                gconfaccess::ConfigurationValues[i].OOoConfItem))
         {
-            mNotificationThread->create();
+            return css::uno::makeAny(
+                enabled_
+                ? gconfaccess::getValue(gconfaccess::ConfigurationValues[i])
+                : css::beans::Optional< css::uno::Any >());
         }
     }
-*/   
-    //Store listener in list
-    mListenerList.insert(ListenerList::value_type(aComponent, xListener));
-   
-
-}
-//------------------------------------------------------------------------------
-void SAL_CALL GconfBackend::removeChangesListener( 
-    const uno::Reference<backend::XBackendChangesListener>& /*xListener*/,
-    const rtl::OUString& /*aComponent*/)
-    throw (::com::sun::star::uno::RuntimeException)
-{
-/*
-    osl::MutexGuard aGuard(mMutex);
-    GConfClient* aClient = GconfBackend::getGconfClient();	
-    ListenerList::iterator aIter;
-    aIter = mListenerList.find(aComponent);
-    if (aIter == mListenerList.end())
-    {
-        
-        OSL_TRACE("GconfBackend:: Cannot deregister listener for Component %s - Listner not registered", 
-                    rtl::OUStringToOString(aComponent, RTL_TEXTENCODING_ASCII_US).getStr() );
-        
-        typedef KeyMappingTable::iterator KMTIter;
-        typedef std::pair<KMTIter, KMTIter> BFRange;
-        
-        BFRange aRange = mKeyMap.equal_range(aComponent);
-    
-        while (aRange.first != aRange.second)
-    {
-            KMTIter cur = aRange.first++;
-            
-            sal_Int32 nIndex = cur->second.mGconfName.lastIndexOf('/');  
-            rtl::OUString aDirectory = cur->second.mGconfName.copy(0, nIndex);
-            rtl::OString aDirectoryStr= rtl::OUStringToOString(aDirectory, RTL_TEXTENCODING_ASCII_US);
-            GError* aError = NULL;
-            gconf_client_remove_dir(aClient,
-                                    aDirectoryStr.getStr(),
-                                    &aError);
-              
-            if(aError != NULL)
-            {
-                OSL_TRACE("GconfBackend:: Cannot deRegister listener for Component %s", 
-                    rtl::OUStringToOString(aComponent, RTL_TEXTENCODING_ASCII_US).getStr() );
-            }
-       }
-    }
-*/
+    throw css::beans::UnknownPropertyException(
+        PropertyName, static_cast< cppu::OWeakObject * >(this));
 }
 
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL GconfBackend::getBackendName(void) {
-    return rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.GconfBackend") );
+css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
+    css::uno::Reference< css::uno::XComponentContext > const &)
+{
+    return static_cast< cppu::OWeakObject * >(new Service);
 }
 
-//------------------------------------------------------------------------------
+static cppu::ImplementationEntry const services[] = {
+    { &createInstance, &getServiceImplementationName,
+      &getServiceSupportedServiceNames, &cppu::createSingleComponentFactory, 0,
+      0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
 
-rtl::OUString SAL_CALL GconfBackend::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return getBackendName() ;
 }
 
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL GconfBackend::getBackendServiceNames(void) 
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
-    uno::Sequence<rtl::OUString> aServices(1) ;
-    aServices[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.GconfBackend")) ;
-
-    return aServices ;
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
 }
 
-//------------------------------------------------------------------------------
-
-sal_Bool SAL_CALL GconfBackend::supportsService(const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException) 
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
 {
-    uno::Sequence< rtl::OUString > const svc = getBackendServiceNames();
-
-    for(sal_Int32 i = 0; i < svc.getLength(); ++i )
-        if(svc[i] == aServiceName)
-            return true;
-
-    return false;
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> 
-SAL_CALL GconfBackend::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException) 
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
 {
-    return getBackendServiceNames() ;
+    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
 }
-
-// ---------------------------------------------------------------------------------------
-
-
diff --git a/shell/source/backends/gconfbe/gconfbackend.hxx b/shell/source/backends/gconfbe/gconfbackend.hxx
deleted file mode 100644
index e469fe10a4..0000000000
--- a/shell/source/backends/gconfbe/gconfbackend.hxx
+++ /dev/null
@@ -1,226 +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: gconfbackend.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 GCONFBACKEND_HXX_
-#define GCONFBACKEND_HXX_
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XSCHEMASUPPLIER_HPP_
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#endif
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-//#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
-//#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-//#endif // _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
-#include <cppuhelper/compbase3.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-//#ifndef _VOS_THREAD_HXX_
-//#include <vos/thread.hxx>
-//#endif
-
-#include <gconf/gconf-client.h>
-
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-
-/** Structure containing the mapping between OOffice and Gconf keys.            
-    AlOO specifies whether the key is protected, if key is protected it         
-    can not be over riden in subsequent higher layers                           
-*/                                                                             
-struct keyMapping                                                               
-{                                                                               
-    keyMapping(){};                                                             
-    rtl::OUString mOOName;                                                      
-    rtl::OUString mOOType;                                                      
-    rtl::OUString mGconfName;                                                   
-    sal_Bool mbProtected;                                                       
-};                                                                              
-
-typedef keyMapping KeyMappingInfo;                                              
-typedef std::multimap<rtl::OUString, KeyMappingInfo> KeyMappingTable;           
-
-/*Time Stamp mapping table used to store timestamps of updated components       
-  when a notification is recieved. It is needed as you cannot access gconf key  
-  timestamps via the Gconf api */                                               
-
-typedef std::multimap<rtl::OUString, rtl::OUString>  TSMappingTable;            
-
-//------------------------------------------------------------------------------
-
-/*
-class ONotificationThread: public vos::OThread
-{
-   
-
-public:
-    ONotificationThread()
-    {}
-
-    ~ONotificationThread()
-    {
-        g_main_loop_quit(mLoop);  
-    }
-
-private:
-    virtual void SAL_CALL onTerminated()
-    {
-        delete this;
-    }
-
-    virtual void SAL_CALL run();
-    GMainLoop* mLoop;
-};
-
-*/
-
-//------------------------------------------------------------------------------
-typedef cppu::WeakComponentImplHelper3<backend::XSingleLayerStratum,
-                                       backend::XBackendChangesNotifier,
-                       lang::XServiceInfo> BackendBase ;
-
-/**
-  Implements the SingleLayerStratum service for gconf access.
-  */
-class GconfBackend : public BackendBase {
-    public :
-        
-    static GconfBackend* createInstance(const uno::Reference<uno::XComponentContext>& xContext);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName(  ) 
-            throw (uno::RuntimeException) ;
-        
-        virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& aServiceName ) 
-            throw (uno::RuntimeException) ;
-
-        virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(  ) 
-            throw (uno::RuntimeException) ;
-
-        /**
-          Provides the implementation name.
-
-          @return   implementation name
-          */
-        static rtl::OUString SAL_CALL getBackendName(void) ;
-
-        /**
-          Provides the supported services names
-
-          @return   service names
-          */
-        static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void) ;
-
-        /* returns a GconfClient */
-        static GConfClient* getGconfClient();
-        
-        //XSingleLayerStratum
-        virtual uno::Reference<backend::XLayer> SAL_CALL 
-            getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-                throw (backend::BackendAccessException, lang::IllegalArgumentException) ;
-
-        virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-            getUpdatableLayer( const rtl::OUString& aLayerId ) 
-                throw (backend::BackendAccessException, lang::NoSupportException,	   
-                       lang::IllegalArgumentException) ;
-
-        // XBackendChangesNotifier
-        virtual void SAL_CALL addChangesListener( 
-            const uno::Reference<backend::XBackendChangesListener>& xListener,
-            const rtl::OUString& aComponent)
-                throw (::com::sun::star::uno::RuntimeException);
-
-   
-        virtual void SAL_CALL removeChangesListener( 
-            const uno::Reference<backend::XBackendChangesListener>& xListener,
-            const rtl::OUString& aComponent)
-                throw (::com::sun::star::uno::RuntimeException);
-// currently not used
-#if 0
-        //Notify all listener of component change
-        void notifyListeners(const rtl::OUString& aGconfKey); 
-#endif        
-    protected:
-        /**
-          Service constructor from a service factory.
-
-          @param xContext   component context
-          */
-         GconfBackend(const uno::Reference<uno::XComponentContext>& xContext) 
-            throw (backend::BackendAccessException);
-                        
-        /** Destructor */
-        ~GconfBackend(void) ;
-
-    private:
-     
-        typedef uno::Reference<backend::XBackendChangesListener> ListenerRef;
-        typedef std::multimap<rtl::OUString,ListenerRef> ListenerList; 
-        
-        /** Build Gconf/OO mapping table */ 
-        void initializeMappingTable ();
-
-        
-        /** The component context */		
-        uno::Reference<uno::XComponentContext> m_xContext;
-        
-        /** Mutex for reOOurces protection */
-        osl::Mutex mMutex ;
-
-        KeyMappingTable mKeyMap;
-
-        /** List of component TimeStamps */
-        TSMappingTable mTSMap;
-
-        static GconfBackend* mInstance;
-
-        /** List of listener */
-        ListenerList mListenerList;
-        
-        /**Connection to Gconf */
-        static GConfClient* mClient;
-
-//       ONotificationThread* mNotificationThread;  
-} ;
-
-
-#endif // CONFIGMGR_LOCALBE_LOCALSINGLESTRATUM_HXX_
diff --git a/shell/source/backends/gconfbe/gconfbe.xml b/shell/source/backends/gconfbe/gconfbe.xml
deleted file mode 100644
index 4f795f6160..0000000000
--- a/shell/source/backends/gconfbe/gconfbe.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>gconfbe</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>com.sun.star.comp.configuration.backend.GconfBackend</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.comp.configuration.backend.GconfBackend</supported-service>		
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/backends/gconfbe/gconfbecdef.cxx b/shell/source/backends/gconfbe/gconfbecdef.cxx
deleted file mode 100644
index 54faf1caeb..0000000000
--- a/shell/source/backends/gconfbe/gconfbecdef.cxx
+++ /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: gconfbecdef.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_shell.hxx"
-#include "gconfbackend.hxx"
-#include <com/sun/star/registry/XRegistryKey.hpp>
-
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <cppuhelper/implementationentry.hxx>
-#endif // _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <rtl/ustrbuf.hxx>
-
-#include "uno/current_context.hxx"
-#include <stdio.h>
-#include "orbit.h"
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-//==============================================================================
-
-static uno::Reference<uno::XInterface> SAL_CALL createGconfBackend(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    try {
-        uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
-        
-        if (xCurrentContext.is())
-        {
-            uno::Any aValue = xCurrentContext->getValueByName(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
-        
-            rtl::OUString aDesktopEnvironment;
-            if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("GNOME")) )
-            {
-                // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
-                if ( (orbit_major_version >= 2) && (orbit_minor_version >= 8) )
-                {
-                    return * GconfBackend::createInstance(xContext);
-                }
-            }
-        }
-        
-        return uno::Reference<uno::XInterface>(); 
-        
-    } catch (uno::RuntimeException e) {
-        return uno::Reference<uno::XInterface>();    
-    }    
-    
-}
-
-//==============================================================================
-
-static const cppu::ImplementationEntry kImplementations_entries[] = 
-{
-    {
-        createGconfBackend,
-        GconfBackend::getBackendName,
-        GconfBackend::getBackendServiceNames,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL, NULL, NULL, NULL, NULL, 0 }
-} ;
-//------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-                                            const sal_Char **aEnvTypeName,
-                                            uno_Environment **/*aEnvironment*/) {
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void */*pServiceManager*/,
-                                                 void *pRegistryKey) {
-    
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + GconfBackend::getBackendName()
-            );
-            
-        // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( 
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-            );
-            
-            uno::Sequence<rtl::OUString> sServiceNames = GconfBackend::getBackendServiceNames();
-            for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            return sal_True;
-        }
-        
-        catch( InvalidRegistryException& )
-        {                       
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");           
-        }
-    }
-    
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" void *component_getFactory(const sal_Char *aImplementationName,
-                                      void *aServiceManager,
-                                      void *aRegistryKey) {
-                                      
-    return cppu::component_getFactoryHelper(
-        aImplementationName,
-        aServiceManager,
-        aRegistryKey,
-        kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
diff --git a/shell/source/backends/gconfbe/gconflayer.hxx b/shell/source/backends/gconfbe/gconflayer.hxx
deleted file mode 100644
index e3e0e67313..0000000000
--- a/shell/source/backends/gconfbe/gconflayer.hxx
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef GCONFLAYER_HXX_
-#define GCONFLAYER_HXX_
-
-#include "gconfbackend.hxx"
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif // _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-#define GCONF_PROXY_MODE_KEY "/system/proxy/mode"
-#define GCONF_AUTO_SAVE_KEY  "/apps/openoffice/auto_save"
-
-enum ConfigurationSetting
-{
-    SETTING_PROXY_MODE,
-    SETTING_PROXY_HTTP_HOST,
-    SETTING_PROXY_HTTP_PORT,
-    SETTING_PROXY_HTTPS_HOST,
-    SETTING_PROXY_HTTPS_PORT,
-    SETTING_PROXY_FTP_HOST,
-    SETTING_PROXY_FTP_PORT,
-    SETTING_NO_PROXY_FOR,
-    SETTING_ENABLE_ACCESSIBILITY,
-    SETTING_MAILER_PROGRAM,
-    SETTING_WORK_DIRECTORY,
-    SETTING_SOURCEVIEWFONT_NAME,
-    SETTING_SOURCEVIEWFONT_HEIGHT,
-    SETTING_USER_GIVENNAME,
-    SETTING_USER_SURNAME,
-
-#ifdef ENABLE_LOCKDOWN
-
-    SETTING_DISABLE_PRINTING,
-    SETTING_USE_SYSTEM_FILE_DIALOG,
-    SETTING_DISABLE_UI_CUSTOMIZATION,
-    SETTING_PRINTING_MODIFIES_DOCUMENT,
-    SETTING_SHOW_ICONS_IN_MENUS,
-    SETTING_SHOW_INACTIVE_MENUITEMS,
-    SETTING_SHOW_FONT_PREVIEW,
-    SETTING_SHOW_FONT_HISTORY,
-    SETTING_ENABLE_OPENGL,
-    SETTING_OPTIMIZE_OPENGL,
-    SETTING_SAVE_DOCUMENT_WINDOWS,
-    SETTING_SAVE_DOCUMENT_VIEW_INFO,
-    SETTING_USE_SYSTEM_FONT,
-    SETTING_USE_FONT_ANTI_ALIASING,
-    SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
-    SETTING_WARN_CREATE_PDF,
-    SETTING_WARN_PRINT_DOC,
-    SETTING_WARN_SAVEORSEND_DOC,
-    SETTING_WARN_SIGN_DOC,
-    SETTING_REMOVE_PERSONAL_INFO,
-    SETTING_RECOMMEND_PASSWORD,
-    SETTING_UNDO_STEPS,
-    SETTING_SYMBOL_SET,
-    SETTING_MACRO_SECURITY_LEVEL,
-    SETTING_CREATE_BACKUP,
-    SETTING_WARN_ALIEN_FORMAT,
-    SETTING_AUTO_SAVE,
-    SETTING_AUTO_SAVE_INTERVAL,
-    SETTING_WRITER_DEFAULT_DOC_FORMAT,
-    SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
-    SETTING_CALC_DEFAULT_DOC_FORMAT,
-
-#endif // ENABLE_LOCKDOWN
-
-    SETTINGS_LAST
-};
-
-struct ConfigurationValue
-{
-    const ConfigurationSetting nSettingId;    
-    const gchar *GconfItem;
-    const char *OOoConfItem;
-    const char *OOoConfValueType;
-    const sal_Bool bLocked;
-    const sal_Bool bNeedsTranslation;
-    const ConfigurationSetting nDependsOn;
-};
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the Gconf values mapped into
-  the org.openoffice.* configuration component.
-  */
-class GconfLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-
-    GconfLayer( const uno::Reference<uno::XComponentContext>& xContext,
-                const ConfigurationValue pConfigurationValuesList[],
-                const sal_Int32 nConfigurationValues,
-                const char * pPreloadValuesList[] );
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-                lang::NullPointerException, 
-                lang::WrappedTargetException, 
-                uno::RuntimeException );
-    
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-            throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~GconfLayer(void) {}
-              
-private :
-    uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber;
-    const ConfigurationValue* m_pConfigurationValuesList;
-    const sal_Int32 m_nConfigurationValues;
-    const char** m_pPreloadValuesList;
-  } ;
-
-#endif // GCONFLAYER
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk
index 472db4b244..a8d9b23aa9 100644
--- a/shell/source/backends/gconfbe/makefile.mk
+++ b/shell/source/backends/gconfbe/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -35,8 +31,7 @@ TARGET=gconfbe
 
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
-
-COMP1TYPELIST=$(TARGET)
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings ---
 
@@ -69,9 +64,8 @@ PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS)
 
 
 SLOFILES=\
-    $(SLO)$/gconfbecdef.obj \
-    $(SLO)$/gconfbackend.obj \
-    $(SLO)$/gconflayer.obj
+    $(SLO)$/gconfaccess.obj \
+    $(SLO)$/gconfbackend.obj
         
 SHL1NOCHECK=TRUE
 SHL1TARGET=$(TARGET)1.uno   
@@ -86,7 +80,6 @@ SHL1STDLIBS=    \
         
 SHL1STDLIBS+=$(PKGCONFIG_LIBS)
 
-SHL1VERSIONMAP=exports.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/shell/source/backends/gconfbe/orbit.h b/shell/source/backends/gconfbe/orbit.h
index 1707e46166..86ab7a527c 100644
--- a/shell/source/backends/gconfbe/orbit.h
+++ b/shell/source/backends/gconfbe/orbit.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orbit.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/shell/source/backends/kde4be/exports.map b/shell/source/backends/kde4be/exports.map
deleted file mode 100644
index ba501f9ae0..0000000000
--- a/shell/source/backends/kde4be/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
new file mode 100644
index 0000000000..336d2d4a45
--- /dev/null
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -0,0 +1,319 @@
+/*************************************************************************
+*
+* 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_shell.hxx"
+#include "sal/config.h"
+
+#include "QFont"
+#include "QString"
+#include "kemailsettings.h"
+#include "kglobalsettings.h"
+#include "kprotocolmanager.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "cppu/unotype.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "rtl/string.h"
+#include "rtl/ustring.hxx"
+
+#include "kde4access.hxx"
+
+#define SPACE      ' '
+#define COMMA      ','
+#define SEMI_COLON ';'
+
+namespace kde4access {
+
+namespace {
+
+namespace css = com::sun::star ;
+namespace uno = css::uno ;
+
+}
+
+css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
+    if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) {
+        KEMailSettings aEmailSettings;
+        QString aClientProgram;
+        ::rtl::OUString sClientProgram;
+
+        aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
+        if ( aClientProgram.isEmpty() )
+            aClientProgram = "kmail";
+        else
+            aClientProgram = aClientProgram.section(SPACE, 0, 0);
+        sClientProgram = (const sal_Unicode *) aClientProgram.utf16();
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( sClientProgram ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")))
+    {
+        QFont aFixedFont;
+        short nFontHeight;
+
+        aFixedFont = KGlobalSettings::fixedFont();
+        nFontHeight = aFixedFont.pointSize();
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( nFontHeight ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")))
+    {
+        QFont aFixedFont;
+        QString aFontName;
+        :: rtl::OUString sFontName;
+
+        aFixedFont = KGlobalSettings::fixedFont();
+        aFontName = aFixedFont.family();
+        sFontName = (const sal_Unicode *) aFontName.utf16();
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( sFontName ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")))
+    {
+        /* does not make much sense without an accessibility bridge */
+        sal_Bool ATToolSupport = sal_False;
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
+    {
+        QString aDocumentsDir( KGlobalSettings::documentPath() );
+        rtl::OUString sDocumentsDir;
+        rtl::OUString sDocumentsURL;
+        if ( aDocumentsDir.endsWith(QChar('/')) )
+            aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
+        sDocumentsDir = (const sal_Unicode *) aDocumentsDir.utf16();
+        osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( sDocumentsURL ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
+    {
+        QString aFTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aFTPProxy = KProtocolManager::proxyFor( "FTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aFTPProxy.isEmpty() )
+        {
+            KUrl aProxy(aFTPProxy);
+            ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sProxy ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    {
+        QString aFTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aFTPProxy = KProtocolManager::proxyFor( "FTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aFTPProxy.isEmpty() )
+        {
+            KUrl aProxy(aFTPProxy);
+            sal_Int32 nPort = aProxy.port();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nPort ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    {
+        QString aHTTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPProxy = KProtocolManager::proxyFor( "HTTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org") );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPProxy.isEmpty() )
+        {
+            KUrl aProxy(aHTTPProxy);
+            ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sProxy ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    {
+        QString aHTTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPProxy = KProtocolManager::proxyFor( "HTTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://http.openoffice.org") );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPProxy.isEmpty() )
+        {
+            KUrl aProxy(aHTTPProxy);
+            sal_Int32 nPort = aProxy.port();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nPort ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    {
+        QString aHTTPSProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPSProxy = KProtocolManager::proxyFor( "HTTPS" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org") );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPSProxy.isEmpty() )
+        {
+            KUrl aProxy(aHTTPSProxy);
+            ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sProxy ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    {
+        QString aHTTPSProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPSProxy = KProtocolManager::proxyFor( "HTTPS" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://https.openoffice.org") );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPSProxy.isEmpty() )
+        {
+            KUrl aProxy(aHTTPSProxy);
+            sal_Int32 nPort = aProxy.port();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nPort ) );
+        }
+    } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) {
+        QString aNoProxyFor;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+            aNoProxyFor = KProtocolManager::noProxyFor();
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aNoProxyFor.isEmpty() )
+        {
+            ::rtl::OUString sNoProxyFor;
+
+            aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON );
+            sNoProxyFor = (const sal_Unicode *) aNoProxyFor.utf16();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sNoProxyFor ) );
+        }
+    } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) {
+        int nProxyType;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+            nProxyType = 1;
+            break;
+        default:                            // No proxy is used
+            nProxyType = 0;
+        }
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( (sal_Int32) nProxyType ) );
+    } else {
+        OSL_ASSERT(false); // this cannot happen
+    }
+    return css::beans::Optional< css::uno::Any >();
+}
+
+}
diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx
new file mode 100644
index 0000000000..bfb7bc1ac9
--- /dev/null
+++ b/shell/source/backends/kde4be/kde4access.hxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+*
+* 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_SHELL_SOURCE_BACKENDS_KDE4BE_KDE4ACCESS_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_KDE4BE_KDE4ACCESS_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/beans/Optional.hpp"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+} } } }
+namespace rtl { class OUString; }
+
+namespace kde4access {
+
+com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
+    rtl::OUString const & id);
+
+}
+
+#endif
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 3e0fadd682..44ddb49bd0 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -1,158 +1,258 @@
 /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: kde4backend.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
+*
+* 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_shell.hxx"
+#include "sal/config.h"
 
-#include "kde4backend.hxx"
-#include "kde4commonlayer.hxx"
-#include "kde4inetlayer.hxx"
-#include "kde4vcllayer.hxx"
-#include "kde4pathslayer.hxx"
+#include "kapplication.h"
 
-//------------------------------------------------------------------------------
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XVetoableChangeListener.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XCurrentContext.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/current_context.hxx"
+#include "uno/lbnames.h"
 
-KDEBackend* KDEBackend::mInstance= 0;
+#include "kde4access.hxx"
 
-KDEBackend* KDEBackend::createInstance(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    if (mInstance == 0)
-    {
-        mInstance = new KDEBackend (xContext);
-    }
-    
-    return mInstance;
-}
+namespace {
 
-//------------------------------------------------------------------------------
+namespace css = com::sun::star;
 
-KDEBackend::KDEBackend(const uno::Reference<uno::XComponentContext>& xContext)
-        throw (backend::BackendAccessException)
-    : BackendBase(mMutex), m_xContext(xContext)
-{
+rtl::OUString SAL_CALL getServiceImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.backend.KDE4Backend"));
 }
 
-//------------------------------------------------------------------------------
+css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.backend.KDE4Backend"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
 
-KDEBackend::~KDEBackend(void)
+class Service:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::beans::XPropertySet >,
+    private boost::noncopyable
 {
-}
+public:
+    Service();
 
-//------------------------------------------------------------------------------
+private:
+    virtual ~Service() {}
 
-uno::Reference<backend::XLayer> SAL_CALL KDEBackend::getLayer(
-    const rtl::OUString& aComponent, const rtl::OUString& /* aTimestamp */)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException)
-{
-    uno::Reference<backend::XLayer> xLayer;
-    
-    if( aComponent.equalsAscii("org.openoffice.Office.Common" ) )
-    {
-        xLayer = new KDECommonLayer(m_xContext);
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Inet" ) )
-    {
-        xLayer = new KDEInetLayer(m_xContext);
-    }
-    else if( aComponent.equalsAscii("org.openoffice.VCL" ) )
-    {
-        xLayer = new KDEVCLLayer(m_xContext);
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Office.Paths" ) )
-    {
-        xLayer = new KDEPathsLayer(m_xContext);
-    }
-    
-    return xLayer;
-}
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return getServiceImplementationName(); }
 
-//------------------------------------------------------------------------------
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; }
 
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-KDEBackend::getUpdatableLayer(const rtl::OUString& /* aComponent */) 
-    throw (backend::BackendAccessException,lang::NoSupportException,	   
-           lang::IllegalArgumentException)
-{
-    throw lang::NoSupportException( rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("KDEBackend: No Update Operation allowed, Read Only access") ),
-        *this) ; 
-}
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return getServiceSupportedServiceNames(); }
 
-//------------------------------------------------------------------------------
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+    getPropertySetInfo() throw (css::uno::RuntimeException)
+    { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
-rtl::OUString SAL_CALL KDEBackend::getBackendName(void)
-{
-    return rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.KDE4Backend") );
-}
+    virtual void SAL_CALL setPropertyValue(
+        rtl::OUString const &, css::uno::Any const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-//------------------------------------------------------------------------------
+    virtual css::uno::Any SAL_CALL getPropertyValue(
+        rtl::OUString const & PropertyName)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-rtl::OUString SAL_CALL KDEBackend::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return getBackendName() ;
-}
+    virtual void SAL_CALL addPropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
 
-//------------------------------------------------------------------------------
+    virtual void SAL_CALL removePropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
 
-uno::Sequence<rtl::OUString> SAL_CALL KDEBackend::getBackendServiceNames(void) 
-{
-    uno::Sequence<rtl::OUString> aServices(1) ;
-    aServices[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.KDE4Backend")) ;
+    virtual void SAL_CALL addVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    bool enabled_;
+};
+
+Service::Service(): enabled_(false) {
+    css::uno::Reference< css::uno::XCurrentContext > context(
+        css::uno::getCurrentContext());
+    if (context.is()) {
+        rtl::OUString desktop;
+        context->getValueByName(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
+            desktop;
+        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE4")) &&
+            KApplication::kApplication() != 0;
+    }
+}
 
-    return aServices ;
+void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-//------------------------------------------------------------------------------
+css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    if (PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    {
+        return css::uno::makeAny(
+            enabled_
+            ? kde4access::getValue(PropertyName)
+            : css::beans::Optional< css::uno::Any >());
+    }
+    throw css::beans::UnknownPropertyException(
+        PropertyName, static_cast< cppu::OWeakObject * >(this));
+}
 
-sal_Bool SAL_CALL KDEBackend::supportsService(const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException) 
+css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
+    css::uno::Reference< css::uno::XComponentContext > const &)
 {
-    uno::Sequence< rtl::OUString > const svc = getBackendServiceNames();
+    return static_cast< cppu::OWeakObject * >(new Service);
+}
 
-    for(sal_Int32 i = 0; i < svc.getLength(); ++i )
-        if(svc[i] == aServiceName)
-            return true;
+static cppu::ImplementationEntry const services[] = {
+    { &createInstance, &getServiceImplementationName,
+      &getServiceSupportedServiceNames, &cppu::createSingleComponentFactory, 0,
+      0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
 
-    return false;
 }
 
-//------------------------------------------------------------------------------
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
 
-uno::Sequence<rtl::OUString> 
-SAL_CALL KDEBackend::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException) 
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
 {
-    return getBackendServiceNames() ;
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// ---------------------------------------------------------------------------------------
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
+}
diff --git a/shell/source/backends/kde4be/kde4backend.hxx b/shell/source/backends/kde4be/kde4backend.hxx
deleted file mode 100644
index 95f66f325a..0000000000
--- a/shell/source/backends/kde4be/kde4backend.hxx
+++ /dev/null
@@ -1,123 +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: kde4backend.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.
- *
- ************************************************************************/
-
-#pragma once
-
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <cppuhelper/compbase2.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-
-//------------------------------------------------------------------------------
-typedef cppu::WeakComponentImplHelper2<backend::XSingleLayerStratum,
-                       lang::XServiceInfo> BackendBase ;
-
-/**
-  Implements the SingleLayerStratum service for KDE access.
-  */
-class KDEBackend : public BackendBase {
-    public :
-        
-    static KDEBackend* createInstance(const uno::Reference<uno::XComponentContext>& xContext);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName(  ) 
-            throw (uno::RuntimeException) ;
-        
-        virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& aServiceName ) 
-            throw (uno::RuntimeException) ;
-
-        virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(  ) 
-            throw (uno::RuntimeException) ;
-
-        /**
-          Provides the implementation name.
-
-          @return   implementation name
-          */
-        static rtl::OUString SAL_CALL getBackendName(void) ;
-
-        /**
-          Provides the supported services names
-
-          @return   service names
-          */
-        static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void) ;
-
-        //XSingleLayerStratum
-        virtual uno::Reference<backend::XLayer> SAL_CALL 
-            getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-                throw (backend::BackendAccessException, lang::IllegalArgumentException) ;
-
-        virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-            getUpdatableLayer( const rtl::OUString& aLayerId ) 
-                throw (backend::BackendAccessException, lang::NoSupportException,	   
-                       lang::IllegalArgumentException) ;
-
-    protected:
-        /**
-          Service constructor from a service factory.
-
-          @param xContext   component context
-          */
-         KDEBackend(const uno::Reference<uno::XComponentContext>& xContext) 
-            throw (backend::BackendAccessException);
-                        
-        /** Destructor */
-        ~KDEBackend(void) ;
-
-    private:
-     
-        /** Build KDE/OO mapping table */ 
-        void initializeMappingTable ();
-
-        
-        /** The component context */		
-        uno::Reference<uno::XComponentContext> m_xContext;
-        
-        /** Mutex for reOOurces protection */
-        osl::Mutex mMutex ;
-
-        static KDEBackend* mInstance;
-};
diff --git a/shell/source/backends/kde4be/kde4be.xml b/shell/source/backends/kde4be/kde4be.xml
deleted file mode 100644
index 93961672e5..0000000000
--- a/shell/source/backends/kde4be/kde4be.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>kde4be</module-name>
-    <component-description>
-        <author> Éric Bischoff </author>
-        <name>com.sun.star.comp.configuration.backend.KDE4Backend</name>
-        <description> The KDE4 configuration backend </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.comp.configuration.backend.KDE4Backend</supported-service>		
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/backends/kde4be/kde4becdef.cxx b/shell/source/backends/kde4be/kde4becdef.cxx
deleted file mode 100644
index 277e3910b7..0000000000
--- a/shell/source/backends/kde4be/kde4becdef.cxx
+++ /dev/null
@@ -1,143 +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: kde4becdef.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_shell.hxx"
-#include "kde4backend.hxx"
-
-#include <kapplication.h>
-
-#include <cppuhelper/implementationentry.hxx>
-
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include "uno/current_context.hxx"
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-//==============================================================================
-
-static uno::Reference<uno::XInterface> SAL_CALL createKDEBackend(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    try {
-        uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
-        
-        if (xCurrentContext.is())
-        {
-            uno::Any aValue = xCurrentContext->getValueByName(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
-        
-            rtl::OUString aDesktopEnvironment;
-            if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("KDE")) && (KApplication::kApplication() != NULL) )
-                return * KDEBackend::createInstance(xContext);
-        }
-        
-        return uno::Reference<uno::XInterface>(); 
-        
-    } catch (uno::RuntimeException e) {
-        return uno::Reference<uno::XInterface>();    
-    }    
-    
-}
-
-//==============================================================================
-
-static const cppu::ImplementationEntry kImplementations_entries[] = 
-{
-    {
-        createKDEBackend,
-        KDEBackend::getBackendName,
-        KDEBackend::getBackendServiceNames,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL, NULL, NULL, NULL, NULL, 0 }
-} ;
-//------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-                                            const sal_Char **aEnvTypeName,
-                                            uno_Environment **) {
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *,
-                                                 void *pRegistryKey) {
-    
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + KDEBackend::getBackendName()
-            );
-            
-        // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( 
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-            );
-            
-            uno::Sequence<rtl::OUString> sServiceNames = KDEBackend::getBackendServiceNames();
-            for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            return sal_True;
-        }
-        
-        catch( InvalidRegistryException& )
-        {                       
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");           
-        }
-    }
-    
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" void *component_getFactory(const sal_Char *aImplementationName,
-                                      void *aServiceManager,
-                                      void *aRegistryKey) {
-                                      
-    return cppu::component_getFactoryHelper(
-        aImplementationName,
-        aServiceManager,
-        aRegistryKey,
-        kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
diff --git a/shell/source/backends/kde4be/kde4commonlayer.cxx b/shell/source/backends/kde4be/kde4commonlayer.cxx
deleted file mode 100644
index 6e718cbddb..0000000000
--- a/shell/source/backends/kde4be/kde4commonlayer.cxx
+++ /dev/null
@@ -1,157 +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: kde4commonlayer.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_shell.hxx"
-
-#include "kde4commonlayer.hxx"
-
-#include <kemailsettings.h>
-#include <kglobalsettings.h>
-
-#include <QFont>
-
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#define SPACE      ' '
-
-//==============================================================================
-
-KDECommonLayer::KDECommonLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-    
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(3);
-    sal_Int32 nProperties = 0;
-
-    // Email client settings
-    KEMailSettings aEmailSettings;
-    QString aClientProgram;
-    ::rtl::OUString sClientProgram;
-
-    aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
-    if ( aClientProgram.isEmpty() )
-        aClientProgram = "kmail";
-    else
-        aClientProgram = aClientProgram.section(SPACE, 0, 0);
-    sClientProgram = (const sal_Unicode *) aClientProgram.utf16();
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer/Program") );
-    aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( sClientProgram );
-
-    // Source code font settings
-    QFont aFixedFont;
-    QString aFontName;
-    :: rtl::OUString sFontName;
-    short nFontHeight;
-
-    aFixedFont = KGlobalSettings::fixedFont();
-    aFontName = aFixedFont.family();
-    sFontName = (const sal_Unicode *) aFontName.utf16();
-    nFontHeight = aFixedFont.pointSize();
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontName") );
-    aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( sFontName );
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontHeight") );
-    aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "short" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( nFontHeight );
-
-    if( nProperties > 0 )
-    {
-        aPropInfoList.realloc(nProperties);
-        m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDECommonLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    KEMailSettings aEmailSettings;
-    QString aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
-    aClientProgram = aClientProgram.section(SPACE, 0, 0);
-
-    QString aFixedFont = KGlobalSettings::fixedFont().toString();
-
-    ::rtl::OUString sTimeStamp,
-                    sep( RTL_CONSTASCII_USTRINGPARAM( "$" ) );
-
-    sTimeStamp = (const sal_Unicode *) aClientProgram.utf16();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aFixedFont.utf16();
-
-    return sTimeStamp;
-}
diff --git a/shell/source/backends/kde4be/kde4commonlayer.hxx b/shell/source/backends/kde4be/kde4commonlayer.hxx
deleted file mode 100644
index d37bab8627..0000000000
--- a/shell/source/backends/kde4be/kde4commonlayer.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "kde4backend.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.Office.Common configuration component.
-  */
-class KDECommonLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-    
-    KDECommonLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDECommonLayer(void) {}
-              
-    private :
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-};
diff --git a/shell/source/backends/kde4be/kde4inetlayer.cxx b/shell/source/backends/kde4be/kde4inetlayer.cxx
deleted file mode 100644
index 968121b025..0000000000
--- a/shell/source/backends/kde4be/kde4inetlayer.cxx
+++ /dev/null
@@ -1,255 +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: kde4inetlayer.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_shell.hxx"
-
-#include <kprotocolmanager.h>
-
-#include "kde4inetlayer.hxx"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#define COMMA      ','
-#define SEMI_COLON ';'
-
-//==============================================================================
-
-KDEInetLayer::KDEInetLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEInetLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(8);
-    sal_Int32 nProperties = 0;
-
-    switch ( KProtocolManager::proxyType() )
-    {
-        case KProtocolManager::ManualProxy: // Proxies are manually configured
-            setProxy(aPropInfoList, nProperties, 1,
-                     KProtocolManager::noProxyFor(),
-                     KProtocolManager::proxyFor( "HTTP" ),
-                     KProtocolManager::proxyFor( "FTP" ),
-                     KProtocolManager::proxyFor( "HTTPS" ));
-            break;
-        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
-        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
-        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
-// In such cases, the proxy address is not stored in KDE, but determined dynamically.
-// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
-// The best we can do here is to ask the current value for a given address.
-            setProxy(aPropInfoList, nProperties, 1,
-                     KProtocolManager::noProxyFor(),
-                     KProtocolManager::proxyForUrl( KUrl("http://www.openoffice.org") ),
-                     KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") ),
-                     KProtocolManager::proxyForUrl( KUrl("https://www.openoffice.org") ));
-            break;
-        default:                            // No proxy is used
-            setProxy(aPropInfoList, nProperties, 0);
-    }
-
-    if ( nProperties > 0 )
-    {
-      aPropInfoList.realloc(nProperties);
-      m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDEInetLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    QString aProxyType, aNoProxyFor, aHTTPProxy, aHTTPSProxy, aFTPProxy;
-
-    switch ( KProtocolManager::proxyType() )
-    {
-        case KProtocolManager::ManualProxy:
-            aProxyType = '1';
-            aNoProxyFor = KProtocolManager::noProxyFor();
-            aHTTPProxy = KProtocolManager::proxyFor( "HTTP" );
-            aHTTPProxy = KProtocolManager::proxyFor( "HTTPS" );
-            aFTPProxy = KProtocolManager::proxyFor( "FTP" );
-            break;
-        case KProtocolManager::PACProxy:
-        case KProtocolManager::WPADProxy:
-        case KProtocolManager::EnvVarProxy:
-            aProxyType = '1';
-            aNoProxyFor = KProtocolManager::noProxyFor();
-            aHTTPProxy = KProtocolManager::proxyForUrl( KUrl("http://www.openoffice.org") );
-            aHTTPSProxy = KProtocolManager::proxyForUrl( KUrl("https://www.openoffice.org") );
-            aFTPProxy = KProtocolManager::proxyForUrl( KUrl("ftp://ftp.openoffice.org") );
-            break;
-        default:
-            aProxyType = '0';
-    }
-
-    ::rtl::OUString sTimeStamp,
-                    sep( RTL_CONSTASCII_USTRINGPARAM( "$" ) );
-
-    sTimeStamp = (const sal_Unicode *) aProxyType.utf16();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aNoProxyFor.utf16();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aHTTPProxy.utf16();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aHTTPSProxy.utf16();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aFTPProxy.utf16();
-
-    return sTimeStamp;
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEInetLayer::setProxy
-    (uno::Sequence<backend::PropertyInfo> &aPropInfoList, sal_Int32 &nProperties,
-     int nProxyType, const QString &aNoProxy, const QString &aHTTPProxy, const QString &aFTPProxy, const QString &aHTTPSProxy ) const
-{
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetProxyType") );
-    aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( (sal_Int32) nProxyType );
-
-    if (nProxyType == 0) return;
-
-    if ( !aNoProxy.isEmpty() )
-    {
-        QString aNoProxyFor(aNoProxy);
-        ::rtl::OUString sNoProxyFor;
-
-        aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON );
-        sNoProxyFor = (const sal_Unicode *) aNoProxyFor.utf16();
-
-        aPropInfoList[nProperties].Name = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetNoProxy") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sNoProxyFor );
-    }
-
-    if ( !aHTTPProxy.isEmpty() )
-    {
-        KUrl aProxy(aHTTPProxy);
-        ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16();
-        sal_Int32 nPort = aProxy.port();
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyName") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sProxy );
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyPort") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( nPort );
-    }
-
-    if ( !aHTTPSProxy.isEmpty() )
-    {
-        KUrl aProxy(aHTTPSProxy);
-        ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16();
-        sal_Int32 nPort = aProxy.port();
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyName") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sProxy );
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyPort") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( nPort );
-    }
-
-    if ( !aFTPProxy.isEmpty() )
-    {
-        KUrl aProxy(aFTPProxy);
-        ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16();
-        sal_Int32 nPort = aProxy.port();
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyName") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sProxy );
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyPort") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( nPort );
-    }
-}
-
diff --git a/shell/source/backends/kde4be/kde4inetlayer.hxx b/shell/source/backends/kde4be/kde4inetlayer.hxx
deleted file mode 100644
index 1724628f9f..0000000000
--- a/shell/source/backends/kde4be/kde4inetlayer.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-#pragma once
-
-#include <QString>
-
-#include "kde4backend.hxx"
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.Inet configuration component.
-  */
-class KDEInetLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-
-    KDEInetLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-                lang::NullPointerException, 
-                lang::WrappedTargetException, 
-                uno::RuntimeException) ;
-    
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDEInetLayer(void) {}
-              
-private :
-    uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-
-    void SAL_CALL setProxy
-        (uno::Sequence<backend::PropertyInfo> &aPropInfoList, sal_Int32 &nProperties,
-         int nProxyType, const QString &aNoProxyfor = QString(),
-         const QString &aHTTPProxy = QString(), const QString &aFTPProxy = QString(), const QString &aHTTPSProxy = QString()) const;
-};
diff --git a/shell/source/backends/kde4be/kde4pathslayer.cxx b/shell/source/backends/kde4be/kde4pathslayer.cxx
deleted file mode 100644
index 079179062c..0000000000
--- a/shell/source/backends/kde4be/kde4pathslayer.cxx
+++ /dev/null
@@ -1,124 +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: kde4pathslayer.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_shell.hxx"
-
-#include "kde4pathslayer.hxx"
-
-#include <QString>
-#include <kglobalsettings.h>
-
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-
-#include <osl/security.hxx>
-#include <osl/file.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#define SPACE      ' '
-
-//==============================================================================
-
-KDEPathsLayer::KDEPathsLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-    
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
-    sal_Int32 nProperties = 0;
-
-    QString aDocumentsDir( KGlobalSettings::documentPath() );
-    rtl::OUString sDocumentsDir;
-    rtl::OUString sDocumentsURL;
-    if ( aDocumentsDir.endsWith(QChar('/')) )
-        aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
-    sDocumentsDir = (const sal_Unicode *) aDocumentsDir.utf16();
-    osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Paths/Variables/Work") );
-    aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( sDocumentsURL );
-
-    if( nProperties > 0 )
-    {
-        aPropInfoList.realloc(nProperties);
-        m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDEPathsLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    ::rtl::OUString sTimeStamp,
-                    sep( RTL_CONSTASCII_USTRINGPARAM( "$" ) );
-
-    QString aDocumentsDir;
-    aDocumentsDir = KGlobalSettings::documentPath();
-
-    sTimeStamp += (const sal_Unicode *) aDocumentsDir.utf16();
-
-    return sTimeStamp;
-}
diff --git a/shell/source/backends/kde4be/kde4pathslayer.hxx b/shell/source/backends/kde4be/kde4pathslayer.hxx
deleted file mode 100644
index e3fc4dcadc..0000000000
--- a/shell/source/backends/kde4be/kde4pathslayer.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: kde4pathslayer.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.
- *
- ************************************************************************/
-
-#pragma once
-
-#include "kde4backend.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/util/XTimeStamped.hpp>
-
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.Office.Paths configuration component.
-  */
-class KDEPathsLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-    
-    KDEPathsLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDEPathsLayer(void) {}
-              
-    private :
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-};
diff --git a/shell/source/backends/kde4be/kde4vcllayer.cxx b/shell/source/backends/kde4be/kde4vcllayer.cxx
deleted file mode 100644
index 2705cb64e9..0000000000
--- a/shell/source/backends/kde4be/kde4vcllayer.cxx
+++ /dev/null
@@ -1,115 +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: kde4vcllayer.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_shell.hxx"
-
-#include "kde4vcllayer.hxx"
-
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-//==============================================================================
-
-KDEVCLLayer::KDEVCLLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-    
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
-
-/*
-   Commenting out, does not make much sense without an accessibility bridge
-===========================================================================
-#if defined(QT_ACCESSIBILITY_SUPPORT)
-// Accessibility tools under Qt for UNIX are available starting with Qt 4.0
-    int nVersionMajor = 0;
-    const char *q = qVersion();     // "3.1.0" for example
-    while ('0' <= *q && *q <= '9')
-        nVersionMajor = nVersionMajor * 10 + *q++ - '0';
-    sal_Bool ATToolSupport = (sal_Bool) (nVersionMajor >= 4);
-#else
-    sal_Bool ATToolSupport = sal_False;
-#endif
-===========================================================================
-   End of commented out section
-*/  sal_Bool ATToolSupport = sal_False;
-
-    aPropInfoList[0].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.VCL/Settings/Accessibility/EnableATToolSupport") );
-    aPropInfoList[0].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[0].Protected = sal_False;
-    aPropInfoList[0].Value = uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) );
-
-    m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDEVCLLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    ::rtl::OUString sTimeStamp(
-                RTL_CONSTASCII_USTRINGPARAM( "FALSE" ) );
-
-    return sTimeStamp;
-}
diff --git a/shell/source/backends/kde4be/kde4vcllayer.hxx b/shell/source/backends/kde4be/kde4vcllayer.hxx
deleted file mode 100644
index aeed4e668a..0000000000
--- a/shell/source/backends/kde4be/kde4vcllayer.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "kde4backend.hxx"
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#include <com/sun/star/util/XTimeStamped.hpp>
-
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.VCL configuration component.
-  */
-class KDEVCLLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-    
-    KDEVCLLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDEVCLLayer(void) {}
-              
-    private :
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-};
diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk
index 6f92762e5a..1f9093a95a 100644
--- a/shell/source/backends/kde4be/makefile.mk
+++ b/shell/source/backends/kde4be/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -35,11 +31,7 @@ TARGET=kde4be
 
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
-
-COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
-UNOUCROUT=$(OUT)$/inc$/$(TARGET)
-INCPRE=$(UNOUCROUT)
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings ---
 
@@ -64,12 +56,8 @@ CFLAGS+=$(KDE4_CFLAGS)
 # --- Files ---
 
 SLOFILES=\
-    $(SLO)$/kde4backend.obj \
-    $(SLO)$/kde4commonlayer.obj \
-    $(SLO)$/kde4inetlayer.obj \
-    $(SLO)$/kde4vcllayer.obj \
-    $(SLO)$/kde4pathslayer.obj \
-    $(SLO)$/kde4becdef.obj
+    $(SLO)$/kde4access.obj \
+    $(SLO)$/kde4backend.obj
 
 SHL1NOCHECK=TRUE
 SHL1TARGET=$(TARGET)1.uno   
@@ -82,8 +70,7 @@ SHL1STDLIBS=    \
         $(CPPULIB) \
         $(SALLIB) \
         $(KDE4_LIBS) -lkio
-        
-SHL1VERSIONMAP=exports.map
+
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/shell/source/backends/kdebe/exports.map b/shell/source/backends/kdebe/exports.map
deleted file mode 100644
index ba501f9ae0..0000000000
--- a/shell/source/backends/kdebe/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx
new file mode 100644
index 0000000000..618d74b5ea
--- /dev/null
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
@@ -0,0 +1,315 @@
+/*************************************************************************
+*
+* 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_shell.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "cppu/unotype.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "rtl/string.h"
+#include "rtl/ustring.hxx"
+
+#include "kde_headers.h"
+
+#include "kdeaccess.hxx"
+
+#define SPACE      ' '
+#define COMMA      ','
+#define SEMI_COLON ';'
+
+namespace kdeaccess {
+
+namespace {
+
+namespace css = com::sun::star ;
+namespace uno = css::uno ;
+
+}
+
+css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) {
+    if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) {
+        KEMailSettings aEmailSettings;
+        QString aClientProgram;
+        ::rtl::OUString sClientProgram;
+
+        aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
+        if ( aClientProgram.isEmpty() )
+            aClientProgram = "kmail";
+        else
+            aClientProgram = aClientProgram.section(SPACE, 0, 0);
+        sClientProgram = (const sal_Unicode *) aClientProgram.ucs2();
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( sClientProgram ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")))
+    {
+        QFont aFixedFont;
+        short nFontHeight;
+
+        aFixedFont = KGlobalSettings::fixedFont();
+        nFontHeight = aFixedFont.pointSize();
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( nFontHeight ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")))
+    {
+        QFont aFixedFont;
+        QString aFontName;
+        :: rtl::OUString sFontName;
+
+        aFixedFont = KGlobalSettings::fixedFont();
+        aFontName = aFixedFont.family();
+        sFontName = (const sal_Unicode *) aFontName.ucs2();
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( sFontName ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")))
+    {
+        /* does not make much sense without an accessibility bridge */
+        sal_Bool ATToolSupport = sal_False;
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
+    {
+        QString aDocumentsDir( KGlobalSettings::documentPath() );
+        rtl::OUString sDocumentsDir;
+        rtl::OUString sDocumentsURL;
+        if ( aDocumentsDir.endsWith(QChar('/')) )
+            aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
+        sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2();
+        osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( sDocumentsURL ) );
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
+    {
+        QString aFTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aFTPProxy = KProtocolManager::proxyFor( "FTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aFTPProxy = KProtocolManager::proxyForURL( "ftp://ftp.openoffice.org" );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aFTPProxy.isEmpty() )
+        {
+            KURL aProxy(aFTPProxy);
+            ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sProxy ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    {
+        QString aFTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aFTPProxy = KProtocolManager::proxyFor( "FTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aFTPProxy = KProtocolManager::proxyForURL( "ftp://ftp.openoffice.org" );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aFTPProxy.isEmpty() )
+        {
+            KURL aProxy(aFTPProxy);
+            sal_Int32 nPort = aProxy.port();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nPort ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    {
+        QString aHTTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPProxy = KProtocolManager::proxyFor( "HTTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPProxy = KProtocolManager::proxyForURL( "http://http.openoffice.org" );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPProxy.isEmpty() )
+        {
+            KURL aProxy(aHTTPProxy);
+            ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sProxy ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    {
+        QString aHTTPProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPProxy = KProtocolManager::proxyFor( "HTTP" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPProxy = KProtocolManager::proxyForURL( "http://http.openoffice.org" );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPProxy.isEmpty() )
+        {
+            KURL aProxy(aHTTPProxy);
+            sal_Int32 nPort = aProxy.port();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nPort ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    {
+        QString aHTTPSProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPSProxy = KProtocolManager::proxyFor( "HTTPS" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPSProxy = KProtocolManager::proxyForURL( "https://https.openoffice.org" );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPSProxy.isEmpty() )
+        {
+            KURL aProxy(aHTTPSProxy);
+            ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sProxy ) );
+        }
+    } else if (id.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    {
+        QString aHTTPSProxy;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+            aHTTPSProxy = KProtocolManager::proxyFor( "HTTPS" );
+            break;
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+// In such cases, the proxy address is not stored in KDE, but determined dynamically.
+// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
+// The best we can do here is to ask the current value for a given address.
+            aHTTPSProxy = KProtocolManager::proxyForURL( "https://https.openoffice.org" );
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aHTTPSProxy.isEmpty() )
+        {
+            KURL aProxy(aHTTPSProxy);
+            sal_Int32 nPort = aProxy.port();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nPort ) );
+        }
+    } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) {
+        QString aNoProxyFor;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+            aNoProxyFor = KProtocolManager::noProxyFor();
+            break;
+        default:                            // No proxy is used
+            break;
+        }
+        if ( !aNoProxyFor.isEmpty() )
+        {
+            ::rtl::OUString sNoProxyFor;
+
+            aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON );
+            sNoProxyFor = (const sal_Unicode *) aNoProxyFor.ucs2();
+            return css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( sNoProxyFor ) );
+        }
+    } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) {
+        int nProxyType;
+        switch ( KProtocolManager::proxyType() )
+        {
+        case KProtocolManager::ManualProxy: // Proxies are manually configured
+        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
+        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
+        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
+            nProxyType = 1;
+            break;
+        default:                            // No proxy is used
+            nProxyType = 0;
+        }
+        return css::beans::Optional< css::uno::Any >(
+            true, uno::makeAny( (sal_Int32) nProxyType ) );
+    } else {
+        OSL_ASSERT(false); // this cannot happen
+    }
+    return css::beans::Optional< css::uno::Any >();
+}
+
+}
diff --git a/shell/source/backends/kdebe/kdeaccess.hxx b/shell/source/backends/kdebe/kdeaccess.hxx
new file mode 100644
index 0000000000..36a22e23db
--- /dev/null
+++ b/shell/source/backends/kdebe/kdeaccess.hxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+*
+* 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_SHELL_SOURCE_BACKENDS_KDEBE_KDEACCESS_HXX
+#define INCLUDED_SHELL_SOURCE_BACKENDS_KDEBE_KDEACCESS_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/beans/Optional.hpp"
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class Any;
+} } } }
+namespace rtl { class OUString; }
+
+namespace kdeaccess {
+
+com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
+    rtl::OUString const & id);
+
+}
+
+#endif
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index ecf1715d0e..53a00cf359 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -1,158 +1,258 @@
 /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: kdebackend.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
+*
+* 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_shell.hxx"
+#include "sal/config.h"
 
-#include "kdebackend.hxx"
-#include "kdecommonlayer.hxx"
-#include "kdeinetlayer.hxx"
-#include "kdevcllayer.hxx"
-#include "kdepathslayer.hxx"
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/beans/Optional.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XVetoableChangeListener.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XCurrentContext.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/weak.hxx"
+#include "rtl/string.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "uno/current_context.hxx"
+#include "uno/lbnames.h"
 
-//------------------------------------------------------------------------------
+#include "kde_headers.h"
 
-KDEBackend* KDEBackend::mInstance= 0;
+#include "kdeaccess.hxx"
 
-KDEBackend* KDEBackend::createInstance(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    if (mInstance == 0)
-    {
-        mInstance = new KDEBackend (xContext);
-    }
-    
-    return mInstance;
-}
+namespace {
 
-//------------------------------------------------------------------------------
+namespace css = com::sun::star;
 
-KDEBackend::KDEBackend(const uno::Reference<uno::XComponentContext>& xContext)
-        throw (backend::BackendAccessException)
-    : BackendBase(mMutex), m_xContext(xContext)
-{
+rtl::OUString SAL_CALL getServiceImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.configuration.backend.KDEBackend"));
 }
 
-//------------------------------------------------------------------------------
+css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.backend.KDEBackend"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
 
-KDEBackend::~KDEBackend(void)
+class Service:
+    public cppu::WeakImplHelper2<
+        css::lang::XServiceInfo, css::beans::XPropertySet >,
+    private boost::noncopyable
 {
-}
+public:
+    Service();
 
-//------------------------------------------------------------------------------
+private:
+    virtual ~Service() {}
 
-uno::Reference<backend::XLayer> SAL_CALL KDEBackend::getLayer(
-    const rtl::OUString& aComponent, const rtl::OUString& /* aTimestamp */)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException)
-{
-    uno::Reference<backend::XLayer> xLayer;
-    
-    if( aComponent.equalsAscii("org.openoffice.Office.Common" ) )
-    {
-        xLayer = new KDECommonLayer(m_xContext);
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Inet" ) )
-    {
-        xLayer = new KDEInetLayer(m_xContext);
-    }
-    else if( aComponent.equalsAscii("org.openoffice.VCL" ) )
-    {
-        xLayer = new KDEVCLLayer(m_xContext);
-    }
-    else if( aComponent.equalsAscii("org.openoffice.Office.Paths" ) )
-    {
-        xLayer = new KDEPathsLayer(m_xContext);
-    }
-    
-    return xLayer;
-}
+    virtual rtl::OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException)
+    { return getServiceImplementationName(); }
 
-//------------------------------------------------------------------------------
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+        throw (css::uno::RuntimeException)
+    { return ServiceName == getSupportedServiceNames()[0]; }
 
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-KDEBackend::getUpdatableLayer(const rtl::OUString& /* aComponent */) 
-    throw (backend::BackendAccessException,lang::NoSupportException,	   
-           lang::IllegalArgumentException)
-{
-    throw lang::NoSupportException( rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("KDEBackend: No Update Operation allowed, Read Only access") ),
-        *this) ; 
-}
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    { return getServiceSupportedServiceNames(); }
 
-//------------------------------------------------------------------------------
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+    getPropertySetInfo() throw (css::uno::RuntimeException)
+    { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
-rtl::OUString SAL_CALL KDEBackend::getBackendName(void)
-{
-    return rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.KDEBackend") );
-}
+    virtual void SAL_CALL setPropertyValue(
+        rtl::OUString const &, css::uno::Any const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-//------------------------------------------------------------------------------
+    virtual css::uno::Any SAL_CALL getPropertyValue(
+        rtl::OUString const & PropertyName)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
 
-rtl::OUString SAL_CALL KDEBackend::getImplementationName(void) 
-    throw (uno::RuntimeException) 
-{
-    return getBackendName() ;
-}
+    virtual void SAL_CALL addPropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
 
-//------------------------------------------------------------------------------
+    virtual void SAL_CALL removePropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
 
-uno::Sequence<rtl::OUString> SAL_CALL KDEBackend::getBackendServiceNames(void) 
-{
-    uno::Sequence<rtl::OUString> aServices(1) ;
-    aServices[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.KDEBackend")) ;
+    virtual void SAL_CALL addVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    bool enabled_;
+};
+
+Service::Service(): enabled_(false) {
+    css::uno::Reference< css::uno::XCurrentContext > context(
+        css::uno::getCurrentContext());
+    if (context.is()) {
+        rtl::OUString desktop;
+        context->getValueByName(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
+            desktop;
+        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE")) &&
+            KApplication::kApplication() != 0;
+    }
+}
 
-    return aServices ;
+void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-//------------------------------------------------------------------------------
+css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    if (PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) ||
+        PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    {
+        return css::uno::makeAny(
+            enabled_
+            ? kdeaccess::getValue(PropertyName)
+            : css::beans::Optional< css::uno::Any >());
+    }
+    throw css::beans::UnknownPropertyException(
+        PropertyName, static_cast< cppu::OWeakObject * >(this));
+}
 
-sal_Bool SAL_CALL KDEBackend::supportsService(const rtl::OUString& aServiceName) 
-    throw (uno::RuntimeException) 
+css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
+    css::uno::Reference< css::uno::XComponentContext > const &)
 {
-    uno::Sequence< rtl::OUString > const svc = getBackendServiceNames();
+    return static_cast< cppu::OWeakObject * >(new Service);
+}
 
-    for(sal_Int32 i = 0; i < svc.getLength(); ++i )
-        if(svc[i] == aServiceName)
-            return true;
+static cppu::ImplementationEntry const services[] = {
+    { &createInstance, &getServiceImplementationName,
+      &getServiceSupportedServiceNames, &cppu::createSingleComponentFactory, 0,
+      0 },
+    { 0, 0, 0, 0, 0, 0 }
+};
 
-    return false;
 }
 
-//------------------------------------------------------------------------------
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+    char const * pImplName, void * pServiceManager, void * pRegistryKey)
+{
+    return cppu::component_getFactoryHelper(
+        pImplName, pServiceManager, pRegistryKey, services);
+}
 
-uno::Sequence<rtl::OUString> 
-SAL_CALL KDEBackend::getSupportedServiceNames(void) 
-    throw (uno::RuntimeException) 
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+    char const ** ppEnvTypeName, uno_Environment **)
 {
-    return getBackendServiceNames() ;
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// ---------------------------------------------------------------------------------------
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+    void * pServiceManager, void * pRegistryKey)
+{
+    return component_writeInfoHelper(pServiceManager, pRegistryKey, services);
+}
diff --git a/shell/source/backends/kdebe/kdebackend.hxx b/shell/source/backends/kdebe/kdebackend.hxx
deleted file mode 100644
index 5305c4414a..0000000000
--- a/shell/source/backends/kdebe/kdebackend.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: kdebackend.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 KDEBACKEND_HXX_
-#define KDEBACKEND_HXX_
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XSCHEMASUPPLIER_HPP_
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#endif
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/configuration/InvalidBootstrapFileException.hpp>
-#include <com/sun/star/configuration/backend/CannotConnectException.hpp>
-#include <cppuhelper/compbase2.hxx>
-
-#ifndef INCLUDED_MAP
-#include <map>
-#define INCLUDED_MAP
-#endif
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-
-//------------------------------------------------------------------------------
-typedef cppu::WeakComponentImplHelper2<backend::XSingleLayerStratum,
-                       lang::XServiceInfo> BackendBase ;
-
-/**
-  Implements the SingleLayerStratum service for KDE access.
-  */
-class KDEBackend : public BackendBase {
-    public :
-        
-    static KDEBackend* createInstance(const uno::Reference<uno::XComponentContext>& xContext);
-
-        // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName(  ) 
-            throw (uno::RuntimeException) ;
-        
-        virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& aServiceName ) 
-            throw (uno::RuntimeException) ;
-
-        virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(  ) 
-            throw (uno::RuntimeException) ;
-
-        /**
-          Provides the implementation name.
-
-          @return   implementation name
-          */
-        static rtl::OUString SAL_CALL getBackendName(void) ;
-
-        /**
-          Provides the supported services names
-
-          @return   service names
-          */
-        static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void) ;
-
-        //XSingleLayerStratum
-        virtual uno::Reference<backend::XLayer> SAL_CALL 
-            getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-                throw (backend::BackendAccessException, lang::IllegalArgumentException) ;
-
-        virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-            getUpdatableLayer( const rtl::OUString& aLayerId ) 
-                throw (backend::BackendAccessException, lang::NoSupportException,	   
-                       lang::IllegalArgumentException) ;
-
-    protected:
-        /**
-          Service constructor from a service factory.
-
-          @param xContext   component context
-          */
-         KDEBackend(const uno::Reference<uno::XComponentContext>& xContext) 
-            throw (backend::BackendAccessException);
-                        
-        /** Destructor */
-        ~KDEBackend(void) ;
-
-    private:
-     
-        /** Build KDE/OO mapping table */ 
-        void initializeMappingTable ();
-
-        
-        /** The component context */		
-        uno::Reference<uno::XComponentContext> m_xContext;
-        
-        /** Mutex for reOOurces protection */
-        osl::Mutex mMutex ;
-
-        static KDEBackend* mInstance;
-};
-
-#endif // CONFIGMGR_LOCALBE_LOCALSINGLESTRATUM_HXX_
diff --git a/shell/source/backends/kdebe/kdebe.xml b/shell/source/backends/kdebe/kdebe.xml
deleted file mode 100644
index 7f4856be98..0000000000
--- a/shell/source/backends/kdebe/kdebe.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>kdebe</module-name>
-    <component-description>
-        <author> Éric Bischoff </author>
-        <name>com.sun.star.comp.configuration.backend.KDEBackend</name>
-        <description> The KDE configuration backend </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>        
-        <supported-service>com.sun.star.comp.configuration.backend.KDEBackend</supported-service>		
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
-        <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
-        <type>com.sun.star.configuration.backend.XLayerHandler</type>
-        <type>com.sun.star.configuration.backend.XSingleLayerStratum</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper3$(COM)</runtime-module-dependency>
-    <runtime-module-dependency>cppu3</runtime-module-dependency>
-    <runtime-module-dependency>sal3</runtime-module-dependency>
-</module-description>
diff --git a/shell/source/backends/kdebe/kdebecdef.cxx b/shell/source/backends/kdebe/kdebecdef.cxx
deleted file mode 100644
index c4995e6e81..0000000000
--- a/shell/source/backends/kdebe/kdebecdef.cxx
+++ /dev/null
@@ -1,143 +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: kdebecdef.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_shell.hxx"
-#include "kdebackend.hxx"
-#include <com/sun/star/registry/XRegistryKey.hpp>
-
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#include <cppuhelper/implementationentry.hxx>
-#endif
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include "kde_headers.h"
-
-#include "uno/current_context.hxx"
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
-//==============================================================================
-
-static uno::Reference<uno::XInterface> SAL_CALL createKDEBackend(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    try {
-        uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
-
-        if (xCurrentContext.is())
-        {
-            uno::Any aValue = xCurrentContext->getValueByName(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
-
-            rtl::OUString aDesktopEnvironment;
-            if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("KDE")) && (KApplication::kApplication() != NULL) )
-                return * KDEBackend::createInstance(xContext);
-        }
-
-        return uno::Reference<uno::XInterface>();
-
-    } catch (uno::RuntimeException e) {
-        return uno::Reference<uno::XInterface>();
-    }
-
-}
-
-//==============================================================================
-
-static const cppu::ImplementationEntry kImplementations_entries[] =
-{
-    {
-        createKDEBackend,
-        KDEBackend::getBackendName,
-        KDEBackend::getBackendServiceNames,
-        cppu::createSingleComponentFactory,
-        NULL,
-        0
-    },
-    { NULL, NULL, NULL, NULL, NULL, 0 }
-} ;
-//------------------------------------------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment(
-                                            const sal_Char **aEnvTypeName,
-                                            uno_Environment **) {
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *,
-                                                 void *pRegistryKey) {
-
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + KDEBackend::getBackendName()
-            );
-
-        // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-            );
-
-            uno::Sequence<rtl::OUString> sServiceNames = KDEBackend::getBackendServiceNames();
-            for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            return sal_True;
-        }
-
-        catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
-        }
-    }
-
-    return sal_False;
-}
-
-//------------------------------------------------------------------------------
-
-extern "C" void *component_getFactory(const sal_Char *aImplementationName,
-                                      void *aServiceManager,
-                                      void *aRegistryKey) {
-
-    return cppu::component_getFactoryHelper(
-        aImplementationName,
-        aServiceManager,
-        aRegistryKey,
-        kImplementations_entries) ;
-}
-//------------------------------------------------------------------------------
diff --git a/shell/source/backends/kdebe/kdecommonlayer.cxx b/shell/source/backends/kdebe/kdecommonlayer.cxx
deleted file mode 100644
index 44592e8933..0000000000
--- a/shell/source/backends/kdebe/kdecommonlayer.cxx
+++ /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: kdecommonlayer.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_shell.hxx"
-#include "kdecommonlayer.hxx"
-#include "kde_headers.h"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/uno/Sequence.hxx>
-
-#define SPACE      ' '
-
-//==============================================================================
-
-KDECommonLayer::KDECommonLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
-    throw ( backend::MalformedDataException, lang::NullPointerException,
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(3);
-    sal_Int32 nProperties = 0;
-
-    // Email client settings
-    KEMailSettings aEmailSettings;
-    QString aClientProgram;
-    ::rtl::OUString sClientProgram;
-
-    aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
-    if ( aClientProgram.isEmpty() )
-        aClientProgram = "kmail";
-    else
-        aClientProgram = aClientProgram.section(SPACE, 0, 0);
-    sClientProgram = (const sal_Unicode *) aClientProgram.ucs2();
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer/Program") );
-    aPropInfoList[nProperties].Type = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( sClientProgram );
-
-    // Source code font settings
-    QFont aFixedFont;
-    QString aFontName;
-    :: rtl::OUString sFontName;
-    short nFontHeight;
-
-    aFixedFont = KGlobalSettings::fixedFont();
-    aFontName = aFixedFont.family();
-    sFontName = (const sal_Unicode *) aFontName.ucs2();
-    nFontHeight = aFixedFont.pointSize();
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontName") );
-    aPropInfoList[nProperties].Type = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( sFontName );
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontHeight") );
-    aPropInfoList[nProperties].Type = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "short" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( nFontHeight );
-
-    if( nProperties > 0 )
-    {
-        aPropInfoList.realloc(nProperties);
-        m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDECommonLayer::getTimestamp(void)
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    KEMailSettings aEmailSettings;
-    QString aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram );
-    aClientProgram = aClientProgram.section(SPACE, 0, 0);
-
-    QString aFixedFont = KGlobalSettings::fixedFont().toString();
-
-    ::rtl::OUString sTimeStamp,
-                    sep( RTL_CONSTASCII_USTRINGPARAM( "$" ) );
-
-    sTimeStamp = (const sal_Unicode *) aClientProgram.ucs2();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aFixedFont.ucs2();
-
-    return sTimeStamp;
-}
diff --git a/shell/source/backends/kdebe/kdecommonlayer.hxx b/shell/source/backends/kdebe/kdecommonlayer.hxx
deleted file mode 100644
index 84bcf35544..0000000000
--- a/shell/source/backends/kdebe/kdecommonlayer.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef KDECOMMONLAYER_HXX_
-#define KDECOMMONLAYER_HXX_
-
-#include "kdebackend.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.Office.Common configuration component.
-  */
-class KDECommonLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-    
-    KDECommonLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDECommonLayer(void) {}
-              
-    private :
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-  } ;
-
-#endif // KDECOMMONLAYER
diff --git a/shell/source/backends/kdebe/kdeinetlayer.cxx b/shell/source/backends/kdebe/kdeinetlayer.cxx
deleted file mode 100644
index 476baec070..0000000000
--- a/shell/source/backends/kdebe/kdeinetlayer.cxx
+++ /dev/null
@@ -1,254 +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: kdeinetlayer.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_shell.hxx"
-#include "kdeinetlayer.hxx"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/uno/Sequence.hxx>
-
-#define COMMA      ','
-#define SEMI_COLON ';'
-
-//==============================================================================
-
-KDEInetLayer::KDEInetLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEInetLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException, lang::NullPointerException, 
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(8);
-    sal_Int32 nProperties = 0;
-
-    switch ( KProtocolManager::proxyType() )
-    {
-        case KProtocolManager::ManualProxy: // Proxies are manually configured
-            setProxy(aPropInfoList, nProperties, 1,
-                     KProtocolManager::noProxyFor(),
-                     KProtocolManager::proxyFor( "HTTP" ),
-                     KProtocolManager::proxyFor( "FTP" ),
-                     KProtocolManager::proxyFor( "HTTPS" ));
-            break;
-        case KProtocolManager::PACProxy:    // A proxy configuration URL has been given
-        case KProtocolManager::WPADProxy:   // A proxy should be automatically discovered
-        case KProtocolManager::EnvVarProxy: // Use the proxy values set through environment variables
-// In such cases, the proxy address is not stored in KDE, but determined dynamically.
-// The proxy address may depend on the requested address, on the time of the day, on the speed of the wind...
-// The best we can do here is to ask the current value for a given address.
-            setProxy(aPropInfoList, nProperties, 1,
-                     KProtocolManager::noProxyFor(),
-                     KProtocolManager::proxyForURL( "http://www.openoffice.org" ),
-                     KProtocolManager::proxyForURL( "ftp://ftp.openoffice.org" ),
-                     KProtocolManager::proxyForURL( "https://www.openoffice.org" ));
-            break;
-        default:                            // No proxy is used
-            setProxy(aPropInfoList, nProperties, 0);
-    }
-
-    if ( nProperties > 0 )
-    {
-      aPropInfoList.realloc(nProperties);
-      m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDEInetLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    QString aProxyType, aNoProxyFor, aHTTPProxy, aHTTPSProxy, aFTPProxy;
-
-    switch ( KProtocolManager::proxyType() )
-    {
-        case KProtocolManager::ManualProxy:
-            aProxyType = '1';
-            aNoProxyFor = KProtocolManager::noProxyFor();
-            aHTTPProxy = KProtocolManager::proxyFor( "HTTP" );
-            aHTTPProxy = KProtocolManager::proxyFor( "HTTPS" );
-            aFTPProxy = KProtocolManager::proxyFor( "FTP" );
-            break;
-        case KProtocolManager::PACProxy:
-        case KProtocolManager::WPADProxy:
-        case KProtocolManager::EnvVarProxy:
-            aProxyType = '1';
-            aNoProxyFor = KProtocolManager::noProxyFor();
-            aHTTPProxy = KProtocolManager::proxyForURL( "http://www.openoffice.org" );
-            aHTTPSProxy = KProtocolManager::proxyForURL( "https://www.openoffice.org" );
-            aFTPProxy = KProtocolManager::proxyForURL( "ftp://ftp.openoffice.org" );
-            break;
-        default:
-            aProxyType = '0';
-    }
-
-    ::rtl::OUString sTimeStamp,
-                    sep( RTL_CONSTASCII_USTRINGPARAM( "$" ) );
-
-    sTimeStamp = (const sal_Unicode *) aProxyType.ucs2();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aNoProxyFor.ucs2();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aHTTPProxy.ucs2();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aHTTPSProxy.ucs2();
-    sTimeStamp += sep;
-    sTimeStamp += (const sal_Unicode *) aFTPProxy.ucs2();
-
-    return sTimeStamp;
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEInetLayer::setProxy
-    (uno::Sequence<backend::PropertyInfo> &aPropInfoList, sal_Int32 &nProperties,
-     int nProxyType, const QString &aNoProxy, const QString &aHTTPProxy, const QString &aFTPProxy, const QString &aHTTPSProxy ) const
-{
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetProxyType") );
-    aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( (sal_Int32) nProxyType );
-
-    if (nProxyType == 0) return;
-
-    if ( !aNoProxy.isEmpty() )
-    {
-        QString aNoProxyFor(aNoProxy);
-        ::rtl::OUString sNoProxyFor;
-
-        aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON );
-        sNoProxyFor = (const sal_Unicode *) aNoProxyFor.ucs2();
-
-        aPropInfoList[nProperties].Name = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetNoProxy") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sNoProxyFor );
-    }
-
-    if ( !aHTTPProxy.isEmpty() )
-    {
-        KURL aProxy(aHTTPProxy);
-        ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2();
-        sal_Int32 nPort = aProxy.port();
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyName") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sProxy );
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyPort") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( nPort );
-    }
-
-    if ( !aHTTPSProxy.isEmpty() )
-    {
-        KURL aProxy(aHTTPSProxy);
-        ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2();
-        sal_Int32 nPort = aProxy.port();
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyName") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sProxy );
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyPort") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( nPort );
-    }
-
-    if ( !aFTPProxy.isEmpty() )
-    {
-        KURL aProxy(aFTPProxy);
-        ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().ucs2();
-        sal_Int32 nPort = aProxy.port();
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyName") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( sProxy );
-
-        aPropInfoList[nProperties].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyPort") );
-        aPropInfoList[nProperties].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[nProperties].Protected = sal_False;
-        aPropInfoList[nProperties++].Value = uno::makeAny( nPort );
-    }
-}
-
diff --git a/shell/source/backends/kdebe/kdeinetlayer.hxx b/shell/source/backends/kdebe/kdeinetlayer.hxx
deleted file mode 100755
index 1a7427b1cb..0000000000
--- a/shell/source/backends/kdebe/kdeinetlayer.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef KDEINETLAYER_HXX_
-#define KDEINETLAYER_HXX_
-
-#include "kdebackend.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <kde_headers.h>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.Inet configuration component.
-  */
-class KDEInetLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped>
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-
-    KDEInetLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler)
-        throw ( backend::MalformedDataException,
-                lang::NullPointerException,
-                lang::WrappedTargetException,
-                uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void)
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDEInetLayer(void) {}
-
-private :
-    uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-
-    void SAL_CALL setProxy
-        (uno::Sequence<backend::PropertyInfo> &aPropInfoList, sal_Int32 &nProperties,
-         int nProxyType, const QString &aNoProxyfor = QString(),
-         const QString &aHTTPProxy = QString(), const QString &aFTPProxy = QString(), const QString &aHTTPSProxy = QString()) const;
-  } ;
-
-#endif // KDEINETLAYER
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx
deleted file mode 100644
index c60a7fff04..0000000000
--- a/shell/source/backends/kdebe/kdepathslayer.cxx
+++ /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: kdepathslayer.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_shell.hxx"
-#include "kdepathslayer.hxx"
-#include "kde_headers.h"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <osl/security.hxx>
-#include <osl/file.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#define SPACE      ' '
-
-//==============================================================================
-
-KDEPathsLayer::KDEPathsLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
-    throw ( backend::MalformedDataException, lang::NullPointerException,
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
-    sal_Int32 nProperties = 0;
-
-    QString aDocumentsDir( KGlobalSettings::documentPath() );
-    rtl::OUString sDocumentsDir;
-    rtl::OUString sDocumentsURL;
-    if ( aDocumentsDir.endsWith(QChar('/')) )
-        aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
-    sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2();
-    osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
-
-    aPropInfoList[nProperties].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Paths/Variables/Work") );
-    aPropInfoList[nProperties].Type = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[nProperties].Protected = sal_False;
-    aPropInfoList[nProperties++].Value = uno::makeAny( sDocumentsURL );
-
-    if( nProperties > 0 )
-    {
-        aPropInfoList.realloc(nProperties);
-        m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDEPathsLayer::getTimestamp(void)
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    ::rtl::OUString sTimeStamp,
-                    sep( RTL_CONSTASCII_USTRINGPARAM( "$" ) );
-
-    QString aDocumentsDir;
-    aDocumentsDir = KGlobalSettings::documentPath();
-
-    sTimeStamp += (const sal_Unicode *) aDocumentsDir.ucs2();
-
-    return sTimeStamp;
-}
diff --git a/shell/source/backends/kdebe/kdepathslayer.hxx b/shell/source/backends/kdebe/kdepathslayer.hxx
deleted file mode 100644
index fe882064ee..0000000000
--- a/shell/source/backends/kdebe/kdepathslayer.hxx
+++ /dev/null
@@ -1,86 +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: kdepathslayer.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 KDEPATHSLAYER_HXX_
-#define KDEPATHSLAYER_HXX_
-
-#include "kdebackend.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.Office.Paths configuration component.
-  */
-class KDEPathsLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-    
-    KDEPathsLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDEPathsLayer(void) {}
-              
-    private :
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-  } ;
-
-#endif // KDEPATHSLAYER
diff --git a/shell/source/backends/kdebe/kdevcllayer.cxx b/shell/source/backends/kdebe/kdevcllayer.cxx
deleted file mode 100644
index f6c5368acf..0000000000
--- a/shell/source/backends/kdebe/kdevcllayer.cxx
+++ /dev/null
@@ -1,116 +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: kdevcllayer.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_shell.hxx"
-#include "kdevcllayer.hxx"
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/uno/Sequence.hxx>
-#include "kde_headers.h"
-
-//==============================================================================
-
-KDEVCLLayer::KDEVCLLayer(const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
-    throw ( backend::MalformedDataException, lang::NullPointerException,
-            lang::WrappedTargetException, uno::RuntimeException)
-{
-    if( ! m_xLayerContentDescriber.is() )
-    {
-        throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
-        ) ), static_cast < backend::XLayer * > (this) );
-    }
-
-    uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
-
-/*
-   Commenting out, does not make much sense without an accessibility bridge
-===========================================================================
-#if defined(QT_ACCESSIBILITY_SUPPORT)
-// Accessibility tools under Qt for UNIX are available starting with Qt 4.0
-    int nVersionMajor = 0;
-    const char *q = qVersion();     // "3.1.0" for example
-    while ('0' <= *q && *q <= '9')
-        nVersionMajor = nVersionMajor * 10 + *q++ - '0';
-    sal_Bool ATToolSupport = (sal_Bool) (nVersionMajor >= 4);
-#else
-    sal_Bool ATToolSupport = sal_False;
-#endif
-===========================================================================
-   End of commented out section
-*/  sal_Bool ATToolSupport = sal_False;
-
-    aPropInfoList[0].Name = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.VCL/Settings/Accessibility/EnableATToolSupport") );
-    aPropInfoList[0].Type = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-    aPropInfoList[0].Protected = sal_False;
-    aPropInfoList[0].Value = uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) );
-
-    m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL KDEVCLLayer::getTimestamp(void)
-    throw (uno::RuntimeException)
-{
-    // Return the value as timestamp to avoid regenerating the binary cache
-    // on each office launch.
-
-    ::rtl::OUString sTimeStamp(
-                RTL_CONSTASCII_USTRINGPARAM( "FALSE" ) );
-
-    return sTimeStamp;
-}
diff --git a/shell/source/backends/kdebe/kdevcllayer.hxx b/shell/source/backends/kdebe/kdevcllayer.hxx
deleted file mode 100644
index 32b541a3c3..0000000000
--- a/shell/source/backends/kdebe/kdevcllayer.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef KDEVCLLAYER_HXX_
-#define KDEVCLLAYER_HXX_
-
-#include "kdebackend.hxx"
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interface for the KDE values mapped into
-  the org.openoffice.VCL configuration component.
-  */
-class KDEVCLLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-public :
-    /**
-      Constructor given the component context
-
-      @param xContext       The component context
-    */
-    
-    KDEVCLLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    // XLayer
-    virtual void SAL_CALL readData(
-        const uno::Reference<backend::XLayerHandler>& xHandler) 
-        throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException) ;
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void) 
-        throw (uno::RuntimeException);
-
-    protected:
-
-    /** Destructor */
-    ~KDEVCLLayer(void) {}
-              
-    private :
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-  } ;
-
-#endif // KDEVCLLAYER
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk
index 6159be6be1..b63e233262 100644
--- a/shell/source/backends/kdebe/makefile.mk
+++ b/shell/source/backends/kdebe/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -35,11 +31,7 @@ TARGET=kdebe
 
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
-
-COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
-UNOUCROUT=$(OUT)$/inc$/$(TARGET)
-INCPRE=$(UNOUCROUT)
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings ---
 
@@ -64,12 +56,8 @@ CFLAGS+=$(KDE_CFLAGS)
 # --- Files ---
 
 SLOFILES=\
-    $(SLO)$/kdebackend.obj \
-    $(SLO)$/kdecommonlayer.obj \
-    $(SLO)$/kdeinetlayer.obj \
-    $(SLO)$/kdevcllayer.obj \
-    $(SLO)$/kdepathslayer.obj \
-    $(SLO)$/kdebecdef.obj
+    $(SLO)$/kdeaccess.obj \
+    $(SLO)$/kdebackend.obj
 
 SHL1NOCHECK=TRUE
 SHL1TARGET=$(TARGET)1.uno   
@@ -81,9 +69,8 @@ SHL1LINKFLAGS+=$(KDE_LIBS) -lkio
 SHL1STDLIBS=    \
         $(CPPUHELPERLIB) \
         $(CPPULIB) \
-        $(SALLIB)
-        
-SHL1VERSIONMAP=exports.map
+        $(SALLIB) \
+
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 80d6240ae8..e98d7d752f 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: localebackend.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,9 +29,7 @@
 #include "precompiled_shell.hxx"
 
 #include "localebackend.hxx"
-#include "localelayer.hxx"
-#include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-#include <uno/current_context.hxx>
+#include <com/sun/star/beans/Optional.hpp>
 #include <osl/time.h>
 
 #include <stdio.h>
@@ -229,11 +224,7 @@ rtl::OUString ImplGetLocale(LCID lcid)
 
 // -------------------------------------------------------------------------------
 
-LocaleBackend::LocaleBackend(const uno::Reference<uno::XComponentContext>& xContext)
-    throw (backend::BackendAccessException) :
-    ::cppu::WeakImplHelper2 < backend::XSingleLayerStratum, lang::XServiceInfo > (),
-    m_xContext(xContext)
-
+LocaleBackend::LocaleBackend()
 {
 }
 
@@ -245,11 +236,9 @@ LocaleBackend::~LocaleBackend(void)
 
 //------------------------------------------------------------------------------
 
-LocaleBackend* LocaleBackend::createInstance(
-    const uno::Reference<uno::XComponentContext>& xContext
-)
+LocaleBackend* LocaleBackend::createInstance()
 {
-    return new LocaleBackend(xContext);
+    return new LocaleBackend;
 }
 
 // ---------------------------------------------------------------------------------------
@@ -291,61 +280,45 @@ rtl::OUString LocaleBackend::getSystemLocale(void)
 }
 //------------------------------------------------------------------------------
 
-rtl::OUString LocaleBackend::createTimeStamp()
+void LocaleBackend::setPropertyValue(
+    rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
 {
-    // the time stamp is free text, so just returning the values here.
-    return getLocale() + getUILocale() + getSystemLocale();
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XLayer> SAL_CALL LocaleBackend::getLayer(
-        const rtl::OUString& aComponent, const rtl::OUString& /*aTimestamp*/)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException)
+css::uno::Any LocaleBackend::getPropertyValue(
+    rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
 {
-
-    uno::Sequence<rtl::OUString> aComps( getSupportedComponents() );
-    if( aComponent.equals( aComps[0]) )
+    if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Locale"))) {
+        return css::uno::makeAny(
+            css::beans::Optional< css::uno::Any >(
+                true, css::uno::makeAny(getLocale())));
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("SystemLocale")))
     {
-        if( ! m_xSystemLayer.is() )
-        {
-            uno::Sequence<backend::PropertyInfo> aPropInfoList(3);
-            
-            aPropInfoList[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.System/L10N/UILocale") );
-            aPropInfoList[0].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-            aPropInfoList[0].Protected = sal_False;
-            aPropInfoList[0].Value = uno::makeAny( getUILocale() );
-
-            aPropInfoList[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N/Locale") );
-            aPropInfoList[1].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ));
-            aPropInfoList[1].Protected = sal_False;
-            aPropInfoList[1].Value = uno::makeAny( getLocale() );
-
-            aPropInfoList[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N/SystemLocale") );
-            aPropInfoList[2].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ));
-            aPropInfoList[2].Protected = sal_False;
-            aPropInfoList[2].Value = uno::makeAny( getSystemLocale() );
-
-            m_xSystemLayer = new LocaleLayer(aPropInfoList, createTimeStamp(), m_xContext);           
-        }
-        
-        return m_xSystemLayer;
+        return css::uno::makeAny(
+            css::beans::Optional< css::uno::Any >(
+                true, css::uno::makeAny(getSystemLocale())));
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("UILocale")))
+    {
+        return css::uno::makeAny(
+            css::beans::Optional< css::uno::Any >(
+                true, css::uno::makeAny(getUILocale())));
+    } else {
+        throw css::beans::UnknownPropertyException(
+            PropertyName, static_cast< cppu::OWeakObject * >(this));
     }
-    
-    return uno::Reference<backend::XLayer>();
-}	
-
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-LocaleBackend::getUpdatableLayer(const rtl::OUString& /*aComponent*/) 
-    throw (backend::BackendAccessException,lang::NoSupportException,	   
-           lang::IllegalArgumentException)
-{
-    throw lang::NoSupportException(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "LocaleBackend: No Update Operation allowed, Read Only access") ),
-        *this) ; 
 }
 
 //------------------------------------------------------------------------------
@@ -366,10 +339,8 @@ rtl::OUString SAL_CALL LocaleBackend::getImplementationName(void)
 
 uno::Sequence<rtl::OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) 
 {
-    uno::Sequence<rtl::OUString> aServiceNameList(2);
+    uno::Sequence<rtl::OUString> aServiceNameList(1);
     aServiceNameList[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.LocaleBackend")) ;
-    aServiceNameList[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.PlatformBackend")) ;
-            
     return aServiceNameList ;
 }
 
@@ -394,16 +365,3 @@ uno::Sequence<rtl::OUString> SAL_CALL LocaleBackend::getSupportedServiceNames(vo
 {
     return getBackendServiceNames() ;
 }
-
-// ---------------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL LocaleBackend::getSupportedComponents(void) 
-{
-    uno::Sequence<rtl::OUString> aSupportedComponentList(1);
-    aSupportedComponentList[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.System" ) 
-    );
-    
-    return aSupportedComponentList;
-}
-
diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx
index eedce52b89..e927f95aa9 100644
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: localebackend.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,10 +28,8 @@
 #ifndef _FIXEDVALUEBACKEND_HXX_
 #define _FIXEDVALUEBACKEND_HXX_
 
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <rtl/string.hxx>
 
@@ -42,19 +37,14 @@
 namespace css = com::sun::star ;
 namespace uno = css::uno ;
 namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-
 
-/**
-  Implements the SingleLayerStratum service.
-  */
 class LocaleBackend : public ::cppu::WeakImplHelper2 < 
-        backend::XSingleLayerStratum,
+        css::beans::XPropertySet,
         lang::XServiceInfo > {
         
     public :
         
-        static LocaleBackend* createInstance(const uno::Reference<uno::XComponentContext>& xContext);
+        static LocaleBackend* createInstance();
 
         // XServiceInfo
         virtual rtl::OUString SAL_CALL 
@@ -81,45 +71,70 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 <
           @return   service names
           */
         static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void) ;
-        /**
-          Provides the supported component nodes
-          
-          @return supported component nodes
-        */
-        static uno::Sequence<rtl::OUString> SAL_CALL getSupportedComponents(void) ;
-
-        //XSingleLayerStratum
-        virtual uno::Reference<backend::XLayer> SAL_CALL 
-        getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-            throw (backend::BackendAccessException,
-                   lang::IllegalArgumentException) ;
-
-        virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-        getUpdatableLayer( const rtl::OUString& aLayerId ) 
-            throw (backend::BackendAccessException,
-                   lang::NoSupportException,	   
-                   lang::IllegalArgumentException) ;
+
+        // XPropertySet
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+        getPropertySetInfo() throw (css::uno::RuntimeException)
+        { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
+
+        virtual void SAL_CALL setPropertyValue(
+            rtl::OUString const &, css::uno::Any const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::beans::PropertyVetoException,
+                css::lang::IllegalArgumentException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+        virtual css::uno::Any SAL_CALL getPropertyValue(
+            rtl::OUString const & PropertyName)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+        virtual void SAL_CALL addPropertyChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
+        virtual void SAL_CALL removePropertyChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
+        virtual void SAL_CALL addVetoableChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
+        virtual void SAL_CALL removeVetoableChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
     protected:
         /**
           Service constructor from a service factory.
 
           @param xContext   component context
           */
-        LocaleBackend(const uno::Reference<uno::XComponentContext>& xContext) 
-            throw (backend::BackendAccessException);
+        LocaleBackend();
 
         /** Destructor */
         ~LocaleBackend(void) ;
 
     private:
-    
-        uno::Reference<uno::XComponentContext> m_xContext ;
-        uno::Reference<backend::XLayer> m_xSystemLayer ;
-        
-        // Returns a time stamp in the appropriate format 
-        // for configuration layers.
-        static rtl::OUString createTimeStamp(void);
-        
         // Returns the user locale 
         static rtl::OUString getLocale(void);
         
diff --git a/shell/source/backends/localebe/localebe.xml b/shell/source/backends/localebe/localebe.xml
index d3778f30e3..fe641db7fc 100644
--- a/shell/source/backends/localebe/localebe.xml
+++ b/shell/source/backends/localebe/localebe.xml
@@ -10,7 +10,6 @@
         <language>c++</language>
         <status value="beta"/>        
         <supported-service>com.sun.star.comp.configuration.backend.LocaleBackend</supported-service>		
-        <supported-service>com.sun.star.comp.configuration.backend.PlatformBackend</supported-service>		
         <service-dependency>...</service-dependency>
         <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
         <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index 668187b1ee..8326c65075 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: localebecdef.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,6 @@
 #include "precompiled_shell.hxx"
 
 #include <localebackend.hxx>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 
 #ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
@@ -42,14 +38,13 @@
 namespace css = com::sun::star ;
 namespace uno = css::uno ;
 namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
 
 //------------------------------------------------------------------------------
 
 static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend(
-    const uno::Reference<uno::XComponentContext>& xContext){
+    const uno::Reference<uno::XComponentContext>&){
 
-    return * LocaleBackend::createInstance(xContext);	
+    return * LocaleBackend::createInstance();
 }
 
 //------------------------------------------------------------------------------
@@ -77,41 +72,9 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void *pRegistryKey) {
-    
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + LocaleBackend::getBackendName()
-            );
-            
-        // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( 
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-            );
-            
-            uno::Sequence<rtl::OUString> sServiceNames = LocaleBackend::getBackendServiceNames();
-            for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            // Register supported components            
-            uno::Reference<XRegistryKey> xComponentKey = xImplKey->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/DATA/SupportedComponents") )
-            );
-        
-            xComponentKey->setAsciiListValue( LocaleBackend::getSupportedComponents() );
-
-            return sal_True;
-        }
-        catch( InvalidRegistryException& )
-        {                       
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");           
-        }
-    }
-    return sal_False;
+extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) {
+    return cppu::component_writeInfoHelper(
+        pServiceManager, pRegistryKey, kImplementations_entries);
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/localebe/localelayer.cxx b/shell/source/backends/localebe/localelayer.cxx
deleted file mode 100644
index 9d30723b3f..0000000000
--- a/shell/source/backends/localebe/localelayer.cxx
+++ /dev/null
@@ -1,88 +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: localelayer.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_shell.hxx"
-#include "localelayer.hxx"
-
-//------------------------------------------------------------------------------
-
-LocaleLayer::LocaleLayer( const uno::Sequence<backend::PropertyInfo>& aPropInfoList,
-    const rtl::OUString& aTimestamp,
-    const uno::Reference<uno::XComponentContext>& xContext)
-  : m_aTimestamp(aTimestamp), m_aPropInfoList(aPropInfoList)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }	
-
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL LocaleLayer::readData(
-    const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-
-    if (m_xLayerContentDescriber.is())
-    {
-        m_xLayerContentDescriber->describeLayer(xHandler, m_aPropInfoList);
-    }
-    else
-    {
-        OSL_TRACE("Could not create com.sun.star.configuration.backend.LayerContentDescriber Service");
-    }	
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL LocaleLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    return m_aTimestamp;
-}
-
-//------------------------------------------------------------------------------
diff --git a/shell/source/backends/localebe/localelayer.hxx b/shell/source/backends/localebe/localelayer.hxx
deleted file mode 100644
index c720efca49..0000000000
--- a/shell/source/backends/localebe/localelayer.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _LOCALELAYER_HXX_
-#define _LOCALELAYER_HXX_
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase2.hxx>
-
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interfaces for fixed values
- */
- 
-class LocaleLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-    public :
-        /**
-          Constructor given the requested component name
-          
-          @param aPropInfoListyMap        Gconf->OO key map
-          @param aCompoentName  Requested Component Name
-          @param sTimestamp     timestamp indicating last modifictaion
-         */
-        LocaleLayer(const uno::Sequence<backend::PropertyInfo>& aPropInfoList,
-            const rtl::OUString& aTimestamp,
-            const uno::Reference<uno::XComponentContext>& xContext);
-            
-        /** Destructor */
-        ~LocaleLayer(void) {}
-
-        // XLayer
-        virtual void SAL_CALL readData(const uno::Reference<backend::XLayerHandler>& xHandler) 
-            throw ( backend::MalformedDataException,
-                    lang::NullPointerException, 
-                    lang::WrappedTargetException, 
-                    uno::RuntimeException) ;
-      
-        // XTimeStamped
-        virtual rtl::OUString SAL_CALL getTimestamp(void) 
-            throw (uno::RuntimeException);
-            
-    private :
-        
-        rtl::OUString m_aTimestamp ;
-        rtl::OUString m_aComponent ;
-        
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-        uno::Sequence<backend::PropertyInfo> m_aPropInfoList ;
-} ;
-
-#endif // _LOCALELAYER_HXX_
diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk
index 76767264a8..8a05be4cb3 100644
--- a/shell/source/backends/localebe/makefile.mk
+++ b/shell/source/backends/localebe/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -49,9 +45,8 @@ DLLPRE =
 
 SLOFILES=\
     $(SLO)$/localebecdef.obj \
-    $(SLO)$/localebackend.obj \
-    $(SLO)$/localelayer.obj
-        
+    $(SLO)$/localebackend.obj
+
 SHL1TARGET=$(TARGET)1.uno   
 SHL1OBJS=$(SLOFILES)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index 53f64ea663..2d4eb169be 100644
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macbackend.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,18 +28,140 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 
+// For MAXHOSTNAMELEN constant
+#include <sys/param.h>
+
+#include <premac.h>
+#include <SystemConfiguration/SystemConfiguration.h>
+#include <Foundation/NSPathUtilities.h>
+#include <postmac.h>
+
 #include "macbackend.hxx"
-#include "macbelayer.hxx"
-#include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-#include <uno/current_context.hxx>
 
-#define MACBE_INET_COMPONENT    "org.openoffice.Inet"
-#define MACBE_PATHS_COMPONENT   "org.openoffice.Office.Paths"
+#include "com/sun/star/beans/Optional.hpp"
+#include "rtl/ustrbuf.hxx"
+#include "osl/file.h"
+
+#define SPACE      ' '
+#define SEMI_COLON ';'
+
+typedef struct
+{
+    rtl::OUString Server;
+    sal_Int32 Port;
+} ProxyEntry;
+
+typedef enum {
+    sHTTP,
+    sHTTPS,
+    sFTP
+} ServiceType;
+
+//------------------------------------------------------------------------
+// helper functions
+//------------------------------------------------------------------------
 
-MacOSXBackend::MacOSXBackend(const uno::Reference<uno::XComponentContext>& xContext)
-        throw (backend::BackendAccessException) :
-        ::cppu::WeakImplHelper2 < backend::XSingleLayerStratum, lang::XServiceInfo > (),
-        m_xContext(xContext)
+namespace // private
+{
+
+/*
+ * Returns current proxy settings for selected service type (HTTP or
+ * FTP) as a C string (in the buffer specified by host and hostSize)
+ * and a port number.
+ */
+
+bool GetProxySetting(ServiceType sType, char *host, size_t hostSize, UInt16 *port)
+{
+    bool                result;
+    CFDictionaryRef     proxyDict;
+    CFNumberRef         enableNum;
+    int                 enable;
+    CFStringRef         hostStr;
+    CFNumberRef         portNum;
+    int                 portInt;
+
+    proxyDict = SCDynamicStoreCopyProxies(NULL);
+
+    if (!proxyDict)
+        return false;
+
+    CFStringRef proxiesEnable;
+    CFStringRef proxiesProxy;
+    CFStringRef proxiesPort;
+
+    switch ( sType )
+    {
+        case sHTTP : proxiesEnable =  kSCPropNetProxiesHTTPEnable;
+                     proxiesProxy = kSCPropNetProxiesHTTPProxy;
+                     proxiesPort = kSCPropNetProxiesHTTPPort;
+            break;
+        case sHTTPS: proxiesEnable = kSCPropNetProxiesHTTPSEnable;
+                     proxiesProxy = kSCPropNetProxiesHTTPSProxy;
+                     proxiesPort = kSCPropNetProxiesHTTPSPort;
+            break;
+        default: proxiesEnable = kSCPropNetProxiesFTPEnable;
+                 proxiesProxy = kSCPropNetProxiesFTPProxy;
+                 proxiesPort = kSCPropNetProxiesFTPPort;
+            break;
+    }
+    // Proxy enabled?
+    enableNum = (CFNumberRef) CFDictionaryGetValue( proxyDict,
+                                                   proxiesEnable );
+
+    result = (enableNum != NULL) && (CFGetTypeID(enableNum) == CFNumberGetTypeID());
+
+    if (result)
+        result = CFNumberGetValue(enableNum, kCFNumberIntType, &enable) && (enable != 0);
+
+    // Proxy enabled -> get hostname
+    if (result)
+    {
+        hostStr = (CFStringRef) CFDictionaryGetValue( proxyDict,
+                                                     proxiesProxy );
+
+        result = (hostStr != NULL) && (CFGetTypeID(hostStr) == CFStringGetTypeID());
+    }
+
+    if (result)
+        result = CFStringGetCString(hostStr, host, (CFIndex) hostSize, kCFStringEncodingASCII);
+
+    // Get proxy port
+    if (result)
+    {
+        portNum = (CFNumberRef) CFDictionaryGetValue( proxyDict,
+                                                     proxiesPort );
+
+        result = (portNum != NULL) && (CFGetTypeID(portNum) == CFNumberGetTypeID());
+    }
+    else
+    {
+        CFRelease(proxyDict);
+        return false;
+    }
+
+    if (result)
+        result = CFNumberGetValue(portNum, kCFNumberIntType, &portInt);
+
+    if (result)
+        *port = (UInt16) portInt;
+
+    if (proxyDict)
+        CFRelease(proxyDict);
+
+    if (!result)
+    {
+        *host = 0;
+        *port = 0;
+    }
+
+    return result;
+}
+
+} // end private namespace
+
+//------------------------------------------------------------------------------
+
+MacOSXBackend::MacOSXBackend()
 {
 }
 
@@ -54,46 +173,282 @@ MacOSXBackend::~MacOSXBackend(void)
 
 //------------------------------------------------------------------------------
 
-MacOSXBackend* MacOSXBackend::createInstance(const uno::Reference<uno::XComponentContext>& xContext)
+MacOSXBackend* MacOSXBackend::createInstance()
 {
-    return new MacOSXBackend(xContext);
+    return new MacOSXBackend;
 }
 
 // ---------------------------------------------------------------------------------------
 
-uno::Reference<backend::XLayer> SAL_CALL MacOSXBackend::getLayer(const rtl::OUString& aComponent, const rtl::OUString& /*aTimestamp*/)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException)
-{
-    if( aComponent.equalsAscii( MACBE_INET_COMPONENT ) )
-    {
-        if( ! m_xSystemLayer.is() )
-            m_xSystemLayer = new MacOSXLayer( m_xContext );
+rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
+    CFRetain(sOrig);
 
-        return m_xSystemLayer;
-    }
-    else if( aComponent.equalsAscii( MACBE_PATHS_COMPONENT ) )
-    {
-        if( ! m_xPathLayer.is() )
-            m_xPathLayer = new MacOSXPathLayer( m_xContext );
-        return m_xPathLayer;
-    }
+    CFIndex nStringLen = CFStringGetLength(sOrig)+1;
+
+    // Allocate a c string buffer
+    char sBuffer[nStringLen];
+
+    CFStringGetCString(sOrig, sBuffer, nStringLen, kCFStringEncodingASCII);
+
+    CFRelease(sOrig);
 
-    return uno::Reference<backend::XLayer>();
+    return rtl::OUString::createFromAscii((sal_Char*)sBuffer);
 }
 
-//------------------------------------------------------------------------------
+rtl::OUString GetOUString( NSString* pStr )
+{
+    if( ! pStr )
+        return rtl::OUString();
+    int nLen = [pStr length];
+    if( nLen == 0 )
+        return rtl::OUString();
+    
+    rtl::OUStringBuffer aBuf( nLen+1 );
+    aBuf.setLength( nLen );
+    [pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())];
+    return aBuf.makeStringAndClear();
+}
 
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-    MacOSXBackend::getUpdatableLayer(const rtl::OUString& /*aComponent*/)
-    throw (backend::BackendAccessException,lang::NoSupportException,
-           lang::IllegalArgumentException)
+void MacOSXBackend::setPropertyValue(
+    rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
 {
-    throw lang::NoSupportException(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                           "MacOSXBackend: No Update Operation allowed, Read Only access") ),
-        *this);
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
+}
 
-    return NULL;
+css::uno::Any MacOSXBackend::getPropertyValue(
+    rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    if (PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
+    {
+        rtl::OUString aDocDir;
+        NSArray* pPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, true );
+        if( pPaths && [pPaths count] > 0 )
+        {
+            aDocDir = GetOUString( [pPaths objectAtIndex: 0] );
+            
+            rtl::OUString aDocURL;
+            if( aDocDir.getLength() > 0 &&
+                osl_getFileURLFromSystemPath( aDocDir.pData, &aDocURL.pData ) == osl_File_E_None )
+            {
+                return css::uno::makeAny(
+                    css::beans::Optional< css::uno::Any >(
+                        true, css::uno::makeAny( aDocURL ) ) );
+            }
+            else
+            {
+                OSL_TRACE( "user documents list contains empty file path or conversion failed" );
+            }
+        }
+        else
+        {
+            OSL_TRACE( "Got nil or empty list of user document directories" );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
+    {
+        ProxyEntry aFtpProxy;
+
+        char host[MAXHOSTNAMELEN];
+        UInt16 port;
+        bool retVal;
+
+        retVal = GetProxySetting(sFTP, host, 100, &port);
+
+        if (retVal)
+        {
+            aFtpProxy.Server = rtl::OUString::createFromAscii( host );
+        }
+
+        // ftp proxy name
+        if( aFtpProxy.Server.getLength() > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true, uno::makeAny( aFtpProxy.Server ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    {
+        ProxyEntry aFtpProxy;
+
+        char host[MAXHOSTNAMELEN];
+        UInt16 port;
+        bool retVal;
+
+        retVal = GetProxySetting(sFTP, host, 100, &port);
+
+        if (retVal)
+        {
+            aFtpProxy.Port = port;
+        }
+
+        // ftp proxy port
+        if( aFtpProxy.Port > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true, uno::makeAny( aFtpProxy.Port ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    {
+        ProxyEntry aHttpProxy;
+
+        char host[MAXHOSTNAMELEN];
+        UInt16 port;
+        bool retVal;
+
+        retVal = GetProxySetting(sHTTP, host, 100, &port);
+
+        if (retVal)
+        {
+            aHttpProxy.Server = rtl::OUString::createFromAscii( host );
+        }
+
+        // http proxy name
+        if( aHttpProxy.Server.getLength() > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true, uno::makeAny( aHttpProxy.Server ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    {
+        ProxyEntry aHttpProxy;
+
+        char host[MAXHOSTNAMELEN];
+        UInt16 port;
+        bool retVal;
+
+        retVal = GetProxySetting(sHTTP, host, 100, &port);
+
+        if (retVal)
+        {
+            aHttpProxy.Port = port;
+        }
+
+        // http proxy port
+        if( aHttpProxy.Port > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true, uno::makeAny( aHttpProxy.Port ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    {
+        ProxyEntry aHttpsProxy;
+
+        char host[MAXHOSTNAMELEN];
+        UInt16 port;
+        bool retVal;
+
+        retVal = GetProxySetting(sHTTPS, host, 100, &port);
+
+        if (retVal)
+        {
+            aHttpsProxy.Server = rtl::OUString::createFromAscii( host );
+        }
+
+        // https proxy name
+        if( aHttpsProxy.Server.getLength() > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true, uno::makeAny( aHttpsProxy.Server ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    {
+        ProxyEntry aHttpsProxy;
+
+        char host[MAXHOSTNAMELEN];
+        UInt16 port;
+        bool retVal;
+
+        retVal = GetProxySetting(sHTTPS, host, 100, &port);
+
+        if (retVal)
+        {
+            aHttpsProxy.Port = port;
+        }
+
+        // https proxy port
+        if( aHttpsProxy.Port > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true, uno::makeAny( aHttpsProxy.Port ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    {
+        // override default for ProxyType, which is "0" meaning "No proxies".
+        sal_Int32 nProperties = 1;
+        return css::uno::makeAny(
+            css::beans::Optional< css::uno::Any >(
+                true, uno::makeAny( nProperties ) ) );
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")))
+    {
+        rtl::OUString aProxyBypassList;
+
+        CFArrayRef rExceptionsList;
+        CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(NULL);
+
+        if (!rProxyDict)
+            rExceptionsList = false;
+        else
+            rExceptionsList = (CFArrayRef) CFDictionaryGetValue(rProxyDict, kSCPropNetProxiesExceptionsList);
+
+        if (rExceptionsList)
+        {
+            for (CFIndex idx = 0; idx < CFArrayGetCount(rExceptionsList); idx++)
+            {
+                CFStringRef rException = (CFStringRef) CFArrayGetValueAtIndex(rExceptionsList, idx);
+
+                if (idx>0)
+                    aProxyBypassList += rtl::OUString::createFromAscii( ";" );
+
+                aProxyBypassList += CFStringToOUString(rException);
+            }
+        }
+
+        if (rProxyDict)
+            CFRelease(rProxyDict);
+
+        // fill proxy bypass list
+        if( aProxyBypassList.getLength() > 0 )
+        {
+            return css::uno::makeAny(
+                css::beans::Optional< css::uno::Any >(
+                    true,
+                    uno::makeAny( aProxyBypassList.replace( SPACE, SEMI_COLON ) ) ) );
+        }
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+    } else {
+        throw css::beans::UnknownPropertyException(
+            PropertyName, static_cast< cppu::OWeakObject * >(this));
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -115,9 +470,8 @@ rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void)
 
 uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void)
 {
-    uno::Sequence<rtl::OUString> aServiceNameList(2);
+    uno::Sequence<rtl::OUString> aServiceNameList(1);
     aServiceNameList[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.MacOSXBackend"));
-    aServiceNameList[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.PlatformBackend"));
 
     return aServiceNameList;
 }
@@ -143,15 +497,3 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(vo
 {
     return getBackendServiceNames();
 }
-
-// ---------------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedComponents(void)
-{
-    uno::Sequence<rtl::OUString> aSupportedComponentList(2);
-    aSupportedComponentList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MACBE_INET_COMPONENT ) );
-    aSupportedComponentList[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MACBE_PATHS_COMPONENT ) );
-
-    return aSupportedComponentList;
-}
-
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index ed5aed163f..9c4210b4d5 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macbackend.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,8 @@
 #ifndef _MACBACKEND_HXX_
 #define _MACBACKEND_HXX_
 
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <rtl/string.hxx>
 
@@ -44,18 +39,13 @@
 namespace css = com::sun::star;
 namespace uno = css::uno;
 namespace lang = css::lang;
-namespace backend = css::configuration::backend;
-
 
-/**
-  Implements the SingleLayerStratum service.
-  */
-class MacOSXBackend : public ::cppu::WeakImplHelper2 <backend::XSingleLayerStratum, lang::XServiceInfo >
+class MacOSXBackend : public ::cppu::WeakImplHelper2 <css::beans::XPropertySet, lang::XServiceInfo >
 {
 
 public:
 
-    static MacOSXBackend* createInstance(const uno::Reference<uno::XComponentContext>& xContext);
+    static MacOSXBackend* createInstance();
 
     // XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName()
@@ -81,19 +71,56 @@ public:
     */
     static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void);
 
-    /**
-       Provides the supported component nodes
-
-       @return supported component nodes
-    */
-    static uno::Sequence<rtl::OUString> SAL_CALL getSupportedComponents(void);
-
-    // XSingleLayerStratum
-    virtual uno::Reference<backend::XLayer> SAL_CALL getLayer(const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp)
-        throw (backend::BackendAccessException, lang::IllegalArgumentException);
-
-    virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL getUpdatableLayer(const rtl::OUString& aLayerId)
-        throw (backend::BackendAccessException, lang::NoSupportException, lang::IllegalArgumentException);
+    // XPropertySet
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+    getPropertySetInfo() throw (css::uno::RuntimeException)
+    { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
+
+    virtual void SAL_CALL setPropertyValue(
+        rtl::OUString const &, css::uno::Any const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::beans::PropertyVetoException,
+            css::lang::IllegalArgumentException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+    virtual css::uno::Any SAL_CALL getPropertyValue(
+        rtl::OUString const & PropertyName)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+    virtual void SAL_CALL addPropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removePropertyChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL addVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
+
+    virtual void SAL_CALL removeVetoableChangeListener(
+        rtl::OUString const &,
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+        throw (
+            css::beans::UnknownPropertyException,
+            css::lang::WrappedTargetException, css::uno::RuntimeException)
+    {}
 
 protected:
 
@@ -102,18 +129,10 @@ protected:
 
        @param xContext   component context
     */
-    MacOSXBackend(const uno::Reference<uno::XComponentContext>& xContext)
-        throw (backend::BackendAccessException);
+    MacOSXBackend();
 
     /** Destructor */
     ~MacOSXBackend(void);
-
-private:
-
-    uno::Reference<uno::XComponentContext> m_xContext;
-    uno::Reference<backend::XLayer> m_xSystemLayer;
-    uno::Reference<backend::XLayer> m_xPathLayer;
-
 };
 
 #endif // _MACBACKEND_HXX_
diff --git a/shell/source/backends/macbe/macbe.xml b/shell/source/backends/macbe/macbe.xml
index 85854250cf..7cee5bb14d 100644
--- a/shell/source/backends/macbe/macbe.xml
+++ b/shell/source/backends/macbe/macbe.xml
@@ -10,7 +10,6 @@
         <language>c++</language>
         <status value="beta"/>
         <supported-service>com.sun.star.comp.configuration.backend.MacOSXBackend</supported-service>
-        <supported-service>com.sun.star.comp.configuration.backend.PlatformBackend</supported-service>
         <service-dependency>...</service-dependency>
         <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
         <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index bf9ee9d7bd..e0609dd06b 100644
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: macbecdef.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,14 +39,13 @@
 namespace css = com::sun::star;
 namespace uno = css::uno;
 namespace lang = css::lang;
-namespace backend = css::configuration::backend;
 
 //------------------------------------------------------------------------------
 
 static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend(
-    const uno::Reference<uno::XComponentContext>& xContext)
+    const uno::Reference<uno::XComponentContext>&)
 {
-    return * MacOSXBackend::createInstance(xContext);
+    return * MacOSXBackend::createInstance();
 }
 
 //------------------------------------------------------------------------------
@@ -77,41 +73,9 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void *pRegistryKey) {
-
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + MacOSXBackend::getBackendName()
-                );
-
-            // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-                );
-
-            uno::Sequence<rtl::OUString> sServiceNames = MacOSXBackend::getBackendServiceNames();
-            for (sal_Int32 i = 0; i < sServiceNames.getLength(); ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            // Register supported components
-            uno::Reference<XRegistryKey> xComponentKey = xImplKey->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/DATA/SupportedComponents") )
-                );
-
-            xComponentKey->setAsciiListValue( MacOSXBackend::getSupportedComponents() );
-
-            return sal_True;
-        }
-        catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");
-        }
-    }
-    return sal_False;
+extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) {
+    return cppu::component_writeInfoHelper(
+        pServiceManager, pRegistryKey, kImplementations_entries);
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/macbe/macbelayer.cxx b/shell/source/backends/macbe/macbelayer.cxx
deleted file mode 100644
index 2204677037..0000000000
--- a/shell/source/backends/macbe/macbelayer.cxx
+++ /dev/null
@@ -1,443 +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: macbelayer.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_shell.hxx"
-
-// For MAXHOSTNAMELEN constant
-#include <sys/param.h>
-
-#include <premac.h>
-#include <SystemConfiguration/SystemConfiguration.h>
-#include <Foundation/NSPathUtilities.h>
-#include <postmac.h>
-
-#include "macbelayer.hxx"
-
-#include "rtl/ustrbuf.hxx"
-#include "osl/file.h"
-
-#define SPACE      ' '
-#define SEMI_COLON ';'
-
-typedef struct
-{
-    rtl::OUString Server;
-    sal_Int32 Port;
-} ProxyEntry;
-
-typedef enum {
-    sHTTP,
-    sHTTPS,
-    sFTP
-} ServiceType;
-
-//------------------------------------------------------------------------
-// helper functions
-//------------------------------------------------------------------------
-
-namespace // private
-{
-
-/*
- * Returns current proxy settings for selected service type (HTTP or
- * FTP) as a C string (in the buffer specified by host and hostSize)
- * and a port number.
- */
-
-bool GetProxySetting(ServiceType sType, char *host, size_t hostSize, UInt16 *port)
-{
-    bool                result;
-    CFDictionaryRef     proxyDict;
-    CFNumberRef         enableNum;
-    int                 enable;
-    CFStringRef         hostStr;
-    CFNumberRef         portNum;
-    int                 portInt;
-
-    proxyDict = SCDynamicStoreCopyProxies(NULL);
-
-    if (!proxyDict)
-        return false;
-
-    CFStringRef proxiesEnable;
-    CFStringRef proxiesProxy;
-    CFStringRef proxiesPort;
-
-    switch ( sType )
-    {
-        case sHTTP : proxiesEnable =  kSCPropNetProxiesHTTPEnable;
-                     proxiesProxy = kSCPropNetProxiesHTTPProxy;
-                     proxiesPort = kSCPropNetProxiesHTTPPort;
-            break;
-        case sHTTPS: proxiesEnable = kSCPropNetProxiesHTTPSEnable;
-                     proxiesProxy = kSCPropNetProxiesHTTPSProxy;
-                     proxiesPort = kSCPropNetProxiesHTTPSPort;
-            break;
-        default: proxiesEnable = kSCPropNetProxiesFTPEnable;
-                 proxiesProxy = kSCPropNetProxiesFTPProxy;
-                 proxiesPort = kSCPropNetProxiesFTPPort;
-            break;
-    }
-    // Proxy enabled?
-    enableNum = (CFNumberRef) CFDictionaryGetValue( proxyDict,
-                                                   proxiesEnable );
-
-    result = (enableNum != NULL) && (CFGetTypeID(enableNum) == CFNumberGetTypeID());
-
-    if (result)
-        result = CFNumberGetValue(enableNum, kCFNumberIntType, &enable) && (enable != 0);
-
-    // Proxy enabled -> get hostname
-    if (result)
-    {
-        hostStr = (CFStringRef) CFDictionaryGetValue( proxyDict,
-                                                     proxiesProxy );
-
-        result = (hostStr != NULL) && (CFGetTypeID(hostStr) == CFStringGetTypeID());
-    }
-
-    if (result)
-        result = CFStringGetCString(hostStr, host, (CFIndex) hostSize, kCFStringEncodingASCII);
-
-    // Get proxy port
-    if (result)
-    {
-        portNum = (CFNumberRef) CFDictionaryGetValue( proxyDict,
-                                                     proxiesPort );
-
-        result = (portNum != NULL) && (CFGetTypeID(portNum) == CFNumberGetTypeID());
-    }
-    else
-    {
-        CFRelease(proxyDict);
-        return false;
-    }
-
-    if (result)
-        result = CFNumberGetValue(portNum, kCFNumberIntType, &portInt);
-
-    if (result)
-        *port = (UInt16) portInt;
-
-    if (proxyDict)
-        CFRelease(proxyDict);
-
-    if (!result)
-    {
-        *host = 0;
-        *port = 0;
-    }
-
-    return result;
-}
-
-} // end private namespace
-
-//------------------------------------------------------------------------------
-
-MacOSXLayer::MacOSXLayer( const uno::Reference<uno::XComponentContext>& xContext)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(
-        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }
-
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
-    CFRetain(sOrig);
-
-    CFIndex nStringLen = CFStringGetLength(sOrig)+1;
-
-    // Allocate a c string buffer
-    char sBuffer[nStringLen];
-
-    CFStringGetCString(sOrig, sBuffer, nStringLen, kCFStringEncodingASCII);
-
-    CFRelease(sOrig);
-
-    return rtl::OUString::createFromAscii((sal_Char*)sBuffer);
-}
-
-void SAL_CALL MacOSXLayer::readData(
-    const uno::Reference<backend::XLayerHandler>& xHandler)
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException,
-            uno::RuntimeException)
-{
-
-    if (m_xLayerContentDescriber.is())
-    {
-        rtl::OUString aProxyBypassList;
-
-        CFArrayRef rExceptionsList;
-        CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(NULL);
-
-        if (!rProxyDict)
-            rExceptionsList = false;
-        else
-            rExceptionsList = (CFArrayRef) CFDictionaryGetValue(rProxyDict, kSCPropNetProxiesExceptionsList);
-
-        if (rExceptionsList)
-        {
-            for (CFIndex idx = 0; idx < CFArrayGetCount(rExceptionsList); idx++)
-            {
-                CFStringRef rException = (CFStringRef) CFArrayGetValueAtIndex(rExceptionsList, idx);
-
-                if (idx>0)
-                    aProxyBypassList += rtl::OUString::createFromAscii( ";" );
-
-                aProxyBypassList += CFStringToOUString(rException);
-            }
-        }
-
-        if (rProxyDict)
-            CFRelease(rProxyDict);
-
-        // override default for ProxyType, which is "0" meaning "No proxies".
-        // CAUTION: if you add properties, please increase the sequence size here !
-        uno::Sequence<backend::PropertyInfo> aPropInfoList(8);
-        sal_Int32 nProperties = 1;
-
-        aPropInfoList[0].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetProxyType") );
-        aPropInfoList[0].Type = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[0].Protected = sal_False;
-        aPropInfoList[0].Value = uno::makeAny( nProperties );
-
-        // fill proxy bypass list
-        if( aProxyBypassList.getLength() > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetNoProxy") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aProxyBypassList.replace( SPACE, SEMI_COLON ) );
-        }
-
-        ProxyEntry aHttpProxy;
-        ProxyEntry aHttpsProxy;
-        ProxyEntry aFtpProxy;
-
-        char host[MAXHOSTNAMELEN];
-        UInt16 port;
-        bool retVal;
-
-        retVal = GetProxySetting(sHTTP, host, 100, &port);
-
-        if (retVal)
-        {
-            aHttpProxy.Server = rtl::OUString::createFromAscii( host );
-            aHttpProxy.Port = port;
-        }
-
-        retVal = GetProxySetting(sHTTPS, host, 100, &port);
-
-        if (retVal)
-        {
-            aHttpsProxy.Server = rtl::OUString::createFromAscii( host );
-            aHttpsProxy.Port = port;
-        }
-
-        retVal = GetProxySetting(sFTP, host, 100, &port);
-
-        if (retVal)
-        {
-            aFtpProxy.Server = rtl::OUString::createFromAscii( host );
-            aFtpProxy.Port = port;
-        }
-
-        // http proxy name
-        if( aHttpProxy.Server.getLength() > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyName") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aHttpProxy.Server );
-        }
-
-        // http proxy port
-        if( aHttpProxy.Port > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyPort") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aHttpProxy.Port );
-        }
-
-        // https proxy name
-        if( aHttpsProxy.Server.getLength() > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyName") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aHttpsProxy.Server );
-        }
-
-        // https proxy port
-        if( aHttpsProxy.Port > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyPort") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aHttpsProxy.Port );
-        }
-
-        // ftp proxy name
-        if( aFtpProxy.Server.getLength() > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyName") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aFtpProxy.Server );
-        }
-
-        // ftp proxy port
-        if( aFtpProxy.Port > 0 )
-        {
-            aPropInfoList[nProperties].Name = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyPort") );
-            aPropInfoList[nProperties].Type = rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aFtpProxy.Port );
-        }
-
-        // resize the property info list appropriately
-        aPropInfoList.realloc(nProperties);
-
-        m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-    else
-    {
-        OSL_TRACE("Could not create com.sun.star.configuration.backend.LayerContentDescriber Service");
-    }
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL MacOSXLayer::getTimestamp(void)
-    throw (uno::RuntimeException)
-{
-    // FIXME: Always new timestamp!?
-    rtl::OUString aTimestamp = rtl::OUString::valueOf( time(NULL) );
-
-    return aTimestamp;
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString GetOUString( NSString* pStr )
-{
-    if( ! pStr )
-        return rtl::OUString();
-    int nLen = [pStr length];
-    if( nLen == 0 )
-        return rtl::OUString();
-    
-    rtl::OUStringBuffer aBuf( nLen+1 );
-    aBuf.setLength( nLen );
-    [pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())];
-    return aBuf.makeStringAndClear();
-}
-
-void SAL_CALL MacOSXPathLayer::readData(
-    const uno::Reference<backend::XLayerHandler>& i_xHandler)
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException,
-            lang::WrappedTargetException,
-            uno::RuntimeException)
-{
-    if (m_xLayerContentDescriber.is())
-    {
-        rtl::OUString aDocDir;
-        NSArray* pPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, true );
-        if( pPaths && [pPaths count] > 0 )
-        {
-            aDocDir = GetOUString( [pPaths objectAtIndex: 0] );
-            
-            rtl::OUString aDocURL;
-            if( aDocDir.getLength() > 0 &&
-                osl_getFileURLFromSystemPath( aDocDir.pData, &aDocURL.pData ) == osl_File_E_None )
-            {
-                uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
-        
-                aPropInfoList[0].Name = rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Paths/Variables/Work" ) );
-                aPropInfoList[0].Type = rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-                aPropInfoList[0].Protected = sal_False;
-                aPropInfoList[0].Value <<= aDocURL;
-        
-                m_xLayerContentDescriber->describeLayer(i_xHandler, aPropInfoList);
-            }
-            else
-            {
-                OSL_TRACE( "user documents list contains empty file path or conversion failed" );
-            }
-        }
-        else
-        {
-            OSL_TRACE( "Got nil or empty list of user document directories" );
-        }
-    }
-    else
-    {
-        OSL_TRACE("Could not create com.sun.star.configuration.backend.LayerContentDescriber Service");
-    }
-}
-
diff --git a/shell/source/backends/macbe/macbelayer.hxx b/shell/source/backends/macbe/macbelayer.hxx
deleted file mode 100644
index 84ab493436..0000000000
--- a/shell/source/backends/macbe/macbelayer.hxx
+++ /dev/null
@@ -1,104 +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: macbelayer.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 _MACBELAYER_HXX_
-#define _MACBELAYER_HXX_
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase2.hxx>
-
-namespace css = com::sun::star;
-namespace uno = css::uno;
-namespace lang = css::lang;
-namespace backend = css::configuration::backend;
-namespace util = css::util;
-
-/**
-  Implementation of the XLayer interfaces for fixed values
- */
-
-class MacOSXLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped>
-{
-public:
-
-    /**
-       Constructor given the requested component name
-
-       @param aTimestamp     timestamp indicating last modifictaion
-    */
-    MacOSXLayer(const uno::Reference<uno::XComponentContext>& xContext);
-
-    /** Destructor */
-    virtual ~MacOSXLayer(void) {}
-
-    // XLayer
-    virtual void SAL_CALL readData(const uno::Reference<backend::XLayerHandler>& xHandler)
-        throw ( backend::MalformedDataException,
-                lang::NullPointerException,
-                lang::WrappedTargetException,
-                uno::RuntimeException);
-
-    // XTimeStamped
-    virtual rtl::OUString SAL_CALL getTimestamp(void)
-        throw (uno::RuntimeException);
-
-protected:
-
-    rtl::OUString m_aComponent;
-
-    uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber;
-
-};
-
-class MacOSXPathLayer : public MacOSXLayer
-{
-    public:
-    MacOSXPathLayer(const uno::Reference<uno::XComponentContext>& i_xContext) :
-        MacOSXLayer( i_xContext ) {}
-    virtual ~MacOSXPathLayer() {}
-    
-    // XLayer
-    virtual void SAL_CALL readData(const uno::Reference<backend::XLayerHandler>& i_xHandler)
-        throw ( backend::MalformedDataException,
-                lang::NullPointerException,
-                lang::WrappedTargetException,
-                uno::RuntimeException);
-};
-
-#endif // _MACBELAYER_HXX_
diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk
index c8f6891d6f..7b42c8c577 100644
--- a/shell/source/backends/macbe/makefile.mk
+++ b/shell/source/backends/macbe/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -58,8 +54,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
 
 SLOFILES= \
     $(SLO)$/macbecdef.obj \
-    $(SLO)$/macbackend.obj \
-    $(SLO)$/macbelayer.obj
+    $(SLO)$/macbackend.obj
 
 SHL1TARGET=$(TARGET)1.uno
 SHL1OBJS=$(SLOFILES)
diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk
index be43ecaded..0401cb88b7 100644
--- a/shell/source/backends/wininetbe/makefile.mk
+++ b/shell/source/backends/wininetbe/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -50,9 +46,8 @@ DLLPRE =
 
 SLOFILES=\
     $(SLO)$/wininetbecdef.obj \
-    $(SLO)$/wininetbackend.obj \
-    $(SLO)$/wininetlayer.obj
-        
+    $(SLO)$/wininetbackend.obj
+
 SHL1TARGET=$(TARGET)1.uno   
 SHL1OBJS=$(SLOFILES)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 775d39a8d3..04de8fdd7d 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wininetbackend.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,76 +28,331 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
 
+#include "rtl/ustrbuf.hxx"
+
 #include "wininetbackend.hxx"
-#include "wininetlayer.hxx"
-#include <com/sun/star/configuration/backend/ComponentChangeEvent.hpp>
-#include <uno/current_context.hxx>
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#include <wininet.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif 
 
 #define WININET_DLL_NAME "wininet.dll" 
+#define EQUAL_SIGN '='
+#define COLON      ':'
+#define SPACE      ' '
+#define SEMI_COLON ';'
+
+namespace {
+
+struct Library {
+    HMODULE module;
+
+    Library(HMODULE theModule): module(theModule) {}
+
+    ~Library() { if (module) FreeLibrary(module); }
+};
+
+}
+
+typedef struct  
+{  
+    rtl::OUString Server;
+    rtl::OUString Port;
+} ProxyEntry;
+
+//------------------------------------------------------------------------
+// helper functions
+//------------------------------------------------------------------------
+
+namespace // private
+{
+    ProxyEntry ReadProxyEntry(const rtl::OUString& aProxy, sal_Int32& i)
+    {
+        ProxyEntry aProxyEntry;
+        
+        aProxyEntry.Server = aProxy.getToken( 0, COLON, i );
+        if ( i > -1 )
+            aProxyEntry.Port = aProxy.getToken( 0, COLON, i );
+        
+        return aProxyEntry;
+    }
+    
+    ProxyEntry FindProxyEntry(const rtl::OUString& aProxyList, const rtl::OUString& aType)
+    {
+        sal_Int32 nIndex = 0;
+        
+        do
+        {
+            // get the next token, e.g. ftp=server:port
+            rtl::OUString nextToken = aProxyList.getToken( 0, SPACE, nIndex );
+                
+            // split the next token again into the parts separated 
+            // through '=', e.g. ftp=server:port -> ftp and server:port
+            sal_Int32 i = 0;              
+            if( nextToken.indexOf( EQUAL_SIGN ) > -1 )
+            {
+                if( aType.equals( nextToken.getToken( 0, EQUAL_SIGN, i ) ) )
+                    return ReadProxyEntry(nextToken, i);
+            }
+            else if( aType.getLength() == 0)
+                return ReadProxyEntry(nextToken, i);
+            
+        } while ( nIndex >= 0 );
+        
+        return ProxyEntry();
+    }
+    
+} // end private namespace
 
-WinInetBackend::WinInetBackend(const uno::Reference<uno::XComponentContext>& xContext)
-    throw (backend::BackendAccessException) :
-    ::cppu::WeakImplHelper2 < backend::XSingleLayerStratum, lang::XServiceInfo > (),
-    m_xContext(xContext)
+//------------------------------------------------------------------------------
+
+WinInetBackend::WinInetBackend()
 {
-    m_hWinInetDll = LoadLibrary( WININET_DLL_NAME );
+    Library hWinInetDll( LoadLibrary( WININET_DLL_NAME ) );
+    if( hWinInetDll.module )
+    {
+        typedef BOOL ( WINAPI *InternetQueryOption_Proc_T )( HINTERNET, DWORD, LPVOID, LPDWORD );
+
+        InternetQueryOption_Proc_T lpfnInternetQueryOption = 
+            reinterpret_cast< InternetQueryOption_Proc_T >( 
+                GetProcAddress( hWinInetDll.module, "InternetQueryOptionA" ) );
+        if (lpfnInternetQueryOption)
+        {
+            LPINTERNET_PROXY_INFO lpi = NULL;
+
+            // query for the neccessary space
+            DWORD dwLength = 0;
+            BOOL bRet = lpfnInternetQueryOption(
+                NULL,
+                INTERNET_OPTION_PROXY,
+                (LPVOID)lpi,
+                &dwLength );
+        
+            // allocate sufficient space on the heap
+            // insufficient space on the heap results
+            // in a stack overflow exception, we assume
+            // this never happens, because of the relatively
+            // small amount of memory we need
+            // _alloca is nice because it is fast and we don't
+            // have to free the allocated memory, it will be
+            // automatically done
+            lpi = reinterpret_cast< LPINTERNET_PROXY_INFO >(
+                _alloca( dwLength ) );
+        
+            bRet = lpfnInternetQueryOption( 
+                NULL,
+                INTERNET_OPTION_PROXY,
+                (LPVOID)lpi,
+                &dwLength );
+
+            // if a proxy is disabled, InternetQueryOption returns
+            // an empty proxy list, so we don't have to check if
+            // proxy is enabled or not
+        
+            rtl::OUString aProxyList       = rtl::OUString::createFromAscii( lpi->lpszProxy );
+            rtl::OUString aProxyBypassList = rtl::OUString::createFromAscii( lpi->lpszProxyBypass );
+        
+            // override default for ProxyType, which is "0" meaning "No proxies".
+            sal_Int32 nProperties = 1;
+
+            valueProxyType_.IsPresent = true;
+            valueProxyType_.Value <<= nProperties;
+
+            // fill proxy bypass list
+            if( aProxyBypassList.getLength() > 0 )
+            {
+                rtl::OUStringBuffer aReverseList;
+                sal_Int32 nIndex = 0;
+                do
+                {
+                    rtl::OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex );
+                    if ( aProxyList.indexOf( aToken ) == -1 )
+                    {
+                        if ( aReverseList.getLength() )
+                        {
+                            aReverseList.insert( 0, sal_Unicode( SEMI_COLON ) );
+                            aReverseList.insert( 0, aToken );
+                        }
+                        else
+                            aReverseList = aToken;
+                    }
+                }
+                while ( nIndex >= 0 );
+
+                aProxyBypassList = aReverseList.makeStringAndClear();
+            
+                valueNoProxy_.IsPresent = true;
+                valueNoProxy_.Value <<= aProxyBypassList.replace( SPACE, SEMI_COLON );
+            }
+
+            if( aProxyList.getLength() > 0 )
+            {
+                //-------------------------------------------------
+                // this implementation follows the algorithm
+                // of the internet explorer
+                // if there are type-dependent proxy settings
+                // and type independent proxy settings in the
+                // registry the internet explorer chooses the
+                // type independent proxy for all settings
+                // e.g. imagine the following registry entry
+                // ftp=server:port;http=server:port;server:port
+                // the last token server:port is type independent
+                // so the ie chooses this proxy server
+    
+                // if there is no port specified for a type independent 
+                // server the ie uses the port of an http server if 
+                // there is one and it has a port
+                //-------------------------------------------------
+
+                ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, rtl::OUString());
+                ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM( "http" ) ) );
+                ProxyEntry aHttpsProxy  = FindProxyEntry( aProxyList, rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM( "https" ) ) );
+
+                ProxyEntry aFtpProxy  = FindProxyEntry( aProxyList, rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM( "ftp" ) ) );
+            
+                if( aTypeIndepProxy.Server.getLength() )
+                {
+                    aHttpProxy.Server = aTypeIndepProxy.Server;
+                    aHttpsProxy.Server  = aTypeIndepProxy.Server;
+                    aFtpProxy.Server  = aTypeIndepProxy.Server;
+                
+                    if( aTypeIndepProxy.Port.getLength() )
+                    {
+                        aHttpProxy.Port = aTypeIndepProxy.Port;
+                        aHttpsProxy.Port  = aTypeIndepProxy.Port;
+                        aFtpProxy.Port  = aTypeIndepProxy.Port;
+                    }
+                    else
+                    {
+                        aFtpProxy.Port  = aHttpProxy.Port;
+                        aHttpsProxy.Port  = aHttpProxy.Port;
+                    }
+                }
+                
+                // http proxy name
+                if( aHttpProxy.Server.getLength() > 0 )
+                {
+                    valueHttpProxyName_.IsPresent = true;
+                    valueHttpProxyName_.Value <<= aHttpProxy.Server;
+                }
+
+                // http proxy port
+                if( aHttpProxy.Port.getLength() > 0 )
+                {
+                    valueHttpProxyPort_.IsPresent = true;
+                    valueHttpProxyPort_.Value <<= aHttpProxy.Port.toInt32();
+                }
+
+                // https proxy name
+                if( aHttpsProxy.Server.getLength() > 0 )
+                {
+                    valueHttpsProxyName_.IsPresent = true;
+                    valueHttpsProxyName_.Value <<= aHttpsProxy.Server;
+                }
+
+                // https proxy port
+                if( aHttpsProxy.Port.getLength() > 0 )
+                {
+                    valueHttpsProxyPort_.IsPresent = true;
+                    valueHttpsProxyPort_.Value <<= aHttpsProxy.Port.toInt32();
+                }
+
+                // ftp proxy name
+                if( aFtpProxy.Server.getLength() > 0 )
+                {
+                    valueFtpProxyName_.IsPresent = true;
+                    valueFtpProxyName_.Value <<= aFtpProxy.Server;
+                }
+
+                // ftp proxy port
+                if( aFtpProxy.Port.getLength() > 0 )
+                {
+                    valueFtpProxyPort_.IsPresent = true;
+                    valueFtpProxyPort_.Value <<= aFtpProxy.Port.toInt32();
+                }
+            }
+        }
+    }
 }
 
 //------------------------------------------------------------------------------
 
 WinInetBackend::~WinInetBackend(void) 
 {
-    if ( m_hWinInetDll )
-        FreeLibrary( m_hWinInetDll );
 }
 
 //------------------------------------------------------------------------------
 
-WinInetBackend* WinInetBackend::createInstance( 
-    const uno::Reference<uno::XComponentContext>& xContext
-)
+WinInetBackend* WinInetBackend::createInstance()
 {
-    return new WinInetBackend(xContext);
+    return new WinInetBackend;
 }
 
 // ---------------------------------------------------------------------------------------
 
-uno::Reference<backend::XLayer> SAL_CALL WinInetBackend::getLayer(
-        const rtl::OUString& aComponent, const rtl::OUString& /*aTimestamp*/)
-    throw (backend::BackendAccessException, lang::IllegalArgumentException)
+void WinInetBackend::setPropertyValue(
+    rtl::OUString const &, css::uno::Any const &)
+    throw (
+        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
+        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
 {
+    throw css::lang::IllegalArgumentException(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+        static_cast< cppu::OWeakObject * >(this), -1);
+}
 
-    if( aComponent.equals( getSupportedComponents()[0]) )
+css::uno::Any WinInetBackend::getPropertyValue(
+    rtl::OUString const & PropertyName)
+    throw (
+        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
+        css::uno::RuntimeException)
+{
+    if (PropertyName.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
     {
-        if( ! m_xSystemLayer.is() && m_hWinInetDll )
-        {
-            WinInetLayer::InternetQueryOption_Proc_T lpfnInternetQueryOption = 
-                reinterpret_cast< WinInetLayer::InternetQueryOption_Proc_T >( 
-                    GetProcAddress( m_hWinInetDll, "InternetQueryOptionA" ) );
-
-            if( lpfnInternetQueryOption )
-                m_xSystemLayer = new WinInetLayer(lpfnInternetQueryOption, m_xContext);           
-        }
-        
-        return m_xSystemLayer;
+        return css::uno::makeAny(valueFtpProxyName_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    {
+        return css::uno::makeAny(valueFtpProxyPort_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    {
+        return css::uno::makeAny(valueHttpProxyName_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    {
+        return css::uno::makeAny(valueHttpProxyPort_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    {
+        return css::uno::makeAny(valueHttpsProxyName_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    {
+        return css::uno::makeAny(valueHttpsProxyPort_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")))
+    {
+        return css::uno::makeAny(valueNoProxy_);
+    } else if (PropertyName.equalsAsciiL(
+                   RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    {
+        return css::uno::makeAny(valueProxyType_);
+    } else {
+        throw css::beans::UnknownPropertyException(
+            PropertyName, static_cast< cppu::OWeakObject * >(this));
     }
-    
-    return uno::Reference<backend::XLayer>();
-}	
-
-//------------------------------------------------------------------------------
-
-uno::Reference<backend::XUpdatableLayer> SAL_CALL
-WinInetBackend::getUpdatableLayer(const rtl::OUString& /*aComponent*/) 
-    throw (backend::BackendAccessException,lang::NoSupportException,	   
-           lang::IllegalArgumentException)
-{
-    throw lang::NoSupportException(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-            "WinInetBackend: No Update Operation allowed, Read Only access") ),
-        *this) ; 
-    
-    return NULL; 
 }
 
 //------------------------------------------------------------------------------
@@ -121,10 +373,9 @@ rtl::OUString SAL_CALL WinInetBackend::getImplementationName(void)
 
 uno::Sequence<rtl::OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) 
 {
-    uno::Sequence<rtl::OUString> aServiceNameList(2);
+    uno::Sequence<rtl::OUString> aServiceNameList(1);
     aServiceNameList[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.WinInetBackend")) ;
-    aServiceNameList[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.PlatformBackend")) ;
-            
+
     return aServiceNameList ;
 }
 
@@ -149,16 +400,3 @@ uno::Sequence<rtl::OUString> SAL_CALL WinInetBackend::getSupportedServiceNames(v
 {
     return getBackendServiceNames() ;
 }
-
-// ---------------------------------------------------------------------------------------
-
-uno::Sequence<rtl::OUString> SAL_CALL WinInetBackend::getSupportedComponents(void) 
-{
-    uno::Sequence<rtl::OUString> aSupportedComponentList(1);
-    aSupportedComponentList[0] = rtl::OUString( 
-        RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet" ) 
-    );
-    
-    return aSupportedComponentList;
-}
-
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx
index 865872ecc0..711cde7151 100644
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wininetbackend.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,38 +28,23 @@
 #ifndef _FIXEDVALUEBACKEND_HXX_
 #define _FIXEDVALUEBACKEND_HXX_
 
-#include <com/sun/star/configuration/backend/XSingleLayerStratum.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/Optional.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/configuration/backend/XBackendChangesNotifier.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <rtl/string.hxx>
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#include <wininet.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif 
-
 namespace css = com::sun::star ;
 namespace uno = css::uno ;
 namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
 
-
-/**
-  Implements the SingleLayerStratum service.
-  */
 class WinInetBackend : public ::cppu::WeakImplHelper2 < 
-        backend::XSingleLayerStratum,
+        css::beans::XPropertySet,
         lang::XServiceInfo > {
         
     public :
         
-        static WinInetBackend* createInstance(const uno::Reference<uno::XComponentContext>& xContext);
+        static WinInetBackend* createInstance();
 
         // XServiceInfo
         virtual rtl::OUString SAL_CALL 
@@ -89,43 +71,86 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 <
           @return   service names
           */
         static uno::Sequence<rtl::OUString> SAL_CALL getBackendServiceNames(void) ;
-        /**
-          Provides the supported component nodes
-          
-          @return supported component nodes
-        */
-        static uno::Sequence<rtl::OUString> SAL_CALL getSupportedComponents(void) ;
-
-        //XSingleLayerStratum
-        virtual uno::Reference<backend::XLayer> SAL_CALL 
-        getLayer( const rtl::OUString& aLayerId, const rtl::OUString& aTimestamp )
-            throw (backend::BackendAccessException,
-                   lang::IllegalArgumentException) ;
-
-        virtual uno::Reference<backend::XUpdatableLayer> SAL_CALL
-        getUpdatableLayer( const rtl::OUString& aLayerId ) 
-            throw (backend::BackendAccessException,
-                   lang::NoSupportException,	   
-                   lang::IllegalArgumentException) ;
+
+        // XPropertySet
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+        getPropertySetInfo() throw (css::uno::RuntimeException)
+        { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
+
+        virtual void SAL_CALL setPropertyValue(
+            rtl::OUString const &, css::uno::Any const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::beans::PropertyVetoException,
+                css::lang::IllegalArgumentException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+        virtual css::uno::Any SAL_CALL getPropertyValue(
+            rtl::OUString const & PropertyName)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException);
+
+        virtual void SAL_CALL addPropertyChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
+        virtual void SAL_CALL removePropertyChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
+        virtual void SAL_CALL addVetoableChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
+        virtual void SAL_CALL removeVetoableChangeListener(
+            rtl::OUString const &,
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
+            throw (
+                css::beans::UnknownPropertyException,
+                css::lang::WrappedTargetException, css::uno::RuntimeException)
+        {}
+
     protected:
         /**
           Service constructor from a service factory.
 
           @param xContext   component context
           */
-        WinInetBackend(const uno::Reference<uno::XComponentContext>& xContext) 
-            throw (backend::BackendAccessException);
+        WinInetBackend();
 
         /** Destructor */
         ~WinInetBackend(void) ;
 
     private:
-    
-        uno::Reference<uno::XComponentContext> m_xContext ;
-        uno::Reference<backend::XLayer> m_xSystemLayer ;
-        
-        // The wininet.dll module handle
-        HMODULE m_hWinInetDll;    
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueProxyType_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueNoProxy_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueHttpProxyName_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueHttpProxyPort_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueHttpsProxyName_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueHttpsProxyPort_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueFtpProxyName_;
+        com::sun::star::beans::Optional< com::sun::star::uno::Any >
+            valueFtpProxyPort_;
 } ;
 
 
diff --git a/shell/source/backends/wininetbe/wininetbe.xml b/shell/source/backends/wininetbe/wininetbe.xml
index 0f84d3a43d..070ac5111a 100644
--- a/shell/source/backends/wininetbe/wininetbe.xml
+++ b/shell/source/backends/wininetbe/wininetbe.xml
@@ -10,7 +10,6 @@
         <language>c++</language>
         <status value="beta"/>        
         <supported-service>com.sun.star.comp.configuration.backend.Win32Backend</supported-service>		
-        <supported-service>com.sun.star.comp.configuration.backend.PlatformBackend</supported-service>		
         <service-dependency>...</service-dependency>
         <type>com.sun.star.configuration.backend.XBackendChangesListener</type>
         <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type>
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index a5902c3f6b..7ecdbecf32 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wininetbecdef.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,14 +39,13 @@
 namespace css = com::sun::star ;
 namespace uno = css::uno ;
 namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
 
 //------------------------------------------------------------------------------
 
 static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend(
-    const uno::Reference<uno::XComponentContext>& xContext){
+    const uno::Reference<uno::XComponentContext>&){
 
-    return * WinInetBackend::createInstance(xContext);	
+    return * WinInetBackend::createInstance();
 }
 
 //------------------------------------------------------------------------------
@@ -77,41 +73,9 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void *pRegistryKey) {
-    
-    using namespace ::com::sun::star::registry;
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + WinInetBackend::getBackendName()
-            );
-            
-        // Register associated service names
-            uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey( 
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
-            );
-            
-            uno::Sequence<rtl::OUString> sServiceNames = WinInetBackend::getBackendServiceNames();
-            for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
-                xServicesKey->createKey(sServiceNames[i]);
-
-            // Register supported components            
-            uno::Reference<XRegistryKey> xComponentKey = xImplKey->createKey(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/DATA/SupportedComponents") )
-            );
-        
-            xComponentKey->setAsciiListValue( WinInetBackend::getSupportedComponents() );
-
-            return sal_True;
-        }
-        catch( InvalidRegistryException& )
-        {                       
-            OSL_ENSURE(sal_False, "InvalidRegistryException caught");           
-        }
-    }
-    return sal_False;
+extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) {
+    return cppu::component_writeInfoHelper(
+        pServiceManager, pRegistryKey, kImplementations_entries);
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/wininetbe/wininetlayer.cxx b/shell/source/backends/wininetbe/wininetlayer.cxx
deleted file mode 100644
index 0151eb5550..0000000000
--- a/shell/source/backends/wininetbe/wininetlayer.cxx
+++ /dev/null
@@ -1,377 +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: wininetlayer.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_shell.hxx"
-
-#ifndef _WININETLAYER_HXX_
-#include "wininetlayer.hxx"
-#endif 
-
-#include <malloc.h>
-
-#include <rtl/ustrbuf.hxx>
-
-#define EQUAL_SIGN '='
-#define COLON      ':'
-#define SPACE      ' '
-#define SEMI_COLON ';'
-
-typedef struct  
-{  
-    rtl::OUString Server;
-    rtl::OUString Port;
-} ProxyEntry;
-
-//------------------------------------------------------------------------
-// helper functions
-//------------------------------------------------------------------------
-
-namespace // private
-{
-    ProxyEntry ReadProxyEntry(const rtl::OUString& aProxy, sal_Int32& i)
-    {
-        ProxyEntry aProxyEntry;
-        
-        aProxyEntry.Server = aProxy.getToken( 0, COLON, i );
-        if ( i > -1 )
-            aProxyEntry.Port = aProxy.getToken( 0, COLON, i );
-        
-        return aProxyEntry;
-    }
-    
-    ProxyEntry FindProxyEntry(const rtl::OUString& aProxyList, const rtl::OUString& aType)
-    {
-        sal_Int32 nIndex = 0;
-        
-        do
-        {
-            // get the next token, e.g. ftp=server:port
-            rtl::OUString nextToken = aProxyList.getToken( 0, SPACE, nIndex );
-                
-            // split the next token again into the parts separated 
-            // through '=', e.g. ftp=server:port -> ftp and server:port
-            sal_Int32 i = 0;              
-            if( nextToken.indexOf( EQUAL_SIGN ) > -1 )
-            {
-                if( aType.equals( nextToken.getToken( 0, EQUAL_SIGN, i ) ) )
-                    return ReadProxyEntry(nextToken, i);
-            }
-            else if( aType.getLength() == 0)
-                return ReadProxyEntry(nextToken, i);
-            
-        } while ( nIndex >= 0 );
-        
-        return ProxyEntry();
-    }
-    
-} // end private namespace
-
-//------------------------------------------------------------------------------
-
-WinInetLayer::WinInetLayer( InternetQueryOption_Proc_T lpfnInternetQueryOption,
-    const uno::Reference<uno::XComponentContext>& xContext)
-  : m_lpfnInternetQueryOption(lpfnInternetQueryOption)
-{
-    //Create instance of LayerContentDescriber Service
-    rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
-        "com.sun.star.comp.configuration.backend.LayerDescriber"));
-
-    typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber; 
-    uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
-    if( xServiceManager.is() )
-    {
-        m_xLayerContentDescriber = LayerDescriber::query(
-            xServiceManager->createInstanceWithContext(k_sLayerDescriberService, xContext));
-    }
-    else
-    {
-        OSL_TRACE("Could not retrieve ServiceManager");
-    }	
-
-}
-
-//------------------------------------------------------------------------------
-
-void SAL_CALL WinInetLayer::readData(
-    const uno::Reference<backend::XLayerHandler>& xHandler) 
-    throw ( backend::MalformedDataException,
-            lang::NullPointerException, 
-            lang::WrappedTargetException, 
-            uno::RuntimeException)
-{
-
-    if (m_xLayerContentDescriber.is() && m_lpfnInternetQueryOption)
-    {
-        LPINTERNET_PROXY_INFO lpi = NULL;
-
-        // query for the neccessary space
-        DWORD dwLength = 0;
-        BOOL bRet = m_lpfnInternetQueryOption(
-            NULL,
-            INTERNET_OPTION_PROXY,
-            (LPVOID)lpi,
-            &dwLength );
-        
-        // allocate sufficient space on the heap
-        // insufficient space on the heap results
-        // in a stack overflow exception, we assume
-        // this never happens, because of the relatively
-        // small amount of memory we need
-        // _alloca is nice because it is fast and we don't
-        // have to free the allocated memory, it will be
-        // automatically done
-        lpi = reinterpret_cast< LPINTERNET_PROXY_INFO >(
-            _alloca( dwLength ) );
-        
-        bRet = m_lpfnInternetQueryOption( 
-            NULL,
-            INTERNET_OPTION_PROXY,
-            (LPVOID)lpi,
-            &dwLength );
-
-        // if a proxy is disabled, InternetQueryOption returns
-        // an empty proxy list, so we don't have to check if
-        // proxy is enabled or not
-        
-        rtl::OUString aProxyList       = rtl::OUString::createFromAscii( lpi->lpszProxy );
-        rtl::OUString aProxyBypassList = rtl::OUString::createFromAscii( lpi->lpszProxyBypass );
-        
-        // override default for ProxyType, which is "0" meaning "No proxies".
-        uno::Sequence<backend::PropertyInfo> aPropInfoList(8);
-        sal_Int32 nProperties = 1;
-
-        aPropInfoList[0].Name = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetProxyType") );
-        aPropInfoList[0].Type = rtl::OUString( 
-            RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-        aPropInfoList[0].Protected = sal_False;
-        aPropInfoList[0].Value = uno::makeAny( nProperties );
-
-        // fill proxy bypass list
-        if( aProxyBypassList.getLength() > 0 )
-        {
-            rtl::OUStringBuffer aReverseList;
-            sal_Int32 nIndex = 0;
-            do
-            {
-                rtl::OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex );
-                if ( aProxyList.indexOf( aToken ) == -1 )
-                {
-                    if ( aReverseList.getLength() )
-                    {
-                        aReverseList.insert( 0, sal_Unicode( SEMI_COLON ) );
-                        aReverseList.insert( 0, aToken );
-                    }
-                    else
-                        aReverseList = aToken;
-                }
-            }
-            while ( nIndex >= 0 );
-
-            aProxyBypassList = aReverseList.makeStringAndClear();
-            
-            aPropInfoList[nProperties].Name = rtl::OUString( 
-                RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetNoProxy") );
-            aPropInfoList[nProperties].Type = rtl::OUString( 
-                RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-            aPropInfoList[nProperties].Protected = sal_False;
-            aPropInfoList[nProperties++].Value = uno::makeAny( aProxyBypassList.replace( SPACE, SEMI_COLON ) );
-        }
-
-        if( aProxyList.getLength() > 0 )
-        {
-            //-------------------------------------------------
-            // this implementation follows the algorithm
-            // of the internet explorer
-            // if there are type-dependent proxy settings
-            // and type independent proxy settings in the
-            // registry the internet explorer chooses the
-            // type independent proxy for all settings
-            // e.g. imagine the following registry entry
-            // ftp=server:port;http=server:port;server:port
-            // the last token server:port is type independent
-            // so the ie chooses this proxy server
-    
-            // if there is no port specified for a type independent 
-            // server the ie uses the port of an http server if 
-            // there is one and it has a port
-            //-------------------------------------------------
-
-            ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, rtl::OUString());
-            ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "http" ) ) );
-            ProxyEntry aHttpsProxy  = FindProxyEntry( aProxyList, rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "https" ) ) );
-
-            ProxyEntry aFtpProxy  = FindProxyEntry( aProxyList, rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM( "ftp" ) ) );
-            
-            if( aTypeIndepProxy.Server.getLength() )
-            {
-                aHttpProxy.Server = aTypeIndepProxy.Server;
-                aHttpsProxy.Server  = aTypeIndepProxy.Server;
-                aFtpProxy.Server  = aTypeIndepProxy.Server;
-                
-                if( aTypeIndepProxy.Port.getLength() )
-                {
-                    aHttpProxy.Port = aTypeIndepProxy.Port;
-                    aHttpsProxy.Port  = aTypeIndepProxy.Port;
-                    aFtpProxy.Port  = aTypeIndepProxy.Port;
-                }
-                else
-                {
-                    aFtpProxy.Port  = aHttpProxy.Port;
-                    aHttpsProxy.Port  = aHttpProxy.Port;
-                }
-            }
-                
-            // http proxy name
-            if( aHttpProxy.Server.getLength() > 0 )
-            {
-                aPropInfoList[nProperties].Name = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyName") );
-                aPropInfoList[nProperties].Type = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-                aPropInfoList[nProperties].Protected = sal_False;
-                aPropInfoList[nProperties++].Value = uno::makeAny( aHttpProxy.Server );
-            }
-
-            // http proxy port
-            if( aHttpProxy.Port.getLength() > 0 )
-            {
-                aPropInfoList[nProperties].Name = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPProxyPort") );
-                aPropInfoList[nProperties].Type = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-                aPropInfoList[nProperties].Protected = sal_False;
-                aPropInfoList[nProperties++].Value = uno::makeAny( aHttpProxy.Port.toInt32() );
-            }
-
-            // https proxy name
-            if( aHttpsProxy.Server.getLength() > 0 )
-            {
-                aPropInfoList[nProperties].Name = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyName") );
-                aPropInfoList[nProperties].Type = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-                aPropInfoList[nProperties].Protected = sal_False;
-                aPropInfoList[nProperties++].Value = uno::makeAny( aHttpsProxy.Server );
-            }
-
-            // https proxy port
-            if( aHttpsProxy.Port.getLength() > 0 )
-            {
-                aPropInfoList[nProperties].Name = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetHTTPSProxyPort") );
-                aPropInfoList[nProperties].Type = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-                aPropInfoList[nProperties].Protected = sal_False;
-                aPropInfoList[nProperties++].Value = uno::makeAny( aHttpsProxy.Port.toInt32() );
-            }
-
-            // ftp proxy name
-            if( aFtpProxy.Server.getLength() > 0 )
-            {
-                aPropInfoList[nProperties].Name = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyName") );
-                aPropInfoList[nProperties].Type = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "string" ) );
-                aPropInfoList[nProperties].Protected = sal_False;
-                aPropInfoList[nProperties++].Value = uno::makeAny( aFtpProxy.Server );
-            }
-
-            // ftp proxy port
-            if( aFtpProxy.Port.getLength() > 0 )
-            {
-                aPropInfoList[nProperties].Name = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetFTPProxyPort") );
-                aPropInfoList[nProperties].Type = rtl::OUString( 
-                    RTL_CONSTASCII_USTRINGPARAM( "int" ) );
-                aPropInfoList[nProperties].Protected = sal_False;
-                aPropInfoList[nProperties++].Value = uno::makeAny( aFtpProxy.Port.toInt32() );
-            }
-        }
-        
-        // resize the property info list appropriately
-        aPropInfoList.realloc(nProperties);
-        
-        m_xLayerContentDescriber->describeLayer(xHandler, aPropInfoList);
-    }
-    else
-    {
-        OSL_TRACE("Could not create com.sun.star.configuration.backend.LayerContentDescriber Service");
-    }	
-}
-
-//------------------------------------------------------------------------------
-
-rtl::OUString SAL_CALL WinInetLayer::getTimestamp(void) 
-    throw (uno::RuntimeException)
-{
-    rtl::OUString aTimestamp;
-    
-    if (m_lpfnInternetQueryOption)
-    {
-        LPINTERNET_PROXY_INFO lpi = NULL;
-
-        // query for the neccessary space
-        DWORD dwLength = 0;
-        BOOL bRet = m_lpfnInternetQueryOption(
-            NULL,
-            INTERNET_OPTION_PROXY,
-            (LPVOID)lpi,
-            &dwLength );
-        
-        // allocate sufficient space on the heap
-        // insufficient space on the heap results
-        // in a stack overflow exception, we assume
-        // this never happens, because of the relatively
-        // small amount of memory we need
-        // _alloca is nice because it is fast and we don't
-        // have to free the allocated memory, it will be
-        // automatically done
-        lpi = reinterpret_cast< LPINTERNET_PROXY_INFO >(
-            _alloca( dwLength ) );
-        
-        bRet = m_lpfnInternetQueryOption( 
-            NULL,
-            INTERNET_OPTION_PROXY,
-            (LPVOID)lpi,
-            &dwLength );
-
-        aTimestamp = rtl::OUString::createFromAscii( lpi->lpszProxy );
-        aTimestamp += rtl::OUString::createFromAscii( lpi->lpszProxyBypass );
-    }
-    
-    return aTimestamp;
-}
-
-//------------------------------------------------------------------------------
diff --git a/shell/source/backends/wininetbe/wininetlayer.hxx b/shell/source/backends/wininetbe/wininetlayer.hxx
deleted file mode 100644
index 540433362c..0000000000
--- a/shell/source/backends/wininetbe/wininetlayer.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef _WinInetLayer_HXX_
-#define _WinInetLayer_HXX_
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/configuration/backend/XLayer.hpp>
-#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
-#include <com/sun/star/configuration/backend/BackendAccessException.hpp>
-
-#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
-#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
-#endif
-#include <com/sun/star/util/XTimeStamped.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase2.hxx>
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#include <wininet.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif 
-
-namespace css = com::sun::star ;
-namespace uno = css::uno ;
-namespace lang = css::lang ;
-namespace backend = css::configuration::backend ;
-namespace util = css::util ;
-
-/**
-  Implementation of the XLayer interfaces for fixed values
- */
- 
-class WinInetLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped> 
-{
-    public :
-        typedef BOOL ( WINAPI *InternetQueryOption_Proc_T )( HINTERNET, DWORD, LPVOID, LPDWORD );
-    
-        /**
-          Constructor given the requested component name
-          
-          @param lpfnInternetQueryOption   function pointer into wininet.dll
-          @param aTimestamp     timestamp indicating last modifictaion
-         */
-        WinInetLayer(InternetQueryOption_Proc_T lpfnInternetQueryOption,
-            const uno::Reference<uno::XComponentContext>& xContext);
-            
-        /** Destructor */
-        ~WinInetLayer(void) {}
-
-        // XLayer
-        virtual void SAL_CALL readData(const uno::Reference<backend::XLayerHandler>& xHandler) 
-            throw ( backend::MalformedDataException,
-                    lang::NullPointerException, 
-                    lang::WrappedTargetException, 
-                    uno::RuntimeException) ;
-      
-        // XTimeStamped
-        virtual rtl::OUString SAL_CALL getTimestamp(void) 
-            throw (uno::RuntimeException);
-            
-    private :
-        
-        rtl::OUString m_aComponent ;
-        
-        uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
-    
-        // The InternetQueryOption function pointer
-        InternetQueryOption_Proc_T m_lpfnInternetQueryOption;    
-} ;
-
-#endif // _WinInetLayer_HXX_
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 0934a6e034..63a0fa0517 100755
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdmailentry.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/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index e6787be2fc..52f10c17e2 100755
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdmailmsg.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/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index db5817d35b..b853e6e4aa 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdmailmsg.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/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index dc31693138..465ea85f71 100755
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdmailsuppl.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/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index 3d4ff311a4..4cc8a6b9da 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdmailsuppl.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/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk
index 6b83d74842..a7eaec1f89 100644
--- a/shell/source/cmdmail/makefile.mk
+++ b/shell/source/cmdmail/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx
index e8c5ead776..4e0eda17cf 100644
--- a/shell/source/tools/lngconvex/cmdline.cxx
+++ b/shell/source/tools/lngconvex/cmdline.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cmdline.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/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index bc15796b25..2405925705 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lngconvex.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/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index c98f5d4796..da28e5ff68 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/shell/source/tools/regsvrex/makefile.mk b/shell/source/tools/regsvrex/makefile.mk
index 52c6ee70b6..2eb8dbf484 100644
--- a/shell/source/tools/regsvrex/makefile.mk
+++ b/shell/source/tools/regsvrex/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/shell/source/tools/regsvrex/regsvrex.cxx b/shell/source/tools/regsvrex/regsvrex.cxx
index 51a188ac1b..6358aeb49a 100644
--- a/shell/source/tools/regsvrex/regsvrex.cxx
+++ b/shell/source/tools/regsvrex/regsvrex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: regsvrex.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/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index e23e249e08..2d9d5d250d 100644
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 6e635f8cd0..f76c2c0517 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shellexec.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/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index 7ea66909b9..d528800880 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shellexec.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/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index 5ef8c34651..134d750773 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shellexecentry.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/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx
index fc46d331b5..5c667f1f9a 100644
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c
index 891edc630b..aaf469c2df 100644
--- a/shell/source/unix/misc/gnome-open-url.c
+++ b/shell/source/unix/misc/gnome-open-url.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: gnome-open-url.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/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 8a5ee36622..67fcc708c6 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/unix/misc/open-url.c b/shell/source/unix/misc/open-url.c
index 32c7503344..88ed4858f3 100644
--- a/shell/source/unix/misc/open-url.c
+++ b/shell/source/unix/misc/open-url.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/shell/source/unix/misc/senddoc.c b/shell/source/unix/misc/senddoc.c
index 3de1b6118f..a8e647c0d6 100644
--- a/shell/source/unix/misc/senddoc.c
+++ b/shell/source/unix/misc/senddoc.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/shell/source/unix/misc/uri-encode.c b/shell/source/unix/misc/uri-encode.c
index 5354cfd936..51789afa99 100644
--- a/shell/source/unix/misc/uri-encode.c
+++ b/shell/source/unix/misc/uri-encode.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: uri-encode.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/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 2c1ace9fe1..3d8a55d437 100644
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 37a4ca7e2a..050ba60caa 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_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: recently_used_file.cxx,v $
- * $Revision: 1.7.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index 8fe8477bb2..adce356c96 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recently_used_file.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/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 14ba26a773..a33888ba9e 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recently_used_file_handler.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/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 35e68a3a04..c6e9b0d2fa 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SysShExec.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/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 2ed0a3bb3d..5be95783b4 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SysShExec.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index 0e2549615d..18da51da6d 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SysShentry.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/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk
index 04cc45d89b..9a9564ed76 100644
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -68,4 +64,6 @@ DEF1EXPORTFILE=	exports.dxp
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
 
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index a7b729d03a..2102128df3 100644..100755
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: classfactory.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/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index 3c85c4e8e6..481760c5ab 100644
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: classfactory.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/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 9d65114714..f8db1e8eba 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: columninfo.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/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk
index 0b25d470aa..868a711e00 100644
--- a/shell/source/win32/shlxthandler/columninfo/makefile.mk
+++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -58,4 +54,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 # --- Targets ------------------------------------------------------
 .INCLUDE :  set_wntx64.mk
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
 .INCLUDE :  tg_wntx64.mk
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 4ebe4c642a..58f8a877b2 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: infotips.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/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk
index cf489f3232..f69f2cf2fd 100644
--- a/shell/source/win32/shlxthandler/infotips/makefile.mk
+++ b/shell/source/win32/shlxthandler/infotips/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -34,6 +30,7 @@ PRJNAME=shell
 TARGET=infotips
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE  
 
 # --- Settings -----------------------------------------------------
 
@@ -58,4 +55,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE 
 .INCLUDE :	tg_wntx64.mk
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 479f8c0b6c..0c2abb405b 100644..100755
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/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.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +54,7 @@ SLOFILES=$(SLO)$/classfactory.obj\
     $(SLO)$/shlxthdl.obj\
     $(SLO)$/listviewbuilder.obj\
     $(SLO)$/document_statistic.obj\
-    $(SLO)$/thumbviewer.obj
+    $(SLO)$/thumbviewer.obj\
 
 SHL1TARGET=$(TARGET)
 
@@ -79,7 +75,9 @@ SHL1STDLIBS+=\
     $(SHELL32LIB)\
     $(KERNEL32LIB)\
     $(GDI32LIB)\
-    $(GDIPLUSLIB)
+    $(GDIPLUSLIB)\
+    msvcprt.lib \
+    $(SHLWAPILIB)
 
 SHL1LIBS+=$(SLB)$/util.lib\
     $(SLB)$/ooofilereader.lib
@@ -108,7 +106,7 @@ SLOFILES_X64= \
     $(SLO_X64)$/shlxthdl.obj\
     $(SLO_X64)$/listviewbuilder.obj\
     $(SLO_X64)$/document_statistic.obj\
-    $(SLO_X64)$/thumbviewer.obj
+    $(SLO_X64)$/thumbviewer.obj\
 
 SHL1TARGET_X64=$(TARGET)
 SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\
@@ -127,7 +125,12 @@ SHL1STDLIBS_X64+=\
     $(GDIPLUSLIB_X64) \
     $(MSVCRT_X64)   \
     $(MSVCPRT_X64)  \
-    $(OLDNAMESLIB_X64)
+    $(OLDNAMESLIB_X64) \
+    msvcprt.lib
+
+.IF "$(PRODUCT)"!="full"
+SHL1STDLIBS+=msvcrt.lib
+.ENDIF
 
 SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
     $(SLB_X64)$/ooofilereader.lib
@@ -143,5 +146,7 @@ DEF1EXPORTFILE_X64=exports.dxp
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
 .INCLUDE :	tg_wntx64.mk
 
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 22127bc8dd..0d2a40e147 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -37,7 +33,7 @@ ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
 # Do not use the dynamic STLport library.
-# NO_DEFAULT_STL=YES
+NO_DEFAULT_STL=YES
 
 # Do not use the uwinapi library
 UWINAPILIB=
@@ -55,7 +51,8 @@ CDEFS+=-D_WIN32_IE=0x501
 # --- Files --------------------------------------------------------
 
 SLOFILES=$(SLO)$/ooofilt.obj\
-        $(SLO)$/propspec.obj
+        $(SLO)$/propspec.obj\
+        $(SLO)$/stream_helper.obj
 
 #       $(SLO)$/utilities.obj
 #        $(SLO)$/dbgmacros.obj
@@ -76,7 +73,13 @@ SHL1STDLIBS+=$(OLE32LIB)\
      $(UUIDLIB)\
      $(SHELL32LIB)\
      $(KERNEL32LIB)\
-     $(OLDNAMESLIB)
+     $(OLDNAMESLIB)\
+     msvcprt.lib
+
+.IF "$(PRODUCT)"!="full"
+SHL1STDLIBS+=msvcrt.lib
+.ENDIF
+
      
 #     $(LIBSTLPORTST)
      
@@ -98,7 +101,8 @@ CDEFS_X64+=-D_WIN32_IE=0x501
 USE_DEFFILE_X64=TRUE
 
 SLOFILES_X64=$(SLO_X64)$/ooofilt.obj\
-        $(SLO_X64)$/propspec.obj
+        $(SLO_X64)$/propspec.obj\
+        $(SLO_X64)$/stream_helper.obj
 
 SHL1TARGET_X64=$(TARGET)
 
@@ -129,4 +133,6 @@ DEF1EXPORTFILE_X64=exports.dxp
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
-.INCLUDE :	tg_wntx64.mk
\ No newline at end of file
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
+.INCLUDE :	tg_wntx64.mk
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index f907306e99..89b0cc435d 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ooofilt.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,14 +75,15 @@
 #include <ntquery.h>
 #include "assert.h"
 #include "ooofilt.hxx"
-#include <objidl.h>

-#include <stdio.h>

+#include <objidl.h>
+#include <stdio.h>
 #include "propspec.hxx"
 #ifdef __MINGW32__
 #include <algorithm>
 using ::std::min;
 #endif
 
+#include "internal/stream_helper.hxx"
 
 //C-------------------------------------------------------------------------
 //
@@ -120,7 +118,7 @@ COooFilter::COooFilter() :
     m_ChunkPosition(0),
     m_cAttributes(0),
     m_pAttributes(0),
-    m_pStream(NULL)

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

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

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

-//

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

-//

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

-//

-//  Arguments:  pStm

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

-//                    

-//

-//  Returns:    S_OK

-//				E_OUTOFMEMORY

-//				E_FAIL

-//                 

-//

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

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

-{

-

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

-    

-    char buf[20];

-    unsigned long count;

-    HRESULT hr;

-    ULARGE_INTEGER NewPosition;

-    LARGE_INTEGER Move;	

-    Move.QuadPart = 0;	

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

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

-                

-    zlib_filefunc_def z_filefunc;

-    fill_stream_filefunc (&z_filefunc);

-    z_filefunc.opaque = (void*)pStm;

-

-    m_pStream = pStm;

-  

-    try

-    {

-        if (m_pMetaInfoReader)

-            delete m_pMetaInfoReader;             

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

-        

-        if (m_pContentReader)

-            delete m_pContentReader;

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

-    }

-    catch (const std::exception&)

-    {

-        return E_FAIL;

-    }

-    return S_OK;

-}

-

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

-//

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

-//

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

-//

-//  Arguments:  pcbSize

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

-//

-//  Returns:    E_NOTIMPL

-//                  

-//

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

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

-{

-    // 

-    return E_NOTIMPL;

-}

-

-//M-------------------------------------------------------------------------

-//

-//  Method:     COooFilter::Save      (IPersistStream::Save)

-//

-//  Summary:    Save object to specified stream

-//

-//  Arguments:  pStm

-//                  [in] Pointer to stream

-//

-//              fClearDirty

-//					[in] Indicates whether to clear dirty flag

-//				

-//  Returns:    E_NOTIMPL

-//                 

-//

-//--------------------------------------------------------------------------

-SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )

-{

-    // 

-    return E_NOTIMPL;

-}

+//M-------------------------------------------------------------------------
+//
+//  Method:     COooFilter::Load      (IPersistStream::Load)
+//
+//  Summary:    Initializes an object from the stream where it was previously saved
+//
+//  Arguments:  pStm
+//                  [in] Pointer to stream from which object should be loaded
+//                    
+//
+//  Returns:    S_OK
+//				E_OUTOFMEMORY
+//				E_FAIL
+//                 
+//
+//--------------------------------------------------------------------------
+SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
+{
+    zlib_filefunc_def z_filefunc;
+
+    m_pStream = PrepareIStream( pStm, z_filefunc );
+  
+    try
+    {
+        if (m_pMetaInfoReader)
+            delete m_pMetaInfoReader;             
+        m_pMetaInfoReader = new CMetaInfoReader((void*)m_pStream, &z_filefunc);
+        
+        if (m_pContentReader)
+            delete m_pContentReader;
+        m_pContentReader = new CContentReader((void*)m_pStream, m_pMetaInfoReader->getDefaultLocale(), &z_filefunc);
+    }
+    catch (const std::exception&)
+    {
+        return E_FAIL;
+    }
+    return S_OK;
+}
+
+//M-------------------------------------------------------------------------
+//
+//  Method:     COooFilter::GetSizeMax      (IPersistStream::GetSizeMax)
+//
+//  Summary:    Returns the size in bytes of the stream neede to save the object.
+//
+//  Arguments:  pcbSize
+//                  [out] Pointer to a 64 bit unsigned int indicating the size needed 
+//
+//  Returns:    E_NOTIMPL
+//                  
+//
+//--------------------------------------------------------------------------
+SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
+{
+    // 
+    return E_NOTIMPL;
+}
+
+//M-------------------------------------------------------------------------
+//
+//  Method:     COooFilter::Save      (IPersistStream::Save)
+//
+//  Summary:    Save object to specified stream
+//
+//  Arguments:  pStm
+//                  [in] Pointer to stream
+//
+//              fClearDirty
+//					[in] Indicates whether to clear dirty flag
+//				
+//  Returns:    E_NOTIMPL
+//                 
+//
+//--------------------------------------------------------------------------
+SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
+{
+    // 
+    return E_NOTIMPL;
+}
 
 //M-------------------------------------------------------------------------
 //
@@ -1247,14 +1231,14 @@ namespace /* private */
         if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
             return E_FAIL;	
 
-        // Add missing entry 

-        std::string ClsidEntry_Persist_Entry = CLSID_PERSIST_ENTRY;

-        SubstitutePlaceholder(ClsidEntry_Persist_Entry, 

-                              GUID_PLACEHOLDER, 

-                              ClsidToString(PersistentGuid));		

-

-        if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist_Entry.c_str(), "", ClsidToString(PersistentGuid).c_str()));

+        // Add missing entry 
+        std::string ClsidEntry_Persist_Entry = CLSID_PERSIST_ENTRY;
+        SubstitutePlaceholder(ClsidEntry_Persist_Entry, 
+                              GUID_PLACEHOLDER, 
+                              ClsidToString(PersistentGuid));		
 
+        if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist_Entry.c_str(), "", ClsidToString(PersistentGuid).c_str()))
+            return E_FAIL;
         
         std::string ClsidEntry_Persist_Addin = CLSID_GUID_PERSIST_ADDIN_ENTRY;
         SubstitutePlaceholder(ClsidEntry_Persist_Addin, 
@@ -1504,100 +1488,3 @@ STDAPI DllUnregisterServer()
     */
     return S_OK;
 }
-
-extern "C" {

-

-    // IStream callback

-    voidpf ZCALLBACK cb_sopen (voidpf opaque, const char* filename, int mode) {		

-        return opaque;

-    }

-

-    uLong ZCALLBACK cb_sread (voidpf opaque, voidpf stream, void* buf, uLong size) {

-        unsigned long newsize;

-        HRESULT hr;

-    

-        hr = ((IStream *)stream)->Read (buf, size, &newsize);

-        if (hr == S_OK){

-            return (unsigned long)newsize;

-        }

-        else {			

-            return (uLong)0;

-        }

-    }

-

-    long ZCALLBACK cb_sseek (voidpf opaque, voidpf stream, uLong offset, int origin) {

-        // IStream::Seek parameters

-        HRESULT hr;

-        LARGE_INTEGER Move;

-        DWORD dwOrigin;		

-        Move.QuadPart = (__int64)offset;	

-

-        switch (origin) {

-            case SEEK_CUR:

-                dwOrigin = STREAM_SEEK_CUR;

-                break;

-            case SEEK_END:

-                dwOrigin = STREAM_SEEK_END;

-                break;

-            case SEEK_SET:

-                dwOrigin = STREAM_SEEK_SET;

-                break;

-            default:

-                return -1;

-        }

-    

-        hr = ((IStream*)stream)->Seek (Move, dwOrigin, NULL);

-        if (hr == S_OK){	

-            return 0;

-        }

-        else {			

-            return -1;

-        }

-    }

-

-    long ZCALLBACK cb_stell (voidpf opaque, voidpf stream) {

-        // IStream::Seek parameters

-        HRESULT hr;

-        LARGE_INTEGER Move;

-        ULARGE_INTEGER NewPosition;

-        Move.QuadPart = 0;

-        NewPosition.QuadPart = 0;

-        

-        hr = ((IStream*)stream)->Seek (Move, STREAM_SEEK_CUR, &NewPosition);

-        if (hr == S_OK){			

-            return (long) NewPosition.QuadPart;

-        }

-        else {

-            return -1;

-        }

-    }

-

-    int ZCALLBACK cb_sclose (voidpf opaque, voidpf stream) {

-        return 0;

-    }

-

-    int ZCALLBACK cb_serror (voidpf opaque, voidpf stream) {

-        return 0;  //RJK - for now

-    }

-

-    uLong ZCALLBACK cb_swrite (voidpf opaque, voidpf stream, const void* buf, uLong size) {

-        HRESULT hr;

-        unsigned long writecount;

-        hr = ((IStream*)stream)->Write (buf, size, &writecount);

-        if (hr == S_OK)

-            return (unsigned int)writecount;

-        else

-            return (uLong)0;

-    }

-

-    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def) {

-        pzlib_filefunc_def->zopen_file = cb_sopen;

-        pzlib_filefunc_def->zread_file = cb_sread;

-        pzlib_filefunc_def->zwrite_file = cb_swrite;

-        pzlib_filefunc_def->ztell_file = cb_stell;

-        pzlib_filefunc_def->zseek_file = cb_sseek;

-        pzlib_filefunc_def->zclose_file = cb_sclose;

-        pzlib_filefunc_def->zerror_file = cb_serror;		

-    }

-}

-
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index f63a9942f5..f23e050d6b 100644..100755
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ooofilt.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 @@ enum FilterState
     FilteringContent,                           // Filtering the content property
     FilteringProperty                           // Filtering the pseudo property
 };
-class COooFilter : public IFilter, public IPersistFile, public IPersistStream

+class COooFilter : public IFilter, public IPersistFile, public IPersistStream
 {
 public:
     // From IUnknown
@@ -143,16 +140,16 @@ public:
     virtual  SCODE STDMETHODCALLTYPE  GetCurFile(
         LPWSTR  * ppszFileName);
 
-    // From IPersistStream

-    virtual SCODE STDMETHODCALLTYPE  Load(

-        IStream *pStm);

-

-    virtual SCODE STDMETHODCALLTYPE Save(

-        IStream *pStm,

-        BOOL fClearDirty);

-

-    virtual SCODE STDMETHODCALLTYPE  GetSizeMax(

-        ULARGE_INTEGER *pcbSize);

+    // From IPersistStream
+    virtual SCODE STDMETHODCALLTYPE  Load(
+        IStream *pStm);
+
+    virtual SCODE STDMETHODCALLTYPE Save(
+        IStream *pStm,
+        BOOL fClearDirty);
+
+    virtual SCODE STDMETHODCALLTYPE  GetSizeMax(
+        ULARGE_INTEGER *pcbSize);
 
 
 private:
@@ -177,7 +174,7 @@ private:
     ULONG			          m_ChunkPosition;          // Chunk pointer to specify the current Chunk;
     ULONG                     m_cAttributes;            // Count of attributes
     CFullPropSpec *           m_pAttributes;            // Attributes to filter
-    IStream *                 m_pStream;

+    IStream *                 m_pStream;
 
 };
 
@@ -219,26 +216,3 @@ private:
     
     long m_lRefs;           // Reference count
 };
-
-extern "C" {

-

-    voidpf ZCALLBACK cb_sopen OF((voidpf opaque, const char * filename, int mode));

-    uLong ZCALLBACK cb_sread OF((voidpf opaque, voidpf stream, void* vuf, uLong size));

-    uLong ZCALLBACK cb_swrite OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

-    long ZCALLBACK cb_stell OF((voidpf opaque, voidpf stream));

-    long ZCALLBACK cb_sseek OF((voidpf opaque, voidpf stream, uLong offset, int origin));

-    int ZCALLBACK cb_sclose OF((voidpf opaque, voidpf stream));

-    int ZCALLBACK cb_serror OF((voidpf opaque, voidpf stream));

-

-    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def);	

-    

-}

-

-
-
-
-
-
-
-
-
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index 019cb12d7e..14d0cc9d63 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propspec.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/shell/source/win32/shlxthandler/ooofilt/propspec.hxx b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
index 8c587ed0e3..4b20593f4b 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propspec.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/shell/source/win32/shlxthandler/ooofilt/proxy/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/proxy/exports.dxp
deleted file mode 100644
index 953039ccc9..0000000000
--- a/shell/source/win32/shlxthandler/ooofilt/proxy/exports.dxp
+++ /dev/null
@@ -1,4 +0,0 @@
-DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE 
-DllGetClassObject PRIVATE 
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
deleted file mode 100644
index 4836eb34bb..0000000000
--- a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
+++ /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: ooofiltproxy.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_shell.hxx"
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif 
-#include <tchar.h>
-#ifdef __MINGW32__
-#include <basetyps.h>
-#endif
-#include "internal/config.hxx"
-
-
-/*
-    The indexing filter library ooofilt.dll is linked against a couple 
-    of libaries (e.g. stlport, uwinapi, ...) which are not standard on
-    a windows system. Unfortunately the library will be loaded by the
-    indexing service via LoadLibrary so that the libraries ooofilt.dll
-    depends on need to be in one of the standard search directories or
-    the <office installation> directory need to be added to the PATH 
-    environment variable. In order to prevent failures while loading 
-    the ooofilt.dll we're installing and registering this proxy library
-    which will load ooofilt.dll using LoadLibraryEx with the flag
-    LOAD_WITH_ALTERED_SEARCH_PATH (see MSDN for details). This approach
-    ensures that all libraries ooofilt.dll depends on will be found.
-*/
-
-typedef HRESULT (__stdcall * Forward_DllGetClassObject_t)(REFCLSID cid, REFIID iid, void** ppvObj);
-typedef HRESULT (__stdcall * Forward_DllCanUnloadNow_t)();
-typedef HRESULT (__stdcall * Forward_DllRegisterServer_t)();
-typedef HRESULT (__stdcall * Forward_DllUnregisterServer_t)();
-
-Forward_DllGetClassObject_t Forward_DllGetClassObject = NULL;
-Forward_DllCanUnloadNow_t Forward_DllCanUnloadNow = NULL;
-Forward_DllRegisterServer_t Forward_DllRegisterServer = NULL;
-Forward_DllUnregisterServer_t Forward_DllUnregisterServer = NULL;
-
-HMODULE hOoofilt = NULL;
-HMODULE hThisLibrary = NULL;
-
-/* Truncates the file name from an absolute path but
-   leaves the final '\' */
-void PathTruncateFileName(TCHAR* path)
-{
-    TCHAR* p = path + lstrlen(path);
-    while (*p != _T('\\')) p--;        
-    p++;
-    *p = 0;            
-}
-
-void Init()
-{
-    if (Forward_DllGetClassObject == NULL)
-    {
-        TCHAR buff[MAX_PATH];
-        GetModuleFileName(hThisLibrary, buff, (sizeof(buff)/sizeof(TCHAR)));            
-        PathTruncateFileName(buff);
-
-        lstrcat(buff, MODULE_NAME_FILTER);
-        
-        hOoofilt = LoadLibraryEx(buff, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-        
-        if (hOoofilt)
-        {
-            Forward_DllGetClassObject = reinterpret_cast<Forward_DllGetClassObject_t>(
-                GetProcAddress(hOoofilt, "DllGetClassObject"));
-            Forward_DllCanUnloadNow = reinterpret_cast<Forward_DllCanUnloadNow_t>(
-                GetProcAddress(hOoofilt, "DllCanUnloadNow"));                
-            Forward_DllRegisterServer = reinterpret_cast<Forward_DllRegisterServer_t>(
-                GetProcAddress(hOoofilt, "DllRegisterServer"));
-            Forward_DllUnregisterServer = reinterpret_cast<Forward_DllUnregisterServer_t>(
-                GetProcAddress(hOoofilt, "DllUnregisterServer"));                
-        }
-    }
-}
-
-extern "C" BOOL WINAPI DllMain(HMODULE hInstance, DWORD fdwReason, LPVOID /*lpvReserved*/)
-{
-    switch (fdwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hInstance );
-        hThisLibrary = hInstance;        
-        break;
-    case DLL_PROCESS_DETACH:
-        if (hOoofilt)
-            FreeLibrary(hOoofilt);
-        break;        
-    default:
-        break;        
-    }            
-    return TRUE;
-}
-
-extern "C" HRESULT __stdcall DllGetClassObject(REFCLSID cid, REFIID iid, void** ppvObj)
-{
-    Init();
-    
-    if (Forward_DllGetClassObject)
-        return Forward_DllGetClassObject(cid, iid, ppvObj);
-    else
-        return E_FAIL;        
-}
-
-extern "C" HRESULT __stdcall DllCanUnloadNow()
-{    
-    Init();
-    
-    if (Forward_DllCanUnloadNow)
-        return Forward_DllCanUnloadNow();   
-    else
-        return E_FAIL;        
-}
-
-extern "C" HRESULT __stdcall DllRegisterServer()
-{	
-    Init();
-    if (Forward_DllRegisterServer)
-        return Forward_DllRegisterServer();
-    else
-        return E_FAIL;	    
-}
-
-extern "C" HRESULT __stdcall DllUnregisterServer()
-{
-    Init();
-    
-    if (Forward_DllUnregisterServer)
-        return Forward_DllUnregisterServer();
-    else
-        return E_FAIL;	    
-}
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
new file mode 100755
index 0000000000..dc5966ea28
--- /dev/null
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2010 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_shell.hxx"
+
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif 
+
+#include <stdio.h>
+#include <objidl.h>
+
+/*#include <string.h>
+#include <filter.h>
+#include <filterr.h>
+#include <ntquery.h>
+#include "assert.h"
+#include "propspec.hxx"
+#ifdef __MINGW32__
+#include <algorithm>
+using ::std::min;
+#endif
+*/
+
+#include "internal/stream_helper.hxx"
+
+extern "C" {
+    voidpf ZCALLBACK cb_sopen OF((voidpf opaque, const char * filename, int mode));
+    uLong ZCALLBACK cb_sread OF((voidpf opaque, voidpf stream, void* vuf, uLong size));
+    uLong ZCALLBACK cb_swrite OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+    long ZCALLBACK cb_stell OF((voidpf opaque, voidpf stream));
+    long ZCALLBACK cb_sseek OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+    int ZCALLBACK cb_sclose OF((voidpf opaque, voidpf stream));
+    int ZCALLBACK cb_serror OF((voidpf opaque, voidpf stream));
+
+    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def);
+}
+
+//-----------------------------
+IStream* PrepareIStream( IStream* pStream, zlib_filefunc_def &zFileFunc )
+{
+    // These next few lines work around the "Seek pointer" bug found on Vista.
+    char cBuf[20];
+    unsigned long nCount;
+    HRESULT hr;
+    ULARGE_INTEGER nNewPosition;
+    LARGE_INTEGER nMove;	
+    nMove.QuadPart = 0;	
+    hr = pStream->Seek( nMove, STREAM_SEEK_SET, &nNewPosition );	
+    hr = pStream->Read( cBuf, 20, &nCount );
+
+    fill_stream_filefunc( &zFileFunc );
+    zFileFunc.opaque = (void*)pStream;
+
+    return pStream;
+}
+
+extern "C" {
+
+    // IStream callback
+    voidpf ZCALLBACK cb_sopen (voidpf opaque, const char* /*filename*/, int /*mode*/) {		
+        return opaque;
+    }
+
+    uLong ZCALLBACK cb_sread (voidpf /*opaque*/, voidpf stream, void* buf, uLong size) {
+        unsigned long newsize;
+        HRESULT hr;
+    
+        hr = ((IStream *)stream)->Read (buf, size, &newsize);
+        if (hr == S_OK){
+            return (unsigned long)newsize;
+        }
+        else {			
+            return (uLong)0;
+        }
+    }
+
+    long ZCALLBACK cb_sseek (voidpf /*opaque*/, voidpf stream, uLong offset, int origin) {
+        // IStream::Seek parameters
+        HRESULT hr;
+        LARGE_INTEGER Move;
+        DWORD dwOrigin;		
+        Move.QuadPart = (__int64)offset;	
+
+        switch (origin) {
+            case SEEK_CUR:
+                dwOrigin = STREAM_SEEK_CUR;
+                break;
+            case SEEK_END:
+                dwOrigin = STREAM_SEEK_END;
+                break;
+            case SEEK_SET:
+                dwOrigin = STREAM_SEEK_SET;
+                break;
+            default:
+                return -1;
+        }
+    
+        hr = ((IStream*)stream)->Seek (Move, dwOrigin, NULL);
+        if (hr == S_OK){	
+            return 0;
+        }
+        else {			
+            return -1;
+        }
+    }
+
+    long ZCALLBACK cb_stell (voidpf /*opaque*/, voidpf stream) {
+        // IStream::Seek parameters
+        HRESULT hr;
+        LARGE_INTEGER Move;
+        ULARGE_INTEGER NewPosition;
+        Move.QuadPart = 0;
+        NewPosition.QuadPart = 0;
+        
+        hr = ((IStream*)stream)->Seek (Move, STREAM_SEEK_CUR, &NewPosition);
+        if (hr == S_OK){			
+            return (long) NewPosition.QuadPart;
+        }
+        else {
+            return -1;
+        }
+    }
+
+    int ZCALLBACK cb_sclose (voidpf /*opaque*/, voidpf /*stream*/) {
+        return 0;
+    }
+
+    int ZCALLBACK cb_serror (voidpf /*opaque*/, voidpf /*stream*/) {
+        return 0;  //RJK - for now
+    }
+
+    uLong ZCALLBACK cb_swrite (voidpf /*opaque*/, voidpf stream, const void* buf, uLong size) {
+        HRESULT hr;
+        unsigned long writecount;
+        hr = ((IStream*)stream)->Write (buf, size, &writecount);
+        if (hr == S_OK)
+            return (unsigned int)writecount;
+        else
+            return (uLong)0;
+    }
+
+    void fill_stream_filefunc (zlib_filefunc_def* pzlib_filefunc_def) {
+        pzlib_filefunc_def->zopen_file = cb_sopen;
+        pzlib_filefunc_def->zread_file = cb_sread;
+        pzlib_filefunc_def->zwrite_file = cb_swrite;
+        pzlib_filefunc_def->ztell_file = cb_stell;
+        pzlib_filefunc_def->zseek_file = cb_sseek;
+        pzlib_filefunc_def->zclose_file = cb_sclose;
+        pzlib_filefunc_def->zerror_file = cb_serror;		
+    }
+}
diff --git a/shell/source/win32/shlxthandler/prophdl/exports.dxp b/shell/source/win32/shlxthandler/prophdl/exports.dxp
new file mode 100755
index 0000000000..2ada8255f8
--- /dev/null
+++ b/shell/source/win32/shlxthandler/prophdl/exports.dxp
@@ -0,0 +1,2 @@
+DllGetClassObject PRIVATE 
+DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
new file mode 100755
index 0000000000..572dcb9385
--- /dev/null
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2010 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.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..
+PRJNAME=shell
+TARGET=propertyhdl
+LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
+NO_DEFAULT_STL=YES
+USE_DEFFILE=TRUE
+.IF "$(BUILD_X64)"!=""
+USE_DEFFILE_X64=TRUE
+.ENDIF
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+UWINAPILIB =
+UWINAPILIB_X64 =
+
+CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
+CDEFS+=-D_WIN32_IE=0x501
+
+# --- Files --------------------------------------------------------
+
+SLOFILES=$(SLO)$/$(TARGET).obj\
+    $(SLO)$/stream_helper.obj
+
+SHL1TARGET=$(TARGET)
+
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB)
+SHL1LIBS=
+.ELSE
+SHL1STDLIBS=
+SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\
+    $(SOLARLIBDIR)$/expat_xmlparse.lib\
+    $(SOLARLIBDIR)$/expat_xmltok.lib
+.ENDIF
+SHL1STDLIBS+=\
+    $(OLEAUT32LIB)\
+    $(ADVAPI32LIB)\
+    $(OLE32LIB)\
+    $(UUIDLIB)\
+    $(SHELL32LIB)\
+    $(KERNEL32LIB)\
+    $(GDI32LIB)\
+    $(GDIPLUSLIB)\
+    $(SHLWAPILIB)\
+    $(PROPSYSLIB) \
+    msvcprt.lib
+
+.IF "$(PRODUCT)"!="full"
+SHL1STDLIBS+=msvcrt.lib
+.ENDIF
+
+SHL1LIBS+=$(SLB)$/util.lib\
+    $(SLB)$/ooofilereader.lib
+
+SHL1DEPN=
+SHL1OBJS=$(SLOFILES)
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+# -------------------- x64 -----------------------
+.IF "$(BUILD_X64)"!=""
+CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
+CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
+CDEFS_X64+=-D_WIN32_IE=0x501
+SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
+
+SLOFILES_X64= \
+    $(SLO_X64)$/propertyhdl.obj\
+    $(SLO_X64)$/stream_helper.obj\
+
+SHL1TARGET_X64=$(TARGET)
+SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\
+    $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\
+    $(SOLARLIBDIR_X64)$/expat_xmltok.lib
+
+SHL1STDLIBS_X64+=\
+    $(OLEAUT32LIB_X64)\
+    $(ADVAPI32LIB_X64)\
+    $(OLE32LIB_X64)\
+    $(UUIDLIB_X64)\
+    $(SHELL32LIB_X64)\
+    $(KERNEL32LIB_X64)\
+    $(GDI32LIB_X64)\
+    $(USER32LIB_X64) \
+    $(GDIPLUSLIB_X64) \
+    $(MSVCRT_X64)   \
+    $(MSVCPRT_X64)  \
+    $(OLDNAMESLIB_X64)\
+    $(PROPSYSLIB_X64)
+
+SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
+    $(SLB_X64)$/ooofilereader.lib
+SHL1OBJS_X64=$(SLOFILES_X64)
+SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def
+
+DEF1NAME_X64=$(SHL1TARGET_X64)
+DEF1EXPORTFILE_X64=exports.dxp
+
+.ENDIF # "$(BUILD_X64)"!=""
+
+# --- Targets ------------------------------------------------------
+.INCLUDE :  set_wntx64.mk
+.INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
+.INCLUDE :  tg_wntx64.mk
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
new file mode 100755
index 0000000000..cbe4638658
--- /dev/null
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -0,0 +1,459 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2010 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_shell.hxx"
+#include "internal/global.hxx"
+#include "internal/PropertyHdl.hxx"
+#include "internal/fileextensions.hxx"
+#include "internal/metainforeader.hxx"
+#include "internal/utilities.hxx"
+#include "internal/config.hxx"
+
+#include <propkey.h>
+#include <propvarutil.h>
+
+#include <malloc.h>
+#include <strsafe.h>
+
+#include "internal/stream_helper.hxx"
+
+//---------------------------
+// Module global
+//---------------------------
+long g_DllRefCnt = 0;
+HINSTANCE g_hModule = NULL;
+    
+//
+// Map of property keys to the locations of their value(s) in the .??? XML schema
+//
+struct PROPERTYMAP
+{
+    PROPERTYKEY key;
+    PCWSTR pszXPathParent;
+    PCWSTR pszValueNodeName;
+};
+
+PROPERTYMAP g_rgPROPERTYMAP[] =
+{
+    { PKEY_Title,          L"OpenOffice.org",          L"Title" },
+    { PKEY_Author,         L"OpenOffice.org",          L"Author" },
+    { PKEY_Subject,        L"OpenOffice.org",          L"Subject" },
+    { PKEY_Keywords,       L"OpenOffice.org",          L"Keyword" },
+    { PKEY_Comment,        L"OpenOffice.org",          L"Comments" },
+};
+
+size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
+
+//----------------------------
+//
+//----------------------------
+
+CPropertyHdl::CPropertyHdl( long nRefCnt ) :
+    m_RefCnt( nRefCnt ),
+    m_pCache( NULL )
+{
+    OutputDebugStringFormat( "CPropertyHdl: CTOR\n" );
+    InterlockedIncrement( &g_DllRefCnt );
+}
+
+//----------------------------
+//
+//----------------------------
+
+CPropertyHdl::~CPropertyHdl()
+{
+    if ( m_pCache )
+    {
+        m_pCache->Release();
+        m_pCache = NULL;
+    }
+    InterlockedDecrement( &g_DllRefCnt );
+}
+
+//-----------------------------
+// IUnknown methods
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject)
+{
+    *ppvObject = 0;
+
+    if (IID_IUnknown == riid || IID_IPropertyStore == riid) 
+    {
+        OutputDebugStringFormat( "CPropertyHdl: QueryInterface (IID_IPropertyStore)\n" );
+        IUnknown* pUnk = static_cast<IPropertyStore*>(this);
+        pUnk->AddRef();
+        *ppvObject = pUnk;
+        return S_OK;
+    }
+    else if (IID_IPropertyStoreCapabilities == riid)
+    {
+        OutputDebugStringFormat( "CPropertyHdl: QueryInterface (IID_IPropertyStoreCapabilities)\n" );
+        IUnknown* pUnk = static_cast<IPropertyStore*>(this);
+        pUnk->AddRef();
+        *ppvObject = pUnk;
+        return S_OK;
+    }
+    else if (IID_IInitializeWithStream == riid)
+    {
+        OutputDebugStringFormat( "CPropertyHdl: QueryInterface (IID_IInitializeWithStream)\n" );
+        IUnknown* pUnk = static_cast<IInitializeWithStream*>(this);
+        pUnk->AddRef();
+        *ppvObject = pUnk;
+        return S_OK;
+    }
+    OutputDebugStringFormat( "CPropertyHdl: QueryInterface (something different)\n" );
+
+    return E_NOINTERFACE;
+}
+
+//----------------------------
+ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef( void )
+{
+    return InterlockedIncrement( &m_RefCnt );
+}
+
+//----------------------------
+ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void )
+{
+    long refcnt = InterlockedDecrement( &m_RefCnt );
+
+    if ( 0 == m_RefCnt )
+        delete this;
+
+    return refcnt;
+}
+
+//-----------------------------
+// IPropertyStore
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::GetCount( DWORD *pcProps )
+{
+    HRESULT hr = E_UNEXPECTED;
+    if ( m_pCache && pcProps )
+    {
+        hr = m_pCache->GetCount( pcProps );
+    }
+
+    return hr;
+}
+
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::GetAt( DWORD iProp, PROPERTYKEY *pKey )
+{
+    HRESULT hr = E_UNEXPECTED;
+    if ( m_pCache )
+    {
+        hr = m_pCache->GetAt( iProp, pKey );
+    }
+
+    return hr;
+}
+
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::GetValue( REFPROPERTYKEY key, PROPVARIANT *pPropVar )
+{
+    HRESULT hr = E_UNEXPECTED;
+    if ( m_pCache )
+    {
+        hr = m_pCache->GetValue( key, pPropVar );
+    }
+
+    return hr;
+}
+
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::SetValue( REFPROPERTYKEY key, REFPROPVARIANT propVar )
+{
+    HRESULT hr = E_UNEXPECTED;
+    if ( m_pCache )
+    {
+        hr = STG_E_ACCESSDENIED;
+    }
+    return hr;
+}
+
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::Commit()
+{
+    return S_OK;
+}
+
+//-----------------------------
+// IPropertyStore
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::IsPropertyWritable( REFPROPERTYKEY key )
+{
+    // We start with read only properties only
+    return S_FALSE;
+}
+
+//-----------------------------
+// IInitializeWithStream
+//-----------------------------
+HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfMode )
+{
+    if ( grfMode & STGM_READWRITE )
+        return STG_E_ACCESSDENIED;
+
+    if ( !m_pCache )
+    {
+        if ( FAILED( PSCreateMemoryPropertyStore( IID_PPV_ARGS( &m_pCache ) ) ) )
+            OutputDebugStringFormat( "CPropertyHdl::Initialize: PSCreateMemoryPropertyStore failed" );
+
+        zlib_filefunc_def z_filefunc;
+        pStream = PrepareIStream( pStream, z_filefunc );
+
+        CMetaInfoReader *pMetaInfoReader = NULL; 
+
+        try
+        {
+            pMetaInfoReader = new CMetaInfoReader( (void*)pStream, &z_filefunc );
+        }
+        catch (const std::exception& e)
+        {
+            OutputDebugStringFormat( "CPropertyHdl::Initialize: Caught exception [%s]", e.what() );
+            return E_FAIL;
+        }
+
+        LoadProperties( pMetaInfoReader );
+/*
+    // load extended properties and search content
+    _LoadExtendedProperties();
+    _LoadSearchContent();
+*/
+    }
+
+    return S_OK;
+}
+
+//-----------------------------
+void CPropertyHdl::LoadProperties( CMetaInfoReader *pMetaInfoReader )
+{
+    OutputDebugStringFormat( "CPropertyHdl: LoadProperties\n" );
+    PROPVARIANT propvarValues;
+
+    for ( UINT i = 0; i < (UINT)gPropertyMapTableSize; ++i )
+    {
+        PropVariantClear( &propvarValues );
+        HRESULT hr = GetItemData( pMetaInfoReader, i, &propvarValues);
+        if (hr == S_OK)
+        {
+            // coerce the value(s) to the appropriate type for the property key
+            hr = PSCoerceToCanonicalValue( g_rgPROPERTYMAP[i].key, &propvarValues );
+            if (SUCCEEDED(hr))
+            {
+                // cache the value(s) loaded
+                hr = m_pCache->SetValueAndState( g_rgPROPERTYMAP[i].key, &propvarValues, PSC_NORMAL );
+            }
+        }
+    }
+}
+
+//-----------------------------
+HRESULT CPropertyHdl::GetItemData( CMetaInfoReader *pMetaInfoReader, UINT nIndex, PROPVARIANT *pVarData )
+{
+    switch (nIndex) {
+    case 0: {
+            pVarData->vt = VT_BSTR;
+            pVarData->bstrVal = SysAllocString( pMetaInfoReader->getTagData( META_INFO_TITLE ).c_str() );
+            OutputDebugStringFormat( "CPropertyHdl::GetItemData: Title=%S.\n", pMetaInfoReader->getTagData( META_INFO_TITLE ).c_str() );
+            return S_OK;
+    }
+    case 1: {
+            pVarData->vt = VT_BSTR;
+            pVarData->bstrVal = SysAllocString( pMetaInfoReader->getTagData( META_INFO_AUTHOR ).c_str() );
+            OutputDebugStringFormat( "CPropertyHdl::GetItemData: Author=%S.\n", pMetaInfoReader->getTagData( META_INFO_AUTHOR ).c_str() );
+            return S_OK;
+    }
+    case 2: {
+            pVarData->vt = VT_BSTR;
+            pVarData->bstrVal = SysAllocString( pMetaInfoReader->getTagData( META_INFO_SUBJECT ).c_str() );
+            OutputDebugStringFormat( "CPropertyHdl::GetItemData: Subject=%S.\n", pMetaInfoReader->getTagData( META_INFO_SUBJECT ).c_str() );
+            return S_OK;
+    }
+    case 3: {
+            pVarData->vt = VT_BSTR;
+            pVarData->bstrVal = SysAllocString( pMetaInfoReader->getTagData( META_INFO_KEYWORDS ).c_str() );
+            OutputDebugStringFormat( "CPropertyHdl::GetItemData: Keywords=%S.\n", pMetaInfoReader->getTagData( META_INFO_KEYWORDS ).c_str() );
+            return S_OK;
+    }
+    case 4: {
+            pVarData->vt = VT_BSTR;
+            pVarData->bstrVal = SysAllocString( pMetaInfoReader->getTagData( META_INFO_DESCRIPTION ).c_str() );
+            OutputDebugStringFormat( "CPropertyHdl::GetItemData: Description=%S.\n", pMetaInfoReader->getTagData( META_INFO_DESCRIPTION ).c_str() );
+            return S_OK;
+    }										
+    case 5: {
+            pVarData->vt = VT_BSTR;
+            pVarData->bstrVal = SysAllocString( pMetaInfoReader->getTagAttribute( META_INFO_DOCUMENT_STATISTIC, META_INFO_PAGES ).c_str() );
+            OutputDebugStringFormat( "CPropertyHdl::GetItemData: Pages=%S.\n", pMetaInfoReader->getTagAttribute( META_INFO_DOCUMENT_STATISTIC, META_INFO_PAGES ).c_str() );
+            return S_OK;
+    }
+    }
+
+    return S_FALSE;
+}
+
+//-----------------------------------------------------------------------------
+//                              CClassFactory
+//-----------------------------------------------------------------------------
+
+long CClassFactory::s_ServerLocks = 0;
+
+//-----------------------------------------------------------------------------
+CClassFactory::CClassFactory( const CLSID& clsid ) :
+    m_RefCnt(1),
+    m_Clsid(clsid)
+{
+    InterlockedIncrement( &g_DllRefCnt );
+}
+
+//-----------------------------------------------------------------------------
+CClassFactory::~CClassFactory()
+{
+    InterlockedDecrement( &g_DllRefCnt );
+}
+
+//-----------------------------------------------------------------------------
+//                              IUnknown methods
+//-----------------------------------------------------------------------------
+HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject )
+{
+    *ppvObject = 0;
+
+    if ( IID_IUnknown == riid || IID_IClassFactory == riid )
+    {
+        IUnknown* pUnk = this;
+        pUnk->AddRef();
+        *ppvObject = pUnk;
+        return S_OK;
+    }
+
+    return E_NOINTERFACE;
+}
+
+//-----------------------------------------------------------------------------
+ULONG STDMETHODCALLTYPE CClassFactory::AddRef( void )
+{
+    return InterlockedIncrement( &m_RefCnt );
+}
+
+//-----------------------------------------------------------------------------
+ULONG STDMETHODCALLTYPE CClassFactory::Release( void )
+{
+    long refcnt = InterlockedDecrement( &m_RefCnt );
+
+    if (0 == refcnt)
+        delete this;
+
+    return refcnt;
+}
+
+//-----------------------------------------------------------------------------
+//                          IClassFactory methods
+//-----------------------------------------------------------------------------
+HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
+            IUnknown __RPC_FAR *pUnkOuter,
+            REFIID riid,
+            void __RPC_FAR *__RPC_FAR *ppvObject)
+{
+    if ( pUnkOuter != NULL )
+        return CLASS_E_NOAGGREGATION;
+
+    IUnknown* pUnk = 0;
+
+    if ( CLSID_PROPERTY_HANDLER == m_Clsid )
+        pUnk = static_cast<IPropertyStore*>( new CPropertyHdl() );
+
+    POST_CONDITION(pUnk != 0, "Could not create COM object");
+
+    if (0 == pUnk)
+        return E_OUTOFMEMORY;
+
+    HRESULT hr = pUnk->QueryInterface( riid, ppvObject );
+
+    // if QueryInterface failed the component will destroy itself
+    pUnk->Release();
+
+    return hr;
+}
+
+//-----------------------------------------------------------------------------
+HRESULT STDMETHODCALLTYPE CClassFactory::LockServer( BOOL fLock )
+{
+    if ( fLock )
+        InterlockedIncrement( &s_ServerLocks );
+    else
+        InterlockedDecrement( &s_ServerLocks );
+
+    return S_OK;
+}
+
+//-----------------------------------------------------------------------------
+bool CClassFactory::IsLocked()
+{
+    return ( s_ServerLocks > 0 );
+}
+
+//-----------------------------------------------------------------------------
+extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+{
+    OutputDebugStringFormat( "DllGetClassObject.\n" );
+    *ppv = 0;
+
+    if ( rclsid != CLSID_PROPERTY_HANDLER )
+        return CLASS_E_CLASSNOTAVAILABLE;
+
+    if ( (riid != IID_IUnknown) && (riid != IID_IClassFactory) )
+        return E_NOINTERFACE;
+
+    IUnknown* pUnk = new CClassFactory( rclsid );
+    if ( 0 == pUnk )
+        return E_OUTOFMEMORY;
+
+    *ppv = pUnk;
+    return S_OK;
+}
+
+//-----------------------------------------------------------------------------
+extern "C" STDAPI DllCanUnloadNow( void )
+{
+    OutputDebugStringFormat( "DllCanUnloadNow.\n" );
+    if (CClassFactory::IsLocked() || g_DllRefCnt > 0)
+        return S_FALSE;
+
+    return S_OK;
+}
+
+//-----------------------------------------------------------------------------
+BOOL WINAPI DllMain( HINSTANCE hInst, ULONG /*ul_reason_for_call*/, LPVOID /*lpReserved*/ )
+{
+    OutputDebugStringFormat( "DllMain.\n" );
+    g_hModule = hInst;
+    return TRUE;
+}
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index 2e8bdc5e3a..7d4c429e2c 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document_statistic.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/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 6ef3bfbd67..a25883ac4d 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: document_statistic.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/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 4d4396f06b..5d2235ca71 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: listviewbuilder.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/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
index 15b629cba6..17e131bf7e 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: listviewbuilder.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/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index ac12795cf3..fd83f33b99 100644
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -63,4 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
 .INCLUDE :	tg_wntx64.mk
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 7172fa8348..b81461fcf9 100644..100755
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propsheets.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,6 +48,7 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <strsafe.h>
 
 
 /*---------------------------------------------
@@ -70,6 +68,7 @@
 CPropertySheet::CPropertySheet(long RefCnt) : 
     m_RefCnt(RefCnt)
 {
+    OutputDebugStringFormat("CPropertySheet::CTor [%d], [%d]", m_RefCnt, g_DllRefCnt );
     InterlockedIncrement(&g_DllRefCnt);
 }
 
@@ -79,6 +78,7 @@ CPropertySheet::CPropertySheet(long RefCnt) :
 
 CPropertySheet::~CPropertySheet()
 {	
+    OutputDebugStringFormat("CPropertySheet::DTor [%d], [%d]", m_RefCnt, g_DllRefCnt );
     InterlockedDecrement(&g_DllRefCnt);
 }
 
@@ -116,6 +116,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface(
   
 ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void)
 {
+    OutputDebugStringFormat("CPropertySheet::AddRef [%d]", m_RefCnt );
     return InterlockedIncrement(&m_RefCnt);
 }
 
@@ -125,6 +126,7 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void)
         
 ULONG STDMETHODCALLTYPE CPropertySheet::Release(void)
 {
+    OutputDebugStringFormat("CPropertySheet::Release [%d]", m_RefCnt );
     long refcnt = InterlockedDecrement(&m_RefCnt);
 
     if (0 == refcnt)
@@ -177,41 +179,51 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
 {
-    PROPSHEETPAGE psp;
+    // Get OS version (we don't need the summary page on Windows Vista or later)
+    OSVERSIONINFO sInfoOS;
 
-    // add the summary property page
+    ZeroMemory( &sInfoOS, sizeof(OSVERSIONINFO) );
+    sInfoOS.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
+    GetVersionEx( &sInfoOS );
+    bool bIsVistaOrLater = (sInfoOS.dwMajorVersion >= 6);
 
-    ZeroMemory(&psp, sizeof(PROPSHEETPAGEA));
+    std::wstring proppage_header;
 
-    std::wstring proppage_header = GetResString(IDS_PROPPAGE_SUMMARY_TITLE);
+    PROPSHEETPAGE psp;
+    ZeroMemory(&psp, sizeof(PROPSHEETPAGEA));
 
+    // add the summary property page
     psp.dwSize      = sizeof(PROPSHEETPAGE);
     psp.dwFlags     = PSP_DEFAULT | PSP_USETITLE | PSP_USECALLBACK;
     psp.hInstance   = GetModuleHandle(MODULE_NAME);
-    psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGE_SUMMARY);
-    psp.pszTitle    = proppage_header.c_str();
-    psp.pfnDlgProc  = reinterpret_cast<DLGPROC>(CPropertySheet::PropPageSummaryProc);	
     psp.lParam      = reinterpret_cast<LPARAM>(this);
     psp.pfnCallback = reinterpret_cast<LPFNPSPCALLBACK>(CPropertySheet::PropPageSummaryCallback);
 
-    HPROPSHEETPAGE hPage = CreatePropertySheetPage(&psp);
-
-    // keep this instance alive
-    // will be released when the
-    // the page is about to be 
-    // destroyed in the callback
-    // function
+    HPROPSHEETPAGE hPage = NULL;
 
-    if (hPage)		
+    if ( !bIsVistaOrLater )
     {
-        if (lpfnAddPage(hPage, lParam))	
-            AddRef();
-        else
-            DestroyPropertySheetPage(hPage);
+        proppage_header = GetResString(IDS_PROPPAGE_SUMMARY_TITLE);
+
+        psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGE_SUMMARY);
+        psp.pszTitle    = proppage_header.c_str();
+        psp.pfnDlgProc  = reinterpret_cast<DLGPROC>(CPropertySheet::PropPageSummaryProc);	
+
+        hPage = CreatePropertySheetPage(&psp);
+
+        // keep this instance alive, will be released when the
+        // the page is about to be destroyed in the callback function
+
+        if (hPage)
+        {
+            if (lpfnAddPage(hPage, lParam))
+                AddRef();
+            else
+                DestroyPropertySheetPage(hPage);
+        }
     }
-    
-    // add the statistics property page
 
+    // add the statistics property page
     proppage_header = GetResString(IDS_PROPPAGE_STATISTICS_TITLE);
 
     psp.pszTemplate = MAKEINTRESOURCE(IDD_PROPPAGE_STATISTICS);
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index 8f8c776383..ec05290151 100644
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 95d7f59d02..ced354e099 100644..100755
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shlxthdl.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -397,7 +394,16 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
 
     if ((riid != IID_IUnknown) && (riid != IID_IClassFactory))
         return E_NOINTERFACE;
-    
+
+    if ( rclsid == CLSID_INFOTIP_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_INFOTIP_HANDLER\n" );
+    else if ( rclsid == CLSID_COLUMN_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_COLUMN_HANDLER\n" );
+    else if ( rclsid == CLSID_PROPERTYSHEET_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_PROPERTYSHEET_HANDLER\n" );
+    else if ( rclsid == CLSID_THUMBVIEWER_HANDLER )
+        OutputDebugStringFormat( "DllGetClassObject: Create CLSID_THUMBVIEWER_HANDLER\n" );
+
     IUnknown* pUnk = new CClassFactory(rclsid);
     if (0 == pUnk)
         return E_OUTOFMEMORY;
diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
index a7b0b40032..1b7dd10302 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
+++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -60,5 +56,7 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE 
 .INCLUDE :	tg_wntx64.mk
 
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 0c77dc22f3..23831d07be 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: thumbviewer.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/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
index ca76e8b8c3..8760d72066 100644
--- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx
+++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbgmacros.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/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index bd6a118b3f..dd89a32853 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fileextensions.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/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index e9fa5d3cf9..e4007af18b 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_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: iso8601_converter.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -149,7 +146,7 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat
         hours = buff;
     }
        
-#if defined(_MSC_VER) && defined(_M_X64)        
+#if defined(_MSC_VER) //&& defined(_M_X64)        
     std::wostringstream oss;
     oss << std::setw(2) << std::setfill(wchar_t('0')) << hours   << L":" <<
            std::setw(2) << std::setfill(wchar_t('0')) << minutes << L":" << 
@@ -172,12 +169,14 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat
 
     return result;
 #undef ADD_AS_PREFILLED
+/*
 #else
     std::wostringstream oss;
     oss << std::setw(2) << std::setfill('0') << hours   << L":" <<
            std::setw(2) << std::setfill('0') << minutes << L":" << 
            std::setw(2) << std::setfill('0') << seconds;
     return oss.str();
+*/
 #endif    
 }
 
diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk
index c0bec9c36d..8ccf50602f 100644
--- a/shell/source/win32/shlxthandler/util/makefile.mk
+++ b/shell/source/win32/shlxthandler/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,5 +62,7 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\
 
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+INCLUDE!:=$(subst,/stl, $(INCLUDE))
+.EXPORT : INCLUDE
 .INCLUDE :	tg_wntx64.mk
 
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index f7ade4614f..a49175e925 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: registry.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/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index eaffd4f023..55353e20f9 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: utilities.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/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk
index 70e25f76fe..84a209e4c0 100644
--- a/shell/source/win32/simplemail/makefile.mk
+++ b/shell/source/win32/simplemail/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx
index 303cb1fb5f..42f5b9e244 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: senddoc.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/shell/source/win32/simplemail/simplemapi.cxx b/shell/source/win32/simplemail/simplemapi.cxx
index c0f4a6bdb9..be5642d077 100644
--- a/shell/source/win32/simplemail/simplemapi.cxx
+++ b/shell/source/win32/simplemail/simplemapi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simplemapi.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/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx
index c79e53162f..f1224fca21 100644
--- a/shell/source/win32/simplemail/simplemapi.hxx
+++ b/shell/source/win32/simplemail/simplemapi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simplemapi.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/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index ffdc8d4f5d..7da7f1c9a9 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailclient.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/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index 9eae02ae18..9ceaa07a81 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailclient.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/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index aa8b537d91..fd66e40a5f 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailentry.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/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index 4f95443ab4..873589abe5 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailmsg.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/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index d2d200f9cc..13b1d5400b 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailmsg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index b81c91e438..6939572e06 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailsuppl.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/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 6224ca0c7a..6432db2c91 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smplmailsuppl.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/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index 0e1f16d81b..991fa99662 100644
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TestProxySet.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/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 82b06c99f9..ce2da0528b 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TestSmplMail.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/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 179766e9f9..f8857dbd3b 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TestSysShExec.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/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk
index 2a48f63222..9d9c7945b9 100644
--- a/shell/source/win32/workbench/makefile.mk
+++ b/shell/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/AccessibleStaticTextBase.hxx b/svx/inc/AccessibleStaticTextBase.hxx
deleted file mode 100644
index 2a9fdab114..0000000000
--- a/svx/inc/AccessibleStaticTextBase.hxx
+++ /dev/null
@@ -1,562 +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: AccessibleStaticTextBase.hxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
-#define _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
-
-#include <memory>
-#include <tools/gen.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
-#include "svx/svxdllapi.h"
-
-
-class SvxEditSource;
-class SvxEditViewForwarder;
-
-namespace accessibility
-{
-
-    class AccessibleStaticTextBase_Impl;
-
-    typedef ::cppu::ImplHelper2<
-        ::com::sun::star::accessibility::XAccessibleText,
-        ::com::sun::star::accessibility::XAccessibleTextAttributes > AccessibleStaticTextBase_BASE;
-
-    /** Helper class for objects containing EditEngine/Outliner text
-
-        This class implements the XAccessibleText interface for static
-        text, somewhat similar to the children of the
-        AccessibleTextHelper class. Currently, there are no children,
-        i.e. the whole text is presented in one big chunk. This might
-        change in the future, if a need for image bullets should
-        arise. These, by convention, would be represented as children
-        of the text.
-
-        You have to implement the SvxEditSource, SvxTextForwarder,
-        SvxViewForwarder and SvxEditViewForwarder interfaces in order
-        to enable your object to cooperate with this
-        class. SvxTextForwarder encapsulates the fact that text
-        objects do not necessarily have an EditEngine at their
-        disposal, SvxViewForwarder and SvxEditViewForwarder do the
-        same for the document and the edit view. The three mentioned
-        forwarder objects are not stored by the AccessibleTextHelper,
-        but fetched every time from the SvxEditSource. So you are best
-        off making your SvxEditSource::Get*Forwarder methods cache the
-        current forwarder.
-
-        As this class is intended for static (i.e. non-changing) text
-        only, no event broadcasting is necessary. You must handle
-        visibility by yourself, the bounding boxes returned by
-        getCharacterBounds() are relative to your accessibility
-        object.
-
-        @attention All public non-UNO methods (those are the uppercase
-        ones) must not be called with any mutex hold, except when
-        calling from the main thread (with holds the solar mutex),
-        unless stated otherwise. This is because they themselves might
-        need the solar mutex in addition to the object mutex, and the
-        ordering of the locking must be: first solar mutex, then
-        object mutex. Furthermore, state change events might be fired
-        internally.
-
-        @derive Use this class as a base for objects containing static
-        edit engine text. To avoid overwriting every interface method
-        to intercept derived object defunc state, just set NULL as the
-        edit source. Every interface method will then properly throw
-        an exception.
-    */
-    class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
-    {
-
-    public:
-        /** Create accessible text object for given edit source
-
-            @param pEditSource
-            The edit source to use. Object ownership is transferred
-            from the caller to the callee. The object listens on the
-            SvxEditSource for object disposal, so no provisions have
-            to be taken if the caller destroys the data (e.g. the
-            model) contained in the given SvxEditSource.
-
-        */
-        explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource );
-        virtual ~AccessibleStaticTextBase();
-
-    private:
-
-        // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
-        // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
-
-    public:
-        /** Query the current edit source
-
-            @attention This method returns by reference, so you are
-            responsible for serialization (typically, you aquired the
-            solar mutex when calling this method). Thus, the method
-            should only be called from the main office thread.
-
-        */
-        virtual const SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Set the current edit source
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            The EditSource set here is required to broadcast out the
-            following hints: EDITSOURCE_HINT_PARASMOVED,
-            EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED,
-            TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED,
-            TEXT_HINT_TEXTHEIGHTCHANGED,
-            TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes
-            will get noticed by the accessibility object. Further
-            more, when the corresponding core object or the model is
-            dying, either the edit source must be set to NULL or it
-            has to broadcast a SFX_HINT_DYING hint.
-
-            This class does not have a dispose method, since it is not
-            a UNO component. Nevertheless, it holds C++ references to
-            several core objects, so you should issue a
-            SetEditSource(::std::auto_ptr<SvxEditSource>(NULL)) in
-            your dispose() method.
-
-            @param pEditSource
-            The new edit source to set. Object ownership is transferred
-            from the caller to the callee.
-        */
-        virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Set the event source
-
-            @attention When setting a reference here, you should call
-            Dispose() when you as the owner are disposing, since until
-            then this object will hold that reference
-
-            @param rInterface
-            The interface that should be set as the source for
-            accessibility events sent by this object.
-         */
-        virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface );
-
-        /** Get the event source
-
-            @return the interface that is set as the source for
-            accessibility events sent by this object.
-         */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const;
-
-        /** Set offset of EditEngine from parent
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            If the origin of the underlying EditEngine does
-            not correspond to the upper left corner of the object
-            using this class, you have to specify the offset.
-
-            @param rPoint
-            The offset in screen coordinates (i.e. pixel)
-        */
-        virtual void SetOffset( const Point& rPoint );
-
-        /** Query offset of EditEngine from parent
-
-            @return the offset in screen coordinates (i.e. pixel)
-        */
-        virtual Point GetOffset() const;
-
-        /** Update the visible children
-
-            As this class currently does not represent any content
-            using children, this does nothing at the moment.
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            This method reevaluates the visibility of all
-            childrens. Call this method if your visibility state has
-            changed somehow, e.g. if the visible area has changed and
-            the AccessibleStaticTextHelper isn't notified
-            internally. Normally, there should not be a need to call
-            this method.
-        */
-        virtual void UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Drop all references and enter disposed state
-
-            This method drops all references to external objects (also
-            the event source reference set via SetEventSource()) and
-            sets the object into the disposed state (i.e. the methods
-            return default values or throw a uno::DisposedException
-            exception).
-         */
-        virtual void Dispose();
-
-        // XAccessibleText interface implementation
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
-        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // XAccessibleTextAttributes
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // child-related methods from XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // child-related methods from XAccessibleComponent
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-
-    protected:
-        Rectangle GetParagraphBoundingBox() const;
-        sal_Int32 GetParagraphCount() const;
-        sal_Int32 GetParagraphIndex() const;
-        sal_Int32 GetLineCount( sal_Int32 nParagraph ) const;
-
-    private:
-
-        /// @dyn
-        const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
-
-    };
-
-} // end of namespace accessibility
-
-#endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: AccessibleStaticTextBase.hxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
-#define _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_
-
-#include <memory>
-#include <tools/gen.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
-#include "svx/svxdllapi.h"
-
-
-class SvxEditSource;
-
-namespace accessibility
-{
-
-    class AccessibleStaticTextBase_Impl;
-
-    typedef ::cppu::ImplHelper2<
-        ::com::sun::star::accessibility::XAccessibleText,
-        ::com::sun::star::accessibility::XAccessibleTextAttributes > AccessibleStaticTextBase_BASE;
-
-    /** Helper class for objects containing EditEngine/Outliner text
-
-        This class implements the XAccessibleText interface for static
-        text, somewhat similar to the children of the
-        AccessibleTextHelper class. Currently, there are no children,
-        i.e. the whole text is presented in one big chunk. This might
-        change in the future, if a need for image bullets should
-        arise. These, by convention, would be represented as children
-        of the text.
-
-        You have to implement the SvxEditSource, SvxTextForwarder,
-        SvxViewForwarder and SvxEditViewForwarder interfaces in order
-        to enable your object to cooperate with this
-        class. SvxTextForwarder encapsulates the fact that text
-        objects do not necessarily have an EditEngine at their
-        disposal, SvxViewForwarder and SvxEditViewForwarder do the
-        same for the document and the edit view. The three mentioned
-        forwarder objects are not stored by the AccessibleTextHelper,
-        but fetched every time from the SvxEditSource. So you are best
-        off making your SvxEditSource::Get*Forwarder methods cache the
-        current forwarder.
-
-        As this class is intended for static (i.e. non-changing) text
-        only, no event broadcasting is necessary. You must handle
-        visibility by yourself, the bounding boxes returned by
-        getCharacterBounds() are relative to your accessibility
-        object.
-
-        @attention All public non-UNO methods (those are the uppercase
-        ones) must not be called with any mutex hold, except when
-        calling from the main thread (with holds the solar mutex),
-        unless stated otherwise. This is because they themselves might
-        need the solar mutex in addition to the object mutex, and the
-        ordering of the locking must be: first solar mutex, then
-        object mutex. Furthermore, state change events might be fired
-        internally.
-
-        @derive Use this class as a base for objects containing static
-        edit engine text. To avoid overwriting every interface method
-        to intercept derived object defunc state, just set NULL as the
-        edit source. Every interface method will then properly throw
-        an exception.
-    */
-    class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
-    {
-
-    public:
-        /** Create accessible text object for given edit source
-
-            @param pEditSource
-            The edit source to use. Object ownership is transferred
-            from the caller to the callee. The object listens on the
-            SvxEditSource for object disposal, so no provisions have
-            to be taken if the caller destroys the data (e.g. the
-            model) contained in the given SvxEditSource.
-
-        */
-        explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource );
-        virtual ~AccessibleStaticTextBase();
-
-    private:
-
-        // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
-        // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
-
-    public:
-        /** Query the current edit source
-
-            @attention This method returns by reference, so you are
-            responsible for serialization (typically, you aquired the
-            solar mutex when calling this method). Thus, the method
-            should only be called from the main office thread.
-
-        */
-        virtual const SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Set the current edit source
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            The EditSource set here is required to broadcast out the
-            following hints: EDITSOURCE_HINT_PARASMOVED,
-            EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED,
-            TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED,
-            TEXT_HINT_TEXTHEIGHTCHANGED,
-            TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes
-            will get noticed by the accessibility object. Further
-            more, when the corresponding core object or the model is
-            dying, either the edit source must be set to NULL or it
-            has to broadcast a SFX_HINT_DYING hint.
-
-            This class does not have a dispose method, since it is not
-            a UNO component. Nevertheless, it holds C++ references to
-            several core objects, so you should issue a
-            SetEditSource(::std::auto_ptr<SvxEditSource>(NULL)) in
-            your dispose() method.
-
-            @param pEditSource
-            The new edit source to set. Object ownership is transferred
-            from the caller to the callee.
-        */
-        virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Set the event source
-
-            @attention When setting a reference here, you should call
-            Dispose() when you as the owner are disposing, since until
-            then this object will hold that reference
-
-            @param rInterface
-            The interface that should be set as the source for
-            accessibility events sent by this object.
-         */
-        virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface );
-
-        /** Get the event source
-
-            @return the interface that is set as the source for
-            accessibility events sent by this object.
-         */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const;
-
-        /** Set offset of EditEngine from parent
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            If the origin of the underlying EditEngine does
-            not correspond to the upper left corner of the object
-            using this class, you have to specify the offset.
-
-            @param rPoint
-            The offset in screen coordinates (i.e. pixel)
-        */
-        virtual void SetOffset( const Point& rPoint );
-
-        /** Query offset of EditEngine from parent
-
-            @return the offset in screen coordinates (i.e. pixel)
-        */
-        virtual Point GetOffset() const;
-
-        /** Update the visible children
-
-            As this class currently does not represent any content
-            using children, this does nothing at the moment.
-
-            @attention You are required to have the solar mutex
-            locked, when calling this method. Thus, the method should
-            only be called from the main office thread.
-
-            This method reevaluates the visibility of all
-            childrens. Call this method if your visibility state has
-            changed somehow, e.g. if the visible area has changed and
-            the AccessibleStaticTextHelper isn't notified
-            internally. Normally, there should not be a need to call
-            this method.
-        */
-        virtual void UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException));
-
-        /** Drop all references and enter disposed state
-
-            This method drops all references to external objects (also
-            the event source reference set via SetEventSource()) and
-            sets the object into the disposed state (i.e. the methods
-            return default values or throw a uno::DisposedException
-            exception).
-         */
-        virtual void Dispose();
-
-        // XAccessibleText interface implementation
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
-        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // XAccessibleTextAttributes
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // child-related methods from XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-        // child-related methods from XAccessibleComponent
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
-
-    protected:
-        Rectangle GetParagraphBoundingBox() const;
-
-    private:
-
-        /// @dyn
-        const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl;
-
-    };
-
-} // end of namespace accessibility
-
-#endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */
diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/ActionDescriptionProvider.hxx
index 68f48ca1b2..70f466b6eb 100644
--- a/svx/inc/ActionDescriptionProvider.hxx
+++ b/svx/inc/ActionDescriptionProvider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ActionDescriptionProvider.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/DescriptionGenerator.hxx
index 7aacb234b5..1ab616b7a6 100644
--- a/svx/inc/DescriptionGenerator.hxx
+++ b/svx/inc/DescriptionGenerator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DescriptionGenerator.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/ParseContext.hxx b/svx/inc/ParseContext.hxx
index 947bfbf706..fc589e3586 100644
--- a/svx/inc/ParseContext.hxx
+++ b/svx/inc/ParseContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ParseContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/UnoNamespaceMap.hxx
index b0660be5da..05a92f7c06 100644
--- a/svx/inc/UnoNamespaceMap.hxx
+++ b/svx/inc/UnoNamespaceMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoNamespaceMap.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/XPropertyTable.hxx
index d1dedc0918..13d870991c 100644
--- a/svx/inc/XPropertyTable.hxx
+++ b/svx/inc/XPropertyTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPropertyTable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
index 8909545e61..372bddd215 100644
--- a/svx/inc/accessibility.hrc
+++ b/svx/inc/accessibility.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: accessibility.hrc,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,10 +75,8 @@
 #define RID_SVXSTR_GRAPHCTRL_ACC_NAME			(RID_SVXSTR_GRAPHCTRL_ACC_START + 0)
 #define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION	(RID_SVXSTR_GRAPHCTRL_ACC_START + 1)
 
-// text paragraphs and bullets
+// text paragraphs
 #define RID_SVXSTR_A11Y_TEXTHELPER_START		(RID_SVXSTR_ACCESSIBILITY_START + 70)
-#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION	(RID_SVXSTR_A11Y_TEXTHELPER_START + 2)
-#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME		(RID_SVXSTR_A11Y_TEXTHELPER_START + 3)
 
 // SvxShowCharSetAcc
 #define RID_SVXSTR_CHARACTER_SELECTION			(RID_SVXSTR_ACCESSIBILITY_START + 80)
diff --git a/svx/inc/anchorid.hxx b/svx/inc/anchorid.hxx
index d518a7b2da..a7c814b8f4 100644
--- a/svx/inc/anchorid.hxx
+++ b/svx/inc/anchorid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: anchorid.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/asiancfg.hxx b/svx/inc/asiancfg.hxx
deleted file mode 100644
index b9cc3abd31..0000000000
--- a/svx/inc/asiancfg.hxx
+++ /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: asiancfg.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 _SVX_ASIANCFG_HXX
-#define _SVX_ASIANCFG_HXX
-
-#include <unotools/configitem.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include "svx/svxdllapi.h"
-
-namespace com{namespace sun{namespace star{
-namespace lang{
-    struct Locale;
-}}}}
-//-----------------------------------------------------------------------------
-struct SvxAsianConfig_Impl;
-class SVX_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/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx
index 6a53f92fde..129e7e747f 100644
--- a/svx/inc/chrtitem.hxx
+++ b/svx/inc/chrtitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chrtitem.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx
index 40563867d6..4ad3933603 100644
--- a/svx/inc/clipboardctl.hxx
+++ b/svx/inc/clipboardctl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: clipboardctl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx
index 8c9f7a60d4..a55b929610 100644
--- a/svx/inc/clipfmtitem.hxx
+++ b/svx/inc/clipfmtitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: clipfmtitem.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/connctrl.hxx b/svx/inc/connctrl.hxx
index 0b3de2fb1a..6ba07e23ae 100644
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/connctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: connctrl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/databaseregistrationui.hxx
index a28c0d6aa4..736dee6e72 100644
--- a/svx/inc/databaseregistrationui.hxx
+++ b/svx/inc/databaseregistrationui.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: databaseregistrationui.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/dbexch.hrc b/svx/inc/dbexch.hrc
index f0b138b670..1909ece6de 100644
--- a/svx/inc/dbexch.hrc
+++ b/svx/inc/dbexch.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: dbexch.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx
index 9faa5e69f9..2965587f2e 100644
--- a/svx/inc/dgdefs_.hxx
+++ b/svx/inc/dgdefs_.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dgdefs_.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/dialcontrol.hxx
index 233ad1a851..23da0627fc 100644
--- a/svx/inc/dialcontrol.hxx
+++ b/svx/inc/dialcontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialcontrol.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx
index 8fd31234f5..f5b3532603 100644
--- a/svx/inc/dialdll.hxx
+++ b/svx/inc/dialdll.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialdll.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx
index 380464c06e..861203c2bd 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/dlgutil.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -31,100 +28,17 @@
 #define _SVX_DLGUTIL_HXX
 
 // include ---------------------------------------------------------------
-#ifndef _FIELD_HXX
-#include <vcl/field.hxx>
-#endif
-#include <svl/poolitem.hxx>
-#include <svl/intitem.hxx>
-#include "svx/svxdllapi.h"
+#include <svtools/unitconv.hxx>
+#include <svx/svxdllapi.h>
 
 // macro -----------------------------------------------------------------
 
 // typedef ---------------------------------------------------------------
 
-typedef long (*FUNC_CONVERT)(long);
-
 // Functions -------------------------------------------------------------
+class SfxItemSet;
 
-// HM- und LanguageStrings aus der Resource laden
-SVX_DLLPUBLIC String 	GetLanguageString( LanguageType eType );
-SVX_DLLPUBLIC String 	GetDicInfoStr( const String& rName, const USHORT nLang,
-                       const BOOL bNeg );
-
-// FieldUnit im MetricField oder -Box umsetzen
-SVX_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl,
-                   FieldUnit eUnit, BOOL bAll = FALSE );
-SVX_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl,
-                   FieldUnit eUnit, BOOL bAll = FALSE );
-
-SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet* pSet = NULL );
-
-// Metriken umrechnen
-SVX_DLLPUBLIC long 		CalcToUnit( float nIn, SfxMapUnit eUnit );
-SVX_DLLPUBLIC long 		CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
-
-SVX_DLLPUBLIC long		ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
-long		ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem );
-
-SVX_DLLPUBLIC FieldUnit	MapToFieldUnit( const SfxMapUnit eUnit );
-MapUnit		FieldToMapUnit( const SfxFieldUnit eUnit );
-
-long		ConvertValueToMap( long nVal, SfxMapUnit eUnit );
-long		ConvertValueToUnit( long nVal, SfxMapUnit eUnit );
-
-SVX_DLLPUBLIC void 		SetMetricValue( MetricField& rField,
-                            long lCoreValue, SfxMapUnit eUnit );
-SVX_DLLPUBLIC long 		GetCoreValue( const MetricField& rField, SfxMapUnit eUnit );
-
-// to Twips
-long 	CMToTwips( long nIn );
-long 	MMToTwips( long nIn );
-long 	InchToTwips( long nIn );
-SVX_DLLPUBLIC long 	PointToTwips( long nIn );
-long 	PicaToTwips( long nIn );
-
-// to CM
-long 	TwipsToCM( long nIn );
-long 	InchToCM( long nIn );
-long 	MMToCM( long nIn );
-long 	PointToCM( long nIn );
-long	PicaToCM( long nIn );
-
-// to MM
-long 	TwipsToMM( long nIn );
-long 	CMToMM( long nIn );
-long 	InchToMM( long nIn );
-long 	PointToMM( long nIn );
-long 	PicaToMM( long nIn );
-
-// to Inch
-long 	TwipsToInch(long nIn );
-long 	CMToInch(long nIn );
-long 	MMToInch(long nIn );
-long 	PointToInch(long nIn );
-long	PicaToInch(long nIn );
-
-// to Point
-long 	TwipsToPoint(long nIn );
-long 	InchToPoint(long nIn );
-long 	CMToPoint(long nIn );
-long 	MMToPoint(long nIn );
-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 );
-
-// generische Wandlung
-long 	TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
-
-// replacement of the SfxIniManager
-String		ConvertPosSizeToIniString( const Point& rPos, const Size& rSize );
-sal_Bool	ConvertIniStringToPosSize(	const String& rIniStr, Point& rPos, Size& rSize );
-
+SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& );
 
 #define OUTPUT_DRAWMODE_COLOR		(DRAWMODE_DEFAULT)
 #define OUTPUT_DRAWMODE_CONTRAST	(DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT)
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index c8378deae7..a8ad139bae 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragmt3d.hxx,v $
- * $Revision: 1.8.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx
index f0fd60cc7f..2a816bc13c 100644
--- a/svx/inc/drawitem.hxx
+++ b/svx/inc/drawitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawitem.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx
index df00ceb15f..1f6c84efb0 100644
--- a/svx/inc/drawuiks.hxx
+++ b/svx/inc/drawuiks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawuiks.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx
index 54d9fef468..613cd94e5d 100644
--- a/svx/inc/extrusioncontrols.hxx
+++ b/svx/inc/extrusioncontrols.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extrusioncontrols.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/svx/inc/flagsdef.hxx b/svx/inc/flagsdef.hxx
index f0fa65f193..b56d69fd02 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/flagsdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: flagsdef.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index f041f7e4f7..aa1c142d79 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.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: float3d.hrc,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/fmgridif.hxx b/svx/inc/fmgridif.hxx
index d9a7ad66ee..31f391399a 100644
--- a/svx/inc/fmgridif.hxx
+++ b/svx/inc/fmgridif.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmgridif.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/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 6c07ffd5da..6745d7047e 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.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: fmhelp.hrc,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/fmobjfac.hxx
index 1134fc1e03..7e59fa175b 100644
--- a/svx/inc/fmobjfac.hxx
+++ b/svx/inc/fmobjfac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmobjfac.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/fontlb.hxx b/svx/inc/fontlb.hxx
index 2b12b98039..e8bcd3777c 100644
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/fontlb.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontlb.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index 0d9337a1fa..13912923c1 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.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: fontworkgallery.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/svx/inc/fontworkgallery.hxx b/svx/inc/fontworkgallery.hxx
index 77de26d548..85ac4d523c 100644
--- a/svx/inc/fontworkgallery.hxx
+++ b/svx/inc/fontworkgallery.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontworkgallery.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/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/formatpaintbrushctrl.hxx
index 9e4bbb4bd5..81e7031a37 100644
--- a/svx/inc/formatpaintbrushctrl.hxx
+++ b/svx/inc/formatpaintbrushctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formatpaintbrushctrl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/galbrws.hxx b/svx/inc/galbrws.hxx
index 6e4da56fe1..01ba5ce90b 100644
--- a/svx/inc/galbrws.hxx
+++ b/svx/inc/galbrws.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galbrws.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/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index b86057e353..2549f2e8e7 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galbrws2.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx
index 79eab3f4a1..a5a74d5881 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/galctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galctrl.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 #include <svtools/transfer.hxx> 
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include "svx/galmisc.hxx"
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 31efc2ca6e..a22cce8e3a 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.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: gallery.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/svx/inc/gallery.hxx b/svx/inc/gallery.hxx
index c362b8ff92..2f42bc32fe 100644
--- a/svx/inc/gallery.hxx
+++ b/svx/inc/gallery.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gallery.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/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 6eb1e79b2c..3dd7994848 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galobj.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 7e1d8e03db..63866a8e0f 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.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: galtheme.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/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 4f8fd1cee2..6a51190ce6 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galtheme.hxx,v $
- * $Revision: 1.11.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/globl3d.hxx b/svx/inc/globl3d.hxx
index b914ab65d1..0d965bdd2a 100644
--- a/svx/inc/globl3d.hxx
+++ b/svx/inc/globl3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globl3d.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc
index 51167b054d..b51334d0f8 100644
--- a/svx/inc/globlac.hrc
+++ b/svx/inc/globlac.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: globlac.hrc,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 128c5c5ded..41d0d42bdf 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: globlmn_tmpl.hrc,v $
- * $Revision: 1.11.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx
index 82d1c31a4a..97d8de5782 100644
--- a/svx/inc/grafctrl.hxx
+++ b/svx/inc/grafctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grafctrl.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 3e9fbfb64b..a183735b6c 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/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.78 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,8 +34,6 @@
 
 // Help-Ids --------------------------------------------------------------
 #define HID_ALIGN_TBX                                               (HID_SVX_START +   1)
-#define HID_AUTOCORR_HELP_END                                       (HID_SVX_START +   2)
-#define HID_AUTOCORR_HELP_START                                     (HID_SVX_START +   3)
 #define HID_BMPMASK_CTL_PIPETTE                                     (HID_SVX_START +   4)
 #define HID_BMPMASK_CTL_QCOL_1                                      (HID_SVX_START +   5)
 #define HID_BMPMASK_TBI_PIPETTE                                     (HID_SVX_START +   6)
@@ -122,7 +117,7 @@
 #define HID_GRFFILTER_SMOOTH                                        (HID_SVX_START +  84)
 #define HID_GRFFILTER_SOBEL                                         (HID_SVX_START +  85)
 #define HID_GRFFILTER_SOLARIZE                                      (HID_SVX_START +  86)
-#define HID_HYPHENATE                                               (HID_SVX_START +  87)
+
 #define HID_IMAPDLG_ACTIVE                                          (HID_SVX_START +  88)
 #define HID_IMAPDLG_APPLY                                           (HID_SVX_START +  89)
 #define HID_IMAPDLG_CIRCLE                                          (HID_SVX_START +  90)
@@ -226,7 +221,7 @@
 #define HID_SVX_TP_DOCRECOVERY_SAVE                                 (HID_SVX_START + 188)
 #define HID_SVX_TP_ERR_REP_SEND                                     (HID_SVX_START + 189)
 #define HID_SVX_TP_ERR_REP_WELCOME                                  (HID_SVX_START + 190)
-#define HID_THES_LANGUAGE                                           (HID_SVX_START + 191)
+
 #define HID_VALUESET_EXTRUSION_DIRECTION                            (HID_SVX_START + 192)
 #define HID_VALUESET_EXTRUSION_LIGHTING                             (HID_SVX_START + 193)
 #define HID_WIN_FONTWORK_ALIGN                                      (HID_SVX_START + 194)
diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx
index 30f90f7c7b..1beecda742 100644
--- a/svx/inc/hlnkitem.hxx
+++ b/svx/inc/hlnkitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hlnkitem.hxx,v $
- * $Revision: 1.6.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx
deleted file mode 100644
index 98b114085d..0000000000
--- a/svx/inc/htmlcfg.hxx
+++ /dev/null
@@ -1,104 +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: htmlcfg.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 _SVX_HTMLCFG_HXX
-#define _SVX_HTMLCFG_HXX
-
-// -----------------------------------------------------------------------
-
-#include <tools/solar.h>
-#include <unotools/configitem.hxx>
-#include "svx/svxdllapi.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
-
-struct HtmlOptions_Impl;
-// -----------------------------------------------------------------------
-
-class SVX_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem
-{
-    HtmlOptions_Impl*pImp;
-    const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
-
-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);
-};
-
-#endif
-
-
-
-
diff --git a/svx/inc/htmlmode.hxx b/svx/inc/htmlmode.hxx
index 56a376b6a9..41440388c6 100644
--- a/svx/inc/htmlmode.hxx
+++ b/svx/inc/htmlmode.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: htmlmode.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/hyperdlg.hxx
index 216ad929b6..457cb7c5e6 100644
--- a/svx/inc/hyperdlg.hxx
+++ b/svx/inc/hyperdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperdlg.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/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx
index 8ec9224d06..dc587513b8 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/imapdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imapdlg.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/svx/inc/insctrl.hxx b/svx/inc/insctrl.hxx
index 81bee6e2eb..c1e43e59fa 100644
--- a/svx/inc/insctrl.hxx
+++ b/svx/inc/insctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insctrl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/layctrl.hxx b/svx/inc/layctrl.hxx
index 629f5d7c47..26e3f1fc74 100644
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/layctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layctrl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/lboxctrl.hxx
index ebd82952c6..0a699a72aa 100644
--- a/svx/inc/lboxctrl.hxx
+++ b/svx/inc/lboxctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lboxctrl.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/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx
index 4f66c7df57..fe00bcf0e5 100644
--- a/svx/inc/lightdlg.hxx
+++ b/svx/inc/lightdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lightdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx
index bb13dfc0e4..3daef66ffd 100644
--- a/svx/inc/linectrl.hxx
+++ b/svx/inc/linectrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linectrl.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/linkmgr.hxx b/svx/inc/linkmgr.hxx
deleted file mode 100644
index 6568610acf..0000000000
--- a/svx/inc/linkmgr.hxx
+++ /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: linkmgr.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 _SVXLINKMGR_HXX
-#define _SVXLINKMGR_HXX
-
-
-#include <sfx2/linkmgr.hxx>
-#include "svx/svxdllapi.h"
-
-class Graphic;
-class Size;
-
-// Damit der Link ueber den Status der zu ladenen Grafik informierten werden
-// verschickt das FileObject ein SvData, mit der FormatId
-// "RegisterStatusInfoId" und ein einem String als Datentraeger. Dieser
-// enthaelt den folgenden enum.
-enum LinkState
-{
-    STATE_LOAD_OK,
-    STATE_LOAD_ERROR,
-    STATE_LOAD_ABORT
-};
-
-class SVX_DLLPUBLIC SvxLinkManager : public ::sfx2::SvLinkManager
-{
-    SvxLinkManager( const SvxLinkManager& );
-    SvxLinkManager& operator=( const SvxLinkManager& );
-
-public:
-    SvxLinkManager( SfxObjectShell * pCacheCont );
-
-    // den Link mit einem PseudoObject verbinden und in die Liste eintragen
-    BOOL InsertFileLink( sfx2::SvBaseLink&,
-                        USHORT nFileType,
-                        const String& rTxt,
-                        const String* pFilterNm = 0,
-                        const String* pRange = 0 );
-
-            // falls am Link schon alles eingestellt ist !
-    BOOL InsertFileLink( sfx2::SvBaseLink& );
-
-        // erfrage die Strings fuer den Dialog
-    virtual BOOL GetDisplayNames( const sfx2::SvBaseLink*,
-                                    String* pType,
-                                    String* pFile = 0,
-                                    String* pLink = 0,
-                                    String* pFilter = 0 ) const;
-
-    virtual sfx2::SvLinkSourceRef CreateObj( sfx2::SvBaseLink * );
-
-    // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
-    // (ist zur Zeit nur fuer die FileLinks interressant!)
-    void CancelTransfers();
-
-    // um Status Informationen aus dem FileObject an den BaseLink zu
-    // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
-    // dann die entsprechenden Informationen als String.
-    // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
-    // - das braucht Informationen ueber Load/Abort/Error
-    static ULONG  RegisterStatusInfoId();
-
-    // if the mimetype says graphic/bitmap/gdimetafile then get the
-    // graphic from the Any. Return says no errors
-    static BOOL GetGraphicFromAny( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue,
-                                Graphic& rGrf );
-
-};
-
-
-#endif
-
diff --git a/svx/inc/makefile.mk b/svx/inc/makefile.mk
index 357b21f5a8..37a079a68a 100644
--- a/svx/inc/makefile.mk
+++ b/svx/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/measctrl.hxx b/svx/inc/measctrl.hxx
index e665325b3b..00e061b08e 100644
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/measctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: measctrl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/modctrl.hxx b/svx/inc/modctrl.hxx
index e1f41a8af5..c03617ed55 100644
--- a/svx/inc/modctrl.hxx
+++ b/svx/inc/modctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modctrl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/numvset.hxx b/svx/inc/numvset.hxx
index 04b3fffae2..63915d0500 100644
--- a/svx/inc/numvset.hxx
+++ b/svx/inc/numvset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numvset.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/objfac3d.hxx b/svx/inc/objfac3d.hxx
index c4787c5a52..34dcb8b094 100644
--- a/svx/inc/objfac3d.hxx
+++ b/svx/inc/objfac3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objfac3d.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx
index a16e3316b0..668990b383 100644
--- a/svx/inc/ofaitem.hxx
+++ b/svx/inc/ofaitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ofaitem.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/optextbr.hrc b/svx/inc/optextbr.hrc
deleted file mode 100644
index f882328115..0000000000
--- a/svx/inc/optextbr.hrc
+++ /dev/null
@@ -1,59 +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: optextbr.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.
- *
- ************************************************************************/
-#ifndef _SVX_OPTEXTBR_HRC
-#define _SVX_OPTEXTBR_HRC
-
-// defines ---------------------------------------------------------------
-
-#define CB_EXTBRW_ON            10
-#define FT_EXTBRW_EXCEPTION     11
-#define ED_EXTBRW_EXCEPTION     12
-#define LB_EXTBRW_EXCEPTION     13
-#define PB_EXTBRW_ADD           14
-#define PB_EXTBRW_DELETE        15
-#define PB_EXTBRW_IEOPTIONS		16
-#define CB_EXTBRW_NOHINT		17
-#define ED_EXTBRW_FILE			18
-#define PB_EXTBRW_FILE			19
-#define CB_EXTBRW_FILE			20
-
-#define STR_EXTBRW_FILE			30
-
-#define IMG_EXTBRW_WARNING		10
-#define FT_EXTBRW_WARNING		11
-#define CB_EXTBRW_DISABLE		12
-#define GB_EXTBRW_WARNING		13
-#define BTN_EXTBRW_YES			14
-#define BTN_EXTBRW_NO			15
-
-#endif // #ifndef _SVX_OPTEXTBR_HRC
-
-// ******************************************************************* EOF
-
diff --git a/svx/inc/optgenrl.hxx b/svx/inc/optgenrl.hxx
index 368448e32c..c3afa9c847 100644
--- a/svx/inc/optgenrl.hxx
+++ b/svx/inc/optgenrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optgenrl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx
index fb17b4b5c8..9fbd0098e9 100644
--- a/svx/inc/optgrid.hxx
+++ b/svx/inc/optgrid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optgrid.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/svx/inc/orienthelper.hxx b/svx/inc/orienthelper.hxx
index 3bbbaac77e..1ffb1bb855 100644
--- a/svx/inc/orienthelper.hxx
+++ b/svx/inc/orienthelper.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orienthelper.hxx,v $
- * $Revision: 1.5.274.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/passwd.hxx b/svx/inc/passwd.hxx
index e4fcb33bb8..617c89014d 100644
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/passwd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passwd.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx
index 1bc25aad15..52e0e91754 100644
--- a/svx/inc/pch/precompiled_svx.cxx
+++ b/svx/inc/pch/precompiled_svx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_svx.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index c83e875cd6..8dda799ab3 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_svx.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -740,7 +737,7 @@
 #include "sfx2/sfxstatuslistener.hxx"
 #include "sfx2/sfxuno.hxx"
 #include "sfx2/shell.hxx"
-#include "sfx2/srchdefs.hxx"
+#include "svl/srchdefs.hxx"
 #include "sfx2/tplpitem.hxx"
 #include "sfx2/viewfrm.hxx"
 #include "sot/clsids.hxx"
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx
index 68bc87c49a..c604769d61 100644
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/pfiledlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pfiledlg.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx
index 0b1cf0c12f..466baf121b 100644
--- a/svx/inc/postattr.hxx
+++ b/svx/inc/postattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postattr.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/prtqry.hxx b/svx/inc/prtqry.hxx
index 69f5d1a61e..e3d7867a23 100644
--- a/svx/inc/prtqry.hxx
+++ b/svx/inc/prtqry.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prtqry.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/pszctrl.hxx b/svx/inc/pszctrl.hxx
index 08cecbb7b1..a0f3fa725f 100644
--- a/svx/inc/pszctrl.hxx
+++ b/svx/inc/pszctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pszctrl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,6 +43,7 @@ class SVX_DLLPUBLIC SvxPosSizeStatusBarControl : public SfxStatusBarControl
 {
 private:
     SvxPosSizeStatusBarControl_Impl*	pImp;
+    SVX_DLLPRIVATE String		GetMetricStr_Impl( long nVal );
 public:
     SFX_DECL_STATUSBAR_CONTROL();
 
diff --git a/svx/inc/relfld.hxx b/svx/inc/relfld.hxx
index 08c2b1a3b3..15863f498e 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/relfld.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: relfld.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx
index 1fc02c558d..6b281d3e80 100644
--- a/svx/inc/rotmodit.hxx
+++ b/svx/inc/rotmodit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rotmodit.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/rubydialog.hxx
index a36c82189d..51f83c79ac 100644
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/rubydialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rubydialog.hxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx
index b9186a61db..7a3d42eebf 100644
--- a/svx/inc/rulritem.hxx
+++ b/svx/inc/rulritem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rulritem.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/svx/inc/sdrpaintwindow.hxx b/svx/inc/sdrpaintwindow.hxx
index 175b1eba25..5b2224dfa8 100644
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/sdrpaintwindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrpaintwindow.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/selctrl.hxx b/svx/inc/selctrl.hxx
index b87bd3d2fc..77c8f91898 100644
--- a/svx/inc/selctrl.hxx
+++ b/svx/inc/selctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selctrl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index fb934596e2..19e735265b 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sjctrl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/srchcfg.hxx b/svx/inc/srchcfg.hxx
deleted file mode 100644
index 625d88b74c..0000000000
--- a/svx/inc/srchcfg.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: srchcfg.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 _SVX_SRCHCFG_HXX
-#define _SVX_SRCHCFG_HXX
-
-#include <unotools/configitem.hxx>
-#include <com/sun/star/uno/Sequence.h>
-#include "svx/svxdllapi.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 SVX_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/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index 411d2f941e..856f3fc5c3 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.hxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,34 +31,20 @@
 
 
 #include <svtools/stdctrl.hxx>
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <svl/svarray.hxx>
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
 #include <svtools/svmedit.hxx>
-#include <sfx2/srchdefs.hxx>
+#include <svl/srchdefs.hxx>
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx
index f15b8a6641..7ae414c729 100644
--- a/svx/inc/srchitem.hxx
+++ b/svx/inc/srchitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchitem.hxx,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 +27,7 @@
 #ifndef _SVX_SRCHITEM_HXX
 #define _SVX_SRCHITEM_HXX
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 #endif
 
diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx
index 46029ac3a0..396ab1cff5 100644
--- a/svx/inc/svdglob.hxx
+++ b/svx/inc/svdglob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdglob.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 534ff73c2a..a48f552f88 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdibrow.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svditer.hxx b/svx/inc/svditer.hxx
index 0dc391ec46..dcae622822 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svditer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svditer.hxx,v $
- * $Revision: 1.9.246.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx
index f13dfde67b..74c33052b4 100644
--- a/svx/inc/svdpomv.hxx
+++ b/svx/inc/svdpomv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpomv.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx
index 2c92e3fa6c..f0f9789d77 100644
--- a/svx/inc/svdshort.hxx
+++ b/svx/inc/svdshort.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdshort.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 8bf727b7f1..686679be1f 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdstr.hrc,v $
- * $Revision: 1.18.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svdviter.hxx b/svx/inc/svdviter.hxx
index a73f134c7f..43f8c0e14a 100644
--- a/svx/inc/svdviter.hxx
+++ b/svx/inc/svdviter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdviter.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svimbase.hxx b/svx/inc/svimbase.hxx
index 45529cde40..58fb0c969c 100644
--- a/svx/inc/svimbase.hxx
+++ b/svx/inc/svimbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svimbase.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx
index 93e6c89e82..d7049043de 100644
--- a/svx/inc/svx/AccessibleControlShape.hxx
+++ b/svx/inc/svx/AccessibleControlShape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleControlShape.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx
index 0201663839..c1131fa746 100644
--- a/svx/inc/svx/AccessibleGraphicShape.hxx
+++ b/svx/inc/svx/AccessibleGraphicShape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleGraphicShape.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx
index a9a2ff3ee2..c8136ca4b9 100644
--- a/svx/inc/svx/AccessibleOLEShape.hxx
+++ b/svx/inc/svx/AccessibleOLEShape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleOLEShape.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index b176c7c942..59a601c5a4 100755
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleShape.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,9 +29,10 @@
 #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
 
-#include <svx/AccessibleContextBase.hxx>
-#include <svx/AccessibleComponentBase.hxx>
+#include <editeng/AccessibleContextBase.hxx>
+#include <editeng/AccessibleComponentBase.hxx>
 #include <svx/IAccessibleViewForwarderListener.hxx>
+#include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -43,6 +41,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <svx/AccessibleTextHelper.hxx>
 #include "svx/svxdllapi.h"
+#include "ChildrenManager.hxx"
 
 class SdrObject;
 
diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx
index d5f1c8c0d6..23f4eb0085 100644
--- a/svx/inc/svx/AccessibleShapeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleShapeInfo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
index 32106b1d08..2610a58a2f 100644
--- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx
+++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleShapeTreeInfo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx
index 056766df3b..0f89805d9f 100644
--- a/svx/inc/svx/AccessibleTableShape.hxx
+++ b/svx/inc/svx/AccessibleTableShape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleTableShape.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx
index 971f50cf15..c577b8d2f7 100644
--- a/svx/inc/svx/AccessibleTextHelper.hxx
+++ b/svx/inc/svx/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx
index 4cf14a5295..0fefc121cf 100644
--- a/svx/inc/svx/ChildrenManager.hxx
+++ b/svx/inc/svx/ChildrenManager.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChildrenManager.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
index cdfa4dadad..4e83dd757a 100755..100644
--- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeFunctionParser.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx
index 2e80f4c106..b817e611ab 100644
--- a/svx/inc/svx/IAccessibleParent.hxx
+++ b/svx/inc/svx/IAccessibleParent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IAccessibleParent.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx
index 5539c73812..5291a7f8f4 100644
--- a/svx/inc/svx/IAccessibleViewForwarder.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarder.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IAccessibleViewForwarder.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
index 6a207ea7f8..4a49e4fe7c 100644
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IAccessibleViewForwarderListener.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx
index bd6cb3c008..dbbca94edc 100755
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/svx/inc/svx/ShapeTypeHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ShapeTypeHandler.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx
index b815660800..08e80c153e 100644
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/svx/inc/svx/SmartTagCtl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SmartTagCtl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index 05b44e3a8a..d6ad34ee74 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SmartTagItem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx
index 7821b2ce13..6dc8e484de 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/svx/inc/svx/SmartTagMgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SmartTagMgr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index 58f594da3b..ba7077ae79 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SpellDialogChildWindow.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define SVX_SPELL_DIALOG_CHILD_WINDOW_HXX
 
 #include <sfx2/childwin.hxx>
-#include <svx/SpellPortions.hxx>
+#include <editeng/SpellPortions.hxx>
 #include "svx/svxdllapi.h"
 #include <vcl/image.hxx>
 
diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx
index cf5ec424f7..403ad6726e 100644
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/svx/inc/svx/SvxShapeTypes.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SvxShapeTypes.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index c2644b9bce..faf381d8a2 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: algitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <svx/svxids.hrc>
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include "svx/svxdllapi.h"
 
 class SvStream;
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index f9ecfac490..8a8241323a 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bmpmask.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 99359feaa6..ee4bd71039 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: camera3d.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 290c14073f..43d5272719 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charmap.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index c8d04d526a..4aefcf2791 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checklbx.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index bcc09258b0..5ffcab526d 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colrctrl.hxx,v $
- * $Revision: 1.3.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 66592b96bd..17c31d6d5e 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index a893f7d6d4..853fd75470 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ctredlin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index b280128fc8..0afdcfbdc7 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cube3d.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx
index c6d835023d..b73432b6c5 100644
--- a/svx/inc/svx/dataaccessdescriptor.hxx
+++ b/svx/inc/svx/dataaccessdescriptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dataaccessdescriptor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx
index 1e1ef50350..77e93297e6 100644
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/svx/inc/svx/databaselocationinput.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: databaselocationinput.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx
index 8d097e0971..003a07ae2b 100644
--- a/svx/inc/svx/dbaexchange.hxx
+++ b/svx/inc/svx/dbaexchange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbaexchange.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx
index 4585534d1e..b82fa273f0 100644
--- a/svx/inc/svx/dbaobjectex.hxx
+++ b/svx/inc/svx/dbaobjectex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbaobjectex.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
index 342f54c1e4..8d1c4b7f5c 100755
--- a/svx/inc/svx/dbcharsethelper.hxx
+++ b/svx/inc/svx/dbcharsethelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbcharsethelper.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index ae5721a87f..22e2ab820e 100755
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtoolsclient.hxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx
index 76f28b5782..056291f8ad 100644
--- a/svx/inc/svx/def3d.hxx
+++ b/svx/inc/svx/def3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: def3d.hxx,v $
- * $Revision: 1.3.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index 244eb81381..2c95c76c06 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: deflt3d.hxx,v $
- * $Revision: 1.3.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx
index 00308321af..94c2a238b0 100644
--- a/svx/inc/svx/dialmgr.hxx
+++ b/svx/inc/svx/dialmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialmgr.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index b87d987b2d..eb304d09f3 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialogs.hrc,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,8 +38,6 @@
 #define RID_SVX_FIRSTFREE                   305
 
 // some strings also used in CUI
-#define RID_SVXSTR_PAPERBIN                 (RID_SVX_START + 145)
-#define RID_SVXSTR_PAPERBIN_SETTINGS		(RID_SVX_START + 149)
 #define RID_SVXERRCTX                       (RID_SVX_START + 351)
 #define RID_SVXSTR_COLOR                    (RID_SVX_START + 179)
 #define RID_SVXSTR_TRANSPARENT              (RID_SVX_START + 190)
@@ -179,20 +174,6 @@
 #define RID_SVXPAGE_HEADER                  (RID_SVX_START +  27)
 #define RID_SVXQBX_DELETE_HEADFOOT          (RID_SVX_START +  28)
 
-// ResId fuer die Linguistik-Dialoge
-#define RID_SVXDLG_HYPHENATE                (RID_SVX_START +  30)
-#define RID_SVXDLG_THESAURUS                (RID_SVX_START +  31)
-#define RID_SVXDLG_THES_LANGUAGE            (RID_SVX_START +  38)
-
-// ResIds fuer HM-QueryBoxen und Error-Strings
-#define RID_SVXQB_THESAURUS                 (RID_SVX_START +  33)
-#define RID_SVXQB_CONTINUE                  (RID_SVX_START +  34)
-#define RID_SVXQB_BODYTEXT                  (RID_SVX_START +  35)
-#define RID_SVXQB_SPECIAL                   (RID_SVX_START +  36)
-#define RID_SVXQB_SPECIAL_FORCED            (RID_SVX_START +  37)
-// + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE
-#define RID_SVXQB_BW_CONTINUE               (RID_SVX_START +  39)
-
 // ResId's fuer Dialoge aus StarDraw
 #define RID_SVXPAGE_POSITION                (RID_SVX_START +  46)
 #define RID_SVXPAGE_SIZE                    (RID_SVX_START +  47)
@@ -427,65 +408,12 @@
 #define RID_SVXSTR_SEARCH                   (RID_SVX_START +  81)
 #define RID_SVXSTR_REPLACE                  (RID_SVX_START +  82)
 
-// Strings fuer die HM-Strings
-#define RID_SVXSTR_HMSTATUS_BEGIN           (RID_SVX_START +  90)
-#define RID_SVXSTR_HMSTATUS_OK              (RID_SVX_START +  90)
-#define RID_SVXSTR_HMSTATUS_DONTUSE         (RID_SVX_START +  91)
-#define RID_SVXSTR_HMSTATUS_WRONG           (RID_SVX_START +  92)
-#define RID_SVXSTR_HMSTATUS_CAPERROR        (RID_SVX_START +  93)
-#define RID_SVXSTR_HMERR_CHECKINSTALL       (RID_SVX_START +  94)
-#define RID_SVXSTR_HMERR_ADDWORD            (RID_SVX_START +  95)
-#define RID_SVXSTR_HMSTATUS_INVALID_LANG    (RID_SVX_START +  96)
-
-// paper formats
-#define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 100)
-#define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 101)	
-#define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 102)	
-#define RID_SVXSTR_PAPER_A3                 (RID_SVX_START + 103)	
-#define RID_SVXSTR_PAPER_A4                 (RID_SVX_START + 104)	
-#define RID_SVXSTR_PAPER_A5                 (RID_SVX_START + 105)	
-#define RID_SVXSTR_PAPER_B4_ISO             (RID_SVX_START + 106)	
-#define RID_SVXSTR_PAPER_B5_ISO             (RID_SVX_START + 107)	
-#define RID_SVXSTR_PAPER_LETTER             (RID_SVX_START + 108)	
-#define RID_SVXSTR_PAPER_LEGAL              (RID_SVX_START + 109)	
-#define RID_SVXSTR_PAPER_TABLOID            (RID_SVX_START + 110)	
-#define RID_SVXSTR_PAPER_USER               (RID_SVX_START + 111)	
-#define RID_SVXSTR_PAPER_B6_ISO             (RID_SVX_START + 112)	
-#define RID_SVXSTR_PAPER_C4                 (RID_SVX_START + 113)	
-#define RID_SVXSTR_PAPER_C5                 (RID_SVX_START + 114)	
-#define RID_SVXSTR_PAPER_C6                 (RID_SVX_START + 115)	
-#define RID_SVXSTR_PAPER_C65                (RID_SVX_START + 116)	
-#define RID_SVXSTR_PAPER_DL                 (RID_SVX_START + 117)	
-#define RID_SVXSTR_PAPER_DIA                (RID_SVX_START + 118)	
-#define RID_SVXSTR_PAPER_SCREEN             (RID_SVX_START + 119)	
-#define RID_SVXSTR_PAPER_C                  (RID_SVX_START + 120)	
-#define RID_SVXSTR_PAPER_D                  (RID_SVX_START + 121)	
-#define RID_SVXSTR_PAPER_E                  (RID_SVX_START + 122)	
-#define RID_SVXSTR_PAPER_EXECUTIVE          (RID_SVX_START + 123)	
-#define RID_SVXSTR_PAPER_LEGAL2				(RID_SVX_START + 124)	
-#define RID_SVXSTR_PAPER_MONARCH			(RID_SVX_START + 125)	
-#define RID_SVXSTR_PAPER_COM675				(RID_SVX_START + 126)	
-#define RID_SVXSTR_PAPER_COM9				(RID_SVX_START + 127)	
-#define RID_SVXSTR_PAPER_COM10				(RID_SVX_START + 128)	
-#define RID_SVXSTR_PAPER_COM11				(RID_SVX_START + 129)	
-#define RID_SVXSTR_PAPER_COM12				(RID_SVX_START + 130)	
-#define RID_SVXSTR_PAPER_KAI16				(RID_SVX_START + 131)	
-#define RID_SVXSTR_PAPER_KAI32				(RID_SVX_START + 132)	
-#define RID_SVXSTR_PAPER_KAI32BIG			(RID_SVX_START + 133)	
-#define RID_SVXSTR_PAPER_B4_JIS             (RID_SVX_START + 134)	
-#define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 135)	
-#define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 136)	
-
 #define RID_SVXSTR_FULLSIZE                 (RID_SVX_START + 144)
 
 // ResIds fuer die verschiedenen Strings des PageDlgs
 #define RID_SVXSTR_CALC_PAGE                (RID_SVX_START + 146)
 #define RID_SVXSTR_DRAW_PAGE                (RID_SVX_START + 147)
 
-// HM_ERR
-#define RID_SVXSTR_HMERR_THESAURUS          (RID_SVX_START + 150)
-#define RID_SVXSTR_HMERR_HYPH               (RID_SVX_START + 151)
-
 // Strings der ToolBox-Controls aus tbcontrl.cxx
 #define RID_SVXSTR_FILLPATTERN              (RID_SVX_START + 191)
 #define RID_SVXSTR_FRAME                    (RID_SVX_START + 192)
@@ -529,13 +457,6 @@
 #define RID_SVXSTR_RULER_TAB_DECIMAL        (RID_SVX_START + 247)
 #define RID_SVXSTR_RULER_TAB_CENTER         (RID_SVX_START + 248)
 
-// File-/Grafik-Link String, Dialog Name
-#define RID_SVXSTR_FILELINK                 (RID_SVX_START + 255)
-#define RID_SVXSTR_GRAFIKLINK               (RID_SVX_START + 256)
-#define RID_SVXSTR_EDITGRFLINK              (RID_SVX_START + 257)
-#define RID_SVXSTR_GRFLINKPROGRESS          (RID_SVX_START + 258)
-#define RID_SVXGRF_GRAPHICLOAD				(RID_SVX_START + 259)
-
 // Schlie"ssen (im TabDialog Line/Area)
 #define RID_SVXSTR_CLOSE                    (RID_SVX_START + 260)
 
@@ -803,14 +724,6 @@
 #define RID_SVXSTR_HATCH_START				RID_SVXSTR_HATCH0
 #define RID_SVXSTR_HATCH_END				RID_SVXSTR_HATCH10
 
-// strings for error messsages of OpenGraphics dialog
-#define RID_SVXSTR_GRFILTER_OPENERROR		(RID_SVX_START + 683)
-#define RID_SVXSTR_GRFILTER_IOERROR			(RID_SVX_START + 684)
-#define RID_SVXSTR_GRFILTER_FORMATERROR		(RID_SVX_START + 685)
-#define RID_SVXSTR_GRFILTER_VERSIONERROR	(RID_SVX_START + 686)
-#define RID_SVXSTR_GRFILTER_FILTERERROR		(RID_SVX_START + 687)
-#define RID_SVXSTR_GRFILTER_TOOBIG			(RID_SVX_START + 688)
-
 // Default-Bitmap-Names
 #define RID_SVXSTR_BMP0_DEF					(RID_SVX_START + 691)
 #define RID_SVXSTR_BMP1_DEF					(RID_SVX_START + 692)
@@ -926,11 +839,6 @@
 #define RID_SVXSTR_QRY_PRINT_ALL            (RID_SVX_START + 804)
 #define RID_SVXSTR_QRY_PRINT_SELECTION      (RID_SVX_START + 805)
 
-// strings for error messsages in dictionary updates
-#define RID_SVXSTR_DIC_ERR_UNKNOWN			(RID_SVX_START +  810)
-#define RID_SVXSTR_DIC_ERR_FULL				(RID_SVX_START +  811)
-#define RID_SVXSTR_DIC_ERR_READONLY			(RID_SVX_START +  812)
-
 // strings for graphic attributes/undo
 #define RID_SVXSTR_GRAFCROP					(RID_SVX_START + 820)
 #define RID_SVXSTR_UNDO_GRAFMODE			(RID_SVX_START + 821)
diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx
index 5d12e900f5..fe06fdfc2d 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/svx/inc/svx/dlgctl3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgctl3d.hxx,v $
- * $Revision: 1.4.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 69e83c1661..a6c2d52f41 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx
index a859e12a7f..e9e3dfce04 100644
--- a/svx/inc/svx/dstribut_enum.hxx
+++ b/svx/inc/svx/dstribut_enum.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dstribut_enum.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index 2f24e8786a..5d22acf2ac 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3ditem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx
index ecc413a47e..d395bceaef 100644
--- a/svx/inc/svx/e3dsceneupdater.hxx
+++ b/svx/inc/svx/e3dsceneupdater.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dsceneupdater.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index c31a6f60f7..1c5e595fde 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dundo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc
index fbbea43260..2008375dde 100644
--- a/svx/inc/svx/exthelpid.hrc
+++ b/svx/inc/svx/exthelpid.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.78 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@
 
 // Help-Ids --------------------------------------------------------------
 #define HID_GALLERY_ACTUALIZE                     (HID_SVX_EXT0_START +  0)
-#define HID_GALLERY_TITLE						  (HID_SVX_EXT0_START +  1)

+#define HID_GALLERY_TITLE						  (HID_SVX_EXT0_START +  1)
 
 // please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
 
diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index 4d5d62e145..d56532533e 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extrud3d.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx
index c767893a21..87b93ccd38 100644
--- a/svx/inc/svx/extrusionbar.hxx
+++ b/svx/inc/svx/extrusionbar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extrusionbar.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index c09ee45f90..4e0b001950 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: f3dchild.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 61a1cbe353..1e2bcc5fab 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fillctrl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index bf7d49545f..1d255187c0 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: float3d.hxx,v $
- * $Revision: 1.3.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx
index 5a9c9db96e..4926d1ecb2 100644
--- a/svx/inc/svx/fmdmod.hxx
+++ b/svx/inc/svx/fmdmod.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdmod.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index 64a2b70034..29931235df 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdpage.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx
index ba28de8e4d..c07362f37d 100644
--- a/svx/inc/svx/fmglob.hxx
+++ b/svx/inc/svx/fmglob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmglob.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx
index 54ed0bd5f5..e9bf83ad12 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/svx/inc/svx/fmgridcl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmgridcl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index d92f925cdf..ee5c157d47 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmmodel.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 1c894e1c7f..12296f64c1 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmpage.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index a24b5a5cab..63ab4b85e7 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmsearch.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index 4caea7cd4c..07e570b958 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmshell.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index b5d6f09093..d814281bc0 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.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/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index 94aa09686e..cccc48b8bf 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmview.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index b88ba95bf8..5ba448e344 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fntctl.hxx,v $
- * $Revision: 1.4.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 31422c88b1..20badbeb75 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fntctrl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/window.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include "svx/svxdllapi.h"
 
 #ifndef _RTL_USTRING_HXX_
diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx
index e4ca0394ff..5b46d28ab5 100644
--- a/svx/inc/svx/fntszctl.hxx
+++ b/svx/inc/svx/fntszctl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fntszctl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 8446d73ee3..756b76c868 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontwork.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx
index e49cd33afd..8b63d0ee79 100644
--- a/svx/inc/svx/fontworkbar.hxx
+++ b/svx/inc/svx/fontworkbar.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontworkbar.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx
index a1ae128183..ffd4ce06ce 100644
--- a/svx/inc/svx/framebordertype.hxx
+++ b/svx/inc/svx/framebordertype.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framebordertype.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index 2bf5138d42..660fd17ab0 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framelink.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx
index d9cabe34f3..fb36019d52 100644
--- a/svx/inc/svx/framelinkarray.hxx
+++ b/svx/inc/svx/framelinkarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framelinkarray.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx
index 804a90f59b..c56b363d58 100644
--- a/svx/inc/svx/frmdirlbox.hxx
+++ b/svx/inc/svx/frmdirlbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmdirlbox.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,7 +32,7 @@
 #include <vcl/lstbox.hxx>
 #endif
 #include <sfx2/itemconnect.hxx>
-#include <svx/frmdir.hxx>
+#include <editeng/frmdir.hxx>
 #include "svx/svxdllapi.h"
 
 class SvxFrameDirectionItem;
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index c6896113a4..22100d3e0a 100644
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmsel.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index fc47bfca35..6cd5ca8589 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gallery1.hxx,v $
- * $Revision: 1.8.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index e028acee26..57f98ccca9 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galmisc.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/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index 907e3514da..ade161ab2c 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphctl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index b717aed3b5..f25d37c8e4 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grfcrop.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index 1df1daae34..e754b32ced 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grfflt.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,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
 #include <vcl/salbtype.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/graphctl.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/rectenum.hxx>
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 0519050011..32a2bb28dc 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridctrl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index 3fca243482..7efa978285 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hdft.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx
index 8561618d57..15550281b6 100644
--- a/svx/inc/svx/helperhittest3d.hxx
+++ b/svx/inc/svx/helperhittest3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helperhittest3d.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx
index 0ed3cebbef..dfa106a9d4 100644
--- a/svx/inc/svx/ifaceids.hxx
+++ b/svx/inc/svx/ifaceids.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ifaceids.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/impgrf.hxx b/svx/inc/svx/impgrf.hxx
deleted file mode 100644
index b12068e958..0000000000
--- a/svx/inc/svx/impgrf.hxx
+++ /dev/null
@@ -1,65 +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: impgrf.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 _SVX_IMPGRF_HXX
-#define _SVX_IMPGRF_HXX
-
-// include ---------------------------------------------------------------
-
-#include <svtools/filter.hxx>
-
-#ifndef _BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#include "svx/svxdllapi.h"
-
-// Funktionen ------------------------------------------------------------
-
-// returnt einen static Graphic-Filter, wird einmalig angelegt,
-// steht immer zur Verfuegung, DARF NIE geloescht werden!!!!
-SVX_DLLPUBLIC GraphicFilter* GetGrfFilter();
-SVX_DLLPUBLIC int 	LoadGraphic( const String& rPath, const String& rFilter,
-                     Graphic& rGraphic,
-                     GraphicFilter* pFilter = NULL,
-                     USHORT* pDeterminedFormat = NULL );
-
-// class SvxImportGraphicDialog ------------------------------------------
-#ifndef SV_NODIALOG
-
-#define ENABLE_STANDARD			((USHORT)0x0001)	// Standard-Button
-#define ENABLE_LINK				((USHORT)0x0002)	// Verkn"upfungs-Box
-#define ENABLE_STD_AND_LINK		(ENABLE_STANDARD | ENABLE_LINK)
-#define ENABLE_PROPERTY			((USHORT)0x0004)	// Eigenschaften-Button
-#define ENABLE_ALL				((USHORT)0x0007)	// alle
-#define ENABLE_PROP_WITHOUTLINK ((USHORT)0x0008)	// Eigenschaften ohne Link
-#define ENABLE_EMPTY_FILENAMES	((USHORT)0x0010)	// Leere Dateinamen zulassen
-
-#endif	// SV_NODIALOG
-
-#endif
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index f0b4b26374..b81e74e2d6 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ipolypolygoneditorcontroller.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 0188d98498..85d67a6ca6 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemwin.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index a99d4eb418..a1f78a6a04 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langbox.hxx,v $
- * $Revision: 1.4.242.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,6 +57,9 @@ class SvtLanguageTable;
                                             // opposed to Arabic-Egypt.
 
 
+// load language strings from resource
+SVX_DLLPUBLIC String 	GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg );
+
 class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
 {
 public:
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index c87e6f1983..3b20cccd61 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lathe3d.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index e3f65a5022..a20eecf424 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msdffdef.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 75f253487b..94e4660a13 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numfmtsh.hxx,v $
- * $Revision: 1.3.242.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 81a1972f23..94177b5928 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numinf.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 7a6e48a909..6cf2a210f5 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: obj3d.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx
index 3b53b24e7f..3fcdecfda1 100644
--- a/svx/inc/svx/pagectrl.hxx
+++ b/svx/inc/svx/pagectrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagectrl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 6c84d71aac..d2921d1559 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageitem.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index de5a1db55d..3a40b616b1 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paraprev.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,7 +30,7 @@
 // include ---------------------------------------------------------------
 
 #include <vcl/window.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include "svx/svxdllapi.h"
 
 // enum ------------------------------------------------------------------
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 63ceee30cc..c49f995bd2 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: polygn3d.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx
index efcfcfd6ff..28bd40e318 100644
--- a/svx/inc/svx/polypolygoneditor.hxx
+++ b/svx/inc/svx/polypolygoneditor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: polypolygoneditor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx
index c7b32c19c9..f0f33110e3 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/svx/inc/svx/polysc3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: polysc3d.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx
index 470d01dd8b..538a4f2738 100644
--- a/svx/inc/svx/rectenum.hxx
+++ b/svx/inc/svx/rectenum.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rectenum.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index b58839bdeb..b82213e69a 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/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.4.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index ccccf1ded4..e10400e935 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scene3d.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define _E3D_SCENE3D_HXX
 
 #include <svx/camera3d.hxx>
-#include <goodies/b3dtrans.hxx>
+#include <tools/b3dtrans.hxx>
 #include <tools/time.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/obj3d.hxx>
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index 7571b8ffe8..952664d6bf 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdangitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx
index fa8105da68..81abd5ec63 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/svx/inc/svx/sdasaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdasaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index f678492366..c0a4aac44e 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdasitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx
index 8b55dd8dc4..0d09bb29a6 100644
--- a/svx/inc/svx/sderitm.hxx
+++ b/svx/inc/svx/sderitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sderitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx
index b9ed996f57..69807c148c 100644
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/svx/inc/svx/sdgcoitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdgcoitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx
index 680b5d495b..dd01de87f8 100644
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/svx/inc/svx/sdgcpitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdgcpitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index 4a46bdc53a..122e38c87e 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdggaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx
index bc494689e5..aa175ee728 100644
--- a/svx/inc/svx/sdginitm.hxx
+++ b/svx/inc/svx/sdginitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdginitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx
index d8a477a8c8..8ba0c1a507 100644
--- a/svx/inc/svx/sdgluitm.hxx
+++ b/svx/inc/svx/sdgluitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdgluitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index 680d828849..0924028e26 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdgmoitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +28,7 @@
 #ifndef _SDGMOITM_HXX
 #define _SDGMOITM_HXX
 
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx
index 5c091607b4..ad3895df1f 100644
--- a/svx/inc/svx/sdgtritm.hxx
+++ b/svx/inc/svx/sdgtritm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdgtritm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index 5d6886d9e7..a1b4904176 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdmetitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index ed78dc85d2..01980c7b24 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdooitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index cd96f03ca0..8e373039f5 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdprcitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx
index fbab0840dc..58e3bf8601 100644
--- a/svx/inc/svx/sdr/animation/animationstate.hxx
+++ b/svx/inc/svx/sdr/animation/animationstate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationstate.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx
index a618d846ef..801da79f05 100644
--- a/svx/inc/svx/sdr/animation/objectanimator.hxx
+++ b/svx/inc/svx/sdr/animation/objectanimator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectanimator.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx
index 7c927ec590..a1b167ca97 100644
--- a/svx/inc/svx/sdr/animation/scheduler.hxx
+++ b/svx/inc/svx/sdr/animation/scheduler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scheduler.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/svx/inc/svx/sdr/attribute/sdrallattribute.hxx b/svx/inc/svx/sdr/attribute/sdrallattribute.hxx
index 092c0e224a..4e132a280a 100644
--- a/svx/inc/svx/sdr/attribute/sdrallattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrallattribute.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: sdrallattribute.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
index aa417b4451..8b484e2bea 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.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: sdrtextattribute.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
index c8c80ceb02..048f882f1e 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.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: sdrtextattribute.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index aaba3620ea..5023a16520 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.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: sdrtextattribute.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +30,7 @@
 
 #include <sal/types.h>
 #include <svx/xenum.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/sdtaitm.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx
index 88776ec5d6..870eda9dc8 100644
--- a/svx/inc/svx/sdr/contact/displayinfo.hxx
+++ b/svx/inc/svx/sdr/contact/displayinfo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: displayinfo.hxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx
index 1a35f5eae7..8fad111b7d 100644
--- a/svx/inc/svx/sdr/contact/objectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontact.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectcontact.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/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 85b301d20b..be2518a685 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectcontactofobjlistpainter.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
index ed3ccf4045..875f9dddd6 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectcontactofpageview.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/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx
index dadf99da16..13a7d626f7 100644
--- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx
+++ b/svx/inc/svx/sdr/contact/objectcontacttools.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: objectcontacttools.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx
index 8a7cca12de..cddf2ef7e7 100644
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontact.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontact.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/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
index ad92d5afd5..841fa98cb9 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.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: viewcontactofe3d.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
index 63cb81ddf0..43f8c8cd96 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.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: viewcontactofe3dcube.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
index 5a5dcf85ae..493ba8d79a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.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: viewcontactofe3dextrude.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
index 7cb55b8003..20987d603c 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.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: viewcontactofe3dlathe.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
index 338ac54634..48741625a3 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.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: viewcontactofe3dpolygon.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
index aec9d8df54..c6beae062a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofe3dscene.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
index 208ce6cf9f..a14b252d01 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.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: viewcontactofe3dsphere.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
index 322b55b69a..f760c86858 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofgraphic.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
index df5682c4e8..44880a60d9 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofgroup.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index ca66d0aa58..9fafa5d959 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofmasterpagedescriptor.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/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
index 51da09c166..d14a57f3c9 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofpageobj.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/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
index 9b2edeec58..eed299b929 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.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: viewcontactofsdrcaptionobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
index 11ef52a957..cf5b661711 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.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: viewcontactofsdrcircobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
index e6b79309d2..3e1e877172 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.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: viewcontactofsdredgeobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 962bb01b06..704690ca1c 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.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: viewcontactofsdrmeasureobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 95796b7b3a..47dbc7cfbc 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrmediaobj.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/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
index a25755ad55..2b3e21a67a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrobj.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/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 8db1f88f0b..00ad86ec3a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrobjcustomshape.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index 630187b323..f0dfc7a3f1 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.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: viewcontactofsdrole2obj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
index 8b634b6252..de7053d921 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrpage.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/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
index 88da41a7a8..657c39c038 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.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: viewcontactofsdrpathobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index c1b5f17464..78e2949ac0 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.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: viewcontactofsdrrectobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
index ef26648a42..febfde890e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactoftextobj.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
index 8a05f91e8f..7ca76eafdc 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofunocontrol.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/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
index 1ae5f87956..cd05842528 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofvirtobj.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index c2ea138d7c..44fb3346f1 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontact.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
index bc00355180..a2e71aa5a8 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.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: viewobjectcontactofe3d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
index f1bde37c65..9252e7d749 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.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: viewobjectcontactofe3dscene.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
index 84c7c35d4c..21183af187 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.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: viewobjectcontactofgraphic.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
index 7cf1f9876c..89008bfd6b 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.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: viewobjectcontactofgroup.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index 7de4ab2e73..775914396b 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.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: viewobjectcontactofmasterpagedescriptor.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 444820cc5c..24042ccbaf 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.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: viewobjectcontactofpageobj.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index 505bc25791..e706b4236b 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontactofsdrmediaobj.hxx,v $
- * $Revision: 1.9.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index 84445708ec..6b6ac662e6 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.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: viewobjectcontactofsdrobj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index ae7db471a3..99b481b9fb 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.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: viewobjectcontactofsdrole2obj.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
index 2ef0c6df41..c23d814c1c 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.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: viewobjectcontactofsdrpage.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 64ee4c19b5..99f885edb2 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontactofunocontrol.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
index 5a94b39fa3..be18142d6e 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontactredirector.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx
index e6793ce536..43900b0b56 100644
--- a/svx/inc/svx/sdr/event/eventhandler.hxx
+++ b/svx/inc/svx/sdr/event/eventhandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventhandler.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 69438c9ef5..9c0ee2fa29 100644
--- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayanimatedbitmapex.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index 531890c6c0..e702e7a194 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaybitmapex.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
index 5a9f2286f0..99e92bdce0 100644
--- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaycrosshair.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index 497d7c1b89..1dae45c670 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaybitmap.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/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
index b51a91621b..14c1f46a36 100644
--- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayhelpline.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx
index 314589c47c..cc555ec36c 100644
--- a/svx/inc/svx/sdr/overlay/overlayline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayline.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayline.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx
index 1ca348a244..d51cbc1720 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanager.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: overlaymanager.hxx,v $
- *
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 709f3be982..abf5460651 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaymanagerbuffered.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx
index a48afed140..2ac427da51 100644
--- a/svx/inc/svx/sdr/overlay/overlayobject.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobject.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
index 2c9c26888b..f1fd91468b 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobjectcell.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 2b87ed1917..d082fb62b7 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobjectlist.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
index 523a9ba652..c828c50d73 100644
--- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaypolypolygon.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 68ece1cb77..483e61ab85 100644
--- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaysdrobject.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
index 9b875ffdba..57ac6bf761 100644
--- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayrollingrectangle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx
index bd4194cc85..37fbebf1dc 100644
--- a/svx/inc/svx/sdr/overlay/overlayselection.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayline.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx
index c970a3919e..e3d376dd59 100644
--- a/svx/inc/svx/sdr/overlay/overlaytools.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobject.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
index b9a175fa90..a0aaa4a346 100644
--- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaytriangle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
index ad4867b4da..7b4b05a53c 100644
--- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.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: primitiveFactory2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
index 097eecb952..d5a313d4c1 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.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: sdrattributecreator.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index 7ffc95344a..c9adedf13f 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.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: sdrcaptionprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 3b73b09ca1..5b8a0fef9e 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.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: sdrconnectorprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index b6044df2b0..cb821091d1 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.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: sdrcustomshapeprimitive2d.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,8 +57,8 @@ namespace drawinglayer
             // making exceptions with shadow generation
             unsigned                                    mb3DShape : 1;
 
-            // #SJ# Allow text clipping against TextBox in special cases (used for SC)

-            unsigned                                    mbForceTextClipToTextRange : 1;

+            // #SJ# Allow text clipping against TextBox in special cases (used for SC)
+            unsigned                                    mbForceTextClipToTextRange : 1;
 
         protected:
             // local decomposition.
diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index d3bf028869..91628b73b9 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.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: sdrdecompositiontools.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index c78e9e0655..092b35f040 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.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: sdrellipseprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 9c57c15911..cabc7092c3 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.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: sdrgrafprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +32,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/attribute/sdrattribute.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 559e914911..5e417e13ff 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.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: sdrmeasureprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
index 54e8ce4d90..ef68326e5e 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.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: sdrole2primitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index bea5895650..8dc7b41802 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.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: sdrcaptionprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
index 7c4bb21b73..f12793b12a 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.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: sdrpathprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index f8d8fb3880..a96d2cab18 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.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: primitiveFactory2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 54afa94a68..364e86643e 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.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: sdrrectangleprimitive2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index d06e0080a0..145fdd6d3c 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.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: sdrtextprimitive2d.hxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,8 +32,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <svx/outlobj.hxx>
-#include <tools/color.hxx>

+#include <editeng/outlobj.hxx>
+#include <tools/color.hxx>
 #include <svx/sdr/attribute/sdrformtextattribute.hxx>
 #include <tools/weakbase.hxx>
 #include <svx/sdtaitm.hxx>
diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
index 70dc15c62e..7833fa5994 100644
--- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.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: svx_primitivetypes2d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
index 7e776be4c9..58c5b73420 100644
--- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.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: sdrattributecreator3d.hxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx
index b04fee0384..2d363895bc 100644
--- a/svx/inc/svx/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attributeproperties.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/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx
index 551928b960..6083fd8101 100644
--- a/svx/inc/svx/sdr/properties/captionproperties.hxx
+++ b/svx/inc/svx/sdr/properties/captionproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: captionproperties.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx
index df52c1819f..90f96638d6 100644
--- a/svx/inc/svx/sdr/properties/circleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/circleproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: circleproperties.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx
index 9fb174d21a..905e268e26 100644
--- a/svx/inc/svx/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: connectorproperties.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx
index 2cf8037a73..664a675422 100644
--- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customshapeproperties.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx
index 149121867d..93981e0b71 100644
--- a/svx/inc/svx/sdr/properties/defaultproperties.hxx
+++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: defaultproperties.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
index 65d2bc4ff8..7e51cbdf4e 100644
--- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dcompoundproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
index 831e79d738..4f87548a9d 100644
--- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dextrudeproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
index c1d2644e29..2a31e0e6e7 100644
--- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dlatheproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx
index fd7f19d7b6..d19517ab1e 100644
--- a/svx/inc/svx/sdr/properties/e3dproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
index c5fdbdb581..c02cbbbd6b 100644
--- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dsceneproperties.hxx,v $
- * $Revision: 1.6.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
index f0293911b2..50263d78c9 100644
--- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dsphereproperties.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx
index f3be3cd408..f62f5dab74 100644
--- a/svx/inc/svx/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: emptyproperties.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx
index 2c9dfb7b2d..77ca1ef2ae 100644
--- a/svx/inc/svx/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphicproperties.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx
index 24cd73624a..e0fc636274 100644
--- a/svx/inc/svx/sdr/properties/groupproperties.hxx
+++ b/svx/inc/svx/sdr/properties/groupproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: groupproperties.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx
index 69d8d5a2ec..05d5cc46f0 100644
--- a/svx/inc/svx/sdr/properties/itemsettools.hxx
+++ b/svx/inc/svx/sdr/properties/itemsettools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemsettools.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx
index 869e79e463..783b06dedd 100644
--- a/svx/inc/svx/sdr/properties/measureproperties.hxx
+++ b/svx/inc/svx/sdr/properties/measureproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: measureproperties.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx
index ec687e8434..0b1dc0ada3 100644
--- a/svx/inc/svx/sdr/properties/pageproperties.hxx
+++ b/svx/inc/svx/sdr/properties/pageproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx
index 2b8928e376..dfd5b07d7e 100644
--- a/svx/inc/svx/sdr/properties/properties.hxx
+++ b/svx/inc/svx/sdr/properties/properties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: properties.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/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx
index 3fd13a0608..7a50f3f3e8 100644
--- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx
+++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rectangleproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx
index 08f2603a76..1787af922d 100644
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/svx/inc/svx/sdr/properties/textproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textproperties.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/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx
index 89017fd751..4a020cfccb 100644
--- a/svx/inc/svx/sdr/table/tabledesign.hxx
+++ b/svx/inc/svx/sdr/table/tabledesign.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabledesign.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx
index 8a241a759b..5fcb069e3e 100644
--- a/svx/inc/svx/sdrcomment.hxx
+++ b/svx/inc/svx/sdrcomment.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrcomment.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx
index dae0c26487..431a879eab 100644
--- a/svx/inc/svx/sdrhittesthelper.hxx
+++ b/svx/inc/svx/sdrhittesthelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdetc.hxx,v $
- * $Revision: 1.4.152.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index f7eb05fb18..c5e83fcd6f 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrmasterpagedescriptor.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx
index eda8e9a21f..750dcc083c 100644
--- a/svx/inc/svx/sdrobjectuser.hxx
+++ b/svx/inc/svx/sdrobjectuser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrobjectuser.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx
index 7676267688..63bae1f04a 100644
--- a/svx/inc/svx/sdrpageuser.hxx
+++ b/svx/inc/svx/sdrpageuser.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrpageuser.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index 2a37c9161f..60fb360a2e 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrpagewindow.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx
index 350fe199af..fa42352873 100644
--- a/svx/inc/svx/sdshcitm.hxx
+++ b/svx/inc/svx/sdshcitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdshcitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx
index b5b90f73c5..13fb76bcb0 100644
--- a/svx/inc/svx/sdshitm.hxx
+++ b/svx/inc/svx/sdshitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdshitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx
index ded0191c7a..56b4a5d4af 100644
--- a/svx/inc/svx/sdshtitm.hxx
+++ b/svx/inc/svx/sdshtitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdshtitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx
index 5f0adc5c1f..73b517d462 100644
--- a/svx/inc/svx/sdsxyitm.hxx
+++ b/svx/inc/svx/sdsxyitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdsxyitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index 2b5e7df3a1..d157330438 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtaaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx
index 2704f946f5..43e34abbbd 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/svx/inc/svx/sdtacitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtacitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 5d1a69e986..66eded48ae 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtaditm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx
index 6a3e0527d3..be89a2bcb5 100644
--- a/svx/inc/svx/sdtagitm.hxx
+++ b/svx/inc/svx/sdtagitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtagitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx
index aa7352b261..905766cfe2 100644
--- a/svx/inc/svx/sdtaiitm.hxx
+++ b/svx/inc/svx/sdtaiitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtaiitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index 81e9554149..07a823d8e1 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index 5874c830d2..bf6b495d12 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtakitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx
index 70dc5dc54f..b1d1715f4b 100644
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/svx/inc/svx/sdtayitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtayitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx
index 37af82cb1f..d11e0834e7 100644
--- a/svx/inc/svx/sdtcfitm.hxx
+++ b/svx/inc/svx/sdtcfitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtcfitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx
index ac9084aff3..f303873e17 100644
--- a/svx/inc/svx/sdtditm.hxx
+++ b/svx/inc/svx/sdtditm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtditm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
index 2a630fac6b..a551bcc840 100644
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/svx/inc/svx/sdtfchim.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtfchim.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index d37e006d62..362f444d3d 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtfsitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx
index c839aada70..154cc9c02d 100644
--- a/svx/inc/svx/sdtmfitm.hxx
+++ b/svx/inc/svx/sdtmfitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdtmfitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index aa2f4bdcb2..7b39551988 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdynitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx
index 2965b00304..301929b91e 100644
--- a/svx/inc/svx/selectioncontroller.hxx
+++ b/svx/inc/svx/selectioncontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selectioncontroller.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx
index 62ef7e7f55..ccd041888a 100755
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/svx/inc/svx/shapeproperty.hxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 #ifndef SVX_SHAPEPROPERTY_HXX
 #define SVX_SHAPEPROPERTY_HXX
 
diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx
index dd02f4787a..01ceed36a8 100644
--- a/svx/inc/svx/shapepropertynotifier.hxx
+++ b/svx/inc/svx/shapepropertynotifier.hxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 #ifndef SVX_PROPERTYCHANGENOTIFIER_HXX
 #define SVX_PROPERTYCHANGENOTIFIER_HXX
 
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index b040131783..6f313b4419 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simptabl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 38f78eca52..4bfb958c24 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sphere3d.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx
index 5651b2dd80..b74e3e21c5 100644
--- a/svx/inc/svx/splitcelldlg.hxx
+++ b/svx/inc/svx/splitcelldlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: splitcelldlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx
index 65e3c89744..8e24ae54e2 100644
--- a/svx/inc/svx/stddlg.hxx
+++ b/svx/inc/svx/stddlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stddlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx
index 15ba8a7cef..0a8c4fe7f7 100644
--- a/svx/inc/svx/strarray.hxx
+++ b/svx/inc/svx/strarray.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: strarray.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx
index 52a107adfc..735e677d4f 100644
--- a/svx/inc/svx/subtoolboxcontrol.hxx
+++ b/svx/inc/svx/subtoolboxcontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtoolboxcontrol.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx
index ea38817559..50cb575ede 100644
--- a/svx/inc/svx/svdattr.hxx
+++ b/svx/inc/svx/svdattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdattr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx
index 3f66992555..cf1f8e4762 100644
--- a/svx/inc/svx/svdattrx.hxx
+++ b/svx/inc/svx/svdattrx.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdattrx.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 36f1b3de21..ddcfd87707 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdcrtv.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index 3231cd4dd3..12ced57c57 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddef.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx
index ef30ed602a..0b3c7a52de 100644
--- a/svx/inc/svx/svddrag.hxx
+++ b/svx/inc/svx/svddrag.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrag.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx
index 96fb97c7e6..3511930594 100644
--- a/svx/inc/svx/svddrgmt.hxx
+++ b/svx/inc/svx/svddrgmt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrgmt.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index d86c4bc75f..d973c8b878 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrgv.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx
index 38b20ef276..6a3bbd1f75 100644
--- a/svx/inc/svx/svdedtv.hxx
+++ b/svx/inc/svx/svdedtv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdedtv.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/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 35dda79124..1c16f444c3 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdedxv.hxx,v $
- * $Revision: 1.4.76.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 8a93741bc3..3abbde007a 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdetc.hxx,v $
- * $Revision: 1.4.152.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,7 @@
 #include <vcl/outdev.hxx>
 #endif
 #include <tools/shl.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include "svx/svxdllapi.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx
index e6bb3b7ec9..1673ca172c 100644
--- a/svx/inc/svx/svdfield.hxx
+++ b/svx/inc/svx/svdfield.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdfield.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,45 +28,9 @@
 #ifndef _SVDFIELD_HXX
 #define _SVDFIELD_HXX
 
-#include <svx/eeitem.hxx>
-
-#ifndef _FLDITEM_HXX
-#ifndef ITEMID_FIELD
-#ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>  /* das include wird wg. EE_FEATURE_FIELD benoetigt */
-#endif
-#define ITEMID_FIELD EE_FEATURE_FIELD  /* wird fuer #include <svx/flditem.hxx> benoetigt */
-#endif
-#include <svx/flditem.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Do not remove this, it is still used in src536a!
 void SVX_DLLPUBLIC SdrRegisterFieldClasses();
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define SDR_MEASUREFIELD 50
-
-class SdrMeasureObj;
-
-enum SdrMeasureFieldKind {SDRMEASUREFIELD_VALUE,SDRMEASUREFIELD_UNIT,SDRMEASUREFIELD_ROTA90BLANCS};
-
-class SVX_DLLPUBLIC SdrMeasureField: public SvxFieldData {
-    SdrMeasureFieldKind eMeasureFieldKind;
-public:
-    SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,SDR_MEASUREFIELD)
-    SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {}
-    SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {}
-    virtual ~SdrMeasureField();
-    virtual SvxFieldData* Clone() const;
-    virtual int operator==(const SvxFieldData&) const;
-    SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; }
-    void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; }
-    void TakeRepresentation(const SdrMeasureObj& rObj, XubString& rStr) const;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #endif //_SVDFIELD_HXX
 
diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx
index 5bef658918..d2613c0ea3 100644
--- a/svx/inc/svx/svdglev.hxx
+++ b/svx/inc/svx/svdglev.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdglev.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index b4e79f786e..34d2ec3125 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdglue.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 0fd8967c1a..9afd417b6b 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdhdl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index 163026e9d1..d1b5896118 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdhlpln.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 3ee37edaac..f6edf9f229 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdlayer.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index 5a42c06f83..90e8c286a6 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmark.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 7238b80915..a40f1c184a 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmodel.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,9 +34,7 @@
 #include <tools/link.hxx>
 #include <tools/contnr.hxx>
 #include <tools/weakbase.hxx>
-#ifndef _MAPMOD_HXX //autogen
 #include <vcl/mapmod.hxx>
-#endif
 #include <svl/brdcst.hxx>
 #include <tools/string.hxx>
 #include <tools/datetime.hxx>
@@ -86,7 +81,6 @@ class SfxRepeatTarget;
 class SfxStyleSheet;
 class SfxUndoAction;
 class SfxUndoManager;
-class SvxLinkManager;
 class XBitmapList;
 class XBitmapTable;
 class XColorTable;
@@ -107,6 +101,9 @@ class SdrUndoFactory;
 namespace comphelper{
     class IEmbeddedHelper;
 }
+namespace sfx2{
+    class LinkManager;
+}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #define SDR_SWAPGRAPHICSMODE_NONE		0x00000000
@@ -215,7 +212,7 @@ protected:
     ULONG           nProgressOfs;   // -Handler
     rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
     SfxStyleSheet*	pDefaultStyleSheet;
-    SvxLinkManager* pLinkManager;   // LinkManager
+    sfx2::LinkManager* pLinkManager;   // LinkManager
     Container*      pUndoStack;
     Container*      pRedoStack;
     SdrUndoGroup*   pAktUndoGroup;  // Fuer mehrstufige
@@ -403,8 +400,8 @@ public:
     SfxStyleSheet*       GetDefaultStyleSheet() const             { return pDefaultStyleSheet; }
     void                 SetDefaultStyleSheet(SfxStyleSheet* pDefSS) { pDefaultStyleSheet = pDefSS; }
 
-    SvxLinkManager*      GetLinkManager()                         { return pLinkManager; }
-    void                 SetLinkManager(SvxLinkManager* pLinkMgr) { pLinkManager = pLinkMgr; }
+    sfx2::LinkManager*      GetLinkManager()                         { return pLinkManager; }
+    void                 SetLinkManager( sfx2::LinkManager* pLinkMgr ) { pLinkManager = pLinkMgr; }
 
     ::comphelper::IEmbeddedHelper*     GetPersist() const               { return m_pEmbeddedHelper; }
     void				 ClearPersist()                                 { m_pEmbeddedHelper = 0; }
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index 4639a291a2..c1428c56b4 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmrkv.hxx,v $
- * $Revision: 1.6.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 6ce8f54039..c2e10c8ba1 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoashp.hxx,v $
- * $Revision: 1.6.90.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -179,7 +176,7 @@ public:
     virtual UINT16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
-    virtual void SetModel(SdrModel* pNewModel);

+    virtual void SetModel(SdrModel* pNewModel);
 
     virtual void RecalcSnapRect();
 
diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
index ca84262c7b..7f4f2ef7fb 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoattr.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 548d78a778..53e40ead03 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdobj.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/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index e2cecd0579..018422e905 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdocapt.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
index 7fff0c36db..8271a7c283 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdocirc.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 0f5366d5b1..9b965db9df 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoedge.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 0d74a071a0..6e0a3e92d3 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdograf.hxx,v $
- * $Revision: 1.5.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <vcl/graph.hxx>
 #include <svx/svdorect.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include "svx/svxdllapi.h"
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx
index 5e796b75c9..fdcfb34203 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdogrp.hxx,v $
- * $Revision: 1.3.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index e410904fe5..951fc3d464 100644
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdomeas.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,6 +30,7 @@
 
 #include <svx/svdotext.hxx>
 #include "svx/svxdllapi.h"
+#include <editeng/measfld.hxx>
 
 //************************************************************
 //   Vorausdeklarationen
@@ -86,6 +84,7 @@ protected:
 
 protected:
     void ImpTakeAttr(ImpMeasureRec& rRec) const;
+    void TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMeasureFieldKind ) const;
     void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const;
     basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
     void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index 14bbfac260..9ece24349f 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdomedia.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 41157116b3..ae70b42215 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoole2.hxx,v $
- * $Revision: 1.5.60.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx
index 763f5b9a72..a53f41db4c 100644
--- a/svx/inc/svx/svdopage.hxx
+++ b/svx/inc/svx/svdopage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdopage.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx
index b59ee4b84b..1b2b33c196 100644
--- a/svx/inc/svx/svdopath.hxx
+++ b/svx/inc/svx/svdopath.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdopath.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index 9942941d04..79a8293883 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdorect.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index f14695ca48..a6f617ec92 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotable.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index abe9978730..db544f7b7b 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotext.hxx,v $
- * $Revision: 1.5.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx
index e6a7d53869..e8b2eaf3bc 100644
--- a/svx/inc/svx/svdouno.hxx
+++ b/svx/inc/svx/svdouno.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdouno.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx
index f5457dd885..817a94dab1 100644
--- a/svx/inc/svx/svdoutl.hxx
+++ b/svx/inc/svx/svdoutl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoutl.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,7 +28,7 @@
 #ifndef _SVDOUTL_HXX
 #define _SVDOUTL_HXX
 
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include "svx/svxdllapi.h"
 #include <svx/svdobj.hxx>
 
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index b055c37dc7..1aa504ad80 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdovirt.hxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 6723a7a1ba..e9b9d0287b 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpage.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/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 81cd87a87d..5f2117b371 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpagv.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 8d95725cf0..8ed8b61af4 100755..100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpntv.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/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx
index c3190e0de4..7e5b68174c 100644
--- a/svx/inc/svx/svdpoev.hxx
+++ b/svx/inc/svx/svdpoev.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpoev.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx
index 75059d7796..c90f6b762b 100644
--- a/svx/inc/svx/svdpool.hxx
+++ b/svx/inc/svx/svdpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpool.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx
index 50853266d9..25803c0c55 100644
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/svx/inc/svx/svdsnpv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdsnpv.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx
index f7e519f970..ca5bfd4154 100644
--- a/svx/inc/svx/svdsob.hxx
+++ b/svx/inc/svx/svdsob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdsob.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx
index d44f426958..9fac9b3082 100644
--- a/svx/inc/svx/svdtext.hxx
+++ b/svx/inc/svx/svdtext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdtext.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index e9eb99a153..c6c2271917 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdtrans.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx
index 05ba7f8d61..5f7842ca64 100644
--- a/svx/inc/svx/svdtypes.hxx
+++ b/svx/inc/svx/svdtypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdtypes.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 159e5c38ab..5017f1e127 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdundo.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index cfa5b648b1..60c557f8b0 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdview.hxx,v $
- * $Revision: 1.5.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 9e9d4eab11..f93d72e68c 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdxcgv.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
index 2bff30ee10..81bb8a93b3 100644
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/svx/inc/svx/svx3ditems.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svx3ditems.hxx,v $
- * $Revision: 1.4.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/eitem.hxx>
 
 
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 #include <svx/viewpt3d.hxx>
 #include <svx/svddef.hxx>
diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx
deleted file mode 100644
index 7f1c8aaa75..0000000000
--- a/svx/inc/svx/svxbox.hxx
+++ /dev/null
@@ -1,205 +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: svxbox.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 _SVX_BOX_HXX
-#define _SVX_BOX_HXX
-
-// include ---------------------------------------------------------------
-
-#include <svl/svarray.hxx>
-#include <tools/string.hxx>
-
-#ifndef _LSTBOX_HXX //autogen
-#include <vcl/lstbox.hxx>
-#endif
-
-#ifndef _COMBOBOX_HXX //autogen
-#include <vcl/combobox.hxx>
-#endif
-
-// forward ---------------------------------------------------------------
-
-class SvxBoxEntry;
-class SvxListBase;
-
-//#if 0 // _SOLAR__PRIVATE
-SV_DECL_PTRARR( SvxEntryLst, SvxBoxEntry*, 10, 10 )
-//#else
-//typedef SvPtrarr SvxEntryLst;
-//#endif
-
-// class SvxBoxEntry -----------------------------------------------------
-
-class 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 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 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/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 2e040b6de2..77a4e40e75 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxdlg.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,10 +29,11 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/sfxdlg.hxx>
-#include <svx/hangulhanja.hxx> //add for HangulHanjaConversionDialog
+#include <editeng/edtdlg.hxx>
+
 class SdrModel;
 class SdrView;
-using namespace svx;
+
 #include <svx/dstribut_enum.hxx>
 #include <svx/rectenum.hxx>	//add for enum RECT_POINT
 #include <com/sun/star/container/XIndexContainer.hpp> //add for FmShowColsDialog
@@ -47,6 +45,8 @@ namespace linguistic2{
     class XDictionary;
     class XSpellChecker1;
     class XSpellChecker;
+    class XThesaurus;
+    class XHyphenator;
 }}}}
 class SvxSpellWrapper; //add for SvxSpellCheckDialog
 typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
@@ -61,6 +61,8 @@ class SearchAttrItemList;
 class FmFormShell;
 class Graphic;
 class SdrObject;
+class SvxSpellWrapper;
+
 namespace svx{ class SpellDialogChildWindow;}
 
 #define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >()
@@ -73,33 +75,6 @@ public:
     virtual SvxDistributeVertical GetDistributeVer() const = 0;
 };
 
-class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog //add for HangulHanjaConversionDialog
-{
- public:
-    virtual void EnableRubySupport( sal_Bool _bVal ) = 0;
-     virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0;
-    virtual	void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0;
-     virtual void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ) = 0;
-    virtual void	SetOptionsChangedHdl( const Link& _rHdl ) = 0;
-     virtual void	SetIgnoreHdl( const Link& _rHdl ) = 0;
-     virtual void	SetIgnoreAllHdl( const Link& _rHdl ) = 0;
-     virtual void	SetChangeHdl( const Link& _rHdl ) = 0;
-     virtual void	SetChangeAllHdl( const Link& _rHdl ) = 0;
-    virtual void	SetClickByCharacterHdl( const Link& _rHdl ) = 0;
-     virtual void	SetConversionFormatChangedHdl( const Link& _rHdl ) = 0;
-     virtual void	SetFindHdl( const Link& _rHdl ) = 0;
-    virtual sal_Bool		GetUseBothDirections( ) const= 0;
-    virtual HangulHanjaConversion::ConversionDirection    GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0;
-    virtual void	SetCurrentString(
-                    const String& _rNewString,
-                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
-                    bool _bOriginatesFromDocument = true )=0;
-    virtual String	GetCurrentString( ) const =0;
-    virtual HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const =0;
-    virtual void	FocusSuggestion( )= 0;
-    virtual String	GetCurrentSuggestion( ) const =0;
-};
-
 class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDialog
 {
  public:
@@ -356,12 +331,12 @@ public:
 
 //-------------------------------------------------------------
 
-class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory
+class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public EditAbstractDialogFactory
 {
 public:
     static SvxAbstractDialogFactory* Create();
 
-    // define dtor as this will create typeinfo in svx library
+    // define dtor as this will create typeinfo and in svx library and export vtable
     virtual								~SvxAbstractDialogFactory();
 
     virtual SfxAbstractTabDialog* 		CreateTextTabDialog( Window* pParent,
@@ -378,9 +353,6 @@ public:
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
                                             SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0;
 
-    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
-                                            HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
-
     virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0;
     
     virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,  //add for SvxZoomDialog
diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h
index bb52c1e9bf..de790b8e40 100644
--- a/svx/inc/svx/svxdllapi.h
+++ b/svx/inc/svx/svxdllapi.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxdllapi.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/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 4bf16135aa..665ee7fba6 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.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: svxids.hrc,v $
- * $Revision: 1.10.132.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/sfx.hrc>
 #include <sfx2/sfxsids.hrc>
-
+#include <editeng/editids.hrc>
 #include <svx/unomid.hxx>
 
 // solange noch im sfxids.hrc definiert -------------------------------------
@@ -44,18 +41,12 @@
 #undef SID_INSERT_FRAME
 #endif
 
-// ID-Bereiche --------------------------------------------------------------
-
-// Slot-Id's
-#define SID_SVX_END 						(SID_LIB_START + 1199)
-
 // --------------------------------------------------------------------------
 // Member-Id's
 // --------------------------------------------------------------------------
 
 #define MID_APPFLAG             0x20
 #define MID_AUTOBREAK           0x21
-#define MID_BG_COLOR            0x22
 #define MID_BREAKxxx            0x22
 #define MID_BRUSHSTYLE          0x23
 #define MID_CELLTYPE            0x24
@@ -63,32 +54,26 @@
 #define MID_COMMAND             0x26
 #define MID_CONTENT             0x27
 #define MID_DESCNAMExxx         0x28
-#define MID_DISTANCE            0x29
+
 #define MID_ESCAPEMENT          0x2a
 #define MID_FAMILY              0x2b
-#define MID_FG_COLOR            0x2c
 #define MID_FIRSTLINE_OFFSET    0x2d
-#define MID_FLAGS               0x2e
 #define MID_FONTFAMILY          0x2f
 #define MID_FONTFAMILYNAME      0x30
 #define MID_FONTPITCH           0x31
 #define MID_FONTSTYLE           0x32
 #define MID_PERCENT             0x33
 #define MID_HYPHEN              0x34
-#define MID_INNER_WIDTH         0x35
 #define MID_INTER_LINESPACE     0x36
 #define MID_INTER_SPACE         0x37
 #define MID_LANDSCAPE           0x38
 
 #define MID_LEFT_MARGIN         0x3a
-#define MID_LINESPACE           0x3b
-#define MID_LOCATION            0x3c
 #define MID_LOWER               0x3d
 #define MID_MAXHYPHENS          0x3e
 #define MID_MINLEAD             0x3f
 #define MID_MINTRAIL            0x40
 #define MID_NUMTYPExxx          0x41
-#define MID_OUTER_WIDTH         0x41
 #define MID_PAGEEND             0x42
 #define MID_POS                 0x43
 #define MID_PROPORTIONAL        0x44
@@ -97,7 +82,6 @@
 #define MID_RIGHT_MARGIN        0x47
 #define MID_ROW_DIRECTION       0x48
 #define MID_SIZE                0x4a
-#define MID_TRANSPARENT         0x4b
 #define MID_TYPE                0x4c
 #define MID_UPPER               0x4d
 #define MID_USExxx              0x4e
@@ -426,59 +410,14 @@
 // --------------------------------------------------------------------------
 
 #define SID_ATTR_ZOOM                                   ( SID_SVX_START + 0 )
-#define SID_ATTR_BRUSH                                  ( SID_SVX_START + 1 )
-#define SID_ATTR_TABSTOP                                ( SID_SVX_START + 2 )
-#define SID_ATTR_TABSTOP_DEFAULTS                       ( SID_SVX_START + 3 )
-#define SID_ATTR_TABSTOP_POS                            ( SID_SVX_START + 4 )
-#define SID_ATTR_TABSTOP_OFFSET                         ( SID_SVX_START + 5 )
-//#define SID_ATTR_CHAR                                   ( SID_SVX_START + 6 )     -> sfxsids.hrc
-//#define SID_ATTR_CHAR_FONT                              ( SID_SVX_START + 7 )     -> sfxsids.hrc
-//#define SID_ATTR_CHAR_POSTURE                           ( SID_SVX_START + 8 )     -> sfxsids.hrc
-//#define SID_ATTR_CHAR_WEIGHT                            ( SID_SVX_START + 9 )     -> sfxsids.hrc
-//#define SID_ATTR_CHAR_SHADOWED                          ( SID_SVX_START + 10 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_WORDLINEMODE                      ( SID_SVX_START + 11 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_CONTOUR                           ( SID_SVX_START + 12 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_STRIKEOUT                         ( SID_SVX_START + 13 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_UNDERLINE                         ( SID_SVX_START + 14 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_FONTHEIGHT                        ( SID_SVX_START + 15 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_PROPSIZE                          ( SID_SVX_START + 16 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_COLOR                             ( SID_SVX_START + 17 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_KERNING                           ( SID_SVX_START + 18 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_CASEMAP                           ( SID_SVX_START + 19 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_LANGUAGE                          ( SID_SVX_START + 20 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_ESCAPEMENT                        ( SID_SVX_START + 21 )    -> sfxsids.hrc
-//#define SID_ATTR_CHAR_FONTLIST                          ( SID_SVX_START + 22 )    -> sfxsids.hrc
+
 #define SID_ATTR_BORDER_INNER                           ( SID_SVX_START + 23 )
-#define SID_ATTR_BORDER_OUTER                           ( SID_SVX_START + 24 )
-#define SID_ATTR_BORDER_SHADOW                          ( SID_SVX_START + 25 )
-#define SID_ATTR_PARA                                   ( SID_SVX_START + 26 )
-#define SID_ATTR_PARA_ADJUST                            ( SID_SVX_START + 27 )
-#define SID_ATTR_PARA_ADJUST_LEFT                       ( SID_SVX_START + 28 )
-#define SID_TEXT_ALIGNLEFT                                  SID_ATTR_PARA_ADJUST_LEFT
-#define SID_ATTR_PARA_ADJUST_RIGHT                      ( SID_SVX_START + 29 )
-#define SID_TEXT_ALIGNRIGHT                                 SID_ATTR_PARA_ADJUST_RIGHT
-#define SID_ATTR_PARA_ADJUST_CENTER                     ( SID_SVX_START + 30 )
-#define SID_TEXT_ALIGNCENTER                                SID_ATTR_PARA_ADJUST_CENTER
-#define SID_ATTR_PARA_ADJUST_BLOCK                      ( SID_SVX_START + 31 )
-#define SID_TEXT_ALIGNBLOCK                                 SID_ATTR_PARA_ADJUST_BLOCK
-#define SID_ATTR_PARA_ADJUST_BLOCKLINE                  ( SID_SVX_START + 32 )
-#define SID_ATTR_PARA_LINESPACE                         ( SID_SVX_START + 33 )
-#define SID_ATTR_PARA_LINESPACE_10                      ( SID_SVX_START + 34 )
-#define SID_ATTR_PARA_LINESPACE_15                      ( SID_SVX_START + 35 )
-#define SID_ATTR_PARA_LINESPACE_20                      ( SID_SVX_START + 36 )
-#define SID_ATTR_PARA_PAGEBREAK                         ( SID_SVX_START + 37 )
-#define SID_ATTR_PARA_HYPHENZONE                        ( SID_SVX_START + 38 )
-#define SID_ATTR_PARA_SPLIT                             ( SID_SVX_START + 39 )
-#define SID_ATTR_PARA_ORPHANS                           ( SID_SVX_START + 40 )
-#define SID_ATTR_PARA_WIDOWS                            ( SID_SVX_START + 41 )
-#define SID_ATTR_PARA_ULSPACE                           ( SID_SVX_START + 42 )
-#define SID_ATTR_PARA_LRSPACE                           ( SID_SVX_START + 43 )
+
+
 #define SID_ATTR_POSTIT_AUTHOR                          ( SID_SVX_START + 44 )
 #define SID_ATTR_POSTIT_DATE                            ( SID_SVX_START + 45 )
 #define SID_ATTR_POSTIT_TEXT                            ( SID_SVX_START + 46 )
 #define SID_ATTR_SEARCH                                 ( SID_SVX_START + 47 )
-#define SID_ATTR_LRSPACE                                ( SID_SVX_START + 48 )
-#define SID_ATTR_ULSPACE                                ( SID_SVX_START + 49 )
 #define SID_ATTR_PAGE                                   ( SID_SVX_START + 50 )
 #define SID_ATTR_PAGE_SIZE                              ( SID_SVX_START + 51 )
 #define SID_ATTR_PAGE_MAXSIZE                           ( SID_SVX_START + 52 )
@@ -492,10 +431,6 @@
 #define SID_ATTR_PAGE_DYNAMIC                           ( SID_SVX_START + 61 )
 #define SID_ATTR_PAGE_SHARED                            ( SID_SVX_START + 62 )
 #define SID_ATTR_PAGE_BSP                               ( SID_SVX_START + 63 )
-//#define SID_ATTR_CHAR_MAPTYPE                           ( SID_SVX_START + 64 )    -> sfxsids.hrc
-#define SID_ATTR_PARA_MODEL                             ( SID_SVX_START + 65 )
-#define SID_ATTR_PARA_KEEP                              ( SID_SVX_START + 66 )
-//#define SID_ATTR_CHAR_AUTOKERN                          ( SID_SVX_START + 67 )    -> sfxsids.hrc
 #define SID_ATTR_DBSESS_SERVERTYPE                      ( SID_SVX_START + 70 )
 #define SID_ATTR_DBSESS_SERVEROPTS                      ( SID_SVX_START + 71 )
 #define SID_ATTR_DBSESS_USERNAME                        ( SID_SVX_START + 72 )
@@ -504,12 +439,6 @@
 #define SID_ATTR_DBSESS_SAVEUSER                        ( SID_SVX_START + 75 )
 #define SID_ATTR_DBSESS_SERVERNAME                      ( SID_SVX_START + 76 )
 #define SID_ATTR_DBSESS_ENABLETYPE                      ( SID_SVX_START + 77 )
-#define SID_RULER_NULL_OFFSET                           ( SID_SVX_START + 79 )
-#define SID_RULER_BORDERS                               ( SID_SVX_START + 80 )
-#define SID_RULER_OBJECT                                ( SID_SVX_START + 81 )
-#define SID_RULER_PAGE_POS                              ( SID_SVX_START + 82 )
-#define SID_RULER_ACT_LINE_ONLY                         ( SID_SVX_START + 83 )
-#define SID_RULER_LR_MIN_MAX                            ( SID_SVX_START + 84 )
 #define SID_ATTR_NUMBERFORMAT_VALUE                     ( SID_SVX_START + 85 )
 #define SID_ATTR_NUMBERFORMAT_INFO                      ( SID_SVX_START + 86 )
 #define SID_ATTR_TRANSFORM                              ( SID_SVX_START + 87 )
@@ -521,6 +450,12 @@
 #define SID_ATTR_TRANSFORM_ROT_X                        ( SID_SVX_START + 93 )
 #define SID_ATTR_TRANSFORM_ROT_Y                        ( SID_SVX_START + 94 )
 #define SID_ATTR_TRANSFORM_ANGLE                        ( SID_SVX_START + 95 )
+#define SID_RULER_NULL_OFFSET                           ( SID_SVX_START + 79 )
+#define SID_RULER_BORDERS                               ( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT                                ( SID_SVX_START + 81 )
+#define SID_RULER_PAGE_POS                              ( SID_SVX_START + 82 )
+#define SID_RULER_ACT_LINE_ONLY                         ( SID_SVX_START + 83 )
+#define SID_RULER_LR_MIN_MAX                            ( SID_SVX_START + 84 )
 //#define SID_ZOOM_TOOLBOX                                ( SID_SVX_START + 96 )    -> sfxsids.hrc
 //#define SID_ZOOM_OUT                                    ( SID_SVX_START + 97 )    -> sfxsids.hrc
 //#define SID_ZOOM_IN                                     ( SID_SVX_START + 98 )    -> sfxsids.hrc
@@ -671,7 +606,6 @@
 #define SID_SPELL_DIALOG                                 ( SID_SVX_START + 243 )
 #define SID_INSERT_DRAW                                 ( SID_SVX_START + 244 )
 #define SID_THESAURUS                                   ( SID_SVX_START + 245 )
-#define SID_ATTR_PARA_BULLET                            ( SID_SVX_START + 250 )
 #define SID_AUTOCOMPLETEWORD                            ( SID_SVX_START + 251 )
 #define SID_DRAW_TEXT                                   ( SID_SVX_START + 253 )
 #define SID_DRAW_CAPTION                                ( SID_SVX_START + 254 )
@@ -720,10 +654,8 @@
 #define SID_PARA_DLG                                    ( SID_SVX_START + 297 )
 #define SID_ATTR_GRID_OPTIONS                           ( SID_SVX_START + 298 )
 #define SID_ATTR_FILL_SHADOW                            ( SID_SVX_START + 299 )
-#define SID_ATTR_PARA_OUTLLEVEL                         ( SID_SVX_START + 300 )
 #define SID_ATTR_LINEEND_STYLE                          ( SID_SVX_START + 301 )
 #define SID_ATTR_TRANSFORM_SLANT                        ( SID_SVX_START + 302 ) // !!!
-//#define SID_ATTR_CHAR_FONTWIDTH                         ( SID_SVX_START + 303 )   -> sfxsids.hrc
 #define SID_ATTR_TRANSFORM_SHEAR                        ( SID_SVX_START + 304 )
 #define SID_ATTR_TRANSFORM_SHEAR_X                      ( SID_SVX_START + 305 )
 #define SID_ATTR_TRANSFORM_SHEAR_Y                      ( SID_SVX_START + 306 )
@@ -768,7 +700,6 @@
 //#define SID_HYPERLINK_INSERT                            ( SID_SVX_START + 360 )   -> sfxsids.hrc
 //#define SID_HYPERLINK_GETLINK                           ( SID_SVX_START + 361 )   -> sfxsids.hrc
 //#define SID_HYPERLINK_SETLINK                           ( SID_SVX_START + 362 )   -> sfxsids.hrc
-#define SID_FIELD                                       ( SID_SVX_START + 363 )
 #define SID_NO_GRAPHICS                                 ( SID_SVX_START + 364 )
 #define SID_IMPORT_GRAPH_LASTURL                        ( SID_SVX_START + 365 )
 //#define SID_NAVIGATOR                                   ( SID_SVX_START + 366 )   -> sfxsids.hrc
@@ -816,7 +747,6 @@
 #define SID_ATTR_3D_AMBIENTINTENSITY                    ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
 #define SID_ATTR_3D_AMBIENTCOLOR                        ( SID_SVX_START + 411 )
 #define SID_IMPORT_GRAPH_LINK                           ( SID_SVX_START + 412 )
-#define SID_ATTR_PARA_REGISTER                          ( SID_SVX_START + 413 )
 #define SID_HTML_MODE                                   ( SID_SVX_START + 414 )
 #define SID_RULER_PROTECT                               ( SID_SVX_START + 415 )
 //#define SID_INET_DLG                                    ( SID_SVX_START + 416 )   -> sfxsids.hrc
@@ -863,7 +793,6 @@
 #define SID_GROUP                                       ( SID_SVX_START + 454 )
 #define SID_UNGROUP                                     ( SID_SVX_START + 455 )
 #define SID_SET_DEFAULT                                 ( SID_SVX_START + 456 )
-#define SID_ATTR_PARA_PAGENUM                           ( SID_SVX_START + 457 )
 #define SID_BEZIER                                      ( SID_SVX_START + 458 )
 #define SID_ATTR_3D_DOUBLE_SIDED                        ( SID_SVX_START + 459 )
 #define SID_ATTR_ALIGN_INDENT                           ( SID_SVX_START + 460 )
@@ -887,11 +816,7 @@
 #define SID_GRFFILTER_POPART                            ( SID_SVX_START + 478 )
 #define SID_GRFFILTER_SEPIA                             ( SID_SVX_START + 479 )
 #define SID_GRFFILTER_SOLARIZE                          ( SID_SVX_START + 480 )
-//#define SID_ATTR_CHAR_COLOR_EXT                         ( SID_SVX_START + 488 )   -> sfxsids.hrc
-//#define SID_ATTR_CHAR_COLOR_BACKGROUND                  ( SID_SVX_START + 489 )   -> sfxsids.hrc
-//#define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT              ( SID_SVX_START + 490 )   -> sfxsids.hrc
 #define SID_COLL_CLEAR                                  ( SID_SVX_START + 536 )
-//#define SID_ATTR_CHAR_COLOR2                            ( SID_SVX_START + 537 )   -> sfxsids.hrc
 #define SID_SHOW_ADDRESS                                ( SID_SVX_START + 538 )
 #define SID_APP_ENTERWAIT                               ( SID_SVX_START + 550 )
 #define SID_APP_LEAVEWAIT                               ( SID_SVX_START + 551 )
@@ -922,11 +847,10 @@
 #define SID_TAB_REMOVE_ALL                              ( SID_SVX_START + 583 )
 #define SID_TAB_REMOVE_BY_INDEX                         ( SID_SVX_START + 584 )
 #define SID_OFA_VW_CREATE                               ( SID_SVX_START + 585 )
-#define SID_ATTR_PARA_NUMRULE                           ( SID_SVX_START + 587 )
 #define SID_OFA_REL_DESIGNVIEW                          ( SID_SVX_START + 588 )
 #define SID_OFA_MANUAL_SQL                              ( SID_SVX_START + 589 )
 #define SID_PARA_BACKGRND_DESTINATION                   ( SID_SVX_START + 590 )
-#define SID_ATTR_BRUSH_CHAR                             ( SID_SVX_START + 591 )
+
 #define SID_FMSLOTS_START                               ( SID_SVX_START + 592 )
 #define SID_FM_CONFIG                                   ( SID_SVX_START + 593 )
 #define SID_FM_PUSHBUTTON                               ( SID_SVX_START + 594 )
@@ -1117,7 +1041,6 @@
 #define SID_HLINKBAR_BOOKMARK                           ( SID_SVX_START + 852 )
 #define SID_HLINKBAR_SEARCH                             ( SID_SVX_START + 853 )
 #define SID_HLINKBAR_TARGET                             ( SID_SVX_START + 854 )
-#define SID_ATTR_NUMBERING_RULE                         ( SID_SVX_START + 855 )
 #define SID_PARAM_NUM_PRESET                            ( SID_SVX_START + 856 )
 #define SID_PARAM_CUR_NUMBER                            ( SID_SVX_START + 857 )
 #define SID_PARAM_CHILD_LEVELS                          ( SID_SVX_START + 858 )
@@ -1136,38 +1059,17 @@
 #define SID_ATTR_GRAF_RESERVE3                          ( SID_SVX_START + 873 )
 #define SID_ATTR_GRAF_RESERVE4                          ( SID_SVX_START + 874 )
 #define SID_ATTR_GRAF_RESERVE5                          ( SID_SVX_START + 875 )
-#define SID_ATTR_CHAR_CHARSETCOLOR                      ( SID_SVX_START + 877 )
 //#define SID_COMP_BIBLIOGRAPHY                           ( SID_SVX_START + 880 )   -> sfxsids.hrc
 #define SID_ATTR_GRAF_KEEP_ZOOM                         ( SID_SVX_START + 882 )
 #define SID_ATTR_GRAF_CROP                              ( SID_SVX_START + 883 )
 #define SID_ATTR_GRAF_FRMSIZE                           ( SID_SVX_START + 884 )
 #define SID_ATTR_GRAF_FRMSIZE_PERCENT                   ( SID_SVX_START + 885 )
 #define SID_ATTR_GRAF_GRAPHIC                           ( SID_SVX_START + 886 )
-#define SID_ATTR_CHAR_CJK_FONT                          ( SID_SVX_START + 887 )
-#define SID_ATTR_CHAR_CJK_FONTHEIGHT                    ( SID_SVX_START + 888 )
-#define SID_ATTR_CHAR_CJK_LANGUAGE                      ( SID_SVX_START + 889 )
-#define SID_ATTR_CHAR_CJK_POSTURE                       ( SID_SVX_START + 890 )
-#define SID_ATTR_CHAR_CJK_WEIGHT                        ( SID_SVX_START + 891 )
-#define SID_ATTR_CHAR_CTL_FONT                          ( SID_SVX_START + 892 )
-#define SID_ATTR_CHAR_CTL_FONTHEIGHT                    ( SID_SVX_START + 893 )
-#define SID_ATTR_CHAR_CTL_LANGUAGE                      ( SID_SVX_START + 894 )
-#define SID_ATTR_CHAR_CTL_POSTURE                       ( SID_SVX_START + 895 )
-#define SID_ATTR_CHAR_CTL_WEIGHT                        ( SID_SVX_START + 896 )
-#define SID_ATTR_CHAR_TWO_LINES                         ( SID_SVX_START + 897 )
-#define SID_ATTR_CHAR_CJK_RUBY                          ( SID_SVX_START + 898 )
-#define SID_ATTR_CHAR_EMPHASISMARK                      ( SID_SVX_START + 899 )
-#define SID_ATTR_CHAR_SCRIPTTYPE                        ( SID_SVX_START + 900 )
-#define SID_ATTR_PARA_SCRIPTSPACE                       ( SID_SVX_START + 901 )
-#define SID_ATTR_PARA_HANGPUNCTUATION                   ( SID_SVX_START + 902 )
-#define SID_ATTR_PARA_FORBIDDEN_RULES                   ( SID_SVX_START + 903 )
 #define SID_ASIAN_DLG                                   ( SID_SVX_START + 904 )
-#define SID_DRAW_TEXT_VERTICAL                          ( SID_SVX_START + 905 )
-#define SID_ATTR_CHAR_VERTICAL                              SID_DRAW_TEXT_VERTICAL
+#define SID_DRAW_TEXT_VERTICAL                          SID_ATTR_CHAR_VERTICAL
 #define SID_DRAW_CAPTION_VERTICAL                       ( SID_SVX_START + 906 )
 #define SID_TEXTDIRECTION_LEFT_TO_RIGHT                 ( SID_SVX_START + 907 )
 #define SID_TEXTDIRECTION_TOP_TO_BOTTOM                 ( SID_SVX_START + 908 )
-#define SID_ATTR_CHAR_ROTATED                           ( SID_SVX_START + 910 )
-#define SID_ATTR_CHAR_SCALEWIDTH                        ( SID_SVX_START + 911 )
 #define SID_TRANSLITERATE_UPPER                         ( SID_SVX_START + 912 )
 #define SID_TRANSLITERATE_LOWER                         ( SID_SVX_START + 913 )
 #define SID_TRANSLITERATE_HALFWIDTH                     ( SID_SVX_START + 914 )
@@ -1175,12 +1077,10 @@
 #define SID_TRANSLITERATE_HIRAGANA                      ( SID_SVX_START + 916 )
 #define SID_TRANSLITERATE_KATAGANA                      ( SID_SVX_START + 917 )
 #define SID_MN_SUB_TRANSLITERATE                        ( SID_SVX_START + 918 )
-#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE                 ( SID_SVX_START + 919 )
-#define SID_ATTR_CHAR_RELIEF                            ( SID_SVX_START + 920 )
 #define SID_LANGUAGE_OPTIONS                            ( SID_SVX_START + 921 )
 #define SID_GETUNDOSTRINGS                              ( SID_SVX_START + 923 )
 #define SID_GETREDOSTRINGS                              ( SID_SVX_START + 924 )
-#define SID_PARA_VERTALIGN                              ( SID_SVX_START + 925 )
+
 #define SID_INSERT_IMAGECONTROL                         ( SID_SVX_START + 926 )
 #define SID_INSERT_PROGRESSBAR                          ( SID_SVX_START + 927 )
 #define SID_INSERT_HFIXEDLINE                           ( SID_SVX_START + 928 )
@@ -1199,14 +1099,9 @@
 #define SID_INSERT_PATTERNFIELD                         ( SID_SVX_START + 941 )
 #define SID_INSERT_FILECONTROL                          ( SID_SVX_START + 942 )
 #define SID_SHOW_PROPERTYBROWSER                        ( SID_SVX_START + 943 )
-#define SID_ATTR_FRAMEDIRECTION                         ( SID_SVX_START + 944 )
-#define SID_ATTR_PARA_SNAPTOGRID                        ( SID_SVX_START + 945 )
 #define SID_ATTR_TABSTOP_VERTICAL                       ( SID_SVX_START + 946 )
-#define SID_ATTR_PARA_LRSPACE_VERTICAL                  ( SID_SVX_START + 947 )
 #define SID_RULER_BORDERS_VERTICAL                      ( SID_SVX_START + 948 )
 #define SID_ATTR_ALIGN_ASIANVERTICAL                    ( SID_SVX_START + 949 )
-#define SID_ATTR_PARA_LEFT_TO_RIGHT                     ( SID_SVX_START + 950 )
-#define SID_ATTR_PARA_RIGHT_TO_LEFT                     ( SID_SVX_START + 951 )
 #define SID_RULER_TEXT_RIGHT_TO_LEFT                    ( SID_SVX_START + 952 )
 #define SID_ATTR_HDFT_DYNAMIC_SPACING                   ( SID_SVX_START + 953 )
 #define SID_ATTR_NUMBERFORMAT_ADD_AUTO                  ( SID_SVX_START + 954 )
@@ -1244,16 +1139,10 @@
 #define SID_FONTWORK_KERN_CHARACTER_PAIRS               ( SID_SVX_START + 986 )
 #define SID_DRAW_FONTWORK                               ( SID_SVX_START + 987 )
 #define SID_DRAW_FONTWORK_VERTICAL                      ( SID_SVX_START + 988 )
-#define SID_ATTR_CHAR_HIDDEN                            ( SID_SVX_START + 989 )
 #define SID_ATTR_BORDER_CONNECT                         ( SID_SVX_START + 990 )
 #define SID_SW_FOLLOW_TEXT_FLOW                         ( SID_SVX_START + 991 ) /* #i18732# - slot-id for new option IsFollowingTextFlow' */
 #define SID_RULER_ROWS                                  ( SID_SVX_START + 992 )
 #define SID_RULER_ROWS_VERTICAL                         ( SID_SVX_START + 993 )
-#define SID_ATTR_CHAR_LATIN_FONT                        ( SID_SVX_START + 994 )
-#define SID_ATTR_CHAR_LATIN_FONTHEIGHT                  ( SID_SVX_START + 995 )
-#define SID_ATTR_CHAR_LATIN_LANGUAGE                    ( SID_SVX_START + 996 )
-#define SID_ATTR_CHAR_LATIN_POSTURE                     ( SID_SVX_START + 997 )
-#define SID_ATTR_CHAR_LATIN_WEIGHT                      ( SID_SVX_START + 998 )
 #define SID_ATTR_TRANSFORM_HORI_POSITION                ( SID_SVX_START + 999 )
 #define SID_ATTR_TRANSFORM_VERT_POSITION                ( SID_SVX_START + 1000 )
 #define SID_SHOW_ITEMBROWSER                            ( SID_SVX_START + 1001 )
@@ -1349,7 +1238,6 @@
 #define SID_TABLE_STYLE_SETTINGS						(SID_SVX_START+1089)
 #define SID_CHAR_DLG_PREVIEW_STRING                     (SID_SVX_START+1090)
 #define SID_RECHECK_DOCUMENT                            (SID_SVX_START+1091)
-#define SID_ATTR_PARA_OUTLINE_LEVEL                     (SID_SVX_START+1092)
 #define SID_OBJECT_MIRROR                               (SID_SVX_START+1093)
 
 #define SID_DELETE_POSTIT								(SID_SVX_START+1094)
diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index 8800b7cb46..1909e2d955 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.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: svxitems.hrc,v $
- * $Revision: 1.3.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,13 +29,7 @@
 
 // include ------------------------------------------------------------------
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
-
-// BOOL ---------------------------------------------------------------------
-#define RID_SVXITEMS_TRUE					(RID_SVXITEMS_START +  0)
-#define RID_SVXITEMS_FALSE					(RID_SVXITEMS_START +  1)
 
 // Extras -------------------------------------------------------------------
 #define RID_SVXITEMS_EXTRAS_CHARCOLOR		(RID_SVXITEMS_START +  2)
@@ -68,24 +59,6 @@
 #define RID_SVXITEMS_SEARCHAPP_DRAW			(RID_SVXITEMS_START + 27)
 #define RID_SVXITEMS_SEARCHAPP_BASE			(RID_SVXITEMS_START + 28)
 
-// enum SvxBreak ------------------------------------------------------------
-#define RID_SVXITEMS_BREAK_BEGIN			(RID_SVXITEMS_START + 30)
-#define RID_SVXITEMS_BREAK_NONE				(RID_SVXITEMS_START + 30)
-#define RID_SVXITEMS_BREAK_COLUMN_BEFORE	(RID_SVXITEMS_START + 31)
-#define RID_SVXITEMS_BREAK_COLUMN_AFTER		(RID_SVXITEMS_START + 32)
-#define RID_SVXITEMS_BREAK_COLUMN_BOTH		(RID_SVXITEMS_START + 33)
-#define RID_SVXITEMS_BREAK_PAGE_BEFORE		(RID_SVXITEMS_START + 34)
-#define RID_SVXITEMS_BREAK_PAGE_AFTER		(RID_SVXITEMS_START + 35)
-#define RID_SVXITEMS_BREAK_PAGE_BOTH		(RID_SVXITEMS_START + 36)
-
-// enum SvxShadowLocation ---------------------------------------------------
-#define RID_SVXITEMS_SHADOW_BEGIN			(RID_SVXITEMS_START + 40)
-#define RID_SVXITEMS_SHADOW_NONE			(RID_SVXITEMS_START + 40)
-#define RID_SVXITEMS_SHADOW_TOPLEFT			(RID_SVXITEMS_START + 41)
-#define RID_SVXITEMS_SHADOW_TOPRIGHT		(RID_SVXITEMS_START + 42)
-#define RID_SVXITEMS_SHADOW_BOTTOMLEFT		(RID_SVXITEMS_START + 43)
-#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT		(RID_SVXITEMS_START + 44)
-
 // enum BrushStyle ----------------------------------------------------------
 #define RID_SVXITEMS_BRUSHSTYLE_BEGIN		(RID_SVXITEMS_START + 45)
 #define RID_SVXITEMS_BRUSHSTYLE_NULL		(RID_SVXITEMS_START + 45)
@@ -101,41 +74,6 @@
 #define RID_SVXITEMS_BRUSHSTYLE_75			(RID_SVXITEMS_START + 55)
 #define RID_SVXITEMS_BRUSHSTYLE_BITMAP		(RID_SVXITEMS_START + 56)
 
-// enum ColorName -----------------------------------------------------------
-#define RID_SVXITEMS_COLOR_BEGIN			(RID_SVXITEMS_START + 60)
-#define RID_SVXITEMS_COLOR					(RID_SVXITEMS_START + 60)
-#define RID_SVXITEMS_COLOR_BLACK			(RID_SVXITEMS_START + 61)
-#define RID_SVXITEMS_COLOR_BLUE				(RID_SVXITEMS_START + 62)
-#define RID_SVXITEMS_COLOR_GREEN			(RID_SVXITEMS_START + 63)
-#define RID_SVXITEMS_COLOR_CYAN				(RID_SVXITEMS_START + 64)
-#define RID_SVXITEMS_COLOR_RED				(RID_SVXITEMS_START + 65)
-#define RID_SVXITEMS_COLOR_MAGENTA			(RID_SVXITEMS_START + 66)
-#define RID_SVXITEMS_COLOR_BROWN			(RID_SVXITEMS_START + 67)
-#define RID_SVXITEMS_COLOR_GRAY				(RID_SVXITEMS_START + 68)
-#define RID_SVXITEMS_COLOR_LIGHTGRAY		(RID_SVXITEMS_START + 69)
-#define RID_SVXITEMS_COLOR_LIGHTBLUE		(RID_SVXITEMS_START + 70)
-#define RID_SVXITEMS_COLOR_LIGHTGREEN		(RID_SVXITEMS_START + 71)
-#define RID_SVXITEMS_COLOR_LIGHTCYAN		(RID_SVXITEMS_START + 72)
-#define RID_SVXITEMS_COLOR_LIGHTRED			(RID_SVXITEMS_START + 73)
-#define RID_SVXITEMS_COLOR_LIGHTMAGENTA		(RID_SVXITEMS_START + 74)
-#define RID_SVXITEMS_COLOR_YELLOW			(RID_SVXITEMS_START + 75)
-#define RID_SVXITEMS_COLOR_WHITE			(RID_SVXITEMS_START + 76)
-#define RID_SVXITEMS_COLOR_MENUBAR			(RID_SVXITEMS_START + 77)
-#define RID_SVXITEMS_COLOR_MENUBARTEXT		(RID_SVXITEMS_START + 78)
-#define RID_SVXITEMS_COLOR_POPUPMENU		(RID_SVXITEMS_START + 79)
-#define RID_SVXITEMS_COLOR_POPUPMENUTEXT	(RID_SVXITEMS_START + 80)
-#define RID_SVXITEMS_COLOR_WINDOWTEXT		(RID_SVXITEMS_START + 81)
-#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE	(RID_SVXITEMS_START + 82)
-#define RID_SVXITEMS_COLOR_HIGHLIGHT		(RID_SVXITEMS_START + 83)
-#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT	(RID_SVXITEMS_START + 84)
-#define RID_SVXITEMS_COLOR_3DTEXT			(RID_SVXITEMS_START + 85)
-#define RID_SVXITEMS_COLOR_3DFACE			(RID_SVXITEMS_START + 86)
-#define RID_SVXITEMS_COLOR_3DLIGHT			(RID_SVXITEMS_START + 87)
-#define RID_SVXITEMS_COLOR_3DSHADOW			(RID_SVXITEMS_START + 88)
-#define RID_SVXITEMS_COLOR_SCROLLBAR		(RID_SVXITEMS_START + 89)
-#define RID_SVXITEMS_COLOR_FIELD			(RID_SVXITEMS_START + 90)
-#define RID_SVXITEMS_COLOR_FIELDTEXT		(RID_SVXITEMS_START + 91)
-
 // enum FontFamily -------------------------------------------------------
 #define RID_SVXITEMS_FONTFAMILY_BEGIN		(RID_SVXITEMS_START + 100)
 #define RID_SVXITEMS_FONTFAMILY_DONTKNOW	(RID_SVXITEMS_START + 100)
@@ -152,36 +90,6 @@
 #define RID_SVXITEMS_FONTPITCH_FIXED		(RID_SVXITEMS_START + 111)
 #define RID_SVXITEMS_FONTPITCH_VARIABLE		(RID_SVXITEMS_START + 112)
 
-// enum FontItalic -------------------------------------------------------
-#define RID_SVXITEMS_ITALIC_BEGIN			(RID_SVXITEMS_START + 115)
-#define RID_SVXITEMS_ITALIC_NONE			(RID_SVXITEMS_START + 115)
-#define RID_SVXITEMS_ITALIC_OBLIQUE			(RID_SVXITEMS_START + 116)
-#define RID_SVXITEMS_ITALIC_NORMAL			(RID_SVXITEMS_START + 117)
-
-// enum FontWeight -------------------------------------------------------
-#define RID_SVXITEMS_WEIGHT_BEGIN			(RID_SVXITEMS_START + 120)
-#define RID_SVXITEMS_WEIGHT_DONTKNOW		(RID_SVXITEMS_START + 120)
-#define RID_SVXITEMS_WEIGHT_THIN			(RID_SVXITEMS_START + 121)
-#define RID_SVXITEMS_WEIGHT_ULTRALIGHT		(RID_SVXITEMS_START + 122)
-#define RID_SVXITEMS_WEIGHT_LIGHT			(RID_SVXITEMS_START + 123)
-#define RID_SVXITEMS_WEIGHT_SEMILIGHT		(RID_SVXITEMS_START + 124)
-#define RID_SVXITEMS_WEIGHT_NORMAL			(RID_SVXITEMS_START + 125)
-#define RID_SVXITEMS_WEIGHT_MEDIUM			(RID_SVXITEMS_START + 126)
-#define RID_SVXITEMS_WEIGHT_SEMIBOLD		(RID_SVXITEMS_START + 127)
-#define RID_SVXITEMS_WEIGHT_BOLD			(RID_SVXITEMS_START + 128)
-#define RID_SVXITEMS_WEIGHT_ULTRABOLD		(RID_SVXITEMS_START + 129)
-#define RID_SVXITEMS_WEIGHT_BLACK			(RID_SVXITEMS_START + 130)
-
-// enum FontStrikeout ----------------------------------------------------
-#define RID_SVXITEMS_STRIKEOUT_BEGIN		(RID_SVXITEMS_START + 135)
-#define RID_SVXITEMS_STRIKEOUT_NONE			(RID_SVXITEMS_START + 135)
-#define RID_SVXITEMS_STRIKEOUT_SINGLE		(RID_SVXITEMS_START + 136)
-#define RID_SVXITEMS_STRIKEOUT_DOUBLE		(RID_SVXITEMS_START + 137)
-#define RID_SVXITEMS_STRIKEOUT_DONTKNOW		(RID_SVXITEMS_START + 138)
-#define RID_SVXITEMS_STRIKEOUT_BOLD			(RID_SVXITEMS_START + 139)
-#define RID_SVXITEMS_STRIKEOUT_SLASH		(RID_SVXITEMS_START + 140)
-#define RID_SVXITEMS_STRIKEOUT_X			(RID_SVXITEMS_START + 141)
-
 // enum CharSet ----------------------------------------------------------
 #define RID_SVXITEMS_CHARSET_BEGIN			(RID_SVXITEMS_START + 145)
 #define RID_SVXITEMS_CHARSET_DONTKNOW		(RID_SVXITEMS_START + 145)
@@ -196,208 +104,6 @@
 #define RID_SVXITEMS_CHARSET_SYSTEM			(RID_SVXITEMS_START + 154)
 #define RID_SVXITEMS_CHARSET_SYMBOL			(RID_SVXITEMS_START + 155)
 
-// enum CASEMAP ----------------------------------------------------------
-#define RID_SVXITEMS_CASEMAP_BEGIN			(RID_SVXITEMS_START + 160)
-#define RID_SVXITEMS_CASEMAP_NONE			(RID_SVXITEMS_START + 160)
-#define RID_SVXITEMS_CASEMAP_VERSALIEN		(RID_SVXITEMS_START + 161)
-#define RID_SVXITEMS_CASEMAP_GEMEINE		(RID_SVXITEMS_START + 162)
-#define RID_SVXITEMS_CASEMAP_TITEL			(RID_SVXITEMS_START + 163)
-#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN	(RID_SVXITEMS_START + 164)
-
-// enum ESCAPEMENT -------------------------------------------------------
-#define RID_SVXITEMS_ESCAPEMENT_BEGIN		(RID_SVXITEMS_START + 166)
-#define RID_SVXITEMS_ESCAPEMENT_OFF			(RID_SVXITEMS_START + 166)
-#define RID_SVXITEMS_ESCAPEMENT_SUPER		(RID_SVXITEMS_START + 167)
-#define RID_SVXITEMS_ESCAPEMENT_SUB			(RID_SVXITEMS_START + 168)
-#define RID_SVXITEMS_ESCAPEMENT_AUTO		(RID_SVXITEMS_START + 169)
-
-// enum FontUnderline - used for underline -------------------------------
-#define RID_SVXITEMS_UL_BEGIN				(RID_SVXITEMS_START + 170)
-#define RID_SVXITEMS_UL_NONE				(RID_SVXITEMS_START + 170)
-#define RID_SVXITEMS_UL_SINGLE				(RID_SVXITEMS_START + 171)
-#define RID_SVXITEMS_UL_DOUBLE				(RID_SVXITEMS_START + 172)
-#define RID_SVXITEMS_UL_DOTTED				(RID_SVXITEMS_START + 173)
-#define RID_SVXITEMS_UL_DONTKNOW			(RID_SVXITEMS_START + 174)
-#define RID_SVXITEMS_UL_DASH				(RID_SVXITEMS_START + 175)
-#define RID_SVXITEMS_UL_LONGDASH			(RID_SVXITEMS_START + 176)
-#define RID_SVXITEMS_UL_DASHDOT				(RID_SVXITEMS_START + 177)
-#define RID_SVXITEMS_UL_DASHDOTDOT			(RID_SVXITEMS_START + 178)
-#define RID_SVXITEMS_UL_SMALLWAVE			(RID_SVXITEMS_START + 179)
-#define RID_SVXITEMS_UL_WAVE				(RID_SVXITEMS_START + 180)
-#define RID_SVXITEMS_UL_DOUBLEWAVE			(RID_SVXITEMS_START + 181)
-#define RID_SVXITEMS_UL_BOLD				(RID_SVXITEMS_START + 182)
-#define RID_SVXITEMS_UL_BOLDDOTTED			(RID_SVXITEMS_START + 183)
-#define RID_SVXITEMS_UL_BOLDDASH			(RID_SVXITEMS_START + 184)
-#define RID_SVXITEMS_UL_BOLDLONGDASH		(RID_SVXITEMS_START + 185)
-#define RID_SVXITEMS_UL_BOLDDASHDOT			(RID_SVXITEMS_START + 186)
-#define RID_SVXITEMS_UL_BOLDDASHDOTDOT		(RID_SVXITEMS_START + 187)
-#define RID_SVXITEMS_UL_BOLDWAVE			(RID_SVXITEMS_START + 188)
-
-// enum FontUnderline - used for overline --------------------------------
-#define RID_SVXITEMS_OL_BEGIN				(RID_SVXITEMS_START + 200)
-#define RID_SVXITEMS_OL_NONE				(RID_SVXITEMS_START + 200)
-#define RID_SVXITEMS_OL_SINGLE				(RID_SVXITEMS_START + 201)
-#define RID_SVXITEMS_OL_DOUBLE				(RID_SVXITEMS_START + 202)
-#define RID_SVXITEMS_OL_DOTTED				(RID_SVXITEMS_START + 203)
-#define RID_SVXITEMS_OL_DONTKNOW			(RID_SVXITEMS_START + 204)
-#define RID_SVXITEMS_OL_DASH				(RID_SVXITEMS_START + 205)
-#define RID_SVXITEMS_OL_LONGDASH			(RID_SVXITEMS_START + 206)
-#define RID_SVXITEMS_OL_DASHDOT				(RID_SVXITEMS_START + 207)
-#define RID_SVXITEMS_OL_DASHDOTDOT			(RID_SVXITEMS_START + 208)
-#define RID_SVXITEMS_OL_SMALLWAVE			(RID_SVXITEMS_START + 209)
-#define RID_SVXITEMS_OL_WAVE				(RID_SVXITEMS_START + 210)
-#define RID_SVXITEMS_OL_DOUBLEWAVE			(RID_SVXITEMS_START + 211)
-#define RID_SVXITEMS_OL_BOLD				(RID_SVXITEMS_START + 212)
-#define RID_SVXITEMS_OL_BOLDDOTTED			(RID_SVXITEMS_START + 213)
-#define RID_SVXITEMS_OL_BOLDDASH			(RID_SVXITEMS_START + 214)
-#define RID_SVXITEMS_OL_BOLDLONGDASH		(RID_SVXITEMS_START + 215)
-#define RID_SVXITEMS_OL_BOLDDASHDOT			(RID_SVXITEMS_START + 216)
-#define RID_SVXITEMS_OL_BOLDDASHDOTDOT		(RID_SVXITEMS_START + 217)
-#define RID_SVXITEMS_OL_BOLDWAVE			(RID_SVXITEMS_START + 218)
-
-// enum SvxAdjust -----------------------------------------------------------
-#define RID_SVXITEMS_ADJUST_BEGIN			(RID_SVXITEMS_START + 230)
-#define RID_SVXITEMS_ADJUST_LEFT			(RID_SVXITEMS_START + 230)
-#define RID_SVXITEMS_ADJUST_RIGHT			(RID_SVXITEMS_START + 231)
-#define RID_SVXITEMS_ADJUST_BLOCK			(RID_SVXITEMS_START + 232)
-#define RID_SVXITEMS_ADJUST_CENTER			(RID_SVXITEMS_START + 233)
-#define RID_SVXITEMS_ADJUST_BLOCKLINE		(RID_SVXITEMS_START + 234)
-
-// enum SvxAdjust -----------------------------------------------------------
-#define RID_SVXITEMS_TAB_DECIMAL_CHAR		(RID_SVXITEMS_START + 243)
-#define RID_SVXITEMS_TAB_FILL_CHAR			(RID_SVXITEMS_START + 244)
-#define RID_SVXITEMS_TAB_ADJUST_BEGIN		(RID_SVXITEMS_START + 245)
-#define RID_SVXITEMS_TAB_ADJUST_LEFT		(RID_SVXITEMS_START + 245)
-#define RID_SVXITEMS_TAB_ADJUST_RIGHT		(RID_SVXITEMS_START + 246)
-#define RID_SVXITEMS_TAB_ADJUST_DECIMAL		(RID_SVXITEMS_START + 247)
-#define RID_SVXITEMS_TAB_ADJUST_CENTER		(RID_SVXITEMS_START + 248)
-#define RID_SVXITEMS_TAB_ADJUST_DEFAULT		(RID_SVXITEMS_START + 249)
-
-// type names of slots; needed for attribute list on search & replace dialogue
-#define RID_ATTR_BEGIN						(RID_SVXITEMS_START + 250)
-#define RID_ATTR_ZOOM						(RID_ATTR_BEGIN + 0)
-#define RID_ATTR_BRUSH						(RID_ATTR_BEGIN + 1)
-#define RID_ATTR_TABSTOP					(RID_ATTR_BEGIN + 2)
-#define RID_ATTR_TABSTOP_DEFAULTS			(RID_ATTR_BEGIN + 3)
-#define RID_ATTR_TABSTOP_POS				(RID_ATTR_BEGIN + 4)
-#define RID_ATTR_TABSTOP_OFFSET				(RID_ATTR_BEGIN + 5)
-#define RID_ATTR_CHAR						(RID_ATTR_BEGIN + 6)
-#define RID_ATTR_CHAR_FONT					(RID_ATTR_BEGIN + 7)
-#define RID_ATTR_CHAR_POSTURE				(RID_ATTR_BEGIN + 8)
-#define RID_ATTR_CHAR_WEIGHT				(RID_ATTR_BEGIN + 9)
-#define RID_ATTR_CHAR_SHADOWED				(RID_ATTR_BEGIN + 10)
-#define RID_ATTR_CHAR_WORDLINEMODE			(RID_ATTR_BEGIN + 11)
-#define RID_ATTR_CHAR_CONTOUR				(RID_ATTR_BEGIN + 12)
-#define RID_ATTR_CHAR_STRIKEOUT				(RID_ATTR_BEGIN + 13)
-#define RID_ATTR_CHAR_UNDERLINE				(RID_ATTR_BEGIN + 14)
-#define RID_ATTR_CHAR_FONTHEIGHT			(RID_ATTR_BEGIN + 15)
-#define RID_ATTR_CHAR_PROPSIZE				(RID_ATTR_BEGIN + 16)
-#define RID_ATTR_CHAR_COLOR					(RID_ATTR_BEGIN + 17)
-#define RID_ATTR_CHAR_KERNING				(RID_ATTR_BEGIN + 18)
-#define RID_ATTR_CHAR_CASEMAP				(RID_ATTR_BEGIN + 19)
-#define RID_ATTR_CHAR_LANGUAGE				(RID_ATTR_BEGIN + 20)
-#define RID_ATTR_CHAR_ESCAPEMENT			(RID_ATTR_BEGIN + 21)
-#define RID_ATTR_CHAR_FONTLIST				(RID_ATTR_BEGIN + 22)
-#define RID_ATTR_BORDER_INNER               (RID_ATTR_BEGIN + 23)
-#define RID_ATTR_BORDER_OUTER				(RID_ATTR_BEGIN + 24)
-#define RID_ATTR_BORDER_SHADOW				(RID_ATTR_BEGIN + 25)
-#define RID_ATTR_PARA						(RID_ATTR_BEGIN + 26)
-#define RID_ATTR_PARA_ADJUST				(RID_ATTR_BEGIN + 27)
-#define RID_ATTR_PARA_ADJUST_LEFT			(RID_ATTR_BEGIN + 28)
-#define RID_ATTR_PARA_ADJUST_RIGHT			(RID_ATTR_BEGIN + 29)
-#define RID_ATTR_PARA_ADJUST_CENTER			(RID_ATTR_BEGIN + 30)
-#define RID_ATTR_PARA_ADJUST_BLOCK			(RID_ATTR_BEGIN + 31)
-#define RID_ATTR_PARA_ADJUST_BLOCKLINE		(RID_ATTR_BEGIN + 32)
-#define RID_ATTR_PARA_LINESPACE 			(RID_ATTR_BEGIN + 33)
-#define RID_ATTR_PARA_LINESPACE_10			(RID_ATTR_BEGIN + 34)
-#define RID_ATTR_PARA_LINESPACE_15			(RID_ATTR_BEGIN + 35)
-#define RID_ATTR_PARA_LINESPACE_20			(RID_ATTR_BEGIN + 36)
-#define RID_ATTR_PARA_PAGEBREAK				(RID_ATTR_BEGIN + 37)
-#define RID_ATTR_PARA_HYPHENZONE			(RID_ATTR_BEGIN + 38)
-#define RID_ATTR_PARA_SPLIT					(RID_ATTR_BEGIN + 39)
-#define RID_ATTR_PARA_WIDOWS				(RID_ATTR_BEGIN + 40)
-#define RID_ATTR_PARA_ORPHANS				(RID_ATTR_BEGIN + 41)
-#define RID_ATTR_PARA_ULSPACE				(RID_ATTR_BEGIN + 42)
-#define RID_ATTR_PARA_LRSPACE				(RID_ATTR_BEGIN + 43)
-#define RID_ATTR_POSTIT_AUTHOR				(RID_ATTR_BEGIN + 44)
-#define RID_ATTR_POSTIT_DATE				(RID_ATTR_BEGIN + 45)
-#define RID_ATTR_POSTIT_TEXT				(RID_ATTR_BEGIN + 46)
-#define RID_ATTR_SEARCH						(RID_ATTR_BEGIN + 47)
-#define RID_ATTR_LRSPACE					(RID_ATTR_BEGIN + 48)
-#define RID_ATTR_ULSPACE					(RID_ATTR_BEGIN + 49)
-#define RID_ATTR_PAGE		  				(RID_ATTR_BEGIN + 50)
-#define RID_ATTR_PAGE_SIZE	  				(RID_ATTR_BEGIN + 51)
-#define RID_ATTR_PAGE_MAXSIZE	  			(RID_ATTR_BEGIN + 52)
-#define RID_ATTR_PAGE_PAPERTRAY				(RID_ATTR_BEGIN + 53)
-#define RID_ATTR_PAGE_PAPERBIN				(RID_ATTR_BEGIN + 54)
-#define RID_ATTR_PAGE_APP					(RID_ATTR_BEGIN + 55)
-#define RID_ATTR_PAGE_EXT1					(RID_ATTR_BEGIN + 56)
-#define RID_ATTR_PAGE_EXT2					(RID_ATTR_BEGIN + 57)
-#define RID_ATTR_PAGE_HEADERSET				(RID_ATTR_BEGIN + 58)
-#define RID_ATTR_PAGE_FOOTERSET				(RID_ATTR_BEGIN + 59)
-#define RID_ATTR_PAGE_ON					(RID_ATTR_BEGIN + 60)
-#define RID_ATTR_PAGE_DYNAMIC				(RID_ATTR_BEGIN + 61)
-#define RID_ATTR_PAGE_SHARED				(RID_ATTR_BEGIN + 62)
-#define RID_ATTR_PAGE_BSP					(RID_ATTR_BEGIN + 63)
-#define RID_ATTR_CHAR_MAPTYPE				(RID_ATTR_BEGIN + 64)
-#define RID_ATTR_PARA_MODEL					(RID_ATTR_BEGIN + 65)
-#define RID_ATTR_PARA_KEEP					(RID_ATTR_BEGIN + 66)
-#define RID_ATTR_CHAR_BLINK					(RID_ATTR_BEGIN + 67)
-#define RID_ATTR_CHAR_CHARSETCOLOR			(RID_ATTR_BEGIN + 68)
-#define RID_ATTR_CHAR_OVERLINE				(RID_ATTR_BEGIN + 69)
-
-#define RID_ATTR_FLASH						(RID_ATTR_BEGIN + 406)
-#define RID_ATTR_PARA_REGISTER				(RID_ATTR_BEGIN + 413)
-#define RID_ATTR_BRUSH_CHAR					(RID_ATTR_BEGIN + 591)
-
-#define RID_ATTR_CHAR_CJK_FONT				(RID_ATTR_BEGIN + 887)
-#define RID_ATTR_CHAR_CJK_FONTHEIGHT        (RID_ATTR_BEGIN + 888)
-#define RID_ATTR_CHAR_CJK_LANGUAGE          (RID_ATTR_BEGIN + 889)
-#define RID_ATTR_CHAR_CJK_POSTURE           (RID_ATTR_BEGIN + 890)
-#define RID_ATTR_CHAR_CJK_WEIGHT            (RID_ATTR_BEGIN + 891)
-#define RID_ATTR_CHAR_CTL_FONT              (RID_ATTR_BEGIN + 892)
-#define RID_ATTR_CHAR_CTL_FONTHEIGHT        (RID_ATTR_BEGIN + 893)
-#define RID_ATTR_CHAR_CTL_LANGUAGE          (RID_ATTR_BEGIN + 894)
-#define RID_ATTR_CHAR_CTL_POSTURE           (RID_ATTR_BEGIN + 895)
-#define RID_ATTR_CHAR_CTL_WEIGHT            (RID_ATTR_BEGIN + 896)
-#define RID_ATTR_CHAR_TWO_LINES         	(RID_ATTR_BEGIN + 897)
-#define RID_ATTR_CHAR_EMPHASISMARK          (RID_ATTR_BEGIN + 899)
-
-#define RID_ATTR_PARA_SCRIPTSPACE  			(RID_ATTR_BEGIN + 901)
-#define RID_ATTR_PARA_HANGPUNCTUATION		(RID_ATTR_BEGIN + 902)
-#define RID_ATTR_PARA_FORBIDDEN_RULES		(RID_ATTR_BEGIN + 903)
-#define RID_ATTR_CHAR_ROTATED     			(RID_ATTR_BEGIN + 910)
-#define RID_ATTR_CHAR_SCALEWIDTH       		(RID_ATTR_BEGIN + 911)
-#define RID_ATTR_CHAR_RELIEF				(RID_ATTR_BEGIN + 920)
-#define RID_PARA_VERTALIGN					(RID_ATTR_BEGIN + 925)
-
-
-// Umrandungslinien
-#define RID_SINGLE_LINE0					(RID_SVXITEMS_START + 360)
-#define RID_SINGLE_LINE1					(RID_SVXITEMS_START + 361)
-#define RID_SINGLE_LINE2					(RID_SVXITEMS_START + 362)
-#define RID_SINGLE_LINE3					(RID_SVXITEMS_START + 363)
-#define RID_SINGLE_LINE4					(RID_SVXITEMS_START + 364)
-#define RID_DOUBLE_LINE0					(RID_SVXITEMS_START + 365)
-#define RID_DOUBLE_LINE1					(RID_SVXITEMS_START + 366)
-#define RID_DOUBLE_LINE2					(RID_SVXITEMS_START + 367)
-#define RID_DOUBLE_LINE3					(RID_SVXITEMS_START + 368)
-#define RID_DOUBLE_LINE4					(RID_SVXITEMS_START + 369)
-#define RID_DOUBLE_LINE5					(RID_SVXITEMS_START + 370)
-#define RID_DOUBLE_LINE6					(RID_SVXITEMS_START + 371)
-#define RID_DOUBLE_LINE7					(RID_SVXITEMS_START + 372)
-#define RID_DOUBLE_LINE8					(RID_SVXITEMS_START + 373)
-#define RID_DOUBLE_LINE9					(RID_SVXITEMS_START + 374)
-#define RID_DOUBLE_LINE10					(RID_SVXITEMS_START + 375)
-
-// Metric-Texte
-#define RID_SVXITEMS_METRIC_MM				(RID_SVXITEMS_START + 380)
-#define RID_SVXITEMS_METRIC_CM				(RID_SVXITEMS_START + 381)
-#define RID_SVXITEMS_METRIC_INCH			(RID_SVXITEMS_START + 382)
-#define RID_SVXITEMS_METRIC_POINT			(RID_SVXITEMS_START + 383)
-#define RID_SVXITEMS_METRIC_TWIP			(RID_SVXITEMS_START + 384)
-#define RID_SVXITEMS_METRIC_PIXEL			(RID_SVXITEMS_START + 385)
-
 // enum SvxCellHorJustify
 #define RID_SVXITEMS_HORJUST_STANDARD		(RID_SVXITEMS_START + 400)
 #define RID_SVXITEMS_HORJUST_LEFT			(RID_SVXITEMS_START + 401)
@@ -419,46 +125,12 @@
 #define RID_SVXITEMS_ORI_STACKED			(RID_SVXITEMS_START + 413)
 
 // Id's fuer BoolItems
-#define RID_SVXITEMS_SHADOWED_TRUE			(RID_SVXITEMS_START + 415)
-#define RID_SVXITEMS_SHADOWED_FALSE			(RID_SVXITEMS_START + 416)
-#define RID_SVXITEMS_AUTOKERN_TRUE			(RID_SVXITEMS_START + 417)
-#define RID_SVXITEMS_AUTOKERN_FALSE			(RID_SVXITEMS_START + 418)
-#define RID_SVXITEMS_WORDLINE_TRUE			(RID_SVXITEMS_START + 419)
-#define RID_SVXITEMS_WORDLINE_FALSE			(RID_SVXITEMS_START + 420)
-#define RID_SVXITEMS_CONTOUR_TRUE			(RID_SVXITEMS_START + 421)
-#define RID_SVXITEMS_CONTOUR_FALSE			(RID_SVXITEMS_START + 422)
-#define RID_SVXITEMS_NOLINEBREAK_TRUE		(RID_SVXITEMS_START + 423)
-#define RID_SVXITEMS_NOLINEBREAK_FALSE		(RID_SVXITEMS_START + 424)
-#define RID_SVXITEMS_NOHYPHEN_TRUE			(RID_SVXITEMS_START + 425)
-#define RID_SVXITEMS_NOHYPHEN_FALSE			(RID_SVXITEMS_START + 426)
-#define RID_SVXITEMS_PRINT_TRUE				(RID_SVXITEMS_START + 427)
-#define RID_SVXITEMS_PRINT_FALSE			(RID_SVXITEMS_START + 428)
-#define RID_SVXITEMS_OPAQUE_TRUE			(RID_SVXITEMS_START + 429)
-#define RID_SVXITEMS_OPAQUE_FALSE			(RID_SVXITEMS_START + 430)
-#define RID_SVXITEMS_FMTKEEP_TRUE			(RID_SVXITEMS_START + 431)
-#define RID_SVXITEMS_FMTKEEP_FALSE			(RID_SVXITEMS_START + 432)
-#define RID_SVXITEMS_FMTSPLIT_TRUE			(RID_SVXITEMS_START + 433)
-#define RID_SVXITEMS_FMTSPLIT_FALSE			(RID_SVXITEMS_START + 434)
-#define RID_SVXITEMS_PROT_CONTENT_TRUE		(RID_SVXITEMS_START + 435)
-#define RID_SVXITEMS_PROT_CONTENT_FALSE		(RID_SVXITEMS_START + 436)
-#define RID_SVXITEMS_PROT_SIZE_TRUE			(RID_SVXITEMS_START + 437)
-#define RID_SVXITEMS_PROT_SIZE_FALSE		(RID_SVXITEMS_START + 438)
-#define RID_SVXITEMS_PROT_POS_TRUE			(RID_SVXITEMS_START + 439)
-#define RID_SVXITEMS_PROT_POS_FALSE			(RID_SVXITEMS_START + 440)
-#define RID_SVXITEMS_TRANSPARENT_TRUE		(RID_SVXITEMS_START + 441)
-#define RID_SVXITEMS_TRANSPARENT_FALSE		(RID_SVXITEMS_START + 442)
 #define RID_SVXITEMS_BOXINF_TABLE_TRUE		(RID_SVXITEMS_START + 443)
 #define RID_SVXITEMS_BOXINF_TABLE_FALSE		(RID_SVXITEMS_START + 444)
 #define RID_SVXITEMS_BOXINF_DIST_TRUE		(RID_SVXITEMS_START + 445)
 #define RID_SVXITEMS_BOXINF_DIST_FALSE		(RID_SVXITEMS_START + 446)
 #define RID_SVXITEMS_BOXINF_MDIST_TRUE		(RID_SVXITEMS_START + 447)
 #define RID_SVXITEMS_BOXINF_MDIST_FALSE		(RID_SVXITEMS_START + 448)
-#define RID_SVXITEMS_HYPHEN_TRUE			(RID_SVXITEMS_START + 449)
-#define RID_SVXITEMS_HYPHEN_FALSE			(RID_SVXITEMS_START + 450)
-#define RID_SVXITEMS_PAGE_END_TRUE			(RID_SVXITEMS_START + 451)
-#define RID_SVXITEMS_PAGE_END_FALSE			(RID_SVXITEMS_START + 452)
-#define RID_SVXITEMS_BLINK_TRUE				(RID_SVXITEMS_START + 453)
-#define RID_SVXITEMS_BLINK_FALSE			(RID_SVXITEMS_START + 454)
 
 // Complete-Texte -----------------------------------------------------------
 
@@ -466,20 +138,6 @@
 #define RID_SVXITEMS_MARGIN_TOP				(RID_SVXITEMS_START + 481)
 #define RID_SVXITEMS_MARGIN_RIGHT			(RID_SVXITEMS_START + 482)
 #define RID_SVXITEMS_MARGIN_BOTTOM			(RID_SVXITEMS_START + 483)
-#define RID_SVXITEMS_SIZE_WIDTH				(RID_SVXITEMS_START + 484)
-#define RID_SVXITEMS_SIZE_HEIGHT			(RID_SVXITEMS_START + 485)
-#define RID_SVXITEMS_LRSPACE_LEFT			(RID_SVXITEMS_START + 486)
-#define RID_SVXITEMS_LRSPACE_FLINE			(RID_SVXITEMS_START + 487)
-#define RID_SVXITEMS_LRSPACE_RIGHT			(RID_SVXITEMS_START + 488)
-#define RID_SVXITEMS_SHADOW_COMPLETE		(RID_SVXITEMS_START + 489)
-#define RID_SVXITEMS_BORDER_COMPLETE		(RID_SVXITEMS_START + 490)
-#define RID_SVXITEMS_BORDER_TOP				(RID_SVXITEMS_START + 491)
-#define RID_SVXITEMS_BORDER_BOTTOM			(RID_SVXITEMS_START + 492)
-#define RID_SVXITEMS_BORDER_LEFT			(RID_SVXITEMS_START + 493)
-#define RID_SVXITEMS_BORDER_RIGHT			(RID_SVXITEMS_START + 494)
-#define RID_SVXITEMS_BORDER_DISTANCE		(RID_SVXITEMS_START + 495)
-#define RID_SVXITEMS_ULSPACE_UPPER			(RID_SVXITEMS_START + 496)
-#define RID_SVXITEMS_ULSPACE_LOWER			(RID_SVXITEMS_START + 497)
 #define RID_SVXITEMS_PAGE_COMPLETE			(RID_SVXITEMS_START + 498)
 #define RID_SVXITEMS_PAGE_NUM_BEGIN			(RID_SVXITEMS_START + 499)
 #define RID_SVXITEMS_PAGE_NUM_CHR_UPPER		(RID_SVXITEMS_START + 499)
@@ -494,85 +152,19 @@
 #define RID_SVXITEMS_PAGE_USAGE_RIGHT		(RID_SVXITEMS_START + 508)
 #define RID_SVXITEMS_PAGE_USAGE_ALL			(RID_SVXITEMS_START + 509)
 #define RID_SVXITEMS_PAGE_USAGE_MIRROR		(RID_SVXITEMS_START + 510)
-#define RID_SVXITEMS_LINES					(RID_SVXITEMS_START + 511)
-#define RID_SVXITEMS_WIDOWS_COMPLETE		(RID_SVXITEMS_START + 512)
-#define RID_SVXITEMS_ORPHANS_COMPLETE		(RID_SVXITEMS_START + 513)
-#define RID_SVXITEMS_HYPHEN_MINLEAD			(RID_SVXITEMS_START + 514)
-#define RID_SVXITEMS_HYPHEN_MINTRAIL		(RID_SVXITEMS_START + 515)
-#define RID_SVXITEMS_HYPHEN_MAX				(RID_SVXITEMS_START + 516)
-#define RID_SVXITEMS_PAGEMODEL_COMPLETE		(RID_SVXITEMS_START + 517)
-#define RID_SVXITEMS_KERNING_COMPLETE		(RID_SVXITEMS_START + 518)
-#define RID_SVXITEMS_KERNING_EXPANDED		(RID_SVXITEMS_START + 519)
-#define RID_SVXITEMS_KERNING_CONDENSED		(RID_SVXITEMS_START + 520)
 #define RID_SVXITEMS_AUTHOR_COMPLETE		(RID_SVXITEMS_START + 521)
 #define RID_SVXITEMS_DATE_COMPLETE			(RID_SVXITEMS_START + 522)
 #define RID_SVXITEMS_TEXT_COMPLETE			(RID_SVXITEMS_START + 523)
 #define RID_SVXITEMS_BACKGROUND_COLOR		(RID_SVXITEMS_START + 524)
 #define RID_SVXITEMS_PATTERN_COLOR			(RID_SVXITEMS_START + 525)
 
-#define RID_SVXITEMS_GRAPHIC				(RID_SVXITEMS_START + 526)
 #define RID_SVXITEMS_BRUSH_CHAR				(RID_SVXITEMS_START + 527)
-#define RID_SVXITEMS_BORDER_NONE			(RID_SVXITEMS_START + 528)
-
-// enum FontEmphasisMark ---------------------------------------------------
-#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE	(RID_SVXITEMS_START + 530)
-#define RID_SVXITEMS_EMPHASIS_NONE_STYLE	(RID_SVXITEMS_START + 530)
-#define RID_SVXITEMS_EMPHASIS_DOT_STYLE		(RID_SVXITEMS_START + 531)
-#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE	(RID_SVXITEMS_START + 532)
-#define RID_SVXITEMS_EMPHASIS_DISC_STYLE	(RID_SVXITEMS_START + 533)
-#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE	(RID_SVXITEMS_START + 534)
-
-#define RID_SVXITEMS_EMPHASIS_ABOVE_POS		(RID_SVXITEMS_START + 540)
-#define RID_SVXITEMS_EMPHASIS_BELOW_POS		(RID_SVXITEMS_START + 541)
-
-#define RID_SVXITEMS_TWOLINES_OFF			(RID_SVXITEMS_START + 545)
-#define RID_SVXITEMS_TWOLINES				(RID_SVXITEMS_START + 546)
-
-#define RID_SVXITEMS_SCRPTSPC_OFF			(RID_SVXITEMS_START + 550)
-#define RID_SVXITEMS_SCRPTSPC_ON			(RID_SVXITEMS_START + 551)
-#define RID_SVXITEMS_HNGPNCT_OFF			(RID_SVXITEMS_START + 552)
-#define RID_SVXITEMS_HNGPNCT_ON				(RID_SVXITEMS_START + 553)
-
-#define RID_SVXITEMS_FORBIDDEN_RULE_OFF 	(RID_SVXITEMS_START + 554)
-#define RID_SVXITEMS_FORBIDDEN_RULE_ON 	    (RID_SVXITEMS_START + 555)
-
-#define RID_SVXITEMS_CHARROTATE_OFF			(RID_SVXITEMS_START + 556)
-#define RID_SVXITEMS_CHARROTATE				(RID_SVXITEMS_START + 557)
-#define RID_SVXITEMS_CHARROTATE_FITLINE		(RID_SVXITEMS_START + 558)
-
-#define RID_SVXITEMS_CHARSCALE_OFF			(RID_SVXITEMS_START + 559)
-#define RID_SVXITEMS_CHARSCALE				(RID_SVXITEMS_START + 560)
-
-#define RID_SVXITEMS_RELIEF_BEGIN			(RID_SVXITEMS_START + 561)
-#define RID_SVXITEMS_RELIEF_NONE			(RID_SVXITEMS_START + 561)
-#define RID_SVXITEMS_RELIEF_EMBOSSED		(RID_SVXITEMS_START + 562)
-#define RID_SVXITEMS_RELIEF_ENGRAVED		(RID_SVXITEMS_START + 563)
-#define RID_SVXITEMS_RELIEF_END				(RID_SVXITEMS_START + 564)
-
-#define RID_SVXITEMS_PARAVERTALIGN_AUTO			(RID_SVXITEMS_START + 565)
-#define RID_SVXITEMS_PARAVERTALIGN_BASELINE		(RID_SVXITEMS_START + 566)
-#define RID_SVXITEMS_PARAVERTALIGN_TOP	 		(RID_SVXITEMS_START + 567)
-#define RID_SVXITEMS_PARAVERTALIGN_CENTER		(RID_SVXITEMS_START + 568)
-#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM		(RID_SVXITEMS_START + 569)
-
-#define RID_SVXITEMS_FRMDIR_BEGIN				(RID_SVXITEMS_START + 570)
-#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP		(RID_SVXITEMS_START + 570)
-#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP		(RID_SVXITEMS_START + 571)
-#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT		(RID_SVXITEMS_START + 572)
-#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT		(RID_SVXITEMS_START + 573)
-#define RID_SVXITEMS_FRMDIR_ENVIRONMENT			(RID_SVXITEMS_START + 574)
-#define RID_SVXITEMS_FRMDIR_END					(RID_SVXITEMS_START + 574)
-
-#define RID_SVXITEMS_PARASNAPTOGRID_ON                     (RID_SVXITEMS_START + 575)
-#define RID_SVXITEMS_PARASNAPTOGRID_OFF                    (RID_SVXITEMS_START + 576)
-
-#define RID_SVXITEMS_CHARHIDDEN_FALSE           (RID_SVXITEMS_START + 577)
-#define RID_SVXITEMS_CHARHIDDEN_TRUE            (RID_SVXITEMS_START + 578)
+#define RID_ATTR_NAMES                      (RID_SVXITEMS_START + 528)
 
 // Ueberlaufpruefung --------------------------------------------------------
 
 // Resource-Id's
-#define ACT_RID_SVXITEMS_END    RID_SVXITEMS_CHARHIDDEN_TRUE
+#define ACT_RID_SVXITEMS_END    RID_ATTR_NAMES
 #if ACT_RID_SVXITEMS_END > RID_SVXITEMS_END
 #error Resource-Ueberlauf in #line, #file
 #endif
diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx
index 7bb5926078..b71a05d9e6 100644
--- a/svx/inc/svx/sxallitm.hxx
+++ b/svx/inc/svx/sxallitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxallitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx
index 9118249676..28221d57ba 100644
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/svx/inc/svx/sxcaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxcaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index 36c481d267..a42215af07 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxcecitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx
index 9be0f3c099..eab00df9cc 100644
--- a/svx/inc/svx/sxcgitm.hxx
+++ b/svx/inc/svx/sxcgitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxcgitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx
index 6e0ffc1192..ecdb621132 100644
--- a/svx/inc/svx/sxciaitm.hxx
+++ b/svx/inc/svx/sxciaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxciaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index daeebaac51..a4ff9f309a 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxcikitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx
index 5b95e25e50..48b943219d 100644
--- a/svx/inc/svx/sxcllitm.hxx
+++ b/svx/inc/svx/sxcllitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxcllitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index ad7916e8a3..fbfef44d2b 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxctitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index a0faab3317..cb62886899 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxekitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx
index 6878592b2d..8140c88fb2 100644
--- a/svx/inc/svx/sxelditm.hxx
+++ b/svx/inc/svx/sxelditm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxelditm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx
index 021c32a711..edac60d579 100644
--- a/svx/inc/svx/sxenditm.hxx
+++ b/svx/inc/svx/sxenditm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxenditm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index 0095b40d85..017a4d42cc 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxfiitm.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx
index 2dfa5fb3d6..c13d950ae6 100644
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/svx/inc/svx/sxlayitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxlayitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx
index 29dcf6675d..9689a90a2f 100644
--- a/svx/inc/svx/sxlogitm.hxx
+++ b/svx/inc/svx/sxlogitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxlogitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx
index b6ac509cbd..f6765fc7f0 100644
--- a/svx/inc/svx/sxmbritm.hxx
+++ b/svx/inc/svx/sxmbritm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmbritm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx
index eb972d4148..3ff6630d4b 100644
--- a/svx/inc/svx/sxmfsitm.hxx
+++ b/svx/inc/svx/sxmfsitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmfsitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index eae1cf6926..6ff09ccc57 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmkitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx
index c84aa4eb07..1b36f6c6f4 100644
--- a/svx/inc/svx/sxmlhitm.hxx
+++ b/svx/inc/svx/sxmlhitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmlhitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx
index be5eb5d696..f80d1e971c 100644
--- a/svx/inc/svx/sxmoitm.hxx
+++ b/svx/inc/svx/sxmoitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmoitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx
index 5c16334393..f6e6e08a55 100644
--- a/svx/inc/svx/sxmovitm.hxx
+++ b/svx/inc/svx/sxmovitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmovitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx
index 1e7677b8e2..e7b5d002e3 100644
--- a/svx/inc/svx/sxmsitm.hxx
+++ b/svx/inc/svx/sxmsitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmsitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx
index 9bd74bd81a..708009da14 100644
--- a/svx/inc/svx/sxmspitm.hxx
+++ b/svx/inc/svx/sxmspitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmspitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx
index 56b4bca946..505d0672a4 100644
--- a/svx/inc/svx/sxmsuitm.hxx
+++ b/svx/inc/svx/sxmsuitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmsuitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx
index 62b98f8593..ccaec77c43 100644
--- a/svx/inc/svx/sxmtaitm.hxx
+++ b/svx/inc/svx/sxmtaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmtaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx
index a743d2e9be..90c4dc29d3 100644
--- a/svx/inc/svx/sxmtfitm.hxx
+++ b/svx/inc/svx/sxmtfitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmtfitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index efe8d8f9ff..411efd4acb 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmtpitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx
index c7efdaf829..6c3332e96f 100644
--- a/svx/inc/svx/sxmtritm.hxx
+++ b/svx/inc/svx/sxmtritm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmtritm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index e3112f0c56..57dc5f70c4 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxmuitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx
index b082d72a22..3994a224e0 100644
--- a/svx/inc/svx/sxoneitm.hxx
+++ b/svx/inc/svx/sxoneitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxoneitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx
index b335886b9e..6577f3d0d5 100644
--- a/svx/inc/svx/sxonitm.hxx
+++ b/svx/inc/svx/sxonitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxonitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx
index de9f0a247e..18a633f987 100644
--- a/svx/inc/svx/sxopitm.hxx
+++ b/svx/inc/svx/sxopitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxopitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx
index 2b98c6cabd..3e163d511d 100644
--- a/svx/inc/svx/sxraitm.hxx
+++ b/svx/inc/svx/sxraitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxraitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx
index efb6de9245..bf1c214557 100644
--- a/svx/inc/svx/sxreaitm.hxx
+++ b/svx/inc/svx/sxreaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxreaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx
index 4d8157bb48..6a70ba5cca 100644
--- a/svx/inc/svx/sxreoitm.hxx
+++ b/svx/inc/svx/sxreoitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxreoitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx
index d28fbcefbf..4aae18f18a 100644
--- a/svx/inc/svx/sxroaitm.hxx
+++ b/svx/inc/svx/sxroaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxroaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx
index 51fd8e0d05..724ae030ce 100644
--- a/svx/inc/svx/sxrooitm.hxx
+++ b/svx/inc/svx/sxrooitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxrooitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx
index b3a4e1939a..39c4738e2b 100644
--- a/svx/inc/svx/sxsaitm.hxx
+++ b/svx/inc/svx/sxsaitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxsaitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx
index f119686d46..0333d8bd59 100644
--- a/svx/inc/svx/sxsalitm.hxx
+++ b/svx/inc/svx/sxsalitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxsalitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx
index ed5076065c..e984f38bb2 100644
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/svx/inc/svx/sxsiitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxsiitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx
index 275bdeb52f..8a53e3dfca 100644
--- a/svx/inc/svx/sxsoitm.hxx
+++ b/svx/inc/svx/sxsoitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxsoitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx
index 3fcfb19944..442f89ef7c 100644
--- a/svx/inc/svx/sxtraitm.hxx
+++ b/svx/inc/svx/sxtraitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sxtraitm.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index f1d4414654..d6229320d3 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabarea.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index 8ca10e7059..8015939271 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabline.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 267b0adb69..ff2301f52a 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbcontrl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx
index b28eff34f9..4c38a3aa76 100644
--- a/svx/inc/svx/tbxcolorupdate.hxx
+++ b/svx/inc/svx/tbxcolorupdate.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxcolorupdate.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/thesdlg.hxx b/svx/inc/svx/thesdlg.hxx
deleted file mode 100644
index 1023cbf161..0000000000
--- a/svx/inc/svx/thesdlg.hxx
+++ /dev/null
@@ -1,137 +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: thesdlg.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 _SVX_THESDLG_HXX
-#define _SVX_THESDLG_HXX
-// include ---------------------------------------------------------------
-
-#ifndef _EDIT_HXX //autogen
-#include <vcl/edit.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
-#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
-#include <vcl/fixed.hxx>
-#endif
-#include <svx/stddlg.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include "svx/svxdllapi.h"
-
-// forward ---------------------------------------------------------------
-
-struct ThesDlg_Impl;
-
-class SvxThesaurusLanguageDlg_Impl;
-
-namespace com { namespace sun { namespace star { 
-    namespace linguistic2 {
-        class XThesaurus;
-        class XMeaning;
-    }
-    namespace lang {
-        struct Locale;
-    }
-}}}
-
-// class SvxThesaurusDialog ----------------------------------------------
-
-class SVX_DLLPUBLIC SvxThesaurusDialog : public SvxStandardDialog
-{
-public:
-    friend class SvxThesaurusLanguageDlg_Impl;
-
-    SvxThesaurusDialog( Window* pParent,
-                        ::com::sun::star::uno::Reference<
-                            ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
-                        const String &rWord, sal_Int16 nLanguage );
-    ~SvxThesaurusDialog();
-
-    String          GetWord() { return aReplaceEdit.GetText(); }
-
-    sal_uInt16      GetLanguage() const;
-
-private:
-    FixedText		aWordText;
-    ListBox 		aWordLB;
-    FixedText		aReplaceText;
-    Edit  			aReplaceEdit;
-    FixedText		aMeanText;
-    ListBox			aMeanLB;
-    FixedText		aSynonymText;
-    ListBox			aSynonymLB;
-    FixedLine       aVarFL;
-
-    OKButton		aOkBtn;
-    CancelButton	aCancelBtn;
-    PushButton		aLookUpBtn;
-    PushButton		aLangBtn;
-    HelpButton		aHelpBtn;
-
-    String			aErrStr;
-
-    ThesDlg_Impl*	pImpl;		// always != NULL
-
-    SVX_DLLPRIVATE virtual void 	Apply();
-
-#ifdef _SVX_THESDLG_CXX
-    SVX_DLLPRIVATE void 			UpdateSynonymBox_Impl();
-    SVX_DLLPRIVATE void 			UpdateMeaningBox_Impl(
-                        ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::uno::Reference<
-                                ::com::sun::star::linguistic2::XMeaning >  > *pMeaningSeq = NULL );
-    SVX_DLLPRIVATE void			Init_Impl(sal_Int16 nLanguage);
-
-    ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
-        queryMeanings_Impl( 
-                ::rtl::OUString& rTerm,
-                const ::com::sun::star::lang::Locale& rLocale,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException);
-
-    // Handler
-    DECL_LINK( SelectHdl_Impl, ListBox * );
-    DECL_LINK( SynonymHdl_Impl, ListBox * );
-    DECL_LINK( LookUpHdl_Impl, Button * );
-    DECL_LINK( LanguageHdl_Impl, Button * );
-    DECL_LINK( EntryHdl_Impl, ListBox * );
-    DECL_LINK( SpellErrorHdl_Impl, void * );
-#endif
-};
-
-#endif
-
diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc
index 5284dcf24d..d7e79490fd 100644
--- a/svx/inc/svx/ucsubset.hrc
+++ b/svx/inc/svx/ucsubset.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: ucsubset.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx
index 0c4f172792..0dc9496c0c 100644
--- a/svx/inc/svx/ucsubset.hxx
+++ b/svx/inc/svx/ucsubset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucsubset.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx
index 0a0328b924..9c49f4eda6 100644
--- a/svx/inc/svx/unomid.hxx
+++ b/svx/inc/svx/unomid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomid.hxx,v $
- * $Revision: 1.3.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,82 +26,6 @@
  ************************************************************************/
 #ifndef _SVX_UNOMID_HXX
 #define _SVX_UNOMID_HXX
-//LRSpaceItem
-#define MID_LR_MARGIN		0
-#define MID_LRP_MARGIN  	1
-#define MID_LR_REL_MARGIN	2
-#define MID_LRP_REL_MARGIN  3
-#define MID_L_MARGIN		4
-#define MID_R_MARGIN		5
-#define MID_L_REL_MARGIN	6
-#define MID_R_REL_MARGIN	7
-#define MID_FIRST_LINE_INDENT	 	8
-#define MID_FIRST_LINE_REL_INDENT   9
-#define MID_FIRST_AUTO				10
-#define MID_TXT_LMARGIN 			11
-
-//ULSpaceItem
-#define MID_UL_MARGIN		1
-#define MID_UL_REL_MARGIN	2
-#define MID_UP_MARGIN		3
-#define MID_LO_MARGIN		4
-#define MID_UP_REL_MARGIN	5
-#define MID_LO_REL_MARGIN	6
-
-//SvxBoolItem
-#define MID_BOLD			0
-#define MID_WEIGHT          1
-
-//SvxPostureItem
-#define MID_ITALIC          0
-#define MID_POSTURE         1
-
-//SvxFontHeightItem
-#define MID_FONTHEIGHT     	1
-#define MID_FONTHEIGHT_PROP 2
-#define MID_FONTHEIGHT_DIFF 3
-
-//SvxFontWidthItem
-#define MID_FONTWIDTH     	0
-#define MID_FONTWIDTH_PROP  1
-
-//SvxTextLineItem
-#define MID_TEXTLINED		0
-#define MID_TL_STYLE		1
-#define MID_TL_COLOR		2
-#define MID_TL_HASCOLOR		3
-
-//SvxCrossedOutItem
-#define MID_CROSSED_OUT		0
-#define MID_CROSS_OUT       1
-
-//SvxExcapementItem
-#define MID_ESC			 0
-#define MID_ESC_HEIGHT   1
-#define MID_AUTO_ESC     2
-
-//SvxLanguageItem
-#define MID_LANGUAGE		0
-#define MID_COUNTRY			1
-#define MID_LANG_COUNTRY	2
-
-//BrushItem
-#define MID_BACK_COLOR			0
-#define MID_GRAPHIC_POSITION    1
-#define MID_GRAPHIC_LINK        2
-#define MID_GRAPHIC             3
-#define MID_GRAPHIC_TRANSPARENT 4
-#define MID_GRAPHIC_URL        	5
-#define MID_GRAPHIC_FILTER     	6
-#define MID_GRAPHIC_REPEAT     	7
-#define MID_GRAPHIC_TRANSPARENCY 8
-#define MID_BACK_COLOR_R_G_B    9
-#define MID_BACK_COLOR_TRANSPARENCY 10
-
-//ProtectItem
-#define MID_PROTECT_CONTENT		0
-#define MID_PROTECT_SIZE        1
-#define MID_PROTECT_POSITION    2
 
 //AdjustItem
 #define MID_PARA_ADJUST			0
@@ -124,21 +45,6 @@
 #define MID_MARGIN_UP_MARGIN	4
 #define MID_MARGIN_LO_MARGIN	5
 
-//SvxBoxItem
-#define LEFT_BORDER  			1
-#define RIGHT_BORDER            2
-#define TOP_BORDER              3
-#define BOTTOM_BORDER           4
-#define BORDER_DISTANCE         5
-#define LEFT_BORDER_DISTANCE    6
-#define RIGHT_BORDER_DISTANCE   7
-#define TOP_BORDER_DISTANCE     8
-#define BOTTOM_BORDER_DISTANCE  9
-#define MID_LEFT_BORDER             10
-#define MID_RIGHT_BORDER            11
-#define MID_TOP_BORDER              12
-#define MID_BOTTOM_BORDER           13
-
 #define ALL_BORDER					10
 #define ALL_BORDER_PADDING			11
 #define LEFT_BORDER_PADDING			12
@@ -151,70 +57,13 @@
 #define TOP_BORDER_LINE_WIDTH		19
 #define BOTTOM_BORDER_LINE_WIDTH	20
 
-//SvxFontItem
-// Don't use 0 as it used for the whole struct
-#define MID_FONT_FAMILY_NAME 	1
-#define MID_FONT_STYLE_NAME     2
-#define MID_FONT_FAMILY         3
-#define MID_FONT_CHAR_SET       4
-#define MID_FONT_PITCH          5
-
-//SvxHyphenZoneItem
-#define MID_IS_HYPHEN	      	0
-#define MID_HYPHEN_MIN_LEAD     1
-#define MID_HYPHEN_MIN_TRAIL    2
-#define MID_HYPHEN_MAX_HYPHENS  3
-
-//SvxFmtBreakItem
-#define MID_BREAK_BEFORE		0
-#define MID_BREAK_AFTER			1
-
-//SvxCaseMapItem
-#define MID_CASEMAP_VARIANT		0
-#define MID_CASEMAP_TRANS		1
-
-//SvxLineSpaceItem
-#define MID_LS_FIXED			0
-#define MID_LS_MINIMUM			1
-#define MID_LS_DISTANCE			2
-
-//SvxLanguageItem
-#define MID_LANG_INT			0
-#define MID_LANG_LOCALE			1
-
-//NameOrIndex
-#define MID_NAME				16
-#define MID_GRAFURL				32
-
 // XFillBitmapItem (is also a NameOrIndex)
 #define MID_BITMAP              8
 
-//SvxTwoLinesItem
-#define MID_TWOLINES			0
-#define MID_START_BRACKET 		1
-#define MID_END_BRACKET 		2
-
-//SvxEmphasisMarkItem
-#define MID_EMPHASIS			0
-
-//SvxCharRotateItem
-#define MID_ROTATE				0
-#define MID_FITTOLINE			1
-
-// SvxCharReliefItem
-#define MID_RELIEF				0
-
-// SvxTabStop
-#define MID_TABSTOPS            0
-#define MID_STD_TAB             1
-
 // SvxHorJustifyItem
 #define MID_HORJUST_HORJUST		0
 #define MID_HORJUST_ADJUST		1
 
-// SvxPageModelItem
-#define MID_AUTO                1
-
 // SvxZoomItem
 #define MID_VALUE               2
 
@@ -225,11 +74,6 @@
 #define MID_END_Y               4
 #define MID_LIMIT               5
 
-// SvxBoxInfoItem
-#define MID_HORIZONTAL          1
-#define MID_VERTICAL            2
-#define MID_VALIDFLAGS          4
-
 // SvxColumnItem
 #define MID_COLUMNARRAY         7
 #define MID_ACTUAL              4
@@ -269,4 +113,5 @@
 #define MID_LINEDASH_DISTANCE		7
 
 #define MID_LEFT                    3
+
 #endif
diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx
index 31a7589011..08fb0102d8 100644
--- a/svx/inc/svx/unomod.hxx
+++ b/svx/inc/svx/unomod.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomod.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,10 +30,14 @@
 
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/container/XIndexReplace.hpp>
 #include "svx/svxdllapi.h"
 
 class SdrHint;
 class SdrModel;
+class SdrModel;
+
+SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw();
 
 class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiServiceFactory
 {
diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx
index 9cb6376eef..0f13b9eeb3 100644
--- a/svx/inc/svx/unomodel.hxx
+++ b/svx/inc/svx/unomodel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomodel.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index a84360ccb8..b01c13b55a 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopage.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <svl/lstner.hxx>
-#include <svx/mutxhelp.hxx>
+#include <editeng/mutxhelp.hxx>
 #include "svx/svxdllapi.h"
 
 #include <cppuhelper/implbase5.hxx> 
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index 98156d5d25..06a1a7a284 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -32,12 +29,13 @@
 #define SVX_UNOPROV_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <svx/svdpool.hxx>
 #include <svl/itemprop.hxx>
 #include <tools/list.hxx>
 #include "svx/svxdllapi.h"
 
 class SvxItemPropertySet;
+class SfxItemPool;
+
 /***********************************************************************
 * class UHashMap                                                       *
 ***********************************************************************/
@@ -110,7 +108,7 @@ public:
     SvxUnoPropertyMapProvider();
     ~SvxUnoPropertyMapProvider();
     const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId);
-    const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId);
+    const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool);
 };
 
 /***********************************************************************
@@ -124,34 +122,9 @@ extern SvxUnoPropertyMapProvider aSvxMapProvider;
 extern UHashMapEntry pSdrShapeIdentifierMap[];
 extern UHashMap aSdrShapeIdentifierMap;
 
-#define SFX_METRIC_ITEM				(0x40)
 #define E3D_INVENTOR_FLAG			(0x80000000)
 
-#include <svx/unoipset.hxx>
-
-/***********************************************************************
-* class SvxServiceInfoHelper                                           *
-***********************************************************************/
-
-/** 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 SVX_DLLPUBLIC SvxServiceInfoHelper : 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,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();
-};
+#include <editeng/unoipset.hxx>
 
 /***********************************************************************
 * class SvxPropertySetInfoPool                                         *
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index fd95b762dc..01fcb99dec 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshape.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,13 +47,14 @@
 #include <tools/gen.hxx>
 #include <tools/weakbase.hxx>
 #include <svl/lstner.hxx>
-#include <svx/unoipset.hxx>
+#include <editeng/unoipset.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <osl/mutex.hxx>
 #include "svx/svxdllapi.h"
 #include <rtl/ref.hxx>
+#include <com/sun/star/uno/Any.hxx>
 
 #include <svx/svdouno.hxx>
 
@@ -86,6 +84,15 @@ protected:
 
 struct SvxShapeImpl;
 class SvxShapeMaster;
+class SvxItemPropertySet;
+class SvxItemPropertySimpleEntry;
+class SfxItemSet;
+
+void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, 
+        const com::sun::star::uno::Any& rVal, SfxItemSet& rSet );
+        
+com::sun::star::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet );
+
 
 // WARNING: if you update the supported interfaces,
 //          also update SvxShape::_getTypes()
@@ -324,7 +331,7 @@ private:
     SVX_DLLPRIVATE void impl_construct();
 };
 
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 
 class SVX_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase
 {
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 73c4c45bf4..9478109077 100644..100755
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshprp.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,9 +37,7 @@
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
-#ifndef _COM_SUN_STAR_DRAWING_LINEJOINT_Hpp_
 #include <com/sun/star/drawing/LineJoint.hpp>
-#endif
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
@@ -79,9 +74,9 @@
 
 #define _SVX_USE_UNOGLOBALS_
 #include <svx/unoprov.hxx>
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 #include <svx/unomid.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 #include <svl/itemprop.hxx>
 
 #include <svx/svxids.hrc>
@@ -94,7 +89,6 @@
  #endif
 #endif
 
-#define OWN_ATTR_VALUE_START					(3900)
 #define OWN_ATTR_VALUE_START_TEXT				(OWN_ATTR_VALUE_START+0)	// the next 10 entries are reserved for text
 #define OWN_ATTR_VALUE_POLYGONKIND				(OWN_ATTR_VALUE_START+10)
 #define OWN_ATTR_VALUE_POLYPOLYGON				(OWN_ATTR_VALUE_START+11)
@@ -192,9 +186,7 @@
 
 #define OWN_ATTR_STYLE							(OWN_ATTR_VALUE_START+87)
 
-#define OWN_ATTR_EDGE_POLYPOLYGONBEZIER			(OWN_ATTR_VALUE_START+88)
-
-#define OWN_ATTR_VALUE_END                      OWN_ATTR_EDGE_POLYPOLYGONBEZIER // WARNING: ee items start at 3991!
+#define OWN_ATTR_EDGE_POLYPOLYGONBEZIER			(OWN_ATTR_VALUE_START+88)	// maximum is OWN_ATTR_VALUE_START+88, see svl/inc/svl/solar.hrc
 
 // #FontWork#
 #define FONTWORK_PROPERTIES \
diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx
index 1c0c2d0de6..2607ccd438 100644
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/svx/inc/svx/unoshtxt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshtxt.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #define SVX_UNOSHTXT_HXX
 
 #include <memory>
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 #include "svx/svxdllapi.h"
 
 namespace com { namespace sun { namespace star { 
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index 95ceceb1d5..f30c3be8b9 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: view3d.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index 563bd01abd..6484c4cac0 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewlayoutitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index dbdcac36f3..734a56827e 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewpt3d.hxx,v $
- * $Revision: 1.3.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx
index 514d567e73..0254a49ec7 100644
--- a/svx/inc/svx/volume3d.hxx
+++ b/svx/inc/svx/volume3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: volume3d.hxx,v $
- * $Revision: 1.3.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index 96a1893d86..187a0678d4 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xbitmap.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,7 +32,7 @@
 #ifndef _BITMAP_HXX //autogen
 #include <vcl/bitmap.hxx>
 #endif
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/xenum.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index 967660d366..f0426d0210 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xbtmpit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index f1bc9f0643..e419ac8413 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xcolit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx
index 2000818362..bacc17de97 100644
--- a/svx/inc/svx/xdash.hxx
+++ b/svx/inc/svx/xdash.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xdash.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx
index 984bc6c070..85d00f5094 100644
--- a/svx/inc/svx/xdef.hxx
+++ b/svx/inc/svx/xdef.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xdef.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx
index b9a7eb7d3a..433799c928 100644
--- a/svx/inc/svx/xenum.hxx
+++ b/svx/inc/svx/xenum.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xenum.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx
index 8ba3e394e5..3a35a0d6d8 100644
--- a/svx/inc/svx/xfillit.hxx
+++ b/svx/inc/svx/xfillit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfillit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
index ffb69ae225..b32a691034 100644
--- a/svx/inc/svx/xfillit0.hxx
+++ b/svx/inc/svx/xfillit0.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfillit0.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx
index 73c3e43329..7e65ff6bc4 100644
--- a/svx/inc/svx/xflasit.hxx
+++ b/svx/inc/svx/xflasit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflasit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index f192de55be..e6c817dfa5 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbckit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index 4766860a7a..b352dfe4cf 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbmpit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index 4fbfda9dec..4ec7fd9e59 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbmsli.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index fbd0885750..459819e227 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbmsxy.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx
index 747a999b95..69b44b5738 100644
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/svx/inc/svx/xflbmtit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbmtit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index a912b4348b..b41d11ece9 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflboxy.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx
index 627a5e4969..01af18d79f 100644
--- a/svx/inc/svx/xflbstit.hxx
+++ b/svx/inc/svx/xflbstit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbstit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index 63fa08c7d5..d205ae439b 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflbtoxy.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx
index c579b66c2b..4f8ee4b9d5 100644
--- a/svx/inc/svx/xflclit.hxx
+++ b/svx/inc/svx/xflclit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflclit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
index 9737cf3b10..a8b016418b 100644
--- a/svx/inc/svx/xflftrit.hxx
+++ b/svx/inc/svx/xflftrit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflftrit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx
index cf1bdcac6c..42543a6df2 100644
--- a/svx/inc/svx/xflgrit.hxx
+++ b/svx/inc/svx/xflgrit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflgrit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index 4f6ffefe0e..955184cc42 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xflhtit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx
index ae0d5ab995..b23a236b23 100644
--- a/svx/inc/svx/xfltrit.hxx
+++ b/svx/inc/svx/xfltrit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfltrit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
index 1ed03ddb9c..45c9821eca 100644
--- a/svx/inc/svx/xftadit.hxx
+++ b/svx/inc/svx/xftadit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftadit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx
index 71373c9fdf..03942d3345 100644
--- a/svx/inc/svx/xftdiit.hxx
+++ b/svx/inc/svx/xftdiit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftdiit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx
index c06e1ae718..b6d514f64b 100644
--- a/svx/inc/svx/xftmrit.hxx
+++ b/svx/inc/svx/xftmrit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftmrit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx
index 0de655b51c..9643eda921 100644
--- a/svx/inc/svx/xftouit.hxx
+++ b/svx/inc/svx/xftouit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftouit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
index 28dee62688..ade90a7122 100644
--- a/svx/inc/svx/xftsfit.hxx
+++ b/svx/inc/svx/xftsfit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftsfit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx
index f05319fbbe..0ebca5673c 100644
--- a/svx/inc/svx/xftshcit.hxx
+++ b/svx/inc/svx/xftshcit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftshcit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
index cb706080e9..532a996b27 100644
--- a/svx/inc/svx/xftshit.hxx
+++ b/svx/inc/svx/xftshit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftshit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx
index 57af63d210..2e1245a2d4 100644
--- a/svx/inc/svx/xftshtit.hxx
+++ b/svx/inc/svx/xftshtit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftshtit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx
index 87b35afccc..aae03c6eb5 100644
--- a/svx/inc/svx/xftshxy.hxx
+++ b/svx/inc/svx/xftshxy.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftshxy.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx
index 4c8693e69c..d9eb6cb847 100644
--- a/svx/inc/svx/xftstit.hxx
+++ b/svx/inc/svx/xftstit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xftstit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx
index 2ebb23864f..2f6b9d49f1 100644
--- a/svx/inc/svx/xgrad.hxx
+++ b/svx/inc/svx/xgrad.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xgrad.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx
index 98a79b0f2f..e002e3eafe 100644
--- a/svx/inc/svx/xgrscit.hxx
+++ b/svx/inc/svx/xgrscit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xgrscit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx
index 0e4732811f..823463733b 100644
--- a/svx/inc/svx/xhatch.hxx
+++ b/svx/inc/svx/xhatch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xhatch.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 59d7d131b6..9b7de6297c 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx
index 74d3c447ff..37fb9d56a1 100644
--- a/svx/inc/svx/xlineit.hxx
+++ b/svx/inc/svx/xlineit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlineit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
index db58c3a070..1937035566 100644
--- a/svx/inc/svx/xlineit0.hxx
+++ b/svx/inc/svx/xlineit0.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlineit0.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
index d94f1fbbb5..90ea7c4b50 100644
--- a/svx/inc/svx/xlinjoit.hxx
+++ b/svx/inc/svx/xlinjoit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlinjoit.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx
index 7d72bbaef5..ba6a248286 100644
--- a/svx/inc/svx/xlnasit.hxx
+++ b/svx/inc/svx/xlnasit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnasit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx
index be073fffd2..0467a2fea6 100644
--- a/svx/inc/svx/xlnclit.hxx
+++ b/svx/inc/svx/xlnclit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnclit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index a39e078b53..c476a7848c 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlndsit.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
index 3af01e45c4..988705b026 100644
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/svx/inc/svx/xlnedcit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnedcit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index a0ec1abfb7..df85abc4c6 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnedit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
index 11d56f5fd8..0651824e0e 100644
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/svx/inc/svx/xlnedwit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnedwit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
index c4805a413c..ffbdfe0ab0 100644
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/svx/inc/svx/xlnstcit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnstcit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index 24475fc0ef..0572ec9c38 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnstit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
index be49f3c470..02ff94f48c 100644
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/svx/inc/svx/xlnstwit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnstwit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx
index 33d96c1852..377f4dcfcb 100644
--- a/svx/inc/svx/xlntrit.hxx
+++ b/svx/inc/svx/xlntrit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlntrit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
index b89182723f..f4f24a2f56 100644
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/svx/inc/svx/xlnwtit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xlnwtit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx
index 14fe205f37..837d681afd 100644
--- a/svx/inc/svx/xpoly.hxx
+++ b/svx/inc/svx/xpoly.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xpoly.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx
index 7bf94b7ad9..4f5dba0c06 100644
--- a/svx/inc/svx/xpool.hxx
+++ b/svx/inc/svx/xpool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xpool.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx
index 3bdd30c3d9..f40b9fa939 100644
--- a/svx/inc/svx/xsetit.hxx
+++ b/svx/inc/svx/xsetit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xsetit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx
index be552105b5..ef65257c2c 100644
--- a/svx/inc/svx/xsflclit.hxx
+++ b/svx/inc/svx/xsflclit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xsflclit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 3253e78878..444d2cf984 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtable.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx
index 0350140910..85061cf2c1 100644
--- a/svx/inc/svx/xtextit.hxx
+++ b/svx/inc/svx/xtextit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtextit.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
index d3921e7a9a..e7c981633c 100644
--- a/svx/inc/svx/xtextit0.hxx
+++ b/svx/inc/svx/xtextit0.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtextit0.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index 311eb4a058..3405b5eda4 100644
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx
index 8c7694cdcb..23415597d7 100644
--- a/svx/inc/svx/zoomsliderctrl.hxx
+++ b/svx/inc/svx/zoomsliderctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomsliderctrl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index 9ba2a52684..725f61a31f 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomslideritem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx
index f14477872f..ccfa3cf672 100644
--- a/svx/inc/svxempty.hxx
+++ b/svx/inc/svxempty.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxempty.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svxerr.hxx
index 41bd5f6d58..31baf42e2e 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svxerr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxerr.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,8 @@
 #define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS   (1UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_NOTEXISTS)
 
-#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS    (2UL | ERRCODE_AREA_SVX)
+// moved to editeng lib
+//#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS    (2UL | ERRCODE_AREA_SVX)
 
 #define ERRCODE_SVX_LINGU_LINGUNOTEXISTS       (3UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_NOTEXISTS )
@@ -52,8 +50,9 @@
 
 #define ERRCODE_SVX_GRAPHIC_NOTREADABLE	 	   (7UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_READ )
-#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT   (8UL | ERRCODE_AREA_SVX | \
-                                                ERRCODE_CLASS_READ )
+// moved to editeng lib
+//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT   (8UL | ERRCODE_AREA_SVX | ERRCODE_CLASS_READ )
+
 #define ERRCODE_SVX_LINGU_NOLANGUAGE		   (9UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_NOTEXISTS )
 #define ERRCODE_SVX_FORMS_NOIOSERVICES		   (10UL | ERRCODE_AREA_SVX )
diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svxgrahicitem.hxx
index e68d47ad17..120beaad6c 100644
--- a/svx/inc/svxgrahicitem.hxx
+++ b/svx/inc/svxgrahicitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxgrahicitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/swframeexample.hxx b/svx/inc/swframeexample.hxx
index 5cace0710e..fabd1b10c5 100644
--- a/svx/inc/swframeexample.hxx
+++ b/svx/inc/swframeexample.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swframeexample.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/swframeposstrings.hxx
index 663563ae66..ba73e3d017 100644
--- a/svx/inc/swframeposstrings.hxx
+++ b/svx/inc/swframeposstrings.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swframeposstrings.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/swframevalidation.hxx
index 997dd32759..0bd57c9747 100644
--- a/svx/inc/swframevalidation.hxx
+++ b/svx/inc/swframevalidation.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx
index ee24ca190b..4b45d8f5aa 100644
--- a/svx/inc/tbunocontroller.hxx
+++ b/svx/inc/tbunocontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbunocontroller.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/tbxalign.hxx b/svx/inc/tbxalign.hxx
index f30fd18810..bc674472aa 100644
--- a/svx/inc/tbxalign.hxx
+++ b/svx/inc/tbxalign.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxalign.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/tbxcolor.hxx
index 4fa8c7e577..3581093654 100644
--- a/svx/inc/tbxcolor.hxx
+++ b/svx/inc/tbxcolor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxcolor.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/tbxctl.hxx b/svx/inc/tbxctl.hxx
index a0d7b58051..eee93e3d7b 100644
--- a/svx/inc/tbxctl.hxx
+++ b/svx/inc/tbxctl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxctl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/tbxcustomshapes.hxx
index f3c50cf9ad..4265b9af44 100644
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/tbxcustomshapes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxcustomshapes.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/tbxdraw.hxx
index 8e0e98bdb7..d4aceb2c32 100644
--- a/svx/inc/tbxdraw.hxx
+++ b/svx/inc/tbxdraw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxdraw.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/svx/inc/txencbox.hxx b/svx/inc/txencbox.hxx
index c861118c87..a37cf0aad7 100644
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/txencbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txencbox.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -98,12 +95,6 @@ public:
      */
     void				FillWithMimeAndSelectBest();
 
-    /** 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();
-
     const SvxTextEncodingTable*		GetTextEncodingTable() const
                             { return m_pEncTable; }
 
diff --git a/svx/inc/txenctab.hxx b/svx/inc/txenctab.hxx
index 3da3436108..a1d28b2695 100644
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/txenctab.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txenctab.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx
index e5ab210597..8fe1de39b2 100644
--- a/svx/inc/uiks.hxx
+++ b/svx/inc/uiks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uiks.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx
index ffb19792b8..2f9a16b91c 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/unoapi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoapi.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <sal/types.h>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
@@ -63,9 +60,6 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDraw
 /** returns the SdrPage from the given StarOffice API wrapper */
 SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage ) throw() ;
 
-/** returns a GraphicObject for this URL */
-SVX_DLLPUBLIC GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ) throw() ;
-
 /** returns the SvxNumBulletItem with the given name from the pool or a null if there is no item
     with that name
 */
@@ -104,21 +98,5 @@ SVX_DLLPUBLIC void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String
 */
 SVX_DLLPUBLIC void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& rApiName, String& rInternalName ) throw();
 
-/** returns the which id for the given property name.  This only works for
-    properties of shapes (map SVXMAP_SHAPE is used for searching)
-
-    Note: As this function has no access to SvxItemPropertySet but only to
-    SfxItemPropertyMap, the search in the map is not done via bsearch, but by
-    linear search.
- */
-// os: unused function
-//SVX_DLLPUBLIC sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName );
-
-/** converts the given any with a metric to 100th/mm if needed */
-SVX_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, com::sun::star::uno::Any & rMetric ) throw();
-
-/** converts the given any with a metric from 100th/mm to the given metric if needed */
-SVX_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, com::sun::star::uno::Any & rMetric ) throw();
-
 #endif // _SVX_UNOAPI_HXX_
 
diff --git a/svx/inc/unofill.hxx b/svx/inc/unofill.hxx
index 8715c04d90..5579c2202d 100644
--- a/svx/inc/unofill.hxx
+++ b/svx/inc/unofill.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unofill.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/unomaster.hxx b/svx/inc/unomaster.hxx
index e6ba9d620f..670d575a53 100644
--- a/svx/inc/unomaster.hxx
+++ b/svx/inc/unomaster.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomaster.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index 98ce67b61b..0ed838c4c9 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomlstr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/unonrule.hxx b/svx/inc/unonrule.hxx
deleted file mode 100644
index 4a7d09a0ec..0000000000
--- a/svx/inc/unonrule.hxx
+++ /dev/null
@@ -1,49 +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: unonrule.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 _SVX_UNONRULE_HXX
-#define _SVX_UNONRULE_HXX
-
-#include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/ucb/XAnyCompare.hpp>
-#include "svx/svxdllapi.h"
-
-class SdrModel;
-class SvxNumRule;
-
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw();
-const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException );
-bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule );
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
-
-#endif
-
-
diff --git a/svx/inc/unopool.hxx b/svx/inc/unopool.hxx
index 447b294111..49baf26ee4 100644
--- a/svx/inc/unopool.hxx
+++ b/svx/inc/unopool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopool.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/svx/inc/unoshcol.hxx b/svx/inc/unoshcol.hxx
index 270f46c313..8783cb9521 100644
--- a/svx/inc/unoshcol.hxx
+++ b/svx/inc/unoshcol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshcol.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/verttexttbxctrl.hxx
index ea5f39ad03..2fa88fe614 100644
--- a/svx/inc/verttexttbxctrl.hxx
+++ b/svx/inc/verttexttbxctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: verttexttbxctrl.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/wrapfield.hxx b/svx/inc/wrapfield.hxx
index a798fb1a4c..54b7eba0d6 100644
--- a/svx/inc/wrapfield.hxx
+++ b/svx/inc/wrapfield.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrapfield.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/xattr.hxx b/svx/inc/xattr.hxx
index 477759d5ae..d4f4bd42e1 100644
--- a/svx/inc/xattr.hxx
+++ b/svx/inc/xattr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xattr.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/xexch.hxx b/svx/inc/xexch.hxx
index 2e0c291677..bb18e46231 100644
--- a/svx/inc/xexch.hxx
+++ b/svx/inc/xexch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xexch.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/xmleohlp.hxx
index ecda02f71c..4e4982d045 100644
--- a/svx/inc/xmleohlp.hxx
+++ b/svx/inc/xmleohlp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmleohlp.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/svx/inc/xmlexchg.hxx b/svx/inc/xmlexchg.hxx
index 8631b1024d..eab60f07ad 100644
--- a/svx/inc/xmlexchg.hxx
+++ b/svx/inc/xmlexchg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexchg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx
index 71d52a42c3..7df268a39c 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/xmlgrhlp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlgrhlp.hxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <vector>
 #include <set>
 #include <utility>
diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/xmlsecctrl.hxx
index efca38035e..cadcc55fc5 100644
--- a/svx/inc/xmlsecctrl.hxx
+++ b/svx/inc/xmlsecctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsecctrl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/xoutbmp.hxx
index 7c09fd0b99..21ab95e2f6 100644
--- a/svx/inc/xoutbmp.hxx
+++ b/svx/inc/xoutbmp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xoutbmp.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index a9ea14155e..3650a698f9 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xpolyimp.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/zoomctrl.hxx
index 7a8a067c26..b3386b207b 100644
--- a/svx/inc/zoomctrl.hxx
+++ b/svx/inc/zoomctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomctrl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 3f66b2ae19..5b99711eda 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,23 +1,13 @@
-sx	svx	:	sfx2 l10n connectivity xmloff linguistic jvmfwk avmedia drawinglayer NULL
+sx	svx	:	sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng NULL
 sx	svx										usr1	-	all	sx_mkout NULL
 sx	svx\inc									nmake	-	all	sx_inc NULL
-sx	svx\uiconfig\layout									nmake	-	all	sx_layout NULL
-sx	svx\prj									get		-	all	sx_prj NULL
-sx	svx\win\res								get		-	all	sx_wres NULL
-sx	svx\os2\res								get		-	all	sx_ores NULL
-sx	svx\unx\res								get		-	all	sx_ures NULL
-sx	svx\source\inc							get		-	all	sx_sinc NULL
-sx	svx\mac\inc								get		-	all	sx_minc NULL
-sx	svx\source\unodialogs					get		-	all	sx_unodialogs NULL
-sx	svx\source\unodialogs\inc   	        get	    -	all	sx_unodialogs_inc NULL
+sx	svx\uiconfig\layout						nmake	-	all	sx_layout NULL
 sx	svx\source\unodialogs\textconversiondlgs   	nmake	-	all	sx_textconversiondlgs sx_inc NULL
 sx	svx\sdi									nmake	-	all	sx_sdi sx_inc NULL
 sx	svx\source\src							nmake	-	all	sx_src sx_inc sx_sdi NULL
 sx	svx\source\intro						nmake	-	all	sx_intro sx_inc NULL
 sx	svx\source\items						nmake	-	all	sx_items sx_inc sx_sdi NULL
 sx	svx\source\xoutdev						nmake	-	all	sx_xout sx_items sx_inc NULL
-sx	svx\source\editeng						nmake	-	all	sx_eeng sx_inc NULL
-sx	svx\source\outliner						nmake	-	all	sx_outl sx_inc NULL
 sx	svx\source\svdraw						nmake	-	all	sx_draw sx_inc NULL
 sx	svx\source\sdr\attribute				nmake	-	all	sx_attribute sx_inc NULL
 sx	svx\source\sdr\primitive2d				nmake	-	all	sx_primitive2d sx_inc NULL
@@ -32,20 +22,16 @@ sx	svx\source\smarttags					nmake	-	all	sx_smarttags sx_inc NULL
 sx	svx\source\stbctrls						nmake	-	all	sx_stbc sx_inc NULL
 sx	svx\source\mnuctrls						nmake	-	all	sx_mnuc sx_inc NULL
 sx	svx\source\engine3d						nmake	-	all	sx_3deng sx_inc NULL
-sx	svx\source\svxlink						nmake	-	all	sx_link sx_inc NULL
 sx	svx\source\form							nmake	-	all	sx_form sx_sdi sx_inc NULL
 sx	svx\source\fmcomp						nmake	-	all	sx_fmcmp sx_sdi sx_inc NULL
 sx	svx\source\tbxctrls						nmake	-	all	sx_tbxc sx_inc NULL
-sx	svx\source\options						nmake	-	all	sx_opt sx_inc NULL
-sx      svx\source\dialog                                               nmake   -       all     sx_dlg sx_inc NULL
-sx	svx\source\svrtf						nmake	-	all	sx_rtf sx_inc NULL
+sx  svx\source\dialog                                               nmake   -       all     sx_dlg sx_inc NULL
 sx	svx\source\unodraw						nmake	-	all	sx_undrw sx_inc NULL
-sx	svx\source\unoedit						nmake	-	all	sx_unedt sx_inc NULL
 sx	svx\source\unogallery					nmake	-	all	sx_ungal sx_inc NULL
 sx	svx\source\gallery2						nmake	-	all	sx_gall sx_inc NULL
 sx	svx\source\xml							nmake	-	all	sx_xml sx_inc NULL
 sx	svx\source\accessibility				nmake	-	all	sx_accessibility sx_inc NULL
 sx	svx\source\customshapes					nmake	-	all sx_customshapes sx_inc NULL
 sx	svx\source\toolbars						nmake	-	all sx_toolbars sx_inc NULL
-sx      svx\util                                                                nmake   -       all     sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_eeng sx_fmcmp sx_form sx_gall sx_items sx_link sx_mnuc sx_opt sx_outl sx_rtf sx_sdi sx_stbc sx_tbxc sx_undrw sx_unedt sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
+sx      svx\util                                                                nmake   -       all     sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL
 sx	svx\source\gengal						nmake	-	all	sx_gengal sx_util NULL
diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk
index da8e595ccb..a64401995a 100644
--- a/svx/qa/unoapi/makefile.mk
+++ b/svx/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.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index 4829c2889f..4c1b7181e8 100644
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmslots.sdi,v $
- * $Revision: 1.15.212.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/sdi/makefile.mk b/svx/sdi/makefile.mk
index c86488daee..be41593be7 100644
--- a/svx/sdi/makefile.mk
+++ b/svx/sdi/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c4a82a436c..bf8b234493 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svx.sdi,v $
- * $Revision: 1.78.198.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -6870,31 +6867,6 @@ SfxBoolItem LastRecord SID_FM_RECORD_LAST
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem LaunchStarImage SID_SIM_START
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem LeaveFMCreateMode SID_FM_LEAVE_CREATE
 (SfxBoolItem Leave SID_FM_LEAVE_CREATE)
 [
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 377b40130c..d88807e38d 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxitems.sdi,v $
- * $Revision: 1.32.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc
index a1c7ae70b9..b6756506e9 100644
--- a/svx/sdi/svxslots.hrc
+++ b/svx/sdi/svxslots.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: svxslots.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,7 +25,9 @@
  *
  ************************************************************************/
 #include <sfx2/sfx.hrc>
+#include <sfx2/sfxsids.hrc>
+#include <editeng/memberids.hrc>
+#include <editeng/editids.hrc>
 #include <svx/svxids.hrc>
 #include <svx/unomid.hxx>
-#include <sfx2/sfxsids.hrc>
 
diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi
index bda0f783b0..c8a6d80135 100644
--- a/svx/sdi/svxslots.sdi
+++ b/svx/sdi/svxslots.sdi
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxslots.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index b612309640..cbc9342227 100644
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xoitems.sdi,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 5aff34589c..d717fa2a49 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleControlShape.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/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 0ed80a5af8..89f3e20f54 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleEmptyEditSource.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,8 +34,8 @@
 //
 //------------------------------------------------------------------------
 #include <svl/itemset.hxx>
-#include <svx/editdata.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index 83350ae116..f4492f313b 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleEmptyEditSource.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <svl/lstner.hxx>
 
 #include <memory>
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 class SdrObject;
 class SdrView;
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 49287b16b8..e43ff30d03 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleFrameSelector.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
 #include <vcl/svapp.hxx>
 #include <svx/frmsel.hxx>
 #include <svx/dialmgr.hxx>
-#include "unolingu.hxx"
+#include "editeng/unolingu.hxx"
 
 #ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 6b5f1ed8bc..c99c398e8e 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleGraphicShape.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/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 76142ed8f2..26445c420f 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleOLEShape.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 14ec72bfb3..1feb374c68 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleShape.cxx,v $
- * $Revision: 1.54 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,9 +45,9 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <rtl/ref.hxx>
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx
index 8b36ad05a3..dee1822f0d 100644
--- a/svx/source/accessibility/AccessibleShapeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeInfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleShapeInfo.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/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 576275ec38..e2b8bf82fa 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleShapeTreeInfo.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/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index 59a67e3c2f..128bf304ed 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleTextEventQueue.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,16 +29,16 @@
 #include "precompiled_svx.hxx"
 #include "AccessibleTextEventQueue.hxx"
 #include <svx/unoshape.hxx>
-#include "unolingu.hxx"
-#include <svx/unotext.hxx>
+#include "editeng/unolingu.hxx"
+#include <editeng/unotext.hxx>
 
-#include "unoedhlp.hxx"
-#include "unopracc.hxx"
+#include "editeng/unoedhlp.hxx"
+#include "editeng/unopracc.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 
 namespace accessibility
 {
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index 2d1fa86bb9..daa3bbb564 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleTextEventQueue.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 6217cf9caf..d723b0cc51 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/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.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,18 +67,18 @@
 #include "AccessibleTextEventQueue.hxx"
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshape.hxx>
-#include "unolingu.hxx"
-#include <svx/unotext.hxx>
+#include "editeng/unolingu.hxx"
+#include <editeng/unotext.hxx>
 
-#include "unoedhlp.hxx"
-#include "unopracc.hxx"
-#include "AccessibleParaManager.hxx"
-#include "AccessibleEditableTextPara.hxx"
+#include "editeng/unoedhlp.hxx"
+#include "editeng/unopracc.hxx"
+#include "editeng/AccessibleParaManager.hxx"
+#include "editeng/AccessibleEditableTextPara.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index 46eb66ec4e..d7ce3b2a1e 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChildrenManager.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 1655e3206a..6ab4ac7ed7 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChildrenManagerImpl.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index b28430befa..06c49670a6 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChildrenManagerImpl.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,21 +30,16 @@
 #include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/IAccessibleParent.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>
-#include <svx/AccessibleContextBase.hxx>
+#include <editeng/AccessibleContextBase.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <vos/mutex.hxx>
 #include <vector>
+#include <memory>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/document/XEventListener.hpp>
-#ifndef _COM_SUN_STAR_DOCUMENT_XSELECTIONCHANGELISTENER_HPP_
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBLE_XACCESSIBLE_HPP_
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
-#include <vector>
-
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index 32251caf13..1715188534 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DGColorNameLookUp.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/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index d21faf1fc2..6a2466a6ce 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DescriptionGenerator.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/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 89382818f4..82cc03d7da 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GraphCtlAccessibleContext.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/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 3145870d38..29493f85f9 100755
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ShapeTypeHandler.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index e3e28f8678..18e080c242 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SvxShapeTypes.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
index 82fe774f5b..0fd5579898 100644
--- a/svx/source/accessibility/accessibility.src
+++ b/svx/source/accessibility/accessibility.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: accessibility.src,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -196,16 +193,6 @@ String RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION
     Text [ en-US ] = "This is where you can edit the contour." ;
 };
 
-String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
-{
-    Text [ en-US ] = "Image bullet in paragraph" ;
-};
-
-String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
-{
-    Text [ en-US ] = "Image bullet" ;
-};
-
 String RID_SVXSTR_CHARACTER_SELECTION
 {
     Text [ en-US ] = "Special character selection";
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index fac109fc9c..1a4d71c75c 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charmapacc.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/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk
index 8b1802bf1a..9ac9cff08a 100755
--- a/svx/source/accessibility/makefile.mk
+++ b/svx/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.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +29,6 @@ PRJ=..$/..
 
 PRJNAME=svx
 TARGET=accessibility
-LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -43,21 +38,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-    $(SLO)$/AccessibleStringWrap.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
+SLOFILES= \
     $(SLO)$/charmapacc.obj						\
     $(SLO)$/svxrectctaccessiblecontext.obj		\
     $(SLO)$/GraphCtlAccessibleContext.obj		\
     $(SLO)$/ChildrenManager.obj 				\
     $(SLO)$/ChildrenManagerImpl.obj 			\
     $(SLO)$/DescriptionGenerator.obj 			\
-    $(SLO)$/AccessibleContextBase.obj			\
-    $(SLO)$/AccessibleComponentBase.obj			\
-    $(SLO)$/AccessibleSelectionBase.obj			\
     $(SLO)$/AccessibleShape.obj					\
     $(SLO)$/AccessibleGraphicShape.obj			\
     $(SLO)$/AccessibleOLEShape.obj				\
@@ -66,18 +53,12 @@ LIB2OBJFILES= \
     $(SLO)$/AccessibleTextHelper.obj			\
     $(SLO)$/AccessibleEmptyEditSource.obj		\
     $(SLO)$/AccessibleTextEventQueue.obj		\
-    $(SLO)$/AccessibleStaticTextBase.obj		\
-    $(SLO)$/AccessibleParaManager.obj			\
-    $(SLO)$/AccessibleEditableTextPara.obj		\
-    $(SLO)$/AccessibleImageBullet.obj			\
     $(SLO)$/ShapeTypeHandler.obj				\
     $(SLO)$/SvxShapeTypes.obj					\
     $(SLO)$/AccessibleControlShape.obj			\
     $(SLO)$/DGColorNameLookUp.obj				\
     $(SLO)$/AccessibleFrameSelector.obj
     
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
 SRS2NAME = accessibility
 SRC2FILES = accessibility.src
 
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 75e4ef1d59..f900fd2d36 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxrectctaccessiblecontext.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index eba03cd9ea..3644b2b3a2 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShape2d.cxx,v $
- * $Revision: 1.31.146.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index ffacbfa59c..6123e7f4c9 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShape2d.hxx,v $
- * $Revision: 1.11.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index fcce0b5a0e..c2f861ba2f 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShape3d.cxx,v $
- * $Revision: 1.19.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index 45d98d9e4c..5c242855c9 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShape3d.hxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 9e05ca41b0..272a46b49a 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeEngine.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,8 +42,8 @@
 #include <svx/svdoashp.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdorect.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svdoutl.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svdopath.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index 2666d7f1e6..684d902d9b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeEngine.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 1769009824..33d9bef294 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeFontWork.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,19 +40,19 @@
 #include <vcl/virdev.hxx>
 #include <svditer.hxx>
 #include <vcl/metric.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/charscaleitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include "EnhancedCustomShapeTypeNames.hxx"
 #include <svx/svdorect.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/outliner.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editeng.hxx>
 #include <svx/svdmodel.hxx>
 #include <vector>
 #include <numeric>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
index 4ee4f4657c..672637d7d2 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeFontWork.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 9c408f7746..dfb0752841 100755..100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeFunctionParser.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/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 548c09b295..d7b8cef73c 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeGeometry.cxx,v $
- * $Revision: 1.23.92.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
index d216c5bb48..1961227844 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeGeometry.hxx,v $
- * $Revision: 1.8.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index b6b0a54fbc..45f56e8e70 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeHandle.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/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 0cb681cc13..c1fbb291cd 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeHandle.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 588e8a3207..5925cd0eed 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeTypeNames.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
index a24f11ebf0..2d26f8d6bd 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeTypeNames.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk
index edd6f7d33e..3feca8f250 100644
--- a/svx/source/customshapes/makefile.mk
+++ b/svx/source/customshapes/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index c1561822cf..d3c6ea3396 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxcustomshapes.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index d5e99df857..f1e0da5d29 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SpellDialogChildWindow.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 20e59b4d3d..022478a824 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _bmpmask.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/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 157d7e8053..2313f15ea6 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _contdlg.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -874,7 +871,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
 IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
 {
     String aStr;
-    const FieldUnit eFieldUnit = GetModuleFieldUnit();
+    const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
     const Point& rMousePos = pWnd->GetMousePos();
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
@@ -897,7 +894,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
 IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
 {
     String aStr;
-    const FieldUnit eFieldUnit = GetModuleFieldUnit();
+    const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
     const Size& rSize = pWnd->GetGraphicSize();
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index 934a0f60f2..79c9b60d3a 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.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: bmpmask.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/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index 23fe9df291..d299defde4 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.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: bmpmask.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/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index f0827a25e7..1dce3620a5 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charmap.cxx,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index e48736bf37..06730c4bf6 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: checklbx.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/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index ad96fab911..25c362ad6f 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: connctrl.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/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index 946282e7e3..bf3bc84267 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.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: contdlg.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/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index b2c663cc8c..df5805daa6 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.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: contdlg.src,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/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index dd88d823b5..3689d19935 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contimp.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 692a961cf0..a398469a82 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contwnd.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/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 29ebe78618..43babce95e 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contwnd.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 7a695c550c..b5e28ab6cf 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ctredlin.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 #include <svtools/txtcmp.hxx>
 #include <unotools/charclass.hxx>
 // INCLUDE -------------------------------------------------------------------
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/dialmgr.hxx>
 #include "ctredlin.hrc"
 #include <svx/ctredlin.hxx>
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index eef45668cc..cba699d839 100644
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.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: ctredlin.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/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index 8b49dc708d..3ca9f10480 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.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: ctredlin.src,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/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 9406c09672..e9c65020fe 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: databaseregistrationui.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/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 001bcb04b8..3968a946bc 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialcontrol.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/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index 0a05a75b3d..d95dffb514 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dialmgr.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 79d0490720..8923ca6776 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dlgctl3d.cxx,v $
- * $Revision: 1.20.226.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 21941e26fa..d19e04dd93 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/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.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src
index a23922b4b3..e5bd607efd 100644
--- a/svx/source/dialog/dlgctrl.src
+++ b/svx/source/dialog/dlgctrl.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: dlgctrl.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/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index a1fd1e8bbd..5fa005d0dc 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -33,935 +30,26 @@
 
 // include ---------------------------------------------------------------
 
-#include <limits.h>
-#include <tools/shl.hxx>
-#include <tools/urlobj.hxx>
-#include <unolingu.hxx>
-
-#include <svtools/langtab.hxx>
-#include <svl/itemset.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
-
-#include <svx/dialogs.hrc>
-
 #include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-
-// -----------------------------------------------------------------------
-
-String GetLanguageString( LanguageType eType )
-{
-    static const SvtLanguageTable aLangTable;
-    return aLangTable.GetString( eType );
-}
-
-// -----------------------------------------------------------------------
-
-String GetDicInfoStr( const String& rName, const USHORT nLang, const BOOL bNeg )
-{
-    INetURLObject aURLObj;
-    aURLObj.SetSmartProtocol( INET_PROT_FILE );
-    aURLObj.SetSmartURL( rName, INetURLObject::ENCODE_ALL );
-    String aTmp( aURLObj.GetBase() );
-    aTmp += sal_Unicode( ' ' );
-
-    if ( bNeg )
-    {
-        sal_Char const sTmp[] = " (-) ";
-        aTmp.AppendAscii( sTmp );
-    }
-
-    if ( LANGUAGE_NONE == nLang )
-        aTmp += String( ResId( RID_SVXSTR_LANGUAGE_ALL, DIALOG_MGR() ) );
-    else
-    {
-        aTmp += sal_Unicode( '[' );
-        aTmp += ::GetLanguageString( (LanguageType)nLang );
-        aTmp += sal_Unicode( ']' );
-    }
-
-    return aTmp;
-}
-
-// -----------------------------------------------------------------------
-
-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 );
-    }
-}
+#include <svl/itemset.hxx>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/module.hxx>
+#include <svl/intitem.hxx>
 
 // -----------------------------------------------------------------------
 
-FieldUnit GetModuleFieldUnit( const SfxItemSet* pSet )
+FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
 {
     FieldUnit eUnit = FUNIT_INCH;
     const SfxPoolItem* pItem = NULL;
-    if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) )
+    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) )
         eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue();
-    else
-    {
-        SfxViewFrame* pFrame = SfxViewFrame::Current();
-        SfxObjectShell* pSh = NULL;
-        if ( pFrame )
-            pSh = pFrame->GetObjectShell();
-        if ( pSh )  // #93209# the object shell is not always available during reload
-        {
-            SfxModule* pModule = pSh->GetModule();
-            if ( pModule )
-            {
-                const SfxPoolItem* _pItem = pModule->GetItem( SID_ATTR_METRIC );
-                if ( _pItem )
-                    eUnit = (FieldUnit)( (SfxUInt16Item*)_pItem )->GetValue();
-            }
-            else
-            {
-                DBG_ERRORFILE( "GetModuleFieldUnit(): no module found" );
-            }
-        }
-    }
-    return eUnit;
-}
-
-// -----------------------------------------------------------------------
-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 );
-
-/*
-    if ( SFX_MAPUNIT_100TH_MM == eUnit )
-    {
-        FieldUnit eFUnit = ( (MetricField&)rField ).GetUnit();
-        USHORT nDigits = rField.GetDecimalDigits();
-
-        if ( FUNIT_MM == eFUnit )
-        {
-            if ( 0 == nDigits )
-                lCoreValue /= 100;
-            else if ( 1 == nDigits )
-                lCoreValue /= 10;
-            else if ( nDigits > 2 )
-            {
-                DBG_ERROR( "too much decimal digits" );
-                return;
-            }
-            rField.SetValue( lCoreValue, FUNIT_MM );
-            return;
-        }
-        else if ( FUNIT_CM == eFUnit )
-        {
-            if ( 0 == nDigits )
-                lCoreValue /= 1000;
-            else if ( 1 == nDigits )
-                lCoreValue /= 100;
-            else if ( 2 == nDigits )
-                lCoreValue /= 10;
-            else if ( nDigits > 3 )
-            {
-                DBG_ERROR( "too much decimal digits" );
-                return;
-            }
-            rField.SetValue( lCoreValue, FUNIT_CM );
-            return;
-        }
-    }
-    rField.SetValue( rField.Normalize(
-        ConvertValueToUnit( lCoreValue, eUnit ) ), MapToFieldUnit( eUnit ) );
-*/
-}
-
-// -----------------------------------------------------------------------
-
-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 nRet = rField.GetValue( MapToFieldUnit( eUnit ) );
-    FieldUnit eFUnit = ( (MetricField&)rField ).GetUnit();
-    USHORT nDigits = rField.GetDecimalDigits();
-    DBG_ASSERT( nDigits <= 2, "decimal digits > 2!" );
-
-    switch ( eUnit )
-    {
-        case SFX_MAPUNIT_100TH_MM:
-        {
-            if ( 2 == nDigits )
-                return nRet;
-            else if ( 1 == nDigits )
-                return nRet * 10;
-            else
-                return nRet * 100;
-        }
-
-        case SFX_MAPUNIT_TWIP:
-        {
-            if ( 2 == nDigits )
-            {
-                long nMod = 100;
-                long nTmp = nRet % nMod;
-
-                if ( nTmp >= 49 )
-                    nRet += 100 - nTmp;
-                return nRet / 100;
-            }
-            else if ( 1 == nDigits )
-            {
-                long nMod = 10;
-                long nTmp = nRet % nMod;
-
-                if ( nTmp >= 4 )
-                    nRet += 10 - nTmp;
-                return nRet / 10;
-            }
-            else
-                return nRet;
-        }
-
-        default:
-            DBG_ERROR( "this unit is not implemented" );
-            return 0;
-    }
-*/
-
-/*!!!
-    return ConvertValueToMap( rField.Denormalize(
-        rField.GetValue( MapToFieldUnit( eUnit ) ) ), eUnit );
-*/
-}
-
-// -----------------------------------------------------------------------
-
-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 )
+    else 
     {
-        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
+        DBG_ERROR("Using fallback for field unit - field unit should be provided in ItemSet");
+        return SfxModule::GetCurrentFieldUnit();
     }
-    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 );
-}
-
-String ConvertPosSizeToIniString( const Point& rPos, const Size& rSize )
-{
-    String aRet = String::CreateFromInt32( rPos.X() );
-    aRet += '/';
-    aRet += String::CreateFromInt32( rPos.Y() );
-    aRet += '/';
-    aRet += String::CreateFromInt32( rSize.Width() );
-    aRet += '/';
-    aRet += String::CreateFromInt32( rSize.Height() );
-    return aRet;
-}
-
-sal_Bool ConvertIniStringToPosSize( const String& rIniStr, Point& rPos, Size& rSize )
-{
-    if ( rIniStr.GetTokenCount('/') != 4 )
-        return sal_False;
-
-    USHORT nIdx = 0;
-    rPos.X() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-    rPos.Y() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-    rSize.Width() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-    rSize.Height() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-
-    // negative sizes are invalid
-    if ( rSize.Width() < 0 || rSize.Height() < 0 )
-        return sal_False;
-
-    return sal_True;
+    return eUnit;
 }
 
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 5533100319..0b97433d53 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docrecovery.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index 07587d25af..851321bc6a 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.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: docrecovery.hrc,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index a5698ad742..67df927ee8 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.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: docrecovery.src,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 513094dbf7..96a5c1782e 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fntctrl.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 1358080600..c62749b4f6 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontlb.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index b967f3ed79..8faf74ffe7 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontwork.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 #include <svx/dialogs.hrc>
 #include "fontwork.hrc"
 #include <svx/fontwork.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 
@@ -295,7 +292,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
     aMtrFldShadowY.SetModifyHdl( aLink );
 
     // System-Metrik setzen
-    const FieldUnit eDlgUnit = GetModuleFieldUnit();
+    const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
     SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
     SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
     SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
@@ -605,7 +602,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
             if ( pItem->GetValue() == XFTSHADOW_NORMAL )
             {
                 nId = TBI_SHADOW_NORMAL;
-                 const FieldUnit eDlgUnit = GetModuleFieldUnit();
+                const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
 
 //              aFbShadowX.SetBitmap( Bitmap( ResId(RID_SVXBMP_SHADOW_XDIST, _pMgr ) ) );
                 //aMtrFldShadowX.SetUnit(FUNIT_MM);
@@ -888,7 +885,7 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
     // System-Metrik evtl. neu setzen
     // Dieses sollte mal als Listener passieren, ist aber aus
     // inkompatibilitaetsgruenden z.Z. nicht moeglich
-    const FieldUnit eDlgUnit = GetModuleFieldUnit();
+    const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
     if( eDlgUnit != aMtrFldDistance.GetUnit() )
     {
         SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc
index 6009830617..a664dd3ce6 100644
--- a/svx/source/dialog/fontwork.hrc
+++ b/svx/source/dialog/fontwork.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: fontwork.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/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 10349f389b..667ab90f96 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.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: fontwork.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/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 2fe4d8187d..06fc47828b 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framelink.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 
 #include <math.h>
 #include <vcl/outdev.hxx>
-#include <svx/borderline.hxx>
+#include <editeng/borderline.hxx>
 
 // ----------------------------------------------------------------------------
 
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index b0b25d8355..273f2e8ce8 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: framelinkarray.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 69d5149758..89b8f73480 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmdirlbox.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 1347062895..b562e123b4 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmsel.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/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src
index 7e649f6291..4f85f5eff9 100644
--- a/svx/source/dialog/frmsel.src
+++ b/svx/source/dialog/frmsel.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: frmsel.src,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index f1174bde5c..248744758c 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphctl.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/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index f2b0a18439..bf8bd104a2 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grfflt.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/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 85db5fca3e..3496e11b01 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hdft.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,17 +39,7 @@
 
 #include <svx/dialogs.hrc>
 #include "hdft.hrc"
-
-
-
-
-
-
-
-
-
-
-
+#include <svl/intitem.hxx>
 
 #define _SVX_HDFT_CXX
 
@@ -63,12 +50,12 @@
 #include <svx/dialmgr.hxx>
 #include "htmlmode.hxx"
 
-#include <svx/brshitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/shaditem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/boxitem.hxx>
 
 #include <svx/svxdlg.hxx> //CHINA001
 #include <svx/dialogs.hrc> //CHINA001
@@ -188,7 +175,7 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
     FreeResource();
 
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rAttr );
+    FieldUnit eFUnit = GetModuleFieldUnit( rAttr );
     SetFieldUnit( aDistEdit, eFUnit );
     SetFieldUnit( aHeightEdit, eFUnit );
     SetFieldUnit( aLMEdit, eFUnit );
diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc
index aa48cf962a..fe221189fc 100644
--- a/svx/source/dialog/hdft.hrc
+++ b/svx/source/dialog/hdft.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: hdft.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/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index 4170534e84..adb89ce3bf 100644
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.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: hdft.src,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/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index edb6d73b95..5342be0e13 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyperdlg.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/svx/source/dialog/hyphen.cxx b/svx/source/dialog/hyphen.cxx
deleted file mode 100644
index 81ae5961cf..0000000000
--- a/svx/source/dialog/hyphen.cxx
+++ /dev/null
@@ -1,522 +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: hyphen.cxx,v $
- * $Revision: 1.14 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-// include ---------------------------------------------------------------
-#include <tools/shl.hxx>
-#include <tools/list.hxx>
-#include <com/sun/star/linguistic2/XPossibleHyphens.hpp>
-#include <vcl/msgbox.hxx>
-
-
-#define _SVX_HYPHEN_CXX
-
-#include <svx/dialogs.hrc>
-#include "hyphen.hrc"
-
-#include <svx/svxenum.hxx>
-#include "hyphen.hxx"
-#include <svx/splwrap.hxx>
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include <unolingu.hxx>
-#ifndef _USR_USTRING_HXX
-//#include <usr/ustring.hxx>
-#endif
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::linguistic2;
-
-#undef S2U
-#undef U2S
-//#define S2U(s) 						StringToOUString(s, CHARSET_SYSTEM)
-//#define U2S(s)						OUStringToString(s, CHARSET_SYSTEM)
-
-// define ----------------------------------------------------------------
-
-#define HYPHHERE			'-'
-#define CONTINUE_HYPH       USHRT_MAX
-
-// Dies ist nur ein Hack, weil an dieser Stelle das extern char aus hmwrap
-// nicht bekannt ist, wird demnaechst in hmwrap durch ein define ersetzt.
-#define SW_SOFT_HYPHEN  '='
-
-// class SvxHyphenEdit ---------------------------------------------------
-
-SvxHyphenEdit::SvxHyphenEdit( Window* pParent, const ResId& rResId ) :
-
-    Edit( pParent, rResId )
-{
-}
-
-// -----------------------------------------------------------------------
-
-void SvxHyphenEdit::KeyInput( const KeyEvent& rKEvt )
-{
-//	sal_uInt16 nMod  = rKEvt.GetKeyCode().GetModifier();
-    sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
-
-    switch ( nCode )
-    {
-        case KEY_LEFT:
-            ( (SvxHyphenWordDialog*)GetParent() )->SelLeft();
-            break;
-
-        case KEY_RIGHT:
-            ( (SvxHyphenWordDialog*)GetParent() )->SelRight();
-            break;
-
-        case KEY_TAB:
-        case KEY_ESCAPE:
-        case KEY_RETURN:
-            Edit::KeyInput(rKEvt);
-            break;
-        default:
-            Control::KeyInput( rKEvt );	// An den Dialog weiterleiten
-            break;
-    }
-}
-
-// class SvxHyphenWordDialog ---------------------------------------------
-
-SvxHyphenWordDialog::SvxHyphenWordDialog( const String &rWord, LanguageType nLang,
-                                          Window* pParent,
-                                          Reference< XHyphenator >  &xHyphen,
-                                          SvxSpellWrapper* pWrapper ) :
-    SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_HYPHENATE ) ),
-
-    aWordFT     ( this, SVX_RES( FT_WORD ) ),
-    aWordEdit	( this, SVX_RES( ED_WORD ) ),
-    aLeftBtn	( this, SVX_RES( BTN_LEFT ) ),
-    aRightBtn	( this, SVX_RES( BTN_RIGHT ) ),
-    aOkBtn		( this, SVX_RES( BTN_HYPH_CUT ) ),
-    aCancelBtn	( this, SVX_RES( BTN_HYPH_CANCEL ) ),
-    aContBtn	( this, SVX_RES( BTN_HYPH_CONTINUE ) ),
-    aDelBtn		( this, SVX_RES( BTN_HYPH_DELETE ) ),
-    aHelpBtn	( this, SVX_RES( BTN_HYPH_HELP ) ),
-    aLabel			( GetText() ),
-    pHyphWrapper	( pWrapper ),
-    xHyphenator		( xHyphen ),
-    aActWord		( rWord ),
-    nActLanguage	( nLang ),
-    nHyphPos		( 0 ),
-    nOldPos			( 0 ),
-    bBusy			( sal_False )
-{
-    aContBtn.SetClickHdl(
-        LINK( this, SvxHyphenWordDialog, ContinueHdl_Impl ) );
-    aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, CutHdl_Impl ) );
-    aDelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, DeleteHdl_Impl ) );
-    aCancelBtn.SetClickHdl(
-        LINK( this, SvxHyphenWordDialog, CancelHdl_Impl ) );
-    aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Left_Impl ) );
-    aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Right_Impl ) );
-
-    aWordEdit.SetGetFocusHdl(
-        LINK( this, SvxHyphenWordDialog, GetFocusHdl_Impl ) );
-
-    Reference< XHyphenatedWord >  xHyphWord( pWrapper ?
-            pWrapper->GetLast() : Reference< XInterface > () , UNO_QUERY );
-    DBG_ASSERT(xHyphWord.is(), "missing hyphenated word");
-    nMaxHyphenationPos = xHyphWord.is() ? xHyphWord->getHyphenationPos() : 0;
-    SetLabel_Impl( nLang );
-
-    InitControls_Impl();
-    aWordEdit.GrabFocus();
-
-    FreeResource();
-
-    // disable controls if service is not available
-    if (!xHyphenator.is())
-        Enable( sal_False );
-}
-
-// -----------------------------------------------------------------------
-
-void SvxHyphenWordDialog::SelLeft()
-{
-    String aTxt( aWordEdit.GetText() );
-
-    for ( xub_StrLen i = nOldPos + 1;  i-- > 0 ; )
-    {
-        DBG_ASSERT(i <= aTxt.Len(), "index out of range");
-        if( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) )
-        {
-            aTxt.SetChar( i, sal_Unicode( HYPHHERE ) );
-
-            if ( nOldPos != 0 && nOldPos != aTxt.Len() )
-                aTxt.SetChar( nOldPos, sal_Unicode( SW_SOFT_HYPHEN ) );
-            nOldPos = i;
-            aWordEdit.SetText( aTxt );
-            aWordEdit.GrabFocus();
-            aWordEdit.SetSelection( Selection( i, i + 1 ) );
-            break;
-        }
-    }
-    nHyphPos = GetHyphIndex_Impl();
-    EnableLRBtn_Impl();
-}
-
-// -----------------------------------------------------------------------
-
-void SvxHyphenWordDialog::SelRight()
-{
-    String aTxt( aWordEdit.GetText() );
-
-    for ( xub_StrLen i = nOldPos + 1;  i < aTxt.Len();  ++i )
-    {
-        if( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) )
-        {
-            aTxt.SetChar( i, sal_Unicode( HYPHHERE ) );
-
-            if ( nOldPos != 0 && nOldPos != aTxt.Len() )
-                aTxt.SetChar( nOldPos, sal_Unicode( SW_SOFT_HYPHEN ) );
-            nOldPos = i;
-            aWordEdit.SetText( aTxt );
-            aWordEdit.GrabFocus();
-            aWordEdit.SetSelection( Selection( i, i + 1 ) );
-            break;
-        }
-    }
-    nHyphPos = GetHyphIndex_Impl();
-    EnableLRBtn_Impl();
-}
-
-// -----------------------------------------------------------------------
-
-void SvxHyphenWordDialog::EnableLRBtn_Impl()
-{
-    String	aTxt( aWordEdit.GetText() );
-    xub_StrLen nLen = aTxt.Len();
-    xub_StrLen i;
-
-    aRightBtn.Disable();
-    for ( i = nOldPos + 2; i < nLen; ++i )
-    {
-        if ( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) )
-        {
-            aRightBtn.Enable();
-            break;
-        }
-    }
-
-    DBG_ASSERT(nOldPos < aTxt.Len(), "nOldPos out of range");
-    if (nOldPos >= aTxt.Len())
-        nOldPos = aTxt.Len() - 1;
-    aLeftBtn.Disable();
-    for ( i = nOldPos;  i-- > 0; )
-    {
-        if ( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) )
-        {
-            aLeftBtn.Enable();
-            break;
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-
-void SvxHyphenWordDialog::SetLabel_Impl( LanguageType nLang )
-{
-    String aLangStr( ::GetLanguageString( nLang ) );
-    String aTmp( aLabel );
-    aTmp.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
-    aTmp.Append( aLangStr );
-    aTmp.Append( sal_Unicode( ')' ) );
-    SetText( aTmp );
-}
-
-// -----------------------------------------------------------------------
-
-String SvxHyphenWordDialog::EraseUnusableHyphens_Impl(
-        Reference< XPossibleHyphens >  &rxPossHyph,
-        sal_uInt16 _nMaxHyphenationPos )
-{
-    // returns a String showing only those hyphen positions which will result
-    // in a line break if hyphenation is done there
-
-    String aTxt;
-    DBG_ASSERT(rxPossHyph.is(), "missing possible hyphens");
-    if (rxPossHyph.is())
-    {
-        aTxt = String( rxPossHyph->getPossibleHyphens() );
-
-        Sequence< sal_Int16 > aHyphenationPositions(
-                rxPossHyph->getHyphenationPositions() );
-        sal_Int32 nLen = aHyphenationPositions.getLength();
-        const sal_Int16 *pHyphenationPos = aHyphenationPositions.getConstArray();
-
-        // find position nIdx after which all hyphen positions are unusable
-        xub_StrLen nIdx = STRING_NOTFOUND,
-              nPos;
-        if (nLen)
-        {
-            xub_StrLen nStart = 0;
-            for (sal_Int32 i = 0;  i < nLen;  ++i)
-            {
-                if (pHyphenationPos[i] > _nMaxHyphenationPos)
-                    break;
-                else
-                {
-                    // find corresponding hyphen pos in string
-                    nPos = aTxt.Search( sal_Unicode( SW_SOFT_HYPHEN ), nStart );
-
-                    if (nStart == STRING_NOTFOUND)
-                        break;
-                    else
-                    {
-                        nIdx = nPos;
-                        nStart = nPos + 1;
-                    }
-                }
-            }
-        }
-        DBG_ASSERT(nIdx != STRING_NOTFOUND, "no usable hyphenation position");
-
-        // remove not usable hyphens from string
-        nPos = nIdx == STRING_NOTFOUND ? 0 : nIdx + 1;
-        String aTmp( sal_Unicode( SW_SOFT_HYPHEN ) ),
-               aEmpty;
-        while (nPos != STRING_NOTFOUND)
-            nPos = aTxt.SearchAndReplace( aTmp, aEmpty, nPos + 1 );
-    }
-    return aTxt;
-}
-
-// -----------------------------------------------------------------------
-
-void SvxHyphenWordDialog::InitControls_Impl()
-{
-    String aTxt;
-    xPossHyph = NULL;
-    if (xHyphenator.is())
-    {
-        lang::Locale aLocale( SvxCreateLocale(nActLanguage) );
-        xPossHyph = xHyphenator->createPossibleHyphens( aActWord, aLocale,
-                                                        Sequence< PropertyValue >() );
-        if (xPossHyph.is())
-        {
-            aTxt = EraseUnusableHyphens_Impl( xPossHyph, nMaxHyphenationPos );
-        }
-        SetLabel_Impl( nActLanguage );
-    }
-    aWordEdit.SetText( aTxt );
-
-    nOldPos = aTxt.Len();
-    SelLeft();
-    EnableLRBtn_Impl();
-}
-
-// -----------------------------------------------------------------------
-
-void SvxHyphenWordDialog::ContinueHyph_Impl( sal_uInt16 nInsPos )
-{
-    if ( nInsPos != CONTINUE_HYPH  &&  xPossHyph.is())
-    {
-        if (nInsPos)
-        {
-            //String aTmp( U2S( xPossHyph->getPossibleHyphens() ) );
-            String aTmp( aWordEdit.GetText() );
-            DBG_ASSERT(nInsPos <= aTmp.Len() - 2, "wrong hyphen position");
-
-            sal_uInt16 nIdxPos = 0;
-            sal_uInt16 i = 0;
-            sal_Unicode  c;
-            while (i < aTmp.Len()  &&  HYPHHERE != (c = aTmp.GetChar(i++)) )
-            {
-                if (SW_SOFT_HYPHEN == c)
-                    nIdxPos++;
-            }
-
-            Sequence< sal_Int16 > aSeq = xPossHyph->getHyphenationPositions();
-            sal_Int32 nLen = aSeq.getLength();
-            DBG_ASSERT(nLen, "empty sequence");
-            DBG_ASSERT(nIdxPos < nLen, "index out of range");
-            if (nLen && nIdxPos < nLen)
-            {
-                nInsPos = aSeq.getConstArray()[ nIdxPos ];
-                pHyphWrapper->InsertHyphen( nInsPos );
-            }
-        }
-        else
-        {
-            //! calling with 0 as argument will remove hyphens!
-            pHyphWrapper->InsertHyphen( nInsPos );
-        }
-    }
-
-    if ( pHyphWrapper->FindSpellError() )
-    {
-        Reference< XHyphenatedWord >  xHyphWord( pHyphWrapper->GetLast(), UNO_QUERY );
-
-        // adapt actual word and language to new found hyphenation result
-        if(xHyphWord.is())
-        {
-            aActWord	 = String( xHyphWord->getWord() );
-            nActLanguage = SvxLocaleToLanguage( xHyphWord->getLocale() );
-            nMaxHyphenationPos = xHyphWord->getHyphenationPos();
-            InitControls_Impl();
-        }
-    }
-    else
-        EndDialog( RET_OK );
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 SvxHyphenWordDialog::GetHyphIndex_Impl()
-{
-    sal_uInt16 nPos = 0;
-    String aTxt(aWordEdit.GetText());
-
-    for ( sal_uInt16 i=0 ; i < aTxt.Len(); ++i )
-    {
-        sal_Unicode nChar = aTxt.GetChar( i );
-
-        if ( nChar == HYPHHERE )
-            break;
-
-        if ( nChar != SW_SOFT_HYPHEN )
-            nPos++;
-    }
-    return nPos;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, CutHdl_Impl, Button *, EMPTYARG )
-{
-    if( !bBusy )
-    {
-        bBusy = sal_True;
-        ContinueHyph_Impl( nHyphPos );
-        bBusy = sal_False;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, CutHdl_Impl, Button *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, DeleteHdl_Impl, Button *, EMPTYARG )
-{
-    if( !bBusy )
-    {
-        bBusy = sal_True;
-        ContinueHyph_Impl();
-        bBusy = sal_False;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, DeleteHdl_Impl, Button *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, ContinueHdl_Impl, Button *, EMPTYARG )
-{
-    if( !bBusy )
-    {
-        bBusy = sal_True;
-        ContinueHyph_Impl( CONTINUE_HYPH );
-        bBusy = sal_False;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, ContinueHdl_Impl, Button *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, CancelHdl_Impl, Button *, EMPTYARG )
-{
-    if( !bBusy )
-    {
-        bBusy = sal_True;
-        pHyphWrapper->SpellEnd();
-        EndDialog( RET_CANCEL );
-        bBusy = sal_False;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, CancelHdl_Impl, Button *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, Left_Impl, Button *, EMPTYARG )
-{
-    if( !bBusy )
-    {
-        bBusy = sal_True;
-        SelLeft();
-        bBusy = sal_False;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, Left_Impl, Button *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, Right_Impl, Button *, EMPTYARG )
-{
-    if( !bBusy )
-    {
-        bBusy = sal_True;
-        SelRight();
-        bBusy = sal_False;
-    }
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, Right_Impl, Button *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxHyphenWordDialog, GetFocusHdl_Impl, Edit *, EMPTYARG )
-{
-    aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) );
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxHyphenWordDialog, GetFocusHdl_Impl, Edit *, EMPTYARG )
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxHyphenWordDialog, LangError_Impl, void *, nLang )
-{
-    // Status anzeigen
-    String aErr( ::GetLanguageString( (LanguageType)(sal_IntPtr)nLang ) );
-    aErr += SVX_RESSTR( RID_SVXSTR_HMERR_CHECKINSTALL );
-    InfoBox( this, aErr ).Execute();
-    return 0;
-}
-
-
diff --git a/svx/source/dialog/hyphen.hxx b/svx/source/dialog/hyphen.hxx
deleted file mode 100644
index e872bfae28..0000000000
--- a/svx/source/dialog/hyphen.hxx
+++ /dev/null
@@ -1,126 +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: hyphen.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 _SVX_HYPHEN_HXX
-#define _SVX_HYPHEN_HXX
-
-// include ---------------------------------------------------------------
-
-#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/fixed.hxx>
-#include <sfx2/basedlgs.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-// forward ---------------------------------------------------------------
-
-namespace com{namespace sun{namespace star{
-namespace linguistic2{
-    class XHyphenator;
-    class XPossibleHyphens;
-}}}}
-
-class SvxSpellWrapper;
-
-// class SvxHyphenEdit ---------------------------------------------------
-
-class SvxHyphenEdit : public Edit
-{
-public:
-    SvxHyphenEdit( Window* pParent, const ResId& rResId );
-
-protected:
-    virtual void 	KeyInput( const KeyEvent &rKEvt );
-};
-
-// class SvxHyphenWordDialog ---------------------------------------------
-
-class SvxHyphenWordDialog : public SfxModalDialog
-{
-public:
-    SvxHyphenWordDialog( const String &rWord, LanguageType nLang,
-                         Window* pParent,
-                         ::com::sun::star::uno::Reference<
-                             ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
-                         SvxSpellWrapper* pWrapper );
-
-    void			SelLeft();
-    void			SelRight();
-
-private:
-    FixedText           aWordFT;
-    SvxHyphenEdit		aWordEdit;
-    ImageButton			aLeftBtn;
-    ImageButton			aRightBtn;
-    OKButton			aOkBtn;
-    CancelButton		aCancelBtn;
-    PushButton			aContBtn;
-    PushButton			aDelBtn;
-    HelpButton			aHelpBtn;
-    String				aLabel;
-    SvxSpellWrapper* 	pHyphWrapper;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XHyphenator > 		xHyphenator;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XPossibleHyphens > 	xPossHyph;
-    String				aActWord;		// actual (to be displayed) word
-    LanguageType		nActLanguage;	// and language
-    sal_uInt16				nMaxHyphenationPos;	// right most valid hyphenation pos
-    sal_uInt16 				nHyphPos;
-    sal_uInt16 				nOldPos;
-    sal_Bool				bBusy;
-
-#ifdef _SVX_HYPHEN_CXX
-    void			EnableLRBtn_Impl();
-    //void			EnableCutBtn_Impl();
-    void			SetLabel_Impl( LanguageType nLang );
-    String 			EraseUnusableHyphens_Impl(
-                        ::com::sun::star::uno::Reference<
-                            ::com::sun::star::linguistic2::XPossibleHyphens >  &rxPossHyph,
-                        sal_uInt16 nMaxHyphenationPos );
-
-    void			InitControls_Impl();
-    void			ContinueHyph_Impl( sal_uInt16 nInsPos = 0 );
-    sal_uInt16 			GetHyphIndex_Impl();
-
-    DECL_LINK( CutHdl_Impl, Button* );
-    DECL_LINK( DeleteHdl_Impl, Button* );
-    DECL_LINK( ContinueHdl_Impl, Button* );
-    DECL_LINK( CancelHdl_Impl, Button* );
-    DECL_LINK( Left_Impl, Button* );
-    DECL_LINK( Right_Impl, Button* );
-    DECL_LINK( GetFocusHdl_Impl, Edit* );
-    DECL_LINK( LangError_Impl, void* );
-#endif
-};
-
-
-#endif
-
diff --git a/svx/source/dialog/hyphen.src b/svx/source/dialog/hyphen.src
deleted file mode 100644
index de3caed135..0000000000
--- a/svx/source/dialog/hyphen.src
+++ /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: hyphen.src,v $
- * $Revision: 1.24 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 "helpid.hrc"
-#include <svx/dialogs.hrc>
-#include "hyphen.hrc"
- // pragma ----------------------------------------------------------------
-
- // RID_SVXDLG_HYPHENATE --------------------------------------------------
-ModalDialog RID_SVXDLG_HYPHENATE
-{
-    HelpId = HID_HYPHENATE ;
-    Size = MAP_APPFONT ( 188 , 100 ) ;
-    OutputSize = TRUE ;
-    SvLook = TRUE ;
-    Text [ en-US ] = "Hyphenation" ;
-    Moveable = TRUE ;
-    Edit ED_WORD
-    {
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 17 ) ;
-        Size = MAP_APPFONT ( 120 , 12 ) ;
-        TABSTOP = TRUE ;
-        LEFT = TRUE ;
-    };
-    ImageButton BTN_LEFT
-    {
-        Pos = MAP_APPFONT ( 6 , 33 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        TABSTOP = TRUE ;
-        SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
-    };
-    ImageButton BTN_RIGHT
-    {
-        Pos = MAP_APPFONT ( 22 , 33 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        TABSTOP = TRUE ;
-        Symbol = IMAGEBUTTON_ARROW_RIGHT ;
-    };
-    FixedText FT_WORD
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "~Word" ;
-    };
-    PushButton BTN_HYPH_CONTINUE
-    {
-        Pos = MAP_APPFONT ( 132 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Next" ;
-        TABSTOP = TRUE ;
-    };
-    PushButton BTN_HYPH_DELETE
-    {
-        Pos = MAP_APPFONT ( 132 , 60 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Remove" ;
-        TABSTOP = TRUE ;
-    };
-    OKButton BTN_HYPH_CUT
-    {
-        Pos = MAP_APPFONT ( 132 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Hyphenate" ;
-        TABSTOP = TRUE ;
-        DEFBUTTON = TRUE ;
-    };
-    CancelButton BTN_HYPH_CANCEL
-    {
-        Pos = MAP_APPFONT ( 132 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TABSTOP = TRUE ;
-    };
-    HelpButton BTN_HYPH_HELP
-    {
-        Pos = MAP_APPFONT ( 132 , 80 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TABSTOP = TRUE ;
-    };
-};
- // ******************************************************************* EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index e526bd86a7..465e18337d 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyprdlg.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <vcl/menu.hxx>
 #include <svtools/stdctrl.hxx>
 #include <sfx2/ctrlitem.hxx>
-#include "srchcfg.hxx"
+#include <svl/srchcfg.hxx>
 #include <sfx2/tbxctrl.hxx>
 
 class SvxHyperlinkDlg;
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index fc4927722a..985e2e4b9b 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyprlink.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/svx/source/dialog/hyprlink.hrc b/svx/source/dialog/hyprlink.hrc
index dd3a1be9c4..87f7c9f893 100644
--- a/svx/source/dialog/hyprlink.hrc
+++ b/svx/source/dialog/hyprlink.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: hyprlink.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/svx/source/dialog/hyprlink.hxx b/svx/source/dialog/hyprlink.hxx
index 21ece8bc21..0a1f5ad95a 100644
--- a/svx/source/dialog/hyprlink.hxx
+++ b/svx/source/dialog/hyprlink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hyprlink.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
index 2eaafcaadc..75d6775340 100644
--- a/svx/source/dialog/hyprlink.src
+++ b/svx/source/dialog/hyprlink.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: hyprlink.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/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index db5f21f383..a05a0d00b7 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imapdlg.cxx,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -835,7 +832,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
 IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
 {
     String aStr;
-    const FieldUnit eFieldUnit = GetModuleFieldUnit();
+    const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
     const Point& rMousePos = pWnd->GetMousePos();
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
@@ -858,7 +855,7 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
 IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
 {
     String aStr;
-    const FieldUnit eFieldUnit = GetModuleFieldUnit();
+    const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
     const Size&	rSize = pWnd->GetGraphicSize();
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 80eee9e319..5247836d25 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.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: imapdlg.hrc,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index cc40d30b51..6c4facd2f0 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.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: imapdlg.src,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index a6190c96c1..0296bc426a 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imapimp.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index f57679299c..cdd1f90e26 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imapwnd.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/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 507b03d30d..0ab118b3c7 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imapwnd.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/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
deleted file mode 100644
index be32ba5778..0000000000
--- a/svx/source/dialog/impgrf.cxx
+++ /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: impgrf.cxx,v $
- * $Revision: 1.27 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-// include ------------------------------------------------------------------
-
-#include <limits.h>				// USHRT_MAX
-#include <tools/urlobj.hxx>
-#include <tools/bigint.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/waitobj.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/viewoptions.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <ucbhelper/content.hxx>
-#include <osl/file.hxx>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-
-using namespace ::ucbhelper;
-using namespace com::sun::star::uno;
-
-#include <svx/dialogs.hrc>
-#include "impgrf.hrc"
-
-#define _SVX_IMPGRF_CXX
-#include "svx/impgrf.hxx"
-
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
-#include "helpid.hrc"
-
-// defines ---------------------------------------------------------------
-
-#define IMPGRF_INIKEY_ASLINK		"ImportGraphicAsLink"
-#define IMPGRF_INIKEY_PREVIEW		"ImportGraphicPreview"
-#define IMPGRF_CONFIGNAME			String(DEFINE_CONST_UNICODE("ImportGraphicDialog"))
-
-GraphicFilter* GetGrfFilter()
-{
-    return GraphicFilter::GetGraphicFilter();
-}
-
-// -----------------------------------------------------------------------
-
-int LoadGraphic( const String &rPath, const String &rFilterName,
-                 Graphic& rGraphic, GraphicFilter* pFilter,
-                 USHORT* pDeterminedFormat )
-{
-    if ( !pFilter )
-        pFilter = ::GetGrfFilter();
-
-    const USHORT nFilter = rFilterName.Len() && pFilter->GetImportFormatCount()
-                    ? pFilter->GetImportFormatNumber( rFilterName )
-                    : GRFILTER_FORMAT_DONTKNOW;
-
-    SfxMedium* pMed = 0;
-
-    // dann teste mal auf File-Protokoll:
-    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() )
-    {
-        // z.Z. nur auf die aktuelle DocShell
-        pMed = new SfxMedium( rPath, STREAM_READ, TRUE );
-        pMed->DownLoad();
-        pStream = pMed->GetInStream();
-    }
-    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 )
-    {
-        if( pMed )
-        {
-            DBG_WARNING3( "GrafikFehler [%d] - [%s] URL[%s]",
-                            nRes,
-                            pMed->GetPhysicalName().GetBuffer(),
-                            rPath.GetBuffer() );
-        }
-        else
-        {
-            DBG_WARNING2( "GrafikFehler [%d] - [%s]", nRes, rPath.GetBuffer() );
-        }
-    }
-#endif
-
-    if ( pMed )
-        delete pMed;
-    return nRes;
-}
-
diff --git a/svx/source/dialog/impgrf.src b/svx/source/dialog/impgrf.src
deleted file mode 100644
index 430d41dc1b..0000000000
--- a/svx/source/dialog/impgrf.src
+++ /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: impgrf.src,v $
- * $Revision: 1.29 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- // pragma -------------------------------------------------------------------
-
- // include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
-#include "impgrf.hrc"
- // --------------------------------------------------------------------------
-String RID_SVXSTR_ALL_FILES
-{
-    Text [ en-US ] = "<All files>" ;
-};
-Resource RID_SVXRES_IMPORTGRAPHIC
-{
-    String STR_IMPORT_ALL
-    {
-        Text [ en-US ] = "<All formats>" ;
-    };
-    String STR_UNKNOWN_FORMAT
-    {
-        Text [ en-US ] = "Unknown file format!" ;
-    };
-    String STR_PATH_NOT_FOUND1
-    {
-        Text [ en-US ] = "The directory '" ;
-    };
-    String STR_PATH_NOT_FOUND2
-    {
-        Text [ en-US ] = "' does not exist" ;
-    };
-    String STR_FLT_BMP
-    {
-        Text = "BMP - MS Windows,*.BMP,BMPp0" ;
-    };
-    String STR_FLT_SGF
-    {
-        Text = "SGF - StarWriter SGF,*.SGF,????0" ;
-    };
-    String STR_FLT_SGV
-    {
-        Text = "SGV - StarDraw 2.0,*.SGV,????0" ;
-    };
-    String STR_FLT_SVM
-    {
-        Text = "SVM - StarView Metafile,*.SVM,SVM 0" ;
-    };
-    String STR_GRFILTER_OPENERROR
-    {
-        Text [ en-US ] = "Graphics file cannot be opened" ;
-    };
-    String STR_GRFILTER_IOERROR
-    {
-        Text [ en-US ] = "Graphics file cannot be read" ;
-    };
-    String STR_GRFILTER_FORMATERROR
-    {
-        Text [ en-US ] = "Unknown graphics format" ;
-    };
-    String STR_GRFILTER_VERSIONERROR
-    {
-        Text [ en-US ] = "Cannot support version of graphic file" ;
-    };
-    String STR_GRFILTER_FILTERERROR
-    {
-        Text [ en-US ] = "Graphics filter not found" ;
-    };
-    String STR_GRFILTER_TOOBIG
-    {
-        Text [ en-US ] = "Not enough memory to insert graphic" ;
-    };
-    String STR_PROPERTIES
-    {
-        Text [ en-US ] = "~Properties..." ;
-    };
-    String STR_HOME
-    {
-        Text [ en-US ] = "Standard" ;
-    };
-    String STR_LINK
-    {
-        Text [ en-US ] = "~Link" ;
-    };
-    String STR_PREVIEW
-    {
-        Text [ en-US ] = "Pr~eview" ;
-    };
-    String STR_FILTER
-    {
-        Text [ en-US ] = "~Filter..." ;
-    };
-};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 499f96d6a4..0ff0f72451 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: langbox.cxx,v $
- * $Revision: 1.25.132.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,21 +30,19 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _COM_SUN_STAR_LINGUISTIC2_XLINGUSERVICEMANAGER_HDL_
 #include <com/sun/star/linguistic2/XLinguServiceManager.hdl>
-#endif
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <linguistic/misc.hxx>
 #include <rtl/ustring.hxx>
 #include <unotools/localedatawrapper.hxx>
-
+#include <tools/urlobj.hxx>
 #include <svtools/langtab.hxx>
 #include <tools/shl.hxx>
 #include <i18npool/mslangid.hxx>
 #include <i18npool/lang.h>
-#include <svx/scripttypeitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <svx/langbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -57,13 +52,38 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::uno;
 
+// -----------------------------------------------------------------------
+
+String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
+{
+    INetURLObject aURLObj;
+    aURLObj.SetSmartProtocol( INET_PROT_FILE );
+    aURLObj.SetSmartURL( rName, INetURLObject::ENCODE_ALL );
+    String aTmp( aURLObj.GetBase() );
+    aTmp += sal_Unicode( ' ' );
+
+    if ( bNeg )
+    {
+        sal_Char const sTmp[] = " (-) ";
+        aTmp.AppendAscii( sTmp );
+    }
+
+    if ( LANGUAGE_NONE == nLang )
+        aTmp += String( ResId( RID_SVXSTR_LANGUAGE_ALL, DIALOG_MGR() ) );
+    else
+    {
+        aTmp += sal_Unicode( '[' );
+        aTmp += SvtLanguageTable::GetLanguageString( (LanguageType)nLang );
+        aTmp += sal_Unicode( ']' );
+    }
+
+    return aTmp;
+}
 
 //========================================================================
 //	misc local helper functions
 //========================================================================
 
-
-
 static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
 {
     const Locale *pLocale = rSeq.getConstArray();
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index dd2ea2d8d8..8bd1987d2d 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.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: langbox.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/svx/source/dialog/language.src b/svx/source/dialog/language.src
index 95854d440b..9cd239996e 100644
--- a/svx/source/dialog/language.src
+++ b/svx/source/dialog/language.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: language.src,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/lingu.src b/svx/source/dialog/lingu.src
deleted file mode 100644
index b1082c46b1..0000000000
--- a/svx/source/dialog/lingu.src
+++ /dev/null
@@ -1,180 +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: lingu.src,v $
- * $Revision: 1.33 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General 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 <svx/dialogs.hrc>
- // pragma ----------------------------------------------------------------
-
- // QueryBoxen ---------------------------------------------------------------
-QueryBox RID_SVXQB_THESAURUS
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-     // ### ACHTUNG: Neuer Text in Resource? Dieses Wort sollten Sie vermeiden! Thesaurus starten? : Dieses Wort sollten sie vermeiden! Thesaurus starten?
-    Message [ en-US ] = "This word appears in the list of words you want to avoid. Start thesaurus?" ;
-};
-QueryBox RID_SVXQB_CONTINUE
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_YES ;
-    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Anfang des Dokumentes fortsetzen? : šberpr³fung am Anfang des Dokumentes fortsetzen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Anfang des Dokumentes fortsetzen? : šberpr³fung am Anfang des Dokumentes fortsetzen? */
-    Message [ en-US ] = "Continue checking at beginning of document?" ;
-};
-QueryBox RID_SVXQB_BW_CONTINUE
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_YES ;
-    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Ende des Dokumentes fortsetzen? : šberpr³fung am Ende des Dokumentes fortsetzen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Ende des Dokumentes fortsetzen? : šberpr³fung am Ende des Dokumentes fortsetzen? */
-    Message [ en-US ] = "Continue checking at end of document?" ;
-};
-QueryBox RID_SVXQB_BODYTEXT
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-     // ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Haupttext prüfen? : Wollen Sie den Haupttext prüfen?
-    /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Haupttext prüfen? : M÷chten Sie den Haupttext pr³fen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Haupttext prüfen? : M÷chten Sie den Haupttext pr³fen? */
-    Message [ en-US ] = "Do you want to check the main text?" ;
-};
-QueryBox RID_SVXQB_SPECIAL
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereiche prüfen? : Sonderbereiche pr³fen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereiche prüfen? : Sonderbereiche pr³fen? */
-    Message [ en-US ] = "Do you want check the special regions?" ;
-};
-QueryBox RID_SVXQB_SPECIAL_FORCED
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereichprüfung ist ausgeschaltet, Trotzdem prüfen? : Sonderbereichpr³fung ist ausgeschaltet, Trotzdem pr³fen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereichprüfung ist ausgeschaltet, Trotzdem prüfen? : Sonderbereichpr³fung ist ausgeschaltet, Trotzdem pr³fen? */
-    Message [ en-US ] = "Check special regions is deactivated. Check anyway?" ;
-};
- // Strings ---------------------------------------------------------------
-String RID_SVXSTR_HMSTATUS_OK
-{
-    Text [ en-US ] = "The word is spelled correctly" ;
-};
-String RID_SVXSTR_HMSTATUS_DONTUSE
-{
-    Text [ en-US ] = "Avoid using this word" ;
-};
-String RID_SVXSTR_HMSTATUS_WRONG
-{
-    Text [ en-US ] = "Unknown word." ;
-};
-String RID_SVXSTR_HMSTATUS_CAPERROR
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Groß- / Kleinschreibungs - Fehler : Gro˜- / Kleinschreibungs - Fehler */
-    /* ### ACHTUNG: Neuer Text in Resource? Groß- / Kleinschreibungs - Fehler : Gro˜- / Kleinschreibungs - Fehler */
-    Text [ en-US ] = "Capitalization error" ;
-};
-String RID_SVXSTR_HMSTATUS_INVALID_LANG
-{
-    Text [ en-US ] = "Language not supported";
-};
-String RID_SVXSTR_HMERR_CHECKINSTALL
-{
-    /* ### ACHTUNG: Neuer Text in Resource?  ist für die Prüfung nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache :  ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
-    /* ### ACHTUNG: Neuer Text in Resource?  ist für die Prüfung nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache :  ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
-    Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ;
-};
-String RID_SVXSTR_HMERR_ADDWORD
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Das Wort konnte nicht ins Wörterbuch aufgenommen werden. : Das Wort konnte nicht ins W÷rterbuch aufgenommen werden. */
-    /* ### ACHTUNG: Neuer Text in Resource? Das Wort konnte nicht ins Wörterbuch aufgenommen werden. : Das Wort konnte nicht ins W÷rterbuch aufgenommen werden. */
-    Text [ en-US ] = "The word could not be added to dictionary" ;
-};
-String RID_SVXSTR_HMERR_HYPH
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Die Trennhilfe ist nicht verfügbar : Die Trennhilfe ist nicht verf³gbar */
-    /* ### ACHTUNG: Neuer Text in Resource? Die Trennhilfe ist nicht verfügbar : Die Trennhilfe ist nicht verf³gbar */
-    Text [ en-US ] = "Hyphenation not available" ;
-};
-String RID_SVXSTR_HMERR_THESAURUS
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus für die eingestellte Sprache ist nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : Ein Thesaurus f³r die eingestellte Sprache ist nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
-    /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus für die eingestellte Sprache ist nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : Ein Thesaurus f³r die eingestellte Sprache ist nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
-    Text [ en-US ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ;
-};
-String RID_SVXSTR_DIC_ERR_UNKNOWN
-{
-    Text [ en-US ] = "Word cannot be added to dictionary\ndue to unknown reason.";
-};
-String RID_SVXSTR_DIC_ERR_FULL
-{
-    Text [ en-US ] = "The dictionary is already full.";
-};
-String RID_SVXSTR_DIC_ERR_READONLY
-{
-    Text [ en-US ] = "The dictionary is read-only.";
-};
-
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 7bcdcf4a4c..01951caa14 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/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.65 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,13 +52,10 @@ SRC1FILES =  \
         fontwork.src \
         frmsel.src \
         hdft.src \
-        hyphen.src \
         hyprlink.src \
         imapdlg.src \
-        impgrf.src \
         langbox.src \
         language.src \
-        lingu.src \
         passwd.src \
         prtqry.src \
         rubydialog.src\
@@ -70,9 +63,9 @@ SRC1FILES =  \
         srchdlg.src \
         svxbmpnumvalueset.src \
         swframeposstrings.src \
-        thesdlg.src \
         txenctab.src \
-        ucsubset.src
+        ucsubset.src \
+        optgrid.src     
 
 SRS2NAME=drawdlgs
 SRC2FILES =  \
@@ -84,16 +77,10 @@ LIB1OBJFILES= \
         $(SLO)$/dialmgr.obj\
         $(SLO)$/dlgutil.obj \
         $(SLO)$/framelink.obj\
-        $(SLO)$/hangulhanja.obj \
-        $(SLO)$/hyphen.obj \
-        $(SLO)$/impgrf.obj \
         $(SLO)$/langbox.obj \
-        $(SLO)$/opengrf.obj \
         $(SLO)$/simptabl.obj \
-        $(SLO)$/splwrap.obj \
         $(SLO)$/svxdlg.obj \
         $(SLO)$/stddlg.obj \
-        $(SLO)$/thesdlg.obj
 
 LIB2TARGET=$(SLB)$/$(TARGET).lib
 
@@ -137,7 +124,6 @@ LIB2OBJFILES= \
         $(SLO)$/srchdlg.obj \
         $(SLO)$/strarray.obj \
         $(SLO)$/svxbmpnumvalueset.obj\
-        $(SLO)$/svxbox.obj \
         $(SLO)$/svxgrahicitem.obj \
         $(SLO)$/svxruler.obj \
         $(SLO)$/swframeexample.obj \
@@ -146,7 +132,9 @@ LIB2OBJFILES= \
         $(SLO)$/txenctab.obj \
         $(SLO)$/wrapfield.obj \
         $(SLO)$/_bmpmask.obj \
-        $(SLO)$/_contdlg.obj
+        $(SLO)$/_contdlg.obj \
+        $(SLO)$/optgrid.obj
+        
 
 .IF "$(GUI)"=="UNX"
 LIB2OBJFILES +=    $(SLO)$/sendreportunx.obj
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 3311375461..3aea007ca3 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: measctrl.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/svx/source/options/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 69fd27a3b5..916c774dab 100644
--- a/svx/source/options/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: optgrid.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,6 +32,7 @@
 #include <tools/shl.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
+#include <svl/intitem.hxx>
 
 #define _SVX_OPTGRID_CXX
 
@@ -225,7 +223,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
 
     aDivisionPointY.SetText(aDivisionPointX.GetText());
     // Metrik einstellen
-    FieldUnit eFUnit = GetModuleFieldUnit( &rCoreSet );
+    FieldUnit eFUnit = GetModuleFieldUnit( rCoreSet );
     long nFirst, nLast, nMin, nMax;
 
     lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
diff --git a/svx/source/options/optgrid.hrc b/svx/source/dialog/optgrid.hrc
index 766851f251..f010dbb6a6 100644
--- a/svx/source/options/optgrid.hrc
+++ b/svx/source/dialog/optgrid.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: optgrid.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/svx/source/options/optgrid.src b/svx/source/dialog/optgrid.src
index 84644d92bc..e427ddfd08 100644
--- a/svx/source/options/optgrid.src
+++ b/svx/source/dialog/optgrid.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: optgrid.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/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index d619233246..0fb63234db 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: orienthelper.cxx,v $
- * $Revision: 1.6.274.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index a7cb2f0c69..94dcc23712 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pagectrl.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,10 +32,10 @@
 
 
 #include <vcl/bitmap.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/pagectrl.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 
 #include <algorithm>
 
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index fbe5c771b3..2b2baa07e3 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: paraprev.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 7c10144048..3b365d4d5b 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passwd.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/passwd.hrc b/svx/source/dialog/passwd.hrc
index ad7e5f4553..f840be4c9a 100644
--- a/svx/source/dialog/passwd.hrc
+++ b/svx/source/dialog/passwd.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: passwd.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/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
index 8aabb38066..587150bc85 100644
--- a/svx/source/dialog/passwd.src
+++ b/svx/source/dialog/passwd.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: passwd.src,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/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index 36972dffb1..ddad68af0b 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pfiledlg.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/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index cf69a8124d..7647129327 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prtqry.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/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src
index 167134c4f5..3f8c04cea9 100644
--- a/svx/source/dialog/prtqry.src
+++ b/svx/source/dialog/prtqry.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: prtqry.src,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 08861c093e..002f55a484 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: relfld.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/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index d81ec83ceb..706ca231e9 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rlrcitem.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,10 +39,10 @@
 #include <svx/dialogs.hrc>
 
 #include <svx/ruler.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/tstpitem.hxx>
-#include "protitem.hxx"
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include "editeng/protitem.hxx"
 #include "rlrcitem.hxx"
 #include "rulritem.hxx"
 #include <svl/eitem.hxx>
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index e002ddce63..64eafd2af3 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rlrcitem.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 366cc914b4..e152afc2b9 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rubydialog.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc
index 74c3e91ed3..76839aeb85 100644
--- a/svx/source/dialog/rubydialog.hrc
+++ b/svx/source/dialog/rubydialog.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: rubydialog.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/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src
index 93f9e147fe..b1537c1fa7 100644
--- a/svx/source/dialog/rubydialog.src
+++ b/svx/source/dialog/rubydialog.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rubydialog.src,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc
index 4b253ff545..8031270272 100644
--- a/svx/source/dialog/ruler.hrc
+++ b/svx/source/dialog/ruler.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: ruler.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src
index c88e10c145..5937ab99fb 100644
--- a/svx/source/dialog/ruler.src
+++ b/svx/source/dialog/ruler.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: ruler.src,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 386e25b739..52c8ff2f55 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rulritem.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 853d9f3137..d862c1aa63 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.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: sdstring.src,v $
- * $Revision: 1.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -367,32 +364,6 @@ String RID_SVXSTR_LINEJOINT_ROUND
     Text [ en-US ] = "Line joint round";
 };
 
-String RID_SVXSTR_GRFILTER_OPENERROR
-{
-    Text [ en-US ] = "Graphics file cannot be opened" ;
-};
-String RID_SVXSTR_GRFILTER_IOERROR
-{
-    Text [ en-US ] = "Graphics file cannot be read" ;
-};
-String RID_SVXSTR_GRFILTER_FORMATERROR
-{
-    Text [ en-US ] = "Unknown graphics format" ;
-};
-String RID_SVXSTR_GRFILTER_VERSIONERROR
-{
-    Text [ en-US ] = "This version of the graphics file is not supported" ;
-};
-String RID_SVXSTR_GRFILTER_FILTERERROR
-{
-    Text [ en-US ] = "Graphics filter not found" ;
-};
-String RID_SVXSTR_GRFILTER_TOOBIG
-{
-    Text [ en-US ] = "Not enough memory to insert graphic" ;
-};
-
-
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Reference-strings for standardcolor-table
diff --git a/svx/source/dialog/sendreportgen.cxx b/svx/source/dialog/sendreportgen.cxx
index 3fd23ca9b3..2690d4b392 100644
--- a/svx/source/dialog/sendreportgen.cxx
+++ b/svx/source/dialog/sendreportgen.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sendreportgen.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/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx
index 2a1c0b860a..ccd23ae772 100644
--- a/svx/source/dialog/sendreportunx.cxx
+++ b/svx/source/dialog/sendreportunx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sendreportunx.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index e51ade42cd..61c4daa0f7 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sendreportw32.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 4a3ad5e661..c3f9b5105f 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simptabl.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -291,7 +288,7 @@ void SvxSimpleTable::ShowTable()
 
 void SvxSimpleTable::HideTable()
 {
-    aPrivContainer.Show();
+    aPrivContainer.Hide();
 }
 
 BOOL SvxSimpleTable::IsVisible() const
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 3f117045b2..19391edf2b 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchctrl.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 
 #include "srchctrl.hxx"
 #include "srchdlg.hxx"
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 
 // class SvxSearchFamilyControllerItem -----------------------------------
 
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index a6f1c40a59..e3ffd2c556 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchctrl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 7526313900..b39f59010e 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.cxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,6 +50,7 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svl/itempool.hxx>
+#include <svl/intitem.hxx>
 
 #include <sfx2/app.hxx>
 #include <toolkit/unohlp.hxx>
@@ -67,13 +65,13 @@
 
 #define	ITEMID_SETITEM		0
 
-#include <sfx2/srchitem.hxx>
+#include <svl/srchitem.hxx>
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
 #include "dlgutil.hxx"
-#include <svx/brshitem.hxx>
-
+#include <editeng/brshitem.hxx>
+#include <tools/resary.hxx>
 #include <svx/svxdlg.hxx> //CHINA001
 
 #include <sfx2/layout-pre.hxx>
@@ -81,6 +79,7 @@
 using namespace com::sun::star::i18n;
 using namespace com::sun::star;
 using namespace comphelper;
+
 // -----------------------------------------------------------------------
 
 #define REMEMBER_SIZE		10
@@ -2320,8 +2319,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
 
     // Metrik abfragen
     SfxMapUnit eMapUnit = SFX_MAPUNIT_CM;
-    FieldUnit eFieldUnit = GetModuleFieldUnit();
-
+    FieldUnit eFieldUnit = pSh->GetModule()->GetFieldUnit();
     switch ( eFieldUnit )
     {
         case FUNIT_MM:			eMapUnit = SFX_MAPUNIT_MM; break;
@@ -2337,6 +2335,8 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
         case FUNIT_100TH_MM:	eMapUnit = SFX_MAPUNIT_100TH_MM; break;
         default: ;//prevent warning
     }
+    
+    ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
 
     for ( USHORT i = 0; i < pList->Count(); ++i )
     {
@@ -2353,13 +2353,16 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
                                     eMapUnit, aStr );
             rStr += aStr;
         }
-        else
+        else if ( rItem.nSlot == SID_ATTR_BRUSH_CHAR )
         {
             //Sonderbehandlung fuer Zeichenhintergrund
-            USHORT nId = rItem.nSlot == SID_ATTR_BRUSH_CHAR ?
-                                RID_SVXITEMS_BRUSH_CHAR :
-                                    rItem.nSlot - SID_SVX_START + RID_ATTR_BEGIN;
-            rStr += SVX_RESSTR( nId );
+            rStr += SVX_RESSTR( RID_SVXITEMS_BRUSH_CHAR );
+        }
+        else
+        {
+            sal_uInt32 nId  = aAttrNames.FindIndex( rItem.nSlot );
+            if ( RESARRAY_INDEX_NOTFOUND != nId )
+                rStr += aAttrNames.GetString( nId );
         }
     }
     return rStr;
diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc
index a903caa868..90ce20f467 100644
--- a/svx/source/dialog/srchdlg.hrc
+++ b/svx/source/dialog/srchdlg.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.hrc,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index 2c69a25b92..feba788b1c 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srchdlg.src,v $
- * $Revision: 1.75 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index dbd61f619f..950c4f3a0a 100644
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stddlg.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/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index ed2df90402..4bd93baef0 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: strarray.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 10a572d43a..d2c83a4d68 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxbmpnumvalueset.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,17 +38,17 @@
 #ifndef _SVX_HELPID_HRC
 #include <helpid.hrc>
 #endif
-#include <svx/numitem.hxx>
+#include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <gallery.hxx>
 #include <svl/urihelper.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/msgbox.hxx>
-#include <flstitem.hxx>
+#include <editeng/flstitem.hxx>
 #include <dlgutil.hxx>
 #ifndef _XTABLE_HXX //autogen
 
@@ -62,7 +59,7 @@
 #include <htmlmode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/ctrltool.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -73,7 +70,7 @@
 #include <com/sun/star/text/XNumberingTypeInfo.hpp>
 
 #include <algorithm>
-#include "opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src
index 3b3bd90d25..ad43a5ee9e 100644
--- a/svx/source/dialog/svxbmpnumvalueset.src
+++ b/svx/source/dialog/svxbmpnumvalueset.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: numpages.src,v $
- * $Revision: 1.64.242.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/svxbox.cxx b/svx/source/dialog/svxbox.cxx
deleted file mode 100644
index cb8c4c388f..0000000000
--- a/svx/source/dialog/svxbox.cxx
+++ /dev/null
@@ -1,623 +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: svxbox.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_svx.hxx"
-#include <tools/debug.hxx>
-#ifndef _APP_HXX //autogen
-#include <vcl/svapp.hxx>
-#endif
-
-#include <svx/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/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx
index 35271fed21..ad238f9591 100644
--- a/svx/source/dialog/svxdlg.cxx
+++ b/svx/source/dialog/svxdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxdlg.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 
 SvxAbstractDialogFactory* SvxAbstractDialogFactory::Create()
 {
-    return (SvxAbstractDialogFactory*) VclAbstractDialogFactory::Create();
+    return dynamic_cast< SvxAbstractDialogFactory* >( VclAbstractDialogFactory::Create() );
 }
 
 SvxAbstractDialogFactory::~SvxAbstractDialogFactory()
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index a7cd91015b..aad28af5a8 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxgrahicitem.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 50c3b5a64d..f5392534e2 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxruler.cxx,v $
- * $Revision: 1.39.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,9 +49,9 @@
 #include <svx/ruler.hxx>
 #include "rlrcitem.hxx"
 #include "rulritem.hxx"
-#include <svx/tstpitem.hxx>
-#include <svx/lrspitem.hxx>
-#include "protitem.hxx"
+#include <editeng/tstpitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include "editeng/protitem.hxx"
 #ifndef _APP_HXX
 #include <vcl/svapp.hxx>
 #endif
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 5bdfa05a3f..65ebab216a 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swframeexample.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/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 1b1b40fc05..2b5d2d899f 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swframeposstrings.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src
index 41f220eff8..5455e736c4 100644
--- a/svx/source/dialog/swframeposstrings.src
+++ b/svx/source/dialog/swframeposstrings.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: swframeposstrings.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/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx
deleted file mode 100644
index 8e5170b6d6..0000000000
--- a/svx/source/dialog/thesdlg.cxx
+++ /dev/null
@@ -1,500 +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: thesdlg.cxx,v $
- * $Revision: 1.21 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <tools/shl.hxx>
-#include <svl/lngmisc.hxx>
-#include <vcl/wrkwin.hxx>
-#ifndef _MSGBOX_HXX //autogen
-#include <vcl/msgbox.hxx>
-#endif
-#ifndef _APP_HXX //autogen
-#include <vcl/svapp.hxx>
-#endif
-#include <com/sun/star/linguistic2/XThesaurus.hpp>
-#include <com/sun/star/linguistic2/XMeaning.hpp>
-
-
-#define _SVX_THESDLG_CXX
-
-#include <svx/thesdlg.hxx>
-#include "dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
-
-#include <svx/dialogs.hrc>
-#include "thesdlg.hrc"
-#include <unolingu.hxx>
-#include <svx/langbox.hxx>
-
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::linguistic2;
-
-#undef S2U
-#undef U2S
-//#define S2U(s) 						StringToOUString(s, CHARSET_SYSTEM)
-//#define U2S(s)						OUStringToString(s, CHARSET_SYSTEM)
-
-
-// GetReplaceEditString -------------------------------
-
-static void GetReplaceEditString( String &rText )
-{
-    // The strings returned by the thesaurus saometimes have some
-    // explanation text put in between '(' and ')' or a trailing '*'.
-    // These parts should not be put in the ReplaceEdit Text that may get
-    // inserted into the document. Thus we strip them from the text.
-
-    xub_StrLen nPos = rText.Search( sal_Unicode('(') );
-    while (STRING_NOTFOUND != nPos)
-    {
-        xub_StrLen nEnd = rText.Search( sal_Unicode(')'), nPos );
-        if (STRING_NOTFOUND != nEnd)
-            rText.Erase( nPos, nEnd-nPos+1 );
-        else
-            break;
-        nPos = rText.Search( sal_Unicode('(') );
-    }
-
-    nPos = rText.Search( sal_Unicode('*') );
-    if (STRING_NOTFOUND != nPos)
-        rText.Erase( nPos );
-
-    // remove any possible remaining ' ' that may confuse the thesaurus
-    // when it gets called with the text
-    rText.EraseLeadingAndTrailingChars( sal_Unicode(' ') );
-}
-
-// struct ThesDlg_Impl ---------------------------------------------------
-
-struct ThesDlg_Impl
-{
-    Reference< XThesaurus >	xThesaurus;
-    ::rtl::OUString				aLookUpText;
-    sal_Int16				nLookUpLanguage;
-
-    ThesDlg_Impl( Reference< XThesaurus > & xThes );
-    SfxErrorContext*	pErrContext;	// ErrorContext,
-                                        // w"ahrend der Dialog oben ist
-};
-
-ThesDlg_Impl::ThesDlg_Impl(Reference< XThesaurus > & xThes) :
-    xThesaurus	(xThes)
-{
-    pErrContext = NULL;
-    nLookUpLanguage = LANGUAGE_NONE;
-}
-
-
-// class SvxThesaurusLanguageDlg_Impl ------------------------------------
-
-class SvxThesaurusLanguageDlg_Impl : public ModalDialog
-{
-private:
-    SvxLanguageBox	aLangLB;
-    FixedLine       aLangFL;
-    OKButton		aOKBtn;
-    CancelButton	aCancelBtn;
-    HelpButton		aHelpBtn;
-
-    DECL_LINK( DoubleClickHdl_Impl, ListBox * );
-
-public:
-    SvxThesaurusLanguageDlg_Impl( Window* pParent );
-
-    sal_uInt16		GetLanguage() const;
-    void			SetLanguage( sal_uInt16 nLang );
-};
-
-// -----------------------------------------------------------------------
-
-
-SvxThesaurusLanguageDlg_Impl::SvxThesaurusLanguageDlg_Impl( Window* pParent ) :
-
-    ModalDialog( pParent, SVX_RES( RID_SVXDLG_THES_LANGUAGE ) ),
-
-    aLangLB		( this, SVX_RES( LB_THES_LANGUAGE ) ),
-    aLangFL     ( this, SVX_RES( FL_THES_LANGUAGE ) ),
-    aOKBtn		( this, SVX_RES( BTN_LANG_OK ) ),
-    aCancelBtn	( this, SVX_RES( BTN_LANG_CANCEL ) ),
-    aHelpBtn	( this, SVX_RES( BTN_LANG_HELP ) )
-{
-    FreeResource();
-
-    aLangLB.SetLanguageList( LANG_LIST_THES_USED, FALSE, FALSE );
-    aLangLB.SetDoubleClickHdl(
-        LINK( this, SvxThesaurusLanguageDlg_Impl, DoubleClickHdl_Impl ) );
-}
-
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 SvxThesaurusLanguageDlg_Impl::GetLanguage() const
-{
-    sal_uInt16 nLang = aLangLB.GetSelectLanguage();
-    return nLang;
-}
-
-// -----------------------------------------------------------------------
-
-void SvxThesaurusLanguageDlg_Impl::SetLanguage( sal_uInt16 nLang )
-{
-    aLangLB.SelectLanguage( nLang );
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SvxThesaurusLanguageDlg_Impl, DoubleClickHdl_Impl, ListBox *, EMPTYARG )
-{
-    EndDialog( RET_OK );
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvxThesaurusLanguageDlg_Impl, DoubleClickHdl_Impl, ListBox *, EMPTYARG )
-
-// class SvxThesaurusDialog ----------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-SvxThesaurusDialog::SvxThesaurusDialog( Window* pParent, Reference< XThesaurus >  xThes,
-                                        const String &rWord, sal_Int16 nLanguage) :
-
-    SvxStandardDialog( pParent, SVX_RES( RID_SVXDLG_THESAURUS ) ),
-
-    aWordText	( this, SVX_RES( FT_WORD ) ),
-    aWordLB		( this, SVX_RES( LB_WORD ) ),
-    aReplaceText( this, SVX_RES( FT_REPL ) ),
-    aReplaceEdit( this, SVX_RES( ED_REPL ) ),
-    aMeanText	( this, SVX_RES( FT_MEAN ) ),
-    aMeanLB		( this, SVX_RES( LB_MEAN ) ),
-    aSynonymText( this, SVX_RES( FT_SYNON ) ),
-    aSynonymLB	( this, SVX_RES( LB_SYNON ) ),
-    aVarFL      ( this, SVX_RES( FL_VAR ) ),
-    aOkBtn		( this,	SVX_RES( BTN_THES_OK ) ),
-    aCancelBtn	( this, SVX_RES( BTN_THES_CANCEL ) ),
-    aLookUpBtn	( this, SVX_RES( BTN_LOOKUP ) ),
-    aLangBtn	( this, SVX_RES( BTN_LANGUAGE ) ),
-    aHelpBtn	( this, SVX_RES( BTN_THES_HELP ) ),
-    aErrStr		(		SVX_RES( STR_ERR_WORDNOTFOUND ) )
-{
-    pImpl = new ThesDlg_Impl( xThes );
-    pImpl->aLookUpText = ::rtl::OUString( rWord );
-    pImpl->nLookUpLanguage = nLanguage;
-    pImpl->pErrContext =
-        new	SfxErrorContext( ERRCTX_SVX_LINGU_THESAURUS, String(), this,
-                             RID_SVXERRCTX, &DIALOG_MGR() );
-
-    aLangBtn.SetClickHdl( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) );
-    aLookUpBtn.SetClickHdl( LINK( this, SvxThesaurusDialog, LookUpHdl_Impl ) );
-    aMeanLB.SetSelectHdl( LINK( this, SvxThesaurusDialog, EntryHdl_Impl ) );
-    aSynonymLB.SetSelectHdl( LINK( this, SvxThesaurusDialog, SynonymHdl_Impl ) );
-    Link aLink = LINK( this, SvxThesaurusDialog, SelectHdl_Impl );
-    aMeanLB.SetDoubleClickHdl( aLink );
-    aSynonymLB.SetDoubleClickHdl( aLink );
-    aWordLB.SetSelectHdl( aLink );
-
-    FreeResource();
-
-    ::rtl::OUString aTmp( rWord );
-    linguistic::RemoveHyphens( aTmp );
-    linguistic::ReplaceControlChars( aTmp );
-    aReplaceEdit.SetText( aTmp );
-    aWordLB.InsertEntry( aTmp );
-    aWordLB.SelectEntry( aTmp );
-
-    Init_Impl( nLanguage );
-
-    // disable controls if service is missing
-    if (!pImpl->xThesaurus.is())
-        Enable( sal_False );
-}
-
-
-// -----------------------------------------------------------------------
-
-SvxThesaurusDialog::~SvxThesaurusDialog()
-{
-    delete pImpl->pErrContext;
-    delete pImpl;
-}
-
-// -----------------------------------------------------------------------
-
-uno::Sequence< Reference< XMeaning > > SAL_CALL
-    SvxThesaurusDialog::queryMeanings_Impl(
-            ::rtl::OUString& rTerm,
-            const Locale& rLocale,
-            const beans::PropertyValues& rProperties )
-        throw(lang::IllegalArgumentException, uno::RuntimeException)
-{
-    uno::Sequence< Reference< XMeaning > > aMeanings(
-            pImpl->xThesaurus->queryMeanings( rTerm, rLocale, rProperties ) );
-
-    // text with '.' at the end?
-    if (0 == aMeanings.getLength() && rTerm.getLength() &&
-        rTerm.getStr()[ rTerm.getLength() - 1 ] == '.')
-    {
-        // try again without trailing '.' chars. It may be a word at the
-        // end of a sentence and not an abbreviation...
-        String aTxt( rTerm );
-        aTxt.EraseTrailingChars( '.' );
-        aMeanings = pImpl->xThesaurus->queryMeanings( aTxt, rLocale, rProperties );
-        if (aMeanings.getLength())
-        {
-            rTerm = aTxt;
-        }
-    }
-
-    return aMeanings;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 SvxThesaurusDialog::GetLanguage() const
-{
-    return pImpl->nLookUpLanguage;
-}
-
-// -----------------------------------------------------------------------
-
-void SvxThesaurusDialog::UpdateMeaningBox_Impl( uno::Sequence< Reference< XMeaning >  > *pMeaningSeq )
-{
-    // create temporary meaning list if not supplied from somewhere else
-    sal_Bool bTmpSeq = sal_False;
-    if (!pMeaningSeq  &&  pImpl->xThesaurus.is())
-    {
-        bTmpSeq = sal_True;
-        lang::Locale aLocale( SvxCreateLocale( pImpl->nLookUpLanguage ) );
-        uno::Sequence< Reference< XMeaning > > aTmpMean = queryMeanings_Impl(
-                pImpl->aLookUpText, aLocale, Sequence< PropertyValue >() );
-
-        pMeaningSeq = new Sequence< Reference< XMeaning >  > ( aTmpMean );
-
-        // set new replace edit text if a different look up text was used
-        // see: queryMeanings_Impl
-        aReplaceEdit.SetText( pImpl->aLookUpText );
-    }
-
-    sal_Int32 nMeaningCount = pMeaningSeq ? pMeaningSeq->getLength() : 0;
-    const Reference< XMeaning >  *pMeaning = pMeaningSeq ? pMeaningSeq->getConstArray() : NULL;
-    aMeanLB.Clear();
-    for ( sal_Int32 i = 0;  i < nMeaningCount;  ++i )
-        aMeanLB.InsertEntry( pMeaning[i]->getMeaning() );
-
-    // remove temporary meaning list
-    if (bTmpSeq)
-        delete pMeaningSeq;
-
-    if (aMeanLB.GetEntryCount() > 0)
-        aMeanLB.SelectEntryPos(0);
-    UpdateSynonymBox_Impl();
-}
-
-
-// -----------------------------------------------------------------------
-void SvxThesaurusDialog::UpdateSynonymBox_Impl()
-{
-
-    aSynonymLB.Clear();
-
-    sal_uInt16 nPos = aMeanLB.GetSelectEntryPos();	// active meaning pos
-    if (nPos != LISTBOX_ENTRY_NOTFOUND  &&  pImpl->xThesaurus.is())
-    {
-        // get Reference< XMeaning >  for selected meaning
-        lang::Locale aLocale( SvxCreateLocale( pImpl->nLookUpLanguage ) );
-        Reference< XMeaning >  xMeaning = queryMeanings_Impl(
-                    pImpl->aLookUpText, aLocale, Sequence< PropertyValue >() )
-                 .getConstArray()[ nPos ];
-
-        uno::Sequence< ::rtl::OUString >	aSynonyms;
-        if (xMeaning.is())
-            aSynonyms = xMeaning->querySynonyms();
-
-        sal_Int32 nSynonymCount = aSynonyms.getLength();
-        const ::rtl::OUString *pSynonym = aSynonyms.getConstArray();
-        for ( sal_Int32 i=0;  i < nSynonymCount;  ++i )
-            aSynonymLB.InsertEntry( pSynonym[i] );
-    }
-
-}
-
-// -----------------------------------------------------------------------
-
-void SvxThesaurusDialog::Apply()
-{
-}
-
-// -----------------------------------------------------------------------
-void SvxThesaurusDialog::Init_Impl(sal_Int16 nLanguage)
-{
-    // Sprache anpassen
-    String aStr( GetText() );
-    aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 );
-    aStr.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ) );
-    //aStr += GetLanguageString( (LanguageType)pImpl->pThesaurus->GetLanguage() );
-    aStr += GetLanguageString( (LanguageType) nLanguage );
-    aStr.Append( sal_Unicode( ')' ) );
-    SetText( aStr );	// Text der Window-Leiste setzen (Wort + Sprache)
-
-    // adapt meanings according to (new) language
-    UpdateMeaningBox_Impl();
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxThesaurusDialog, LookUpHdl_Impl, Button *, pBtn )
-{
-
-    EnterWait();
-
-    String aText( aReplaceEdit.GetText() );
-
-    ::rtl::OUString aOldLookUpText = pImpl->aLookUpText;
-    pImpl->aLookUpText = ::rtl::OUString( aText );
-
-    uno::Sequence< Reference< XMeaning >  >	aMeanings;
-    if (pImpl->xThesaurus.is())
-        aMeanings = queryMeanings_Impl(
-                            pImpl->aLookUpText,
-                            SvxCreateLocale( pImpl->nLookUpLanguage ),
-                            Sequence< PropertyValue >() );
-
-    LeaveWait();
-    if ( aMeanings.getLength() == 0 )
-    {
-        if( pBtn == &aCancelBtn ) // called via double click
-        {
-            pImpl->aLookUpText = aOldLookUpText;
-        }
-        else
-        {
-            UpdateMeaningBox_Impl( &aMeanings );
-            if( pBtn == &aLookUpBtn )
-                InfoBox( this, aErrStr ).Execute();
-        }
-        return 0;
-    }
-
-    UpdateMeaningBox_Impl( &aMeanings );
-
-    if ( aWordLB.GetEntryPos( aText ) == LISTBOX_ENTRY_NOTFOUND )
-        aWordLB.InsertEntry( aText );
-
-    aWordLB.SelectEntry( aText );
-    aMeanLB.SelectEntryPos( 0 );
-
-    String aStr( aMeanLB.GetSelectEntry() );
-    GetReplaceEditString( aStr );
-    aReplaceEdit.SetText( aStr );
-    aSynonymLB.SetNoSelection();
-
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, Button *, EMPTYARG )
-{
-    if (!pImpl->xThesaurus.is())
-        return 0;
-
-    SvxThesaurusLanguageDlg_Impl aDlg( this );
-    sal_uInt16 nLang = pImpl->nLookUpLanguage;
-    aDlg.SetLanguage( nLang );
-
-    if ( aDlg.Execute() == RET_OK )
-    {
-        nLang = aDlg.GetLanguage();
-        if (pImpl->xThesaurus->hasLocale( SvxCreateLocale( nLang ) ))
-            pImpl->nLookUpLanguage = nLang;
-        UpdateMeaningBox_Impl();
-        Init_Impl( nLang );
-    }
-
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxThesaurusDialog, SynonymHdl_Impl, ListBox *, EMPTYARG )
-{
-    if ( aSynonymLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
-    {
-        String aStr( aSynonymLB.GetSelectEntry() );
-        GetReplaceEditString( aStr );
-        aReplaceEdit.SetText( aStr );
-    }
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxThesaurusDialog, SelectHdl_Impl, ListBox *, pBox )
-{
-    String aStr( pBox->GetSelectEntry() );
-    GetReplaceEditString( aStr );
-    aReplaceEdit.SetText( aStr );
-
-    //! 'aCancelBtn' is used to indicate that the handler is called as result
-    //! of a double click action.
-    LookUpHdl_Impl( &aCancelBtn /* ??? &aLookUpBtn */ );
-
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxThesaurusDialog, EntryHdl_Impl, ListBox *, EMPTYARG )
-{
-
-    UpdateSynonymBox_Impl();
-
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxThesaurusDialog, SpellErrorHdl_Impl, void *, pError )
-{
-    // Der "ubergebene Pointer pError ist die falsche Sprachen-Nummer
-    LanguageType eLang = (LanguageType)(sal_uIntPtr)pError;
-    String aErr( ::GetLanguageString( eLang ) );
-    // Fehlermeldung ausgeben
-    ErrorHandler::HandleError(
-        *new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
-    return 0;
-}
-
diff --git a/svx/source/dialog/thesdlg.hrc b/svx/source/dialog/thesdlg.hrc
deleted file mode 100644
index 4ae7e53832..0000000000
--- a/svx/source/dialog/thesdlg.hrc
+++ /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: thesdlg.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.
- *
- ************************************************************************/
-#ifndef _SVX_THESDLG_HRC
-#define _SVX_THESDLG_HRC
-
-// defines ---------------------------------------------------------------
-
-#define BTN_THES_OK	   			10
-#define BTN_THES_CANCEL			11
-#define BTN_LANGUAGE			12
-#define BTN_THES_HELP			13
-#define BTN_LOOKUP				14
-#define FT_WORD					15
-#define LB_WORD					16
-#define FT_MEAN					17
-#define LB_MEAN					18
-#define FT_SYNON				19
-#define LB_SYNON				20
-#define FT_REPL					21
-#define ED_REPL					22
-#define FL_VAR                                  23
-
-#define STR_ERR_WORDNOTFOUND	30
-
-// LanguageDialog --------------------------------------------------------
-
-#define LB_THES_LANGUAGE		10
-#define FL_THES_LANGUAGE                11
-#define BTN_LANG_OK				12
-#define BTN_LANG_CANCEL			12
-#define BTN_LANG_HELP			13
-
-
-#endif
-
diff --git a/svx/source/dialog/thesdlg.src b/svx/source/dialog/thesdlg.src
deleted file mode 100644
index c75d95ca5d..0000000000
--- a/svx/source/dialog/thesdlg.src
+++ /dev/null
@@ -1,210 +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: thesdlg.src,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.
- *
- ************************************************************************/
- // include ---------------------------------------------------------------
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-#include "thesdlg.hrc"
-#include "helpid.hrc"
- // pragma ----------------------------------------------------------------
-
- // RID_SVXDLG_THES -------------------------------------------------------
-ModalDialog RID_SVXDLG_THESAURUS
-{
-    HelpId = SID_THESAURUS ;
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 285 , 116 ) ;
-    Text [ en-US ] = "Thesaurus" ;
-    Moveable = TRUE ;
-    SvLook = TRUE ;
-    OkButton BTN_THES_OK
-    {
-        Pos = MAP_APPFONT ( 219 , 6 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_THES_CANCEL
-    {
-        Pos = MAP_APPFONT ( 219 , 23 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-    };
-    PushButton BTN_LOOKUP
-    {
-        Pos = MAP_APPFONT ( 219 , 40 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Search" ;
-    };
-    PushButton BTN_LANGUAGE
-    {
-        Pos = MAP_APPFONT ( 219 , 57 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Language..." ;
-    };
-    HelpButton BTN_THES_HELP
-    {
-        Pos = MAP_APPFONT ( 219 , 77 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-    };
-    FixedText FT_WORD
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 96 , 8 ) ;
-        Text [ en-US ] = "~Word" ;
-        LEFT = TRUE ;
-    };
-    ListBox LB_WORD
-    {
-        DropDown = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 25 ) ;
-        Size = MAP_APPFONT ( 96 , 65 ) ;
-    };
-    FixedText FT_MEAN
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 96 , 8 ) ;
-        Text [ en-US ] = "~Meaning " ;
-        LEFT = TRUE ;
-    };
-    ListBox LB_MEAN
-    {
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 55 ) ;
-        Size = MAP_APPFONT ( 96 , 50 ) ;
-        AutoHScroll = TRUE ;
-    };
-    FixedText FT_SYNON
-    {
-        Pos = MAP_APPFONT ( 111 , 43 ) ;
-        Size = MAP_APPFONT ( 96 , 8 ) ;
-        Text [ en-US ] = "Sy~nonym" ;
-        LEFT = TRUE ;
-    };
-    ListBox LB_SYNON
-    {
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 111 , 55 ) ;
-        Size = MAP_APPFONT ( 96 , 50 ) ;
-        AutoHScroll = TRUE ;
-    };
-    FixedText FT_REPL
-    {
-        Pos = MAP_APPFONT ( 111 , 14 ) ;
-        Size = MAP_APPFONT ( 96 , 8 ) ;
-        Text [ en-US ] = "~Replace" ;
-        LEFT = TRUE ;
-    };
-    Edit ED_REPL
-    {
-        BORDER = TRUE ;
-        Pos = MAP_APPFONT ( 111 , 25 ) ;
-        Size = MAP_APPFONT ( 96 , 12 ) ;
-        LEFT = TRUE ;
-    };
-    FixedLine FL_VAR
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 207 , 8 ) ;
-        Text [ en-US ] = "Variations" ;
-    };
-    String STR_ERR_WORDNOTFOUND
-    {
-        Text [ en-US ] = "Word not found in thesaurus" ;
-    };
-};
- // RID_SVXDLG_THES_LANGUAGE ----------------------------------------------
-ModalDialog RID_SVXDLG_THES_LANGUAGE
-{
-    HelpId = HID_THES_LANGUAGE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 170 , 86 ) ;
-    /* ### ACHTUNG: Neuer Text in Resource? Sprache auswählen : Sprache auswõhlen */
-    /* ### ACHTUNG: Neuer Text in Resource? Sprache auswählen : Sprache auswõhlen */
-    Text [ en-US ] = "Select Language" ;
-    Moveable = TRUE ;
-    ListBox LB_THES_LANGUAGE
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 90 , 60 ) ;
-        Sort = TRUE ;
-    };
-    FixedLine FL_THES_LANGUAGE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 102 , 8 ) ;
-        Text [ en-US ] = "Selection" ;
-    };
-    OKButton BTN_LANG_OK
-    {
-        Pos = MAP_APPFONT ( 114 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_LANG_CANCEL
-    {
-        Pos = MAP_APPFONT ( 114 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton BTN_LANG_HELP
-    {
-        Pos = MAP_APPFONT ( 114 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 7d89f8fa6f..25d6131cfa 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txencbox.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -178,36 +175,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
 
 //------------------------------------------------------------------------
 
-// static
-rtl_TextEncoding SvxTextEncodingBox::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(
-                Application::GetSettings().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;
-}
-
-//------------------------------------------------------------------------
-
 void SvxTextEncodingBox::FillWithMimeAndSelectBest()
 {
     FillFromTextEncodingTable( sal_False, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
-    rtl_TextEncoding nEnc = GetBestMimeEncoding();
+    rtl_TextEncoding nEnc = SvtSysLocale::GetBestMimeEncoding();
     SelectTextEncoding( nEnc );
 }
 
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 4c14991468..2e4f0eef7a 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txenctab.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/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
index 36c4208eba..7cc40bbcd2 100644
--- a/svx/source/dialog/txenctab.src
+++ b/svx/source/dialog/txenctab.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: txenctab.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/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index bf2f6d9842..160b0defe5 100755
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.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: charmap.src,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/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
index 53d4b359e9..b473c34cb1 100644
--- a/svx/source/dialog/wrapfield.cxx
+++ b/svx/source/dialog/wrapfield.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrapfield.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/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index a2243e6867..c61e8dfdf3 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: camera3d.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 0f52f80dff..616db93da6 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cube3d.cxx,v $
- * $Revision: 1.18.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 920b98efe4..45750cbcaa 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: deflt3d.cxx,v $
- * $Revision: 1.11.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svx/deflt3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/svxids.hrc>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 
 /*************************************************************************
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 7bbf9c6ca9..22ad196dab 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dragmt3d.cxx,v $
- * $Revision: 1.12.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx
index c138acdde0..703ba77ae6 100644
--- a/svx/source/engine3d/e3dsceneupdater.cxx
+++ b/svx/source/engine3d/e3dsceneupdater.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dsceneupdater.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
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index a564149499..6e291b4703 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dundo.cxx,v $
- * $Revision: 1.9.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_svx.hxx"
 #include <svx/e3dundo.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/view3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index a08fe4e753..d0cbaf14b3 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extrud3d.cxx,v $
- * $Revision: 1.25.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index fd3028493d..c8001f8091 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: float3d.cxx,v $
- * $Revision: 1.27.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,9 +46,9 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/polysc3d.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/style.hxx>
-
+#include <dlgutil.hxx>
 
 #include <dlgutil.hxx>
 #include <svx/dialmgr.hxx>
@@ -60,7 +57,7 @@
 #include <svx/svxids.hrc>
 #include <svx/dialogs.hrc>
 
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 
 #include <gallery.hxx>
@@ -307,7 +304,8 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
     FreeResource();
 
     // Metrik einstellen
-    eFUnit = GetModuleFieldUnit( NULL );
+    eFUnit = pInBindings->GetDispatcher()->GetModule()->GetFieldUnit();
+
     aMtrDepth.SetUnit( eFUnit );
     aMtrDistance.SetUnit( eFUnit );
     aMtrFocalLength.SetUnit( eFUnit );
@@ -509,7 +507,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" );
         ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH );
     }
-    eFUnit = GetModuleFieldUnit( &rAttrs );
+    eFUnit = GetModuleFieldUnit( rAttrs );
 
 
 // Segmentanzahl aenderbar ? und andere Stati
@@ -1754,7 +1752,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
         DBG_ASSERT( mpImpl->pPool, "Wo ist der Pool?" );
         ePoolUnit = mpImpl->pPool->GetMetric( SID_ATTR_LINE_WIDTH );
 
-        eFUnit = GetModuleFieldUnit( &rAttrs );
+        eFUnit = GetModuleFieldUnit( rAttrs );
     }
 
     // Anzahl Segmente (horizontal)
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index c0f6a579f6..0fce465eca 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.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: float3d.src,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/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index 270e725024..86f172da7d 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helperhittest3d.cxx,v $
- * $Revision: 1.1.2.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx
index 609bdd0f82..6fb31d6e19 100644
--- a/svx/source/engine3d/helperminimaldepth3d.cxx
+++ b/svx/source/engine3d/helperminimaldepth3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helperminimaldepth3d.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
diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx
index 6e3ea4b581..94f09f9f41 100644
--- a/svx/source/engine3d/helperminimaldepth3d.hxx
+++ b/svx/source/engine3d/helperminimaldepth3d.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helperminimaldepth3d.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 40acc800c4..a8ee638100 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lathe3d.cxx,v $
- * $Revision: 1.27.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
index bb590bd76c..6e6e3f97c5 100644
--- a/svx/source/engine3d/makefile.mk
+++ b/svx/source/engine3d/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.18.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index d7274e3cb0..8543c9d247 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: obj3d.cxx,v $
- * $Revision: 1.48.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,9 +55,9 @@
 #include <svx/xlnwtit.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/poly.hxx>
-#include <goodies/b3dtrans.hxx>
+#include <tools/b3dtrans.hxx>
 #include <svx/svxids.hrc>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
@@ -70,7 +67,7 @@
 #include <svx/svx3ditems.hxx>
 #include <svl/whiter.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/xgrscit.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/e3dproperties.hxx>
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 70b46cf4f8..717dd668c8 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objfac3d.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 68e9e3833a..e496a23ee6 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: polygn3d.cxx,v $
- * $Revision: 1.17.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index cd6ee50e8d..b42c963ec3 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: polysc3d.cxx,v $
- * $Revision: 1.18.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 05de87c705..94a3668f2c 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scene3d.cxx,v $
- * $Revision: 1.34.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 #include <svx/e3dundo.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svxids.hrc>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/e3ditem.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index b6910274f4..00f85df53a 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sphere3d.cxx,v $
- * $Revision: 1.20.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src
index 12c97b1925..ffcc2e8e86 100644
--- a/svx/source/engine3d/string3d.src
+++ b/svx/source/engine3d/string3d.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: string3d.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/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 75da20585f..ce4c86ae3f 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svx3ditems.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 7f0e83108e..6b5ef8235b 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: view3d.cxx,v $
- * $Revision: 1.32.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svxids.hrc>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/svdview.hxx>
 #include <svx/dialogs.hrc>
@@ -697,7 +694,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
 |* 3D-Konvertierung zu Extrude ausfuehren
 |*
 \************************************************************************/
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj)
 {
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 9e33b281f2..22aa9583f1 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: view3d1.cxx,v $
- * $Revision: 1.15.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 #include <svx/obj3d.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/e3ditem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
diff --git a/svx/source/engine3d/viewpt3d.cxx b/svx/source/engine3d/viewpt3d.cxx
index 1010b44f22..61357e19cd 100644
--- a/svx/source/engine3d/viewpt3d.cxx
+++ b/svx/source/engine3d/viewpt3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewpt3d.cxx,v $
- * $Revision: 1.10.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index a4be774c11..ed95cd8e6c 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewpt3d2.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/svx/source/engine3d/volume3d.cxx b/svx/source/engine3d/volume3d.cxx
index ef4f704d42..c0d6db9d7c 100644
--- a/svx/source/engine3d/volume3d.cxx
+++ b/svx/source/engine3d/volume3d.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: volume3d.cxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 04a2b30b40..6859e7023c 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbaexchange.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index d30ba00e27..0da3e9ec1a 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbaobjectex.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 2d21734dfe..779017ff0c 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmgridcl.cxx,v $
- * $Revision: 1.64.94.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 57930323c4..e5cc168025 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmgridif.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/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2ab178f3ef..dfedec322e 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridcell.cxx,v $
- * $Revision: 1.66 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 339cf12cbb..0ba38bbd37 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridcols.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 26e5d496bf..4e21fc3761 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridctrl.cxx,v $
- * $Revision: 1.85 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 9dc141821f..f6e4c16404 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.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: gridctrl.src,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/makefile.mk b/svx/source/fmcomp/makefile.mk
index 1f3afe2427..aa4e9eaba1 100644
--- a/svx/source/fmcomp/makefile.mk
+++ b/svx/source/fmcomp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index d5e2a0087f..55b8ef1bd3 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: trace.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index ea13227d59..98a9a365b8 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexchg.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/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index f38c341847..62937a29f6 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ParseContext.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index dc12271221..32ca4a7cd8 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dataaccessdescriptor.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 215e74d72f..588a54b5dc 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: databaselocationinput.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index 595054855d..46a6038d00 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datalistener.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/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index b4f5d62bb0..6070adb015 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1,14 +1,11 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datanavi.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 64bc690839..5d4aaf69b2 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.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: datanavi.src,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index 9f6b1b7401..f4acf0a32d 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbcharsethelper.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/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index c430a2e14a..ed31ec7c0b 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dbtoolsclient.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/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index 4fca59484f..b5a11768e1 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -1,26 +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
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #include "precompiled_svx.hxx"
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 8af92d75cb..c1795f5938 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtnav.cxx,v $
- * $Revision: 1.48.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -374,10 +371,12 @@ void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxC
         Reference< XFilterController > xController( xElement, UNO_QUERY );
         OSL_ENSURE( xController.is(), "FmFilterAdapter::InsertElements: no XFilterController, cannot sync data!" );
         if ( xController.is() )
+        {
             if ( _bAdd )
                 xController->addFilterControllerListener( this );
             else
                 xController->removeFilterControllerListener( this );
+        }
     }
 }
 
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index c93053eee9..36c12a001e 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.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: filtnav.src,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 152853801b..7ab661c758 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmPropBrw.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/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 5c63976628..a4f3ed9c16 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -1,8 +1,8 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index f0d21e2a2c..bd4ebdef6e 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 45a27a6122..194e13f95e 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdmod.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/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index fb5790c35c..40e3b2b3a3 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdocumentclassification.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/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 5765d00bf8..f591fe3624 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdpage.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/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index e511a2e0ba..b16af664c5 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmexch.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 8ac29428db..52393a6e34 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmexpl.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/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 2c7c2c00e4..218df02f07 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.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: fmexpl.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/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 0d7e562a7d..abf1662bb0 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmitems.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 56ea8a2014..2ad86712d5 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmmodel.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index b8df2bfd9d..eb747e0bf5 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmobj.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,7 @@
 #include "svx/fmview.hxx"
 #include "svx/fmglob.hxx"
 #include "svx/fmpage.hxx"
-#include "svx/editeng.hxx"
+#include "editeng/editeng.hxx"
 #include "svx/svdovirt.hxx"
 #include "svx/fmmodel.hxx"
 #include "svx/dialmgr.hxx"
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index dac0daaf8f..282dbd757e 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmobjfac.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 691b141c40..90be1794a8 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmpage.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index d0b5a295de..3544a55def 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmpgeimp.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/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 875afd7178..74d9585087 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmscriptingenv.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -236,6 +233,11 @@ namespace svxform
     void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
+       static const ::rtl::OUString vbaInterOp =
+           ::rtl::OUString::createFromAscii("VBAInterop");
+       if ( _rEvent.ScriptType.equals(vbaInterOp) )
+           return; // not handled here
+    
         if ( impl_isDisposed_nothrow() )
             return;
 
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index c1f738fea6..fc922b4b19 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmservs.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index facfc88701..c40841f221 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmshell.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/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 2bf3c82eb6..d4028a3b18 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmshimp.cxx,v $
- * $Revision: 1.94 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -91,6 +88,7 @@
 /** === end UNO includes === **/
 
 #include <comphelper/extract.hxx>
+#include <comphelper/evtmethodhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/stl_types.hxx>
@@ -362,35 +360,6 @@ namespace
     }
 
     //..........................................................................
-    Sequence< ::rtl::OUString> getEventMethods(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;
-    }
-
-    //..........................................................................
     void TransferEventScripts(const Reference< XControlModel>& xModel, const Reference< XControl>& xControl,
         const Sequence< ScriptEventDescriptor>& rTransferIfAvailable)
     {
@@ -463,7 +432,8 @@ namespace
                         continue;
 
                     // now check the methods
-                    Sequence< ::rtl::OUString> aMethodsNames = getEventMethods(*pCurrentListeners);
+                    Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners);
+
                     const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
                     for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
                     {
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index c986ba991c..fc710ddcbe 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmsrccfg.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 56e55cc127..85f6a79b97 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmsrcimp.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src
index 45a88961dd..89771f126b 100644
--- a/svx/source/form/fmstring.src
+++ b/svx/source/form/fmstring.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: fmstring.src,v $
- * $Revision: 1.76 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 32a245120f..751f699a32 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtextcontroldialogs.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,7 +39,7 @@
 #ifndef _SVX_PARAGRPH_HXX
 //#include "paragrph.hxx"
 #endif
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #ifndef _SVX_TABSTPGE_HXX
 //#include "tabstpge.hxx"
 #endif
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 1c611bc3ba..d82a253b3d 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtextcontrolfeature.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/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index e864ba4207..c55d15781c 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtextcontrolshell.cxx,v $
- * $Revision: 1.16.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,14 +33,14 @@
 #include "fmtextcontroldialogs.hxx"
 #include "fmtextcontrolfeature.hxx"
 #include "fmtextcontrolshell.hxx"
-#include "svx/crsditem.hxx"
+#include "editeng/crsditem.hxx"
 #include "svx/dialmgr.hxx"
-#include "svx/editeng.hxx"
-#include "svx/eeitem.hxx"
+#include "editeng/editeng.hxx"
+#include "editeng/eeitem.hxx"
 #include "svx/fmglob.hxx"
-#include "svx/scriptspaceitem.hxx"
+#include "editeng/scriptspaceitem.hxx"
 #include "svx/svxids.hrc"
-#include "svx/udlnitem.hxx"
+#include "editeng/udlnitem.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 5395267b3a..e1d139dd10 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtools.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/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 709656dc1b..3900c5b694 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmundo.cxx,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -82,6 +79,90 @@ using namespace ::com::sun::star::reflection;
 using namespace ::com::sun::star::form::binding;
 using namespace ::svxform;
 
+
+#include <com/sun/star/script/XScriptListener.hdl>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/implbase1.hxx>
+
+typedef cppu::WeakImplHelper1< XScriptListener > ScriptEventListener_BASE;
+class ScriptEventListenerWrapper : public ScriptEventListener_BASE
+{
+public:
+    ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) : pModel(&_rModel) 
+    {
+        Reference < XPropertySet > xProps(
+            ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+        if ( xProps.is() )
+        {
+            Reference< XComponentContext > xCtx( xProps->getPropertyValue(
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY );
+            if ( xCtx.is() )
+            {
+                Reference< XMultiComponentFactory > xMFac( 
+                    xCtx->getServiceManager(), UNO_QUERY );
+                if ( xMFac.is() )
+                {
+                    m_vbaListener.set( xMFac->createInstanceWithContext( 
+                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
+                            "ooo.vba.EventListener"  ) ), xCtx ), 
+                                UNO_QUERY_THROW );
+                }
+            }
+        }
+    }
+    // XEventListener
+    virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException ){}
+
+    // XScriptListener
+    virtual void SAL_CALL firing(const  ScriptEvent& evt) throw(RuntimeException)	
+    {
+        setModel();
+        if ( m_vbaListener.is() )
+        {
+            m_vbaListener->firing( evt );	
+        }
+    }
+
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( com::sun::star::reflection::InvocationTargetException, RuntimeException)
+    {
+        setModel();
+        if ( m_vbaListener.is() )
+        {
+            return m_vbaListener->approveFiring( evt );	
+        }
+        return Any();	
+    }
+    
+private:
+    void setModel()
+    {
+        Reference< XPropertySet > xProps( m_vbaListener, UNO_QUERY );
+        if ( xProps.is() )
+        {
+            try
+            {
+                SfxObjectShellRef xObjSh = pModel->GetObjectShell();
+                if ( xObjSh.Is() && m_vbaListener.is() )
+                {
+                    Any aVal;
+                    aVal <<= xObjSh->GetModel();
+                    xProps->setPropertyValue( 
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ), 
+                        aVal );
+                }
+            }
+            catch( Exception& )
+            {
+                //swallow any errors
+            }
+        }
+    }
+    FmFormModel* pModel;
+    Reference< XScriptListener > m_vbaListener;
+
+
+};
+
 //------------------------------------------------------------------------------
 // some helper structs for caching property infos
 //------------------------------------------------------------------------------
@@ -125,6 +206,13 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::FmXUndoEnvironment" );
     DBG_CTOR(FmXUndoEnvironment,NULL);
+    try
+    {
+        m_vbaListener =  new ScriptEventListenerWrapper( _rModel );
+    }
+    catch( Exception& )
+    {
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -802,9 +890,17 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
         if ( xManager.is() )
         {
             if ( _bStartListening )
+            {
                 m_pScriptingEnv->registerEventAttacherManager( xManager );
+                if ( m_vbaListener.is() )
+                    xManager->addScriptListener( m_vbaListener );
+            }
             else
+            {
                 m_pScriptingEnv->revokeEventAttacherManager( xManager );
+                if ( m_vbaListener.is() )
+                    xManager->removeScriptListener( m_vbaListener );
+            }
         }
 
         // also handle all children of this element
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 5911ed4ca9..0df6f9d86e 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmview.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/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index c8d008f08e..8d75e4a882 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmvwimp.cxx,v $
- * $Revision: 1.72 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 4ac70bd3dc..089b6986e0 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: formcontrolfactory.cxx,v $
-*
-* $Revision: 1.1.2.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 8cc6ba990d..3ab380dc15 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 76dbe7771b..960716c3c9 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formcontrolling.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/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 4f7a0d9a8d..c9964a7563 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.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/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 993c27bc5d..55bbc2aea5 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index f59bdc1bb4..f92b762b84 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.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: formshell.src,v $
- * $Revision: 1.10.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 0329eabfa2..6a7c738fde 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formtoolbars.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index ec65a2bfd9..07451d5278 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index 1ea5a3f71e..d6dc1bd653 100644
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,6 +40,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
+.IF "$(ENABLE_VBA)"=="YES"
+    CDEFS+=-DENABLE_VBA
+.ENDIF
+
 SRS1NAME=form
 SRC1FILES= \
     fmexpl.src 		\
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 678ca0f6b4..4e1a0b3f95 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigatortree.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 15f580a799..d552f55803 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: navigatortreemodel.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/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index ed43578cb9..1bdc4bc41b 100644
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdbdatacolumn.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/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index 41075ec0f2..5fd57d5abd 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlparserclient.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 0822a5c914..e7bb12ca5e 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stringlistresource.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index e280619a1a..0165212e24 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabwin.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index dea9ec53e4..2548b7a901 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxform.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx
index d7dc87d615..74e6c17c02 100644
--- a/svx/source/form/typeconversionclient.cxx
+++ b/svx/source/form/typeconversionclient.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: typeconversionclient.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/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index 5a8baa8086..ae2d45ca76 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: typemap.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,34 +31,35 @@
 #include <sfx2/msg.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/postitem.hxx>
 #ifndef _SVX_CLIPBOARDCTL_HXX_
 #include "clipfmtitem.hxx"
 #endif
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/charreliefitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include "editeng/fontitem.hxx"
+#include <editeng/charreliefitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/adjitem.hxx>
 #ifndef _SVX_EMPHITEM_HXX
-#include <svx/emphitem.hxx>
+#include <editeng/emphitem.hxx>
 #endif
 
+#include <editeng/memberids.hrc>
 #define SFX_TYPEMAP
 #include "svxslots.hxx"
 
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 0033414540..5c8e50b212 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfm_addcondition.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/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index cd4573d15e..efd63a2b4f 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: codec.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/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 1fcc0c8976..0da253ce70 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: codec.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 2082198547..917b9d64fb 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galbrws.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index dc775caf2b..adc66750cf 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galbrws1.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index e0ae02dde3..4755a92933 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galbrws1.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/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 8d4a38aa14..20148bcf1d 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galbrws2.cxx,v $
- * $Revision: 1.57 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxsids.hrc>
-#include "svx/impgrf.hxx"
-#include <svx/brshitem.hxx>
+#include "svtools/filter.hxx"
+#include <editeng/brshitem.hxx>
 #include "helpid.hrc"
 #include "gallery.hxx"
 #include "galobj.hxx"
@@ -1154,7 +1151,7 @@ String GalleryBrowser2::GetFilterName() const
 
         if( ( SGA_OBJ_BMP == eObjKind ) || ( SGA_OBJ_ANIM == eObjKind ) )
         {
-            GraphicFilter*		pFilter = GetGrfFilter();
+            GraphicFilter*		pFilter = GraphicFilter::GetGraphicFilter();
             INetURLObject		aURL; mpCurTheme->GetURL( mnCurActionPos, aURL );
             sal_uInt16			nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() );
             
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 9f751c98fa..e471f54718 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galctrl.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,12 +37,12 @@
 #include "galtheme.hxx"
 #include "svx/galmisc.hxx"
 #include "galctrl.hxx"
-#include "AccessibleStringWrap.hxx"
-#include <svx/svxfont.hxx>
+#include "editeng/AccessibleStringWrap.hxx"
+#include <editeng/svxfont.hxx>
 #include "galobj.hxx"
 #include <avmedia/mediawindow.hxx>
 #include "gallery.hrc"
-#include <svx/impgrf.hxx>
+#include <svtools/filter.hxx>
 
 // -----------
 // - Defines -
@@ -97,7 +94,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
     }
     else
     {
-        GraphicFilter*  pFilter = GetGrfFilter();
+        GraphicFilter*  pFilter = GraphicFilter::GetGraphicFilter();
         GalleryProgress aProgress( pFilter );
         if( pFilter->ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) )
             bRet = false;
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 7e505245e9..3e0ad51584 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galexpl.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/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 84d763fae6..4fe6116fec 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.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: gallery.src,v $
- * $Revision: 1.79 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 14ac81ebe9..178f6d8289 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gallery1.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/svx/source/gallery2/gallerydrawmodel.hxx b/svx/source/gallery2/gallerydrawmodel.hxx
index e5ea60f286..e7ba22ee4d 100644
--- a/svx/source/gallery2/gallerydrawmodel.hxx
+++ b/svx/source/gallery2/gallerydrawmodel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gallerydrawmodel.hxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 0353af86ef..16efcfdb72 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galmisc.cxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
 
-#include "svx/impgrf.hxx"
+#include "svtools/filter.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/fmmodel.hxx>
@@ -129,7 +126,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
 
     if( pIStm )
     {
-        GraphicFilter*		pGraphicFilter = GetGrfFilter();
+        GraphicFilter*		pGraphicFilter = GraphicFilter::GetGraphicFilter();
         GalleryProgress*	pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL;
         USHORT				nFormat;
 
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index a62a530ccb..106eeff6d8 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galobj.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index b79af995b2..d9d696ede1 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: galtheme.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/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 8156f711c6..8f84949aad 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.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: galtheme.src,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk
index 1da16ff705..4d73a4af2a 100644
--- a/svx/source/gallery2/makefile.mk
+++ b/svx/source/gallery2/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 8f9ae215c4..81474efbcd 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gengal.cxx,v $
- * $Revision: 1.10.288.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index 610a101f9a..38e680e476 100644
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.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: gengal.sh,v $
-#
-# $Revision: 1.5.288.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk
index ae1f36e5f7..eefe8679a1 100644
--- a/svx/source/gengal/makefile.mk
+++ b/svx/source/gengal/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.144.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 909d20eb6f..f578e5de18 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AccessibleFrameSelector.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 3f9c32f283..4f2b3cd392 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DGColorNameLookUp.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index db97446f93..fb92cb45f7 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GraphCtlAccessibleContext.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/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 517afb1f17..a32993e907 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: charmapacc.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/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx
index c822422d26..7b9a8902a3 100644
--- a/svx/source/inc/clonelist.hxx
+++ b/svx/source/inc/clonelist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: clonelist.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index 67b1fb2f26..3c8b5d24a7 100644
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datalistener.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 80c1befa7d..fac792e7d1 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.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: datanavi.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/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 269db25f47..aa285ee039 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: datanavi.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/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 8ca5d85da9..e01e44a326 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -1,26 +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
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef SVX_DELAYEDLINK_HXX
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 9d0b624f7e..da91352adc 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: docrecovery.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 4501a75e63..f069f2f797 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtnav.hxx,v $
- * $Revision: 1.19.216.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index c18885b093..78b394f53e 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmPropBrw.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/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 7447041c57..6f199fe715 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.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/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index fe4bd3cc8c..16ebaa7273 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.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/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index fdbe026211..5b649e7a1c 100644
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmdocumentclassification.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 410addcf31..5cc486f304 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmexch.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/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc
index 41aae9ca1f..ce4d88ee51 100644
--- a/svx/source/inc/fmexpl.hrc
+++ b/svx/source/inc/fmexpl.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: fmexpl.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/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 93a329d032..ac87b4e38e 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmexpl.hxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
index b95580118a..fad4aaa3bf 100644
--- a/svx/source/inc/fmgroup.hxx
+++ b/svx/source/inc/fmgroup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmgroup.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmhlpids.hrc b/svx/source/inc/fmhlpids.hrc
index dedc9bbd5d..70e7b51004 100644
--- a/svx/source/inc/fmhlpids.hrc
+++ b/svx/source/inc/fmhlpids.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: fmhlpids.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 03fe48776f..49cfabfac9 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmitems.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index ee765b45fd..881be1abb6 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmobj.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/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 9009d2ccad..8ff091e420 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmpgeimp.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/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index a981cc65c4..981fd384f0 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.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: fmprop.hrc,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index 6e95386a92..08982d8444 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.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: fmresids.hrc,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/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index 56b5c0e1e3..be33c6e278 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmscriptingenv.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index c52adf1982..6c1136a405 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmservs.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 85f29cf7f4..957d737a1b 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmshimp.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/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index ffbfc92c19..33ce626877 100644
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmslotinvalidator.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/source/inc/fmsrccfg.hxx
index f716fbf035..743dbfa378 100644
--- a/svx/source/inc/fmsrccfg.hxx
+++ b/svx/source/inc/fmsrccfg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmsrccfg.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index 9d55f5c5f9..c8cc4972ef 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmsrcimp.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index 5d3ab50217..d1ba826688 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtextcontroldialogs.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/tabdlg.hxx>
-#include <flstitem.hxx>
+#include <editeng/flstitem.hxx>
 
 //........................................................................
 namespace svx
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 3195987dd4..896992cd47 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtextcontrolfeature.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index f82f06fe1d..ced974a61c 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmtextcontrolshell.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index e7ae4fd9c5..558e0bf42c 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmundo.hxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -217,7 +214,7 @@ private:
 
     void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(());
     void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(());
-
+    ::com::sun::star::uno::Reference< com::sun::star::script::XScriptListener > m_vbaListener;
 public:
     // Methoden zur Zuordnung von Controls zu Forms,
     // werden von der Seite und der UndoUmgebung genutzt
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index 9513fa1841..8a30df131a 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmurl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 52dbb111ef..84a941ae1e 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fmvwimp.hxx,v $
- * $Revision: 1.34.260.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index c157a5db4e..237297ad41 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -1,31 +1,28 @@
 
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: formcontrolfactory.hxx,v $
-*
-* $Revision: 1.1.2.1 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef SVX_FORMCONTROLMANAGER_HXX
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index d06b5358ef..56fcf922ab 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.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/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index 836ffc578f..a3b143e690 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.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/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index 21a74fdeaa..1715e707b4 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.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 SVX_FORMDISPATCHINTERCEPTOR_HXX
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index b41f316d98..c6b6d0e3b0 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.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/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 2083e2baa8..030d5cf1ab 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formtoolbars.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/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc
index 01b0bf41c3..fb6597c6f5 100644
--- a/svx/source/inc/frmsel.hrc
+++ b/svx/source/inc/frmsel.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: frmsel.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/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index fd14d1c7e4..022842b293 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: frmselimpl.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,7 @@
 #include <vcl/image.hxx>
 #include <svx/frmsel.hxx>
 #include <svx/framelinkarray.hxx>
-#include <svx/borderline.hxx>
+#include <editeng/borderline.hxx>
 
 namespace svx {
 
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index db54b3780f..9c1e7cf359 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridcell.hxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index 9b7930837e..ee8e4af826 100644
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridcols.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/linectrl.hrc b/svx/source/inc/linectrl.hrc
index 7604d12b9e..ecbffcb00f 100644
--- a/svx/source/inc/linectrl.hrc
+++ b/svx/source/inc/linectrl.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: linectrl.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx
index c72511cc89..788419e824 100644
--- a/svx/source/inc/recoveryui.hxx
+++ b/svx/source/inc/recoveryui.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recoveryui.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index 91a47051a7..1f41246b8b 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdbdatacolumn.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index a17198bea1..bd054e968b 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sqlparserclient.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 8fb8ff9db2..92e8b8114a 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/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: stringlistresource.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 33b84ce08e..f95cb0c465 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoimp.hxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx
index c316341786..9c978ffdf2 100644
--- a/svx/source/inc/svdoutlinercache.hxx
+++ b/svx/source/inc/svdoutlinercache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoutlinercache.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 169edd577f..69691dc653 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxrectctaccessiblecontext.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/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index c2616ec995..6e03cbaca5 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabwin.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/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 269a97ea19..849981fefb 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxform.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/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx
index 3e2b06246d..c33cf02a2b 100644
--- a/svx/source/inc/trace.hxx
+++ b/svx/source/inc/trace.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: trace.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/treevisitor.hxx b/svx/source/inc/treevisitor.hxx
index f846f55d50..55aef2d9c3 100644
--- a/svx/source/inc/treevisitor.hxx
+++ b/svx/source/inc/treevisitor.hxx
@@ -1,30 +1,27 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2008 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* $RCSfile: code,v $
-*
-* $Revision: 1.3 $
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
 
 #ifndef SVX_TREE_VISITOR_HXX
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index 605e76f208..39439ba113 100644
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: typeconversionclient.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index c4e3cf0287..259ba08c54 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogalthemeprovider.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx
index e912d02ad4..8d474e8b49 100644
--- a/svx/source/inc/unopolyhelper.hxx
+++ b/svx/source/inc/unopolyhelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopolyhelper.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index ee2a017545..f6328082a3 100644
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xfm_addcondition.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index e3db48eafe..bd621ac05f 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlxtexp.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index 5d4082a84b..76e4a8870a 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlxtimp.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/intro_tmpl.hrc
index f724cd476e..825b28a689 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/intro_tmpl.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: intro_tmpl.hrc,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index 5731087c48..00a8ffe342 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.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: iso.src,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk
index be373893cf..3ed86b3bcd 100644
--- a/svx/source/intro/makefile.mk
+++ b/svx/source/intro/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index fbe7d9b09f..f025fb9de0 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.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: ooo.src,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/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 9155d5049e..5dfdcac382 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SmartTagItem.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/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 4ce57b6603..ac96e23927 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: algitem.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 
 #include <svx/algitem.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <svx/unomid.hxx>
 
 using namespace ::rtl;
diff --git a/svx/source/items/boxobj.hxx b/svx/source/items/boxobj.hxx
deleted file mode 100644
index c9dd80a555..0000000000
--- a/svx/source/items/boxobj.hxx
+++ /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: boxobj.hxx,v $
- * $Revision: 1.3.76.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.
- *
- ************************************************************************/
-#ifndef _SVX_BOXOBJ_HXX
-#define _SVX_BOXOBJ_HXX
-
-
-#ifndef _SFX_SHOBJ_HXX //autogen
-#include <sfx2/shobj.hxx>
-#endif
-class SvxBoxItem;
-class SvxBoxInfoItem;
-class SvxBorderLine;
-
-//-------------------------------------------------------------------------
-
-class SvxBoxObject: public SfxShellSubObject
-
-/*	[Beschreibung]
-
-    Diese SbxObject-Subklasse kann das <SvxBoxItem> und <SvxBoxInfoItem>
-    im SBX-System recorden und wieder abspielen. Hier werden keine
-    G"ultigkeitspr"ufungen durchgef"uhrt, diese m"ussen in abgeleiteten
-    Klassen spezifisch implementiert werden; dazu sind virtuelle Methoden
-    vorhanden.
-*/
-
-{
-friend class SvxBoxLineObject_Impl;
-
-    SvxBoxItem* 			pBox;
-    SvxBoxInfoItem* 		pBoxInfo;
-
-#ifdef _SVX_BOXOBJ_CXX
-private:
-    const SvxBorderLine*	GetLine_Impl( USHORT nSID ) const;
-    BOOL					SetLine_Impl( USHORT nSID, const SvxBorderLine *pLine );
-    void					Update_Impl() const;
-#endif
-
-protected:
-    // Schnittstelle zum SbxObject/SvDispatch/SfxShell..Object
-    void					Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-    virtual ULONG			SetProperty( USHORT nSID, SbxVariable &rRet );
-    virtual ULONG			GetProperty( USHORT nSID, SbxVariable &rRet );
-
-    // bei den folgenden Methoden sind die Items bereits besorgt worden
-    virtual SbxError    	GetLineColor( USHORT nSID, Color &rColor ) const;
-    virtual SbxError        GetLineStyle( USHORT nSID,
-                                          USHORT &rOutWidth, USHORT &rDist, USHORT &rInWidth ) const;
-    virtual SbxError		GetDistance( USHORT &rDist ) const;
-
-    // nach den folgenden Methoden werden die Items wieder in die Shell gesetzt
-    virtual SbxError		SetLineColor( USHORT nSID, const Color &rColor );
-    virtual SbxError		SetLineStyle( USHORT nSID,
-                                          USHORT nOutWidth, USHORT nDist, USHORT nInWidth );
-    virtual SbxError        SetDistance( USHORT nDist );
-
-public:
-                            TYPEINFO();
-                            SvxBoxObject( SfxShell *pShell = 0 );
-
-                            ~SvxBoxObject();
-
-    const SvxBoxItem&		GetBoxItem() const { return *pBox; }
-    const SvxBoxInfoItem&	GetBoxInfoItem() const { return *pBoxInfo; }
-
-    virtual String 			GenerateSource( const String &rLinePrefix,
-                                            const SbxObject *pRelativeTo );
-};
-
-
-#endif
-
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 2e46e07cfb..785f5f43e0 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chrtitem.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 26b4a4cfb8..8f34ad3333 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: clipfmtitem.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index b3f86d8e20..44981482db 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customshapeitem.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 20be51e821..bdd6c52d67 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: drawitem.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 229d38c11b..067c3c2774 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3ditem.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index c8bf3195a0..0d055de333 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grfitem.cxx,v $
- * $Revision: 1.12 $
- *
  * 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/stream.hxx>
 #include <svx/grfcrop.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <com/sun/star/text/GraphicCrop.hpp>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 1af7e32f80..f955392681 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hlnkitem.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/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index d99f1705f5..188e6171bd 100644
--- a/svx/source/items/makefile.mk
+++ b/svx/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.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,29 +46,16 @@ LIBTARGET=NO
 SRS1NAME=svxitems
 SRC1FILES =  \
         svxerr.src		\
-        page.src \
         svxitems.src
 
 LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
 LIB1OBJFILES= \
-        $(SLO)$/writingmodeitem.obj \
-        $(SLO)$/frmitems.obj \
-        $(SLO)$/paraitem.obj \
-        $(SLO)$/textitem.obj \
-        $(SLO)$/flditem.obj \
-        $(SLO)$/svxfont.obj \
-        $(SLO)$/paperinf.obj    \
         $(SLO)$/drawitem.obj	\
-        $(SLO)$/itemtype.obj	\
         $(SLO)$/chrtitem.obj	\
-        $(SLO)$/bulitem.obj \
         $(SLO)$/e3ditem.obj \
-        $(SLO)$/numitem.obj \
         $(SLO)$/grfitem.obj \
         $(SLO)$/clipfmtitem.obj \
-        $(SLO)$/xmlcnitm.obj \
-        $(SLO)$/customshapeitem.obj \
-        $(SLO)$/charhiddenitem.obj
+        $(SLO)$/customshapeitem.obj 
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
 LIB2OBJFILES= \
@@ -80,7 +63,7 @@ LIB2OBJFILES= \
         $(SLO)$/postattr.obj	\
         $(SLO)$/hlnkitem.obj \
         $(SLO)$/pageitem.obj	\
-                $(SLO)$/viewlayoutitem.obj    \
+        $(SLO)$/viewlayoutitem.obj    \
         $(SLO)$/algitem.obj \
         $(SLO)$/rotmodit.obj \
         $(SLO)$/numinf.obj	\
@@ -94,11 +77,6 @@ LIB2OBJFILES= \
 SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 EXCEPTIONSFILES= \
-        $(SLO)$/paraitem.obj \
-        $(SLO)$/frmitems.obj \
-        $(SLO)$/numitem.obj\
-        $(SLO)$/xmlcnitm.obj\
-        $(SLO)$/flditem.obj \
         $(SLO)$/customshapeitem.obj
 
 .INCLUDE :	target.mk
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 1e90d7699b..cd1926f34c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numfmtsh.cxx,v $
- * $Revision: 1.20.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 1121799631..7b1161389c 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numinf.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 001d910bd8..13264a5bb7 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ofaitem.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 5268071f9c..2a4846d093 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageitem.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,11 +33,13 @@
 
 
 #include <svx/pageitem.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <svx/unomid.hxx>
 #include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <svl/itemset.hxx>
+#include <svx/svxitems.hrc>
+#include <svx/dialmgr.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index c694ab4863..a739f43600 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postattr.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,7 +32,9 @@
 
 #define _SVX_POSTATTR_CXX
 #include "postattr.hxx"
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
+#include <svx/svxitems.hrc>
+#include <svx/dialmgr.hxx>
 
 // -----------------------------------------------------------------------
 
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 6374cee936..f15f7149d3 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rotmodit.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx
index 641c5f1340..f6d743e1da 100644
--- a/svx/source/items/svxempty.cxx
+++ b/svx/source/items/svxempty.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxempty.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/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index e7cd9c2da0..09c65b6c24 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxerr.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src
index 84ca05c9b6..a55291de29 100644
--- a/svx/source/items/svxerr.src
+++ b/svx/source/items/svxerr.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: svxerr.src,v $
- * $Revision: 1.55 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,6 +28,8 @@
 #define __RSC
 #include "svxerr.hxx"
 #include <svx/dialogs.hrc>
+#include <editeng/editerr.hxx>
+
  // pragma ----------------------------------------------------------------
 
  // Error-Context ---------------------------------------------------------
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index c7a35f625b..a2fd85293c 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.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: svxitems.src,v $
- * $Revision: 1.83.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,19 +25,78 @@
  *
  ************************************************************************/
  // include ------------------------------------------------------------------
+
 #include <svx/svxitems.hrc>
- // pragma -------------------------------------------------------------------
+#include <svx/svxids.hrc>
+#include <editeng/editids.hrc>
 
- // Value-Strings ------------------------------------------------------------
-String RID_SVXITEMS_TRUE
-{
-    Text [ en-US ] = "True" ;
-};
-String RID_SVXITEMS_FALSE
-{
-    Text [ en-US ] = "False" ;
-};
- // Extras -------------------------------------------------------------------
+StringArray RID_ATTR_NAMES
+{
+    ItemList =
+    {
+        < "Scale"			;           SID_ATTR_ZOOM ; > ;
+        < "Brush"			;           SID_ATTR_BRUSH ; > ;
+        < "Tab stops"				;   SID_ATTR_TABSTOP ; > ;
+        < "Character"				;   SID_ATTR_CHAR ; > ;
+        < "Font"			;           SID_ATTR_CHAR_FONT ; > ;
+        < "Font posture"		;       SID_ATTR_CHAR_POSTURE ; > ;
+        < "Font weight"				;   SID_ATTR_CHAR_WEIGHT ; > ;
+        < "Shadowed"			;       SID_ATTR_CHAR_SHADOWED ; > ;
+        < "Individual words"		;   SID_ATTR_CHAR_WORDLINEMODE ; > ;
+        < "Outline"			;           SID_ATTR_CHAR_CONTOUR ; > ;
+        < "Strikethrough"			;   SID_ATTR_CHAR_STRIKEOUT ; > ;
+        < "Underline"			;       SID_ATTR_CHAR_UNDERLINE ; > ;
+        < "Font size"				;   SID_ATTR_CHAR_FONTHEIGHT ; > ;
+        < "Rel. Font size"		;       SID_ATTR_CHAR_PROPSIZE ; > ;
+        < "Font color"			;       SID_ATTR_CHAR_COLOR ; > ;
+        < "Kerning"		;               SID_ATTR_CHAR_KERNING ; > ;
+        < "Effects"		;               SID_ATTR_CHAR_CASEMAP ; > ;
+        < "Language";                   SID_ATTR_CHAR_LANGUAGE ; > ;
+        < "Position"		;           SID_ATTR_CHAR_ESCAPEMENT ; > ;
+        < "Blinking"    ;               SID_ATTR_CHAR_AUTOKERN ; > ;
+        < "Character set color"       ; SID_ATTR_CHAR_CHARSETCOLOR ; > ;
+        < "Overline"      ;             SID_ATTR_CHAR_OVERLINE ; > ;
+        < "Paragraph"		;           SID_ATTR_PARA ; > ;
+        < "Alignment"		;           SID_ATTR_PARA_ADJUST ; > ;
+        < "Line spacing"		;       SID_ATTR_PARA_LINESPACE ; > ;
+        < "Page Break"		;           SID_ATTR_PARA_PAGEBREAK ; > ;
+        < "Hyphenation"		;           SID_ATTR_PARA_HYPHENZONE ; > ;
+        < "Do not split paragraph";     SID_ATTR_PARA_SPLIT ; > ;
+        < "Orphans"		;               SID_ATTR_PARA_ORPHANS ; > ;
+        < "Widows"		;               SID_ATTR_PARA_WIDOWS ; > ;
+        < "Spacing"		;               SID_ATTR_PARA_ULSPACE ; > ;
+        < "Indent"		;               SID_ATTR_PARA_LRSPACE ; > ;
+        < "Indent"		;               SID_ATTR_LRSPACE ; > ;
+        < "Spacing"		;               SID_ATTR_ULSPACE ; > ;
+        < "Page"		;               SID_ATTR_PAGE ; > ;
+        < "Page Style"		;           SID_ATTR_PARA_MODEL ; > ;
+        < "Keep with next paragraph";   SID_ATTR_PARA_KEEP ; > ;
+        < "Blinking"		;           SID_ATTR_FLASH ; > ;
+        < "Register-true"		;       SID_ATTR_PARA_REGISTER ; > ;
+        < "Character background"	;   SID_ATTR_BRUSH_CHAR ; > ;
+        < "Asian font"		;           SID_ATTR_CHAR_CJK_FONT ; > ;
+        < "Size of Asian font"		;   SID_ATTR_CHAR_CJK_FONTHEIGHT ; > ;
+        < "Language of Asian font";     SID_ATTR_CHAR_CJK_LANGUAGE ; > ;
+        < "Posture of Asian font"	;   SID_ATTR_CHAR_CJK_POSTURE ; > ;
+        < "Weight of Asian font"	;   SID_ATTR_CHAR_CJK_WEIGHT ; > ;
+        < "CTL"		;                   SID_ATTR_CHAR_CTL_FONT ; > ;
+        < "Size of complex scripts"	;   SID_ATTR_CHAR_CTL_FONTHEIGHT ; > ;
+        < "Language of complex scripts";SID_ATTR_CHAR_CTL_LANGUAGE ; > ;
+        < "Posture of complex scripts"; SID_ATTR_CHAR_CTL_POSTURE ; > ;
+        < "Weight of complex scripts";  SID_ATTR_CHAR_CTL_WEIGHT ; > ;
+        < "Double-lined"		;       SID_ATTR_CHAR_TWO_LINES ; > ;
+        < "Emphasis mark"		;       SID_ATTR_CHAR_EMPHASISMARK ; > ;
+        < "Text spacing"		;       SID_ATTR_PARA_SCRIPTSPACE ; > ;
+        < "Hanging punctuation"		;   SID_ATTR_PARA_HANGPUNCTUATION ; > ;
+        < "Forbidden characters"	;   SID_ATTR_PARA_FORBIDDEN_RULES ; > ;
+        < "Rotation"		;           SID_ATTR_CHAR_ROTATED ; > ;
+        < "Scale"		;               SID_ATTR_CHAR_SCALEWIDTH ; > ;
+        < "Relief"		;               SID_ATTR_CHAR_RELIEF ; > ;
+        < "Vertical text alignment"	;   SID_PARA_VERTALIGN ; > ;
+    };
+};
+ 
+ 
 String RID_SVXITEMS_EXTRAS_CHARCOLOR
 {
     Text [ en-US ] = "Font color" ;
@@ -110,56 +166,6 @@ String RID_SVXITEMS_SEARCHAPP_BASE
 {
     Text = "StarBase" ;
 };
- // enum SvxBreak ------------------------------------------------------------
-String RID_SVXITEMS_BREAK_NONE
-{
-    Text [ en-US ] = "No break" ;
-};
-String RID_SVXITEMS_BREAK_COLUMN_BEFORE
-{
-    Text [ en-US ] = "Break before new column" ;
-};
-String RID_SVXITEMS_BREAK_COLUMN_AFTER
-{
-    Text [ en-US ] = "Break after new column" ;
-};
-String RID_SVXITEMS_BREAK_COLUMN_BOTH
-{
-    Text [ en-US ] = "Break before and after new column" ;
-};
-String RID_SVXITEMS_BREAK_PAGE_BEFORE
-{
-    Text [ en-US ] = "Break before new page" ;
-};
-String RID_SVXITEMS_BREAK_PAGE_AFTER
-{
-    Text [ en-US ] = "Break after new page" ;
-};
-String RID_SVXITEMS_BREAK_PAGE_BOTH
-{
-    Text [ en-US ] = "Break before and after new page" ;
-};
- // enum SvxShadowLocation ---------------------------------------------------
-String RID_SVXITEMS_SHADOW_NONE
-{
-    Text [ en-US ] = "No Shadow" ;
-};
-String RID_SVXITEMS_SHADOW_TOPLEFT
-{
-    Text [ en-US ] = "Shadow top left" ;
-};
-String RID_SVXITEMS_SHADOW_TOPRIGHT
-{
-    Text [ en-US ] = "Shadow top right" ;
-};
-String RID_SVXITEMS_SHADOW_BOTTOMLEFT
-{
-    Text [ en-US ] = "Shadow bottom left" ;
-};
-String RID_SVXITEMS_SHADOW_BOTTOMRIGHT
-{
-    Text [ en-US ] = "Shadow bottom right" ;
-};
  // enum BrushStyle ----------------------------------------------------------
 String RID_SVXITEMS_BRUSHSTYLE_NULL
 {
@@ -209,917 +215,7 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP
 {
     Text [ en-US ] = "Image" ;
 };
- // enum ColorName -----------------------------------------------------------
-String RID_SVXITEMS_COLOR
-{
-    Text [ en-US ] = "Color " ;
-};
-String RID_SVXITEMS_COLOR_BLACK
-{
-    Text [ en-US ] = "Black" ;
-};
-String RID_SVXITEMS_COLOR_BLUE
-{
-    Text [ en-US ] = "Blue" ;
-};
-String RID_SVXITEMS_COLOR_GREEN
-{
-    Text [ en-US ] = "Green" ;
-};
-String RID_SVXITEMS_COLOR_CYAN
-{
-    Text [ en-US ] = "Cyan" ;
-};
-String RID_SVXITEMS_COLOR_RED
-{
-    Text [ en-US ] = "Red" ;
-};
-String RID_SVXITEMS_COLOR_MAGENTA
-{
-    Text [ en-US ] = "Magenta" ;
-};
-String RID_SVXITEMS_COLOR_BROWN
-{
-    Text [ en-US ] = "Brown" ;
-};
-String RID_SVXITEMS_COLOR_GRAY
-{
-    Text [ en-US ] = "Gray" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTGRAY
-{
-    Text [ en-US ] = "Light Gray" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTBLUE
-{
-    Text [ en-US ] = "Light Blue" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTGREEN
-{
-    Text [ en-US ] = "Light Green" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTCYAN
-{
-    Text [ en-US ] = "Light Cyan" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTRED
-{
-    Text [ en-US ] = "Light Red" ;
-};
-String RID_SVXITEMS_COLOR_LIGHTMAGENTA
-{
-    Text [ en-US ] = "Light Magenta" ;
-};
-String RID_SVXITEMS_COLOR_YELLOW
-{
-    Text [ en-US ] = "Yellow" ;
-};
-String RID_SVXITEMS_COLOR_WHITE
-{
-    Text [ en-US ] = "White" ;
-};
-String RID_SVXITEMS_COLOR_MENUBAR
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_MENUBARTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_POPUPMENU
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_POPUPMENUTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_WINDOWTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_WINDOWWORKSPACE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_HIGHLIGHT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DTEXT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DFACE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DLIGHT
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_3DSHADOW
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_SCROLLBAR
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_FIELD
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_COLOR_FIELDTEXT
-{
-    Text = "?" ;
-};
- // enum FontItalic -------------------------------------------------------
-String RID_SVXITEMS_ITALIC_NONE
-{
-    Text [ en-US ] = "Not Italic" ;
-};
-String RID_SVXITEMS_ITALIC_OBLIQUE
-{
-    Text [ en-US ] = "Oblique italic" ;
-};
-String RID_SVXITEMS_ITALIC_NORMAL
-{
-    Text [ en-US ] = "Italic" ;
-};
- // enum FontWeight -------------------------------------------------------
-String RID_SVXITEMS_WEIGHT_DONTKNOW
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_WEIGHT_THIN
-{
-    Text [ en-US ] = "thin" ;
-};
-String RID_SVXITEMS_WEIGHT_ULTRALIGHT
-{
-    Text [ en-US ] = "ultra thin" ;
-};
-String RID_SVXITEMS_WEIGHT_LIGHT
-{
-    Text [ en-US ] = "light" ;
-};
-String RID_SVXITEMS_WEIGHT_SEMILIGHT
-{
-    Text [ en-US ] = "semi light" ;
-};
-String RID_SVXITEMS_WEIGHT_NORMAL
-{
-    Text [ en-US ] = "normal" ;
-};
-String RID_SVXITEMS_WEIGHT_MEDIUM
-{
-    Text [ en-US ] = "medium" ;
-};
-String RID_SVXITEMS_WEIGHT_SEMIBOLD
-{
-    Text [ en-US ] = "semi bold" ;
-};
-String RID_SVXITEMS_WEIGHT_BOLD
-{
-    Text [ en-US ] = "bold" ;
-};
-String RID_SVXITEMS_WEIGHT_ULTRABOLD
-{
-    Text [ en-US ] = "ultra bold" ;
-};
-String RID_SVXITEMS_WEIGHT_BLACK
-{
-    Text [ en-US ] = "black" ;
-};
- // enum FontUnderline - used for underline ------------------------------
-String RID_SVXITEMS_UL_NONE
-{
-    Text [ en-US ] = "No underline" ;
-};
-String RID_SVXITEMS_UL_SINGLE
-{
-    Text [ en-US ] = "Single underline" ;
-};
-String RID_SVXITEMS_UL_DOUBLE
-{
-    Text [ en-US ] = "Double underline" ;
-};
-String RID_SVXITEMS_UL_DOTTED
-{
-    Text [ en-US ] = "Dotted underline" ;
-};
-String RID_SVXITEMS_UL_DONTKNOW
-{
-    Text [ en-US ] = "Underline";
-};
-String RID_SVXITEMS_UL_DASH
-{
-    Text [ en-US ] = "Underline (dashes)";
-};
-String RID_SVXITEMS_UL_LONGDASH
-{
-    Text [ en-US ] = "Underline (long dashes)";
-};
-String RID_SVXITEMS_UL_DASHDOT
-{
-    Text [ en-US ] = "Underline (dot dash)";
-};
-String RID_SVXITEMS_UL_DASHDOTDOT
-{
-    Text [ en-US ] = "Underline (dot dot dash)";
-};
-String RID_SVXITEMS_UL_SMALLWAVE
-{
-    Text [ en-US ] = "Underline (small wave)";
-};
-String RID_SVXITEMS_UL_WAVE
-{
-    Text [ en-US ] = "Underline (Wave)";
-};
-String RID_SVXITEMS_UL_DOUBLEWAVE
-{
-    Text [ en-US ] = "Underline (Double wave)";
-};
-String RID_SVXITEMS_UL_BOLD
-{
-    Text [ en-US ] = "Underlined (Bold)";
-};
-String RID_SVXITEMS_UL_BOLDDOTTED
-{
-    Text [ en-US ] = "Dotted underline (Bold)";
-};
-String RID_SVXITEMS_UL_BOLDDASH
-{
-    Text [ en-US ] = "Underline (Dash bold)";
-};
-String RID_SVXITEMS_UL_BOLDLONGDASH
-{
-    Text [ en-US ] = "Underline (long dash, bold)";
-};
-String RID_SVXITEMS_UL_BOLDDASHDOT
-{
-    Text [ en-US ] = "Underline (dot dash, bold)";
-};
-String RID_SVXITEMS_UL_BOLDDASHDOTDOT
-{
-    Text [ en-US ] = "Underline (dot dot dash, bold)";
-};
-String RID_SVXITEMS_UL_BOLDWAVE
-{
-    Text [ en-US ] = "Underline (wave, bold)";
-};
- // enum FontUnderline - used for overline -------------------------------
-String RID_SVXITEMS_OL_NONE
-{
-    Text [ en-US ] = "No overline" ;
-};
-String RID_SVXITEMS_OL_SINGLE
-{
-    Text [ en-US ] = "Single overline" ;
-};
-String RID_SVXITEMS_OL_DOUBLE
-{
-    Text [ en-US ] = "Double overline" ;
-};
-String RID_SVXITEMS_OL_DOTTED
-{
-    Text [ en-US ] = "Dotted overline" ;
-};
-String RID_SVXITEMS_OL_DONTKNOW
-{
-    Text [ en-US ] = "Overline";
-};
-String RID_SVXITEMS_OL_DASH
-{
-    Text [ en-US ] = "Overline (dashes)";
-};
-String RID_SVXITEMS_OL_LONGDASH
-{
-    Text [ en-US ] = "Overline (long dashes)";
-};
-String RID_SVXITEMS_OL_DASHDOT
-{
-    Text [ en-US ] = "Overline (dot dash)";
-};
-String RID_SVXITEMS_OL_DASHDOTDOT
-{
-    Text [ en-US ] = "Overline (dot dot dash)";
-};
-String RID_SVXITEMS_OL_SMALLWAVE
-{
-    Text [ en-US ] = "Overline (small wave)";
-};
-String RID_SVXITEMS_OL_WAVE
-{
-    Text [ en-US ] = "Overline (Wave)";
-};
-String RID_SVXITEMS_OL_DOUBLEWAVE
-{
-    Text [ en-US ] = "Overline (Double wave)";
-};
-String RID_SVXITEMS_OL_BOLD
-{
-    Text [ en-US ] = "Overlined (Bold)";
-};
-String RID_SVXITEMS_OL_BOLDDOTTED
-{
-    Text [ en-US ] = "Dotted overline (Bold)";
-};
-String RID_SVXITEMS_OL_BOLDDASH
-{
-    Text [ en-US ] = "Overline (Dash bold)";
-};
-String RID_SVXITEMS_OL_BOLDLONGDASH
-{
-    Text [ en-US ] = "Overline (long dash, bold)";
-};
-String RID_SVXITEMS_OL_BOLDDASHDOT
-{
-    Text [ en-US ] = "Overline (dot dash, bold)";
-};
-String RID_SVXITEMS_OL_BOLDDASHDOTDOT
-{
-    Text [ en-US ] = "Overline (dot dot dash, bold)";
-};
-String RID_SVXITEMS_OL_BOLDWAVE
-{
-    Text [ en-US ] = "Overline (wave, bold)";
-};
- // enum FontStrikeout ----------------------------------------------------
-String RID_SVXITEMS_STRIKEOUT_NONE
-{
-    Text [ en-US ] = "No strikethrough" ;
-};
-String RID_SVXITEMS_STRIKEOUT_SINGLE
-{
-    Text [ en-US ] = "Single strikethrough" ;
-};
-String RID_SVXITEMS_STRIKEOUT_DOUBLE
-{
-    Text [ en-US ] = "Double strikethrough" ;
-};
-String RID_SVXITEMS_STRIKEOUT_BOLD
-{
-    Text [ en-US ] = "Bold strikethrough";
-};
-String RID_SVXITEMS_STRIKEOUT_SLASH
-{
-    Text [ en-US ] = "Strike through with slash";
-};
-String RID_SVXITEMS_STRIKEOUT_X
-{
-    Text [ en-US ] = "Strike through with Xes";
-};
- // enum CASEMAP ----------------------------------------------------------
-String RID_SVXITEMS_CASEMAP_NONE
-{
-    Text [ en-US ] = "None" ;
-};
-String RID_SVXITEMS_CASEMAP_VERSALIEN
-{
-    Text [ en-US ] = "Caps" ;
-};
-String RID_SVXITEMS_CASEMAP_GEMEINE
-{
-    Text [ en-US ] = "Lowercase" ;
-};
-String RID_SVXITEMS_CASEMAP_TITEL
-{
-    Text [ en-US ] = "Title" ;
-};
-String RID_SVXITEMS_CASEMAP_KAPITAELCHEN
-{
-    Text [ en-US ] = "Small caps" ;
-};
- // enum ESCAPEMENT -------------------------------------------------------
-String RID_SVXITEMS_ESCAPEMENT_OFF
-{
-    Text [ en-US ] = "Normal position" ;
-};
-String RID_SVXITEMS_ESCAPEMENT_SUPER
-{
-    Text [ en-US ] = "Superscript " ;
-};
-String RID_SVXITEMS_ESCAPEMENT_SUB
-{
-    Text [ en-US ] = "Subscript " ;
-};
-String RID_SVXITEMS_ESCAPEMENT_AUTO
-{
-    Text [ en-US ] = "automatic" ;
-};
- // enum SvxAdjust -----------------------------------------------------------
-String RID_SVXITEMS_ADJUST_LEFT
-{
-    Text [ en-US ] = "Align left" ;
-};
-String RID_SVXITEMS_ADJUST_RIGHT
-{
-    Text [ en-US ] = "Align right" ;
-};
-String RID_SVXITEMS_ADJUST_BLOCK
-{
-    Text [ en-US ] = "Justify" ;
-};
-String RID_SVXITEMS_ADJUST_CENTER
-{
-    Text [ en-US ] = "Centered" ;
-};
-String RID_SVXITEMS_ADJUST_BLOCKLINE
-{
-    Text [ en-US ] = "Justify" ;
-};
- // enum SvxTabAdjust --------------------------------------------------------
-String RID_SVXITEMS_TAB_DECIMAL_CHAR
-{
-    Text [ en-US ] = "Decimal Symbol:" ;
-};
-String RID_SVXITEMS_TAB_FILL_CHAR
-{
-    Text [ en-US ] = "Fill character:" ;
-};
-String RID_SVXITEMS_TAB_ADJUST_LEFT
-{
-    Text [ en-US ] = "Left" ;
-};
-String RID_SVXITEMS_TAB_ADJUST_RIGHT
-{
-    Text [ en-US ] = "Right" ;
-};
-String RID_SVXITEMS_TAB_ADJUST_DECIMAL
-{
-    Text [ en-US ] = "Decimal" ;
-};
-String RID_SVXITEMS_TAB_ADJUST_CENTER
-{
-    Text [ en-US ] = "Centered" ;
-};
-String RID_SVXITEMS_TAB_ADJUST_DEFAULT
-{
-    Text [ en-US ] = "Default" ;
-};
- // Typ-Namen der SlotIds ----------------------------------------------------
-String RID_ATTR_ZOOM
-{
-    Text [ en-US ] = "Scale" ;
-};
-String RID_ATTR_BRUSH
-{
-    Text [ en-US ] = "Brush" ;
-};
-String RID_ATTR_TABSTOP
-{
-    Text [ en-US ] = "Tab stops" ;
-};
-String RID_ATTR_TABSTOP_DEFAULTS
-{
-    Text = "?" ;
-};
-String RID_ATTR_TABSTOP_POS
-{
-    Text = "?" ;
-};
-String RID_ATTR_TABSTOP_OFFSET
-{
-    Text = "?" ;
-};
-String RID_ATTR_CHAR
-{
-    Text [ en-US ] = "Character" ;
-};
-String RID_ATTR_CHAR_FONT
-{
-    Text [ en-US ] = "Font" ;
-};
-String RID_ATTR_CHAR_POSTURE
-{
-    Text [ en-US ] = "Font posture" ;
-};
-String RID_ATTR_CHAR_WEIGHT
-{
-    Text [ en-US ] = "Font weight" ;
-};
-String RID_ATTR_CHAR_SHADOWED
-{
-    Text [ en-US ] = "Shadowed" ;
-};
-String RID_ATTR_CHAR_WORDLINEMODE
-{
-    Text [ en-US ] = "Individual words" ;
-};
-String RID_ATTR_CHAR_CONTOUR
-{
-    Text [ en-US ] = "Outline" ;
-};
-String RID_ATTR_CHAR_STRIKEOUT
-{
-    Text [ en-US ] = "Strikethrough" ;
-};
-String RID_ATTR_CHAR_UNDERLINE
-{
-    Text [ en-US ] = "Underline" ;
-};
-String RID_ATTR_CHAR_FONTHEIGHT
-{
-    Text [ en-US ] = "Font size" ;
-};
-String RID_ATTR_CHAR_PROPSIZE
-{
-    Text [ en-US ] = "Rel. Font Size" ;
-};
-String RID_ATTR_CHAR_COLOR
-{
-    Text [ en-US ] = "Font color" ;
-};
-String RID_ATTR_CHAR_KERNING
-{
-    Text [ en-US ] = "Kerning" ;
-};
-String RID_ATTR_CHAR_CASEMAP
-{
-    Text [ en-US ] = "Effects" ;
-};
-String RID_ATTR_CHAR_LANGUAGE
-{
-    Text [ en-US ] = "Language" ;
-};
-String RID_ATTR_CHAR_ESCAPEMENT
-{
-    Text [ en-US ] = "Position" ;
-};
-String RID_ATTR_CHAR_FONTLIST
-{
-    Text = "?" ;
-};
-String RID_ATTR_CHAR_BLINK
-{
-    Text [ en-US ] = "Blinking" ;
-};
-String RID_ATTR_CHAR_CHARSETCOLOR
-{
-    Text [ en-US ] = "Character set color";
-};
-String RID_ATTR_CHAR_OVERLINE
-{
-    Text [ en-US ] = "Overline" ;
-};
-String RID_ATTR_BORDER_INNER
-{
-    Text = "?" ;
-};
-String RID_ATTR_BORDER_OUTER
-{
-    Text = "?" ;
-};
-String RID_ATTR_BORDER_SHADOW
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA
-{
-    Text [ en-US ] = "Paragraph" ;
-};
-String RID_ATTR_PARA_ADJUST
-{
-    Text [ en-US ] = "Alignment" ;
-};
-String RID_ATTR_PARA_ADJUST_LEFT
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_ADJUST_RIGHT
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_ADJUST_CENTER
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_ADJUST_BLOCK
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_ADJUST_BLOCKLINE
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_LINESPACE
-{
-    Text [ en-US ] = "Line spacing" ;
-};
-String RID_ATTR_PARA_LINESPACE_10
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_LINESPACE_15
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_LINESPACE_20
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_PAGEBREAK
-{
-    Text [ en-US ] = "Page Break" ;
-};
-String RID_ATTR_PARA_HYPHENZONE
-{
-    Text [ en-US ] = "Hyphenation" ;
-};
-String RID_ATTR_PARA_SPLIT
-{
-    Text [ en-US ] = "Do not split paragraph" ;
-};
-String RID_ATTR_PARA_WIDOWS
-{
-    Text [ en-US ] = "Orphans" ;
-};
-String RID_ATTR_PARA_ORPHANS
-{
-    Text [ en-US ] = "Widows" ;
-};
-String RID_ATTR_PARA_ULSPACE
-{
-    Text [ en-US ] = "Spacing" ;
-};
-String RID_ATTR_PARA_LRSPACE
-{
-    Text [ en-US ] = "Indent" ;
-};
-String RID_ATTR_POSTIT_AUTHOR
-{
-    Text = "?" ;
-};
-String RID_ATTR_POSTIT_DATE
-{
-    Text = "?" ;
-};
-String RID_ATTR_POSTIT_TEXT
-{
-    Text = "?" ;
-};
-String RID_ATTR_SEARCH
-{
-    Text = "?" ;
-};
-String RID_ATTR_LRSPACE
-{
-    Text [ en-US ] = "Indent" ;
-};
-String RID_ATTR_ULSPACE
-{
-    Text [ en-US ] = "Spacing" ;
-};
-String RID_ATTR_PAGE
-{
-    Text [ en-US ] = "Page" ;
-};
-String RID_ATTR_PAGE_SIZE
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_MAXSIZE
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_PAPERTRAY
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_PAPERBIN
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_APP
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_EXT1
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_EXT2
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_HEADERSET
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_FOOTERSET
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_ON
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_DYNAMIC
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_SHARED
-{
-    Text = "?" ;
-};
-String RID_ATTR_PAGE_BSP
-{
-    Text = "?" ;
-};
-String RID_ATTR_CHAR_MAPTYPE
-{
-    Text = "?" ;
-};
-String RID_ATTR_PARA_MODEL
-{
-    Text [ en-US ] = "Page Style" ;
-};
-String RID_ATTR_PARA_KEEP
-{
-    Text [ en-US ] = "Keep with next paragraph" ;
-};
-String RID_ATTR_FLASH
-{
-    Text [ en-US ] = "Blinking" ;
-};
-String RID_ATTR_PARA_REGISTER
-{
-    Text [ en-US ] = "Register-true" ;
-};
-String RID_ATTR_BRUSH_CHAR
-{
-    Text [ en-US ] = "Character background";
-};
-String RID_ATTR_CHAR_CJK_FONT
-{
-    Text [ en-US ] = "Asian font" ;
-};
-String RID_ATTR_CHAR_CJK_FONTHEIGHT
-{
-    Text [ en-US ] = "Size of Asian font" ;
-};
-String RID_ATTR_CHAR_CJK_LANGUAGE
-{
-    Text [ en-US ] = "Language of Asian fonts" ;
-};
-String RID_ATTR_CHAR_CJK_POSTURE
-{
-    Text [ en-US ] = "Posture of Asian fonts" ;
-};
-String RID_ATTR_CHAR_CJK_WEIGHT
-{
-    Text [ en-US ] = "Weight of Asian fonts" ;
-};
-String RID_ATTR_CHAR_CTL_FONT
-{
-    Text [ en-US ] = "CTL" ;
-};
-String RID_ATTR_CHAR_CTL_FONTHEIGHT
-{
-    Text [ en-US ] = "Size of complex scripts" ;
-};
-String RID_ATTR_CHAR_CTL_LANGUAGE
-{
-    Text [ en-US ] = "Language of complex scripts" ;
-};
-String RID_ATTR_CHAR_CTL_POSTURE
-{
-    Text [ en-US ] = "Posture of complex scripts" ;
-};
-String RID_ATTR_CHAR_CTL_WEIGHT
-{
-    Text [ en-US ] = "Weight of complex scripts" ;
-};
-String RID_ATTR_CHAR_TWO_LINES
-{
-    Text [ en-US ] = "Double-lined" ;
-};
-String RID_ATTR_CHAR_EMPHASISMARK
-{
-    Text [ en-US ] = "Emphasis mark" ;
-};
-String RID_ATTR_PARA_SCRIPTSPACE
-{
-    Text [ en-US ] = "Text spacing";
-};
-String RID_ATTR_PARA_HANGPUNCTUATION
-{
-    Text [ en-US ] = "Hanging punctuation";
-};
-String RID_ATTR_PARA_FORBIDDEN_RULES
-{
-    Text [ en-US ] = "Forbidden characters";
-};
-String RID_ATTR_CHAR_ROTATED
-{
-    Text [ en-US ] = "Rotation" ;
-};
-String RID_ATTR_CHAR_SCALEWIDTH
-{
-    Text [ en-US ] = "Scale" ;
-};
-String RID_ATTR_CHAR_RELIEF
-{
-    Text [ en-US ] = "Relief";
-};
-String RID_PARA_VERTALIGN
-{
-    Text [ en-US ] = "Vertical text alignment";
-};
-String RID_SINGLE_LINE0
-{
-    Text [ en-US ] = "Single, fine lines" ;
-};
-String RID_SINGLE_LINE1
-{
-    Text [ en-US ] = "Single, thin" ;
-};
-String RID_SINGLE_LINE2
-{
-    Text [ en-US ] = "Single, thick" ;
-};
-String RID_SINGLE_LINE3
-{
-    Text [ en-US ] = "Single, very thick" ;
-};
-String RID_SINGLE_LINE4
-{
-    Text [ en-US ] = "Single, bold" ;
-};
-String RID_DOUBLE_LINE0
-{
-    Text [ en-US ] = "Double, fine lines, spacing: small" ;
-};
-String RID_DOUBLE_LINE1
-{
-    Text [ en-US ] = "Double, fine line, spacing: large" ;
-};
-String RID_DOUBLE_LINE2
-{
-    Text [ en-US ] = "Double, thin, spacing: small" ;
-};
-String RID_DOUBLE_LINE3
-{
-    Text [ en-US ] = "Double, thick, spacing: large" ;
-};
-String RID_DOUBLE_LINE4
-{
-    Text [ en-US ] = "Double, inside: fine lines, outside: thin, spacing: large" ;
-};
-String RID_DOUBLE_LINE5
-{
-    Text [ en-US ] = "Double, inside: fine lines, outside: thick, spacing: large" ;
-};
-String RID_DOUBLE_LINE6
-{
-    Text [ en-US ] = "Double, inside: fine lines, outside: very thick, spacing: large" ;
-};
-String RID_DOUBLE_LINE7
-{
-    Text [ en-US ] = "Double, inside: thin, outside: thick, spacing: large" ;
-};
-String RID_DOUBLE_LINE8
-{
-    Text [ en-US ] = "Double, inside: thick, outside: thin, spacing: small" ;
-};
-String RID_DOUBLE_LINE9
-{
-    Text [ en-US ] = "Double, inside: thick, outside: very thick, spacing: large" ;
-};
-String RID_DOUBLE_LINE10
-{
-    Text [ en-US ] = "Double, inside: very thick, outside: thick, Spacing: large" ;
-};
-String RID_SVXITEMS_METRIC_MM
-{
-    Text = "mm" ;
-};
-String RID_SVXITEMS_METRIC_CM
-{
-    Text = "cm" ;
-};
-String RID_SVXITEMS_METRIC_INCH
-{
-    Text = "inch" ;
-};
-String RID_SVXITEMS_METRIC_POINT
-{
-    Text = "pt" ;
-};
-String RID_SVXITEMS_METRIC_TWIP
-{
-    Text = "twip" ;
-};
-String RID_SVXITEMS_METRIC_PIXEL
-{
-    Text = "pixel" ;
-};
+ 
 String RID_SVXITEMS_HORJUST_STANDARD
 {
     Text [ en-US ] = "Horizontal alignment default" ;
@@ -1177,126 +273,6 @@ String RID_SVXITEMS_ORI_STACKED
     Text [ en-US ] = "Stacked" ;
 };
  // GetValueText von BoolItems
-String RID_SVXITEMS_SHADOWED_TRUE
-{
-    Text [ en-US ] = "Shadowed" ;
-};
-String RID_SVXITEMS_SHADOWED_FALSE
-{
-    Text [ en-US ] = "Not Shadowed" ;
-};
-String RID_SVXITEMS_BLINK_TRUE
-{
-    Text [ en-US ] = "Blinking" ;
-};
-String RID_SVXITEMS_BLINK_FALSE
-{
-    Text [ en-US ] = "Not Blinking" ;
-};
-String RID_SVXITEMS_AUTOKERN_TRUE
-{
-    Text [ en-US ] = "Pair Kerning" ;
-};
-String RID_SVXITEMS_AUTOKERN_FALSE
-{
-    Text [ en-US ] = "No pair kerning" ;
-};
-String RID_SVXITEMS_WORDLINE_TRUE
-{
-    Text [ en-US ] = "Individual words" ;
-};
-String RID_SVXITEMS_WORDLINE_FALSE
-{
-    Text [ en-US ] = "Not Words Only" ;
-};
-String RID_SVXITEMS_CONTOUR_TRUE
-{
-    Text [ en-US ] = "Outline" ;
-};
-String RID_SVXITEMS_CONTOUR_FALSE
-{
-    Text [ en-US ] = "No Outline" ;
-};
-String RID_SVXITEMS_NOLINEBREAK_TRUE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_NOLINEBREAK_FALSE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_NOHYPHEN_TRUE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_NOHYPHEN_FALSE
-{
-    Text = "?" ;
-};
-String RID_SVXITEMS_PRINT_TRUE
-{
-    Text [ en-US ] = "Print" ;
-};
-String RID_SVXITEMS_PRINT_FALSE
-{
-    Text [ en-US ] = "Don't print" ;
-};
-String RID_SVXITEMS_OPAQUE_TRUE
-{
-    Text [ en-US ] = "Opaque" ;
-};
-String RID_SVXITEMS_OPAQUE_FALSE
-{
-    Text [ en-US ] = "Not Opaque" ;
-};
-String RID_SVXITEMS_FMTKEEP_TRUE
-{
-    Text [ en-US ] = "Keep with next paragraph" ;
-};
-String RID_SVXITEMS_FMTKEEP_FALSE
-{
-    Text [ en-US ] = "Don't Keep Paragraphs Together" ;
-};
-String RID_SVXITEMS_FMTSPLIT_TRUE
-{
-    Text [ en-US ] = "Split paragraph" ;
-};
-String RID_SVXITEMS_FMTSPLIT_FALSE
-{
-    Text [ en-US ] = "Don't split paragraph" ;
-};
-String RID_SVXITEMS_PROT_CONTENT_TRUE
-{
-    Text [ en-US ] = "Contents protected" ;
-};
-String RID_SVXITEMS_PROT_CONTENT_FALSE
-{
-    Text [ en-US ] = "Contents not protected" ;
-};
-String RID_SVXITEMS_PROT_SIZE_TRUE
-{
-    Text [ en-US ] = "Size protected" ;
-};
-String RID_SVXITEMS_PROT_SIZE_FALSE
-{
-    Text [ en-US ] = "Size not protected" ;
-};
-String RID_SVXITEMS_PROT_POS_TRUE
-{
-    Text [ en-US ] = "Position protected" ;
-};
-String RID_SVXITEMS_PROT_POS_FALSE
-{
-    Text [ en-US ] = "Position not protected" ;
-};
-String RID_SVXITEMS_TRANSPARENT_TRUE
-{
-    Text [ en-US ] = "Transparent" ;
-};
-String RID_SVXITEMS_TRANSPARENT_FALSE
-{
-    Text [ en-US ] = "Not Transparent" ;
-};
 String RID_SVXITEMS_BOXINF_TABLE_TRUE
 {
     Text [ en-US ] = "Table" ;
@@ -1321,22 +297,6 @@ String RID_SVXITEMS_BOXINF_MDIST_FALSE
 {
     Text [ en-US ] = "Allowed to fall short of spacing interval" ;
 };
-String RID_SVXITEMS_HYPHEN_TRUE
-{
-    Text [ en-US ] = "Hyphenation" ;
-};
-String RID_SVXITEMS_HYPHEN_FALSE
-{
-    Text [ en-US ] = "No hyphenation" ;
-};
-String RID_SVXITEMS_PAGE_END_TRUE
-{
-    Text [ en-US ] = "Page End" ;
-};
-String RID_SVXITEMS_PAGE_END_FALSE
-{
-    Text [ en-US ] = "No Page End" ;
-};
 String RID_SVXITEMS_MARGIN_LEFT
 {
     Text [ en-US ] = "Left margin: " ;
@@ -1353,66 +313,6 @@ String RID_SVXITEMS_MARGIN_BOTTOM
 {
     Text [ en-US ] = "Bottom margin: " ;
 };
-String RID_SVXITEMS_SIZE_WIDTH
-{
-    Text [ en-US ] = "Width: " ;
-};
-String RID_SVXITEMS_SIZE_HEIGHT
-{
-    Text [ en-US ] = "Height: " ;
-};
-String RID_SVXITEMS_LRSPACE_LEFT
-{
-    Text [ en-US ] = "Indent left " ;
-};
-String RID_SVXITEMS_LRSPACE_FLINE
-{
-    Text [ en-US ] = "First Line " ;
-};
-String RID_SVXITEMS_LRSPACE_RIGHT
-{
-    Text [ en-US ] = "Indent right " ;
-};
-String RID_SVXITEMS_SHADOW_COMPLETE
-{
-    Text [ en-US ] = "Shadow: " ;
-};
-String RID_SVXITEMS_BORDER_COMPLETE
-{
-    Text [ en-US ] = "Borders " ;
-};
-String RID_SVXITEMS_BORDER_NONE
-{
-    Text [ en-US ] = "No border";
-};
-String RID_SVXITEMS_BORDER_TOP
-{
-    Text [ en-US ] = "top " ;
-};
-String RID_SVXITEMS_BORDER_BOTTOM
-{
-    Text [ en-US ] = "bottom " ;
-};
-String RID_SVXITEMS_BORDER_LEFT
-{
-    Text [ en-US ] = "left " ;
-};
-String RID_SVXITEMS_BORDER_RIGHT
-{
-    Text [ en-US ] = "right " ;
-};
-String RID_SVXITEMS_BORDER_DISTANCE
-{
-    Text [ en-US ] = "Spacing " ;
-};
-String RID_SVXITEMS_ULSPACE_UPPER
-{
-    Text [ en-US ] = "From top " ;
-};
-String RID_SVXITEMS_ULSPACE_LOWER
-{
-    Text [ en-US ] = "From bottom " ;
-};
 String RID_SVXITEMS_PAGE_COMPLETE
 {
     Text [ en-US ] = "Page Description: " ;
@@ -1465,47 +365,6 @@ String RID_SVXITEMS_PAGE_USAGE_MIRROR
 {
     Text [ en-US ] = "Mirrored" ;
 };
-String RID_SVXITEMS_LINES
-{
-    Text [ en-US ] = "%1 Lines" ;
-    Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines";
-};
-String RID_SVXITEMS_WIDOWS_COMPLETE
-{
-    Text [ en-US ] = "Widow control" ;
-};
-String RID_SVXITEMS_ORPHANS_COMPLETE
-{
-    Text [ en-US ] = "Orphan control" ;
-};
-String RID_SVXITEMS_HYPHEN_MINLEAD
-{
-    Text [ en-US ] = "Characters at end of line" ;
-};
-String RID_SVXITEMS_HYPHEN_MINTRAIL
-{
-    Text [ en-US ] = "Characters at beginning of line" ;
-};
-String RID_SVXITEMS_HYPHEN_MAX
-{
-    Text [ en-US ] = "Hyphens" ;
-};
-String RID_SVXITEMS_PAGEMODEL_COMPLETE
-{
-    Text [ en-US ] = "Page Style: " ;
-};
-String RID_SVXITEMS_KERNING_COMPLETE
-{
-    Text [ en-US ] = "Kerning " ;
-};
-String RID_SVXITEMS_KERNING_EXPANDED
-{
-    Text [ en-US ] = "locked " ;
-};
-String RID_SVXITEMS_KERNING_CONDENSED
-{
-    Text [ en-US ] = "Condensed " ;
-};
 String RID_SVXITEMS_AUTHOR_COMPLETE
 {
     Text [ en-US ] = "Author: " ;
@@ -1526,176 +385,9 @@ String RID_SVXITEMS_PATTERN_COLOR
 {
     Text [ en-US ] = "Pattern color: " ;
 };
-String RID_SVXITEMS_GRAPHIC
-{
-    Text [ en-US ] = "Graphic" ;
-};
-
 String RID_SVXITEMS_BRUSH_CHAR
 {
     Text [ en-US ] = "Character background";
 };
-
-
-String RID_SVXITEMS_EMPHASIS_NONE_STYLE
-{
-    Text [ en-US ] = "none";
-};
-String RID_SVXITEMS_EMPHASIS_DOT_STYLE
-{
-    Text [ en-US ] = "Dots ";
-};
-String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
-{
-    Text [ en-US ] = "Circle ";
-};
-String RID_SVXITEMS_EMPHASIS_DISC_STYLE
-{
-// ??? disc == filled ring
-    Text [ en-US ] = "Filled circle ";
-};
-String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
-{
-    Text [ en-US ] = "Accent ";
-};
-
-String RID_SVXITEMS_EMPHASIS_ABOVE_POS
-{
-    Text [ en-US ] = "Above";
-};
-String RID_SVXITEMS_EMPHASIS_BELOW_POS
-{
-    Text [ en-US ] = "Below";
-};
-
-String RID_SVXITEMS_TWOLINES_OFF
-{
-    Text [ en-US ] = "Double-lined off";
-};
-String RID_SVXITEMS_TWOLINES
-{
-    Text [ en-US ] = "Double-lined";
-};
-
-String RID_SVXITEMS_SCRPTSPC_OFF
-{
-    Text [ en-US ] = "No automatic character spacing";
-};
-String RID_SVXITEMS_SCRPTSPC_ON
-{
-    Text [ en-US ] = "No automatic character spacing";
-};
-
-String RID_SVXITEMS_HNGPNCT_OFF
-{
-    Text [ en-US ] = "No hanging punctuation at line end";
-};
-String RID_SVXITEMS_HNGPNCT_ON
-{
-    Text [ en-US ] = "Hanging punctuation at line end";
-};
-String RID_SVXITEMS_FORBIDDEN_RULE_OFF
-{
-    Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines";
-};
-
-String RID_SVXITEMS_FORBIDDEN_RULE_ON
-{
-    Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines";
-};
-
-
-String RID_SVXITEMS_CHARROTATE_OFF
-{
-    Text [ en-US ] = "No rotated characters";
-};
-String RID_SVXITEMS_CHARROTATE
-{
-    Text [ en-US ] = "Character rotated by $(ARG1)°";
-};
-String RID_SVXITEMS_CHARROTATE_FITLINE
-{
-    Text [ en-US ] = "Fit to line";
-};
-String RID_SVXITEMS_CHARSCALE
-{
-    Text [ en-US ] = "Characters scaled $(ARG1)%";
-};
-String RID_SVXITEMS_CHARSCALE_OFF
-{
-    Text [ en-US ] = "No scaled characters";
-};
-
-String RID_SVXITEMS_RELIEF_NONE
-{
-    Text [ en-US ] = "No relief";
-};
-String RID_SVXITEMS_RELIEF_EMBOSSED
-{
-    Text [ en-US ] = "Relief";
-};
-String RID_SVXITEMS_RELIEF_ENGRAVED
-{
-    Text [ en-US ] = "Engraved";
-};
-String RID_SVXITEMS_PARAVERTALIGN_AUTO
-{
-    Text [ en-US ] = "Automatic text alignment";
-};
-String RID_SVXITEMS_PARAVERTALIGN_BASELINE
-{
-    Text [ en-US ] = "Text aligned to base line";
-};
-String RID_SVXITEMS_PARAVERTALIGN_TOP
-{
-    Text [ en-US ] = "Text aligned top";
-};
-String RID_SVXITEMS_PARAVERTALIGN_CENTER
-{
-    Text [ en-US ] = "Text aligned middle";
-};
-String RID_SVXITEMS_PARAVERTALIGN_BOTTOM
-{
-    Text [ en-US ] = "Text aligned bottom";
-};
-
-String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP
-{
-    Text [ en-US ] = "Text direction left-to-right (horizontal)";
-};
-String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP
-{
-    Text [ en-US ] = "Text direction right-to-left (horizontal)";
-};
-String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT
-{
-    Text [ en-US ] = "Text direction right-to-left (vertical)";
-};
-String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT
-{
-    Text [ en-US ] = "Text direction left-to-right (vertical)";
-};
-String RID_SVXITEMS_FRMDIR_ENVIRONMENT
-{
-    Text [ en-US ] = "Use superordinate object text direction setting";
-};
-
-String RID_SVXITEMS_PARASNAPTOGRID_ON
-{
-    Text[ en-US ] = "Paragraph snaps to text grid (if active)";
-};
-
-String RID_SVXITEMS_PARASNAPTOGRID_OFF
-{
-    Text[ en-US ] = "Paragraph does not snap to text grid";
-};
-String RID_SVXITEMS_CHARHIDDEN_FALSE
-{
-    Text [ en-US ] = "Not hidden";
-};
-String RID_SVXITEMS_CHARHIDDEN_TRUE
-{
-    Text [ en-US ] = "Hidden";
-};
  // ********************************************************************** EOF
 
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index e1e92d05ff..df95820581 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewlayoutitem.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx
index ab13d3c09f..309ffd91de 100644
--- a/svx/source/items/zoomitem.cxx
+++ b/svx/source/items/zoomitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomitem.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/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index a4ed25e942..73ed5a76ca 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomslideritem.cxx,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/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 221bd147fc..0ce2059cde 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SmartTagCtl.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/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 0e93d05e90..a2b472fbbf 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: clipboardctl.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/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 0ab16726aa..c155d6868c 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fntctl.cxx,v $
- * $Revision: 1.8.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,8 +36,8 @@
 
 #include <svx/fntctl.hxx>       //
 #include <svx/svxids.hrc>
-#include "flstitem.hxx"
-#include "fontitem.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/fontitem.hxx"
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index c279e75633..29846dc5be 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fntszctl.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,9 +39,9 @@
 
 #include <svx/fntszctl.hxx>     //
 #include <svx/dialogs.hrc>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include "flstitem.hxx"
+#include <editeng/fhgtitem.hxx>
+#include "editeng/fontitem.hxx"
+#include "editeng/flstitem.hxx"
 
 #include "dlgutil.hxx"
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk
index 0a9668977c..9c208d9a78 100644
--- a/svx/source/mnuctrls/makefile.mk
+++ b/svx/source/mnuctrls/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/mnuctrls/mnuctrls.src b/svx/source/mnuctrls/mnuctrls.src
index 163e6a1643..8b27fa22f7 100644
--- a/svx/source/mnuctrls/mnuctrls.src
+++ b/svx/source/mnuctrls/mnuctrls.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: mnuctrls.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/svx/source/options/asiancfg.cxx b/svx/source/options/asiancfg.cxx
deleted file mode 100644
index 8f38b47739..0000000000
--- a/svx/source/options/asiancfg.cxx
+++ /dev/null
@@ -1,293 +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: asiancfg.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_svx.hxx"
-#include <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/svx/source/options/htmlcfg.cxx b/svx/source/options/htmlcfg.cxx
deleted file mode 100644
index 68eddf861c..0000000000
--- a/svx/source/options/htmlcfg.cxx
+++ /dev/null
@@ -1,497 +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: htmlcfg.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_svx.hxx"
-
-#include "htmlcfg.hxx"
-#include <svtools/parhtml.hxx>
-#include <sfx2/bindings.hxx>
-
-#include <sfx2/viewfrm.hxx>
-
-#include <svx/svxids.hrc>
-#include "txencbox.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;
-
-#define C2U(cChar) OUString::createFromAscii(cChar)
-/* -----------------------------23.11.00 11:39--------------------------------
-
- ---------------------------------------------------------------------------*/
-struct HtmlOptions_Impl
-{
-    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;
-    const Sequence<OUString>& aNames = GetPropertyNames();
-    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"
-                }
-            }
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-SvxHtmlOptions::~SvxHtmlOptions()
-{
-    delete pImp;
-}
-// -----------------------------------------------------------------------
-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::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
-{
-}
-
-// -----------------------------------------------------------------------
-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();
-        // Invalidierung, falls blinkender Text erlaubt/verboten wurde
-        SfxViewFrame* pViewFrame = SfxViewFrame::Current();
-        if(pViewFrame)
-            pViewFrame->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-
-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 = SvxTextEncodingBox::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/svx/source/options/srchcfg.cxx b/svx/source/options/srchcfg.cxx
deleted file mode 100644
index f6d3ebd769..0000000000
--- a/svx/source/options/srchcfg.cxx
+++ /dev/null
@@ -1,292 +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: srchcfg.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_svx.hxx"
-
-#ifndef _SVX_SRCHNCFG_HXX
-#include <srchcfg.hxx>
-#endif
-#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/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 9ca93a6854..f02e103175 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationstate.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/svx/source/sdr/animation/makefile.mk b/svx/source/sdr/animation/makefile.mk
index 85c9beef4b..a6750647f5 100644
--- a/svx/source/sdr/animation/makefile.mk
+++ b/svx/source/sdr/animation/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx
index 79334d29a3..d7d0cfeedc 100644
--- a/svx/source/sdr/animation/objectanimator.cxx
+++ b/svx/source/sdr/animation/objectanimator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectanimator.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/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 26416d5ff3..fa2d4c01d6 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scheduler.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk
index 44e161a3b5..5ca44ee5c2 100644
--- a/svx/source/sdr/attribute/makefile.mk
+++ b/svx/source/sdr/attribute/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/attribute/sdrallattribute.cxx b/svx/source/sdr/attribute/sdrallattribute.cxx
index 1150f5a684..605c023c50 100644
--- a/svx/source/sdr/attribute/sdrallattribute.cxx
+++ b/svx/source/sdr/attribute/sdrallattribute.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: sdrallattribute.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 619c08ade9..d475bd3f60 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.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: sdrtextattribute.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
index 0a96ad2f6f..cfa1cf49d6 100644
--- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.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: sdrtextattribute.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 244946e393..b322d82346 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.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: sdrtextattribute.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,9 +30,9 @@
 #include <svx/sdr/attribute/sdrtextattribute.hxx>
 #include <svx/sdr/attribute/sdrformtextattribute.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/sdr/properties/properties.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx
index a0cb38b5ed..eccddc5b97 100644
--- a/svx/source/sdr/contact/displayinfo.cxx
+++ b/svx/source/sdr/contact/displayinfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: displayinfo.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/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk
index fcc79db635..9e4356c4aa 100644
--- a/svx/source/sdr/contact/makefile.mk
+++ b/svx/source/sdr/contact/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 435c08fba5..024538b11a 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectcontact.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/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 4b0ffda2d6..e53d767512 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectcontactofobjlistpainter.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/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 898e76a0cc..9ead400f33 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: objectcontactofpageview.cxx,v $
- * $Revision: 1.20.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/objectcontacttools.cxx b/svx/source/sdr/contact/objectcontacttools.cxx
index 42f186fbc2..bdecc06400 100644
--- a/svx/source/sdr/contact/objectcontacttools.cxx
+++ b/svx/source/sdr/contact/objectcontacttools.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: objectcontacttools.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index ff3320f74e..dedae0fc0c 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrmediawindow.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/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index 9bd510b7af..e7b1249858 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrmediawindow.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index f3c6ea732a..35e7412401 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontact.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/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx
index 948bab1b2f..03643420e4 100644
--- a/svx/source/sdr/contact/viewcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3d.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: viewcontactofe3d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index 8bde7b3c45..c4e08c50b9 100644
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.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: viewcontactofe3dcube.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index 954b54396a..85f05dea45 100644
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.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: viewcontactofe3dextrude.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index 5ef516f9a0..dbe9460bbf 100644
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.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: viewcontactofe3dlathe.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index e61c73c2d8..6d39d8eae9 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.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: viewcontactofe3dpolygon.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,8 +71,8 @@ namespace sdr
             basegfx::B3DPolyPolygon aPolyPolygon3D(GetE3dPolygonObj().GetPolyPolygon3D());
             const basegfx::B3DPolyPolygon aPolyNormals3D(GetE3dPolygonObj().GetPolyNormals3D());
             const basegfx::B2DPolyPolygon aPolyTexture2D(GetE3dPolygonObj().GetPolyTexture2D());
-            const bool bNormals(aPolyNormals3D.count() && aPolyNormals3D.count() == aPolyPolygon3D.count());

-            const bool bTexture(aPolyTexture2D.count() && aPolyTexture2D.count() == aPolyPolygon3D.count());

+            const bool bNormals(aPolyNormals3D.count() && aPolyNormals3D.count() == aPolyPolygon3D.count());
+            const bool bTexture(aPolyTexture2D.count() && aPolyTexture2D.count() == aPolyPolygon3D.count());
 
             if(bNormals || bTexture)
             {
diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
index cf5768910f..7658ef7dde 100644
--- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofe3dscene.cxx,v $
- * $Revision: 1.10.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index 8dad4c0d93..4e30ae592c 100644
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.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: viewcontactofe3dsphere.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index b2340f94e1..62aa3c6840 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofgraphic.cxx,v $
- * $Revision: 1.14.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,8 +56,8 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/colritem.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx
index 5c5e6edc48..72683559e1 100644
--- a/svx/source/sdr/contact/viewcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewcontactofgroup.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofgroup.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index 0b7d9d7572..3b8dc097a2 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofmasterpagedescriptor.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/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx
index 58bd3a8b96..0bca7de140 100644
--- a/svx/source/sdr/contact/viewcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofpageobj.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/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 6dcd211856..85dd101da9 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.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: viewcontactofsdrcaptionobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index eaaacd849c..12db5086bd 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.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: viewcontactofsdrcircobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
index 54da961623..6f131479c3 100644
--- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.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: viewcontactofsdredgeobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index 9012768fcb..aea0144d47 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.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: viewcontactofsdrmeasureobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index b9cf4e0a9b..af9686e9d6 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrmediaobj.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/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index c96ca346dd..002717b0a3 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrobj.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 8e428a6c29..9c0d1f5fc8 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrobjcustomshape.cxx,v $
- * $Revision: 1.7.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 0038b7ea85..ddbae27a9e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.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: viewcontactofsdrole2obj.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index c150681efb..fdfcd53d05 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofsdrpage.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 4b92c70587..21cbb4ef94 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.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: viewcontactofsdrpathobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index 8ac99245a1..9b9b3a838e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.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: viewcontactofsdrrectobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx
index f61e858061..39f32d4b4f 100644
--- a/svx/source/sdr/contact/viewcontactoftextobj.cxx
+++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactoftextobj.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/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 1de8ffd792..16756cd8a8 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofunocontrol.cxx,v $
- * $Revision: 1.12.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
index ce6a755af7..5269faedfd 100644
--- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactofvirtobj.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/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 638375ac65..0e1a5bd149 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontact.cxx,v $
- * $Revision: 1.17.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
index c59072c31d..2109789ade 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3d.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: viewobjectcontactofe3d.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
index 21f7a9d3e2..3e13d81f95 100644
--- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.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: viewobjectcontactofe3dscene.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 276da4a240..57312df26a 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.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: viewobjectcontactofgraphic.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
index 9f58fe5f9e..f5f522608a 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgroup.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: viewobjectcontactofgroup.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
index 567708e5da..8744fd14a8 100644
--- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.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: viewobjectcontactofmasterpagedescriptor.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index fefe1fa720..b406620e08 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.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: viewobjectcontactofpageobj.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index e9d5188b9f..bd6205e1f9 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontactofsdrmediaobj.cxx,v $
- * $Revision: 1.16.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index fbffa0b23a..16f5ba7bbf 100755..100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.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: viewobjectcontactofsdrobj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 9c9aaa959c..645a980a1c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.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: viewobjectcontactofsdrole2obj.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,8 +38,8 @@
 #include <drawinglayer/attribute/fillattribute.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <com/sun/star/embed/EmbedMisc.hpp>

-#include <com/sun/star/embed/EmbedStates.hpp>

+#include <com/sun/star/embed/EmbedMisc.hpp>
+#include <com/sun/star/embed/EmbedStates.hpp>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 02e9800bd8..803f9ef9b2 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.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: viewobjectcontactofsdrpage.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 80121e5a8f..3b53a9c543 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontactofunocontrol.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
index 83bf85afd7..d83ed1245a 100644
--- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewobjectcontactredirector.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/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 374e48ec97..d522043abd 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventhandler.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/svx/source/sdr/event/makefile.mk b/svx/source/sdr/event/makefile.mk
index 48ab1c2a52..ff379af6be 100644
--- a/svx/source/sdr/event/makefile.mk
+++ b/svx/source/sdr/event/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk
index d202992c09..155053826f 100644
--- a/svx/source/sdr/overlay/makefile.mk
+++ b/svx/source/sdr/overlay/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index 7ea78b6d4c..e404b2e7b7 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayanimatedbitmapex.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/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index bf3a020398..ad35d659ee 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaybitmapex.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/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx
index 9204c0e87b..6a9eec0170 100644
--- a/svx/source/sdr/overlay/overlaycrosshair.cxx
+++ b/svx/source/sdr/overlay/overlaycrosshair.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaycrosshair.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/svx/source/sdr/overlay/overlayhatchrect.cxx b/svx/source/sdr/overlay/overlayhatchrect.cxx
index 284aa204af..7eb431cb37 100644
--- a/svx/source/sdr/overlay/overlayhatchrect.cxx
+++ b/svx/source/sdr/overlay/overlayhatchrect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaybitmap.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/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx
index eaff70a6f0..2a675d7922 100644
--- a/svx/source/sdr/overlay/overlayhelpline.cxx
+++ b/svx/source/sdr/overlay/overlayhelpline.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayhelpline.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/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index 5a2a5f2248..ae2bf3b801 100644
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayline.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/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 64ac530e55..4fe38f4c85 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaymanager.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index c016d8e557..e265eb66a6 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaymanagerbuffered.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 83947826ff..dc6a29dddf 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobject.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/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx
index cda1bbd636..2a908256f7 100644
--- a/svx/source/sdr/overlay/overlayobjectcell.cxx
+++ b/svx/source/sdr/overlay/overlayobjectcell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobjectcell.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 1ca102e36e..22764b50d0 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobjectlist.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/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index 6827cd64cf..311b136636 100644
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaypolypolygon.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/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index d89a457a87..1157aa61ea 100644
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaysdrobject.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/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index e2e079a37f..443607a495 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayrollingrectangle.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/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx
index 24c73e045b..4b5a952548 100644
--- a/svx/source/sdr/overlay/overlayselection.cxx
+++ b/svx/source/sdr/overlay/overlayselection.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayline.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/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx
index 81bf8b8f9c..eb2e2bd536 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlayobject.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/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx
index f22c737166..344fe45526 100644
--- a/svx/source/sdr/overlay/overlaytriangle.cxx
+++ b/svx/source/sdr/overlay/overlaytriangle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: overlaytriangle.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/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk
index 7510b6a23b..078bc4bc97 100644
--- a/svx/source/sdr/primitive2d/makefile.mk
+++ b/svx/source/sdr/primitive2d/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 379195a8c9..e1eeb9aac4 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.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: primitivefactory2d.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index ee43fb9dc9..c0f9fd57d9 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.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: sdrattributecreator.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index cc71488fb6..f7c32f5040 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.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: sdrcaptionprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index f08fd75ab0..e4e0c68d6d 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.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: sdrconnectorprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 61b60abc52..4359d8b7fe 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.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: sdrcustomshapeprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 67fb97e6b7..bc8d928f7b 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.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: sdrdecompositiontools.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index 016ff9fa8f..0ad7c86810 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.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: sdrellipseprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 70b973e521..9ef9aba423 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.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: sdrgrafprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 7f59e8be96..5ed2734071 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.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: sdrmeasureprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 5a7d327cd9..e4c13a51f6 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.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: sdrole2primitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index cb871d0949..a77f0b0380 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.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: sdrcaptionprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index e19bc75fd6..e117e97f0d 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.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: sdrpathprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 0ae9483787..6361e15a49 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.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: primitivefactory2d.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 1e963e3244..575bfe004f 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.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: sdrrectangleprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index ef716c25d3..622e30ba54 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.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: sdrtextprimitive2d.cxx,v $
- *
- * $Revision: 1.2.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,9 +31,9 @@
 #include <basegfx/color/bcolor.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
 #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/flditem.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <unoapi.hxx>
 #include <svx/svdpage.hxx>
@@ -121,13 +117,13 @@ namespace drawinglayer
             mbContainsOtherFields(false)
         {
             const EditTextObject& rETO = maOutlinerParaObject.GetTextObject();
-            

-            mbContainsPageField = rETO.HasField(SvxPageField::StaticType());

-            mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticType());

-            mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticType())

-                || rETO.HasField(SvxFooterField::StaticType())

-                || rETO.HasField(SvxDateTimeField::StaticType())

-                || rETO.HasField(SvxAuthorField::StaticType());

+            
+            mbContainsPageField = rETO.HasField(SvxPageField::StaticType());
+            mbContainsPageCountField = rETO.HasField(SvxPagesField::StaticType());
+            mbContainsOtherFields = rETO.HasField(SvxHeaderField::StaticType())
+                || rETO.HasField(SvxFooterField::StaticType())
+                || rETO.HasField(SvxDateTimeField::StaticType())
+                || rETO.HasField(SvxAuthorField::StaticType());
         }
 
         bool SdrTextPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/source/sdr/primitive3d/makefile.mk
index 3cc084def4..c845cadc90 100644
--- a/svx/source/sdr/primitive3d/makefile.mk
+++ b/svx/source/sdr/primitive3d/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
index aaa885fb2a..b20c08e319 100644
--- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx
+++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.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: sdrattributecreator3d.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index e3ce0ada1d..e53117a4b4 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attributeproperties.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/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 2e7cf36079..58d1c26e21 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: captionproperties.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svx/svddef.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdocapt.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 78f1a865ee..fe1e0668df 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: circleproperties.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svx/svddef.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/sxcikitm.hxx>
 #include <svx/sxciaitm.hxx>
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index 7ed8a62e33..2433224cbb 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: connectorproperties.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svx/svddef.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdoedge.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 5d55b764a8..6592977bc5 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: customshapeproperties.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/sdtagitm.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index bd1f683c5e..ae91180a71 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: defaultproperties.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index cf64c99da8..883fcf4675 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dcompoundproperties.cxx,v $
- * $Revision: 1.9.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx
index a6c9147c4f..c2a07c37b8 100644
--- a/svx/source/sdr/properties/e3dextrudeproperties.cxx
+++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dextrudeproperties.cxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx
index 4fd21ddc24..60598b41f2 100644
--- a/svx/source/sdr/properties/e3dlatheproperties.cxx
+++ b/svx/source/sdr/properties/e3dlatheproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dlatheproperties.cxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index a31bfe8697..beddca4d27 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dproperties.cxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 713e62811a..02ca9ef4be 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dsceneproperties.cxx,v $
- * $Revision: 1.11.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx
index a706a24af9..61a987c0f4 100644
--- a/svx/source/sdr/properties/e3dsphereproperties.cxx
+++ b/svx/source/sdr/properties/e3dsphereproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: e3dsphereproperties.cxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 5cd05f714e..fda8d248fd 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: emptyproperties.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 2a180810e0..92682bc89a 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: graphicproperties.cxx,v $
- * $Revision: 1.12.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svx/svddef.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/sdgcpitm.hxx>
 
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index e5d01d2c6c..d9c8af02d7 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: groupproperties.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svddef.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index a721e7fb65..99a41164e2 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemsettools.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/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk
index 04e96dd6c2..2ab52e18ae 100644
--- a/svx/source/sdr/properties/makefile.mk
+++ b/svx/source/sdr/properties/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index 681bfa8728..e25ca83fef 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: measureproperties.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svx/svddef.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdomeas.hxx>
 #include <svx/sxmsuitm.hxx>
 #include <svx/xlnstit.hxx>
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index c60c2008d9..3e5fd0886a 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pageproperties.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index b1e45843ed..496978904b 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: properties.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index bf8d25bbd9..6069a0116c 100644
--- a/svx/source/sdr/properties/rectangleproperties.cxx
+++ b/svx/source/sdr/properties/rectangleproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rectangleproperties.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/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index f545b24fc2..0af0cadc47 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: textproperties.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,14 +35,14 @@
 #include <svx/svddef.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/xflclit.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/editeng.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/svdpool.hxx>
 
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 43b3dd207e..737f4e6986 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SmartTagMgr.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/svx/source/smarttags/makefile.mk b/svx/source/smarttags/makefile.mk
index 9b07d977dd..e92a4c0a6b 100644
--- a/svx/source/smarttags/makefile.mk
+++ b/svx/source/smarttags/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 60b5197257..1cdc416c74 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -138,7 +135,6 @@
 #define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
 #define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
 #define RID_OFADLG_AWCP_VALUES			(RID_OFA_START + 117)
-#define RID_OFADLG_OPTIONS_TREE_HINT	(RID_OFA_START + 118)
 #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
 #define RID_OFAPAGE_MSFILTEROPT			(RID_OFA_START + 120)
 #define RID_OFAPAGE_MSFILTEROPT2		(RID_OFA_START + 121)
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 6c1a3c1fdb..f0a7891465 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: app.src,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/src/hidgen.hrc b/svx/source/src/hidgen.hrc
index dd924cbd13..afed9a7878 100644
--- a/svx/source/src/hidgen.hrc
+++ b/svx/source/src/hidgen.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: hidgen.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/svx/source/src/makefile.mk b/svx/source/src/makefile.mk
index b1ce276958..fb96866ca0 100644
--- a/svx/source/src/makefile.mk
+++ b/svx/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 9f4fe8b45f..5b74b49cce 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: insctrl.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk
index 7a6fad6e2a..4e125adcd9 100644
--- a/svx/source/stbctrls/makefile.mk
+++ b/svx/source/stbctrls/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 92035ffcb7..9b4fbd3640 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: modctrl.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 3292783154..9db5f4bf71 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pszctrl.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,12 +32,8 @@
 
 #include <limits.h>
 #include <tools/shl.hxx>
-#ifndef _STATUS_HXX //autogen
 #include <vcl/status.hxx>
-#endif
-#ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
-#endif
 #include <vcl/image.hxx>
 #include <svl/stritem.hxx>
 #include <svl/ptitem.hxx>
@@ -49,17 +42,18 @@
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
-
+#include <svl/intitem.hxx>
 #define _SVX_PSZCTRL_CXX
 
 #include "pszctrl.hxx"
 
 #define PAINT_OFFSET	5
 
-#include <svx/sizeitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/dialmgr.hxx>
 #include "dlgutil.hxx"
 #include "stbctrls.h"
+#include "sfx2/module.hxx"
 
 #include <svx/dialogs.hrc>
 #include <unotools/localedatawrapper.hxx>
@@ -81,10 +75,10 @@
     <SvxPosSizeStatusBarControl::Paint(const UserDrawEvent&)>
 */
 
-String GetMetricStr_Impl( long nVal )
+String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
 {
     // Applikations-Metrik besorgen und setzen
-    FieldUnit eOutUnit = GetModuleFieldUnit( NULL );
+    FieldUnit eOutUnit = SfxModule::GetCurrentFieldUnit();
     FieldUnit eInUnit = FUNIT_100TH_MM;
 
     String sMetric;
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index c25dfbf14f..f210948406 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selctrl.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 59eea7747f..59be68f2fd 100644
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stbctrls.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/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 70ac1d96b8..7520e4f637 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.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: stbctrls.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/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 56de9a8e3a..43226a06e7 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlsecctrl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,7 +58,7 @@
 
 #define PAINT_OFFSET	5
 
-//#include <svx/sizeitem.hxx>
+//#include <editeng/sizeitem.hxx>
 //#include <svx/dialmgr.hxx>
 //#include "dlgutil.hxx"
 //#include "stbctrls.h"
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 4c4f4d3b52..af990f68fe 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomctrl.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 9807144d78..c6502b8bc3 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: zoomsliderctrl.cxx,v $
- * $Revision: 1.3.138.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index 0e92b9dd0f..d5c1745de7 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ActionDescriptionProvider.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index f7eac6db04..042a116da7 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: clonelist.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/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx
index 3f093513ab..23f61b7028 100644
--- a/svx/source/svdraw/gradtrns.cxx
+++ b/svx/source/svdraw/gradtrns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gradtrns.cxx,v $
- * $Revision: 1.7.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx
index d8078f8766..7a29933c0b 100644
--- a/svx/source/svdraw/gradtrns.hxx
+++ b/svx/source/svdraw/gradtrns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gradtrns.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/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
index d0aeb60b77..a49abc21ae 100644
--- a/svx/source/svdraw/impgrfll.cxx
+++ b/svx/source/svdraw/impgrfll.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impgrfll.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk
index 6e158341ae..0108615b10 100644
--- a/svx/source/svdraw/makefile.mk
+++ b/svx/source/svdraw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index 74053345ff..39a5e0ad03 100644
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: polypolygoneditor.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/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx
index 009f0fe683..fb2f1e1922 100644
--- a/svx/source/svdraw/sdrcomment.cxx
+++ b/svx/source/svdraw/sdrcomment.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrcomment.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/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx
index 008ae7734e..136101fb48 100644
--- a/svx/source/svdraw/sdrhittesthelper.cxx
+++ b/svx/source/svdraw/sdrhittesthelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdetc.cxx,v $
- * $Revision: 1.35.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index befbc27f98..0d01693740 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrmasterpagedescriptor.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index d1e2f13403..1be2bb61e3 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrpagewindow.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 276a7d4f8d..1b83413c7c 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdrpaintwindow.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx
index 7e0014f1e0..29b4772803 100644
--- a/svx/source/svdraw/selectioncontroller.cxx
+++ b/svx/source/svdraw/selectioncontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: selectioncontroller.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 37366c4f36..5d30191e21 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdattr.cxx,v $
- * $Revision: 1.34.212.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 #include <svx/svdpool.hxx>
 
 #include <svl/solar.hrc>
-#include "xmlcnitm.hxx"
+#include "editeng/xmlcnitm.hxx"
 
 #include <svx/svxids.hrc>
 #include <svx/xtable.hxx>    // fuer RGB_Color()
@@ -63,9 +60,9 @@
 #include "svdglob.hxx"  // Stringcache
 #include "svdstr.hrc"
 #include <svx/sdgcpitm.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/sdtfchim.hxx>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <tools/bigint.hxx>
 #include <tools/stream.hxx>
 
@@ -76,13 +73,13 @@
 
 #define ITEMID_BOX SDRATTR_TABLE_BORDER
 #define ITEMID_BOXINFO SDRATTR_TABLE_BORDER_INNER
-#include "svx/boxitem.hxx"
+#include "editeng/boxitem.hxx"
 
 #define ITEMID_SHADOW SDRATTR_TABLE_BORDER_SHADOW
-#include "svx/shaditem.hxx"
+#include "editeng/shaditem.hxx"
 
 #define ITEMID_LINE 0
-#include "bolnitem.hxx"
+#include "editeng/bolnitem.hxx"
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdcrtmt.hxx b/svx/source/svdraw/svdcrtmt.hxx
index a8668cda22..2b99c4a550 100644
--- a/svx/source/svdraw/svdcrtmt.hxx
+++ b/svx/source/svdraw/svdcrtmt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdcrtmt.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index ca93a202fe..2ef55c7046 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdcrtv.cxx,v $
- * $Revision: 1.29.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index f29a610b39..b915019dcf 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrag.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/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index d8085dc9df..2fb7d82dfb 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrgm1.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/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 074045d4ef..083c819489 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrgmt.cxx,v $
- * $Revision: 1.21.6.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 7c653e828e..91c2da7dd8 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svddrgv.cxx,v $
- * $Revision: 1.27.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index ec5d5ba7ab..47aff72541 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdedtv.cxx,v $
- * $Revision: 1.24.148.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index cd35046601..0e0c2e8aa9 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdedtv1.cxx,v $
- * $Revision: 1.30.146.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -55,7 +52,7 @@
 #include <svx/svdopath.hxx>  // fuer Crook
 #include "svdstr.hrc"   // Namen aus der Resource
 #include "svdglob.hxx"  // StringCache
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/whiter.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 1ddf95ee01..f04280ea35 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdedtv2.cxx,v $
- * $Revision: 1.33.146.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <svx/svdedtv.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdogrp.hxx>   // fuer's Gruppieren
 #include <svx/svdovirt.hxx>  // fuer VirtualObject-Bundling (Writer)
@@ -48,8 +45,8 @@
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/eeitem.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 162d3522e6..6fb8f14ec2 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdedxv.cxx,v $
- * $Revision: 1.62 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,15 +41,15 @@
 #include <vcl/hatch.hxx>
 #include <svl/whiter.hxx>
 #include <svl/style.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 #include <tools/config.hxx>
 #include <vcl/cursor.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include "svditext.hxx"
 #include <svx/svdoutl.hxx>
 #include <svx/sdtfchim.hxx>
@@ -73,8 +70,8 @@
 #include "svdstr.hrc"   // Namen aus der Resource
 #include "svdglob.hxx"  // StringCache
 #include "globl3d.hxx"
-#include <svx/outliner.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/adjitem.hxx>
 
 // #98988#
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 60a96b1722..921880dfe4 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdetc.cxx,v $
- * $Revision: 1.35.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include "forbiddencharacterstable.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <svx/svdetc.hxx>
@@ -43,15 +40,15 @@
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 #include <vcl/bmpacc.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <tools/config.hxx>
 #include <unotools/cacheoptions.hxx>
 #include <svl/whiter.hxx>
 #include <tools/bigint.hxx>
-#include "fontitem.hxx"
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
+#include "editeng/fontitem.hxx"
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 198724a3fb..3d25b44844 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdfmtf.cxx,v $
- * $Revision: 1.20.84.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,29 +29,29 @@
 #include "precompiled_svx.hxx"
 
 #include "svdfmtf.hxx"
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <math.h>
 #include <svx/xpoly.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xflgrit.hxx>
-#include <fontitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
 #include <vcl/metric.hxx>
-#include <svx/charscaleitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 5ba98dee5b..a4f1a28163 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdfmtf.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 8d879ca4e1..546bb10620 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdglev.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/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index f195f582e0..da9c8c2d54 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdglue.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index f5df1658b3..0be05fbe12 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdhdl.cxx,v $
- * $Revision: 1.34.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 731285801b..c77c7e77c2 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdhlpln.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 4c67ed985c..d9fd1a9a39 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdibrow.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include "svdibrow.hxx"
 
@@ -40,8 +37,8 @@
 #endif
 
 #include "svditext.hxx"
-#include <svx/flditem.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/editdata.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svdattrx.hxx>
@@ -56,13 +53,13 @@
 #include <svx/xflbstit.hxx>
 #include <svx/xflbtoxy.hxx>
 #include <svx/xftshit.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 
 
-#include "fontitem.hxx"
-#include <svx/fhgtitem.hxx>
+#include "editeng/fontitem.hxx"
+#include <editeng/fhgtitem.hxx>
 
-#include <svx/charscaleitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/flagitem.hxx>
 #include <svl/ptitem.hxx>
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index d396876bfd..c1bcc090ed 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svditer.cxx,v $
- * $Revision: 1.9.246.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svditext.hxx b/svx/source/svdraw/svditext.hxx
index c817269bcc..8032e5ad93 100644
--- a/svx/source/svdraw/svditext.hxx
+++ b/svx/source/svdraw/svditext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svditext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 // SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 
 #endif  // _SVDITEXT_HXX
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 7895583833..b9b874f728 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdlayer.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/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 2ba06a6b80..89ef4c46de 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmark.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 5bf35f2398..87dd8e8e89 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmodel.cxx,v $
- * $Revision: 1.82 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,7 +50,7 @@
 #include <svx/xlnstit.hxx>
 
 #include "svditext.hxx"
-#include <svx/editeng.hxx>   // Fuer EditEngine::CreatePool()
+#include <editeng/editeng.hxx>   // Fuer EditEngine::CreatePool()
 
 #include <svx/xtable.hxx>
 
@@ -73,16 +70,16 @@
 #include "svdoutlinercache.hxx"
 
 
-#include "asiancfg.hxx"
-#include "fontitem.hxx"
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
+#include <svl/asiancfg.hxx>
+#include "editeng/fontitem.hxx"
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
 #include <tools/bigint.hxx>
-#include <svx/numitem.hxx>
-#include <bulitem.hxx>
-#include <svx/outlobj.hxx>
-#include "forbiddencharacterstable.hxx"
+#include <editeng/numitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/outlobj.hxx>
+#include "editeng/forbiddencharacterstable.hxx"
 #include <svl/zforlist.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -93,7 +90,7 @@
 // #95114#
 #include <vcl/svapp.hxx>
 #include <svx/sdr/properties/properties.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d8a14f17c3..658b63d6fa 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmrkv.cxx,v $
- * $Revision: 1.39.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -209,9 +206,9 @@ void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
             bMarkedPointsRectsDirty=TRUE;
         }
 /* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects		
-        if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )

-        {

-            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );

+        if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
+        {
+            MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );
         }		
 */
     }
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index f039060b08..382493e4eb 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdmrkv1.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/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 34d517e6c3..03a7d30e92 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoashp.cxx,v $
- * $Revision: 1.51.52.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,10 +60,10 @@
 #include <svx/svdoedge.hxx>  // #32383# Die Verbinder nach Move nochmal anbroadcasten
 #include "svdglob.hxx"   // StringCache
 #include "svdstr.hrc"    // Objektname
-#include <svx/eeitem.hxx>
-#include "editstat.hxx"
+#include <editeng/eeitem.hxx>
+#include "editeng/editstat.hxx"
 #include <svx/svdoutl.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/sdtfchim.hxx>
 #include "../customshapes/EnhancedCustomShapeGeometry.hxx"
 #include "../customshapes/EnhancedCustomShapeTypeNames.hxx"
@@ -77,7 +74,7 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
@@ -1674,11 +1671,11 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     }
 }
 
-void SdrObjCustomShape::SetModel(SdrModel* pNewModel)

-{

-    SdrTextObj::SetModel(pNewModel);

-    mXRenderedCustomShape.clear();

-}

+void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
+{
+    SdrTextObj::SetModel(pNewModel);
+    mXRenderedCustomShape.clear();
+}
 
 UINT16 SdrObjCustomShape::GetObjIdentifier() const
 {
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index d447507542..79148e549c 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoattr.cxx,v $
- * $Revision: 1.53.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,11 +57,11 @@
 #include <svx/xftshit.hxx>
 
 
-#include <svx/colritem.hxx>
-#include "fontitem.hxx"
-#include <svx/fhgtitem.hxx>
+#include <editeng/colritem.hxx>
+#include "editeng/fontitem.hxx"
+#include <editeng/fhgtitem.hxx>
 
-//#include <svx/charscaleitem.hxx>
+//#include <editeng/charscaleitem.hxx>
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svl/style.hxx>
@@ -75,7 +72,7 @@
 #include <svx/xlntrit.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xlnedcit.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <svx/xflbckit.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xbtmpit.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8261f917dd..bcf81b91ef 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdobj.cxx,v $
- * $Revision: 1.99.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -85,14 +82,14 @@
 #include <svx/xflftrit.hxx>
 #include "svx/xlinjoit.hxx"
 #include <svx/unopage.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/xenum.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xhatch.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <vcl/salbtype.hxx>		// FRound
 #include <svl/whiter.hxx>
 
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 13b5f4a3a2..8ef96e7d50 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdocapt.cxx,v $
- * $Revision: 1.30.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +48,7 @@
 #include <svx/xflhtit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfltrit.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/sdr/properties/captionproperties.hxx>
 #include <vcl/salbtype.hxx>		// FRound
 #include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 98bf7c4364..8c14a33564 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdocirc.cxx,v $
- * $Revision: 1.37.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 #include <svx/svdview.hxx>  // Zum Draggen (Ortho)
 #include "svdglob.hxx"   // StringCache
 #include "svdstr.hrc"    // Objektname
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/circleproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 8c927b1146..537703e622 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoedge.cxx,v $
- * $Revision: 1.45.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +47,7 @@
 #include "svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include "svdoimp.hxx"
 #include <svx/sdr/properties/connectorproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdredgeobj.hxx>
@@ -1041,7 +1038,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             if (bCase29) {
                                 // und nun noch dafuer sorgen, dass das
                                 // umzingelte Obj nicht durchquert wird
-                                if (aBewR1.Center().Y()<aBewR2.Center().Y() != bObenLang) {
+                                if ((aBewR1.Center().Y()<aBewR2.Center().Y()) != bObenLang) {
                                     aMeeting.X()=aBewR2.Right();
                                 } else {
                                     aMeeting.X()=aBewR1.Left();
@@ -1101,7 +1098,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             if (bCase29) {
                                 // und nun noch dafuer sorgen, dass das
                                 // umzingelte Obj nicht durchquert wird
-                                if (aBewR1.Center().X()<aBewR2.Center().X() != bLinksLang) {
+                                if ((aBewR1.Center().X()<aBewR2.Center().X()) != bLinksLang) {
                                     aMeeting.Y()=aBewR2.Bottom();
                                 } else {
                                     aMeeting.Y()=aBewR1.Top();
@@ -1277,10 +1274,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                 Point aP3(aXP1[3]);
                 Point aP4(aXP1[4]);
                 if (aP1.Y()==aP2.Y()) { // beide Linien Horz
-                    if (aP1.X()<aP2.X()==aP3.X()<aP4.X()) cForm='S';
+                    if ((aP1.X()<aP2.X())==(aP3.X()<aP4.X())) cForm='S';
                     else cForm='C';
                 } else { // sonst beide Linien Vert
-                    if (aP1.Y()<aP2.Y()==aP3.Y()<aP4.Y()) cForm='S';
+                    if ((aP1.Y()<aP2.Y())==(aP3.Y()<aP4.Y())) cForm='S';
                     else cForm='C';
                 }
             } else cForm='4'; // sonst der 3. Fall mit 5 Linien
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index f31a663311..801609ae89 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdograf.cxx,v $
- * $Revision: 1.84.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,10 +41,10 @@
 #include <svl/style.hxx>
 #include <svtools/filter.hxx>
 #include <svl/urihelper.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <vcl/svapp.hxx>
 
-#include "linkmgr.hxx"
+#include <sfx2/linkmgr.hxx>
 #include <svx/svdetc.hxx>
 #include "svdglob.hxx"
 #include "svdstr.hrc"
@@ -58,7 +55,7 @@
 #include <svx/svdpagv.hxx>
 #include "svdviter.hxx"
 #include <svx/svdview.hxx>
-#include "svx/impgrf.hxx"
+#include "svtools/filter.hxx"
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/xbitmap.hxx>
@@ -67,7 +64,7 @@
 #include <svx/svdundo.hxx>
 #include "svdfmtf.hxx"
 #include <svx/sdgcpitm.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/sdr/properties/graphicproperties.hxx>
 #include <svx/sdr/contact/viewcontactofgraphic.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -124,20 +121,19 @@ void SdrGraphicLink::DataChanged( const String& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue )
 {
     SdrModel*       pModel      = pGrafObj ? pGrafObj->GetModel() : 0;
-    SvxLinkManager* pLinkManager= pModel  ? pModel->GetLinkManager() : 0;
+    sfx2::LinkManager* pLinkManager= pModel  ? pModel->GetLinkManager() : 0;
 
     if( pLinkManager && rValue.hasValue() )
     {
         pLinkManager->GetDisplayNames( this, 0, &pGrafObj->aFileName, 0, &pGrafObj->aFilterName );
 
         Graphic aGraphic;
-        if( SvxLinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic ))
+        if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic ))
         {
                pGrafObj->NbcSetGraphic( aGraphic );
             pGrafObj->ActionChanged();
         }
-        else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) !=
-                    SvxLinkManager::RegisterStatusInfoId() )
+        else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) != sfx2::LinkManager::RegisterStatusInfoId() )
         {
             // only repaint, no objectchange
             pGrafObj->ActionChanged();
@@ -475,7 +471,7 @@ void SdrGrafObj::ForceSwapOut() const
 
 void SdrGrafObj::ImpLinkAnmeldung()
 {
-    SvxLinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL;
+    sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL;
 
     if( pLinkManager != NULL && pGraphicLink == NULL )
     {
@@ -492,7 +488,7 @@ void SdrGrafObj::ImpLinkAnmeldung()
 
 void SdrGrafObj::ImpLinkAbmeldung()
 {
-    SvxLinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL;
+    sfx2::LinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL;
 
     if( pLinkManager != NULL && pGraphicLink!=NULL)
     {
@@ -1157,7 +1153,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
                         mbIsPreview = sal_True;
                     }
 
-                    if( !GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream,
+                    if( !GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream,
                                                         GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData ) )
                     {
                         const String aUserData( pGraphic->GetUserData() );
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 70cfe07549..1d30a85acc 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdogrp.cxx,v $
- * $Revision: 1.38.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/svx/source/svdraw/svdoimp.cxx b/svx/source/svdraw/svdoimp.cxx
index ad29fb3907..4362f5599e 100644
--- a/svx/source/svdraw/svdoimp.cxx
+++ b/svx/source/svdraw/svdoimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoimp.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 46a7779ea3..794331c9b8 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdomeas.cxx,v $
- * $Revision: 1.35.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +44,7 @@
 #include "svdstr.hrc"    // Objektname
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedit.hxx>
@@ -55,11 +52,11 @@
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnedcit.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/outliner.hxx>
-#include <svx/editobj.hxx>
-#include <svx/svdfield.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/measfld.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
@@ -78,37 +75,7 @@
 SdrMeasureObjGeoData::SdrMeasureObjGeoData() {}
 SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {}
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SV_IMPL_PERSIST1(SdrMeasureField,SvxFieldData);
-
-__EXPORT SdrMeasureField::~SdrMeasureField()
-{
-}
-
-SvxFieldData* __EXPORT SdrMeasureField::Clone() const
-{
-    return new SdrMeasureField(*this);
-}
-
-int __EXPORT SdrMeasureField::operator==(const SvxFieldData& rSrc) const
-{
-    return eMeasureFieldKind==((SdrMeasureField&)rSrc).GetMeasureFieldKind();
-}
-
-void __EXPORT SdrMeasureField::Load(SvPersistStream& rIn)
-{
-    UINT16 nFieldKind;
-    rIn>>nFieldKind;
-    eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
-}
-
-void __EXPORT SdrMeasureField::Save(SvPersistStream& rOut)
-{
-    rOut<<(UINT16)eMeasureFieldKind;
-}
-
-void SdrMeasureField::TakeRepresentation(const SdrMeasureObj& rObj, XubString& rStr) const
+void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMeasureFieldKind ) const
 {
     rStr.Erase();
     Fraction aMeasureScale(1, 1);
@@ -117,14 +84,14 @@ void SdrMeasureField::TakeRepresentation(const SdrMeasureObj& rObj, XubString& r
     FieldUnit eMeasureUnit(FUNIT_NONE);
     FieldUnit eModUIUnit(FUNIT_NONE);
 
-    const SfxItemSet& rSet = rObj.GetMergedItemSet();
+    const SfxItemSet& rSet = GetMergedItemSet();
     bTextRota90 = ((SdrMeasureTextRota90Item&)rSet.Get(SDRATTR_MEASURETEXTROTA90)).GetValue();
     eMeasureUnit = ((SdrMeasureUnitItem&)rSet.Get(SDRATTR_MEASUREUNIT)).GetValue();
     aMeasureScale = ((SdrMeasureScaleItem&)rSet.Get(SDRATTR_MEASURESCALE)).GetValue();
     bShowUnit = ((SdrMeasureShowUnitItem&)rSet.Get(SDRATTR_MEASURESHOWUNIT)).GetValue();
     sal_Int16 nNumDigits = ((SdrMeasureDecimalPlacesItem&)rSet.Get(SDRATTR_MEASUREDECIMALPLACES)).GetValue();
 
-    SdrModel* pModel = rObj.pModel;
+    //SdrModel* pModel = rObj.pModel;
 
     switch(eMeasureFieldKind)
     {
@@ -137,7 +104,7 @@ void SdrMeasureField::TakeRepresentation(const SdrMeasureObj& rObj, XubString& r
                 if(eMeasureUnit == FUNIT_NONE)
                     eMeasureUnit = eModUIUnit;
 
-                INT32 nLen(GetLen(rObj.aPt2 - rObj.aPt1));
+                INT32 nLen(GetLen(aPt2 - aPt1));
                 Fraction aFact(1,1);
 
                 if(eMeasureUnit != eModUIUnit)
@@ -200,7 +167,7 @@ void SdrMeasureField::TakeRepresentation(const SdrMeasureObj& rObj, XubString& r
         {
             if(bShowUnit)
             {
-                if(rObj.pModel)
+                if(pModel)
                 {
                     eModUIUnit = pModel->GetUIUnit();
 
@@ -621,7 +588,7 @@ FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara,
     const SvxFieldData* pField=rField.GetField();
     SdrMeasureField* pMeasureField=PTR_CAST(SdrMeasureField,pField);
     if (pMeasureField!=NULL) {
-        pMeasureField->TakeRepresentation(*this,rRet);
+        TakeRepresentation(rRet, pMeasureField->GetMeasureFieldKind());
         if (rpFldColor!=NULL) {
             if (!bEdit)
             {
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index ee8352b6ce..d6fc98c9a2 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdomedia.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 7f2dde332a..dd106da535 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoole2.cxx,v $
- * $Revision: 1.89.60.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,7 +66,7 @@
 #include <sot/clsids.hxx>
 
 #include <sot/formats.hxx>
-#include <linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <svtools/transfer.hxx>
 #include <cppuhelper/implbase5.hxx>
 
@@ -85,7 +82,6 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include "unomlstr.hxx"
-#include "svx/impgrf.hxx"
 #include <svtools/chartprettypainter.hxx>
 #include <svx/sdr/contact/viewcontactofsdrole2obj.hxx>
 #include <svx/svdograf.hxx>
@@ -938,7 +934,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
 
     if ( mpImpl->mpObjectLink )
     {
-        SvxLinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL;
+        sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL;
         if ( pLinkManager )
         {
             String aNewLinkURL;
@@ -1029,7 +1025,7 @@ void SdrOle2Obj::BreakFileLink_Impl()
 
 void SdrOle2Obj::DisconnectFileLink_Impl()
 {
-    SvxLinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL;
+    sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL;
     if ( pLinkManager && mpImpl->mpObjectLink )
     {
         pLinkManager->Remove( mpImpl->mpObjectLink );
@@ -1052,7 +1048,7 @@ void SdrOle2Obj::CheckFileLink_Impl()
                 if ( aLinkURL.Len() )
                 {
                     // this is a file link so the model link manager should handle it
-                    SvxLinkManager* pLinkManager = pModel->GetLinkManager();
+                    sfx2::LinkManager* pLinkManager = pModel->GetLinkManager();
                     if ( pLinkManager )
                     {
                         mpImpl->mpObjectLink = new SdrEmbedObjectLink( this );
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 9153794e9d..a1a6ad8109 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdopage.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/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 5daa6204b1..e7407cd8ec 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdopath.cxx,v $
- * $Revision: 1.51.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -406,7 +403,7 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr
         y2=BigMulDiv(x,nDirY,nDirX);
         long l1=Abs(x1)+Abs(y1);
         long l2=Abs(x2)+Abs(y2);
-        if (l1<=l2 !=(pView!=NULL && pView->IsBigOrtho())) {
+        if ((l1<=l2) != (pView!=NULL && pView->IsBigOrtho())) {
             x=x1; y=y1;
         } else {
             x=x2; y=y2;
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index f6c0fbc6ea..f8a1534fd2 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdorect.cxx,v $
- * $Revision: 1.31.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b90d70671a..173abeba43 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotext.cxx,v $
- * $Revision: 1.90.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,25 +39,25 @@
 #include <svx/svdmodel.hxx>  // OutlinerDefaults
 #include "svdglob.hxx"  // Stringcache
 #include "svdstr.hrc"   // Objektname
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/eeitem.hxx>
-#include <editstat.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
-#include <svx/outliner.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svl/itempool.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/xftouit.hxx>
 #include <vcl/salbtype.hxx>		// FRound
 #include <svx/xflgrit.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/xflclit.hxx>
 #include <svl/style.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <svl/itemiter.hxx>
 #include <svx/sdr/properties/textproperties.hxx>
 #include <vcl/metaact.hxx>
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 28773dd24e..760287af46 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -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: svdotextdecomposition.cxx,v $
- *
- * $Revision: 1.2.18.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +35,7 @@
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 #include <vcl/salbtype.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svl/itemset.hxx>
@@ -48,10 +44,10 @@
 #include <drawinglayer/animation/animationtiming.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/eeitemid.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/eeitemid.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/flditem.hxx>
 #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx>
 #include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
@@ -59,7 +55,7 @@
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -94,10 +90,10 @@ namespace
         // the visible area for contour text decomposition
         basegfx::B2DVector                                          maScale;
 
-        // #SJ# ClipRange for BlockText decomposition; only text portions completely

-        // inside are to be accepted, so this is different from geometric clipping

-        // (which would allow e.g. upper parts of portions to remain). Only used for 

-        // BlockText (see there)

+        // #SJ# ClipRange for BlockText decomposition; only text portions completely
+        // inside are to be accepted, so this is different from geometric clipping
+        // (which would allow e.g. upper parts of portions to remain). Only used for 
+        // BlockText (see there)
         basegfx::B2DRange                                           maClipRange;
 
         DECL_LINK(decomposeContourTextPrimitive, DrawPortionInfo* );
@@ -119,12 +115,12 @@ namespace
     public:
         impTextBreakupHandler(SdrOutliner& rOutliner)
         :	maTextPortionPrimitives(),
-            maLinePrimitives(),

-            maParagraphPrimitives(),

-            mrOutliner(rOutliner),

-            maNewTransformA(),

-            maNewTransformB(),

-            maScale(),

+            maLinePrimitives(),
+            maParagraphPrimitives(),
+            mrOutliner(rOutliner),
+            maNewTransformA(),
+            maNewTransformB(),
+            maScale(),
             maClipRange()
         {
         }
@@ -577,43 +573,43 @@ namespace
     {
         if(pInfo)
         {
-            // #SJ# Is clipping wanted? This is text clipping; only accept a portion

-            // if it's completely in the range

-            if(!maClipRange.isEmpty())

-            {

-                // Test start position first; this allows to not get the text range at

-                // all if text is far outside

-                const basegfx::B2DPoint aStartPosition(pInfo->mrStartPos.X(), pInfo->mrStartPos.Y());

-

-                if(!maClipRange.isInside(aStartPosition))

-                {

-                    return 0;

-                }

-

-                // Start position is inside. Get TextBoundRect and TopLeft next

-                drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice;

-                aTextLayouterDevice.setFont(pInfo->mrFont);

-

-                const basegfx::B2DRange aTextBoundRect(

-                    aTextLayouterDevice.getTextBoundRect(

-                        pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen));

-                const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition);

-

-                if(!maClipRange.isInside(aTopLeft))

-                {

-                    return 0;

-                }

-

-                // TopLeft is inside. Get BottomRight and check

-                const basegfx::B2DPoint aBottomRight(aTextBoundRect.getMaximum() + aStartPosition);

-

-                if(!maClipRange.isInside(aBottomRight))

-                {

-                    return 0;

-                }

-

-                // all inside, clip was successful

-            }

+            // #SJ# Is clipping wanted? This is text clipping; only accept a portion
+            // if it's completely in the range
+            if(!maClipRange.isEmpty())
+            {
+                // Test start position first; this allows to not get the text range at
+                // all if text is far outside
+                const basegfx::B2DPoint aStartPosition(pInfo->mrStartPos.X(), pInfo->mrStartPos.Y());
+
+                if(!maClipRange.isInside(aStartPosition))
+                {
+                    return 0;
+                }
+
+                // Start position is inside. Get TextBoundRect and TopLeft next
+                drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice;
+                aTextLayouterDevice.setFont(pInfo->mrFont);
+
+                const basegfx::B2DRange aTextBoundRect(
+                    aTextLayouterDevice.getTextBoundRect(
+                        pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen));
+                const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition);
+
+                if(!maClipRange.isInside(aTopLeft))
+                {
+                    return 0;
+                }
+
+                // TopLeft is inside. Get BottomRight and check
+                const basegfx::B2DPoint aBottomRight(aTextBoundRect.getMaximum() + aStartPosition);
+
+                if(!maClipRange.isInside(aBottomRight))
+                {
+                    return 0;
+                }
+
+                // all inside, clip was successful
+            }
             impHandleDrawPortionInfo(*pInfo);
         }
 
@@ -922,13 +918,13 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
         bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 : 1.0,
         fShearX, fRotate, aTranslate.getX(), aTranslate.getY()));
 
-    // #SJ# create ClipRange (if needed)

-    basegfx::B2DRange aClipRange;

-

-    if(rSdrBlockTextPrimitive.getClipOnBounds())

-    {

-        aClipRange.expand(-aAdjOffset);

-        aClipRange.expand(basegfx::B2DTuple(aAnchorTextSize.Width(), aAnchorTextSize.Height()) - aAdjOffset);

+    // #SJ# create ClipRange (if needed)
+    basegfx::B2DRange aClipRange;
+
+    if(rSdrBlockTextPrimitive.getClipOnBounds())
+    {
+        aClipRange.expand(-aAdjOffset);
+        aClipRange.expand(basegfx::B2DTuple(aAnchorTextSize.Width(), aAnchorTextSize.Height()) - aAdjOffset);
     }
 
     // now break up text primitives.
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index ecccd6fa42..0c33a54dc3 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.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: svdotextpathdecomposition.cxx,v $
- *
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,7 +46,7 @@
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/i18n/CharacterIteratorMode.hdl>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
@@ -67,7 +63,7 @@
 #include <svx/xlndsit.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 #include <unoapi.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx>
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index d5d09aea94..03d7b9ffc8 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotxat.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,30 +36,30 @@
 #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight
 #include <svx/svdocapt.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight
 #include <svx/svdetc.hxx>
-#include <svx/writingmodeitem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/writingmodeitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
 #include <svx/sdtfchim.hxx>
 
 
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <svl/smplhint.hxx>
 #include <svl/whiter.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/outliner.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/editobj.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/fhgtitem.hxx>
 
-#include <svx/charscaleitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include <svl/style.hxx>
 #include <svl/itemiter.hxx>
-#include <svx/lrspitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <svl/itempool.hxx>
-#include <svx/numitem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/postitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/postitem.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 14e0ad1d84..5c73038abd 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotxdr.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 0191eee99e..2681530be2 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotxed.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,10 +32,10 @@
 #include "svditext.hxx"
 #include <svx/svdmodel.hxx> // fuer GetMaxObjSize
 #include <svx/svdoutl.hxx>
-#include <svx/outliner.hxx>
-#include <editstat.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editstat.hxx>
 #include <svl/itemset.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/sdtfchim.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index 566bd6fdd2..a8e7cf120b 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotxfl.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,10 +27,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/svdfield.hxx>
+#include <editeng/measfld.hxx>
 #include <svx/svdotext.hxx>
+#include <svx/svdfield.hxx>
 
 static BOOL bInit = FALSE;
 
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index a55e2d8740..786aaa1212 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotxln.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,24 +30,16 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
-
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/datetime.hxx>
-
 #include <svx/svdotext.hxx>
 #include "svditext.hxx"
 #include <svx/svdmodel.hxx>
-#include <svx/editdata.hxx>
-
-#ifndef SVX_LIGHT
-#ifndef _LNKBASE_HXX //autogen
+#include <editeng/editdata.hxx>
 #include <sfx2/lnkbase.hxx>
-#endif
-#endif
-#include <linkmgr.hxx>
+#include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
-
 #include <svl/urihelper.hxx>
 
 // #90477#
@@ -114,7 +103,7 @@ void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
 {
     FASTBOOL bForceReload=FALSE;
     SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
-    SvxLinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0;
+    sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0;
     if( pLinkManager )
     {
         ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData();
@@ -331,9 +320,8 @@ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const
 
 void SdrTextObj::ImpLinkAnmeldung()
 {
-#ifndef SVX_LIGHT
     ImpSdrObjTextLinkUserData* pData=GetLinkUserData();
-    SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
+    sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
     if (pLinkManager!=NULL && pData!=NULL && pData->pLink==NULL) { // Nicht 2x Anmelden
         pData->pLink=new ImpSdrObjTextLink(this);
 #ifdef GCC
@@ -347,19 +335,16 @@ void SdrTextObj::ImpLinkAnmeldung()
 #endif
         pData->pLink->Connect();
     }
-#endif // SVX_LIGHT
 }
 
 void SdrTextObj::ImpLinkAbmeldung()
 {
-#ifndef SVX_LIGHT
     ImpSdrObjTextLinkUserData* pData=GetLinkUserData();
-    SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
+    sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
     if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // Nicht 2x Abmelden
         // Bei Remove wird *pLink implizit deleted
         pLinkManager->Remove( pData->pLink );
         pData->pLink=NULL;
     }
-#endif // SVX_LIGHT
 }
 
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 1dad4b45ce..5b96e1b2dc 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotxtr.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdpage.hxx>   // fuer Convert
 #include <svx/svdmodel.hxx>  // fuer Convert
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svx/sdr/properties/properties.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 313de1087f..f48a37fcad 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdouno.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/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 79972849be..738526f015 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoutl.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,11 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 #include <svx/svdoutl.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svdotext.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/itempool.hxx>
 
 DBG_NAME(SdrOutliner)
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index b8f73bea43..e9b0be44b3 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdoutlinercache.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/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 2ad653d6c9..f9b2af6e88 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdovirt.cxx,v $
- * $Revision: 1.21.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 4276f2c950..119141eca5 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpage.cxx,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/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 7a8847dc0d..59e99d8d82 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpagv.cxx,v $
- * $Revision: 1.62 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdouno.hxx>
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index eabcdf7632..17c5b6be1f 100755..100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpntv.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <svx/svdpntv.hxx>
 #include <vcl/msgbox.hxx>
 #include <sdrpaintwindow.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/svdmodel.hxx>
 
 #ifdef DBG_UTIL
@@ -45,7 +42,7 @@
 #include <svl/smplhint.hxx>
 
 #include <svx/svdpntv.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
@@ -67,7 +64,7 @@
 #include <svx/svdview.hxx>
 #include <svx/sxlayitm.hxx>
 #include <svl/itemiter.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/style.hxx>
 #include <svx/sdrpagewindow.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 9f6fd4da5c..a718ae5be1 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdpoev.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdscrol.cxx b/svx/source/svdraw/svdscrol.cxx
index a20150e224..0e7ebaf7eb 100644
--- a/svx/source/svdraw/svdscrol.cxx
+++ b/svx/source/svdraw/svdscrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdscrol.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/svx/source/svdraw/svdscrol.hxx b/svx/source/svdraw/svdscrol.hxx
index b641737ebc..bf900c6380 100644
--- a/svx/source/svdraw/svdscrol.hxx
+++ b/svx/source/svdraw/svdscrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdscrol.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 4f051f8ecb..0943aec425 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdsnpv.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 595ff95bcd..4d1e6f302d 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdstr.src,v $
- * $Revision: 1.95.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 83588ab129..5a731ad9b3 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdtext.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,11 +32,11 @@
 
 #include "svx/svdotext.hxx"
 #include "svx/svdetc.hxx"
-#include "svx/outlobj.hxx"
+#include "editeng/outlobj.hxx"
 #include "svx/svdoutl.hxx"
 #include "svx/svdmodel.hxx"
-#include "svx/fhgtitem.hxx"
-#include <svx/eeitem.hxx>
+#include "editeng/fhgtitem.hxx"
+#include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 
 SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ )
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 63643f178d..bfaba25c4e 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdtrans.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/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index d55c311f14..2cb797ce2d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdundo.cxx,v $
- * $Revision: 1.31.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,7 +39,7 @@
 #include "svdstr.hrc"   // Namen aus der Resource
 #include "svdglob.hxx"  // StringCache
 #include <svx/scene3d.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/sdr/properties/itemsettools.hxx>
 #include <svx/sdr/properties/properties.hxx>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index c64937043e..311678c5ba 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdview.cxx,v $
- * $Revision: 1.29.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #include "svdstr.hrc"   // Namen aus der Resource
 #include "svdglob.hxx"  // StringCache
@@ -49,8 +46,8 @@
 
 #include "svx/svdoutl.hxx"
 #include "svx/svdview.hxx"
-#include "svx/editview.hxx" // fuer GetField
-#include "svx/flditem.hxx"  // fuer URLField
+#include "editeng/editview.hxx" // fuer GetField
+#include "editeng/flditem.hxx"  // fuer URLField
 #include "svx/obj3d.hxx"
 #include "svx/svddrgmt.hxx"
 #include "svx/svdoutl.hxx"
@@ -977,7 +974,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
     }
     return bRet;
 }
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 
 Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const
 {
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index fa97fe1b29..b38007705f 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdviter.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 5effd864f1..f8b3efbab2 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdxcgv.cxx,v $
- * $Revision: 1.34.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include <vector>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include "xexch.hxx"
 #include <svx/xflclit.hxx>
 #include <svx/svdxcgv.hxx>
diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx
deleted file mode 100644
index 2284e1d1fd..0000000000
--- a/svx/source/svxlink/linkmgr.cxx
+++ /dev/null
@@ -1,380 +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: linkmgr.cxx,v $
- * $Revision: 1.34 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <com/sun/star/document/UpdateDocMode.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <sot/formats.hxx>
-#include <sot/exchange.hxx>
-#include <vcl/graph.hxx>
-#include <sfx2/lnkbase.hxx>
-#include <tools/urlobj.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/rectitem.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/objsh.hxx>
-#ifndef _SFX_INTERNO_HXX //autogen
-//#include <sfx2/interno.hxx>
-#endif
-#include <sfx2/dispatch.hxx>
-#include <unotools/charclass.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <svl/itemset.hxx>
-#include <svl/urihelper.hxx>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
-
-#include "linkmgr.hxx"
-#include "fileobj.hxx"
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
-#include "unolingu.hxx"
-
-class SvxInternalLink : public sfx2::SvLinkSource
-{
-public:
-    SvxInternalLink() {}
-
-    virtual BOOL Connect( sfx2::SvBaseLink* );
-};
-
-SvxLinkManager::SvxLinkManager( SfxObjectShell* _pPersist )
-{
-    SvLinkManager::SetPersist( _pPersist );
-}
-
-sfx2::SvLinkSourceRef SvxLinkManager::CreateObj( sfx2::SvBaseLink * pLink )
-{
-    switch( pLink->GetObjType() )
-    {
-    case OBJECT_CLIENT_FILE:
-    case OBJECT_CLIENT_GRF:
-    case OBJECT_CLIENT_OLE:
-        return new SvFileObject;
-
-    case OBJECT_INTERN:
-        return new SvxInternalLink();
-    }
-    return SvLinkManager::CreateObj( pLink );
-}
-
-
-BOOL SvxLinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
-                                    USHORT nFileType,
-                                    const String& rFileNm,
-                                    const String* pFilterNm,
-                                    const String* pRange )
-{
-    if( !( OBJECT_CLIENT_SO & rLink.GetObjType() ))
-        return FALSE;
-
-    String sCmd( rFileNm );
-    sCmd += ::sfx2::cTokenSeperator;
-    if( pRange )
-        sCmd += *pRange;
-    if( pFilterNm )
-        ( sCmd += ::sfx2::cTokenSeperator ) += *pFilterNm;
-
-    return SvLinkManager::InsertLink( &rLink, nFileType,
-                                    sfx2::LINKUPDATE_ONCALL, &sCmd );
-}
-
-BOOL SvxLinkManager::InsertFileLink( sfx2::SvBaseLink& rLink )
-{
-    if( OBJECT_CLIENT_FILE == ( OBJECT_CLIENT_FILE & rLink.GetObjType() ))
-        return SvLinkManager::InsertLink( &rLink, rLink.GetObjType(),
-                                            sfx2::LINKUPDATE_ONCALL );
-    return FALSE;
-}
-
-        // erfrage die Strings fuer den Dialog
-BOOL SvxLinkManager::GetDisplayNames( const sfx2::SvBaseLink* pBaseLink,
-                                        String* pType,
-                                        String* pFile,
-                                        String* pLink,
-                                        String* pFilter ) const
-{
-    BOOL bRet = FALSE;
-    const String sLNm( pBaseLink->GetLinkSourceName() );
-    if( sLNm.Len() )
-        switch( pBaseLink->GetObjType() )
-        {
-        case OBJECT_CLIENT_FILE:
-        case OBJECT_CLIENT_GRF:
-        case OBJECT_CLIENT_OLE:
-            {
-                USHORT nPos = 0;
-                String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
-                String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) );
-
-                if( pFile )
-                    *pFile = sFile;
-                if( pLink )
-                    *pLink = sRange;
-                if( pFilter )
-                    *pFilter = sLNm.Copy( nPos );
-
-                if( pType )
-                {
-                    sal_uInt16 nObjType = pBaseLink->GetObjType();
-                    *pType = String( ResId(
-                                ( OBJECT_CLIENT_FILE == nObjType || OBJECT_CLIENT_OLE == nObjType )
-                                        ? RID_SVXSTR_FILELINK
-                                        : RID_SVXSTR_GRAFIKLINK
-                                        , DIALOG_MGR() ));
-                }
-                bRet = TRUE;
-            }
-            break;
-        default:
-            bRet = SvLinkManager::GetDisplayNames( pBaseLink, pType, pFile,
-                                                    pLink, pFilter );
-            break;
-        }
-    return bRet;
-}
-
-// eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln
-// (ist zur Zeit nur fuer die FileLinks interressant!)
-void SvxLinkManager::CancelTransfers()
-{
-    SvFileObject* pFileObj;
-    sfx2::SvBaseLink* pLnk;
-
-    const sfx2::SvBaseLinks& rLnks = GetLinks();
-    for( USHORT n = rLnks.Count(); n; )
-        if( 0 != ( pLnk = &(*rLnks[ --n ])) &&
-            OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
-            0 != ( pFileObj = (SvFileObject*)pLnk->GetObj() ) )
-//			0 != ( pFileObj = (SvFileObject*)SvFileObject::ClassFactory()->
-//									CastAndAddRef( pLnk->GetObj() )) )
-            pFileObj->CancelTransfers();
-}
-
-    // um Status Informationen aus dem FileObject an den BaseLink zu
-    // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat
-    // dann die entsprechenden Informationen als String.
-    // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt
-    // - das braucht Informationen ueber Load/Abort/Error
-ULONG SvxLinkManager::RegisterStatusInfoId()
-{
-    static ULONG nFormat = 0;
-
-    if( !nFormat )
-    {
-// wie sieht die neue Schnittstelle aus?
-//		nFormat = Exchange::RegisterFormatName( "StatusInfo vom SvxInternalLink" );
-        nFormat = SotExchange::RegisterFormatName(
-                    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
-                                "StatusInfo vom SvxInternalLink" )));
-    }
-    return nFormat;
-}
-
-// ----------------------------------------------------------------------
-
-BOOL SvxLinkManager::GetGraphicFromAny( const String& rMimeType,
-                                const ::com::sun::star::uno::Any & rValue,
-                                Graphic& rGrf )
-{
-    BOOL bRet = FALSE;
-    ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
-    if( rValue.hasValue() && ( rValue >>= aSeq ) )
-    {
-        SvMemoryStream aMemStm( (void*)aSeq.getConstArray(), aSeq.getLength(),
-                                STREAM_READ );
-        aMemStm.Seek( 0 );
-
-        switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
-        {
-        case SOT_FORMATSTR_ID_SVXB:
-            {
-                aMemStm >> rGrf;
-                bRet = TRUE;
-            }
-            break;
-        case FORMAT_GDIMETAFILE:
-            {
-                GDIMetaFile aMtf;
-                aMtf.Read( aMemStm );
-                rGrf = aMtf;
-                bRet = TRUE;
-            }
-            break;
-        case FORMAT_BITMAP:
-            {
-                Bitmap aBmp;
-                aMemStm >> aBmp;
-                rGrf = aBmp;
-                bRet = TRUE;
-            }
-            break;
-        }
-    }
-    return bRet;
-}
-
-
-// ----------------------------------------------------------------------
-String lcl_DDE_RelToAbs( const String& rTopic, const String& rBaseURL )
-{
-    String sRet;
-    INetURLObject aURL( rTopic );
-    if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
-        utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rBaseURL, sRet );
-    if( !sRet.Len() )
-        sRet = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), rTopic, URIHelper::GetMaybeFileHdl(), true );
-    return sRet;
-}
-
-BOOL SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
-{
-    SfxObjectShell* pFndShell = 0;
-    USHORT nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
-    String sTopic, sItem, sReferer;
-    if( pLink->GetLinkManager() &&
-        pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sTopic, &sItem )
-        && sTopic.Len() )
-    {
-        // erstmal nur ueber die DocumentShells laufen und die mit dem
-        // Namen heraussuchen:
-
-        CharClass aCC( SvxCreateLocale( LANGUAGE_SYSTEM ));
-        String sNm( sTopic ), sTmp;
-        aCC.toLower( sNm );
-
-        TypeId aType( TYPE(SfxObjectShell) );
-
-        BOOL bFirst = TRUE;
-        SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist();
-        if( pShell && pShell->GetMedium() )
-        {
-            sReferer = pShell->GetMedium()->GetBaseURL();
-            SFX_ITEMSET_ARG( pShell->GetMedium()->GetItemSet(), pItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False );
-            if ( pItem )
-                nUpdateMode = pItem->GetValue();
-        }
-
-        String sNmURL( lcl_DDE_RelToAbs( sTopic, sReferer ) );
-        aCC.toLower( sNmURL );
-
-        if ( !pShell )
-        {
-            bFirst = FALSE;
-            pShell = SfxObjectShell::GetFirst( &aType, sal_False );
-        }
-
-        while( pShell )
-        {
-            if( !sTmp.Len() )
-            {
-                sTmp = pShell->GetTitle( SFX_TITLE_FULLNAME );
-                sTmp = lcl_DDE_RelToAbs(sTmp, sReferer );
-            }
-
-
-            aCC.toLower( sTmp );
-            if( sTmp == sNmURL )		// die wollen wir haben
-            {
-                pFndShell = pShell;
-                break;
-            }
-
-            if( bFirst )
-            {
-                bFirst = FALSE;
-                pShell = SfxObjectShell::GetFirst( &aType, sal_False );
-            }
-            else
-                pShell = SfxObjectShell::GetNext( *pShell, &aType, sal_False );
-
-            sTmp.Erase();
-        }
-    }
-
-    // empty topics are not allowed - which document is it
-    if( !sTopic.Len() )
-        return FALSE;
-
-    if( !pFndShell )
-    {
-        // dann versuche die Datei zu laden:
-        INetURLObject aURL( sTopic );
-        INetProtocol eOld = aURL.GetProtocol();
-        aURL.SetURL( sTopic = lcl_DDE_RelToAbs( sTopic, sReferer ) );
-        if( INET_PROT_NOT_VALID != eOld ||
-            INET_PROT_HTTP != aURL.GetProtocol() )
-        {
-            SfxStringItem aName( SID_FILE_NAME, sTopic );
-            SfxBoolItem aMinimized(SID_MINIMIZED, TRUE);
-            SfxBoolItem aHidden(SID_HIDDEN, TRUE);
-            SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
-            SfxStringItem aReferer( SID_REFERER, sReferer );
-            SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode );
-            SfxBoolItem aReadOnly(SID_DOC_READONLY, TRUE);
-
-            // #i14200# (DDE-link crashes wordprocessor)
-            SfxAllItemSet aArgs( SFX_APP()->GetPool() );
-            aArgs.Put(aReferer);
-            aArgs.Put(aTarget);
-            aArgs.Put(aHidden);
-            aArgs.Put(aMinimized);
-            aArgs.Put(aName);
-            aArgs.Put(aUpdate);
-            aArgs.Put(aReadOnly);
-            pFndShell = SfxObjectShell::CreateAndLoadObject( aArgs );
-        }
-    }
-
-    BOOL bRet = FALSE;
-    if( pFndShell )
-    {
-        sfx2::SvLinkSource* pNewSrc = pFndShell->DdeCreateLinkSource( sItem );
-        if( pNewSrc )
-        {
-            bRet = TRUE;
-
-            ::com::sun::star::datatransfer::DataFlavor aFl;
-            SotExchange::GetFormatDataFlavor( pLink->GetContentType(), aFl );
-
-            pLink->SetObj( pNewSrc );
-            pNewSrc->AddDataAdvise( pLink, aFl.MimeType,
-                                sfx2::LINKUPDATE_ONCALL == pLink->GetUpdateMode()
-                                    ? ADVISEMODE_ONLYONCE
-                                    : 0 );
-        }
-    }
-    return bRet;
-}
-
-
diff --git a/svx/source/svxlink/linkmgr.src b/svx/source/svxlink/linkmgr.src
deleted file mode 100644
index aca244e55c..0000000000
--- a/svx/source/svxlink/linkmgr.src
+++ /dev/null
@@ -1,86 +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: linkmgr.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 <svx/dialogs.hrc>
-String RID_SVXSTR_FILELINK
-{
-    Text [ en-US ] = "Document" ;
-};
-String RID_SVXSTR_GRAFIKLINK
-{
-    Text [ en-US ] = "Graphic" ;
-};
-String RID_SVXSTR_EDITGRFLINK
-{
-    /* ### ACHTUNG: Neuer Text in Resource? Grafik Verknüpfen : Grafik Verkn³pfen */
-    /* ### ACHTUNG: Neuer Text in Resource? Grafik Verknüpfen : Grafik Verkn³pfen */
-    Text [ en-US ] = "Link graphics" ;
-};
-String RID_SVXSTR_GRFLINKPROGRESS
-{
-    Text [ en-US ] = "Importing graphic..." ;
-};
-Bitmap RID_SVXGRF_GRAPHICLOAD
-{
-    File = "grfload.bmp" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 6066023eac..dd79040992 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: accessiblecell.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,7 +39,7 @@
 
 #include <unotools/accessiblestatesethelper.hxx>
 
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdotext.hxx>
 
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 6114b540bb..9bbaf03003 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: accessiblecell.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,10 +35,11 @@
 
 #include <rtl/ref.hxx>
 
-#include <svx/AccessibleContextBase.hxx>
-#include <svx/AccessibleComponentBase.hxx>
+#include <editeng/AccessibleContextBase.hxx>
+#include <editeng/AccessibleComponentBase.hxx>
 #include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/AccessibleTextHelper.hxx>
+#include <svx/AccessibleShapeTreeInfo.hxx>
 
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 0c6beba822..5cdc8b1d7a 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: accessibletableshape.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/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 22b5a774b9..3d75c031f9 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,8 @@
 #include <vcl/svapp.hxx>
 
 #include "svx/sdr/properties/textproperties.hxx"
-#include "svx/outlobj.hxx"
-#include "svx/writingmodeitem.hxx"
+#include "editeng/outlobj.hxx"
+#include "editeng/writingmodeitem.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdoutl.hxx"
 #include "svx/unoshtxt.hxx"
@@ -58,10 +55,11 @@
 #include "svx/unoshtxt.hxx"
 #include "svx/unoshprp.hxx"
 #include "svx/unoshape.hxx"
-#include "svx/editobj.hxx"
-#include "svx/boxitem.hxx"
+#include "editeng/editobj.hxx"
+#include "editeng/boxitem.hxx"
 #include "svx/xflbstit.hxx"
 #include "svx/xflbmtit.hxx"
+#include <svx/svdpool.hxx>
 
 // -----------------------------------------------------------------------------
 
@@ -76,9 +74,6 @@ using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::container;
 
-extern sal_Bool lcl_LineToSvxLine(const BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
-extern BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert);
-
 // -----------------------------------------------------------------------------
 
 static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
@@ -110,7 +105,7 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
         {0,0,0,0,0,0}
     };
 
-    static SvxItemPropertySet aSvxCellPropertySet( aSvxCellPropertyMap ); 
+    static SvxItemPropertySet aSvxCellPropertySet( aSvxCellPropertyMap, SdrObject::GetGlobalDrawObjectItemPool() ); 
     return &aSvxCellPropertySet;
 }
 
@@ -968,7 +963,7 @@ sal_Int32 SAL_CALL Cell::getError(  ) throw (RuntimeException)
 
 Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap )
 {
-    Any aAny( mpPropSet->getPropertyValue( pMap, aSet ) );
+    Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) );
 
     if( *pMap->pType != aAny.getValueType() )
     {
@@ -1033,27 +1028,27 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
             SvxBoxInfoItem aBoxInfo( SDRATTR_TABLE_BORDER_INNER );
             SvxBorderLine aLine;
 
-            sal_Bool bSet = lcl_LineToSvxLine(pBorder->TopLine, aLine, false);
+            sal_Bool bSet = SvxBoxItem::LineToSvxLine(pBorder->TopLine, aLine, false);
             aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_TOP);
             aBoxInfo.SetValid(VALID_TOP, pBorder->IsTopLineValid);
 
-            bSet = lcl_LineToSvxLine(pBorder->BottomLine, aLine, false);
+            bSet = SvxBoxItem::LineToSvxLine(pBorder->BottomLine, aLine, false);
             aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_BOTTOM);
             aBoxInfo.SetValid(VALID_BOTTOM, pBorder->IsBottomLineValid);
 
-            bSet = lcl_LineToSvxLine(pBorder->LeftLine, aLine, false);
+            bSet = SvxBoxItem::LineToSvxLine(pBorder->LeftLine, aLine, false);
             aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_LEFT);
             aBoxInfo.SetValid(VALID_LEFT, pBorder->IsLeftLineValid);
 
-            bSet = lcl_LineToSvxLine(pBorder->RightLine, aLine, false);
+            bSet = SvxBoxItem::LineToSvxLine(pBorder->RightLine, aLine, false);
             aBox.SetLine(bSet ? &aLine : 0, BOX_LINE_RIGHT);
             aBoxInfo.SetValid(VALID_RIGHT, pBorder->IsRightLineValid);
 
-            bSet = lcl_LineToSvxLine(pBorder->HorizontalLine, aLine, false);
+            bSet = SvxBoxItem::LineToSvxLine(pBorder->HorizontalLine, aLine, false);
             aBoxInfo.SetLine(bSet ? &aLine : 0, BOXINFO_LINE_HORI);
             aBoxInfo.SetValid(VALID_HORI, pBorder->IsHorizontalLineValid);
 
-            bSet = lcl_LineToSvxLine(pBorder->VerticalLine, aLine, false);
+            bSet = SvxBoxItem::LineToSvxLine(pBorder->VerticalLine, aLine, false);
             aBoxInfo.SetLine(bSet ? &aLine : 0, BOXINFO_LINE_VERT);
             aBoxInfo.SetValid(VALID_VERT, pBorder->IsVerticalLineValid);
 
@@ -1124,7 +1119,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
 
                     if( aSet.GetItemState( pMap->nWID ) == SFX_ITEM_SET )
                     {
-                        mpPropSet->setPropertyValue( pMap, rValue, aSet );
+                        SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rValue, aSet );
                     }
                 }
             }
@@ -1168,17 +1163,17 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow
             const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(mpProperties->GetItem(SDRATTR_TABLE_BORDER));
 
              TableBorder aTableBorder;
-            aTableBorder.TopLine 				= lcl_SvxLineToLine(rBox.GetTop(), false);
+            aTableBorder.TopLine 				= SvxBoxItem::SvxLineToLine(rBox.GetTop(), false);
             aTableBorder.IsTopLineValid 		= rBoxInfoItem.IsValid(VALID_TOP);
-            aTableBorder.BottomLine				= lcl_SvxLineToLine(rBox.GetBottom(), false);
+            aTableBorder.BottomLine				= SvxBoxItem::SvxLineToLine(rBox.GetBottom(), false);
             aTableBorder.IsBottomLineValid		= rBoxInfoItem.IsValid(VALID_BOTTOM);
-            aTableBorder.LeftLine				= lcl_SvxLineToLine(rBox.GetLeft(), false);
+            aTableBorder.LeftLine				= SvxBoxItem::SvxLineToLine(rBox.GetLeft(), false);
             aTableBorder.IsLeftLineValid		= rBoxInfoItem.IsValid(VALID_LEFT);
-            aTableBorder.RightLine				= lcl_SvxLineToLine(rBox.GetRight(), false);
+            aTableBorder.RightLine				= SvxBoxItem::SvxLineToLine(rBox.GetRight(), false);
             aTableBorder.IsRightLineValid		= rBoxInfoItem.IsValid(VALID_RIGHT );
-            aTableBorder.HorizontalLine			= lcl_SvxLineToLine(rBoxInfoItem.GetHori(), false);
+            aTableBorder.HorizontalLine			= SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetHori(), false);
             aTableBorder.IsHorizontalLineValid 	= rBoxInfoItem.IsValid(VALID_HORI);
-            aTableBorder.VerticalLine			= lcl_SvxLineToLine(rBoxInfoItem.GetVert(), false);
+            aTableBorder.VerticalLine			= SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetVert(), false);
             aTableBorder.IsVerticalLineValid	= rBoxInfoItem.IsValid(VALID_VERT);
             aTableBorder.Distance 				= rBox.GetDistance();
             aTableBorder.IsDistanceValid 		= rBoxInfoItem.IsValid(VALID_DISTANCE);
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index dd79dd1f5f..87c8198461 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cell.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,16 +34,17 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 
 #include <rtl/ref.hxx>
-
+#include <svl/style.hxx>
 #include "svx/sdtaitm.hxx"
 #include "tablemodel.hxx"
-#include "svx/unotext.hxx"
+#include "editeng/unotext.hxx"
 #include "svx/svdtext.hxx"
 
 // -----------------------------------------------------------------------------
 
 class SfxItemSet;
 class OutlinerParaObject;
+class SdrObject;
 
 namespace sdr { namespace properties {
     class TextProperties;
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 7ed2328745..f9a1e86891 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellcursor.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index 87cef8c343..e437edcf23 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellcursor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index bdf6cf0537..58bd1d2b6e 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: celleditsource.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,17 +44,17 @@
 #include "svx/svdmodel.hxx"
 #include "svx/svdoutl.hxx"
 #include "svx/svdobj.hxx"
-#include "unoedhlp.hxx"
+#include "editeng/unoedhlp.hxx"
 #include "svx/svdview.hxx"
 #include "svx/svdetc.hxx"
-#include "svx/outliner.hxx"
-#include "svx/unoforou.hxx"
-#include "svx/unoviwou.hxx"
-#include "svx/outlobj.hxx"
+#include "editeng/outliner.hxx"
+#include "editeng/unoforou.hxx"
+#include "editeng/unoviwou.hxx"
+#include "editeng/outlobj.hxx"
 #include "svx/svdotext.hxx"
 #include "svx/svdpage.hxx"
-#include "svx/editeng.hxx"
-#include "svx/unotext.hxx"
+#include "editeng/editeng.hxx"
+#include "editeng/unotext.hxx"
 #include "sdrpaintwindow.hxx"
 
 //------------------------------------------------------------------------
diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx
index ebd991905b..f94b4812c0 100644
--- a/svx/source/table/celleditsource.hxx
+++ b/svx/source/table/celleditsource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: celleditsource.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,7 +30,7 @@
 
 #include "cell.hxx"
 #include "celltypes.hxx"
-#include "svx/unoedsrc.hxx"
+#include "editeng/unoedsrc.hxx"
 
 class SvxTextForwarder;
 class SdrObject;
diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx
index 9aebf641bd..50f400e218 100644
--- a/svx/source/table/cellrange.cxx
+++ b/svx/source/table/cellrange.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellrange.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index 5b2f67cf78..3fa3fef891 100644
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cellrange.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx
index f0f8f1ae6c..b81caf6ee7 100644
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/table/celltypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: celltypes.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk
index ae0dc5eb68..1eaaef12aa 100644
--- a/svx/source/table/makefile.mk
+++ b/svx/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx
index a94b04fd2f..247f9bd7a2 100644
--- a/svx/source/table/propertyset.cxx
+++ b/svx/source/table/propertyset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyset.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index 9002e05d02..43ce01a7b3 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyset.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index b52302c9dc..8fa586b76e 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdotable.cxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,8 +43,8 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svl/style.hxx>
-#include "editstat.hxx"
-#include "svx/outlobj.hxx"
+#include "editeng/editstat.hxx"
+#include "editeng/outlobj.hxx"
 #include "svx/svdview.hxx"
 #include "svx/sdr/properties/textproperties.hxx"
 #include "svx/svdotable.hxx"
@@ -62,14 +59,14 @@
 #include "tablelayouter.hxx"
 #include "svx/svdetc.hxx"
 #include "tablehandles.hxx"
-#include "svx/boxitem.hxx"
+#include "editeng/boxitem.hxx"
 #include "svx/framelink.hxx"
 #include "svx/sdr/table/tabledesign.hxx"
 #include "svx/svdundo.hxx"
 #include "svdstr.hrc"
 #include "svdglob.hxx"
-#include "svx/writingmodeitem.hxx"
-#include "svx/frmdiritem.hxx"
+#include "editeng/writingmodeitem.hxx"
+#include "editeng/frmdiritem.hxx"
 #include "svx/xflhtit.hxx"
 #include "svx/xflftrit.hxx"
 #include "svx/xfltrit.hxx"
diff --git a/svx/source/table/table.src b/svx/source/table/table.src
index a4f16e048b..4a696f9e0c 100644
--- a/svx/source/table/table.src
+++ b/svx/source/table/table.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: table.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 024f858303..f59c2bf262 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablecolumn.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index ccac757eca..5d9f012cc3 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablecolumn.hxx,v $
- * $Revision: 1.3.264.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index 76e5000d6a..b04a9da88d 100644
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablecolumns.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index dec7835cbb..f8be12c717 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablecolumns.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 43ef34d8c0..39e6593d13 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablecontroller.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,28 +44,28 @@
 
 #include <sfx2/request.hxx>
 
-#include <svx/scripttypeitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/sdr/overlay/overlayobjectcell.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/svxids.hrc>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/editobj.hxx>
-#include "editstat.hxx"
-#include "unolingu.hxx"
+#include <editeng/editobj.hxx>
+#include "editeng/editstat.hxx"
+#include "editeng/unolingu.hxx"
 #include "svx/sdrpagewindow.hxx"
 #include <svx/selectioncontroller.hxx>
 #include <svx/svdmodel.hxx>
 #include "sdrpaintwindow.hxx"
 #include <svx/svxdlg.hxx>
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 #include "cell.hxx"
-#include <svx/borderline.hxx>
-#include <svx/colritem.hxx>
-#include "bolnitem.hxx"
+#include <editeng/borderline.hxx>
+#include <editeng/colritem.hxx>
+#include "editeng/bolnitem.hxx"
 #include "svdstr.hrc"
 #include "svdglob.hxx"
 #include "svx/svdpage.hxx"
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index 24d9a27ff4..8528db051a 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablecontroller.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 214ca0bad8..3d4f0e10cf 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabledesign.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,6 +37,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
+#include <comphelper/serviceinfohelper.hxx>
 
 #include <osl/mutex.hxx>
 #include <vos/mutex.hxx>
@@ -237,7 +235,7 @@ OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeExcepti
 
 sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName ) throw(RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 // ----------------------------------------------------------
@@ -515,7 +513,7 @@ OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeExcept
 
 sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 // ----------------------------------------------------------
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 511616921c..daa2d0242b 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablehandles.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/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index e1a9095118..907abe6604 100644
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablehandles.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index b27529a323..7bb2122487 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablelayouter.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,8 +41,8 @@
 #include "tablecolumns.hxx"
 #include "tablelayouter.hxx"
 #include "svx/svdotable.hxx"
-#include "svx/borderline.hxx"
-#include "svx/boxitem.hxx"
+#include "editeng/borderline.hxx"
+#include "editeng/boxitem.hxx"
 #include "svx/svdmodel.hxx"
 #include "svdstr.hrc"
 #include "svdglob.hxx"
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index f1bb421cbe..6e3c17c3c7 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablelayouter.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 901f7775e1..5355995347 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablemodel.cxx,v $
- * $Revision: 1.4.264.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 58d2d17820..c67def74e6 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablemodel.hxx,v $
- * $Revision: 1.3.264.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index df71084374..1de353a875 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablerow.cxx,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/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 537ccd1b4e..a259dfa787 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablerow.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index 1fb302eb71..1e3587033e 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablerows.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index 16da90247e..8e449be1c7 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablerows.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 53c557d972..bbdb03aff8 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablertfexporter.cxx,v $
- * $Revision: 1.3.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,18 +37,18 @@
 #include <svtools/rtfkeywd.hxx>
 #include <svtools/rtfout.hxx>
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/sdtaitm.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
 
 #include "cell.hxx"
 #include "celltypes.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdoutl.hxx"
-#include "svx/editeng.hxx"
-#include "svx/outlobj.hxx"
+#include "editeng/editeng.hxx"
+#include "editeng/outlobj.hxx"
 
 //#include <tablertfexporter.hxx>
 
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 399c6d2015..7b9bef62b4 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tablertfimporter.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,19 +36,19 @@
 #include <tools/stream.hxx>
 #include <svtools/rtftoken.h>
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/outlobj.hxx>
 
 #include "cell.hxx"
 #include "celltypes.hxx"
 #include "svx/svdotable.hxx"
 #include "svx/svdoutl.hxx"
-#include "svx/editeng.hxx"
-#include "svx/editdata.hxx"
+#include "editeng/editeng.hxx"
+#include "editeng/editdata.hxx"
 #include "svx/svdmodel.hxx"
-#include "svxrtf.hxx"
+#include "editeng/svxrtf.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index f4d6e89aec..5c3c1d48b2 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tableundo.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +29,7 @@
 #include "precompiled_svx.hxx"
 
 #include "svx/sdr/properties/textproperties.hxx"
-#include "svx/outlobj.hxx"
+#include "editeng/outlobj.hxx"
 
 #include "cell.hxx"
 #include "tableundo.hxx"
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 36e71a254f..1bfc8c5748 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tableundo.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 70fd77ea1b..48c6264caa 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactoftableobj.cxx,v $
- * $Revision: 1.4.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
 #include <svx/sdr/attribute/sdrtextattribute.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
-#include <svx/borderline.hxx>
+#include <editeng/borderline.hxx>
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 
 #include "cell.hxx"
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index 883be542cc..90fb2627b8 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontactoftableobj.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index c7df83a525..32970273ec 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: colrctrl.cxx,v $
- * $Revision: 1.20.76.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 
 #include <svx/svdview.hxx>
 #include "drawitem.hxx"
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src
index 1d897c8d99..da7b5eba64 100644
--- a/svx/source/tbxctrls/colrctrl.src
+++ b/svx/source/tbxctrls/colrctrl.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: colrctrl.src,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 1931516032..f178395199 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extrusioncontrols.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 #include <svl/eitem.hxx>
 #include <vcl/settings.hxx>
 #include <svl/intitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include "chrtitem.hxx"
 #include <tools/urlobj.hxx>
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
index c31fa9df27..c406d5c683 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.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: extrusioncontrols.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/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 3e391def8e..37447b3cba 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.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: extrusioncontrols.src,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 0c2163e9ee..c1d1e979a1 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fillctrl.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 83751efdcb..2ea1f2046e 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontworkgallery.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,8 +42,8 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/frmdiritem.hxx>
 #include "toolbarmenu.hxx"
 
 #include "fontworkgallery.hxx"
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index 880bb5dd54..7d5b20e3e6 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.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: fontworkgallery.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/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 0982e843db..7c8001f591 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formatpaintbrushctrl.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/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index c42ac872ac..4b8cd532e1 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: grafctrl.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -56,8 +53,8 @@
 #include <svx/svxids.hrc>
 #include "grafctrl.hrc"
 #include <svx/dialogs.hrc>
-#include <svx/brshitem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/sizeitem.hxx>
 #include <svx/sdgcpitm.hxx>
 //CHINA001 #include "../dialog/grfpage.hxx"
 #include <svx/itemwin.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.hrc b/svx/source/tbxctrls/grafctrl.hrc
index 5db2e4e194..10eafae0a6 100644
--- a/svx/source/tbxctrls/grafctrl.hrc
+++ b/svx/source/tbxctrls/grafctrl.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: grafctrl.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src
index fca94d2cb5..a0d437ff9c 100644
--- a/svx/source/tbxctrls/grafctrl.src
+++ b/svx/source/tbxctrls/grafctrl.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: grafctrl.src,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/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 879c8708f2..eabe997d33 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: itemwin.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -494,7 +491,7 @@ SvxMetricField::SvxMetricField(
     SetLast( 5000 );
     SetFirst( 0 );
 
-    eDlgUnit = GetModuleFieldUnit( NULL );
+    eDlgUnit = SfxModule::GetCurrentFieldUnit();
     SetFieldUnit( *this, eDlgUnit, FALSE );
     Show();
 }
@@ -579,8 +576,7 @@ void SvxMetricField::SetCoreUnit( SfxMapUnit eUnit )
 
 void SvxMetricField::RefreshDlgUnit()
 {
-    FieldUnit eTmpUnit = GetModuleFieldUnit( NULL );
-
+    FieldUnit eTmpUnit = SfxModule::GetCurrentFieldUnit();
     if ( eDlgUnit != eTmpUnit )
     {
         eDlgUnit = eTmpUnit;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 734afcd45b..0ffa7de0f3 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layctrl.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index a35bcb6f9e..c5d7d21142 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lboxctrl.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/svx/source/tbxctrls/lboxctrl.hrc b/svx/source/tbxctrls/lboxctrl.hrc
index 6168eb0fb3..6f744ae1c2 100644
--- a/svx/source/tbxctrls/lboxctrl.hrc
+++ b/svx/source/tbxctrls/lboxctrl.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: lboxctrl.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
index 42eb9ef493..481c35851f 100644
--- a/svx/source/tbxctrls/lboxctrl.src
+++ b/svx/source/tbxctrls/lboxctrl.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: lboxctrl.src,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index dca3dd00e7..f3a21c1ff6 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: linectrl.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/linectrl.src b/svx/source/tbxctrls/linectrl.src
index b0339dbf48..6ed613bb20 100644
--- a/svx/source/tbxctrls/linectrl.src
+++ b/svx/source/tbxctrls/linectrl.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: linectrl.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
index 9bca3b9798..47da008e87 100644
--- a/svx/source/tbxctrls/makefile.mk
+++ b/svx/source/tbxctrls/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index 7c3b8b1201..a7fc22778e 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: subtoolboxcontrol.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9ee6ffd0ed..db1c5424ef 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbcontrl.cxx,v $
- * $Revision: 1.84 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,9 +56,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <unotools/fontoptions.hxx>
-#ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
-#endif
 
 #include <vcl/svapp.hxx>
 #include <svl/smplhint.hxx>
@@ -79,13 +74,13 @@
 #include "helpid.hrc"
 #include "htmlmode.hxx"
 #include <svx/xtable.hxx>
-#include "fontitem.hxx"
-#include <svx/fhgtitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/colritem.hxx>
-#include "flstitem.hxx"
-#include "bolnitem.hxx"
+#include "editeng/fontitem.hxx"
+#include <editeng/fhgtitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/colritem.hxx>
+#include "editeng/flstitem.hxx"
+#include "editeng/bolnitem.hxx"
 #include "drawitem.hxx"
 #include <svx/tbcontrl.hxx>
 #include "dlgutil.hxx"
@@ -94,6 +89,8 @@
 #include <memory>
 
 #include <svx/tbxcolorupdate.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 // ------------------------------------------------------------------------
 
@@ -882,7 +879,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
         long nCount = pColorTable->Count();
         XColorEntry* pEntry = NULL;
         ::Color aColWhite( COL_WHITE );
-        String aStrWhite( SVX_RES(RID_SVXITEMS_COLOR_WHITE) );
+        String aStrWhite( EditResId(RID_SVXITEMS_COLOR_WHITE) );
 
         if ( nCount > PALETTE_SIZE )
             // Show scrollbar if more than PALLETTE_SIZE colors are available
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index daf2626750..67cff9ac45 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.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: tbcontrl.src,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/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index d00ea44738..4e84217a36 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbunocontroller.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 7f9d4228cc..a12f8096c2 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxalign.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index eb698e1c7d..40082c4624 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxcolor.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/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 13469d3d91..e646229f10 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxcolorupdate.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/svx/source/tbxctrls/tbxdraw.hrc b/svx/source/tbxctrls/tbxdraw.hrc
index 72c8e47025..3dd9eafd91 100644
--- a/svx/source/tbxctrls/tbxdraw.hrc
+++ b/svx/source/tbxctrls/tbxdraw.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: tbxdraw.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/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src
index d035158530..e4c7c1d296 100644
--- a/svx/source/tbxctrls/tbxdraw.src
+++ b/svx/source/tbxctrls/tbxdraw.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: tbxdraw.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/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 88967319d4..75641be026 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tbxdrctl.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/tbxctrls/toolbarmenu.cxx b/svx/source/tbxctrls/toolbarmenu.cxx
index 895afe7b5c..e7cf418ce7 100644
--- a/svx/source/tbxctrls/toolbarmenu.cxx
+++ b/svx/source/tbxctrls/toolbarmenu.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: toolbarmenu.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/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 9de79579d3..57327a6b07 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: verttexttbxctrl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 2112510162..1adb91606c 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extrusionbar.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,7 +49,7 @@
 #include <svx/dialogs.hrc>
 #endif
 #include <svx/svdview.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
 #include "chrtitem.hxx"
 
 #include <svx/extrusionbar.hxx>
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index b0ba9cbd8c..c856eec1f6 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontworkbar.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,9 +45,9 @@
 #include <svx/svdoashp.hxx>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <sfx2/bindings.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/kernitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/kernitem.hxx>
 #include <sdrpaintwindow.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src
index 6324d3b90a..ed9b152fe4 100644
--- a/svx/source/toolbars/fontworkbar.src
+++ b/svx/source/toolbars/fontworkbar.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: fontworkbar.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/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk
index ad4184ca67..40c7f2ccb7 100644
--- a/svx/source/toolbars/makefile.mk
+++ b/svx/source/toolbars/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/inc/buttongroup.hrc
index 5255186991..8385627295 100644
--- a/svx/source/unodialogs/inc/buttongroup.hrc
+++ b/svx/source/unodialogs/inc/buttongroup.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: buttongroup.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/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 6047af2099..7ccf3b4daf 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_dictionarydialog.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
index 7ebd1a2c23..6ba634335f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.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: chinese_dictionarydialog.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/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index f71e20c889..d8590b973f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_dictionarydialog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
index 458e7af3f6..2a0c9b2f28 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.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: chinese_dictionarydialog.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/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
index 3d03100a37..161add1e73 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_direction_ids.hrc,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/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
index a03204825a..956f6232a4 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_direction_tmpl.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/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 68a6623598..84ac6a5070 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_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: chinese_translation_unodialog.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/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 612043d151..79d3ccf668 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_translation_unodialog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index a6263978d1..401242860a 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_translationdialog.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/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
index 3882012839..bc35405016 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.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: chinese_translationdialog.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/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index b262c2705e..630ac959e5 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chinese_translationdialog.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
index 49376d2ef7..52dfd00909 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.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: chinese_translationdialog.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/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk
index 26d975e00c..6cdec3906c 100644
--- a/svx/source/unodialogs/textconversiondlgs/makefile.mk
+++ b/svx/source/unodialogs/textconversiondlgs/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx
index 93e4e0ca1e..06112499dd 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index 99d63d1b98..004a92b214 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/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/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc
index e55187b00d..8581baed1d 100644
--- a/svx/source/unodialogs/textconversiondlgs/resids.hrc
+++ b/svx/source/unodialogs/textconversiondlgs/resids.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: resids.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/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 77449201bf..f54d77c910 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index b75a2c6f1d..be91f08fe5 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoGraphicExporter.cxx,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,11 +62,11 @@
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/numitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
 #include "xoutbmp.hxx"
-#include "svx/impgrf.hxx"
+#include "svtools/filter.hxx"
 #include "unoapi.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
@@ -77,9 +74,9 @@
 #include <svx/fmmodel.hxx>
 #include <svx/unopage.hxx>
 #include <svx/pageitem.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 
 #include "boost/scoped_ptr.hpp"
 
@@ -105,7 +102,7 @@ using namespace ::com::sun::star::task;
 #include <svx/sdr/contact/viewcontact.hxx>
 
 // #i102251#
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -1013,7 +1010,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
     if( NULL == mpUnoPage )
         return sal_False;
 
-    GraphicFilter*				pFilter = GetGrfFilter();
+    GraphicFilter*				pFilter = GraphicFilter::GetGraphicFilter();
    
     if( NULL == pFilter || NULL == mpUnoPage->GetSdrPage() || NULL == mpDoc )
         return sal_False;
@@ -1233,7 +1230,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam
 {
     const String aMimeTypeName( MimeTypeName );
 
-    GraphicFilter*	pFilter = GetGrfFilter();
+    GraphicFilter*	pFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nCount = pFilter->GetExportFormatCount();
     sal_uInt16 nFilter;
     for( nFilter = 0; nFilter < nCount; nFilter++ )
@@ -1249,7 +1246,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& MimeTypeNam
 
 Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames(  ) throw (RuntimeException)
 {
-    GraphicFilter*	pFilter = GetGrfFilter();
+    GraphicFilter*	pFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nCount = pFilter->GetExportFormatCount();
     sal_uInt16 nFilter;
     sal_uInt16 nFound = 0;
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index 5a755af937..5f82a9a56a 100644
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoGraphicExporter.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 630d05228d..7c11806bec 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoNameItemTable.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 79a9b78fc1..0d71a7b67f 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoNameItemTable.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/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index f9d1ad5f0e..14592ca38b 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoNamespaceMap.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,7 +42,7 @@
 #include <comphelper/stl_types.hxx>
 #include <svl/itempool.hxx>
 #include "unoapi.hxx"
-#include "xmlcnitm.hxx"
+#include "editeng/xmlcnitm.hxx"
 
 
 using namespace ::comphelper;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 9324ed5a0b..91bd768f35 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XPropertyTable.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,7 +43,7 @@
 #include <svx/xdef.hxx>
 
 #include "unoapi.hxx"
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 using namespace com::sun::star;
@@ -718,7 +715,7 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno::
     if(!(rAny >>= aURL))
         return NULL;
 
-    GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+    GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
     XOBitmap aBMP( aGrafObj );
     
     const String aName( rName );
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index ca41fa9fe5..801d7bc93c 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gluepts.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk
index 4b8ecb093d..6815f28f4c 100644
--- a/svx/source/unodraw/makefile.mk
+++ b/svx/source/unodraw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -49,7 +45,6 @@ LIB1OBJFILES= \
         $(SLO)$/XPropertyTable.obj \
         $(SLO)$/UnoNameItemTable.obj \
         $(SLO)$/unoshape.obj	\
-        $(SLO)$/unoipset.obj	\
         $(SLO)$/unoshap2.obj	\
         $(SLO)$/unoshap3.obj	\
         $(SLO)$/unoshap4.obj	\
@@ -57,8 +52,6 @@ LIB1OBJFILES= \
         $(SLO)$/unoshtxt.obj	\
         $(SLO)$/unoprov.obj		\
         $(SLO)$/unomod.obj      \
-        $(SLO)$/unonrule.obj	\
-        $(SLO)$/unofdesc.obj	\
         $(SLO)$/unomlstr.obj	\
         $(SLO)$/unogtabl.obj	\
         $(SLO)$/unohtabl.obj	\
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 98137146fc..98a0686bf4 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: recoveryui.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index c64b1d1e71..ba3feed6d3 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeimpl.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/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 337f7ebfb2..3efda09cf7 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -1,28 +1,29 @@
 /*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-* 
-* Copyright 2009 by Sun Microsystems, Inc.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
 ************************************************************************/
-

+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index f8b5bceec9..7f76ade673 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tableshape.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,13 +31,13 @@
 #include "shapeimpl.hxx"
 #include "svx/unoshprp.hxx"
 #include "svx/svdotable.hxx"
+#include <svx/svdpool.hxx>
 
 ///////////////////////////////////////////////////////////////////////
 
 using ::rtl::OUString;
 
 using namespace ::osl;
-using namespace ::vos;
 using namespace ::cppu;
 using namespace ::sdr::table;
 using namespace ::com::sun::star;
@@ -50,7 +47,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 
 SvxTableShape::SvxTableShape( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_TABLE), aSvxMapProvider.GetPropertySet(SVXMAP_TABLE) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_TABLE), aSvxMapProvider.GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
     SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ) );
 }
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 3e369c3e14..a35f825f9a 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unobtabl.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,21 +31,16 @@
 #include <vcl/cvtgrf.hxx>
 #include <svl/itemset.hxx>
 #include <svx/xit.hxx>
-#ifndef SVX_LIGHT
-#ifndef _SFXDOCFILE_HXX 
-#include <sfx2/docfile.hxx>
-#endif
-#endif
 #include "UnoNameItemTable.hxx"
 
 #include <svx/xbtmpit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
 #include "unoapi.hxx"
-#include "svx/impgrf.hxx"
 #include <svx/unomid.hxx>
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 #include "unofill.hxx"
+#include <editeng/memberids.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
@@ -127,41 +119,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( Sdr
 {
     return *new SvxUnoBitmapTable(pModel);
 }
-#include <tools/stream.hxx>
-#include <unotools/localfilehelper.hxx>
-
-/** returns a GraphicObject for this URL */
-GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ) throw()
-{
-    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;
-
-#ifndef SVX_LIGHT
-        if ( aURL.Len() )
-        {
-            SfxMedium	aMedium( aURL, STREAM_READ, TRUE );
-            SvStream*	pStream = aMedium.GetInStream();
 
-            if( pStream )
-                GraphicConverter::Import( *pStream, aGraphic );
-        }
-#else
-        String aSystemPath( rURL );
-        utl::LocalFileHelper::ConvertURLToSystemPath( aSystemPath, aSystemPath );
-        SvFileStream aFile( aSystemPath, STREAM_READ );
-        GraphicConverter::Import( aFile, aGraphic );
-#endif
-        
-
-        return GraphicObject( aGraphic );
-    }
-}
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 1eef2212d1..8e4a387893 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoctabl.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/unodraw.src b/svx/source/unodraw/unodraw.src
index 3e5d556dd8..f905e651cf 100644
--- a/svx/source/unodraw/unodraw.src
+++ b/svx/source/unodraw/unodraw.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: unodraw.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/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 7eec2700c1..4779bc357a 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unodtabl.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 1cdb92d7f0..0791954d40 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogtabl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index bb46cf14ff..38c9c585a5 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unohtabl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index 3958ec5537..6a7fdd4d0a 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomlstr.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 0e4c734683..97adf442eb 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomod.cxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,10 +38,11 @@
 #include <svl/itemprop.hxx>
 #include <svtools/unoevent.hxx>
 #include <comphelper/sequence.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 #include <cppuhelper/implbase2.hxx>
 #include <unofill.hxx>
-#include <unonrule.hxx>
+#include <editeng/unonrule.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/fmdpage.hxx>
 #include <svx/fmmodel.hxx>
@@ -57,7 +55,7 @@
 #include <svx/svdtypes.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unopage.hxx>
-#include <svx/unofield.hxx>
+#include <editeng/unofield.hxx>
 #include <svx/unomod.hxx>
 #include <svx/unomodel.hxx>
 #include <svx/svdobj.hxx>
@@ -213,66 +211,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
-    uno::Reference< uno::XInterface > xRet;
-
-    const OUString aTextFieldPrexit( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.textfield.") );
-    
-    // #i93308# up to OOo 3.2 we used this wrong namespace name with the capital T & F. This is
-    // fixed since OOo 3.2 but for compatibility we will still provide support for the wrong notation.
-    const OUString aTextFieldPrexit2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.") );
-
-    if( (ServiceSpecifier.compareTo( aTextFieldPrexit, aTextFieldPrexit.getLength() ) == 0) ||
-        (ServiceSpecifier.compareTo( aTextFieldPrexit2, aTextFieldPrexit2.getLength() ) == 0) )
-    {
-        OUString aFieldType( ServiceSpecifier.copy( aTextFieldPrexit.getLength() ) );
-
-        sal_Int32 nId = ID_UNKNOWN;
-
-        if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DateTime") ) )
-        {
-            nId = ID_DATEFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL") ) )
-        {
-            nId = ID_URLFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageNumber") ) )
-        {
-            nId = ID_PAGEFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("PageCount") ) )
-        {
-            nId = ID_PAGESFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("SheetName") ) )
-        {
-            nId = ID_TABLEFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName") ) )
-        {
-            nId = ID_EXT_FILEFIELD;
-        }
-        else if (aFieldType.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("docinfo.Title") ) ||
-                 aFieldType.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("DocInfo.Title") ) )
-        {
-            nId = ID_FILEFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Author") ) )
-        {
-            nId = ID_AUTHORFIELD;
-        }
-        else if( aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("Measure") ) )
-        {
-            nId = ID_MEASUREFIELD;
-        }
-
-        if( nId != ID_UNKNOWN )
-            xRet = (::cppu::OWeakObject * )new SvxUnoTextField( nId );
-    }
-
-    return xRet;
+    return SvxUnoTextCreateTextField( ServiceSpecifier );
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString&, const uno::Sequence< ::com::sun::star::uno::Any >& )
@@ -650,7 +589,7 @@ OUString SAL_CALL SvxUnoDrawingModel::getImplementationName()
 sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName )
     throw(uno::RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException)
@@ -810,5 +749,30 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNam
     uno::Sequence< OUString > aSeq( &aService, 1 );
     return aSeq;
 }
+#include <editeng/unonrule.hxx>
+com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw()
+{
+    SvxNumRule* pDefaultRule = NULL;
+    if( pModel )
+    {
+        SvxNumBulletItem* pItem = (SvxNumBulletItem*) pModel->GetItemPool().GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET);
+        if( pItem )
+        {
+            pDefaultRule = pItem->GetNumRule();
+        }
+    }
+
+    if( pDefaultRule )
+    {
+        return SvxCreateNumRule( pDefaultRule );
+    }
+    else
+    {
+        SvxNumRule aTempRule( 0, 10, false );
+        return SvxCreateNumRule( &aTempRule );
+    }
+}
+
+///////////////////////////////////////////////////////////////////////
 
 #endif
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index a2a6f8c6dd..10fad8ba77 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unomtabl.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 5bfeb3a3bf..b7811bfde2 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopage.cxx,v $
- * $Revision: 1.50.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,11 +35,12 @@
 #include <osl/mutex.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sot/clsids.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 #include <sfx2/objsh.hxx>
-
+#include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
@@ -826,7 +824,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
                         }
                         if( pRet == NULL )
                         {
-                            pRet = new SvxOle2Shape( pObj, aSvxMapProvider.GetMap(SVXMAP_OLE2),  aSvxMapProvider.GetPropertySet(SVXMAP_OLE2) );
+                            pRet = new SvxOle2Shape( pObj, aSvxMapProvider.GetMap(SVXMAP_OLE2),  aSvxMapProvider.GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool()) );
                         }
                      }
                     break;
@@ -840,7 +838,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
                     pRet = new SvxShapePolyPolygon( pObj , PolygonKind_PATHPLIN );
                     break;
                 case OBJ_PAGE:
-                    pRet = new SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_PAGE),  aSvxMapProvider.GetPropertySet(SVXMAP_PAGE) );
+                    pRet = new SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_PAGE),  aSvxMapProvider.GetPropertySet(SVXMAP_PAGE, SdrObject::GetGlobalDrawObjectItemPool()) );
                     break;
                 case OBJ_MEASURE:
                     pRet = new SvxShapeDimensioning( pObj );
@@ -935,7 +933,7 @@ OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeExcept
 sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException )
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 78a0f885f9..dc6575af02 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopool.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 #include <svx/xflbmtit.hxx>
 #include <svx/unopage.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 
 #include "unoapi.hxx"
 #include <memory>
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 0ab785b391..404b3e5f30 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -34,30 +31,28 @@
 #define _SVX_USE_UNOGLOBALS_
 
 #include <com/sun/star/table/XTable.hpp>
-
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#ifndef _COM_SUN_STAR_MEDIA_ZOOMLEVEL_HDL_
 #include <com/sun/star/media/ZoomLevel.hpp>
-#endif
 #include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <vcl/fldunit.hxx>
 #include <tools/shl.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-
 #include <comphelper/propertysetinfo.hxx>
 #include <svx/dialmgr.hxx>
-
 #include "unoapi.hxx"
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 #include <svx/unoshprp.hxx>
-#include <svx/svdobj.hxx>
+#include <editeng/editeng.hxx>
 #include "globl3d.hxx"
 #include <svx/dialogs.hrc>
+#include <svx/svdpool.hxx>
+#include <svx/svdobj.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -1004,84 +999,15 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropert
     }
     return aMapArr[nPropertyId];
 }
-const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(UINT16 nPropertyId)
+const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool)
 {
     if( !aSetArr[nPropertyId] )
-        aSetArr[nPropertyId] = new SvxItemPropertySet( GetMap( nPropertyId ) );
+        aSetArr[nPropertyId] = new SvxItemPropertySet( GetMap( nPropertyId ), rPool );
     return aSetArr[nPropertyId];
 }
 
 // #####################################################################
 
-/** returns an empty UString(). most times sufficient */
-::rtl::OUString SAL_CALL SvxServiceInfoHelper::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 SvxServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
-{
-    return supportsService( ServiceName, getSupportedServiceNames() );
-}
-
-sal_Bool SAL_CALL SvxServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw()
-{
-    const ::rtl::OUString * pArray = SupportedServices.getConstArray();
-    for( INT32 i = 0; i < SupportedServices.getLength(); i++ )
-        if( pArray[i] == ServiceName )
-            return TRUE;
-    return FALSE;
-}
-
-/** the base implementation has no supported services */
-::com::sun::star::uno::Sequence< ::rtl::OUString > SvxServiceInfoHelper::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 > SvxServiceInfoHelper::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 SvxServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, UINT16 nServices, /* char * */ ... ) throw()
-{
-    UINT32 nCount = rSeq.getLength();
-
-    rSeq.realloc( nCount + nServices );
-    OUString* pStrings = rSeq.getArray();
-
-    va_list marker;
-    va_start( marker, nServices );
-    for( UINT16 i = 0 ; i < nServices; i++ )
-        pStrings[nCount++] = OUString::createFromAscii(va_arg( marker, char*));
-    va_end( marker );
-}
-
-
-
 /** maps the API constant MeasureUnit to a vcl MapUnit enum.
     Returns false if conversion is not supported.
 
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 24939e20db..834e5053f7 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshap2.cxx,v $
- * $Revision: 1.70 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,15 +44,15 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/fltcall.hxx>
-#include "svx/impgrf.hxx"
+#include <svtools/filter.hxx>
 
 #include <boost/scoped_ptr.hpp>
-
+#include <svx/svdpool.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 #include <tools/urlobj.hxx>
 
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unopage.hxx>
 #include <svx/svdobj.hxx>
@@ -101,7 +98,7 @@ sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetSt
 ***********************************************************************/
 
 SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage  )  throw() :
-    SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_GROUP), aSvxMapProvider.GetPropertySet(SVXMAP_GROUP) ),
+    SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_GROUP), aSvxMapProvider.GetPropertySet(SVXMAP_GROUP, SdrObject::GetGlobalDrawObjectItemPool()) ),
     mxPage( pDrawPage )
 {
 }
@@ -384,7 +381,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames()
 ***********************************************************************/
 
 SvxShapeConnector::SvxShapeConnector( SdrObject* pObj )  throw() :
-    SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONNECTOR), aSvxMapProvider.GetPropertySet(SVXMAP_CONNECTOR) )
+    SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONNECTOR), aSvxMapProvider.GetPropertySet(SVXMAP_CONNECTOR, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -551,7 +548,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames()
 DBG_NAME(SvxShapeControl)
 
 SvxShapeControl::SvxShapeControl( SdrObject* pObj )  throw() :
-    SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL), aSvxMapProvider.GetPropertySet(SVXMAP_CONTROL) )
+    SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL), aSvxMapProvider.GetPropertySet(SVXMAP_CONTROL, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
     DBG_CTOR(SvxShapeControl,NULL);
     setShapeKind( OBJ_UNO );
@@ -1014,7 +1011,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const ::rtl::OUString& aP
 
 //----------------------------------------------------------------------
 SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw()
-:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_DIMENSIONING), aSvxMapProvider.GetPropertySet(SVXMAP_DIMENSIONING) )
+:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_DIMENSIONING), aSvxMapProvider.GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -1035,7 +1032,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceName
 
 //----------------------------------------------------------------------
 SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw()
-:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CIRCLE), aSvxMapProvider.GetPropertySet(SVXMAP_CIRCLE) )
+:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CIRCLE), aSvxMapProvider.GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -1060,7 +1057,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th
 //----------------------------------------------------------------------
 SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew )
  throw( com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException)
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGON), aSvxMapProvider.GetPropertySet(SVXMAP_POLYPOLYGON) )
+: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGON), aSvxMapProvider.GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) )
 , mePolygonKind( eNew )
 {
 }
@@ -1327,7 +1324,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames
 #include <com/sun/star/drawing/FlagSequence.hpp>
 //----------------------------------------------------------------------
 SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pObj , drawing::PolygonKind eNew ) throw()
-:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGONBEZIER), aSvxMapProvider.GetPropertySet(SVXMAP_POLYPOLYGONBEZIER) )
+:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_POLYPOLYGONBEZIER), aSvxMapProvider.GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()) )
 ,	mePolygonKind( eNew )
 {
 }
@@ -1635,7 +1632,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic
 
 //----------------------------------------------------------------------
 SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()
-:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_GRAPHICOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_GRAPHICOBJECT) )
+:	SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_GRAPHICOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -1738,7 +1735,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
 
                     if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID )
                     {
-                        GraphicFilter* pGrfFilter = GetGrfFilter();
+                        GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter();
                         aFilterName = pGrfFilter->GetImportFormatName( pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) );
                     }
                 }
@@ -1874,7 +1871,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const
 ///////////////////////////////////////////////////////////////////////
 
 SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CAPTION), aSvxMapProvider.GetPropertySet(SVXMAP_CAPTION) )
+: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CAPTION), aSvxMapProvider.GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -1887,7 +1884,7 @@ SvxShapeCaption::~SvxShapeCaption() throw()
 ***********************************************************************/
 
 SvxCustomShape::SvxCustomShape( SdrObject* pObj )  throw() :
-    SvxShapeText( pObj, aSvxMapProvider.GetMap( SVXMAP_CUSTOMSHAPE ), aSvxMapProvider.GetPropertySet(SVXMAP_CUSTOMSHAPE) )
+    SvxShapeText( pObj, aSvxMapProvider.GetMap( SVXMAP_CUSTOMSHAPE ), aSvxMapProvider.GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index cb59ca37e4..10b31c06c2 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshap3.cxx,v $
- * $Revision: 1.32.226.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,13 +36,14 @@
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
-
+#include <svx/svdpool.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unopage.hxx>
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 #include <svx/polysc3d.hxx>
 #include "globl3d.hxx"
 #include <svx/cube3d.hxx>
@@ -81,7 +79,7 @@ using namespace ::com::sun::star::container;
 
 //----------------------------------------------------------------------
 Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSCENEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DSCENEOBJECT) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSCENEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 ,	mxPage( pDrawPage )
 {
 }
@@ -494,7 +492,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" );
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.drawing.Shape3DScene" );
     return aSeq;
 }
 
@@ -504,7 +502,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
 
 //----------------------------------------------------------------------
 Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DCUBEOBJEKT), aSvxMapProvider.GetPropertySet(SVXMAP_3DCUBEOBJEKT) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DCUBEOBJEKT), aSvxMapProvider.GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -624,7 +622,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
                             "com.sun.star.drawing.Shape3DCube");
     return aSeq;
 }
@@ -635,7 +633,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
 
 //----------------------------------------------------------------------
 Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSPHEREOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DSPHEREOBJECT) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DSPHEREOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -740,7 +738,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
                             "com.sun.star.drawing.Shape3DSphere");
     return aSeq;
 }
@@ -751,7 +749,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
 
 //----------------------------------------------------------------------
 Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DLATHEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DLATHEOBJECT) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DLATHEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -948,7 +946,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
                             "com.sun.star.drawing.Shape3DLathe");
     return aSeq;
 }
@@ -958,7 +956,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
 ***********************************************************************/
 
 Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DEXTRUDEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DEXTRUDEOBJECT) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DEXTRUDEOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DEXTRUDEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -1059,7 +1057,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
                             "com.sun.star.drawing.Shape3DExtrude");
     return aSeq;
 }
@@ -1070,7 +1068,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
 
 //----------------------------------------------------------------------
 Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DPOLYGONOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DPOLYGONOBJECT) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_3DPOLYGONOBJECT), aSvxMapProvider.GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
@@ -1204,7 +1202,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames(
     throw(uno::RuntimeException)
 {
     Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 2, "com.sun.star.drawing.Shape3D",
                             "com.sun.star.drawing.Shape3DPolygon");
     return aSeq;
 }
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 977a11442e..4033827052 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshap4.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,7 +37,7 @@
 #include <vcl/virdev.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdomedia.hxx>
-
+#include <svx/svdpool.hxx>
 #ifndef SVX_LIGHT
 #ifndef _SOT_CLSIDS_HXX
 #include <sot/clsids.hxx>
@@ -87,7 +84,7 @@ using namespace ::com::sun::star::beans;
 
 ///////////////////////////////////////////////////////////////////////
 SvxOle2Shape::SvxOle2Shape( SdrObject* pObject ) throw()
-: SvxShape( pObject, aSvxMapProvider.GetMap(SVXMAP_OLE2), aSvxMapProvider.GetPropertySet(SVXMAP_OLE2)  )
+: SvxShape( pObject, aSvxMapProvider.GetMap(SVXMAP_OLE2), aSvxMapProvider.GetPropertySet(SVXMAP_OLE2, SdrObject::GetGlobalDrawObjectItemPool())  )
 {
 }
 
@@ -212,7 +209,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
         OUString aURL;
         if( rValue >>= aURL )
         {
-            GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+            GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
             static_cast<SdrOle2Obj*>(mpObj.get())->SetGraphic( &aGrafObj.GetGraphic() );
             return true;
         }
@@ -632,7 +629,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(rtl::OUString& rHexCLSID)
 ///////////////////////////////////////////////////////////////////////
 
 SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw()
-: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_APPLET), aSvxMapProvider.GetPropertySet(SVXMAP_APPLET)  )
+: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_APPLET), aSvxMapProvider.GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool())  )
 {
     SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.AppletShape" ) ) );
 }
@@ -705,7 +702,7 @@ bool SvxAppletShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S
 ///////////////////////////////////////////////////////////////////////
 
 SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw()
-: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_PLUGIN), aSvxMapProvider.GetPropertySet(SVXMAP_PLUGIN) )
+: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_PLUGIN), aSvxMapProvider.GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
     SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.PluginShape" ) ) );
 }
@@ -778,7 +775,7 @@ bool SvxPluginShape::getPropertyValueImpl( const ::rtl::OUString& rName, const S
 ///////////////////////////////////////////////////////////////////////
 
 SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw()
-: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_FRAME), aSvxMapProvider.GetPropertySet(SVXMAP_FRAME)  )
+: SvxOle2Shape( pObject, aSvxMapProvider.GetMap(SVXMAP_FRAME), aSvxMapProvider.GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool())  )
 {
     SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.FrameShape" ) ) );
 }
@@ -853,7 +850,7 @@ bool SvxFrameShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf
 ***********************************************************************/
 
 SvxMediaShape::SvxMediaShape( SdrObject* pObj ) throw()
-:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_MEDIA), aSvxMapProvider.GetPropertySet(SVXMAP_MEDIA) )
+:	SvxShape( pObj, aSvxMapProvider.GetMap(SVXMAP_MEDIA), aSvxMapProvider.GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
     SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MediaShape" ) ) );
 }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3a33807362..396b3e45f4 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshape.cxx,v $
- * $Revision: 1.178.104.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,15 +38,15 @@
 #include <svl/itemprop.hxx>
 #include <svtools/fltcall.hxx>
 #include <vos/mutex.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/extract.hxx>
 #include "svx/shapepropertynotifier.hxx"
-
+#include <comphelper/serviceinfohelper.hxx>
 #include <toolkit/unohlp.hxx>
-
+#include <comphelper/serviceinfohelper.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 #include <vcl/gfxlink.hxx>
@@ -78,7 +75,7 @@
 #include "unoapi.hxx"
 #include "svx/svdomeas.hxx"
 #include "svx/svdpagv.hxx"
-
+#include "svx/svdpool.hxx"
 #include <tools/shl.hxx>	//
 #include "svx/dialmgr.hxx"		// not nice, we need our own resources some day
 #include "svx/dialogs.hrc"		//
@@ -96,7 +93,7 @@
 #include "svdglob.hxx"
 #include "svdstr.hrc"
 #include "unomaster.hxx"
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
@@ -125,33 +122,6 @@ using ::svx::IPropertyValueProvider;
     if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
         aAny <<= uno::Reference< xint >(this)
 
-const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
-{
-    // Propertymap fuer einen Outliner Text
-    static const SfxItemPropertyMapEntry aSvxUnoOutlinerTextCursorPropertyMap[] =
-    {
-        SVX_UNOEDIT_CHAR_PROPERTIES,
-        SVX_UNOEDIT_FONT_PROPERTIES,
-        SVX_UNOEDIT_OUTLINER_PROPERTIES,
-        SVX_UNOEDIT_PARA_PROPERTIES,
-        {MAP_CHAR_LEN("TextUserDefinedAttributes"),			EE_CHAR_XMLATTRIBS,		&::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  , 		0,     0},
-        {MAP_CHAR_LEN("ParaUserDefinedAttributes"),			EE_PARA_XMLATTRIBS,		&::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0)  , 		0,     0},
-        {0,0,0,0,0,0}
-    };
-
-    return aSvxUnoOutlinerTextCursorPropertyMap;
-}
-const SfxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSfxPropertySet()
-{
-    static SfxItemPropertySet aTextCursorSfxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap() );
-    return &aTextCursorSfxPropertySet; 
-}
-const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet()
-{
-    static SvxItemPropertySet aTextCursorSvxPropertySet( ImplGetSvxUnoOutlinerTextCursorPropertyMap() );
-    return &aTextCursorSvxPropertySet;
-}
-
 class GDIMetaFile;
 class SvStream;
 sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream,
@@ -239,7 +209,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw()
 :	maSize(100,100)
 ,	mpImpl( new SvxShapeImpl( *this, maMutex ) )
 ,	mbIsMultiPropertyCall(false)
-,	mpPropSet(aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE))
+,	mpPropSet(aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
 ,   maPropMapEntries(aSvxMapProvider.GetMap(SVXMAP_SHAPE))
 ,	mpObj(pObject)
 ,	mpModel(NULL)
@@ -269,7 +239,7 @@ SvxShape::SvxShape() throw()
 :	maSize(100,100)
 ,	mpImpl( new SvxShapeImpl( *this, maMutex ) )
 ,	mbIsMultiPropertyCall(false)
-,	mpPropSet(aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE))
+,	mpPropSet(aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
 ,   maPropMapEntries(aSvxMapProvider.GetMap(SVXMAP_SHAPE))
 ,	mpObj(NULL)
 ,	mpModel(NULL)
@@ -634,6 +604,53 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 }
 
 //----------------------------------------------------------------------
+//----------------------------------------------------------------------
+void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
+  SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap )
+{
+    if(rPropSet.AreThereOwnUsrAnys())
+    {
+        const SfxItemPropertyMap* pSrc = rPropSet.getPropertyMap();
+        PropertyEntryVector_t aSrcPropVector = pSrc->getPropertyEntries();
+        PropertyEntryVector_t::const_iterator aSrcIt = aSrcPropVector.begin();
+        while(aSrcIt != aSrcPropVector.end())
+        {
+            if(aSrcIt->nWID)
+            {
+                uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID);
+                if(pUsrAny)
+                {
+                    // Aequivalenten Eintrag in pDst suchen
+                    const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aSrcIt->sName );
+                    if(pEntry)
+                    {
+                        // entry found
+                        if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END)
+                        {
+                            // Special ID im PropertySet, kann nur direkt am
+                            // Objekt gesetzt werden+
+                            xSet->setPropertyValue( aSrcIt->sName, *pUsrAny);
+                        }
+                        else
+                        {
+                            if(rSet.GetPool()->IsWhich(pEntry->nWID))
+                                rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
+
+                            // setzen
+                            SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
+                        }
+                    }
+                }
+            }
+
+            // next entry
+            ++aSrcIt;
+        }
+    }
+}
+
+
+
 void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
 {
     DBG_TESTSOLARMUTEX();
@@ -641,7 +658,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
     {
         SfxItemSet aSet( mpModel->GetItemPool(), SDRATTR_START, SDRATTR_END, 0);
         Reference< beans::XPropertySet > xShape( (OWeakObject*)this, UNO_QUERY );
-        mpPropSet->ObtainSettingsFromPropertySet(rPropSet, aSet, xShape);
+        SvxItemPropertySet_ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() );
 
         mpObj->SetMergedItemSetAndBroadcast(aSet);
 
@@ -1932,8 +1949,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
 
                 if( pSet->GetItemState( pMap->nWID ) == SFX_ITEM_SET )
                 {
-                    mpPropSet->setPropertyValue( pMap, rVal, *pSet );
-
+                    SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rVal, *pSet );
                 }
             }
 
@@ -2233,7 +2249,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
     default:
     {
         // Hole Wert aus ItemSet
-        aAny = mpPropSet->getPropertyValue( pMap, aSet );
+        aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet );
 
         if( *pMap->pType != aAny.getValueType() )
         {
@@ -3438,7 +3454,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_GroupServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_GroupServices, 2,
                             sUNO_service_drawing_GroupShape,
                               sUNO_service_drawing_Shape );
 
@@ -3458,7 +3474,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_CustomShapeServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_CustomShapeServices, 13,
                             sUNO_service_drawing_CustomShape,
                               sUNO_service_drawing_Shape,
                             sUNO_service_drawing_CustomShapeProperties,
@@ -3489,7 +3505,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_LineServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_LineServices,14,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_LineServices,14,
                             sUNO_service_drawing_LineShape,
 
                             sUNO_service_drawing_Shape,
@@ -3524,7 +3540,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_RectServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_RectServices,14,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_RectServices,14,
                             sUNO_service_drawing_RectangleShape,
 
                             sUNO_service_drawing_Shape,
@@ -3561,7 +3577,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_CircServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_CircServices,14,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_CircServices,14,
                             sUNO_service_drawing_EllipseShape,
 
                             sUNO_service_drawing_Shape,
@@ -3597,7 +3613,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_PathServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_PathServices,14,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_PathServices,14,
                             sUNO_service_drawing_PolyLineShape,
 
                             sUNO_service_drawing_Shape,
@@ -3632,7 +3648,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_PolyServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_PolyServices,15,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_PolyServices,15,
                             sUNO_service_drawing_PolyPolygonShape,
 
                             sUNO_service_drawing_Shape,
@@ -3670,7 +3686,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_FreeLineServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeLineServices,15,
                             sUNO_service_drawing_OpenBezierShape,
 
                             sUNO_service_drawing_Shape,
@@ -3708,7 +3724,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_FreeFillServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_FreeFillServices,15,
                             sUNO_service_drawing_ClosedBezierShape,
 
                             sUNO_service_drawing_Shape,
@@ -3746,7 +3762,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_TextServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_TextServices,14,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_TextServices,14,
                             sUNO_service_drawing_TextShape,
 
                             sUNO_service_drawing_Shape,
@@ -3780,7 +3796,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_GrafServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_GrafServices, 12,
                             sUNO_service_drawing_GraphicObjectShape,
 
                             sUNO_service_drawing_Shape,
@@ -3813,7 +3829,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_Ole2Services;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_Ole2Services, 2,
                             sUNO_service_drawing_OLE2Shape,
                             sUNO_service_drawing_Shape);
 
@@ -3833,7 +3849,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_CaptionServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_CaptionServices,14,
                             sUNO_service_drawing_CaptionShape,
 
                             sUNO_service_drawing_Shape,
@@ -3869,7 +3885,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_PageServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_PageServices, 2,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_PageServices, 2,
                             sUNO_service_drawing_PageShape,
                             sUNO_service_drawing_Shape );
 
@@ -3889,7 +3905,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_MeasureServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_MeasureServices,15,
                             sUNO_service_drawing_MeasureShape,
 
                             sUNO_service_drawing_MeasureProperties,
@@ -3927,7 +3943,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_FrameServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_FrameServices, 2,
                             sUNO_service_drawing_FrameShape,
                             sUNO_service_drawing_Shape );
 
@@ -3947,7 +3963,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
                     {
                         static uno::Sequence< OUString > SvxShape_UnoServices;
-                        SvxServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2,
                             sUNO_service_drawing_ControlShape,
                             sUNO_service_drawing_Shape );
 
@@ -3967,7 +3983,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_EdgeServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_EdgeServices,15,
                             sUNO_service_drawing_ConnectorShape,
                             sUNO_service_drawing_ConnectorProperties,
 
@@ -4002,7 +4018,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
                     {
                         static uno::Sequence< OUString > SvxShape_MediaServices;
 
-                        SvxServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2,
+                        comphelper::ServiceInfoHelper::addToSequence( SvxShape_MediaServices, 2,
                             sUNO_service_drawing_MediaShape,
                             sUNO_service_drawing_Shape);
 
@@ -4026,7 +4042,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
 //					if( 0 == pSeq )
             {
                 static uno::Sequence< OUString > SvxShape_UnoServices;
-                SvxServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2,
+                comphelper::ServiceInfoHelper::addToSequence( SvxShape_UnoServices, 2,
                     sUNO_service_drawing_ControlShape,
                     sUNO_service_drawing_Shape );
 
@@ -4229,13 +4245,13 @@ void SvxShape::updateShapeKind()
 * class SvxShapeText                                                   *
 ***********************************************************************/
 SvxShapeText::SvxShapeText() throw ()
-: SvxShape(NULL, aSvxMapProvider.GetMap(SVXMAP_TEXT), aSvxMapProvider.GetPropertySet(SVXMAP_TEXT) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
+: SvxShape(NULL, aSvxMapProvider.GetMap(SVXMAP_TEXT), aSvxMapProvider.GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
 {
 }
 
 //----------------------------------------------------------------------
 SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
-: SvxShape( pObject, aSvxMapProvider.GetMap(SVXMAP_TEXT), aSvxMapProvider.GetPropertySet(SVXMAP_TEXT) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
+: SvxShape( pObject, aSvxMapProvider.GetMap(SVXMAP_TEXT), aSvxMapProvider.GetPropertySet(SVXMAP_TEXT, SdrObject::GetGlobalDrawObjectItemPool()) ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
 {
     if( pObject && pObject->GetModel() )
         SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) );
@@ -4472,8 +4488,7 @@ bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* p
 ***********************************************************************/
 DBG_NAME(SvxShapeRect)
 SvxShapeRect::SvxShapeRect( SdrObject* pObj ) throw()
-: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_SHAPE), aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE) )
-
+: SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_SHAPE), aSvxMapProvider.GetPropertySet(SVXMAP_SHAPE, SdrObject::GetGlobalDrawObjectItemPool()))
 {
     DBG_CTOR(SvxShapeRect,NULL);
 }
@@ -4531,3 +4546,22 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Refer
     SvxShape* pSvxShape = SvxShape::getImplementation( xInt );
     return pSvxShape ? pSvxShape->GetSdrObject() : 0;
 }
+
+uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet )
+{
+    if(!pMap || !pMap->nWID)
+        return uno::Any();
+
+    // Check is for items that store either metric values if thei are positiv or percentage if thei are negativ.
+    bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY );
+    return rPropSet.getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues );
+}
+
+void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet )
+{
+    if(!pMap || !pMap->nWID)
+        return;
+
+    bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY );
+    rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
+}
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 0cc232efdc..8f2fd4495f 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshcol.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,6 +31,7 @@
 
 #include "unoshcol.hxx"
 #include <svx/unoprov.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
@@ -238,7 +236,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException
 sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException )
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 41397f2bcb..7aa72bf0dd 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoshtxt.cxx,v $
- * $Revision: 1.62 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/unoshtxt.hxx>
-#include <unoedhlp.hxx>
+#include <editeng/unoedhlp.hxx>
 #include <svl/lstner.hxx>
 #include <rtl/ref.hxx>
 #include <osl/mutex.hxx>
@@ -45,16 +42,16 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/outliner.hxx>
-#include <svx/unoforou.hxx>
-#include <svx/unoviwou.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unoforou.hxx>
+#include <editeng/unoviwou.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editobj.hxx>
 
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 #include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
@@ -610,8 +607,8 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
 // -
         }
 
-        mpTextForwarder = new SvxOutlinerForwarder( *mpOutliner, mpObject );
 
+        mpTextForwarder = new SvxOutlinerForwarder( *mpOutliner, (mpObject->GetObjInventor() == SdrInventor) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) );
         // delay listener subscription and UAA initialization until Outliner is fully setup
         bCreated = sal_True;
 
@@ -710,8 +707,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder()
 
         if( pEditOutliner )
         {
-            mpTextForwarder = new SvxOutlinerForwarder( *pEditOutliner, mpObject );
-                
+            mpTextForwarder = new SvxOutlinerForwarder( *pEditOutliner, (mpObject->GetObjInventor() == SdrInventor) && (mpObject->GetObjIdentifier() == OBJ_OUTLINETEXT) );            
             mbForwarderIsEditMode = sal_True;
         }
     }
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index e6b03af1c4..5d09dea4f6 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unottabl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk
index a699208f4f..113bd70db0 100755
--- a/svx/source/unogallery/makefile.mk
+++ b/svx/source/unogallery/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index e51b0feb3f..fe01e01449 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogalitem.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/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index 6773591d50..5df3bbcc36 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogalitem.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 9bbe80effd..b461d0db85 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogaltheme.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index 96a2956f63..481facbbf3 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogaltheme.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index a2da39ed92..52674b015c 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unogalthemeprovider.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/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk
index f8d77f9fea..02e6f3ae1f 100644
--- a/svx/source/xml/makefile.mk
+++ b/svx/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.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,8 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files --------------------------------------------------------
 SLOFILES = \
         $(SLO)$/xmlexport.obj		\
-        $(SLO)$/xmltxtimp.obj		\
-        $(SLO)$/xmltxtexp.obj		\
         $(SLO)$/xmlxtimp.obj		\
         $(SLO)$/xmlxtexp.obj		\
         $(SLO)$/xmlgrhlp.obj		\
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 8b94cf3085..a45583f3a6 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmleohlp.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 87815791f2..25577a3fed 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexport.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/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 22e99d74d7..76d63e9f35 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlgrhlp.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,7 +46,7 @@
 #include <vcl/metaact.hxx>
 #include <tools/zcodec.hxx>
 
-#include "svx/impgrf.hxx"
+#include "svtools/filter.hxx"
 #include "xmlgrhlp.hxx"
 
 #include <algorithm>
@@ -142,7 +139,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const ::rtl::OUString& rGraphi
             {
                 if( aGraphic.GetType() == GRAPHIC_BITMAP )
                 {
-                    GraphicFilter*  pFilter = GetGrfFilter();
+                    GraphicFilter*  pFilter = GraphicFilter::GetGraphicFilter();
                     String          aFormat;
 
                     if( aGraphic.IsAnimated() )
@@ -334,7 +331,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
         mpOStm->Seek( 0 );
         USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
         USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
-        GetGrfFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat );
+        GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat );
 
         if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
         {
@@ -377,7 +374,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
                         if (nStreamLen_)
                         {
                             pDest->Seek(0L);
-                            GetGrfFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat );
+                            GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat );
                         }
                     }
                     delete pDest;
@@ -573,7 +570,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor
     if( aStream.xStream.is() )
     {
         SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
-        GetGrfFilter()->ImportGraphic( aGraphic, String(), *pStream );
+        GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pStream );
         delete pStream;
     }
 
@@ -619,7 +616,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
             {
                 if( aGraphic.GetType() == GRAPHIC_BITMAP )
                 {
-                    GraphicFilter*  pFilter = GetGrfFilter();
+                    GraphicFilter*  pFilter = GraphicFilter::GetGraphicFilter();
                     String          aFormat;
 
                     if( aGraphic.IsAnimated() )
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 4106cc00a7..b20083cb32 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlxtexp.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index fb10ef3e8e..e09093d09e 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlxtimp.cxx,v $
- * $Revision: 1.17.264.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 0d8df75d8d..8d65c5bbba 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _xoutbmp.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,9 +38,9 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "svx/impgrf.hxx"
 #include "xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
+#include <svtools/filter.hxx>
 
 // -----------
 // - Defines -
@@ -330,7 +327,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
         INetURLObject	aURL( rFileName );
         Graphic			aGraphic;
         String			aExt;
-        GraphicFilter*	pFilter = GetGrfFilter();
+        GraphicFilter*	pFilter = GraphicFilter::GetGraphicFilter();
         USHORT			nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
         BOOL			bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
 
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index ab9f69d8c8..db8d644fd0 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: _xpoly.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk
index 70e2725e93..1ed48bc71f 100644
--- a/svx/source/xoutdev/makefile.mk
+++ b/svx/source/xoutdev/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index eb47f435ad..e4aaa172c4 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xattr.cxx,v $
- * $Revision: 1.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +41,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <svl/itempool.hxx>
-
+#include <editeng/memberids.hrc>
 #include <tools/stream.hxx>
 
 #include "unoapi.hxx"
@@ -58,7 +55,7 @@
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index b9f42039c4..d00606f4d2 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xattr2.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <svx/xdef.hxx>
 
 #define GLOBALOVERFLOW
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index d0f2052526..d4456fbd43 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xattrbmp.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,13 +35,14 @@
 #include <vcl/bitmapex.hxx>
 #include <toolkit/unohlp.hxx>
 #include <svl/style.hxx>
+#include <editeng/memberids.hrc>
 
 #include <svx/dialogs.hrc>
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 
 #include "unoapi.hxx"
 #include <svx/svdmodel.hxx>
@@ -832,7 +830,7 @@ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
     }
     if( bSetURL )
     {
-        GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+        GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
         XOBitmap aBMP( aGrafObj );
         SetBitmapValue( aBMP );
     }
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 0bdaf792bb..6acaa4a2ca 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xexch.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index f583b2edde..3c71725a72 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xpool.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/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 747a9c873b..efd1c2e6e1 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtabbtmp.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 911f9fd22c..bcf0611bf3 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtabcolr.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/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index a3b2e6d6b3..af2c095ec2 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtabdash.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 75f41bb262..afe584d706 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtabgrdt.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 3e5bed7505..7b65c0896f 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtabhtch.cxx,v $
- * $Revision: 1.22 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 882a4a0a98..30d79d5afe 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtable.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/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 1e48f30c13..ad699750e1 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xtablend.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
index d22d6eb103..e75ae5e8d2 100644
--- a/svx/uiconfig/layout/makefile.mk
+++ b/svx/uiconfig/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.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/util/hidother.hrc b/svx/util/hidother.hrc
index 4a99c24246..209e5fe97c 100644
--- a/svx/util/hidother.hrc
+++ b/svx/util/hidother.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: hidother.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 4cc209b069..f00cb22137 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hidother.src,v $
- * $Revision: 1.45 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,42 +29,9 @@
 #include <svx/svxids.hrc>
 #include "../inc/fmhelp.hrc"
 
-#define HID_AUTOCORR_HELP_ACORSENTWORD          HID_AUTOCORR_HELP_START+5
-#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH  HID_AUTOCORR_HELP_START+13
-#define HID_AUTOCORR_HELP_ACORWORD              HID_AUTOCORR_HELP_START+3
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH      HID_AUTOCORR_HELP_START+11
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL     HID_AUTOCORR_HELP_START+20
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER      HID_AUTOCORR_HELP_START+21
-#define HID_AUTOCORR_HELP_CHGQUOTES             HID_AUTOCORR_HELP_START+15
-#define HID_AUTOCORR_HELP_CHGSGLQUOTES          HID_AUTOCORR_HELP_START+16
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH         HID_AUTOCORR_HELP_START+7
-#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL       HID_AUTOCORR_HELP_START+19
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE    HID_AUTOCORR_HELP_START+18
-#define HID_AUTOCORR_HELP_SENT                  HID_AUTOCORR_HELP_START+1
-#define HID_AUTOCORR_HELP_SENTENEMDASH          HID_AUTOCORR_HELP_START+9
-#define HID_AUTOCORR_HELP_SENTWORD              HID_AUTOCORR_HELP_START+2
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH      HID_AUTOCORR_HELP_START+10
-#define HID_AUTOCORR_HELP_SETINETATTR           HID_AUTOCORR_HELP_START+17
-#define HID_AUTOCORR_HELP_WORD                  HID_AUTOCORR_HELP_START+0
-#define HID_AUTOCORR_HELP_WORDENEMDASH          HID_AUTOCORR_HELP_START+8
-hidspecial HID_AUTOCORR_HELP_ACORSENTWORD   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
-hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
-hidspecial HID_AUTOCORR_HELP_CHGQUOTES          { HelpID =  HID_AUTOCORR_HELP_CHGQUOTES;};
-hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES       { HelpID =  HID_AUTOCORR_HELP_CHGSGLQUOTES;};
-hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL    { HelpID =  HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;};
-hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
-hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
-hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
-hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
-hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
-hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
+/* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE        HID_AUTOCORR_HELP_START+20 */
+/* hidspecial HID_AUTOCORR_HELP_CHGNONBRKSPACE     { HelpID =  HID_AUTOCORR_HELP_CHGNONBRKSPACE;}; */
+
 hidspecial HID_FIELD_SEL                    { HelpID =HID_FIELD_SEL             ;};
 hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN         ;};
 hidspecial HID_FILL_ATTR_LISTBOX                { HelpID = HID_FILL_ATTR_LISTBOX ;};
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 070aecc308..0006fa2ff5 100644
--- a/svx/util/makefile.mk
+++ b/svx/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.61 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,99 +32,49 @@ TARGET=svx
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 
-USE_DEFFILE=TRUE
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
 RSCLOCINC+=-I$(PRJ)$/source$/svdraw
 
-# --- Svx - DLL ----------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=\
-    $(SLB)$/svdraw.lib \
-    $(SLB)$/form.lib
-
-.IF "(GUIBASE)" == "WIN"
-LIB1FILES+=$(SLB)$/ibrwimp.lib
-.ENDIF # (WIN)
-
-LIB2TARGET= $(SLB)$/$(TARGET)_2.lib
-LIB2FILES=\
-    $(SLB)$/items.lib     \
-    $(SLB)$/dialogs.lib	\
-    $(SLB)$/mnuctrls.lib  \
-    $(SLB)$/options.lib   \
-    $(SLB)$/stbctrls.lib  \
-    $(SLB)$/tbxctrls.lib  \
-    $(SLB)$/unoedit.lib   \
-    $(SLB)$/smarttags.lib
-
-LIB3TARGET= $(SLB)$/$(TARGET)_3.lib
-LIB3FILES=\
-    $(SLB)$/unodraw.lib	\
-    $(SLB)$/unogallery.lib\
-    $(SLB)$/accessibility.lib	\
-    $(SLB)$/customshapes.lib
+HELPIDFILES=    ..$/inc$/helpid.hrc
 
-LIB4TARGET= $(SLB)$/$(TARGET)_4.lib
-LIB4FILES=\
-    $(SLB)$/fmcomp.lib \
-    $(SLB)$/engine3d.lib \
-    $(SLB)$/table.lib
+# svxcore
+SHL1TARGET= svxcore$(DLLPOSTFIX)
+SHL1IMPLIB= isvxcore
+SHL1USE_EXPORTS=name
 
-# Objects needed for the svxcore library.
-LIB5TARGET= $(SLB)$/$(TARGET)_5.lib
-LIB5FILES=\
-    $(SLB)$/accessibility-core.lib \
+SHL1LIBS= \
     $(SLB)$/animation.lib \
     $(SLB)$/attribute.lib \
     $(SLB)$/contact.lib \
     $(SLB)$/customshapes-core.lib \
     $(SLB)$/dialogs-core.lib \
-    $(SLB)$/editeng.lib \
     $(SLB)$/engine3d-core.lib \
     $(SLB)$/event.lib \
     $(SLB)$/fmcomp-core.lib \
     $(SLB)$/form-core.lib \
     $(SLB)$/gal.lib \
     $(SLB)$/items-core.lib \
-    $(SLB)$/options-core.lib
-
-LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
-LIB6FILES=\
-    $(SLB)$/outliner.lib \
     $(SLB)$/overlay.lib \
     $(SLB)$/primitive2d.lib \
     $(SLB)$/primitive3d.lib \
     $(SLB)$/properties.lib \
     $(SLB)$/svdraw-core.lib \
-    $(SLB)$/svxlink.lib \
-    $(SLB)$/svxrtf-core.lib \
-    $(SLB)$/svxrtf.lib \
     $(SLB)$/table-core.lib \
-    $(SLB)$/tbxctrls-core.lib  \
+    $(SLB)$/tbxctrls-core.lib \
     $(SLB)$/toolbars.lib \
     $(SLB)$/unodraw-core.lib \
-    $(SLB)$/unoedit-core.lib   \
     $(SLB)$/xml.lib \
     $(SLB)$/xout.lib
 
-HELPIDFILES=    ..$/inc$/helpid.hrc
-
-# svxcore
-SHL1TARGET= svxcore$(DLLPOSTFIX)
-SHL1IMPLIB= isvxcore
-SHL1USE_EXPORTS=name
-SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET)
 
 SHL1STDLIBS= \
+             $(EDITENGLIB) \
              $(AVMEDIALIB) \
              $(SFX2LIB) \
              $(XMLOFFLIB) \
-             $(GOODIESLIB) \
              $(BASEGFXLIB) \
              $(DRAWINGLAYERLIB) \
              $(LNGLIB) \
@@ -152,7 +98,7 @@ SHL1STDLIBS= \
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)_5 $(TARGET)_6
+DEFLIB1NAME=$(SHL1LIBS:b)
 
 # svx
 SHL2TARGET= svx$(DLLPOSTFIX)
@@ -160,12 +106,32 @@ SHL2IMPLIB= i$(TARGET)
 SHL2USE_EXPORTS=name
 SHL2DEPN=$(SHL1TARGETN)
 
-SHL2LIBS= $(LIB1TARGET) $(LIB2TARGET) $(LIB3TARGET) $(LIB4TARGET)
+SHL2LIBS= \
+    $(SLB)$/svdraw.lib \
+    $(SLB)$/form.lib \
+    $(SLB)$/items.lib     \
+    $(SLB)$/dialogs.lib	\
+    $(SLB)$/mnuctrls.lib  \
+    $(SLB)$/stbctrls.lib  \
+    $(SLB)$/tbxctrls.lib  \
+    $(SLB)$/smarttags.lib \
+    $(SLB)$/unodraw.lib	\
+    $(SLB)$/unogallery.lib\
+    $(SLB)$/accessibility.lib	\
+    $(SLB)$/customshapes.lib \
+    $(SLB)$/fmcomp.lib \
+    $(SLB)$/engine3d.lib \
+    $(SLB)$/table.lib
+
+.IF "(GUIBASE)" == "WIN"
+SHL2LIBS+=$(SLB)$/ibrwimp.lib
+.ENDIF # (WIN)
+
 SHL2STDLIBS= \
+            $(EDITENGLIB) \
             $(SVXCORELIB) \
             $(SFX2LIB) \
             $(XMLOFFLIB) \
-            $(GOODIESLIB) \
             $(BASEGFXLIB) \
             $(DRAWINGLAYERLIB) \
             $(BASICLIB) \
@@ -192,7 +158,7 @@ SHL2STDLIBS+=$(SHELLLIB)
 
 SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=	$(SHL2TARGET)
-DEFLIB2NAME=$(TARGET) $(TARGET)_2 $(TARGET)_3 $(TARGET)_4
+DEFLIB2NAME=$(SHL2LIBS:b)
 
 .IF "$(debug)$(dbgutil)"!=""
 SHL2STDLIBS += $(CPPUHELPERLIB)
@@ -203,20 +169,16 @@ SHL2STDLIBS += $(CPPUHELPERLIB)
 # Resource files
 SRSFILELIST=\
         $(SRS)$/svdstr.srs \
-        $(SRS)$/editeng.srs \
-        $(SRS)$/outliner.srs \
         $(SRS)$/dialogs.srs \
         $(SRS)$/drawdlgs.srs \
         $(SRS)$/mnuctrls.srs \
         $(SRS)$/stbctrls.srs \
         $(SRS)$/tbxctrls.srs \
-        $(SRS)$/options.srs \
         $(SRS)$/svxitems.srs \
         $(SRS)$/form.srs \
         $(SRS)$/fmcomp.srs \
         $(SRS)$/engine3d.srs \
         $(SRS)$/unodraw.srs \
-        $(SRS)$/svxlink.srs \
         $(SRS)$/accessibility.srs \
         $(SRS)$/table.srs \
         $(SRS)$/toolbars.srs \
diff --git a/svx/util/makefile.pmk b/svx/util/makefile.pmk
index b2aae33291..e0fffdb1fd 100644
--- a/svx/util/makefile.pmk
+++ b/svx/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/svx/util/svxpch.cxx b/svx/util/svxpch.cxx
index 455b857488..9e35443965 100644
--- a/svx/util/svxpch.cxx
+++ b/svx/util/svxpch.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxpch.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,7 @@
 #include <sfxview.hxx>
 #include <sfxdlg.hxx>
 #include <sfxstyle.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <sbx.hxx>
 #include <hmwrap.hxx>
 #include <mail.hxx>
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index fa1b80b97e..2692a0e9d8 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: edittest.cxx,v $
- * $Revision: 1.20.212.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,13 +28,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#include <svx/editeng.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/editview.hxx>
-#include <svx/editobj.hxx>
-#include <editstat.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
 #include <eerdll.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/svxacorr.hxx>
 #include <tools/fsys.hxx>
@@ -69,23 +66,23 @@
 #include <sfx2/sfxuno.hxx>
 
 // SVX
-#include <svx/lrspitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <fwdtitem.hxx>
 
 // SVTOOLS
diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk
index a18c81ab5c..4aa0a098f0 100644
--- a/svx/workben/makefile.mk
+++ b/svx/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
@@ -59,7 +55,6 @@ APP1STDLIBS=$(TOOLSLIB) 		\
             $(CPPULIB)		\
             $(CPPUHELPERLIB)		\
             $(SALLIB)		\
-            $(GOODIESLIB)		\
             $(SFXLIB)			\
             $(SOTLIB)			\
             $(VCLLIB)
diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk
index 5b7c2a3d63..ee4d384399 100644
--- a/svx/workben/msview/makefile.mk
+++ b/svx/workben/msview/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 208ba5b714..a9afcd8ae9 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msview.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/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index 79473333d0..9b0399434d 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlconfig.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/sysui/desktop/cleanversion/makefile.mk b/sysui/desktop/cleanversion/makefile.mk
index 2d775799bf..71a0d7e3df 100644
--- a/sysui/desktop/cleanversion/makefile.mk
+++ b/sysui/desktop/cleanversion/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index cb43697630..f0f4e42886 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk
index 545d46b08a..a93aafd71a 100644
--- a/sysui/desktop/freedesktop/makefile.mk
+++ b/sysui/desktop/freedesktop/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index 5133ce1901..f98b235d12 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/macosx/gen_strings.pl b/sysui/desktop/macosx/gen_strings.pl
index ed85d3e746..65e81710ce 100644
--- a/sysui/desktop/macosx/gen_strings.pl
+++ b/sysui/desktop/macosx/gen_strings.pl
@@ -6,14 +6,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: gen_strings.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/sysui/desktop/macosx/list_icons.pl b/sysui/desktop/macosx/list_icons.pl
index fc498c272d..a2fc6efcbe 100644
--- a/sysui/desktop/macosx/list_icons.pl
+++ b/sysui/desktop/macosx/list_icons.pl
@@ -6,14 +6,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: list_icons.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/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 951def80bd..8a4a4705e9 100644
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 77bfb31029..011b52e417 100644
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/os2/makefile.mk b/sysui/desktop/os2/makefile.mk
index d848d46868..7d1637254a 100644
--- a/sysui/desktop/os2/makefile.mk
+++ b/sysui/desktop/os2/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 4bb67bc50b..24b1a2db04 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: productversion.mk,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk
index 6baa04867e..a633cfe244 100644
--- a/sysui/desktop/redhat/makefile.mk
+++ b/sysui/desktop/redhat/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 5451f7057f..ca66a51295 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -6,14 +6,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: brand.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index a0ed77b179..9668272a56 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,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/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 8ae555792b..d34c5899ff 100644
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -6,14 +6,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: translate.pl,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/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index 8d8fc071d2..7327aa469f 100644
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright
index 2ebebd6ed8..bc2059a3ef 100644
--- a/sysui/desktop/solaris/copyright
+++ b/sysui/desktop/solaris/copyright
@@ -1,2 +1,2 @@
-Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+Copyright 2000, 2010 Oracle and/or its affiliates.  All rights reserved.
 Use is subject to license terms.
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index 32dc11be96..d2ffc8cdfc 100644
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk
index 5be2ca62d0..31ac8c6cf5 100644
--- a/sysui/desktop/suse/makefile.mk
+++ b/sysui/desktop/suse/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,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/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
index 269ff27b4e..6fab6e748a 100644
--- a/sysui/desktop/tg_rpm.mk
+++ b/sysui/desktop/tg_rpm.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_rpm.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/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
index 42386dbc53..a8c6feaaa1 100644
--- a/sysui/desktop/util/makefile.mk
+++ b/sysui/desktop/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/sysui/source/win32/QuickStart/makefile.mk b/sysui/source/win32/QuickStart/makefile.mk
index 3073ec852d..41242d849d 100644
--- a/sysui/source/win32/QuickStart/makefile.mk
+++ b/sysui/source/win32/QuickStart/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/source/win32/QuickStart/so/makefile.mk b/sysui/source/win32/QuickStart/so/makefile.mk
index cd0b4fb872..6c78972325 100644
--- a/sysui/source/win32/QuickStart/so/makefile.mk
+++ b/sysui/source/win32/QuickStart/so/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/sysui/source/win32/misc/AutoBuffer.cxx b/sysui/source/win32/misc/AutoBuffer.cxx
index 9f74567bc8..76e6b588ad 100644
--- a/sysui/source/win32/misc/AutoBuffer.cxx
+++ b/sysui/source/win32/misc/AutoBuffer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AutoBuffer.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/sysui/source/win32/misc/AutoBuffer.hxx b/sysui/source/win32/misc/AutoBuffer.hxx
index 68343b8b09..6f16a337cd 100644
--- a/sysui/source/win32/misc/AutoBuffer.hxx
+++ b/sysui/source/win32/misc/AutoBuffer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AutoBuffer.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/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx
index f64e24fa56..2af8729a91 100644
--- a/sysui/source/win32/misc/WinImplHelper.cxx
+++ b/sysui/source/win32/misc/WinImplHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinImplHelper.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/sysui/source/win32/misc/WinImplHelper.hxx b/sysui/source/win32/misc/WinImplHelper.hxx
index c9aa069f38..c692e939bd 100644
--- a/sysui/source/win32/misc/WinImplHelper.hxx
+++ b/sysui/source/win32/misc/WinImplHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WinImplHelper.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/sysui/source/win32/misc/makefile.mk b/sysui/source/win32/misc/makefile.mk
index 99bffb582a..b3b94be764 100644
--- a/sysui/source/win32/misc/makefile.mk
+++ b/sysui/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.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sysui/source/win32/misc/resourceprovider.cxx b/sysui/source/win32/misc/resourceprovider.cxx
index b5b80391a9..681f8e527e 100644
--- a/sysui/source/win32/misc/resourceprovider.cxx
+++ b/sysui/source/win32/misc/resourceprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.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/sysui/source/win32/misc/resourceprovider.hxx b/sysui/source/win32/misc/resourceprovider.hxx
index 3b257f1715..b61e477acc 100644
--- a/sysui/source/win32/misc/resourceprovider.hxx
+++ b/sysui/source/win32/misc/resourceprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resourceprovider.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl
index 3ecea2cb68..0909966e07 100644
--- a/sysui/util/checksize.pl
+++ b/sysui/util/checksize.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: checksize.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sysui/util/makefile.mk b/sysui/util/makefile.mk
index d692c1da53..bea3077193 100644
--- a/sysui/util/makefile.mk
+++ b/sysui/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk
index c98dc5fe07..1ed22bada6 100644
--- a/ucb/inc/makefile.mk
+++ b/ucb/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/ucb/inc/pch/precompiled_ucb.cxx b/ucb/inc/pch/precompiled_ucb.cxx
index 1875ac1071..b913449afa 100644
--- a/ucb/inc/pch/precompiled_ucb.cxx
+++ b/ucb/inc/pch/precompiled_ucb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_ucb.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/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 95c67e8284..48490e81f0 100644
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_ucb.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/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java
index 202bc35dcd..86a6d08de7 100755
--- a/ucb/qa/complex/tdoc/CheckContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckContentProvider.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: CheckContentProvider.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/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
index 42e6e222c5..9d244af245 100755
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.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: CheckTransientDocumentsContent.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/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index acf8be4c60..ba67a76b3e 100755
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.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: CheckTransientDocumentsContentProvider.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/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
index 8600dcc7f1..a89f948b19 100755
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CheckTransientDocumentsDocumentContent.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/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/interfaces/_XChild.java
index 755014ec39..1638c6aa6a 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XChild.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XChild.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: _XChild.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/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java
index 46f5a5c238..905dffee4b 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.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: _XCommandInfoChangeNotifier.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/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java b/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java
index 3593e165e8..cb5a203820 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.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: _XCommandProcessor.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/ucb/qa/complex/tdoc/interfaces/_XComponent.java b/ucb/qa/complex/tdoc/interfaces/_XComponent.java
index 2a3c861d7b..a37f14bbdf 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XComponent.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XComponent.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: _XComponent.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/ucb/qa/complex/tdoc/interfaces/_XContent.java b/ucb/qa/complex/tdoc/interfaces/_XContent.java
index a79ed73285..929e9b2b0a 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XContent.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XContent.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: _XContent.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/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java
index a87882c4b1..e182271107 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.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: _XPropertiesChangeNotifier.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/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java b/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java
index d972439ba4..882fdd3877 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.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: _XPropertyContainer.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/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java
index 4895ff350a..a6de169cde 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.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: _XPropertySetInfoChangeNotifier.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/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
index 48a5649f22..2fcf59d56f 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.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: _XServiceInfo.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/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
index 929663acd9..5f71388832 100755
--- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java
+++ b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.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: _XTypeProvider.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/ucb/qa/complex/tdoc/interfaces/makefile.mk b/ucb/qa/complex/tdoc/interfaces/makefile.mk
index e62ec14be2..3a57d1501c 100755
--- a/ucb/qa/complex/tdoc/interfaces/makefile.mk
+++ b/ucb/qa/complex/tdoc/interfaces/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.32.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk
index 5a25db74cf..175184de0f 100755
--- a/ucb/qa/complex/tdoc/makefile.mk
+++ b/ucb/qa/complex/tdoc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.32.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java
index 82d62b3a56..d01b4fde15 100755
--- a/ucb/qa/complex/ucb/UCB.java
+++ b/ucb/qa/complex/ucb/UCB.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: UCB.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/ucb/qa/complex/ucb/makefile.mk b/ucb/qa/complex/ucb/makefile.mk
index e0285e70d3..4664bd3cfa 100755
--- a/ucb/qa/complex/ucb/makefile.mk
+++ b/ucb/qa/complex/ucb/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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.32.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/qa/unoapi/makefile.mk b/ucb/qa/unoapi/makefile.mk
index 556e93f97d..1ceb8eb641 100644
--- a/ucb/qa/unoapi/makefile.mk
+++ b/ucb/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/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a6c3f0aa8e..b5efa2b9e9 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachedcontentresultset.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/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 693c66320f..8cca1605b8 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachedcontentresultset.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/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 4581351420..98ac358c67 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachedcontentresultsetstub.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/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 230d60571e..063315869d 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachedcontentresultsetstub.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/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 7415ceb6c3..c6badc9266 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheddynamicresultset.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/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 3a99962e91..f1ce145b03 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheddynamicresultset.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index f335210860..e719e037b9 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheddynamicresultsetstub.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/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 4c2e3f554f..e5feb70e83 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheddynamicresultsetstub.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 8daa84f0f1..031276472b 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheserv.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/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 7f1254393e..a0b5df0524 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contentresultsetwrapper.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/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 02966e2b54..e9ff1b9a32 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contentresultsetwrapper.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/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 7ff6e85f47..53ecdb17ca 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dynamicresultsetwrapper.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/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 97eac446f3..f5f5b47c9f 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dynamicresultsetwrapper.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/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
index 09717b3f0f..20179f8ce7 100644
--- a/ucb/source/cacher/makefile.mk
+++ b/ucb/source/cacher/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index 0ac11b82a3..5f62cd62e0 100644
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index 62c550b7ca..ee43eb0c78 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index 3410f69f97..2a59aa5c4f 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: identify.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/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index 08e1b8aa10..28241cd302 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: identify.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 3f80aac74c..5095dbef94 100644
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/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.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 5da2142d75..c27c3f092e 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: providermap.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/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index b3fc75376c..e37157bb10 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: provprox.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/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 97d0fc7ea8..403ee6db8a 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: provprox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index d1d93596ab..171a989f8b 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucb.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/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 8febff42ab..0b52812d19 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucb.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/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index d514ffcaa8..d762b7fd67 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbcmds.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/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx
index 623603ab5a..9e608216fb 100644
--- a/ucb/source/core/ucbcmds.hxx
+++ b/ucb/source/core/ucbcmds.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbcmds.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index ade855e628..2a66df86ad 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbprops.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/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 6ff4ea0ecd..4b5793b928 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbprops.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/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 70e09d373d..9c22dabe18 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbserv.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/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index e0abbba396..7bf58a2001 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbstore.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1570,7 +1567,9 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
                     // Write state ( Now it is a directly set value )
                     xNameReplace->replaceByName(
                                     OUString::createFromAscii( "State" ),
-                                    makeAny( PropertyState_DIRECT_VALUE ) );
+                                    makeAny(
+                                        sal_Int32(
+                                            PropertyState_DIRECT_VALUE ) ) );
 
                     // Commit changes.
                     xBatch->commitChanges();
@@ -1854,7 +1853,9 @@ void SAL_CALL PersistentPropertySet::addProperty(
                 // Set state ( always "default" )
                 xNameReplace->replaceByName(
                                     OUString::createFromAscii( "State" ),
-                                    makeAny( PropertyState_DEFAULT_VALUE ) );
+                                    makeAny(
+                                        sal_Int32(
+                                            PropertyState_DEFAULT_VALUE ) ) );
 
                 // Set attributes
                 xNameReplace->replaceByName(
@@ -2330,7 +2331,9 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
                         // Write state ( Now it is a directly set value )
                         xNameReplace->replaceByName(
                                     OUString::createFromAscii( "State" ),
-                                    makeAny( PropertyState_DIRECT_VALUE ) );
+                                    makeAny(
+                                        sal_Int32(
+                                            PropertyState_DIRECT_VALUE ) ) );
 
                         // Commit changes.
                         xBatch->commitChanges();
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 3d9d0978d9..a28a016724 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbstore.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/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx
index c1f985d149..7126b3cbe7 100644
--- a/ucb/source/inc/regexp.hxx
+++ b/ucb/source/inc/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: regexp.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/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index ed76c55929..1027424b08 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: regexpmap.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/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 084867e07f..9d4a7fb69c 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: regexpmap.tpt,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/ucb/source/regexp/makefile.mk b/ucb/source/regexp/makefile.mk
index 8d0b938402..e748f054ea 100644
--- a/ucb/source/regexp/makefile.mk
+++ b/ucb/source/regexp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 0e38b25e3a..cb5d972217 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/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: regexp.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/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk
index bcd3b64447..5077be80b4 100644
--- a/ucb/source/sorter/makefile.mk
+++ b/ucb/source/sorter/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index ca498689bd..39d273bc18 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortdynres.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/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 6f46e545b5..27b9fc4326 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortdynres.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/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index 883b4544bf..a1c781c4d4 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortmain.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/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 9fc3ffe764..e49de7a394 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortresult.cxx,v $
- * $Revision: 1.18.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 0d25283b74..95d59f0b52 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sortresult.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/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk
index 6b4ffc8581..aaa7b85edb 100644
--- a/ucb/source/ucp/expand/makefile.mk
+++ b/ucb/source/ucp/expand/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 611531ff36..ea72dedbc9 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucpexpand.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/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 2221966376..5b9adebe18 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bc.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/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 8a99cba1d0..f62b262808 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bc.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/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index c84cc69439..23bc660a45 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filcmd.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/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index 32fbc74d01..ddd8fa5487 100644
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filcmd.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/ucb/source/ucp/file/filerror.hxx b/ucb/source/ucp/file/filerror.hxx
index e773e5a506..c605f826ac 100644
--- a/ucb/source/ucp/file/filerror.hxx
+++ b/ucb/source/ucp/file/filerror.hxx
@@ -1,14 +1,11 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filerror.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/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 2aa5bf94c9..2a3df432fb 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -1,14 +1,11 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filglob.cxx,v $
- * $Revision: 1.26.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx
index d9ee20f32a..e3464ba7a3 100644
--- a/ucb/source/ucp/file/filglob.hxx
+++ b/ucb/source/ucp/file/filglob.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filglob.hxx,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/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 6def154d33..88abcc1fb4 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filid.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/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index fecf17b8c8..12d1a44fd9 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filid.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/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index a2bf11edeb..22205d9e84 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filinl.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/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index a8cd3d8544..f9ff8d4da0 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filinpstr.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/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 4271e651d9..05e5672751 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filinpstr.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/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index ad1a152cee..986db15430 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filinsreq.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/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index b90f3053c2..617809965d 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filinsreq.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/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index 4039e442b7..3abb89adcd 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filnot.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/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 3f2bc53386..46b808ab86 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filnot.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/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 3e24118a50..9e45763d18 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filprp.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/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index 46acc7ee6e..6a62bc4567 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filprp.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/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx
index 1580069175..424ece5df2 100644
--- a/ucb/source/ucp/file/filrec.cxx
+++ b/ucb/source/ucp/file/filrec.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filrec.cxx,v $
- * $Revision: 1.3.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 40d98aa437..de8def9077 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filrec.hxx,v $
- * $Revision: 1.3.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index e4ccde0731..0b2ad97aea 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filrow.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/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 296de98b6c..9d7b0bff09 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filrow.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/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 134db87e19..e0bd6a0080 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filrset.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/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 8815bc93e6..329889af6c 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filrset.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/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index d353f029b3..494413acc0 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filstr.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/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 815bb52a10..393eda0c6c 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filstr.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/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index b1b7f47fc1..df0b85e4fa 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtask.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/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 642c257b6d..610e251ebb 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filtask.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/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index d03983bca0..b11fdd8081 100644
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 17137c8028..1c4f268e93 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prov.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/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 05956fda04..30fc55b9fc 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prov.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/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 6957db82ed..dff5db9616 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1,14 +1,11 @@
  /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shell.cxx,v $
- * $Revision: 1.98 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 80ffd38f55..e7e67e36f3 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shell.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/ucb/source/ucp/ftp/curl.hxx b/ucb/source/ucp/ftp/curl.hxx
index ed6fe22cd0..761a9466af 100644
--- a/ucb/source/ucp/ftp/curl.hxx
+++ b/ucb/source/ucp/ftp/curl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: curl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/ftp/ftpcfunc.cxx b/ucb/source/ucp/ftp/ftpcfunc.cxx
index 9ec3edf0c0..1f4be95862 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.cxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcfunc.cxx,v $
- * $Revision: 1.7.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index 95a6cd00cb..63e98df698 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcfunc.hxx,v $
- * $Revision: 1.6.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/ftp/ftpcontainer.hxx b/ucb/source/ucp/ftp/ftpcontainer.hxx
index e49a8f7166..8d8829bcbe 100644
--- a/ucb/source/ucp/ftp/ftpcontainer.hxx
+++ b/ucb/source/ucp/ftp/ftpcontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontainer.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/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 73300c1684..e01a209bcf 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontent.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -622,9 +619,7 @@ Any SAL_CALL FTPContent::execute(
             else if(e.code() == CURLE_COULDNT_RESOLVE_HOST )
                 action = THROWRESOLVENAME;
             else if(e.code() == CURLE_FTP_USER_PASSWORD_INCORRECT ||
-#if LIBCURL_VERSION_NUM>=0x070d01 /* 7.13.1 */
                     e.code() == CURLE_LOGIN_DENIED ||
-#endif
                     e.code() == CURLE_BAD_PASSWORD_ENTERED ||
                     e.code() == CURLE_FTP_WEIRD_PASS_REPLY)
                 action = THROWAUTHENTICATIONREQUEST;
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index 0b41c9be1d..9dcb8103a5 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontent.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/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 874bb9bbd0..607ecbc4b0 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontentcaps.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/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index dc6b550c4c..eaff30cce1 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontentidentifier.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/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 27038ca3df..d4f423b059 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontentidentifier.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/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 15fcf5378b..f0e1f09624 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontentprovider.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/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 1ab2f8dd54..9e67a8c6fd 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpcontentprovider.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/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index 516ad7e84d..0a47535d59 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpdirp.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/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index 94df845d38..810d45f101 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpdirp.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/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx
index 84b711cfdd..ac6b5b5546 100644
--- a/ucb/source/ucp/ftp/ftpdynresultset.cxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpdynresultset.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/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx
index 8139ccacf5..b1d9194f75 100644
--- a/ucb/source/ucp/ftp/ftpdynresultset.hxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpdynresultset.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/ucb/source/ucp/ftp/ftpinpstr.cxx b/ucb/source/ucp/ftp/ftpinpstr.cxx
index 2f7a82baa2..2faac1e932 100644
--- a/ucb/source/ucp/ftp/ftpinpstr.cxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpinpstr.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/ucb/source/ucp/ftp/ftpinpstr.hxx b/ucb/source/ucp/ftp/ftpinpstr.hxx
index 1ecf5e8bab..83431371ec 100644
--- a/ucb/source/ucp/ftp/ftpinpstr.hxx
+++ b/ucb/source/ucp/ftp/ftpinpstr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpinpstr.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/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index cb0712f19f..9d9bf49b28 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpintreq.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/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 6d335f22ef..8ffb48232d 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpintreq.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/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index 930beaa873..0d81ee9a82 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftploaderthread.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/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index a12d3ecca6..ac3048080e 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftploaderthread.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/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 6961072383..f9944f363f 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpresultsetI.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/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index 433a64ad1b..f108063c06 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpresultsetI.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 12ef1cb180..ead162c99d 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpresultsetbase.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/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 90d001743f..75198bea70 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpresultsetbase.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/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
index 7949017c38..b609ff30e4 100644
--- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpresultsetfactory.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/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index a8eb26069d..ca2cf3823d 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpservices.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/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx
index 17a8cd158c..c79c8e8a01 100644
--- a/ucb/source/ucp/ftp/ftpstrcont.hxx
+++ b/ucb/source/ucp/ftp/ftpstrcont.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpstrcont.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/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 52615e79f9..c107d3b16d 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpurl.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/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 33e2c268b2..d595573a76 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ftpurl.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/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index 75f5512c72..d9b674b786 100644
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx
index 9fd7b0281a..d15cbf9279 100644
--- a/ucb/source/ucp/ftp/test.cxx
+++ b/ucb/source/ucp/ftp/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.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx
index cd008735df..3d609e1a99 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.cxx
+++ b/ucb/source/ucp/ftp/test_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: test_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/ucb/source/ucp/ftp/test_activedatasink.hxx b/ucb/source/ucp/ftp/test_activedatasink.hxx
index 75835ded99..096710aae9 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.hxx
+++ b/ucb/source/ucp/ftp/test_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: test_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/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx
index 9d7167e078..5eaa165003 100755
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_ftpurl.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/ucb/source/ucp/ftp/test_interactionhandler.hxx b/ucb/source/ucp/ftp/test_interactionhandler.hxx
index 51cb804cf3..edb27f5651 100644
--- a/ucb/source/ucp/ftp/test_interactionhandler.hxx
+++ b/ucb/source/ucp/ftp/test_interactionhandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_interactionhandler.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx
index 6dcf8b054f..5c7e2a31a8 100644
--- a/ucb/source/ucp/ftp/test_multiservicefac.cxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_multiservicefac.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/ucb/source/ucp/ftp/test_multiservicefac.hxx b/ucb/source/ucp/ftp/test_multiservicefac.hxx
index 8b55046535..6e99e953ed 100644
--- a/ucb/source/ucp/ftp/test_multiservicefac.hxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_multiservicefac.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/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 6e214308ae..249eace0ea 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_content.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/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 1cb32e61e9..7d004d5242 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_content.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/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 530456b250..2bf26bbd6b 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_datasupplier.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/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index c2f2ee1290..6b15ccf1ec 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_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: gio_datasupplier.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/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index b173b4724c..008d9c4cdc 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_inputstream.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/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 1f53b7117a..70a65236c8 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_inputstream.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/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 4166366c09..3617ed9ee7 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_mount.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/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx
index 3890e49a58..21fa002274 100644
--- a/ucb/source/ucp/gio/gio_mount.hxx
+++ b/ucb/source/ucp/gio/gio_mount.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_mount.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/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 3bb20f5db5..2d10e25eb1 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_outputstream.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/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index 2e5479bece..aa8e22f11a 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_outputstream.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/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index d799a38fd4..9921f3a118 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_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: gio_provider.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/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 0eaa21c518..a4bf10d62a 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_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: gio_provider.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/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx
index ae9019e73a..847be8b9d6 100644
--- a/ucb/source/ucp/gio/gio_resultset.cxx
+++ b/ucb/source/ucp/gio/gio_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: gio_resultset.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/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx
index e5edd110a9..6041383326 100644
--- a/ucb/source/ucp/gio/gio_resultset.hxx
+++ b/ucb/source/ucp/gio/gio_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: gio_resultset.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/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index 6c3b680121..562d04211e 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_seekable.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/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 1c25a7aaac..ea9953ca0e 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gio_seekable.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/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk
index 2e7009e52a..e6ebe2413e 100644
--- a/ucb/source/ucp/gio/makefile.mk
+++ b/ucb/source/ucp/gio/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index c902ac71ec..121c69346f 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: content.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -629,38 +626,38 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             else
                 xRow->appendVoid( rProp );
         }
-
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) ) {
             if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE)
                 xRow->appendBoolean( rProp, ( m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) );
             else
                 xRow->appendVoid( rProp );
         }
+        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) ) {
 
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-                xRow->appendLong( rProp, m_info.size );
-            else
-                xRow->appendVoid( rProp );
-        }
+            GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
 
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) {
+            ::rtl::OString aURI = getOURI();
+            gnome_vfs_get_file_info
+                ( (const sal_Char *)aURI, fileInfo,
+                        GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS );
+
+            if (fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) {
                 bool read_only = true;
 
-                if (m_info.uid == getuid () &&
-                    m_info.permissions & GNOME_VFS_PERM_USER_WRITE)
-                    read_only = false;
-                else if (m_info.gid == getgid () &&
-                    m_info.permissions & GNOME_VFS_PERM_GROUP_WRITE)
-                    read_only = false;
-                else if (m_info.permissions & GNOME_VFS_PERM_OTHER_WRITE)
-                    read_only = false;
+                if (fileInfo->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE)
+                                        read_only = false;
+
                 xRow->appendBoolean( rProp, read_only );
             } else
                 xRow->appendVoid( rProp );
+            gnome_vfs_file_info_unref (fileInfo);
+        }
+        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) {
+            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
+                xRow->appendLong( rProp, m_info.size );
+            else
+                xRow->appendVoid( rProp );
         }
-
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsHidden" ) ) )
             xRow->appendBoolean( rProp, ( m_info.name && m_info.name[0] == '.' ) );
 
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 67425da4df..3b73162572 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: content.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/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index d8357a060a..9654b3bc8d 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -360,25 +357,24 @@ sal_Bool DataSupplier::getData()
             g_free( uri );
         }
 
+        GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
 
-        GnomeVFSFileInfo fileInfo;
-        fileInfo.name = 0;
-        while ((result = gnome_vfs_directory_read_next (dirHandle, &fileInfo)) == GNOME_VFS_OK) {
-            if( fileInfo.name && fileInfo.name[0] == '.' &&
-                ( fileInfo.name[1] == '\0' ||
-                  ( fileInfo.name[1] == '.' && fileInfo.name[2] == '\0' ) ) )
+        while ((result = gnome_vfs_directory_read_next (dirHandle, fileInfo)) == GNOME_VFS_OK) {
+            if( fileInfo->name && fileInfo->name[0] == '.' &&
+                ( fileInfo->name[1] == '\0' ||
+                  ( fileInfo->name[1] == '.' && fileInfo->name[2] == '\0' ) ) )
                 continue;
 
             switch ( m_pImpl->m_nOpenMode ) {
             case ucb::OpenMode::FOLDERS:
-                if ( !(fileInfo.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
-                     fileInfo.type != GNOME_VFS_FILE_TYPE_DIRECTORY )
+                if ( !(fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
+                     fileInfo->type != GNOME_VFS_FILE_TYPE_DIRECTORY )
                     continue;
                 break;
 
             case ucb::OpenMode::DOCUMENTS:
-                if ( !(fileInfo.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
-                     fileInfo.type != GNOME_VFS_FILE_TYPE_REGULAR )
+                if ( !(fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
+                     fileInfo->type != GNOME_VFS_FILE_TYPE_REGULAR )
                     continue;
                 break;
 
@@ -387,8 +383,11 @@ sal_Bool DataSupplier::getData()
                 break;
             }
 
-            m_pImpl->m_aResults.push_back( new ResultListEntry( &fileInfo ) );
+            m_pImpl->m_aResults.push_back( new ResultListEntry( fileInfo ) );
         }
+
+        gnome_vfs_file_info_unref (fileInfo);
+
 #ifdef DEBUG
         g_warning ("Got %d directory entries", result);
 #endif
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index 929eae9b18..c771d497d9 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: directory.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/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index a5eca1dadd..92fa95c0e6 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: provider.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/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index 4aa024ee96..39cd7b0cdb 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index 007693d46a..8c5c7c676f 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: stream.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/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx
index a621c08e98..d7fb17cd6b 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_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.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk
index 81eb43da97..b69455777c 100644
--- a/ucb/source/ucp/gvfs/makefile.mk
+++ b/ucb/source/ucp/gvfs/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
index f0c7ecf4f9..399b000ca0 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dynamicresultset.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/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
index 7d06819ef9..505d4ea5ae 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dynamicresultset.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/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 8027700a01..e868dfc023 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchycontent.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/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 4094d77e4c..4dcb339ad6 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchycontent.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/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index 47280ec125..32677da383 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchycontentcaps.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/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index eb88177691..bed1d9105d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchydata.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/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index 4add72a283..419a66b0c6 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchydata.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/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 933beec7f7..ee1e31821d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchydatasource.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/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 4681a53df2..2e4a7bc7d3 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchydatasource.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index d254d4259b..ebd5739afb 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchydatasupplier.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/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index a18d450310..1d1755b197 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchydatasupplier.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/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index cef8e4759e..e35aa5a22e 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchyprovider.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/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 4d2f09142a..1db4ce758e 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchyprovider.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/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 6df458de86..3249334d90 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchyservices.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/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 7339e34341..51b18c6482 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchyuri.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/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index 46b9e92a0d..6738214cb6 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: hierarchyuri.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/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk
index b71ee7fa18..a968537873 100644
--- a/ucb/source/ucp/hierarchy/makefile.mk
+++ b/ucb/source/ucp/hierarchy/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx
index a3618293ed..fbf4cdb76f 100644
--- a/ucb/source/ucp/inc/urihelper.hxx
+++ b/ucb/source/ucp/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
index 290898e655..d9ddcbfdf0 100644
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index fc4be63462..663436b2cb 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_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: odma_content.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/ucb/source/ucp/odma/odma_content.hxx b/ucb/source/ucp/odma/odma_content.hxx
index 6c824176ed..ab50e1aec7 100644
--- a/ucb/source/ucp/odma/odma_content.hxx
+++ b/ucb/source/ucp/odma/odma_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: odma_content.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/ucb/source/ucp/odma/odma_contentcaps.cxx b/ucb/source/ucp/odma/odma_contentcaps.cxx
index a9df4574c4..aa030af6fd 100644
--- a/ucb/source/ucp/odma/odma_contentcaps.cxx
+++ b/ucb/source/ucp/odma/odma_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: odma_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/ucb/source/ucp/odma/odma_contentprops.hxx b/ucb/source/ucp/odma/odma_contentprops.hxx
index a5b5c7e41e..8ac9fae68f 100644
--- a/ucb/source/ucp/odma/odma_contentprops.hxx
+++ b/ucb/source/ucp/odma/odma_contentprops.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odma_contentprops.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/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index a047921752..a9024d4e64 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_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: odma_datasupplier.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/ucb/source/ucp/odma/odma_datasupplier.hxx b/ucb/source/ucp/odma/odma_datasupplier.hxx
index d9624d20f0..3653d0bdc4 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.hxx
+++ b/ucb/source/ucp/odma/odma_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: odma_datasupplier.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/ucb/source/ucp/odma/odma_inputstream.cxx b/ucb/source/ucp/odma/odma_inputstream.cxx
index 6de50a90c2..d3011f56d7 100644
--- a/ucb/source/ucp/odma/odma_inputstream.cxx
+++ b/ucb/source/ucp/odma/odma_inputstream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odma_inputstream.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/ucb/source/ucp/odma/odma_inputstream.hxx b/ucb/source/ucp/odma/odma_inputstream.hxx
index 93ae4a066b..c5fde77743 100644
--- a/ucb/source/ucp/odma/odma_inputstream.hxx
+++ b/ucb/source/ucp/odma/odma_inputstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odma_inputstream.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/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index e837c51ad6..b6a0d3ada1 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odma_lib.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/ucb/source/ucp/odma/odma_lib.hxx b/ucb/source/ucp/odma/odma_lib.hxx
index 2fbc1cda1e..0c9180ee7d 100644
--- a/ucb/source/ucp/odma/odma_lib.hxx
+++ b/ucb/source/ucp/odma/odma_lib.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odma_lib.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/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index 47152d0921..ccd032f686 100644
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: odma_main.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/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index 988af49933..c6a30acc86 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_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: odma_provider.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/ucb/source/ucp/odma/odma_provider.hxx b/ucb/source/ucp/odma/odma_provider.hxx
index 682e44fa64..cbd8e6b49f 100644
--- a/ucb/source/ucp/odma/odma_provider.hxx
+++ b/ucb/source/ucp/odma/odma_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: odma_provider.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/ucb/source/ucp/odma/odma_resultset.cxx b/ucb/source/ucp/odma/odma_resultset.cxx
index 2fdd2aa0fd..0e87441c77 100644
--- a/ucb/source/ucp/odma/odma_resultset.cxx
+++ b/ucb/source/ucp/odma/odma_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: odma_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/ucb/source/ucp/odma/odma_resultset.hxx b/ucb/source/ucp/odma/odma_resultset.hxx
index cb1ac90597..690f73d19f 100644
--- a/ucb/source/ucp/odma/odma_resultset.hxx
+++ b/ucb/source/ucp/odma/odma_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: odma_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/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 1acb689f86..1140083942 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_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: odma_services.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/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk
index 4b4f066ac1..bd4707cccc 100644
--- a/ucb/source/ucp/package/makefile.mk
+++ b/ucb/source/ucp/package/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 7e8359545e..56d60eb551 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgcontent.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/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 1886d72470..1021f2563e 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgcontent.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/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index b2ae1951fb..636b1b3164 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgcontentcaps.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/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index c465e8d7b4..72a6ffe91b 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgdatasupplier.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/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index e0eeccbefb..6775ff581e 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgdatasupplier.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/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 434fe969e0..dfaaf43034 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgprovider.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/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 8d84e8cb54..4862f64ace 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgprovider.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/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx
index 5320b2b16f..a843c6971f 100644
--- a/ucb/source/ucp/package/pkgresultset.cxx
+++ b/ucb/source/ucp/package/pkgresultset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgresultset.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/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx
index 6d9fca191e..9b6adca131 100644
--- a/ucb/source/ucp/package/pkgresultset.hxx
+++ b/ucb/source/ucp/package/pkgresultset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgresultset.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/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 202edf41f8..61edd11642 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkgservices.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/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index a246d9cbd5..12a54eeda5 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkguri.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/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index 42949afd51..ee2bbd9ca3 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: pkguri.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/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk
index 1c2c44b124..2c85514ef9 100644
--- a/ucb/source/ucp/tdoc/makefile.mk
+++ b/ucb/source/ucp/tdoc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 52d5e917bd..8a17b44fb3 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_content.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/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 5f81792cd9..7fde2aeea9 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_content.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/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index 9d026ce742..acb85c2d28 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_contentcaps.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/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 4ea50aba52..62bdf66b28 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_datasupplier.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/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index 4e88e63d65..d555f4f739 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_datasupplier.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/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 0d1b236397..8361e4bbbc 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_docmgr.cxx,v $
- * $Revision: 1.19.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index ddf990fb4c..c9d68e5f7f 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_docmgr.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/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index 7ce9b01f95..02df472ff2 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_documentcontentfactory.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/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 4960777adb..bde79fc1cb 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_documentcontentfactory.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/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index d0c438543c..53c4ce84bb 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_passwordrequest.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/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
index cad379ed63..50381c8873 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_passwordrequest.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/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 684e4bb609..7bb8af30b2 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_provider.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/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 3ad5d147cd..ca2ab4e5e7 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_provider.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/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
index 915d7e416a..7beab3f46f 100644
--- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_resultset.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/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
index bd0c064804..1a13b82443 100644
--- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_resultset.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/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 4b507f7a2f..26b1d8a2de 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_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/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 6e0e327174..49065d4ae1 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_stgelems.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/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 76917a15f3..424af316ae 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_stgelems.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/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 0ce268bb15..7927108aad 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_storage.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/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index 0c858d5bd4..f570a8a3ab 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_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: tdoc_storage.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/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 2eef39f6e0..5c52a39248 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_uri.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/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index b4e75d327a..91427bddde 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tdoc_uri.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/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index 4cc975070d..4bb54dea94 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ContentProperties.cxx,v $
- * $Revision: 1.12.18.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx
index 4fb9af57f2..5a21dba08a 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ContentProperties.hxx,v $
- * $Revision: 1.12.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx
index 6a4a84db81..fb5f0d0449 100644
--- a/ucb/source/ucp/webdav/DAVAuthListener.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVAuthListener.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/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
index 2192e1fcca..3ee5bf152c 100644
--- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVAuthListenerImpl.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/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx
index cbbd647559..54ad20f440 100644
--- a/ucb/source/ucp/webdav/DAVException.hxx
+++ b/ucb/source/ucp/webdav/DAVException.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVException.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/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index d2d434184a..1b950984b4 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVProperties.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/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx
index cd87f8238e..8567946177 100644
--- a/ucb/source/ucp/webdav/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav/DAVProperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVProperties.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/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
index d8cbe527c6..c1a3ffb295 100644
--- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
+++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVRequestEnvironment.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/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx
index 8dc62f4171..a133f0ba56 100644
--- a/ucb/source/ucp/webdav/DAVResource.hxx
+++ b/ucb/source/ucp/webdav/DAVResource.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVResource.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/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 00b42e24a5..076d92d214 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVResourceAccess.cxx,v $
- * $Revision: 1.29.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index b4f6eb2b5a..31b9bbbfd8 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVResourceAccess.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/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx
index 00b0b75e2a..1206679fc5 100644
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVSession.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/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index fba6318638..112fc93ca9 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVSessionFactory.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/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 0b41f5e5fe..11b2ef29d5 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVSessionFactory.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/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx
index 3d9173f820..4d000057b0 100644
--- a/ucb/source/ucp/webdav/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav/DAVTypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DAVTypes.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/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx
index 4ce2e08c29..ab3da8d22a 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DateTimeHelper.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/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx
index eb8999bca0..101bd8191b 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DateTimeHelper.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/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx
index fad89d3759..1d33216b4d 100644
--- a/ucb/source/ucp/webdav/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav/LinkSequence.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LinkSequence.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/ucb/source/ucp/webdav/LinkSequence.hxx b/ucb/source/ucp/webdav/LinkSequence.hxx
index 368becfb06..8a2a13d015 100644
--- a/ucb/source/ucp/webdav/LinkSequence.hxx
+++ b/ucb/source/ucp/webdav/LinkSequence.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LinkSequence.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/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav/LockEntrySequence.cxx
index 50600e0ad0..8ed838d720 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LockEntrySequence.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/ucb/source/ucp/webdav/LockEntrySequence.hxx b/ucb/source/ucp/webdav/LockEntrySequence.hxx
index 7c81a5f215..6f00020b63 100644
--- a/ucb/source/ucp/webdav/LockEntrySequence.hxx
+++ b/ucb/source/ucp/webdav/LockEntrySequence.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LockEntrySequence.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/ucb/source/ucp/webdav/LockSequence.cxx b/ucb/source/ucp/webdav/LockSequence.cxx
index e55de62e55..2c51d5ce1f 100644
--- a/ucb/source/ucp/webdav/LockSequence.cxx
+++ b/ucb/source/ucp/webdav/LockSequence.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LockSequence.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/ucb/source/ucp/webdav/LockSequence.hxx b/ucb/source/ucp/webdav/LockSequence.hxx
index 79fbe4dba5..0e218d1a80 100644
--- a/ucb/source/ucp/webdav/LockSequence.hxx
+++ b/ucb/source/ucp/webdav/LockSequence.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: LockSequence.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/ucb/source/ucp/webdav/NeonHeadRequest.cxx b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
index 36208be7b0..4b29afae5a 100644
--- a/ucb/source/ucp/webdav/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonHeadRequest.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/ucb/source/ucp/webdav/NeonHeadRequest.hxx b/ucb/source/ucp/webdav/NeonHeadRequest.hxx
index 6e44df3bb1..9bbafc9d82 100644
--- a/ucb/source/ucp/webdav/NeonHeadRequest.hxx
+++ b/ucb/source/ucp/webdav/NeonHeadRequest.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonHeadRequest.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/ucb/source/ucp/webdav/NeonInputStream.cxx b/ucb/source/ucp/webdav/NeonInputStream.cxx
index 3fdd0dbecd..746ce5666b 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonInputStream.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/ucb/source/ucp/webdav/NeonInputStream.hxx b/ucb/source/ucp/webdav/NeonInputStream.hxx
index 4d95c3eedd..7130f5a0bd 100644
--- a/ucb/source/ucp/webdav/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav/NeonInputStream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonInputStream.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/ucb/source/ucp/webdav/NeonLockStore.cxx b/ucb/source/ucp/webdav/NeonLockStore.cxx
index 9d151bc2ba..a73e104649 100644
--- a/ucb/source/ucp/webdav/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/NeonLockStore.hxx b/ucb/source/ucp/webdav/NeonLockStore.hxx
index b00361d55e..4db273ca73 100644
--- a/ucb/source/ucp/webdav/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 2a1703336b..172e43511b 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonPropFindRequest.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/ucb/source/ucp/webdav/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
index 1e6d3a07b2..7487b29b74 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonPropFindRequest.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/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 78f351f88f..d9ff4c0290 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -1,13 +1,11 @@
 /*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 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
  *
- * $RCSfile: NeonSession.cxx,v $
- * $Revision: 1.55.12.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav/NeonSession.hxx
index bb6bbbb8d3..103724311d 100644
--- a/ucb/source/ucp/webdav/NeonSession.hxx
+++ b/ucb/source/ucp/webdav/NeonSession.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonSession.hxx,v $
- * $Revision: 1.31.12.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/NeonTypes.hxx b/ucb/source/ucp/webdav/NeonTypes.hxx
index 633864d263..cb150f06b2 100644
--- a/ucb/source/ucp/webdav/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav/NeonTypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonTypes.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/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index e318cde673..9b97c264a6 100644
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonUri.cxx,v $
- * $Revision: 1.25.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/NeonUri.hxx b/ucb/source/ucp/webdav/NeonUri.hxx
index 1b54085e53..2623887ae0 100644
--- a/ucb/source/ucp/webdav/NeonUri.hxx
+++ b/ucb/source/ucp/webdav/NeonUri.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NeonUri.hxx,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/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx
index 14e915bc1c..fefe316979 100644
--- a/ucb/source/ucp/webdav/PropertyMap.hxx
+++ b/ucb/source/ucp/webdav/PropertyMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyMap.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index 532a6f745b..f9a36d3113 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UCBDeadPropertyValue.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/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
index 77aa746587..b6a2bba2d4 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UCBDeadPropertyValue.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/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 848cecd882..551efb6f06 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/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.43 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index def33876eb..c4aab34aa2 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavcontent.cxx,v $
- * $Revision: 1.65.12.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 78e2a4a184..85b9b710f3 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavcontent.hxx,v $
- * $Revision: 1.23.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 7f3c20eb08..0af93828ac 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavcontentcaps.cxx,v $
- * $Revision: 1.21.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index d36867da6e..0dc4c46fc5 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavdatasupplier.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/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
index 4d555982f9..878257e85b 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavdatasupplier.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/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index d6caf7aafe..4cbe267fcb 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavprovider.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/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 2b9af841f5..c435c2ea64 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavprovider.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/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx
index 330d49abe2..8234628e71 100644
--- a/ucb/source/ucp/webdav/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav/webdavresultset.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavresultset.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/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx
index f05227e9f9..7b084e6b5c 100644
--- a/ucb/source/ucp/webdav/webdavresultset.hxx
+++ b/ucb/source/ucp/webdav/webdavresultset.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavresultset.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/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 2bf66572b7..288772231a 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: webdavservices.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/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
index 6ffb4e18ff..3453a78193 100644
--- a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java
+++ b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.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: GlobalTransfer_Test.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/ucb/test/com/sun/star/comp/ucb/makefile.mk b/ucb/test/com/sun/star/comp/ucb/makefile.mk
index 529b2c6051..1f2e355939 100644
--- a/ucb/test/com/sun/star/comp/ucb/makefile.mk
+++ b/ucb/test/com/sun/star/comp/ucb/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx
index 03e29cec15..e8223d480a 100644
--- a/ucb/workben/cachemap/cachemapobject1.cxx
+++ b/ucb/workben/cachemap/cachemapobject1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobject1.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/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index 99e947204b..374870a532 100644
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobject1.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/ucb/workben/cachemap/cachemapobject2.hxx b/ucb/workben/cachemap/cachemapobject2.hxx
index c229e96c19..f70cef7292 100644
--- a/ucb/workben/cachemap/cachemapobject2.hxx
+++ b/ucb/workben/cachemap/cachemapobject2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobject2.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx
index bfab8c4954..5b8cd41135 100644
--- a/ucb/workben/cachemap/cachemapobject3.cxx
+++ b/ucb/workben/cachemap/cachemapobject3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobject3.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/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index 0cf2c982a1..91af9a719e 100644
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobject3.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/ucb/workben/cachemap/cachemapobjectcontainer2.cxx b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
index 21e762c343..55a4b2deba 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobjectcontainer2.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/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
index a9686a4bf9..a110a7adfe 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemapobjectcontainer2.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucb/workben/cachemap/cachemaptest.cxx b/ucb/workben/cachemap/cachemaptest.cxx
index 4e632de94b..ad754fbf90 100644
--- a/ucb/workben/cachemap/cachemaptest.cxx
+++ b/ucb/workben/cachemap/cachemaptest.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cachemaptest.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/ucb/workben/cachemap/makefile.mk b/ucb/workben/cachemap/makefile.mk
index a42d7ec5f4..53d50fcd21 100644
--- a/ucb/workben/cachemap/makefile.mk
+++ b/ucb/workben/cachemap/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
index baf0a11de0..9a9992a3a7 100644
--- a/ucb/workben/ucb/makefile.mk
+++ b/ucb/workben/ucb/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx
index 0997a90f19..02d05ded3e 100644
--- a/ucb/workben/ucb/srcharg.cxx
+++ b/ucb/workben/ucb/srcharg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srcharg.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/ucb/workben/ucb/srcharg.hxx b/ucb/workben/ucb/srcharg.hxx
index 3cd82ff44b..52b26b435e 100644
--- a/ucb/workben/ucb/srcharg.hxx
+++ b/ucb/workben/ucb/srcharg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: srcharg.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/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index c2d58f2ef1..f90b64a09a 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ucbdemo.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/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 1f2b170f60..b63e89cb7a 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index 2ba2db8a06..3fd695cc8f 100644
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
index e4222af91d..7541396d54 100644
--- a/uui/source/alreadyopen.src
+++ b/uui/source/alreadyopen.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index 34e3d96a8a..fea8b9a274 100644
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cookiedg.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/cookiedg.hrc b/uui/source/cookiedg.hrc
index 84e219aed7..b51309d2e5 100644
--- a/uui/source/cookiedg.hrc
+++ b/uui/source/cookiedg.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: cookiedg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx
index 6cfa190b1f..23956945e7 100644
--- a/uui/source/cookiedg.hxx
+++ b/uui/source/cookiedg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cookiedg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src
index bc45126724..0737ff3f5c 100644
--- a/uui/source/cookiedg.src
+++ b/uui/source/cookiedg.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: cookiedg.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/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 31e942309c..130f928fdb 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index 76f4ad3e8e..2c37359753 100644
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
index 4ebf0826e0..b566f6344b 100644
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index cd617988d0..3c09d66767 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltdlg.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/uui/source/fltdlg.hrc b/uui/source/fltdlg.hrc
index ec5bda8215..3fe7f792d2 100644
--- a/uui/source/fltdlg.hrc
+++ b/uui/source/fltdlg.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: fltdlg.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/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index e6e679d658..f9cec7899a 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fltdlg.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/uui/source/fltdlg.src b/uui/source/fltdlg.src
index ac04d13974..82b230e38f 100644
--- a/uui/source/fltdlg.src
+++ b/uui/source/fltdlg.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: fltdlg.src,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/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index 9cc39b3823..aefa485166 100644
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iahndl.cxx,v $
- * $Revision: 1.67.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 9154122187..70d57cebc5 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
index 9e8f45b5c1..0c8d237f4a 100644
--- a/uui/source/iahndl-cookies.cxx
+++ b/uui/source/iahndl-cookies.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index ed8fd21181..ad5be3705a 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iahndl.cxx,v $
- * $Revision: 1.67.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 4c56e8566c..7a0a0c24dd 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index b9bc7b4017..d233f93c7e 100644
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iahndl.cxx,v $
- * $Revision: 1.67.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 48409235d6..cac71ae277 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index e5e1a14bb2..24d60bdb2e 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index e9f1b9e4c6..2c1d4d7395 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iahndl.cxx,v $
- * $Revision: 1.67.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index e0b58f66ed..b77032e3cf 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: iahndl.hxx,v $
- * $Revision: 1.21.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 36a246fdbc..d7b8ae15d7 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ids.hrc,v $
- * $Revision: 1.26.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 0d692a13fa..efff262861 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -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: ids.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/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index dd8a875ff0..08bc672418 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interactionhandler.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
index d420507b10..11c9b45075 100644
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: interactionhandler.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 20a3ff4798..b5320a1303 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index 9d36803747..70ba107961 100644
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index 6b21d6fc64..c4057387ed 100644
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 99bbfac627..4bfa2147ec 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/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.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc
index d13afae854..13848e694a 100644
--- a/uui/source/logindlg.hrc
+++ b/uui/source/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/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index e3cbea5d41..a8b2fa9c60 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index 88dec194fb..ced176d10a 100644
--- a/uui/source/logindlg.src
+++ b/uui/source/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.42 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index 49aaf818e5..1d5451529e 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: loginerr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk
index d0d8d4e755..5c20e59304 100644
--- a/uui/source/makefile.mk
+++ b/uui/source/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.12.22.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 460cc4e342..b9e82b862f 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpasscrtdlg.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc
index dbee5a44ec..634a047478 100644
--- a/uui/source/masterpasscrtdlg.hrc
+++ b/uui/source/masterpasscrtdlg.hrc
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpasscrtdlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 88581264f2..6c652cbb44 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpasscrtdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
index e11d9abd16..65e24205a5 100644
--- a/uui/source/masterpasscrtdlg.src
+++ b/uui/source/masterpasscrtdlg.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpasscrtdlg.src,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 9a5e667e43..898b2eb9fe 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpassworddlg.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/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc
index 32649dd578..ae6b95b1df 100644
--- a/uui/source/masterpassworddlg.hrc
+++ b/uui/source/masterpassworddlg.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: masterpassworddlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 228e2ea223..07753fbd3d 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: masterpassworddlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 436d44d13f..29d799c5cc 100644
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.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: masterpassworddlg.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/uui/source/mphndl.hxx b/uui/source/mphndl.hxx
index 14d0cf9ffe..204e2374d1 100644
--- a/uui/source/mphndl.hxx
+++ b/uui/source/mphndl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mphndl.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/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 9738b4b043..03c8bd3755 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newerverwarn.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
diff --git a/uui/source/newerverwarn.hrc b/uui/source/newerverwarn.hrc
index 622c799da3..96551021cb 100644
--- a/uui/source/newerverwarn.hrc
+++ b/uui/source/newerverwarn.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: newerverwarn.hrc,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
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index 831751728d..d108bbbfc8 100644
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: newerverwarn.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src
index 93bbd6e991..c9889e6648 100644
--- a/uui/source/newerverwarn.src
+++ b/uui/source/newerverwarn.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: newerverwarn.src,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
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 761ea3d8d2..7b6e6a47a5 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 1336c5c2f0..ddb54713df 100644
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
index 58d65f54a4..0e862064bc 100644
--- a/uui/source/openlocked.src
+++ b/uui/source/openlocked.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index 9a98bad6c1..6dbaeedd93 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passcrtdlg.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/uui/source/passcrtdlg.hrc b/uui/source/passcrtdlg.hrc
index db0c54c3cc..8e3740abf0 100644
--- a/uui/source/passcrtdlg.hrc
+++ b/uui/source/passcrtdlg.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: passcrtdlg.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/uui/source/passcrtdlg.hxx b/uui/source/passcrtdlg.hxx
index 76f0435fc7..4e9d065ee1 100644
--- a/uui/source/passcrtdlg.hxx
+++ b/uui/source/passcrtdlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passcrtdlg.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/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src
index 2425112e2e..b4ba3f2125 100644
--- a/uui/source/passcrtdlg.src
+++ b/uui/source/passcrtdlg.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: passcrtdlg.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/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 4802f92af8..c9448bcf24 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index c08ef70166..36db115bf3 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 77707d3b9b..4e644a980f 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passworddlg.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/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc
index d6d69b3955..edda2504c1 100644
--- a/uui/source/passworddlg.hrc
+++ b/uui/source/passworddlg.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: passworddlg.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/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 18c4996a7a..44d30ab57b 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: passworddlg.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/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 1a22bc1f08..24fce39772 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.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: passworddlg.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/uui/source/passworderrs.src b/uui/source/passworderrs.src
index 6bb98d1bdb..124a360db9 100644
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.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: passworderrs.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/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 8b8be7c62d..eeed50049c 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: requeststringresolver.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 9d12a48c10..9b52a3f371 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: requeststringresolver.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index db272a88f9..6b62384feb 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: secmacrowarnings.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc
index c77b7d53f6..38ea65952e 100644
--- a/uui/source/secmacrowarnings.hrc
+++ b/uui/source/secmacrowarnings.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: secmacrowarnings.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index ac4fff4641..9889d9a363 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: secmacrowarnings.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src
index 1d6176f12a..9ae4186ec8 100644
--- a/uui/source/secmacrowarnings.src
+++ b/uui/source/secmacrowarnings.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: secmacrowarnings.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 92669fe0d9..7ec7c34056 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: services.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/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 29f3cd2ce1..95ddef2038 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sslwarndlg.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/sslwarndlg.hrc b/uui/source/sslwarndlg.hrc
index b31d3b4140..6dc5822bf6 100644
--- a/uui/source/sslwarndlg.hrc
+++ b/uui/source/sslwarndlg.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: sslwarndlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index d4e74439cb..4e94cc8855 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sslwarndlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src
index 0145d85c6b..bea7d06da3 100644
--- a/uui/source/sslwarndlg.src
+++ b/uui/source/sslwarndlg.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: sslwarndlg.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 9e7857dfc8..80599081a3 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index 64140966fb..e8040c153e 100644
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/trylater.src b/uui/source/trylater.src
index 945ac8c741..acc799ac16 100644
--- a/uui/source/trylater.src
+++ b/uui/source/trylater.src
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: openlocked.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index d64a636eca..e49ba7680c 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unknownauthdlg.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/unknownauthdlg.hrc b/uui/source/unknownauthdlg.hrc
index 6c4c19f34f..9bb6b0dea6 100644
--- a/uui/source/unknownauthdlg.hrc
+++ b/uui/source/unknownauthdlg.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: unknownauthdlg.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index d376dfd96d..0ca6c38fe8 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unknownauthdlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src
index c8f57b9276..aadb52282d 100644
--- a/uui/source/unknownauthdlg.src
+++ b/uui/source/unknownauthdlg.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: unknownauthdlg.src,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk
index a262b94438..78d726d0ee 100644
--- a/uui/util/makefile.mk
+++ b/uui/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.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/vbahelper/inc/vbahelper/helperdecl.hxx
index 7a0b495a3c..f6614add6b 100644
--- a/vbahelper/inc/vbahelper/helperdecl.hxx
+++ b/vbahelper/inc/vbahelper/helperdecl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helperdecl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/msvbahelper.hxx b/vbahelper/inc/vbahelper/msvbahelper.hxx
new file mode 100644
index 0000000000..f6700f1c8c
--- /dev/null
+++ b/vbahelper/inc/vbahelper/msvbahelper.hxx
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * 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 _MSVBAHELPER_HXX
+#define _MSVBAHELPER_HXX
+
+#include <sfx2/objsh.hxx>
+#include <vbahelper/vbadllapi.h>
+
+namespace ooo { namespace vba 
+{
+    class VBAHELPER_DLLPUBLIC VBAMacroResolvedInfo
+    {
+        SfxObjectShell* mpDocContext;
+        bool mbFound;
+        String msResolvedMacro;
+        public:
+        VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
+        void SetResolved( bool bRes ) { mbFound = bRes; }
+        bool IsResolved() { return mbFound; }
+        void SetMacroDocContext(SfxObjectShell* pShell )  { mpDocContext = pShell; }
+        SfxObjectShell* MacroDocContext() { return mpDocContext; }
+        String ResolvedMacro() { return msResolvedMacro; }
+        void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
+    };
+
+    VBAHELPER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
+    VBAHELPER_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
+    VBAHELPER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
+} }
+
+#endif
diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
index ac6fa402ea..edcefa8778 100644
--- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaapplicationbase.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
index 84a1d170aa..40b920251e 100644
--- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacollectionimpl.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/vbahelper/inc/vbahelper/vbadialogbase.hxx b/vbahelper/inc/vbahelper/vbadialogbase.hxx
index 08bfa5f9fc..70bd565656 100644
--- a/vbahelper/inc/vbahelper/vbadialogbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadialogbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialog.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/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/vbahelper/inc/vbahelper/vbadialogsbase.hxx
index 43b8ae1f64..63aff5bac6 100644
--- a/vbahelper/inc/vbahelper/vbadialogsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadialogsbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialogs.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/vbahelper/inc/vbahelper/vbadllapi.h b/vbahelper/inc/vbahelper/vbadllapi.h
index 8d815fc9d5..dfdf6ae6fd 100644
--- a/vbahelper/inc/vbahelper/vbadllapi.h
+++ b/vbahelper/inc/vbahelper/vbadllapi.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
index 9042c88e9c..68703aa095 100644
--- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
index 06168b5d1e..82f9ead18d 100644
--- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
+++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/inc/vbahelper/vbafontbase.hxx b/vbahelper/inc/vbahelper/vbafontbase.hxx
index 2821e38db8..5e79ec54c6 100644
--- a/vbahelper/inc/vbahelper/vbafontbase.hxx
+++ b/vbahelper/inc/vbahelper/vbafontbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbafont.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/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
index d12040decc..d2d0399c11 100644
--- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaapplicationbase.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index b508404894..81a823be56 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbahelper.hxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
index 0e65c5b131..3f1da84e22 100644
--- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx
+++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbahelperinterface.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
index bc77cd8e58..f602f51200 100644
--- a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
+++ b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx
index d56d7992ce..29c8e38123 100644
--- a/vbahelper/inc/vbahelper/vbapropvalue.hxx
+++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapropvalue.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx
index e0479ca63e..8fc259046d 100644
--- a/vbahelper/inc/vbahelper/vbashape.hxx
+++ b/vbahelper/inc/vbahelper/vbashape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbashape.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx
index c35eb611f8..d1bc1e576e 100644
--- a/vbahelper/inc/vbahelper/vbashaperange.hxx
+++ b/vbahelper/inc/vbahelper/vbashaperange.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbashaperange.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx
index 3d520e543c..80c99592f8 100644
--- a/vbahelper/inc/vbahelper/vbashapes.hxx
+++ b/vbahelper/inc/vbahelper/vbashapes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbashapes.hxx,v $
- * $Revision: 1.3.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx
index 0b7d9ec272..75b3c97186 100644
--- a/vbahelper/inc/vbahelper/vbatextframe.hxx
+++ b/vbahelper/inc/vbahelper/vbatextframe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatextframe.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx
index a9ee0e2d02..fa7943d2c6 100644
--- a/vbahelper/inc/vbahelper/vbawindowbase.hxx
+++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index 07cc9ac501..0db5274b7a 100644
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,4 +1,4 @@
-vba	vbahelper	:	filter oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
+vba     vbahelper       :       oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 #vba	vbahelper\inc								nmake	-	all	vba_inc NULL
 vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index 1d550c8409..9c24c77f80 100644
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index b91cc9a30f..22d99f24ea 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/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: service.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/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx
index 51641e2d06..ed93d0b6e7 100644
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbabutton.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/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx
index 818f245645..e52964f71d 100644
--- a/vbahelper/source/msforms/vbabutton.hxx
+++ b/vbahelper/source/msforms/vbabutton.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbabutton.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx
index e8df157811..15175f0e0f 100644
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
@@ -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., 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 "vbacheckbox.hxx"
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx
index f3374db011..d3922d84a9 100644
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
@@ -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., 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 SC_VBA_CHECKBOX_HXX
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index 9824358ac6..4dfbf2908a 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacombobox.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/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 05aa433aa2..e7e86a00fd 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacombobox.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/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 54a4345cbd..b4c94691b5 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacontrol.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/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index 3c9a128ece..897b38f159 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacontrol.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 2f08f9f5b0..a82c9a44d1 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx
index 6382cee0ad..a11ef4dd45 100644
--- a/vbahelper/source/msforms/vbacontrols.hxx
+++ b/vbahelper/source/msforms/vbacontrols.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx
index 1a27d2a316..3c202f1e58 100644
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
@@ -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., 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 "vbaframe.hxx"
diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx
index 071b5b09d0..c55a41bf08 100644
--- a/vbahelper/source/msforms/vbaframe.hxx
+++ b/vbahelper/source/msforms/vbaframe.hxx
@@ -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., 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 SC_VBA_FRAME_HXX
diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx
index 6a8571e2dd..bb49ad7b3d 100644
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx
index d64f1c36db..c51b85dfdc 100644
--- a/vbahelper/source/msforms/vbaimage.hxx
+++ b/vbahelper/source/msforms/vbaimage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx
index c07bf96008..5fb6ebeabb 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbalabel.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/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx
index 3afd65296f..fd6b1c199f 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbalabel.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index 7c4f42a34d..8538fc29bc 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbalistbox.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/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index 3f41fcd633..01c53d1b0f 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbalistbox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index bc288340ec..4cdf220aa6 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -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., 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 "vbamultipage.hxx"
diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx
index b0214f684d..75c0da0bb1 100644
--- a/vbahelper/source/msforms/vbamultipage.hxx
+++ b/vbahelper/source/msforms/vbamultipage.hxx
@@ -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., 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 SC_VBA_MULTIPAGE_HXX
diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx
index 1959b6f981..95e2e715b4 100644
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
@@ -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., 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 "vbapages.hxx"
diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx
index 7ae49ca9a3..7914f5bd6f 100644
--- a/vbahelper/source/msforms/vbapages.hxx
+++ b/vbahelper/source/msforms/vbapages.hxx
@@ -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., 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 SC_VBA_PAGES_HXX
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx
index fc6eae8ddb..3ffe96d5c6 100644
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
@@ -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., 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 "vbaprogressbar.hxx"
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx
index 86cbae4e89..a4d4270f96 100644
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
@@ -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., 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 SC_VBA_PROGRESSBAR_HXX
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx
index 1ae3ff4953..3853f380d9 100644
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaradiobutton.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/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx
index 9a09dffae5..576cde6709 100644
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbaradiobutton.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx
index ec0f12e614..1c37e61bb9 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -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., 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 "vbascrollbar.hxx"
diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx
index 459f610a71..8543fe081b 100644
--- a/vbahelper/source/msforms/vbascrollbar.hxx
+++ b/vbahelper/source/msforms/vbascrollbar.hxx
@@ -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., 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 SC_VBA_SCROLLBAR_HXX
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx
index cfbbeb21f3..fbb7961aaf 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -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., 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 "vbaspinbutton.hxx"
diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx
index 8f1d6e3d4d..cd6aaf7ce2 100644
--- a/vbahelper/source/msforms/vbaspinbutton.hxx
+++ b/vbahelper/source/msforms/vbaspinbutton.hxx
@@ -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., 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 SC_VBA_SPINBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index 511a306d90..730f24c961 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatextbox.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/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx
index 4e26f6f99f..58d22f45e9 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatextbox.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index 2b6230cbcd..d16fab90e4 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -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., 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 "vbatogglebutton.hxx"
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index 1932d514cc..8950a1ff09 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -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., 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 SC_VBA_TOGGLEBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 463da446c5..2c04ea6759 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -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., 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 <vbahelper/helperdecl.hxx>
diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx
index be93dc78ea..463a3cba3b 100644
--- a/vbahelper/source/msforms/vbauserform.hxx
+++ b/vbahelper/source/msforms/vbauserform.hxx
@@ -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., 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 SC_VBA_USERFORM_HXX
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index a8a4167948..88f8f53bd5 100644
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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
@@ -40,6 +36,7 @@ VISIBILITY_HIDDEN=TRUE
 .INCLUDE :  settings.mk
 
 SLOFILES=\
+    $(SLO)$/msvbahelper.obj \
     $(SLO)$/vbahelper.obj \
     $(SLO)$/vbapropvalue.obj \
     $(SLO)$/vbacommandbars.obj \
diff --git a/vbahelper/source/vbahelper/msvbahelper.cxx b/vbahelper/source/vbahelper/msvbahelper.cxx
new file mode 100644
index 0000000000..49b514f012
--- /dev/null
+++ b/vbahelper/source/vbahelper/msvbahelper.cxx
@@ -0,0 +1,381 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#define VBAHELPER_DLLIMPLEMENTATION
+#include <vbahelper/msvbahelper.hxx>
+#include <basic/sbx.hxx>
+#include <basic/sbstar.hxx>
+#include <basic/basmgr.hxx>
+#include <basic/sbmod.hxx>
+#include <basic/sbmeth.hxx>
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/document/XDocumentProperties.hpp>
+#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
+#include <tools/urlobj.hxx>
+#include <osl/file.hxx>
+
+using namespace ::com::sun::star;
+
+const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
+const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document"); 
+
+namespace ooo { namespace vba {
+
+String makeMacroURL( const String& sMacroName )
+{
+    return sUrlPart0.concat( sMacroName ).concat( sUrlPart1 ) ;
+}
+
+SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
+{
+    SfxObjectShell* pFoundShell=NULL;
+    SfxObjectShell* pShell = SfxObjectShell::GetFirst();
+    INetURLObject aObj;
+    aObj.SetURL( sMacroURLOrPath );
+    bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
+    rtl::OUString aURL;
+    if ( bIsURL )
+        aURL = sMacroURLOrPath;
+    else
+    {
+        osl::FileBase::getFileURLFromSystemPath( sMacroURLOrPath, aURL );
+        aObj.SetURL( aURL );
+    }    
+    OSL_TRACE("Trying to find shell for url %s", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+    while ( pShell )
+    {
+
+        uno::Reference< frame::XModel > xModel = pShell->GetModel();
+        // are we searching for a template? if so we have to cater for the
+        // fact that in openoffice a document opened from a template is always
+        // a new document :/
+        if ( xModel.is() )
+        {
+            OSL_TRACE("shell 0x%x has model with url %s and we look for %s", pShell
+                , rtl::OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr() 
+                , rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() 
+            );
+            if ( sMacroURLOrPath.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
+            {
+                uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( xModel, uno::UNO_QUERY );
+                if( xDocInfoSupp.is() )
+                {
+                    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
+                    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
+                    rtl::OUString sCurrName = xDocProps->getTemplateName();
+                    if( sMacroURLOrPath.lastIndexOf( sCurrName ) >= 0 )
+                    {
+                        pFoundShell = pShell; 
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                if ( aURL.equals( xModel->getURL() ) )
+                {
+                    pFoundShell = pShell; 
+                    break;
+                }
+            }
+        }
+        pShell = SfxObjectShell::GetNext( *pShell );
+    }
+    return pFoundShell;
+}
+
+// sMod can be empty ( but we really need the library to search in )
+// if sMod is empty and a macro is found then sMod is updated
+bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, const String& sMacro )
+{
+    bool bFound = false;
+    if ( sLibrary.Len() && sMacro.Len() )
+    {
+        OSL_TRACE("** Searching for %s.%s in library %s"
+            ,rtl::OUStringToOString( sMod, RTL_TEXTENCODING_UTF8 ).getStr()
+            ,rtl::OUStringToOString( sMacro, RTL_TEXTENCODING_UTF8 ).getStr()
+            ,rtl::OUStringToOString( sLibrary, RTL_TEXTENCODING_UTF8 ).getStr() );
+        BasicManager* pBasicMgr = pShell-> GetBasicManager();
+        if ( pBasicMgr )
+        {
+            StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
+            if ( !pBasic )
+            {
+                USHORT nId = pBasicMgr->GetLibId( sLibrary );
+                pBasicMgr->LoadLib( nId );
+                pBasic = pBasicMgr->GetLib( sLibrary );
+            }
+            if ( pBasic )
+            {
+                if ( sMod.Len() ) // we wish to find the macro is a specific module
+                {
+                    SbModule* pModule = pBasic->FindModule( sMod );
+                    if ( pModule )
+                    {
+                        SbxArray* pMethods = pModule->GetMethods();
+                        if ( pMethods )
+                        {
+                            SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
+                            if ( pMethod )
+                              bFound = true;
+                        }
+                    }
+                }
+                else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
+                {
+                    if( SbModule* pModule = pMethod->GetModule() )
+                    {
+                        sMod = pModule->GetName();
+                        bFound = true;
+                    }
+                }
+            }
+        }
+    }
+    return bFound;
+}
+void parseMacro( const rtl::OUString& sMacro, String& sContainer, String& sModule, String& sProcedure )
+{
+    sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' );
+    
+    if ( nMacroDot != -1 )
+    {
+        sProcedure = sMacro.copy( nMacroDot + 1 );
+ 
+        sal_Int32 nContainerDot = sMacro.lastIndexOf( '.',  nMacroDot - 1 );
+        if ( nContainerDot != -1 )
+        {
+            sModule = sMacro.copy( nContainerDot + 1, nMacroDot - nContainerDot - 1 );
+            sContainer = sMacro.copy( 0, nContainerDot );
+        }
+        else
+            sModule = sMacro.copy( 0, nMacroDot );
+    }
+    else
+       sProcedure = sMacro;
+}
+
+VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& MacroName, bool bSearchGlobalTemplates )
+{
+    VBAMacroResolvedInfo aRes;
+    if ( !pShell )
+        return aRes;
+    aRes.SetMacroDocContext( pShell );
+    // parse the macro name
+    sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
+    String sMacroUrl = MacroName;
+
+    String sContainer;
+    String sModule;
+    String sProcedure;
+    
+    if( nDocSepIndex > 0 )
+    {
+        // macro specified by document name
+        // find document shell for document name and call ourselves 
+        // recursively
+
+        // assume for now that the document name is *this* document
+        String sDocUrlOrPath = MacroName.copy( 0, nDocSepIndex );
+        sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
+        OSL_TRACE("doc search, current shell is 0x%x", pShell );
+        SfxObjectShell* pFoundShell = findShellForUrl( sDocUrlOrPath );
+        OSL_TRACE("doc search, after find, found shell is 0x%x", pFoundShell );
+        aRes = resolveVBAMacro( pFoundShell, sMacroUrl ); 
+    }    
+    else
+    {
+        // macro is contained in 'this' document ( or code imported from a template
+        // where that template is a global template or perhaps the template this
+        // document is created from ) 
+    
+        // macro format = Container.Module.Procedure
+        parseMacro( MacroName, sContainer, sModule, sProcedure ); 
+        uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
+        uno::Reference< container::XNameContainer > xPrjNameCache;
+        if ( xSF.is() )
+            xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
+    
+        std::vector< rtl::OUString > sSearchList; 
+
+        if ( sContainer.Len() > 0 )
+        { 
+            // get the Project associated with the Container
+            if ( xPrjNameCache.is() )
+            {
+                if ( xPrjNameCache->hasByName( sContainer ) )
+                {
+                    rtl::OUString sProject;
+                    xPrjNameCache->getByName( sContainer ) >>= sProject;
+                    sContainer = sProject;
+                }
+            }
+            sSearchList.push_back( sContainer ); // First Lib to search
+        }
+        else
+        {
+            // Ok, if we have no Container specified then we need to search them in order, this document, template this document created from, global templates, 
+            // get the name of Project/Library for 'this' document
+            rtl::OUString sThisProject;
+            BasicManager* pBasicMgr = pShell-> GetBasicManager();
+            if ( pBasicMgr )
+            {
+                if ( pBasicMgr->GetName().Len() )
+                   sThisProject = pBasicMgr->GetName();
+                else // cater for the case where VBA is not enabled
+                   sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+            }
+            sSearchList.push_back( sThisProject ); // First Lib to search
+            if ( xPrjNameCache.is() )
+            {
+                // is this document created from a template?
+                uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( pShell->GetModel(), uno::UNO_QUERY_THROW );
+                uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
+                uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
+            
+                rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
+                if ( sCreatedFrom.getLength() )
+                {
+                    INetURLObject aObj;
+                    aObj.SetURL( sCreatedFrom );
+                    bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
+                    rtl::OUString aURL;
+                    if ( bIsURL )
+                        aURL = sCreatedFrom;
+                    else
+                    {
+                        osl::FileBase::getFileURLFromSystemPath( sCreatedFrom, aURL );
+                        aObj.SetURL( aURL );
+                    }        
+                    sCreatedFrom =  aObj.GetLastName();
+                } 
+                
+                sal_Int32 nIndex =  sCreatedFrom.lastIndexOf( '.' );
+                if ( nIndex != -1 )
+                    sCreatedFrom = sCreatedFrom.copy( 0, nIndex );
+        
+                rtl::OUString sPrj;
+                if ( sCreatedFrom.getLength() && xPrjNameCache->hasByName( sCreatedFrom ) )
+                {
+                    xPrjNameCache->getByName( sCreatedFrom ) >>= sPrj;
+                    // Make sure we don't double up with this project
+                    if ( !sPrj.equals( sThisProject ) )
+                        sSearchList.push_back( sPrj );
+                }
+        
+                // get list of global template Names
+                uno::Sequence< rtl::OUString > sTemplateNames = xPrjNameCache->getElementNames();
+                sal_Int32 nLen = sTemplateNames.getLength();
+                for ( sal_Int32 index = 0; ( bSearchGlobalTemplates && index < nLen ); ++index )
+                {
+                    
+                    if ( !sCreatedFrom.equals( sTemplateNames[ index ] ) )
+                    {
+                        if ( xPrjNameCache->hasByName( sTemplateNames[ index ] ) )
+                        {
+                            xPrjNameCache->getByName( sTemplateNames[ index ] ) >>= sPrj;
+                            // Make sure we don't double up with this project
+                            if ( !sPrj.equals( sThisProject ) )
+                                sSearchList.push_back( sPrj );
+                        }
+                    }
+        
+                }
+            }
+        }
+        std::vector< rtl::OUString >::iterator it_end = sSearchList.end();
+        for ( std::vector< rtl::OUString >::iterator it = sSearchList.begin(); it != it_end; ++it )
+        {
+            bool bRes = hasMacro( pShell, *it, sModule, sProcedure );
+            if ( bRes )
+            {
+                aRes.SetResolved( true );
+                aRes.SetMacroDocContext( pShell );
+                sContainer = *it;
+                break;
+            }
+        }
+    }
+    aRes.SetResolvedMacro( sProcedure.Insert( '.', 0 ).Insert( sModule, 0).Insert( '.', 0 ).Insert( sContainer, 0 ) );
+
+    return aRes;
+}
+
+// Treat the args as possible inouts ( convertion at bottom of method )
+sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& /*aRet*/, const uno::Any& aCaller )
+{
+    sal_Bool bRes = sal_False;
+    if ( !pShell )
+        return bRes;
+    rtl::OUString sUrl = makeMacroURL( sMacroName );
+
+    uno::Sequence< sal_Int16 > aOutArgsIndex;
+    uno::Sequence< uno::Any > aOutArgs;
+
+    try
+    {    
+        uno::Reference< script::provider::XScriptProvider > xScriptProvider;
+        uno::Reference< script::provider::XScriptProviderSupplier > xSPS( pShell->GetModel(), uno::UNO_QUERY_THROW );
+
+        xScriptProvider.set( xSPS->getScriptProvider(), uno::UNO_QUERY_THROW );
+
+        uno::Reference< script::provider::XScript > xScript( xScriptProvider->getScript( sUrl ), uno::UNO_QUERY_THROW );
+
+        if ( aCaller.hasValue() )
+        {
+            uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
+            if ( xProps.is() )
+            {
+                uno::Sequence< uno::Any > aCallerHack(1);
+                aCallerHack[ 0 ] = aCaller;
+                xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
+            }
+        }
+
+
+        xScript->invoke( aArgs, aOutArgsIndex, aOutArgs  );
+        
+        sal_Int32 nLen = aOutArgs.getLength();
+        // convert any out params to seem like they were inouts
+        if ( nLen )
+        {
+            for ( sal_Int32 index=0; index < nLen; ++index )
+            {
+                sal_Int32 nOutIndex = aOutArgsIndex[ index ];
+                aArgs[ nOutIndex ] = aOutArgs[ index ];
+           }
+        }
+
+        bRes = sal_True;
+    }
+    catch ( uno::Exception& e )
+    {
+       bRes = sal_False;
+    }
+    return bRes; 
+}
+} } // vba // ooo
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 6ead60abe1..732c5124bb 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -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., 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 "vbahelper/vbaapplicationbase.hxx"
@@ -42,7 +34,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
 #include "vbacommandbars.hxx"
-#include <filter/msfilter/msvbahelper.hxx>
+#include <vbahelper/msvbahelper.hxx>
 
 // start basic includes
 #include <basic/sbx.hxx>
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx
index 43e7a4ab27..99c25b1365 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacolorformat.cxx,v $
- * $Revision: 1.3.146.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx
index a45d5d83f3..d7771dd73a 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.hxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbacolorformat.hxx,v $
- * $Revision: 1.3.146.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index 6e51a47519..63952c5734 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -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., 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 "vbacommandbar.hxx" 
diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx
index 10670ed562..44c2cf1ef0 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.hxx
@@ -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., 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 SC_VBA_COMMANDBAR_HXX
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 6df5c4b384..8bd826fae1 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -1,41 +1,33 @@
 /*************************************************************************
  *
- *  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., 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 "vbacommandbarcontrol.hxx"
 #include "vbacommandbarcontrols.hxx"
 #include <vbahelper/vbahelper.hxx>
-#include <filter/msfilter/msvbahelper.hxx>
+#include <vbahelper/msvbahelper.hxx>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
index daeaf61c32..21f913d6e6 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
@@ -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., 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 SC_VBA_COMMANDBARCONTROL_HXX
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index ebfdf2c524..d430f65bff 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -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., 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 "vbacommandbarcontrols.hxx"
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
index ce89794c08..d6cbf9cebd 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
@@ -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., 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 SC_VBA_COMMANDBARCONTROLS_HXX
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index cc5029acfd..e80e426189 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -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., 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 "vbacommandbarhelper.hxx" 
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index e6b0358ad8..d60b6fc982 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
@@ -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., 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 VBA_COMMANDBARHELPER_HXX
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index e87e4a32f5..74fb7ab396 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -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., 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 <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx
index 2c0cc3f83a..0dfff870e9 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.hxx
@@ -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., 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 SC_VBA_COMMANDBARS_HXX
diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx
index 43f7f2cfeb..ec7ecae9f4 100644
--- a/vbahelper/source/vbahelper/vbadialogbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialog.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/vbahelper/source/vbahelper/vbadialogsbase.cxx b/vbahelper/source/vbahelper/vbadialogsbase.cxx
index ca74a1616f..f595d9e991 100644
--- a/vbahelper/source/vbahelper/vbadialogsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogsbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbadialogs.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/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index 914c798a36..848795a0a8 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 5d9145ad8a..61cdb52ca3 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx
index ed7fcd2c5a..db2ceba788 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbafillformat.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/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx
index 047af92a5f..cff28053b6 100644
--- a/vbahelper/source/vbahelper/vbafillformat.hxx
+++ b/vbahelper/source/vbahelper/vbafillformat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbafillformat.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx
index d6265d46a7..e072cfb33a 100644
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbafont.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/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index bc0eda2103..39a8c81661 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -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., 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 "vbahelper/vbaglobalbase.hxx"
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index d6b927f5a0..004d9eeb17 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbahelper.cxx,v $
- * $Revision: 1.5.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -535,7 +532,7 @@ XLRGBToOORGB( sal_Int32 nCol )
 uno::Any 
 OORGBToXLRGB( const uno::Any& aCol )
 {
-    sal_Int32 nCol;
+    sal_Int32 nCol(0);
     aCol >>= nCol;
     nCol = OORGBToXLRGB( nCol );
     return uno::makeAny( nCol );
@@ -543,7 +540,7 @@ OORGBToXLRGB( const uno::Any& aCol )
 uno::Any 
 XLRGBToOORGB(  const uno::Any& aCol )
 {
-    sal_Int32 nCol;
+    sal_Int32 nCol(0);
     aCol >>= nCol;
     nCol = XLRGBToOORGB( nCol );
     return uno::makeAny( nCol );
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx.rej b/vbahelper/source/vbahelper/vbahelper.cxx.rej
deleted file mode 100644
index e6d2d95a74..0000000000
--- a/vbahelper/source/vbahelper/vbahelper.cxx.rej
+++ /dev/null
@@ -1,45 +0,0 @@
-***************
-*** 67,73 ****
-  #include <toolkit/awt/vclxwindow.hxx>
-  #include <toolkit/helper/vclunohelper.hxx>
-  #include <com/sun/star/frame/XModel2.hpp>
-- #include <com/sun/star/lang/XUnoTunnel.hpp>
-  #include <vcl/window.hxx>
-  #include <vcl/syswin.hxx>
-  #include <tools/diagnose_ex.h>
---- 67,72 ----
-  #include <toolkit/awt/vclxwindow.hxx>
-  #include <toolkit/helper/vclunohelper.hxx>
-  #include <com/sun/star/frame/XModel2.hpp>
-  #include <vcl/window.hxx>
-  #include <vcl/syswin.hxx>
-  #include <tools/diagnose_ex.h>
-*************** UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
-*** 1117,1135 ****
-  		double points = double( static_cast<double>(_hmm) / factor);
-  		return points;
-  	}
--         
--         SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
--         {
--             SfxObjectShell* pFoundShell = NULL;
--             if ( xModel.is() )
--             {
--                 uno::Reference< lang::XUnoTunnel >  xObjShellTunnel( xModel, uno::UNO_QUERY_THROW );
--                 pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
--             }
--             if ( !pFoundShell )
--                 throw uno::RuntimeException();
--             return pFoundShell;
--         }
-  
-  } // openoffice
-  } //org
---- 1116,1122 ----
-  		double points = double( static_cast<double>(_hmm) / factor);
-  		return points;
-  	}
-+ 
-  
-  } // openoffice
-  } //org
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx
index 82eb483846..6ca952fd59 100644
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbalineformat.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/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx
index a6287e42f8..948a7d368f 100644
--- a/vbahelper/source/vbahelper/vbalineformat.hxx
+++ b/vbahelper/source/vbahelper/vbalineformat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbalineformat.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
index 897fa2d056..ff48f47464 100644
--- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
+++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 2663682b89..bcdf83a88c 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapictureformat.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/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx
index a549b882c6..49245869ad 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.hxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapictureformat.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx
index 356c960f31..22c87e9a6d 100644
--- a/vbahelper/source/vbahelper/vbapropvalue.cxx
+++ b/vbahelper/source/vbahelper/vbapropvalue.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbapropvalue.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/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 7a6b0fe3f7..e0ec739f23 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbashape.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/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index 7bbd86d2c0..f6dc8ad72c 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbashaperange.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/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 4bc2f8dfa1..f64b4aafd0 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbashapes.cxx,v $
- * $Revision: 1.3.32.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx
index a461c54947..18aef99e00 100644
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vbatextframe.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/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx
index a5d4d2947a..6410231930 100644
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk
index 39bfac9562..09f3866c54 100644
--- a/vbahelper/util/makefile.mk
+++ b/vbahelper/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.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,8 +56,7 @@ SHL1STDLIBS=       \
         $(SVLLIB) \
         $(VCLLIB) \
         $(SVTOOLLIB)    \
-        $(TKLIB) \
-        $(MSFILTERLIB) 
+        $(TKLIB)
 
 SHL1DEPN=
 SHL1IMPLIB= i$(TARGET_HELPER)
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
index b12c06c14f..d75d3614c0 100644
--- a/xmlhelp/inc/makefile.mk
+++ b/xmlhelp/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/xmlhelp/inc/pch/precompiled_xmlhelp.cxx b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
index 7b6e9939dd..b273758c58 100644
--- a/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
+++ b/xmlhelp/inc/pch/precompiled_xmlhelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_xmlhelp.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/xmlhelp/inc/pch/precompiled_xmlhelp.hxx b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
index 25a4c7979b..03f6387a70 100644
--- a/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
+++ b/xmlhelp/inc/pch/precompiled_xmlhelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_xmlhelp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/com/sun/star/help/HelpComponent.java b/xmlhelp/source/com/sun/star/help/HelpComponent.java
index b27ea5bb78..18cb3feaa0 100755
--- a/xmlhelp/source/com/sun/star/help/HelpComponent.java
+++ b/xmlhelp/source/com/sun/star/help/HelpComponent.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: HelpSearch.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/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
index 5fecf5abe6..0c03265295 100644
--- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java
+++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.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/xmlhelp/source/com/sun/star/help/HelpSearch.java b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index 86d83b1ccf..714bb75a52 100644
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.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: HelpSearch.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/xmlhelp/source/com/sun/star/help/helplinker.pmk b/xmlhelp/source/com/sun/star/help/helplinker.pmk
index 569c5f4dbd..6e99d322f4 100644
--- a/xmlhelp/source/com/sun/star/help/helplinker.pmk
+++ b/xmlhelp/source/com/sun/star/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/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index eab2a6a08a..f802ad2467 100644
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/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
diff --git a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
index 72599d58cd..09ff47ed3f 100644
--- a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EntryProcessor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
index b64fe10c50..2c33416182 100644
--- a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
+++ b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XmlSearchExceptions.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx b/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/ContextTables.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 46ca7405b8..24b9ff414b 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocGenerator.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index cc72e77f71..3767684cc2 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Query.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/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Search.hxx b/xmlhelp/source/cxxhelp/inc/qe/Search.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/Search.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx b/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xmlhelp/source/cxxhelp/inc/qe/XmlIndex.hxx
+++ /dev/null
diff --git a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
index 098562381f..2c5966a1f6 100644
--- a/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CompressorIterator.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
index bbb2997e30..ffad0f58a8 100644
--- a/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ConceptList.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index 19ec1e726f..512495a9c5 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Decompressor.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
index b3a53d0bbb..f805d338e5 100644
--- a/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RandomAccessStream.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
index 53489d279c..b68e304759 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bufferedinputstream.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/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
index 9394ae1c2b..5a6e1fe270 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bufferedinputstream.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 0dd138ac3d..29d320d30b 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/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.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 1a6635ae81..dcb6a0e064 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 2c3590b827..2019f9084d 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/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: contentcaps.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/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 5c84ba6ee2..6ce5ef8fdb 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: databases.cxx,v $
- * $Revision: 1.54 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -137,26 +134,11 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
     return aRetURL;
 }
 
-
-// Hold Packages to improve performance (#i106100)
-// The PackageManager implementation seems to completely throw away all cached data
-// as soon as the last reference to a XPackage dies. Maybe this should be changed.
-struct ImplPackageSequenceHolder
-{
-    Sequence< Reference< deployment::XPackage > >	m_aUserPackagesSeq;
-    Sequence< Reference< deployment::XPackage > >	m_aSharedPackagesSeq;
-};
-
-static ImplPackageSequenceHolder* GpPackageSequenceHolder = NULL;
-
 Databases::Databases( sal_Bool showBasic,
                       const rtl::OUString& instPath,
                       const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
                       const rtl::OUString& productName,
                       const rtl::OUString& productVersion,
-                      const rtl::OUString& vendorName,
-                      const rtl::OUString& vendorVersion,
-                      const rtl::OUString& vendorShort,
                       const rtl::OUString& styleSheet,
                       Reference< uno::XComponentContext > xContext )
     : m_xContext( xContext ),
@@ -188,9 +170,7 @@ Databases::Databases( sal_Bool showBasic,
 
     m_vReplacement[0] = productName;
     m_vReplacement[1] = productVersion;
-    m_vReplacement[2] = vendorName;
-    m_vReplacement[3] = vendorVersion;
-    m_vReplacement[4] = vendorShort;
+    // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings
     m_vReplacement[5] = productName;
     m_vReplacement[6] = productVersion;
     
@@ -199,7 +179,6 @@ Databases::Databases( sal_Bool showBasic,
     m_xSFA = Reference< ucb::XSimpleFileAccess >( 
         m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
         m_xContext ), UNO_QUERY_THROW );
-    GpPackageSequenceHolder = new ImplPackageSequenceHolder();
 }
 
 Databases::~Databases()
@@ -247,8 +226,6 @@ Databases::~Databases()
             ++it;
         }
     }
-
-    delete GpPackageSequenceHolder;
 }
 
 static bool impl_getZipFile(
@@ -1570,9 +1547,6 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
             thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
         m_aUserPackagesSeq = xUserManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
-        if( GpPackageSequenceHolder != NULL )
-            GpPackageSequenceHolder->m_aUserPackagesSeq = m_aUserPackagesSeq;
-
         m_bUserPackagesLoaded = true;
     }
 
@@ -1602,9 +1576,6 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
             thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
         m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
-        if( GpPackageSequenceHolder != NULL )
-            GpPackageSequenceHolder->m_aSharedPackagesSeq = m_aSharedPackagesSeq;
-
         m_bSharedPackagesLoaded = true;
     }
 
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index b213930719..51b469cfa0 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: databases.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,9 +189,6 @@ namespace chelp {
                  const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
                  const rtl::OUString& productName,
                  const rtl::OUString& productVersion,
-                 const rtl::OUString& vendorName,
-                 const rtl::OUString& vendorVersion,
-                 const rtl::OUString& vendorShort,
                  const rtl::OUString& styleSheet,
                  com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext );
       
@@ -294,9 +288,6 @@ namespace chelp {
 
         rtl::OUString getProductName() const { return m_vReplacement[0]; }
         rtl::OUString getProductVersion() const { return m_vReplacement[1]; }
-        rtl::OUString getVendorName() const { return m_vReplacement[2]; }
-        rtl::OUString getVendorVersion() const { return m_vReplacement[3]; }
-        rtl::OUString getVendorShort() const { return m_vReplacement[4]; }
         
         rtl::OUString expandURL( const rtl::OUString& aURL );
 
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index 989bed4a96..aafa1bf4dc 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: db.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/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 82b6374321..58bb06bde4 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: db.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/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index c5d00d8391..a877122310 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputstream.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/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index 6c31cd9fa6..cfcd7aa4a9 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: inputstream.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index dee7d40d95..38f57c63e7 100644
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/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/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 7e6931e22d..0a16022a89 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: provider.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #endif
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
@@ -311,9 +307,6 @@ void ContentProvider::init()
      *  now determing
      *  productname,
      *  productversion,
-     *  vendorname,
-     *  vendorversion,
-     *  vendorshort
      */
 
     xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
@@ -354,20 +347,6 @@ void ContentProvider::init()
         rtl::OUString::createFromAscii( " " ) +
         setupextension );
 
-    xHierAccess = getHierAccess( sProvider, "org.openoffice.Webtop.Common" );
-    rtl::OUString vendorname(
-        getKey( xHierAccess,"Product/ooName" ) );
-
-    setupversion = rtl::OUString(
-        getKey( xHierAccess,"Product/ooSetupVersion" ) );
-    setupextension = rtl::OUString(
-        getKey(  xHierAccess,"Product/ooSetupExtension") );
-    rtl::OUString vendorversion(
-        setupversion +
-        rtl::OUString::createFromAscii( " " ) +
-        setupextension );
-    rtl::OUString vendorshort = vendorname;
-
     uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
     xHierAccess = getHierAccess( sProvider,	 "org.openoffice.Office.Common" );
 
@@ -395,9 +374,6 @@ void ContentProvider::init()
                                   aImagesZipPaths,
                                   productname,
                                   productversion,
-                                  vendorname,
-                                  vendorversion,
-                                  vendorshort,
                                   stylesheet,
                                   xContext );
 }
@@ -408,17 +384,6 @@ ContentProvider::getConfiguration() const
     uno::Reference< lang::XMultiServiceFactory > sProvider;
     if( m_xSMgr.is() )
     {
-        uno::Any aAny;
-        aAny <<= rtl::OUString::createFromAscii( "plugin" );
-        beans::PropertyValue aProp(
-            rtl::OUString::createFromAscii( "servertype" ),
-            -1,
-            aAny,
-            beans::PropertyState_DIRECT_VALUE );
-
-        uno::Sequence< uno::Any > seq(1);
-        seq[0] <<= aProp;
-
         try
         {
             rtl::OUString sProviderService =
@@ -426,8 +391,7 @@ ContentProvider::getConfiguration() const
                     "com.sun.star.configuration.ConfigurationProvider" );
             sProvider =
                 uno::Reference< lang::XMultiServiceFactory >(
-                    m_xSMgr->createInstanceWithArguments(
-                        sProviderService,seq ),
+                    m_xSMgr->createInstance( sProviderService ),
                     uno::UNO_QUERY );
         }
         catch( const uno::Exception& )
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index ec7d08bd82..e45aec3b21 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index 47e2ec2b3c..5ac0fc672f 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/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.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
index 87de9b2be8..b1c0e3b6ce 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.hxx
+++ b/xmlhelp/source/cxxhelp/provider/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 9923e1f2e2..c726747bc7 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resultsetbase.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/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 53dda08b47..9038ea95c8 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resultsetbase.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index e0602f5efa..5e941a7664 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resultsetforquery.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,8 +43,8 @@
 #define INCLUDED_STL_SET
 #endif
 
-#include <qe/Query.hxx>

-#include <qe/DocGenerator.hxx>

+#include <qe/Query.hxx>
+#include <qe/DocGenerator.hxx>
 #include "resultsetforquery.hxx"
 #include "databases.hxx"
 
@@ -161,8 +158,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
             try
             {
                 vector< vector<HitItem>* > aQueryListResultVectorVector;
-                set< rtl::OUString > aSet,aCurrent,aResultSet;

-

+                set< rtl::OUString > aSet,aCurrent,aResultSet;
+
                 int nQueryListSize = queryList.size();
                 if( nQueryListSize > 1 )
                     hitCount = 2000;
@@ -181,25 +178,25 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                     }
                     pQueryResultVector->reserve( hitCount );
 
-                    int nParamCount = bCaptionsOnly ? 7 : 6;

-                    Sequence<uno::Any> aParamsSeq( nParamCount );

-

-                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );

-                    aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );

-                    

-                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );

-                    rtl::OUString aSystemPath;

-                    osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );

-                    aParamsSeq[3] = uno::makeAny( aSystemPath );

-

-                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );

-

-                    const std::vector< rtl::OUString >& aListItem = queryList[i];

-                    ::rtl::OUString aNewQueryStr = aListItem[0];

-                    aParamsSeq[5] = uno::makeAny( aNewQueryStr );

-

-                    if( bCaptionsOnly )

-                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );

+                    int nParamCount = bCaptionsOnly ? 7 : 6;
+                    Sequence<uno::Any> aParamsSeq( nParamCount );
+
+                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                    aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
+                    
+                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );
+                    rtl::OUString aSystemPath;
+                    osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
+                    aParamsSeq[3] = uno::makeAny( aSystemPath );
+
+                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );
+
+                    const std::vector< rtl::OUString >& aListItem = queryList[i];
+                    ::rtl::OUString aNewQueryStr = aListItem[0];
+                    aParamsSeq[5] = uno::makeAny( aNewQueryStr );
+
+                    if( bCaptionsOnly )
+                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );
 
                     Sequence< sal_Int16 > aOutParamIndex;
                     Sequence< uno::Any > aOutParam;
@@ -248,22 +245,22 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                         }
                     }
 
-                    // intersect

+                    // intersect
                     if( nQueryListSize > 1 )
                     {
-                        if( i == 0 )

-                        {

-                            aResultSet = aSet;

-                        }

-                        else

-                        {

-                            aCurrent = aResultSet;

-                            aResultSet.clear();

-                            set_intersection( aSet.begin(),aSet.end(),

-                                              aCurrent.begin(),aCurrent.end(),

-                                              inserter(aResultSet,aResultSet.begin()));

-                        }

-                    }

+                        if( i == 0 )
+                        {
+                            aResultSet = aSet;
+                        }
+                        else
+                        {
+                            aCurrent = aResultSet;
+                            aResultSet.clear();
+                            set_intersection( aSet.begin(),aSet.end(),
+                                              aCurrent.begin(),aCurrent.end(),
+                                              inserter(aResultSet,aResultSet.begin()));
+                        }
+                    }
                 }
 
                 // Combine results in aIndexFolderResultVector
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index a596a9f35c..226c16524f 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resultsetforquery.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 12b1712f18..e42a0448aa 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resultsetforroot.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/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
index 9b743eb3f1..c7e694f202 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: resultsetforroot.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index b13ab8cd1f..7cb7e1d706 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/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.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index e2b0c8a127..646c55ab8b 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urlparameter.cxx,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -995,20 +992,11 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
             parString[last++] = "'css'";
 
             parString[last++] = "vendorname";
-            parString[last++] = rtl::OString('\'') + 
-                rtl::OString( pDatabases->getVendorName().getStr(),
-                              pDatabases->getVendorName().getLength(),
-                              RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
+            parString[last++] = rtl::OString("''");
             parString[last++] = "vendorversion";
-            parString[last++] = rtl::OString('\'') + 
-                rtl::OString( pDatabases->getVendorVersion().getStr(),
-                              pDatabases->getVendorVersion().getLength(),
-                              RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
+            parString[last++] = rtl::OString("''");
             parString[last++] = "vendorshort";
-            parString[last++] = rtl::OString('\'') + 
-                rtl::OString( pDatabases->getVendorShort().getStr(),
-                              pDatabases->getVendorShort().getLength(),
-                              RTL_TEXTENCODING_UTF8 ) + rtl::OString('\'');
+            parString[last++] = rtl::OString("''");
         }
         
         // Do we need to add extension path?
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 577fb32c4c..354ead14b5 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: urlparameter.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/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index fd6c468fba..329a095995 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocGenerator.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/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk
index 249950c4f0..e55bb9eb3e 100644
--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
+++ b/xmlhelp/source/cxxhelp/qe/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmlhelp/source/cxxhelp/test/abidebug.hxx b/xmlhelp/source/cxxhelp/test/abidebug.hxx
index cae6094553..7f0074aa0d 100644
--- a/xmlhelp/source/cxxhelp/test/abidebug.hxx
+++ b/xmlhelp/source/cxxhelp/test/abidebug.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: abidebug.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/cxxhelp/test/makefile.mk b/xmlhelp/source/cxxhelp/test/makefile.mk
index 357aae6af0..c255f3fea8 100644
--- a/xmlhelp/source/cxxhelp/test/makefile.mk
+++ b/xmlhelp/source/cxxhelp/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/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index 028e37c794..ac72c4d147 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: searchdemo.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/xmlhelp/source/cxxhelp/util/Decompressor.cxx b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
index 77cd90cdb9..3a16942608 100644
--- a/xmlhelp/source/cxxhelp/util/Decompressor.cxx
+++ b/xmlhelp/source/cxxhelp/util/Decompressor.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Decompressor.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/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk
index 8e25c8584c..a375e7d55c 100644
--- a/xmlhelp/source/cxxhelp/util/makefile.mk
+++ b/xmlhelp/source/cxxhelp/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/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
index 4541a1745b..df01c8a55e 100644
--- a/xmlhelp/source/treeview/makefile.mk
+++ b/xmlhelp/source/treeview/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index b8fa21c7c1..7e705cc3f6 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tvfactory.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/xmlhelp/source/treeview/tvfactory.hxx b/xmlhelp/source/treeview/tvfactory.hxx
index fc13a88b9a..9d9715bd50 100644
--- a/xmlhelp/source/treeview/tvfactory.hxx
+++ b/xmlhelp/source/treeview/tvfactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tvfactory.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index f8a85c2ee9..02ba6b9eaa 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tvread.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,7 +39,6 @@
 #include <osl/file.hxx>
 #include <com/sun/star/frame/XConfigManager.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -677,22 +673,6 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     // replace anything like $(instpath);
     subst( xSMgr,instPath );
 
-
-    /**********************************************************************/
-    /*                       reading Webtop.Common                        */
-    /**********************************************************************/
-    
-    xHierAccess = getHierAccess( sProvider,
-                                 "org.openoffice.Webtop.Common" );
-    rtl::OUString vendorName( getKey(  xHierAccess,"Product/ooName" ) );
-    
-    rtl::OUString setupversion( getKey(  xHierAccess,"Product/ooSetupVersion" ) );
-    rtl::OUString setupextension( getKey(  xHierAccess,"Product/ooSetupExtension") );	
-    rtl::OUString vendorVersion( setupversion + 
-                                 rtl::OUString::createFromAscii( " " ) +
-                                 setupextension );
-    rtl::OUString vendorShort = vendorName;
-
     /**********************************************************************/
     /*                       reading setup                                */
     /**********************************************************************/
@@ -701,8 +681,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
                                  "org.openoffice.Setup" );
     
     rtl::OUString productName( getKey(  xHierAccess,"Product/ooName" ) );
-    setupversion = getKey(  xHierAccess,"Product/ooSetupVersion" );
-    setupextension = rtl::OUString();
+    rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) );
+    rtl::OUString setupextension;
 
     try
     {
@@ -816,9 +796,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     configData.m_vAdd[4] = 12;
     configData.m_vReplacement[0] = productName;
     configData.m_vReplacement[1] = productVersion;
-    configData.m_vReplacement[2] = vendorName;
-    configData.m_vReplacement[3] = vendorVersion;
-    configData.m_vReplacement[4] = vendorShort;
+    // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings
 
        configData.system = system;
     configData.locale = locale;		
@@ -846,23 +824,13 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr
     Reference< XMultiServiceFactory > sProvider;
     if( m_xSMgr.is() )
     {
-        Any aAny;
-        aAny <<= rtl::OUString::createFromAscii( "plugin" );
-        PropertyValue aProp( rtl::OUString::createFromAscii( "servertype" ),
-                             -1,
-                             aAny,
-                             PropertyState_DIRECT_VALUE );
-        
-        Sequence< Any > seq(1);
-        seq[0] <<= aProp;
-        
         try
         {
             rtl::OUString sProviderService =
                 rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" );
             sProvider =
                 Reference< XMultiServiceFactory >(
-                    m_xSMgr->createInstanceWithArguments( sProviderService,seq ),
+                    m_xSMgr->createInstance( sProviderService ),
                     UNO_QUERY );
         }
         catch( const com::sun::star::uno::Exception& )
diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx
index f04538a7b6..65cfd7c00c 100644
--- a/xmlhelp/source/treeview/tvread.hxx
+++ b/xmlhelp/source/treeview/tvread.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tvread.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/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index a16e7958d7..e6cd48d34c 100644
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/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.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/dtd/Blocklist.dtd b/xmloff/dtd/Blocklist.dtd
index e1551fc311..f7bb8eb321 100644
--- a/xmloff/dtd/Blocklist.dtd
+++ b/xmloff/dtd/Blocklist.dtd
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: Blocklist.dtd,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 <!ELEMENT block-list:block-list (block-list:block*) >
 <!ATTLIST block-list:block-list
diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod
index 203b363b37..e72bab68c3 100644
--- a/xmloff/dtd/chart.mod
+++ b/xmloff/dtd/chart.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: chart.mod,v $
- 
-  $Revision: 1.35 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 
diff --git a/xmloff/dtd/datastyl.mod b/xmloff/dtd/datastyl.mod
index 22aaafac90..daacfad66f 100644
--- a/xmloff/dtd/datastyl.mod
+++ b/xmloff/dtd/datastyl.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: datastyl.mod,v $
- 
-  $Revision: 1.14 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- data styles -->
diff --git a/xmloff/dtd/defs.mod b/xmloff/dtd/defs.mod
index 7909d5c9db..98c964fe99 100644
--- a/xmloff/dtd/defs.mod
+++ b/xmloff/dtd/defs.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: defs.mod,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- This module should contain entities intended for content definitions
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index a67f061849..93d7544b4f 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: drawing.mod,v $
- 
-  $Revision: 1.92 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % points "CDATA" >
diff --git a/xmloff/dtd/dtypes.mod b/xmloff/dtd/dtypes.mod
index d051afc7a5..4de538ced1 100644
--- a/xmloff/dtd/dtypes.mod
+++ b/xmloff/dtd/dtypes.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: dtypes.mod,v $
- 
-  $Revision: 1.18 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!-- datatypes corresponding to XML Schema Part 2 W3C Working draft of	-->
diff --git a/xmloff/dtd/form.mod b/xmloff/dtd/form.mod
index e8d832d7eb..511fb180f4 100644
--- a/xmloff/dtd/form.mod
+++ b/xmloff/dtd/form.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: form.mod,v $
- 
-  $Revision: 1.23 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % controls	"form:text|form:textarea|form:fixed-text|form:file|
diff --git a/xmloff/dtd/meta.mod b/xmloff/dtd/meta.mod
index 15ff343000..1ea845bcb0 100644
--- a/xmloff/dtd/meta.mod
+++ b/xmloff/dtd/meta.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: meta.mod,v $
- 
-  $Revision: 1.6 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 
diff --git a/xmloff/dtd/nmspace.mod b/xmloff/dtd/nmspace.mod
index 3ac5504d7e..addcdc5922 100644
--- a/xmloff/dtd/nmspace.mod
+++ b/xmloff/dtd/nmspace.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: nmspace.mod,v $
- 
-  $Revision: 1.8 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY nFO "http://www.w3.org/1999/XSL/Format">
diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd
index c7333f2781..c66bc8d2ad 100644
--- a/xmloff/dtd/office.dtd
+++ b/xmloff/dtd/office.dtd
@@ -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: office.dtd,v $
- 
-  $Revision: 1.9 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % dtypes-mod SYSTEM "dtypes.mod">
diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod
index e45356d915..a7d50df0cf 100644
--- a/xmloff/dtd/office.mod
+++ b/xmloff/dtd/office.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: office.mod,v $
- 
-  $Revision: 1.52 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT office:document ( office:meta?,
diff --git a/xmloff/dtd/openoffice-2.0-schema.rng b/xmloff/dtd/openoffice-2.0-schema.rng
index 248706c5b7..36a3198766 100644
--- a/xmloff/dtd/openoffice-2.0-schema.rng
+++ b/xmloff/dtd/openoffice-2.0-schema.rng
@@ -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: openoffice-2.0-schema.rng,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <grammar
diff --git a/xmloff/dtd/script.mod b/xmloff/dtd/script.mod
index 1c08995c82..5e255ac6df 100644
--- a/xmloff/dtd/script.mod
+++ b/xmloff/dtd/script.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: script.mod,v $
- 
-  $Revision: 1.11 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT script:libraries (script:library-embedded | script:library-linked)*>
diff --git a/xmloff/dtd/settings.mod b/xmloff/dtd/settings.mod
index 58297320f5..bb9224237f 100644
--- a/xmloff/dtd/settings.mod
+++ b/xmloff/dtd/settings.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: settings.mod,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT office:settings (config:config-item-set+)>
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index b839b7afc2..fef8f73630 100644
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: style.mod,v $
- 
-  $Revision: 1.64 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT style:font-decl EMPTY>
diff --git a/xmloff/dtd/table.mod b/xmloff/dtd/table.mod
index 4e11509334..be30da5429 100644
--- a/xmloff/dtd/table.mod
+++ b/xmloff/dtd/table.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: table.mod,v $
- 
-  $Revision: 1.46 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT table:calculation-settings (table:null-date?, table:iteration?)>
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod
index 32d3fd5b95..909321312d 100644
--- a/xmloff/dtd/text.mod
+++ b/xmloff/dtd/text.mod
@@ -2,14 +2,10 @@
 
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   
-  Copyright 2008 by Sun Microsystems, Inc.
+  Copyright 2000, 2010 Oracle and/or its affiliates.
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: text.mod,v $
- 
-  $Revision: 1.59 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,7 +22,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % fields "text:date |
diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index a585245431..92bf9ad5f3 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AttributeContainerHandler.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/DashStyle.hxx b/xmloff/inc/DashStyle.hxx
index b65b34a55b..5001ce1816 100644
--- a/xmloff/inc/DashStyle.hxx
+++ b/xmloff/inc/DashStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DashStyle.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/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 6c6f9445b4..c3f59c6858 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DomBuilderContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index ff6c7b4433..91ac9d76cb 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DomExport.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/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx
index 6ea6bb0780..9c8b4565c7 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeToken.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/GradientStyle.hxx b/xmloff/inc/GradientStyle.hxx
index efbe9ff83c..31b3dc08e1 100644
--- a/xmloff/inc/GradientStyle.hxx
+++ b/xmloff/inc/GradientStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GradientStyle.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/xmloff/inc/HatchStyle.hxx b/xmloff/inc/HatchStyle.hxx
index 985df46161..ffb5fd54a9 100644
--- a/xmloff/inc/HatchStyle.hxx
+++ b/xmloff/inc/HatchStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HatchStyle.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/xmloff/inc/ImageStyle.hxx b/xmloff/inc/ImageStyle.hxx
index 3427922430..18a90671d9 100644
--- a/xmloff/inc/ImageStyle.hxx
+++ b/xmloff/inc/ImageStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ImageStyle.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/MarkerStyle.hxx b/xmloff/inc/MarkerStyle.hxx
index f51a7a4c96..77d1b46d7e 100644
--- a/xmloff/inc/MarkerStyle.hxx
+++ b/xmloff/inc/MarkerStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MarkerStyle.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/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index d40cd88f91..979a8a9526 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MetaExportComponent.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/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index 3e02c04242..e61f5df213 100644
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MetaImportComponent.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/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 1795e14ef7..db91355f2b 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MultiPropertySetHelper.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 63e5a3d7c3..9093f65e7d 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterImportContext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index d9bab76e8b..d93edf8afd 100644
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertySetMerger.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 1578dba90c..3079dd1d85 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RDFaExportHelper.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 431bf18807..fff29ad5d9 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RDFaImportHelper.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 9d7ff1f9df..9fc1085c44 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLExport.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/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 396a2ba5d2..773e439778 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLImport.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/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 79acc3d440..a7cc366d5f 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StyleMap.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/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index d6420a6100..9df416e3af 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransGradientStyle.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/VisAreaContext.hxx
index 5ac403c109..c6e5d4e174 100644
--- a/xmloff/inc/VisAreaContext.hxx
+++ b/xmloff/inc/VisAreaContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VisAreaContext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/VisAreaExport.hxx
index 857e0bae62..8b908c2f29 100644
--- a/xmloff/inc/VisAreaExport.hxx
+++ b/xmloff/inc/VisAreaExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VisAreaExport.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/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index da1ffeddbc..01b1bf2bc4 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBackgroundImageContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index f11a8e0730..e821f712b3 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBackgroundImageExport.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/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index c3ae00f791..4449608795 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBase64Export.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index 26b0dc16a1..973220f9b3 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBasicExportFilter.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/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index 442644c19d..5e378d5494 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBitmapLogicalSizePropertyHandler.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/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index 6c688c8377..1a4684ace7 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBitmapRepeatOffsetPropertyHandler.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/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index ed651f0add..93aa8dd149 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChartPropertySetMapper.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/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index 412237f829..a0fcd1901c 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChartStyleContext.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/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index 3b8a9ce346..b2da3a88c3 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLClipPropertyHandler.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/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 99558c9f74..2df3832c78 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLElementPropertyContext.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/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
index 64892550cf..79ded6cae5 100644
--- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEmbeddedObjectExportFilter.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index e0bf87c305..bf3c4d125a 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEmbeddedObjectImportContext.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/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 28e866f418..e487bf713c 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEventImportHelper.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/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index 0d36605d16..dfafde8fed 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFillBitmapSizePropertyHandler.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/xmloff/inc/XMLFilterServiceNames.h b/xmloff/inc/XMLFilterServiceNames.h
index f626b3d1ea..8c044ceac4 100644
--- a/xmloff/inc/XMLFilterServiceNames.h
+++ b/xmloff/inc/XMLFilterServiceNames.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFilterServiceNames.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/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 2b1f82fa9f..07a02dcf58 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteConfigurationImportContext.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/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index 6c5012e762..96987e5c63 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLImageMapContext.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/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index 71e8db604d..c960675a19 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLImageMapExport.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/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 2079da6110..8b72cfe5c4 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBibliographyConfigurationContext.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/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index f7bbc1cf74..4f46eb6743 100644
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIsPercentagePropertyHandler.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/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 653425c077..a47bee069d 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLineNumberingImportContext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 32db560c17..21949a6fa0 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLNumberStylesImport.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/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index 9ad6451d01..aeb014454d 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLPercentOrMeasurePropertyHandler.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/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index 4f8a478ee2..2333a6334a 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLRectangleMembersHandler.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/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 17a49808ca..d5d2fc03fc 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLReplacementImageContext.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/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index df1d637f22..95965e25ab 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLScriptContextFactory.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/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index f24f20807c..e76fd3f92b 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLScriptExportHandler.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index c2e5b2c606..48ec34cdef 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLShapePropertySetContext.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/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index bc5282b60a..05fbf09b1a 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStarBasicContextFactory.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 1647c3e8ea..aeb104d6e6 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStarBasicExportHandler.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index 8b3a5a096b..1546b25d77 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStringBufferImportContext.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/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index c5a85b8c56..e87af62879 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextColumnsContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index cc4f841935..7ef8055074 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextColumnsExport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index fddaac6b67..84cfc44298 100644
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextColumnsPropertyHandler.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 44f9277f6b..8b6a98569a 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextHeaderFooterContext.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/xmloff/inc/XMLTextListAutoStylePool.hxx b/xmloff/inc/XMLTextListAutoStylePool.hxx
index a01a2d3c6b..3551638d50 100644
--- a/xmloff/inc/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/XMLTextListAutoStylePool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextListAutoStylePool.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 422a3ae0e1..7d2a6df82e 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: anim.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/xmloff/inc/animationexport.hxx b/xmloff/inc/animationexport.hxx
index a0bca923f7..83a1559980 100644
--- a/xmloff/inc/animationexport.hxx
+++ b/xmloff/inc/animationexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationexport.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/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index e21f974ea3..6e7e5bce9f 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationimport.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 120ce1235d..3bcffb9dc1 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animations.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 9bdd3933ff..faf2938769 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animimp.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/xmloff/inc/i18nmap.hxx b/xmloff/inc/i18nmap.hxx
index 1eb3880d5d..66b28f04ea 100644
--- a/xmloff/inc/i18nmap.hxx
+++ b/xmloff/inc/i18nmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: i18nmap.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/makefile.mk b/xmloff/inc/makefile.mk
index 7ba6a226cc..db706e2930 100644
--- a/xmloff/inc/makefile.mk
+++ b/xmloff/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/xmloff/inc/numehelp.hxx b/xmloff/inc/numehelp.hxx
index 60cc27698a..881f85f771 100644
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/numehelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numehelp.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/xmloff/inc/pch/precompiled_xmloff.cxx b/xmloff/inc/pch/precompiled_xmloff.cxx
index 8f835dd247..02942ed906 100644
--- a/xmloff/inc/pch/precompiled_xmloff.cxx
+++ b/xmloff/inc/pch/precompiled_xmloff.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_xmloff.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/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 06c27d0a71..91a199339d 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_xmloff.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index b5931bbfe4..bc67656582 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtflde.hxx,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/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index c014b694c6..817e79823c 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtfldi.hxx,v $
- * $Revision: 1.38.66.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/txtimppr.hxx
index 19cccdaf16..1277bcf5ed 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/txtimppr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtimppr.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/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 0655c3a52c..ac783d4c6e 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtlists.hxx,v $
- * $Revision: 1.2.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index cd60b237e5..85af45aeda 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtvfldi.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/xmloff/inc/unoatrcn.hxx b/xmloff/inc/unoatrcn.hxx
index f409792efb..a1d2493fc1 100644
--- a/xmloff/inc/unoatrcn.hxx
+++ b/xmloff/inc/unoatrcn.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoatrcn.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 99d683aadf..5d63b7026d 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xexptran.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/xmloff/inc/xformsexport.hxx b/xmloff/inc/xformsexport.hxx
index 0de23b2221..dd9b59149d 100644
--- a/xmloff/inc/xformsexport.hxx
+++ b/xmloff/inc/xformsexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsexport.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xformsimport.hxx b/xmloff/inc/xformsimport.hxx
index 19159ae630..576034f9ad 100644
--- a/xmloff/inc/xformsimport.hxx
+++ b/xmloff/inc/xformsimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsimport.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx
index b63697781a..fc51c930c2 100644
--- a/xmloff/inc/xmlcnitm.hxx
+++ b/xmloff/inc/xmlcnitm.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcnitm.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmlehelp.hxx b/xmloff/inc/xmlehelp.hxx
index f61b34e700..a56798b07a 100644
--- a/xmloff/inc/xmlehelp.hxx
+++ b/xmloff/inc/xmlehelp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlehelp.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/xmloff/inc/xmlerror.hxx b/xmloff/inc/xmlerror.hxx
index 239207ffad..bcf996bca5 100644
--- a/xmloff/inc/xmlerror.hxx
+++ b/xmloff/inc/xmlerror.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlerror.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/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx
index fbc8165cfc..ff40e7daab 100644
--- a/xmloff/inc/xmlkywd.hxx
+++ b/xmloff/inc/xmlkywd.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlkywd.hxx,v $
- * $Revision: 1.176 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmlnmspe.hxx
index 2a1c9f4961..1d6a96ef54 100644
--- a/xmloff/inc/xmlnmspe.hxx
+++ b/xmloff/inc/xmlnmspe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnmspe.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/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
index 59b94867ca..10f703907d 100644
--- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx
+++ b/xmloff/inc/xmloff/DocumentSettingsContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentSettingsContext.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/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/xmloff/inc/xmloff/EnumPropertyHdl.hxx
index 14b44518df..a3e6ebb800 100644
--- a/xmloff/inc/xmloff/EnumPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/EnumPropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnumPropertyHdl.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/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
index 1422bcdbbb..2f26e5ebd9 100644
--- a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NamedBoolPropertyHdl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
index b73fb88b83..eece83e592 100644
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterStyleMap.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/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx
index 69badad606..4b671f8821 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProgressBarHelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/PropertySetInfoHash.hxx b/xmloff/inc/xmloff/PropertySetInfoHash.hxx
index bd4a7e2185..5afbc1d7c6 100644
--- a/xmloff/inc/xmloff/PropertySetInfoHash.hxx
+++ b/xmloff/inc/xmloff/PropertySetInfoHash.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertySetInfoHash.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/xmloff/inc/xmloff/PropertySetInfoKey.hxx b/xmloff/inc/xmloff/PropertySetInfoKey.hxx
index 9e37e37898..7bf580b08f 100644
--- a/xmloff/inc/xmloff/PropertySetInfoKey.hxx
+++ b/xmloff/inc/xmloff/PropertySetInfoKey.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertySetInfoKey.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
index 37b7af0840..cbe38e10d3 100644
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLExportHelper.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/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index e89c1d667e..6d48f5f6dc 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLImportHelper.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/xmloff/inc/xmloff/SettingsExportHelper.hxx
index 5b54f10533..6dc9d51bfa 100644
--- a/xmloff/inc/xmloff/SettingsExportHelper.hxx
+++ b/xmloff/inc/xmloff/SettingsExportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SettingsExportHelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
index d46fd0c594..c6419de347 100644
--- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
+++ b/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SinglePropertySetInfoCache.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
index a9c4d3476d..6114bb8682 100644
--- a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
+++ b/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WordWrapPropertyHdl.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
index 67340b0155..4678a51c48 100644
--- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBase64ImportContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/xmloff/inc/xmloff/XMLCharContext.hxx
index dd1238b896..d3e160a25e 100644
--- a/xmloff/inc/xmloff/XMLCharContext.hxx
+++ b/xmloff/inc/xmloff/XMLCharContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCharContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
index de4dec8fa8..a553c7d800 100644
--- a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLConstantsPropertyHandler.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/xmloff/inc/xmloff/XMLEventExport.hxx
index 260d44f848..6ec4ed86ea 100644
--- a/xmloff/inc/xmloff/XMLEventExport.hxx
+++ b/xmloff/inc/xmloff/XMLEventExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEventExport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/xmloff/inc/xmloff/XMLEventsImportContext.hxx
index 207a6fd0ef..b806e45eec 100644
--- a/xmloff/inc/xmloff/XMLEventsImportContext.hxx
+++ b/xmloff/inc/xmloff/XMLEventsImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEventsImportContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
index dc252d5efd..3733e23207 100644
--- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFontAutoStylePool.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index 9ac595b5f7..7bb2d2992f 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFontStylesContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
index 1897344c68..27498f53d9 100644
--- a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLGraphicsDefaultStyle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx
index 2a4302882d..6f9cd25881 100644
--- a/xmloff/inc/xmloff/XMLPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLPageExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLPageExport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
index 6bd96b3991..bdef2192ca 100644
--- a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
+++ b/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLShapeStyleContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/xmloff/inc/xmloff/XMLStringVector.hxx
index dd94fe9eef..52a71aa89f 100644
--- a/xmloff/inc/xmloff/XMLStringVector.hxx
+++ b/xmloff/inc/xmloff/XMLStringVector.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStringVector.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
index f93251e090..2824f97252 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMasterPageContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
index f40cc7625c..811f198ed7 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMasterPageExport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
index d5f82defd1..929180d3e9 100644
--- a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMasterStylesContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
index 4aeb0e8f8f..c6dcd044dd 100644
--- a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextShapeStyleContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/xmloff/inc/xmloff/XMLTextTableContext.hxx
index 36036e4b9b..bfe47519be 100644
--- a/xmloff/inc/xmloff/XMLTextTableContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextTableContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextTableContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/animexp.hxx b/xmloff/inc/xmloff/animexp.hxx
index ec8a50efed..f66ea98f45 100644
--- a/xmloff/inc/xmloff/animexp.hxx
+++ b/xmloff/inc/xmloff/animexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animexp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/attrlist.hxx b/xmloff/inc/xmloff/attrlist.hxx
index 6510eb2bf6..1cfead427f 100644
--- a/xmloff/inc/xmloff/attrlist.hxx
+++ b/xmloff/inc/xmloff/attrlist.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrlist.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/contextid.hxx b/xmloff/inc/xmloff/contextid.hxx
index d0681895fa..ef49dce472 100644
--- a/xmloff/inc/xmloff/contextid.hxx
+++ b/xmloff/inc/xmloff/contextid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contextid.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/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx
index 971d25090f..7fb75edfc6 100644
--- a/xmloff/inc/xmloff/controlpropertyhdl.hxx
+++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlpropertyhdl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/dllapi.h b/xmloff/inc/xmloff/dllapi.h
index 1489396760..aad4e5bef5 100644
--- a/xmloff/inc/xmloff/dllapi.h
+++ b/xmloff/inc/xmloff/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/xmloff/inc/xmloff/families.hxx b/xmloff/inc/xmloff/families.hxx
index a9662fb7f9..890d523012 100644
--- a/xmloff/inc/xmloff/families.hxx
+++ b/xmloff/inc/xmloff/families.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: families.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/xmloff/inc/xmloff/formlayerexport.hxx b/xmloff/inc/xmloff/formlayerexport.hxx
index 3606c2143f..953c18ede0 100644
--- a/xmloff/inc/xmloff/formlayerexport.hxx
+++ b/xmloff/inc/xmloff/formlayerexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formlayerexport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/xmloff/inc/xmloff/formlayerimport.hxx
index d21241accf..54e025e5bb 100644
--- a/xmloff/inc/xmloff/formlayerimport.hxx
+++ b/xmloff/inc/xmloff/formlayerimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formlayerimport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/formsimp.hxx b/xmloff/inc/xmloff/formsimp.hxx
index d015b6191c..2c3b75827f 100644
--- a/xmloff/inc/xmloff/formsimp.hxx
+++ b/xmloff/inc/xmloff/formsimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formsimp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx
index 305d9fabfc..c7402be0c5 100644
--- a/xmloff/inc/xmloff/maptype.hxx
+++ b/xmloff/inc/xmloff/maptype.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: maptype.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/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index 9c221bc200..a91305e216 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nmspmap.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svx/source/dialog/impgrf.hrc b/xmloff/inc/xmloff/odffields.hxx
index 91ab0e4ff6..ef8121a081 100644
--- a/svx/source/dialog/impgrf.hrc
+++ b/xmloff/inc/xmloff/odffields.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impgrf.hrc,v $
- * $Revision: 1.3 $
+ * $RCSfile: $
+ * $Revision: $
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,33 +27,30 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_IMPGRF_HRC
-#define _SVX_IMPGRF_HRC
-
-// define -------------------------------------------------------------------
-
-#define STR_IMPORT_ALL				1
-#define STR_UNKNOWN_FORMAT			2
-#define STR_FLT_BMP					3
-#define	STR_FLT_SGF					4
-#define	STR_FLT_SGV					5
-#define	STR_FLT_SVM					6
-#define STR_PATH_NOT_FOUND1			7
-#define STR_PATH_NOT_FOUND2			8
-#define STR_GRFILTER_OPENERROR		9
-#define STR_GRFILTER_IOERROR		10
-#define STR_GRFILTER_FORMATERROR	11
-#define STR_GRFILTER_VERSIONERROR	12
-#define STR_GRFILTER_FILTERERROR	13
-#define STR_GRFILTER_TOOBIG			14
-#define STR_PROPERTIES				15
-#define STR_HOME					16
-#define STR_LINK			 		17
-#define STR_PREVIEW					18
-#define STR_FILTER					19
-#define STR_IMPORTGRAPHIC_COUNT		19
-
-
-#endif
 
+/* 
+ * Copyright 2008 by Novell, Inc.
+ */
 
+#ifndef _ODFFIELDS_HXX
+#define _ODFFIELDS_HXX
+
+
+#define ODF_FORMTEXT "vnd.oasis.opendocument.field.FORMTEXT"
+
+#define ODF_FORMCHECKBOX "vnd.oasis.opendocument.field.FORMCHECKBOX"
+#define ODF_FORMCHECKBOX_HELPTEXT "Checkbox_HelpText"
+#define ODF_FORMCHECKBOX_NAME "Checkbox_Name"
+#define ODF_FORMCHECKBOX_RESULT "Checkbox_Checked"
+
+#define ODF_FORMDROPDOWN "vnd.oasis.opendocument.field.FORMDROPDOWN"
+#define ODF_FORMDROPDOWN_LISTENTRY "Dropdown_ListEntry"
+#define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected"
+
+#define ODF_TOC "vnd.oasis.opendocument.field.TOC"
+
+#define ODF_HYPERLINK "vnd.oasis.opendocument.field.HYPERLINK"
+
+#define ODF_PAGEREF "vnd.oasis.opendocument.field.PAGEREF"
+
+#endif /*  _ODFFIELDS_HXX */
diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/xmloff/inc/xmloff/prhdlfac.hxx
index 590b550e0a..6b863d2d8b 100644
--- a/xmloff/inc/xmloff/prhdlfac.hxx
+++ b/xmloff/inc/xmloff/prhdlfac.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prhdlfac.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx
index 61dcfdcceb..5ae9d2b60d 100644
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/xmloff/inc/xmloff/prstylei.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prstylei.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx
index f4f79c117c..b9a3eb63e7 100644
--- a/xmloff/inc/xmloff/shapeexport.hxx
+++ b/xmloff/inc/xmloff/shapeexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeexport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index cae039cc62..ae72a20b6f 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeimport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index 0d28a2e46d..0599220794 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styleexp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/xmloff/inc/xmloff/table/XMLTableExport.hxx
index 041c96d194..f70ba3787a 100644
--- a/xmloff/inc/xmloff/table/XMLTableExport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableExport.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/xmloff/inc/xmloff/table/XMLTableImport.hxx b/xmloff/inc/xmloff/table/XMLTableImport.hxx
index ee3f461739..c85298df66 100644
--- a/xmloff/inc/xmloff/table/XMLTableImport.hxx
+++ b/xmloff/inc/xmloff/table/XMLTableImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableImport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 381973917d..cdfd1d9b34 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtimp.hxx,v $
- * $Revision: 1.13.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index e82923d90b..cf538d1598 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtparae.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/txtprmap.hxx b/xmloff/inc/xmloff/txtprmap.hxx
index c1dbb2bba1..31b320adc5 100644
--- a/xmloff/inc/xmloff/txtprmap.hxx
+++ b/xmloff/inc/xmloff/txtprmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtprmap.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/xmloff/inc/xmloff/txtstyle.hxx b/xmloff/inc/xmloff/txtstyle.hxx
index d2388e655c..efea3564cd 100644
--- a/xmloff/inc/xmloff/txtstyle.hxx
+++ b/xmloff/inc/xmloff/txtstyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtstyle.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx
index 6d97d76f62..c726d735ae 100644
--- a/xmloff/inc/xmloff/txtstyli.hxx
+++ b/xmloff/inc/xmloff/txtstyli.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtstyli.hxx,v $
- * $Revision: 1.3.102.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/uniref.hxx b/xmloff/inc/xmloff/uniref.hxx
index a6e1e6895f..844478e18d 100644
--- a/xmloff/inc/xmloff/uniref.hxx
+++ b/xmloff/inc/xmloff/uniref.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uniref.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx
index 36bb8e8b58..7ce25f9ac5 100644
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/xmloff/inc/xmloff/xmlaustp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlaustp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx
index 2482369d63..5aaabdc0e5 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/xmloff/inc/xmloff/xmlcnimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcnimp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlement.hxx b/xmloff/inc/xmloff/xmlement.hxx
index c783f99cf2..8926165bb9 100644
--- a/xmloff/inc/xmloff/xmlement.hxx
+++ b/xmloff/inc/xmloff/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/xmloff/inc/xmloff/xmlevent.hxx b/xmloff/inc/xmloff/xmlevent.hxx
index aa47a20fe7..1226e36718 100644
--- a/xmloff/inc/xmloff/xmlevent.hxx
+++ b/xmloff/inc/xmloff/xmlevent.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlevent.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index c6f048f71b..8900e35542 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexp.hxx,v $
- * $Revision: 1.11.48.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx
index a1b935de40..0ddc9a6682 100644
--- a/xmloff/inc/xmloff/xmlexppr.hxx
+++ b/xmloff/inc/xmloff/xmlexppr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexppr.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/xmloff/inc/xmloff/xmlictxt.hxx
index 14ac38489e..ba5906a497 100644
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/xmloff/inc/xmloff/xmlictxt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlictxt.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 93b32254f8..d7c17628d1 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlimp.hxx,v $
- * $Revision: 1.12.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 243c050117..960c01b775 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlimppr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/xmloff/inc/xmloff/xmlmetae.hxx
index 6715456ea2..c420e4144e 100644
--- a/xmloff/inc/xmloff/xmlmetae.hxx
+++ b/xmloff/inc/xmloff/xmlmetae.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlmetae.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/xmloff/inc/xmloff/xmlmetai.hxx b/xmloff/inc/xmloff/xmlmetai.hxx
index d525c74636..06c9627554 100644
--- a/xmloff/inc/xmloff/xmlmetai.hxx
+++ b/xmloff/inc/xmloff/xmlmetai.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlmetai.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/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index 382aa311e4..4fbfa3a139 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnume.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/xmloff/inc/xmloff/xmlnumfe.hxx
index 1c424b3733..cdf3b3cca7 100644
--- a/xmloff/inc/xmloff/xmlnumfe.hxx
+++ b/xmloff/inc/xmloff/xmlnumfe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnumfe.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index f30023905e..43753723df 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnumfi.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/xmloff/inc/xmloff/xmlnumi.hxx
index acc9784837..07aa6177f2 100644
--- a/xmloff/inc/xmloff/xmlnumi.hxx
+++ b/xmloff/inc/xmloff/xmlnumi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnumi.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/xmloff/inc/xmloff/xmlprcon.hxx b/xmloff/inc/xmloff/xmlprcon.hxx
index 9a8f4bd359..64e31b1796 100644
--- a/xmloff/inc/xmloff/xmlprcon.hxx
+++ b/xmloff/inc/xmloff/xmlprcon.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlprcon.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/xmloff/inc/xmloff/xmlprhdl.hxx
index 888fe614d6..97fa3bd757 100644
--- a/xmloff/inc/xmloff/xmlprhdl.hxx
+++ b/xmloff/inc/xmloff/xmlprhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlprhdl.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx
index 10730effc0..5c2ac5d3fc 100644
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/xmloff/inc/xmloff/xmlprmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlprmap.hxx,v $
- * $Revision: 1.4.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/xmloff/inc/xmloff/xmlscripti.hxx
index 2d20e14494..004168c3d6 100644
--- a/xmloff/inc/xmloff/xmlscripti.hxx
+++ b/xmloff/inc/xmloff/xmlscripti.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlscripti.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index e55a6d7e24..5f721a68e9 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlstyle.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/xmloff/inc/xmloff/xmltkmap.hxx b/xmloff/inc/xmloff/xmltkmap.hxx
index 1055439ddb..f329c55451 100644
--- a/xmloff/inc/xmloff/xmltkmap.hxx
+++ b/xmloff/inc/xmloff/xmltkmap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltkmap.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 738105740d..44c5f364ff 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltoken.hxx,v $
- * $Revision: 1.27.6.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx
index cd3e443563..1983d88521 100644
--- a/xmloff/inc/xmloff/xmltypes.hxx
+++ b/xmloff/inc/xmloff/xmltypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltypes.hxx,v $
- * $Revision: 1.6.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 0e173188b6..ca22ef8696 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmluconv.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmlreg.hxx
index 5606c74021..f4ee189fa9 100644
--- a/xmloff/inc/xmlreg.hxx
+++ b/xmloff/inc/xmlreg.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlreg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmltabe.hxx
index c26b75b445..febc4a24cb 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmltabe.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltabe.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/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index f69fc535b7..4de2b24158 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltabi.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 0a4950d96a..dd1edfa5d5 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlversion.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index 98ab3c3e5c..0b51b0dd97 100644
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -10,6 +10,7 @@ mkdir: %_DEST%\inc%_EXT%\xmloff
 
 ..\dtd\* %_DEST%\bin%_EXT%
 
+..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx
 ..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h
 ..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx
 ..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx
diff --git a/xmloff/qa/unoapi/makefile.mk b/xmloff/qa/unoapi/makefile.mk
index 61d01403a1..0b8d1ebf92 100644
--- a/xmloff/qa/unoapi/makefile.mk
+++ b/xmloff/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/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 6dd0338378..20af306cd8 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ColorPropertySet.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/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index 6a869c2baf..b8b0d1d0bc 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ColorPropertySet.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index 377db18d2d..fbefafae57 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MultiPropertySetHandler.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index f801d630fe..e52ec47c72 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyMap.hxx,v $
- * $Revision: 1.34.8.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 12f3e74b2f..0514d4b04b 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyMaps.cxx,v $
- * $Revision: 1.56.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 14474db43f..accdce4941 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLAutoStylePoolP.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index 5e026ef91c..e75d253855 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLAutoStylePoolP.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/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index c59aab85f1..8188d715de 100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLCalculationSettingsContext.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/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index 3590516235..6f5ffee572 100755
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCalculationSettingsContext.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/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 5125a37610..075e3f66bc 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLChartContext.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/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 076cde7340..190d0d2ee7 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLChartContext.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/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 56daa7b05c..5141f23e88 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLExport.cxx,v $
- * $Revision: 1.101 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 9a8779630c..888191c994 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLImport.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 45f29e5325..2a26a628b0 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLParagraphContext.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/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index 5cb0904cea..271b041dae 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLParagraphContext.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/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 3d8a8495f4..55628c961a 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLPlotAreaContext.cxx,v $
- * $Revision: 1.47.38.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 9ec09f3f07..0a5d237b78 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLPlotAreaContext.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/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 82a8973408..a5621b14c8 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLSeries2Context.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/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index cb5a841974..6278df710c 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLSeries2Context.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 5cae51aa99..cb693f7dc0 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLSeriesHelper.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/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx
index 6c8a458edf..fbbc63b991 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.hxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLSeriesHelper.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 2e0aad2997..5649848e05 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLTableContext.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/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index a49c70b8a8..f8485ed571 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLTableContext.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/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 6a600a44e1..d88d8c7ee5 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLTools.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -745,14 +742,14 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
         uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY );
         if( xChild.is() )
         {
-            aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) );

+            aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) );
             if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project") ) ) != -1 )
             {
-                //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) 

-                //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream

-                if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 )

-                    bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer

-                else

+                //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) 
+                //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream
+                if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 )
+                    bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer
+                else
                     bResult= true; //in this case the OLE chart was created by an older version, as OLE objects are sometimes stream copied the version can differ from the parents version, so the parents version is not a reliable indicator
             }
             else if( isDocumentGeneratedWithOpenOfficeOlderThan2_0(xChartModel) )
@@ -762,18 +759,18 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
     return bResult;
 }
 
-bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel)

-{

-    bool bResult = false;

-    ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );

-    if(    ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 )

-        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 )

-        )

-        bResult= true;

-    return bResult;

+bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel)
+{
+    bool bResult = false;
+    ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );
+    if(    ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 )
+        || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 )
+        )
+        bResult= true;
+    return bResult;
 }
 
 Reference< chart2::data::XDataProvider > getDataProviderFromParent( const Reference< chart2::XChartDocument >& xChartDoc )
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 8be5df2ddb..d66c125e0c 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchXMLTools.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/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
index 85687b6081..4cb63a61c4 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAxisPositionPropertyHdl.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
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
index 45a61df894..f3195eb996 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAxisPositionPropertyHdl.hxx,v $
- * $Revision: 1.1.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index d81ebb2b1f..daeed3db21 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChartPropertyContext.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/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx
index 7562c6c7a3..5ce1945bc2 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.hxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChartPropertyContext.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/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index c234c0e181..c8828d76ca 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChartStyleContext.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/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index cc67c4ac75..2633467359 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLErrorBarStylePropertyHdl.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/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
index 7edcd4cfcb..bc6fa25350 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLErrorBarStylePropertyHdl.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/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index af5dcaa083..1fb3899bd9 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLErrorIndicatorPropertyHdl.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/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
index 4a643b4c6d..e01a9ebd2c 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLErrorIndicatorPropertyHdl.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/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 804bb96cc8..8df46098e6 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLabelSeparatorContext.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/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index 3b94c1c719..a7c883e6b0 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLabelSeparatorContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index ee16507fc4..984786d855 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSymbolImageContext.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/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index fcfce9b514..823836e1c7 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSymbolImageContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
index cf2f6598fe..ead835c513 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSymbolTypePropertyHdl.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/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index e3b6a37853..2987b9b2a8 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSymbolTypePropertyHdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx
index b2cf377b66..a3ca9fbd12 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.cxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextOrientationHdl.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/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx
index d49431b96a..539952f3f7 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.hxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextOrientationHdl.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/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 48cdf9a683..72d5b2e591 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contexts.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/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index 1433049966..ee0fa92bc4 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: contexts.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/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
index 5b47b77702..33c217e513 100644
--- a/xmloff/source/chart/makefile.mk
+++ b/xmloff/source/chart/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/chart/transporttypes.cxx b/xmloff/source/chart/transporttypes.cxx
index 3c48d4598e..63a32fb5d3 100644
--- a/xmloff/source/chart/transporttypes.cxx
+++ b/xmloff/source/chart/transporttypes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transporttypes.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/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 90e8b48333..00806d2af1 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: transporttypes.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/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index a2077a00ce..fd3998d668 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentSettingsContext.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/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index d086580c2a..914370a95e 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DomBuilderContext.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/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index ff512474c8..7872be43fb 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DomExport.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/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index d4f7effb96..53bcb4658c 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProgressBarHelper.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/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 9066737c81..2028f7306b 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertySetMerger.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/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index e803c7dc1c..e755b287d3 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RDFaExportHelper.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/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 2846042177..4257f36c33 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RDFaImportHelper.cxx,v $
- * $Revision: 1.1.2.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 9834b76765..31611faacc 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SettingsExportHelper.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -103,28 +100,28 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
         break;
         case uno::TypeClass_SHORT:
         {
-            sal_Int16 nInt16;
+            sal_Int16 nInt16 = 0;
             aAny >>= nInt16;
             exportShort(nInt16, rName);
         }
         break;
         case uno::TypeClass_LONG:
         {
-            sal_Int32 nInt32;
+            sal_Int32 nInt32 = 0;
             aAny >>= nInt32;
             exportInt(nInt32, rName);
         }
         break;
         case uno::TypeClass_HYPER:
         {
-            sal_Int64 nInt64;
+            sal_Int64 nInt64 = 0;
             aAny >>= nInt64;
             exportLong(nInt64, rName);
         }
         break;
         case uno::TypeClass_DOUBLE:
         {
-            double fDouble;
+            double fDouble = 0.0;
             aAny >>= fDouble;
             exportDouble(fDouble, rName);
         }
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index cae9b456d1..60d2bfaa7f 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBase64Export.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/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index c744d7fee1..d6ccdf667f 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBase64ImportContext.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/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx
index 4e0190c129..f9aa74c177 100644
--- a/xmloff/source/core/XMLBasicExportFilter.cxx
+++ b/xmloff/source/core/XMLBasicExportFilter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBasicExportFilter.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/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index a9a189382d..f8526806fb 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEmbeddedObjectExportFilter.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/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 1b44a8cfe5..22edc73129 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEmbeddedObjectImportContext.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/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index bc641cbfcb..be9c6a159d 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attrlist.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index f39d2b8f47..c20a6ff98c 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: facreg.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/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 89cb16c9c2..86833af1bb 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: i18nmap.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/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
index b9cb8e9c1b..b881f9610f 100644
--- a/xmloff/source/core/makefile.mk
+++ b/xmloff/source/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: makefile.mk,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index e33a2ae108..6367f5f160 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: nmspmap.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -199,12 +196,12 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
     if (aIter != aNameMap.end())
     {
         sAttrName.append( sXMLNS  );
-        const ::rtl::OUString & prefix( (*aIter).second->sPrefix );

-        if (prefix.getLength()) // not default namespace

-        {

-            sAttrName.append( sal_Unicode(':') );

-            sAttrName.append( prefix );

-        }

+        const ::rtl::OUString & prefix( (*aIter).second->sPrefix );
+        if (prefix.getLength()) // not default namespace
+        {
+            sAttrName.append( sal_Unicode(':') );
+            sAttrName.append( prefix );
+        }
     }
     return sAttrName.makeStringAndClear();
 }
@@ -229,11 +226,11 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
             // don't bother caching this, it rarely happens
             OUStringBuffer sQName;
             sQName.append ( sXMLNS );
-            if (rLocalName.getLength()) // not default namespace

-            {

-                sQName.append ( sal_Unicode(':') );

-                sQName.append ( rLocalName );

-            }

+            if (rLocalName.getLength()) // not default namespace
+            {
+                sQName.append ( sal_Unicode(':') );
+                sQName.append ( rLocalName );
+            }
             return sQName.makeStringAndClear();;
         }
         case XML_NAMESPACE_XML:
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 1ae7ed7ab3..a7ff3ae4fe 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoatrcn.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/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index b372fc70b7..75bc1eeaa9 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unointerfacetouniqueidentifiermapper.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/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index d7d3035bc9..cbf42b5133 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlcnitm.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx
index 33a921caf0..03cae78854 100644
--- a/xmloff/source/core/xmlehelp.cxx
+++ b/xmloff/source/core/xmlehelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlehelp.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/xmloff/source/core/xmlenums.hxx b/xmloff/source/core/xmlenums.hxx
index 9c0ac650e4..7161bcd464 100644
--- a/xmloff/source/core/xmlenums.hxx
+++ b/xmloff/source/core/xmlenums.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlenums.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 0325048ca4..a25d25d887 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlerror.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/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index ca3522f8cb..3c4735400d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexp.cxx,v $
- * $Revision: 1.143 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index d7fe067fe8..62a7832024 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlictxt.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/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0ecf904cbe..dda82a237f 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlimp.cxx,v $
- * $Revision: 1.112.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmlkywd.cxx b/xmloff/source/core/xmlkywd.cxx
index 644bbc4457..78203ee781 100644
--- a/xmloff/source/core/xmlkywd.cxx
+++ b/xmloff/source/core/xmlkywd.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlkywd.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/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 1d8583dbcd..fcab07679e 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltkmap.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/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 7a509428a6..7913bde7cd 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltoken.cxx,v $
- * $Revision: 1.131.6.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 1a612027a4..0346aff523 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmluconv.cxx,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 8b854fe860..8f97a89007 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnhancedCustomShapeToken.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 284737ff73..184f855276 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLGraphicsDefaultStyle.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/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 1066e37766..a8fe1afd29 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLImageMapContext.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/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 297531c613..0c0f1a2d77 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLImageMapExport.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 34b89764fd..04d7437964 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLNumberStyles.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/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx
index 6ff63eee65..b9de191017 100644
--- a/xmloff/source/draw/XMLNumberStylesExport.hxx
+++ b/xmloff/source/draw/XMLNumberStylesExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLNumberStylesExport.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/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 609c5441b8..a8d1f96d21 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLReplacementImageContext.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/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index db45f63020..59a30c99b1 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLShapePropertySetContext.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/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 395817015c..e816dcacad 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLShapeStyleContext.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/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index fcb7384113..47b36abf7c 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationexport.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/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index b3f3e07771..ae29c424a7 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animationimport.cxx,v $
- * $Revision: 1.15.62.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index a374770a8a..b97ea298b1 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animexp.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/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index e3cbe88163..6838c81a59 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: animimp.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/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index b6770014ea..b99c48abfc 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: descriptionimp.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/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index f82db52121..c2ee2cdea2 100644
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: descriptionimp.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/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 5efceb59a3..dcc9ff48cb 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventimp.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/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index fa8fa9c3ad..c6029b4a3c 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventimp.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/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index 8755ba272d..b72ef7be88 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerexp.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/layerexp.hxx b/xmloff/source/draw/layerexp.hxx
index e2193a8704..6c8cfe14b0 100644
--- a/xmloff/source/draw/layerexp.hxx
+++ b/xmloff/source/draw/layerexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerexp.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index cf737b2080..e79e539e30 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerimp.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/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index 7da547c1a8..5360faaff4 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerimp.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/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk
index a0bd30cad1..3c9f7ae024 100644
--- a/xmloff/source/draw/makefile.mk
+++ b/xmloff/source/draw/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index 1149b1e6fd..cd90ac90cb 100644
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numithdl.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/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx
index a8eb311cda..c009b456b9 100644
--- a/xmloff/source/draw/numithdl.hxx
+++ b/xmloff/source/draw/numithdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numithdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 5ad2b1ba98..996aee9b1e 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propimp0.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/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index e3bbc3d21c..5a9c4f4980 100644
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propimp0.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/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index fb440dc11e..248f98800a 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdpropls.cxx,v $
- * $Revision: 1.102 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 569340c8c3..ce54cbb458 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdpropls.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/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index f75107c6e2..9f574d0048 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdxmlexp.cxx,v $
- * $Revision: 1.119 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1263,51 +1260,51 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
                         break;
                     }
 
-                    case 33 : // AUTOLAYOUT_4CLIPART

-                    {

-                        Rectangle aTopLeft(pInfo->GetPresRectangle());

-                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

-                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));

-                        Rectangle aBottomLeft(aTopLeft);

-                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);

-                        Rectangle aTopRight(aTopLeft);

-                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);

-                        Rectangle aBottomRight(aTopRight);

-                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);

-

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);

-                        break;

-                    }

-
-                    case 34 : // AUTOLAYOUT_6CLIPART

-                    {

-                        Rectangle aTopLeft(pInfo->GetPresRectangle());

-                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));

-                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));	

-                        Rectangle aTopCenter(aTopLeft);

-                        aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);

-                        Rectangle aTopRight(aTopLeft);

-                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);

-                    

-                        Rectangle aBottomLeft(aTopLeft);

-                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);

-                        Rectangle aBottomCenter(aTopCenter);

-                        aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);

-                        Rectangle aBottomRight(aTopRight);

-                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);

-                                                

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);

-                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);

-                        break;

+                    case 33 : // AUTOLAYOUT_4CLIPART
+                    {
+                        Rectangle aTopLeft(pInfo->GetPresRectangle());
+                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
+                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
+                        Rectangle aBottomLeft(aTopLeft);
+                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+                        Rectangle aTopRight(aTopLeft);
+                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
+                        Rectangle aBottomRight(aTopRight);
+                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
+                        break;
+                    }
+
+                    case 34 : // AUTOLAYOUT_6CLIPART
+                    {
+                        Rectangle aTopLeft(pInfo->GetPresRectangle());
+                        aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
+                        aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));	
+                        Rectangle aTopCenter(aTopLeft);
+                        aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);
+                        Rectangle aTopRight(aTopLeft);
+                        aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);
+                    
+                        Rectangle aBottomLeft(aTopLeft);
+                        aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
+                        Rectangle aBottomCenter(aTopCenter);
+                        aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);
+                        Rectangle aBottomRight(aTopRight);
+                        aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
+                                                
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);
+                        ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
+                        break;
                     }
                     default:
                     {
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index c5d92fcd05..e80bb005c2 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_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: sdxmlexp_impl.hxx,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/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 538dd65384..3a57098c3a 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdxmlimp.cxx,v $
- * $Revision: 1.58 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 3cf1468ba2..11fd210f2d 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_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: sdxmlimp_impl.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/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 7415fed326..a2eb587a2a 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeexport.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/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index ba90886a3e..1fda3d68b2 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeexport2.cxx,v $
- * $Revision: 1.66 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index 2786e82fc9..b162d59b60 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeexport3.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/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index a8587489d5..463e206616 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeexport4.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1031,7 +1028,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
                     {
                         if ( rAdj.Value.getValueTypeClass() == uno::TypeClass_DOUBLE )
                         {
-                            double fValue;
+                            double fValue = 0.0;
                             rAdj.Value >>= fValue;
                             rUnitConverter.convertDouble( aStrBuffer, fValue );
                         }
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index e30a96065b..282ff3c313 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shapeimport.cxx,v $
- * $Revision: 1.68 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index f8e057d53b..ee44931cff 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontext.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/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
index 7617989234..73682f6930 100644
--- a/xmloff/source/draw/viewcontext.hxx
+++ b/xmloff/source/draw/viewcontext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: viewcontext.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/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 7a992a65f2..0d3d285945 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xexptran.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/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 878f9bcf6e..860bc6b3e5 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximp3dobject.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/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 8b7f7a76ac..a7ad16fffe 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximp3dobject.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/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 7330904a1f..a691c479a1 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximp3dscene.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/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 117cd71f3a..0a408182e2 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximp3dscene.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/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 71aa82da49..70b6a26ceb 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpbody.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/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index c807cec1c8..efc088105a 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpbody.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/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index d491b1bab6..5d50cbecba 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpcustomshape.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 0dc710d1ea..159bd5c985 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpcustomshape.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/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 89e2a4e3a6..c2894a36bc 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpgrp.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/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index bbcdda70d9..1a4b5326dc 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpgrp.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/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 04d7ec3d9e..cb71f1fdf2 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximplink.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/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 249b2f81ab..1ff631f8b5 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximplink.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/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 729fcc26fa..5bb6d9fe4c 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpnote.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/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index ed12d68c97..7d810431f0 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpnote.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/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 1008691682..06c227bcdf 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximppage.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/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 21c6992098..2ec9dcc8dd 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximppage.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/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 1e76667fd8..0a0dbb98ff 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpshap.cxx,v $
- * $Revision: 1.128.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 65616bfdf2..8101b89c4d 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpshap.hxx,v $
- * $Revision: 1.48.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index 3bea281dcf..f5b3f5fa19 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpshow.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/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index 4501fa9c0d..4536ccca3e 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpshow.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/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 0254d6ddf1..5eb108c5b3 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpstyl.cxx,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -732,24 +729,24 @@ void SdXMLPresentationPageLayoutContext::EndElement()
                 }
                 case 5:
                 {
-                    SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);

-

-                    if(pObj1->GetName().equals(

-                        OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))

-                    {

-                        mnTypeId = 18; // AUTOLAYOUT_4OBJ

-                    }

-                    else

-                    {

-                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART

-                    }

-                     break;

+                    SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
+
+                    if(pObj1->GetName().equals(
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))
+                    {
+                        mnTypeId = 18; // AUTOLAYOUT_4OBJ
+                    }
+                    else
+                    {
+                        mnTypeId = 33; // AUTOLAYOUT_4CLIPART
+                    }
+                     break;
 
                 }
                 case 7: 
                 {
-                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART

-                    break;

+                    mnTypeId = 33; // AUTOLAYOUT_6CLIPART
+                    break;
                 }
                 default:
                 {
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 146d91c986..9bfd0cd209 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ximpstyl.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/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index bff92c7cbe..65ab21a01b 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attriblistmerge.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/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 43c905dc8c..c876d1f559 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: attriblistmerge.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/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index 5fa8b853c0..b0cb120b11 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: callbacks.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/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx
index 05fcbb8bdf..68c681a65b 100644
--- a/xmloff/source/forms/controlelement.cxx
+++ b/xmloff/source/forms/controlelement.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlelement.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/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx
index 0bf57063b0..64ccefdd8f 100644
--- a/xmloff/source/forms/controlelement.hxx
+++ b/xmloff/source/forms/controlelement.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlelement.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index 390e50a105..55d41f7c6b 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlpropertyhdl.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/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index a40421864c..710906547b 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlpropertymap.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/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index d6302c74f5..44350fb3de 100644
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: controlpropertymap.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 3314e27400..e82d2a3456 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: elementexport.cxx,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index c2d5fde52a..895ca20749 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: elementexport.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/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index e25eef33db..6f78786e78 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: elementimport.cxx,v $
- * $Revision: 1.60.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index ce6540cd69..a9a5857f93 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: elementimport.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/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx
index 49bd8d8f7f..d0abeb0824 100644
--- a/xmloff/source/forms/elementimport_impl.hxx
+++ b/xmloff/source/forms/elementimport_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: elementimport_impl.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/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 45a679bd40..29c120abce 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventexport.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index fcb0029e36..8c3578dd55 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventexport.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/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index 1556dd6ac6..e4127722d5 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventimport.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index 2e58fa73e5..db0933a244 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eventimport.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/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 75a44b1ffe..5fd09a451f 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formattributes.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/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index fcadbecd3c..f2e7bb7cc3 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formattributes.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/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index 0f3e657e16..488299a1e2 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formcellbinding.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/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index 4053b07f50..1e35561455 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formcellbinding.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/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index c9911d3e47..3db9423c22 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formenums.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/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx
index 2d798bcf6e..403b82e908 100644
--- a/xmloff/source/forms/formenums.hxx
+++ b/xmloff/source/forms/formenums.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formenums.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/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index 2d83b9bc5c..871520151c 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formevents.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/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx
index 018867076d..6740a99d8b 100644
--- a/xmloff/source/forms/formevents.hxx
+++ b/xmloff/source/forms/formevents.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formevents.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/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 867624fbaa..b36020d98c 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formlayerexport.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 0c903a4204..0f8e65e623 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formlayerimport.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/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index 42acd6d339..c818dff6a1 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formsimp.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/xmloff/source/forms/formstyles.cxx b/xmloff/source/forms/formstyles.cxx
index c0e7aba282..c4eee13554 100644
--- a/xmloff/source/forms/formstyles.cxx
+++ b/xmloff/source/forms/formstyles.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formstyles.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/xmloff/source/forms/formstyles.hxx b/xmloff/source/forms/formstyles.hxx
index 5ac5a89baf..c2255a97f0 100644
--- a/xmloff/source/forms/formstyles.hxx
+++ b/xmloff/source/forms/formstyles.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: formstyles.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index d5e647f4b2..803058285c 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridcolumnproptranslator.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/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 51c52c59fa..36c24928a5 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: gridcolumnproptranslator.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/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx
index dcf532b7d3..734809e2f3 100644
--- a/xmloff/source/forms/ifacecompare.hxx
+++ b/xmloff/source/forms/ifacecompare.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ifacecompare.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/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index eb8c56b610..2d3c5a8e12 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerexport.cxx,v $
- * $Revision: 1.36.102.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 6d3a318bfd..0a2e7c25eb 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerexport.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/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 81a1276708..5fe178f561 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerimport.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/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index ad11880beb..80a9db78d8 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: layerimport.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/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx
index 438fa55cca..61e7fb5197 100644
--- a/xmloff/source/forms/logging.cxx
+++ b/xmloff/source/forms/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.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx
index f75a4e53d2..e97493bf9a 100644
--- a/xmloff/source/forms/logging.hxx
+++ b/xmloff/source/forms/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
index facc6b9810..8c46a4fbf3 100644
--- a/xmloff/source/forms/makefile.mk
+++ b/xmloff/source/forms/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 0a65cbafe4..69bc154f44 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeforms.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 9fde6e1568..81ae13a397 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeforms.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 5a265d4ac6..e6140c03c3 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyexport.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 0934d9b642..8ca221bbe8 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyexport.hxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 3d88b29271..b5c20be581 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyimport.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/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 2306bd80bd..647af830f1 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: propertyimport.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/xmloff/source/forms/strings.cxx b/xmloff/source/forms/strings.cxx
index a99a422a0f..105b7c3d3b 100644
--- a/xmloff/source/forms/strings.cxx
+++ b/xmloff/source/forms/strings.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/xmloff/source/forms/strings.hxx b/xmloff/source/forms/strings.hxx
index 57bf81f620..83d4262531 100644
--- a/xmloff/source/forms/strings.hxx
+++ b/xmloff/source/forms/strings.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.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/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx
index f3633132f0..e99aa05bd2 100644
--- a/xmloff/source/forms/valueproperties.cxx
+++ b/xmloff/source/forms/valueproperties.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: valueproperties.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/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx
index 4d88a9d90c..72d1cfa0af 100644
--- a/xmloff/source/forms/valueproperties.hxx
+++ b/xmloff/source/forms/valueproperties.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: valueproperties.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 9ad2b841cf..2f416d32a2 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MetaExportComponent.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/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index f371054f6f..34604f32f2 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MetaImportComponent.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/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk
index 3e6ca575da..5efb538c98 100644
--- a/xmloff/source/meta/makefile.mk
+++ b/xmloff/source/meta/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index fb2893201f..938dfb41f6 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlmetae.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/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 26a96378a1..07d0985ecb 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlmetai.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/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index a3d370db30..2889be3bf6 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlversion.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index 917673d06d..a67aee443d 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEventExport.cxx,v $
- * $Revision: 1.21.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index d1697d92a9..7588cbc1da 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEventImportHelper.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index b1881b609f..75a9ca394e 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLEventsImportContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 58928e3be7..f0728f1d49 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLScriptContextFactory.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/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index 92e4e70cd7..be72ceba52 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLScriptExportHandler.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/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 26eb08813a..cc09c3fcf2 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStarBasicContextFactory.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/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 863db4fc34..8e9ca88df7 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStarBasicExportHandler.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk
index e4ce555e9b..4109ae6fc5 100644
--- a/xmloff/source/script/makefile.mk
+++ b/xmloff/source/script/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx
index babc0a35c7..68cd64767f 100644
--- a/xmloff/source/script/xmlbasici.cxx
+++ b/xmloff/source/script/xmlbasici.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbasici.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/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index 2263326dcf..14ca06dc1d 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbasici.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index 96dbd6cf39..d1504276a4 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlscripti.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/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx
index 864ddd28f0..81627a4b7e 100644
--- a/xmloff/source/style/AttributeContainerHandler.cxx
+++ b/xmloff/source/style/AttributeContainerHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AttributeContainerHandler.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/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 072f6c3f4e..004b27a9ee 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DashStyle.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/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx
index 8874cb9853..9feffd67f1 100644
--- a/xmloff/source/style/DrawAspectHdl.cxx
+++ b/xmloff/source/style/DrawAspectHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DrawAspectHdl.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/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx
index 53b0beea69..35a2f79303 100644
--- a/xmloff/source/style/DrawAspectHdl.hxx
+++ b/xmloff/source/style/DrawAspectHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DrawAspectHdl.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/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index d9e7309dde..caffc1cad8 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EnumPropertyHdl.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/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 55556433d4..f5abd44e18 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FillStyleContext.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/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 9ed0c0b50b..36f3cc99a5 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FillStyleContext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index ac8dff99e3..2f7d30e05c 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: GradientStyle.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/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index a7d1c97871..ce3e2ff611 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: HatchStyle.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/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index c53ce82061..9120639fd9 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ImageStyle.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/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 86c78cbd6a..8423b70299 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MarkerStyle.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index bf856604df..3b5d15fa08 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MultiPropertySetHelper.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/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx
index cd82542be3..c61ae4b984 100644
--- a/xmloff/source/style/NamedBoolPropertyHdl.cxx
+++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NamedBoolPropertyHdl.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/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index dd4aa73b00..08e50aff43 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageHeaderFooterContext.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/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index 5775db0b13..016d2a4480 100644
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageHeaderFooterContext.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/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 5f3da2af10..781e46b200 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterExportPropMapper.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/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index da01d32757..ab4e3accf3 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterExportPropMapper.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/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 1f26064a4a..a9b135be21 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterImportContext.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/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index ca71aa71ec..76eab35a36 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterImportPropMapper.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/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx
index fa1aeb1a4f..f64a91a34d 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterImportPropMapper.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/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index 1dc3420d39..f624d89d9f 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterPropHdl.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/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index 5983311bbe..8395d33abd 100644
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterPropHdl.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/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index ee8b657368..6fff6212ff 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterPropHdlFactory.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/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx
index a5e053f9e3..8db84f3904 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.hxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterPropHdlFactory.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx
index 0662515ba1..0b632f6119 100644
--- a/xmloff/source/style/PageMasterPropMapper.cxx
+++ b/xmloff/source/style/PageMasterPropMapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterPropMapper.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/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx
index e08470cb26..b7b210a6e4 100644
--- a/xmloff/source/style/PageMasterPropMapper.hxx
+++ b/xmloff/source/style/PageMasterPropMapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterPropMapper.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/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 5968a600f8..b2d3932c8e 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PageMasterStyleMap.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 9148c00586..b6d5de3497 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PagePropertySetContext.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/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx
index 337fe28029..5a9ef3e760 100644
--- a/xmloff/source/style/PagePropertySetContext.hxx
+++ b/xmloff/source/style/PagePropertySetContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PagePropertySetContext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx
index c977f66dc2..1095aecf56 100644
--- a/xmloff/source/style/SinglePropertySetInfoCache.cxx
+++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SinglePropertySetInfoCache.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/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index 62b5c8c268..25a8d695d2 100644
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StyleMap.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/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 68a5597133..724b597717 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransGradientStyle.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/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
index 66a20cc868..f2e9c374e1 100644
--- a/xmloff/source/style/VisAreaContext.cxx
+++ b/xmloff/source/style/VisAreaContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VisAreaContext.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/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx
index 18bfa89987..895b838e6f 100644
--- a/xmloff/source/style/VisAreaExport.cxx
+++ b/xmloff/source/style/VisAreaExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: VisAreaExport.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/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx
index eec884771f..f0ff8f778b 100644
--- a/xmloff/source/style/WordWrapPropertyHdl.cxx
+++ b/xmloff/source/style/WordWrapPropertyHdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: WordWrapPropertyHdl.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
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 5e7e5534c2..8d62e01231 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBackgroundImageContext.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/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx
index 9bb32a935c..349cff5edb 100644
--- a/xmloff/source/style/XMLBackgroundImageExport.cxx
+++ b/xmloff/source/style/XMLBackgroundImageExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBackgroundImageExport.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/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
index 9acaad5a47..d272ed5e71 100644
--- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBitmapLogicalSizePropertyHandler.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/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
index 4792d6af02..2c6dedbb1f 100644
--- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
+++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLBitmapRepeatOffsetPropertyHandler.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/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index 016ce350cc..c241c1894b 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLClipPropertyHandler.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/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
index 34a92ce673..8dedaaa327 100644
--- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx
+++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLConstantsPropertyHandler.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/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx
index c9647b6779..8b69147b8f 100644
--- a/xmloff/source/style/XMLElementPropertyContext.cxx
+++ b/xmloff/source/style/XMLElementPropertyContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLElementPropertyContext.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/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
index dfab24d514..14a3ae4ff0 100644
--- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
+++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFillBitmapSizePropertyHandler.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/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index cbd6a5de0f..f671fa214a 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFontAutoStylePool.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 3bb6d98785..8322951197 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFontStylesContext.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/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 2f44af15ca..cb32c0096a 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteSeparatorExport.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/xmloff/source/style/XMLFootnoteSeparatorExport.hxx b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
index 5e1632aba3..2a20bf0947 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteSeparatorExport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index cd07088eb1..0ad73bff80 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteSeparatorImport.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/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index d345d553ae..04771bbf89 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteSeparatorImport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
index 50b1c0c087..31a03514b1 100644
--- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
+++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIsPercentagePropertyHandler.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/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 3e1bc7e9b6..d4ee240910 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLPageExport.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/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
index 59c152a589..89f9e314f0 100644
--- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
+++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLPercentOrMeasurePropertyHandler.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/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx
index acf97ca1d4..4169935bd6 100644
--- a/xmloff/source/style/XMLRectangleMembersHandler.cxx
+++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLRectangleMembersHandler.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/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index c23cf3d0e8..7e024e4ca9 100644
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adjushdl.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/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx
index ba7b46ea9d..42463e3ae1 100644
--- a/xmloff/source/style/adjushdl.hxx
+++ b/xmloff/source/style/adjushdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adjushdl.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/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index 97c18a5325..a65738c554 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backhdl.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/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx
index 3107d50493..5765d2319f 100644
--- a/xmloff/source/style/backhdl.hxx
+++ b/xmloff/source/style/backhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: backhdl.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/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 86ec25c5b5..141e592d23 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bordrhdl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx
index 4a2e4bd090..8d290473db 100644
--- a/xmloff/source/style/bordrhdl.hxx
+++ b/xmloff/source/style/bordrhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: bordrhdl.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/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index af781233bb..a8ed90188c 100644
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: breakhdl.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/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx
index b3deb58efa..f9ad6463b6 100644
--- a/xmloff/source/style/breakhdl.hxx
+++ b/xmloff/source/style/breakhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: breakhdl.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/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index d08bfe47de..d1e3c59ecc 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cdouthdl.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/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx
index 54507dc8a4..31a7c1c00e 100644
--- a/xmloff/source/style/cdouthdl.hxx
+++ b/xmloff/source/style/cdouthdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cdouthdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index 7ea4605e15..24de540aa1 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chrhghdl.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/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx
index 4a6968ef45..3b29aacc46 100644
--- a/xmloff/source/style/chrhghdl.hxx
+++ b/xmloff/source/style/chrhghdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chrhghdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index 0c65390787..68eb011178 100644
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chrlohdl.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/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx
index e488634913..a92e6791fd 100644
--- a/xmloff/source/style/chrlohdl.hxx
+++ b/xmloff/source/style/chrlohdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: chrlohdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx
index ef36ff9e70..7ca6e9f0fd 100644
--- a/xmloff/source/style/csmaphdl.cxx
+++ b/xmloff/source/style/csmaphdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csmaphdl.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/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx
index 65a32232e0..7a7c7d6925 100644
--- a/xmloff/source/style/csmaphdl.hxx
+++ b/xmloff/source/style/csmaphdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: csmaphdl.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/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx
index 47b51c1f6f..63b33ff344 100644
--- a/xmloff/source/style/durationhdl.cxx
+++ b/xmloff/source/style/durationhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: durationhdl.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/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx
index a5bda51a0e..c556a5742d 100644
--- a/xmloff/source/style/durationhdl.hxx
+++ b/xmloff/source/style/durationhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: durationhdl.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/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 5131ad4dd1..019f0ef9da 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: escphdl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx
index b6955df254..87fb1073f6 100644
--- a/xmloff/source/style/escphdl.hxx
+++ b/xmloff/source/style/escphdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: escphdl.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/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 16a4d71636..bbaf3d9b47 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fonthdl.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/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx
index d167c92736..5f2ff08334 100644
--- a/xmloff/source/style/fonthdl.hxx
+++ b/xmloff/source/style/fonthdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fonthdl.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/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 9822560f50..70442e524e 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impastp1.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/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index 9e3bb9bb60..481699b952 100644
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impastp2.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/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index e6c8b8fb82..7092021e74 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impastp3.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/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index daec835a1f..f7726b1922 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impastp4.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/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 9b1bbca72b..7e07195235 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impastpl.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/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx
index 65211e30b2..1a89cd1e51 100644
--- a/xmloff/source/style/kernihdl.cxx
+++ b/xmloff/source/style/kernihdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kernihdl.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/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx
index 1f69319032..9354a031d1 100644
--- a/xmloff/source/style/kernihdl.hxx
+++ b/xmloff/source/style/kernihdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: kernihdl.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/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx
index 7c3638ede2..678167427f 100644
--- a/xmloff/source/style/lspachdl.cxx
+++ b/xmloff/source/style/lspachdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lspachdl.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/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx
index 6ac8591013..37622c7b4e 100644
--- a/xmloff/source/style/lspachdl.hxx
+++ b/xmloff/source/style/lspachdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lspachdl.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/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
index 83e3e8b42a..3436b33b65 100644
--- a/xmloff/source/style/makefile.mk
+++ b/xmloff/source/style/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,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/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index d7ed9b35d7..51f682724f 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: numehelp.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/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx
index e6b2908da8..941541ff83 100644
--- a/xmloff/source/style/opaquhdl.cxx
+++ b/xmloff/source/style/opaquhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opaquhdl.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/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx
index 443fdcfeca..4d8c9ead2b 100644
--- a/xmloff/source/style/opaquhdl.hxx
+++ b/xmloff/source/style/opaquhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: opaquhdl.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/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index 97a043a665..3d5c55db53 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postuhdl.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/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx
index e0624a44c0..7cb83a5c77 100644
--- a/xmloff/source/style/postuhdl.hxx
+++ b/xmloff/source/style/postuhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postuhdl.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/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 81530e129c..731c80e138 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prhdlfac.cxx,v $
- * $Revision: 1.30.68.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 4f666b4fc3..c1bbc4b991 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: prstylei.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/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx
index ec728a3ac3..080df73e0a 100644
--- a/xmloff/source/style/shadwhdl.cxx
+++ b/xmloff/source/style/shadwhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shadwhdl.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/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx
index 7125d843f6..99cab92d40 100644
--- a/xmloff/source/style/shadwhdl.hxx
+++ b/xmloff/source/style/shadwhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shadwhdl.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/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx
index 5b56d1a4da..3372f0afcc 100644
--- a/xmloff/source/style/shdwdhdl.cxx
+++ b/xmloff/source/style/shdwdhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shdwdhdl.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/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx
index 255ab82d88..c8aac79d3c 100644
--- a/xmloff/source/style/shdwdhdl.hxx
+++ b/xmloff/source/style/shdwdhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: shdwdhdl.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/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 4317107268..0a46816c2e 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: styleexp.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/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx
index aff04d63a7..8e8dfdfbc7 100644
--- a/xmloff/source/style/tabsthdl.cxx
+++ b/xmloff/source/style/tabsthdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabsthdl.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/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx
index 0362a9a38b..27233dc6e9 100644
--- a/xmloff/source/style/tabsthdl.hxx
+++ b/xmloff/source/style/tabsthdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabsthdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 4560c9c516..12a4a3e79e 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undlihdl.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/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx
index 5e885f5b1d..6e99009738 100644
--- a/xmloff/source/style/undlihdl.hxx
+++ b/xmloff/source/style/undlihdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: undlihdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/uniref.cxx b/xmloff/source/style/uniref.cxx
index 3503f3f7b0..ec9cf8824a 100644
--- a/xmloff/source/style/uniref.cxx
+++ b/xmloff/source/style/uniref.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uniref.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/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index fbee9e0031..7833ce8dbf 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: weighhdl.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx
index 209ed40f97..22fa0cacb5 100644
--- a/xmloff/source/style/weighhdl.hxx
+++ b/xmloff/source/style/weighhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: weighhdl.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/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 4ed59fd092..cf3d85c89f 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlaustp.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/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 152b1adbbd..7dc81eb09d 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbahdl.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/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 9c4e1c3f0f..cff38518c1 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbahdl.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/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index caf36c88c3..058ece1481 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlexppr.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/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 29f89db36b..5212442340 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlimppr.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/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 37bfa76d3e..eecf90e27d 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnume.cxx,v $
- * $Revision: 1.34 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 61c1617bb1..ad3f5ab587 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnumfe.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/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index b8ccfdf909..172868c41a 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnumfi.cxx,v $
- * $Revision: 1.48 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 312017ffda..76ae1bac84 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlnumi.cxx,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx
index f86d342a7f..2f9cf1a271 100644
--- a/xmloff/source/style/xmlprcon.cxx
+++ b/xmloff/source/style/xmlprcon.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlprcon.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/xmloff/source/style/xmlprhdl.cxx b/xmloff/source/style/xmlprhdl.cxx
index b5e1b65dd2..b719aeeee2 100644
--- a/xmloff/source/style/xmlprhdl.cxx
+++ b/xmloff/source/style/xmlprhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlprhdl.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/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index 6fbb674697..e97fdd055e 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlprmap.cxx,v $
- * $Revision: 1.13.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 21ecbb0ea0..582e7d8ac2 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlstyle.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/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index b59c8167e1..36e8325872 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltabe.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 35508f7909..d4289b0eaa 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmltabi.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/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 7c8d3c5c2a..4429c7cbed 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableExport.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/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index dbbb7bdbb9..7c53e52a2b 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTableImport.cxx,v $
- * $Revision: 1.4.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk
index 7500fae4d0..6f8c8efab7 100644
--- a/xmloff/source/table/makefile.mk
+++ b/xmloff/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx
index af8539dc77..a0e227d33c 100644
--- a/xmloff/source/table/table.hxx
+++ b/xmloff/source/table/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/xmloff/source/table/tabledesignsimporter.cxx b/xmloff/source/table/tabledesignsimporter.cxx
index 986a1d9585..bf197000b3 100644
--- a/xmloff/source/table/tabledesignsimporter.cxx
+++ b/xmloff/source/table/tabledesignsimporter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tabledesignsimporter.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/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
index 0684cb460c..ab947fa614 100644
--- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx
+++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAnchorTypePropHdl.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx
index 7871b03434..417ec5631e 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.cxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoMarkFileContext.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/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx
index 7cb2f8c308..8ca3b9816e 100644
--- a/xmloff/source/text/XMLAutoMarkFileContext.hxx
+++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoMarkFileContext.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/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
index e350c76350..370741e159 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoTextContainerEventImport.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/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
index 8c0f8aed15..6b2b8c25ba 100644
--- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoTextContainerEventImport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 0a1e8527dc..fba18745f9 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoTextEventExport.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/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index bf2e9d60d6..f351ae7e59 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoTextEventExport.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/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 97c3ad719b..519199d201 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoTextEventImport.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx
index 02cf42608f..a7fbdf6ac0 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLAutoTextEventImport.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx
index cf9cbbfb5b..ea1b73544a 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.cxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCalculationSettingsContext.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/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx
index 4c35c49a4b..97b3c50994 100644
--- a/xmloff/source/text/XMLCalculationSettingsContext.hxx
+++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLCalculationSettingsContext.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/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 1202b7cd69..255ad6aabe 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeElementImportContext.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/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index 9056c387c3..e6b27156c8 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeElementImportContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index 56cd90fb7f..4c0b2c34bf 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeImportContext.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/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx
index 1bc966f9c9..4b46471f35 100644
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeImportContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx
index 1e8f521b91..d2710935b3 100644
--- a/xmloff/source/text/XMLChangeInfoContext.cxx
+++ b/xmloff/source/text/XMLChangeInfoContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeInfoContext.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/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx
index 91c4bfdfc3..803d1997d6 100644
--- a/xmloff/source/text/XMLChangeInfoContext.hxx
+++ b/xmloff/source/text/XMLChangeInfoContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangeInfoContext.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/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 5a0cf0bec4..1411816e8d 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangedRegionImportContext.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/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx
index af70f3cb17..1d7d142dcc 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.hxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLChangedRegionImportContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index 619bdd0c0d..9192db4d9c 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteBodyImportContext.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/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
index 669e2bea7c..57980fac15 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteBodyImportContext.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/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 0087b0fa49..63b5449f50 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteConfigurationImportContext.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/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index c0b0e94f77..16c38aa42d 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteImportContext.cxx,v $
- * $Revision: 1.15.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx
index 3615e96aac..5bb783aae6 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.hxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFootnoteImportContext.hxx,v $
- * $Revision: 1.5.66.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index ea71a83da3..93b9021b84 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexAlphabeticalSourceContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index 558ed871b0..2e6b637a8e 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexAlphabeticalSourceContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 967e69f8ca..72054bfd6c 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBibliographyConfigurationContext.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/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index 41ecbc32f0..6183dc9211 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBibliographyEntryContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
index 5acaac064e..eed54482ad 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBibliographyEntryContext.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/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index d30499a2b2..307f555da4 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBibliographySourceContext.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/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index 9e0d940f88..64207c2b03 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBibliographySourceContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx
index 02ae3afc20..c3ce18b3c4 100644
--- a/xmloff/source/text/XMLIndexBodyContext.cxx
+++ b/xmloff/source/text/XMLIndexBodyContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBodyContext.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/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx
index d305c9e493..933d6183d9 100644
--- a/xmloff/source/text/XMLIndexBodyContext.hxx
+++ b/xmloff/source/text/XMLIndexBodyContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexBodyContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index ca75b6fc69..08d29ea59e 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexChapterInfoEntryContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index f3e766baaf..a7398d3144 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexChapterInfoEntryContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index a82fc88aed..f5b126e93b 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexIllustrationSourceContext.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/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
index 48815a4a09..ddb18d759c 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexIllustrationSourceContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index 1c3a200dae..95b806cc2f 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexMarkExport.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/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index f31b6fecfb..f98a03d60b 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexMarkExport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index d72b41104f..f49253149e 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexObjectSourceContext.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/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index 0e14654589..0956fb15a6 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexObjectSourceContext.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/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index 78715d4f65..4c795ff821 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexSimpleEntryContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
index 025c018a2c..0c42ec5eee 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexSimpleEntryContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 6314f348d8..f206f8b8d1 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexSourceBaseContext.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/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index 5c91b866b6..96379d5612 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexSourceBaseContext.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/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
index da778b4ee6..dcbe6315f0 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexSpanEntryContext.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/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
index 028cf45936..6d1cfc1b39 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexSpanEntryContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index e3b796d44e..140a069ebf 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTOCContext.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx
index dd35af9f30..52c2ee2e0d 100644
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTOCContext.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/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index e1ad1b9975..0aaefc836c 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTOCSourceContext.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/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index a554969a15..957dd27e8b 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTOCSourceContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index ae43e705fb..0ca74755a8 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTOCStylesContext.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/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index 1b6c2560a0..85fed72501 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTOCStylesContext.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/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 681b2c4256..35551f4d06 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTabStopEntryContext.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/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
index 8630eb7978..c2f90af135 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTabStopEntryContext.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/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index e79f6e8dc8..03b57a515f 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTableSourceContext.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/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx
index 8cba6dc13b..3c851a8a9f 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTableSourceContext.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index 5376a4ed9e..e42c830b2b 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTemplateContext.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/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 0b25ac391e..01c6baf386 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTemplateContext.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/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
index a65730d2f7..4d8af9c91c 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTitleTemplateContext.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/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
index 54bf8a3ff4..81e37fcda9 100644
--- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexTitleTemplateContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 6713a049f4..e84123b875 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexUserSourceContext.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/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index 3bce25a875..23bf46376a 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLIndexUserSourceContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 02177ddc19..fe064ba540 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLineNumberingExport.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/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx
index d52f8656e9..1ff609018b 100644
--- a/xmloff/source/text/XMLLineNumberingExport.hxx
+++ b/xmloff/source/text/XMLLineNumberingExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLineNumberingExport.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 139e123f4f..a3553732b0 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLineNumberingImportContext.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/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
index 5b192ee961..2d0686f2a4 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLineNumberingSeparatorImportContext.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/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
index 02dc2f86c0..c9337a1b5a 100644
--- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
+++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLLineNumberingSeparatorImportContext.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/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index a8c52313a9..45fe207a41 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLPropertyBackpatcher.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/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index bd70ab2f3d..32eb453a8d 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLPropertyBackpatcher.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 2a3da1c569..b48a98f667 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLRedlineExport.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/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx
index 1a51e71fae..8801a11036 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLRedlineExport.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/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index d87e33765f..702f259eb2 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionExport.cxx,v $
- * $Revision: 1.50 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index 428a823f0a..dee65c1c56 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionExport.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index e3b54fa3ec..60be749787 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionFootnoteConfigExport.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/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
index 768f44dc20..c0243fc51c 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionFootnoteConfigExport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index ac696f9d1e..7781ec0efe 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionFootnoteConfigImport.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/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
index 95c5dbb90b..2db1232da9 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionFootnoteConfigImport.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/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 62f49620fb..46cfeeab86 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionImportContext.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/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index d860a4e212..196aeebe57 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionImportContext.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/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index a3c99c477d..0ae154135f 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionSourceDDEImportContext.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
index 5de1c4a11b..e38cf9f40c 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionSourceDDEImportContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 206d765f96..9ee468383c 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionSourceImportContext.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/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index dbef1babeb..b93bcedcc8 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLSectionSourceImportContext.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/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx
index 1db837573e..6769ff9912 100644
--- a/xmloff/source/text/XMLStringBufferImportContext.cxx
+++ b/xmloff/source/text/XMLStringBufferImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLStringBufferImportContext.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/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index 2e2a21bd1f..bf5fc55c1a 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextCharStyleNamesElementExport.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/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
index 90218b9083..5463a62b3d 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextCharStyleNamesElementExport.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 7a9a62c2f3..f25f806687 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextColumnsContext.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/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 9c33e46465..f35abb0dc0 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextColumnsExport.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/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 14776996b7..61b065ef2e 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextFrameContext.cxx,v $
- * $Revision: 1.75.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 4b3eece040..ed66c43555 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextFrameContext.hxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 9fae363ea5..05e9cd38bd 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextFrameHyperlinkContext.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/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index 3b305f9eed..7fdd058a54 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextFrameHyperlinkContext.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/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 44588316e8..cdfcba46a5 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextHeaderFooterContext.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/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index a0a62cab85..c99f9111a6 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextListAutoStylePool.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/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 208725f08e..6fc2c27c31 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextListBlockContext.cxx,v $
- * $Revision: 1.13.2.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index d412e551a1..b62e07e777 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextListBlockContext.hxx,v $
- * $Revision: 1.9.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 2acb8da650..52b3f04574 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextListItemContext.cxx,v $
- * $Revision: 1.12.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index 480b98a99d..5415210ccc 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextListItemContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 52384b0a40..08cb730d3a 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMarkImportContext.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,6 +38,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
+#include <xmloff/odffields.hxx>
 #include "xmlnmspe.hxx"
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
@@ -138,6 +136,33 @@ static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] =
     { XML_TOKEN_INVALID,    		0 },
 };
 
+
+static const char *lcl_getFormFieldmarkName(rtl::OUString &name)
+{
+    static const char sCheckbox[]=ODF_FORMCHECKBOX;
+    static const char sFormDropDown[]=ODF_FORMDROPDOWN;
+    if (name.compareToAscii("msoffice.field.FORMCHECKBOX")==0)
+        return sCheckbox;
+    else if (name.compareToAscii(ODF_FORMCHECKBOX)==0)
+        return sCheckbox;
+    if (name.compareToAscii(ODF_FORMDROPDOWN)==0)
+        return sFormDropDown;
+    else
+        return NULL;
+}
+
+static rtl::OUString lcl_getFieldmarkName(rtl::OUString &name)
+{
+    static const char sFormtext[]=ODF_FORMTEXT;
+    if (name.compareToAscii("msoffice.field.FORMTEXT")==0)
+        return rtl::OUString::createFromAscii(sFormtext);
+    else if (name.compareToAscii(ODF_FORMTEXT)==0)
+        return rtl::OUString::createFromAscii(sFormtext);
+    else
+        return name;
+}
+
+
 void XMLTextMarkImportContext::StartElement(
     const Reference<XAttributeList> & xAttrList)
 {
@@ -194,7 +219,8 @@ void XMLTextMarkImportContext::EndElement()
                 case TypeFieldmark:
                 case TypeBookmark:
                     {
-                        bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && m_sFieldName.compareToAscii("msoffice.field.FORMCHECKBOX")==0); // for now only import FORMCHECKBOX boxes
+                        const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName);
+                        bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && formFieldmarkName!=NULL); //@TODO handle abbreviation cases..
                         // export point bookmark
                         const Reference<XInterface> xContent(
                             CreateAndInsertMark(GetImport(),
@@ -213,10 +239,8 @@ void XMLTextMarkImportContext::EndElement()
                             if (xContent.is() && bImportAsField) {
                                 // setup fieldmark...
                                 Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY);
-                                xFormField->setType(1); // Checkbox...
+                                xFormField->setFieldType(rtl::OUString::createFromAscii(formFieldmarkName));
                                 if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) {
-//									xFormField->setDescription(::rtl::OUString::createFromAscii("HELLO CHECKBOX"));
-//									xFormField->setRes(1); 
                                     m_rHelper.setCurrentFieldParamsTo(xFormField);
                                 }
                             }
@@ -263,11 +287,6 @@ void XMLTextMarkImportContext::EndElement()
                                 xInsertionCursor, UNO_QUERY);
 
                             bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd && m_rHelper.hasCurrentFieldCtx());
-                            if (bImportAsField) {
-                                ::rtl::OUString currentFieldType =
-                                    m_rHelper.getCurrentFieldType();
-                                bImportAsField=currentFieldType.compareToAscii("msoffice.field.FORMTEXT")==0; // for now only import FORMTEXT boxes
-                            }
 
                             // insert reference
                             const Reference<XInterface> xContent(
@@ -288,10 +307,12 @@ void XMLTextMarkImportContext::EndElement()
                                 if (xContent.is() && bImportAsField) {
                                     // setup fieldmark...
                                     Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY);
-                                    xFormField->setType(0); // Text
                                     if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) {
+                                        rtl::OUString givenTypeName=m_rHelper.getCurrentFieldType();
+                                        rtl::OUString fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
+
+                                        xFormField->setFieldType(fieldmarkTypeName);
                                         m_rHelper.setCurrentFieldParamsTo(xFormField);
-//									xFormField->setDescription(::rtl::OUString::createFromAscii("HELLO"));
                                     }
                                 }
                                 m_rHelper.popFieldCtx();
diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx
index 41ef7dcee0..bd03d72edb 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.hxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMarkImportContext.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/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index 214b2e3fde..17fb787576 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMasterPageContext.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/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 7271afc935..8b2a9572b3 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMasterPageExport.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index 8d64c280d4..1a10563a91 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextMasterStylesContext.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/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 30895a5edc..84347206ab 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextNumRuleInfo.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 962f74c6c8..448ef39efd 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextNumRuleInfo.hxx,v $
- * $Revision: 1.10.64.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index de4f034b3f..056037ac89 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextPropertySetContext.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx
index dd2fa24ad8..e6f3d743df 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextPropertySetContext.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/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index 0c587ed23e..b281914b2d 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextShapeImportHelper.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/xmloff/source/text/XMLTextShapeImportHelper.hxx b/xmloff/source/text/XMLTextShapeImportHelper.hxx
index 35d474b6ed..569a084bfc 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.hxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextShapeImportHelper.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/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index d04fc57e52..ad7d358a4d 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextShapeStyleContext.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/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx
index 2ca3b19d6a..e7a551e28d 100644
--- a/xmloff/source/text/XMLTextTableContext.cxx
+++ b/xmloff/source/text/XMLTextTableContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTextTableContext.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/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index 2ca1cfbb21..8a3bbad5c3 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTrackedChangesImportContext.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/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index 8dde08850c..323b747c7d 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLTrackedChangesImportContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
index 5851eeb090..658de22044 100644
--- a/xmloff/source/text/makefile.mk
+++ b/xmloff/source/text/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,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/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index 3a6cfa71f9..27b0a72e6d 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtdrope.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/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index 980aec2623..682dd3969c 100644
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtdrope.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index f3b73ec30c..b647aa0283 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtdropi.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/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx
index 4e4c489bb5..4584cd1a7e 100644
--- a/xmloff/source/text/txtdropi.hxx
+++ b/xmloff/source/text/txtdropi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtdropi.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 8b267bba18..17f3ccf233 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtexppr.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index dc47a82de6..ae4c96e687 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtexppr.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/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 08aeb7828d..51ced52edf 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtflde.cxx,v $
- * $Revision: 1.84.102.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index d47e813c34..5b8032662c 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtfldi.cxx,v $
- * $Revision: 1.71.66.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index c8b2b0158c..bb114b95bc 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtftne.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/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 51af4f954f..153d51e71c 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtimp.cxx,v $
- * $Revision: 1.143.2.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -92,6 +89,8 @@
 // --> OD 2008-04-25 #refactorlists#
 #include <txtlists.hxx>
 // <--
+#include <xmloff/odffields.hxx>
+#include <comphelper/stlunosequence.hxx>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -113,6 +112,8 @@ using namespace ::com::sun::star::ucb;
 
 using ::comphelper::UStringLess;
 
+
+
 static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] =
 {
     { XML_NAMESPACE_TEXT, XML_P, 				XML_TOK_TEXT_P				},
@@ -447,6 +448,70 @@ static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
 #define MAX_COMBINED_CHARACTERS 6
 
 
+namespace
+{
+    class FieldParamImporter
+    {
+        public:
+            typedef pair<OUString,OUString> field_param_t;
+            typedef vector<field_param_t> field_params_t;
+            FieldParamImporter(const field_params_t* const pInParams, Reference<XNameContainer> xOutParams)
+                : m_pInParams(pInParams)
+                , m_xOutParams(xOutParams)
+            { };
+            void Import();
+
+        private:
+            const field_params_t* const m_pInParams;
+            Reference<XNameContainer> m_xOutParams;
+    };
+
+    void FieldParamImporter::Import()
+    {
+        ::std::vector<OUString> vListEntries;
+        ::std::map<OUString, Any> vOutParams;
+        for(field_params_t::const_iterator pCurrent = m_pInParams->begin();
+            pCurrent != m_pInParams->end();
+            ++pCurrent)
+        {
+            if(pCurrent->first.equalsAscii(ODF_FORMDROPDOWN_RESULT))
+            {
+                // sal_Int32
+                vOutParams[pCurrent->first] = makeAny(pCurrent->second.toInt32());
+            }
+            else if(pCurrent->first.equalsAscii(ODF_FORMCHECKBOX_RESULT))
+            {
+                // bool
+                vOutParams[pCurrent->first] = makeAny(pCurrent->second.toBoolean());
+            }
+            else if(pCurrent->first.equalsAscii(ODF_FORMDROPDOWN_LISTENTRY))
+            {
+                // sequence
+                vListEntries.push_back(pCurrent->second);
+            }
+            else
+                vOutParams[pCurrent->first] = makeAny(pCurrent->second);
+        }
+        if(!vListEntries.empty())
+        {
+            Sequence<OUString> vListEntriesSeq(vListEntries.size());
+            copy(vListEntries.begin(), vListEntries.end(), ::comphelper::stl_begin(vListEntriesSeq));
+            vOutParams[OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq);
+        }
+        for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin();
+            pCurrent != vOutParams.end();
+            ++pCurrent)
+        {
+            try
+            {
+                m_xOutParams->insertByName(pCurrent->first, pCurrent->second);
+            }
+            catch(ElementExistException)
+            { }
+        }
+    }
+}
+
 XMLTextImportHelper::XMLTextImportHelper(
         const Reference < XModel >& rModel,
         SvXMLImport& rImport,
@@ -2280,18 +2345,9 @@ bool XMLTextImportHelper::hasCurrentFieldCtx()
 void XMLTextImportHelper::setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField)
 {
     DBG_ASSERT(!aFieldStack.empty(), "stack is empty: not good! Do a pushFieldCtx before...");
-    if (!aFieldStack.empty() && xFormField.is()) {
-        field_params_t &params=aFieldStack.top().second;
-        for (field_params_t::iterator i=params.begin();i!=params.end();i++) {
-            rtl::OUString name=i->first;
-            rtl::OUString value=i->second;
-            if (name.compareToAscii("Description")==0){
-                xFormField->setDescription(value);
-            } else if (name.compareToAscii("Result")==0){
-                xFormField->setRes((sal_Int16)value.toInt32());
-            }
-
-        }
+    if (!aFieldStack.empty() && xFormField.is())
+    {
+        FieldParamImporter(&aFieldStack.top().second, xFormField->getParameters()).Import();
     }
 }
 
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 218f2fa793..b6045f575b 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtimppr.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/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 47345fddef..b4b83e5ec7 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtlists.cxx,v $
- * $Revision: 1.2.24.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index c204881859..cdfbf4ca86 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtparae.cxx,v $
- * $Revision: 1.153 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -119,6 +116,7 @@
 #include "MultiPropertySetHelper.hxx"
 #include <xmloff/formlayerexport.hxx>
 #include "XMLTextCharStyleNamesElementExport.hxx"
+#include <comphelper/stlunosequence.hxx>
 
 // --> OD 2008-04-25 #refactorlists#
 #include <txtlists.hxx>
@@ -234,6 +232,21 @@ namespace
     const OUString BoundFrames::our_sAnchorType = OUString::createFromAscii("AnchorType");
     const OUString BoundFrames::our_sAnchorFrame = OUString::createFromAscii("AnchorFrame");
 
+    class FieldParamExporter
+    {
+        public:
+            FieldParamExporter(SvXMLExport* const pExport, Reference<XNameContainer> xFieldParams)
+                : m_pExport(pExport)
+                , m_xFieldParams(xFieldParams)
+                { };
+            void Export();
+
+        private:
+            SvXMLExport* const m_pExport;
+            const Reference<XNameContainer> m_xFieldParams;
+
+            void ExportParameter(const OUString& sKey, const OUString& sValue);
+    };
 }
 
 namespace xmloff
@@ -389,6 +402,55 @@ BoundFrameSets::BoundFrameSets(const Reference<XInterface> xModel)
             &lcl_ShapeFilter));
 };
 
+void FieldParamExporter::Export()
+{
+    static const Type aStringType = ::getCppuType((OUString*)0);
+    static const Type aBoolType = ::getCppuType((sal_Bool*)0);
+    static const Type aSeqType = ::getCppuType((Sequence<OUString>*)0);
+    static const Type aIntType = ::getCppuType((sal_Int32*)0);
+    Sequence<OUString> vParameters(m_xFieldParams->getElementNames());
+    for(const OUString* pCurrent=::comphelper::stl_begin(vParameters); pCurrent!=::comphelper::stl_end(vParameters); ++pCurrent)
+    {
+        const Any aValue = m_xFieldParams->getByName(*pCurrent);
+        const Type aValueType = aValue.getValueType();
+        if(aValueType == aStringType)
+        {
+            OUString sValue;
+            aValue >>= sValue;
+            ExportParameter(*pCurrent,sValue);
+        }
+        else if(aValueType == aBoolType)
+        {
+            sal_Bool bValue = false;
+            aValue >>= bValue;
+            ExportParameter(*pCurrent,OUString::createFromAscii(bValue ? "true" : "false"));
+        }
+        else if(aValueType == aSeqType)
+        {
+            Sequence<OUString> vValue;
+            aValue >>= vValue;
+            for(OUString* pSeqCurrent = ::comphelper::stl_begin(vValue); pSeqCurrent != ::comphelper::stl_end(vValue); ++pSeqCurrent)
+            {
+                ExportParameter(*pCurrent, *pSeqCurrent);
+            }
+        }
+        else if(aValueType == aIntType)
+        {
+            sal_Int32 nValue = 0;
+            aValue >>= nValue;
+            ExportParameter(*pCurrent, OUStringBuffer().append(nValue).makeStringAndClear());
+        }
+    }
+}
+
+void FieldParamExporter::ExportParameter(const OUString& sKey, const OUString& sValue)
+{
+    m_pExport->AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, sKey);
+    m_pExport->AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, sValue);
+    m_pExport->StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+    m_pExport->EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+}
+
 void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
                                   const Reference < XPropertySet > & rPropSet,
                                   const XMLPropertyState** ppAddStates, bool bDontSeek )
@@ -2240,19 +2302,19 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             else if (sType.equals(sTextFieldStart))
             {
                 Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-                if (xBookmark.is()) {
+                if (xBookmark.is())
+                {
                     GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xBookmark->getName());
                 }
                 Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-                if (xFormField.is()) {
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, ::rtl::OUString::createFromAscii("msoffice.field.FORMTEXT"));
+                if (xFormField.is())
+                {
+                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
                 }
                 GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
-                if (xFormField.is()) {
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Description"));
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getDescription());
-                    GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
-                    GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+                if (xFormField.is())
+                {
+                    FieldParamExporter(&GetExport(), xFormField->getParameters()).Export();
                 }
                 GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
             }
@@ -2264,32 +2326,19 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
             else if (sType.equals(sTextFieldStartEnd))
             {
                 Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-                if (xBookmark.is()) {
+                if (xBookmark.is())
+                {
                     GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xBookmark->getName());
                 }
                 Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-                if (xFormField.is()) {
-                    sal_Int16 fftype=xFormField->getType();
-                    switch (fftype) {
-                        case 1:
-                            GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, ::rtl::OUString::createFromAscii("msoffice.field.FORMCHECKBOX"));
-                        break;
-                        default:
-                            DBG_ASSERT(false, "hey ---- add your export stuff here!!");
-                        break;
-                    }
+                if (xFormField.is())
+                {
+                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
                 }
                 GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
-                if (xFormField.is()) {
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Description"));
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, xFormField->getDescription());
-                    GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
-                    GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
-
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, ::rtl::OUString::createFromAscii("Result"));
-                    GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, ::rtl::OUString::valueOf((sal_Int32 )xFormField->getRes()));
-                    GetExport().StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
-                    GetExport().EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+                if (xFormField.is())
+                {
+                    FieldParamExporter(&GetExport(), xFormField->getParameters()).Export();
                 }
                 GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
             }
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index ceeb676e8b..7fd7702aa5 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtparai.cxx,v $
- * $Revision: 1.68.2.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 274c212d7f..1b2ba58cf3 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtparai.hxx,v $
- * $Revision: 1.14.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 4a4a1228a0..1c9ddc5cbc 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtparaimphint.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/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index a9c4a0dfd3..3def1262f6 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtprhdl.cxx,v $
- * $Revision: 1.41 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx
index 12de2756ac..f1f1a78820 100644
--- a/xmloff/source/text/txtprhdl.hxx
+++ b/xmloff/source/text/txtprhdl.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtprhdl.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/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index e68469f561..87e8bf118e 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtprmap.cxx,v $
- * $Revision: 1.106.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index bd05aa4ba2..afdea2f46a 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -1,14 +1,11 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtsecte.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index d9e061be84..454ec85b51 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtstyle.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/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 9b82d3ce3b..24f9da5539 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtstyli.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/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index c419ee0383..00aa5cc994 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: txtvfldi.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/xmloff/source/transform/ActionMapTypesOASIS.hxx b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index 32f659bbd0..3c7bd7935c 100644
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ActionMapTypesOASIS.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/xmloff/source/transform/ActionMapTypesOOo.hxx b/xmloff/source/transform/ActionMapTypesOOo.hxx
index 08b4857f56..b36bc3447b 100644
--- a/xmloff/source/transform/ActionMapTypesOOo.hxx
+++ b/xmloff/source/transform/ActionMapTypesOOo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ActionMapTypesOOo.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/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx
index e1971dd9a6..a7a3f6adc3 100644
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: AttrTransformerAction.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/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index 2937f77400..be2a1189b6 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartOASISTContext.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/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx
index 07d97c90ff..ac8a0415dd 100644
--- a/xmloff/source/transform/ChartOASISTContext.hxx
+++ b/xmloff/source/transform/ChartOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartOASISTContext.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/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx
index dea76f27b2..911caf3fde 100644
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartOOoTContext.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/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx
index c626861158..b24519dc71 100644
--- a/xmloff/source/transform/ChartOOoTContext.hxx
+++ b/xmloff/source/transform/ChartOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartOOoTContext.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/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index 796adf506d..52d463cf9c 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartPlotAreaOASISTContext.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/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
index ed62116f2c..4a351be8bc 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartPlotAreaOASISTContext.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/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
index 03fd9429c9..c678910f90 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartPlotAreaOOoTContext.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/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
index 4466c599ae..f2644021d0 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ChartPlotAreaOOoTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx
index bcb5bb8729..0ae1123c6d 100644
--- a/xmloff/source/transform/ControlOASISTContext.cxx
+++ b/xmloff/source/transform/ControlOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ControlOASISTContext.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/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx
index ac0359acc1..ec6a295a39 100644
--- a/xmloff/source/transform/ControlOASISTContext.hxx
+++ b/xmloff/source/transform/ControlOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ControlOASISTContext.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/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx
index 783b312565..1a265cf3a4 100644
--- a/xmloff/source/transform/ControlOOoTContext.cxx
+++ b/xmloff/source/transform/ControlOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ControlOOoTContext.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/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx
index 5a4c68914a..9c07a71fd3 100644
--- a/xmloff/source/transform/ControlOOoTContext.hxx
+++ b/xmloff/source/transform/ControlOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ControlOOoTContext.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/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx
index cc667798eb..3e4649a3de 100644
--- a/xmloff/source/transform/CreateElemTContext.cxx
+++ b/xmloff/source/transform/CreateElemTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CreateElemTContext.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/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx
index c6b08dc5d9..701cf8d5da 100644
--- a/xmloff/source/transform/CreateElemTContext.hxx
+++ b/xmloff/source/transform/CreateElemTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: CreateElemTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx
index 21c8af98bf..373ed405d6 100644
--- a/xmloff/source/transform/DeepTContext.cxx
+++ b/xmloff/source/transform/DeepTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DeepTContext.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/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx
index 316ecf0a4a..888f5f1293 100644
--- a/xmloff/source/transform/DeepTContext.hxx
+++ b/xmloff/source/transform/DeepTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DeepTContext.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/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx
index 6a4816e0b3..d13e6494ac 100644
--- a/xmloff/source/transform/DlgOASISTContext.cxx
+++ b/xmloff/source/transform/DlgOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DlgOASISTContext.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/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx
index e4a4457e73..7d44ff6c42 100644
--- a/xmloff/source/transform/DlgOASISTContext.hxx
+++ b/xmloff/source/transform/DlgOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DlgOASISTContext.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/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx
index 89675428cc..d7d4325570 100644
--- a/xmloff/source/transform/DocumentTContext.cxx
+++ b/xmloff/source/transform/DocumentTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentTContext.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/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx
index 3cefc77505..630f9108c0 100644
--- a/xmloff/source/transform/DocumentTContext.hxx
+++ b/xmloff/source/transform/DocumentTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: DocumentTContext.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/xmloff/source/transform/ElemTransformerAction.hxx b/xmloff/source/transform/ElemTransformerAction.hxx
index 70115c5796..a6c344a500 100644
--- a/xmloff/source/transform/ElemTransformerAction.hxx
+++ b/xmloff/source/transform/ElemTransformerAction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ElemTransformerAction.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/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index d65c6cc0df..05da2136f5 100644
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EventMap.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/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index b47795d106..e682c70659 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EventMap.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/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 96acba4e50..1161326b6f 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EventOASISTContext.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/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx
index 620b8a403c..335031784c 100644
--- a/xmloff/source/transform/EventOASISTContext.hxx
+++ b/xmloff/source/transform/EventOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EventOASISTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index cc5e796f06..cc19545e4f 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EventOOoTContext.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/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx
index d2c1cefcdf..09052181aa 100644
--- a/xmloff/source/transform/EventOOoTContext.hxx
+++ b/xmloff/source/transform/EventOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: EventOOoTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/FamilyType.hxx b/xmloff/source/transform/FamilyType.hxx
index 729f48aea5..e09ce97a42 100644
--- a/xmloff/source/transform/FamilyType.hxx
+++ b/xmloff/source/transform/FamilyType.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FamilyType.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/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx
index ad80390eff..5ffc93d1a8 100644
--- a/xmloff/source/transform/FlatTContext.cxx
+++ b/xmloff/source/transform/FlatTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FlatTContext.cxx,v $
- * $Revision: 1.6.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx
index 9c8afa39c8..49fd4f28ca 100644
--- a/xmloff/source/transform/FlatTContext.hxx
+++ b/xmloff/source/transform/FlatTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FlatTContext.hxx,v $
- * $Revision: 1.4.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx
index 3646f5f2e8..f45ff119bd 100644
--- a/xmloff/source/transform/FormPropOASISTContext.cxx
+++ b/xmloff/source/transform/FormPropOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FormPropOASISTContext.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/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx
index 806c5ec7e3..5afbc62adc 100644
--- a/xmloff/source/transform/FormPropOASISTContext.hxx
+++ b/xmloff/source/transform/FormPropOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FormPropOASISTContext.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/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index af214f874a..c31458a366 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FormPropOOoTContext.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/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx
index 168f5d0882..19008f7e8a 100644
--- a/xmloff/source/transform/FormPropOOoTContext.hxx
+++ b/xmloff/source/transform/FormPropOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FormPropOOoTContext.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/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx
index f1ed44dd05..463c003284 100644
--- a/xmloff/source/transform/FrameOASISTContext.cxx
+++ b/xmloff/source/transform/FrameOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FrameOASISTContext.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/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx
index 01651cf7f3..fd6046d3c3 100644
--- a/xmloff/source/transform/FrameOASISTContext.hxx
+++ b/xmloff/source/transform/FrameOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FrameOASISTContext.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/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx
index 6c5a2b0b21..f2e728fef4 100644
--- a/xmloff/source/transform/FrameOOoTContext.cxx
+++ b/xmloff/source/transform/FrameOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FrameOOoTContext.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/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx
index 1d0479a4e9..d4639958c7 100644
--- a/xmloff/source/transform/FrameOOoTContext.hxx
+++ b/xmloff/source/transform/FrameOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FrameOOoTContext.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/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx
index 9a1aa6f17f..36e6758af5 100644
--- a/xmloff/source/transform/IgnoreTContext.cxx
+++ b/xmloff/source/transform/IgnoreTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IgnoreTContext.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/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx
index 0f002d6e39..c253e70995 100644
--- a/xmloff/source/transform/IgnoreTContext.hxx
+++ b/xmloff/source/transform/IgnoreTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: IgnoreTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index e6fc9e9cfd..451916a2ad 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MergeElemTContext.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/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx
index ab88e51236..73c13d9005 100644
--- a/xmloff/source/transform/MergeElemTContext.hxx
+++ b/xmloff/source/transform/MergeElemTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MergeElemTContext.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/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index 20f591a192..0e909c6c39 100644
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MetaTContext.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/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index 52d0797691..553d49188b 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MetaTContext.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/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index bdf0de6318..94542bc706 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MutableAttrList.cxx,v $
- * $Revision: 1.10.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index 9d9ce00bdb..c5fa0659fd 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: MutableAttrList.hxx,v $
- * $Revision: 1.4.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 3106703967..2e5c8461f0 100644
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NotesTContext.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/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx
index f9daeeb8f6..3480c40d98 100644
--- a/xmloff/source/transform/NotesTContext.hxx
+++ b/xmloff/source/transform/NotesTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: NotesTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 8d4cf844a1..b4c28f93ea 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OOo2Oasis.cxx,v $
- * $Revision: 1.23.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 1cdca007ef..3d49e63f47 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: OOo2Oasis.hxx,v $
- * $Revision: 1.6.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 22fcdc2719..109de49e00 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Oasis2OOo.cxx,v $
- * $Revision: 1.24.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 8c05a8aa88..5d0093f851 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Oasis2OOo.hxx,v $
- * $Revision: 1.5.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx
index ce2ac133c2..9917cefa58 100644
--- a/xmloff/source/transform/PersAttrListTContext.cxx
+++ b/xmloff/source/transform/PersAttrListTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PersAttrListTContext.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/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx
index c7c15e30c3..9a1a794195 100644
--- a/xmloff/source/transform/PersAttrListTContext.hxx
+++ b/xmloff/source/transform/PersAttrListTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PersAttrListTContext.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx
index c7d0daa56c..85c7026c21 100644
--- a/xmloff/source/transform/PersMixedContentTContext.cxx
+++ b/xmloff/source/transform/PersMixedContentTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PersMixedContentTContext.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/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx
index 7155fce525..46014c5f3b 100644
--- a/xmloff/source/transform/PersMixedContentTContext.hxx
+++ b/xmloff/source/transform/PersMixedContentTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PersMixedContentTContext.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/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx
index 8fc0695ae0..b5c15d951d 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProcAddAttrTContext.cxx,v $
- * $Revision: 1.7.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx
index a28f78c626..f19a970bbe 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProcAddAttrTContext.hxx,v $
- * $Revision: 1.4.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx
index b863321563..2d8d57e1c5 100644
--- a/xmloff/source/transform/ProcAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAttrTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProcAttrTContext.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/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx
index 089935ce79..26491b526c 100644
--- a/xmloff/source/transform/ProcAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAttrTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ProcAttrTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/PropType.hxx b/xmloff/source/transform/PropType.hxx
index 7da1c56e19..9c38569f12 100644
--- a/xmloff/source/transform/PropType.hxx
+++ b/xmloff/source/transform/PropType.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropType.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/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index 1a054e86ff..95319522fc 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyActionsOASIS.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 1eacb7f193..9d0a8734df 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyActionsOASIS.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/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index 50f75af995..34dec33034 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyActionsOOo.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index f60daf4a4b..809e1ee878 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: PropertyActionsOOo.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/xmloff/source/transform/RenameElemTContext.cxx b/xmloff/source/transform/RenameElemTContext.cxx
index 7f28fd1cd0..a405aca646 100644
--- a/xmloff/source/transform/RenameElemTContext.cxx
+++ b/xmloff/source/transform/RenameElemTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RenameElemTContext.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/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx
index a519685e45..3a5c71df1d 100644
--- a/xmloff/source/transform/RenameElemTContext.hxx
+++ b/xmloff/source/transform/RenameElemTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: RenameElemTContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 2dd8552b98..d0f7fefeab 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StyleOASISTContext.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/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx
index 11b04d3b35..9ccf59feba 100644
--- a/xmloff/source/transform/StyleOASISTContext.hxx
+++ b/xmloff/source/transform/StyleOASISTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StyleOASISTContext.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/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 243b94f338..8f0fba154b 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StyleOOoTContext.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/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx
index 3267be5362..122756a324 100644
--- a/xmloff/source/transform/StyleOOoTContext.hxx
+++ b/xmloff/source/transform/StyleOOoTContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: StyleOOoTContext.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/xmloff/source/transform/TContextVector.hxx b/xmloff/source/transform/TContextVector.hxx
index 12eb32a562..231dfce819 100644
--- a/xmloff/source/transform/TContextVector.hxx
+++ b/xmloff/source/transform/TContextVector.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TContextVector.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/xmloff/source/transform/Transformer.hxx b/xmloff/source/transform/Transformer.hxx
index d346c95483..672f30a7ab 100644
--- a/xmloff/source/transform/Transformer.hxx
+++ b/xmloff/source/transform/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.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/TransformerAction.hxx b/xmloff/source/transform/TransformerAction.hxx
index 34d1c6f156..91014008c9 100644
--- a/xmloff/source/transform/TransformerAction.hxx
+++ b/xmloff/source/transform/TransformerAction.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerAction.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/xmloff/source/transform/TransformerActionInit.hxx b/xmloff/source/transform/TransformerActionInit.hxx
index 65eaec180e..34ec787100 100644
--- a/xmloff/source/transform/TransformerActionInit.hxx
+++ b/xmloff/source/transform/TransformerActionInit.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerActionInit.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx
index a9cf23a5e6..0a1f9bc662 100644
--- a/xmloff/source/transform/TransformerActions.cxx
+++ b/xmloff/source/transform/TransformerActions.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerActions.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/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index 07f2ec96e1..1dba2c6f8a 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerActions.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 95df970b58..b2464ed89e 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerBase.cxx,v $
- * $Revision: 1.23.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index b3fb3f629a..ff6f615df4 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerBase.hxx,v $
- * $Revision: 1.9.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx
index f4571bab5c..3435b10e87 100644
--- a/xmloff/source/transform/TransformerContext.cxx
+++ b/xmloff/source/transform/TransformerContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerContext.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/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx
index 63c35af147..a8a8fb2b1d 100644
--- a/xmloff/source/transform/TransformerContext.hxx
+++ b/xmloff/source/transform/TransformerContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerContext.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/xmloff/source/transform/TransformerTokenMap.cxx b/xmloff/source/transform/TransformerTokenMap.cxx
index bd402cfeac..ba4289a85d 100644
--- a/xmloff/source/transform/TransformerTokenMap.cxx
+++ b/xmloff/source/transform/TransformerTokenMap.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerTokenMap.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/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index 0536bd9139..616b0504cc 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TransformerTokenMap.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 912b19afd0..80098d18e9 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XMLFilterRegistration.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/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk
index acd80bb1f3..473cec5562 100644
--- a/xmloff/source/transform/makefile.mk
+++ b/xmloff/source/transform/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index f037a1b021..fd550d48cd 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchemaContext.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/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index b862872d0e..5edc20de13 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchemaContext.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/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index f48101288f..26405ebc6f 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchemaRestrictionContext.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/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index 19277c442f..d7ef1793d3 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchemaRestrictionContext.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/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index f64853886c..847aaf6603 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchemaSimpleTypeContext.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/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index decb80f8d4..1781894186 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: SchemaSimpleTypeContext.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/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx
index 8fd91b12d5..24db0a5aeb 100644
--- a/xmloff/source/xforms/TokenContext.cxx
+++ b/xmloff/source/xforms/TokenContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TokenContext.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/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 413a4ea7d8..e50e132bbb 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TokenContext.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index 0f8b6a61f3..ee7fceb5f4 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsBindContext.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/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index d7997487d2..cc14aa9ce3 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsBindContext.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/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index e40e540b2f..a7d8596c21 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsInstanceContext.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/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index f75925abe0..1ffa8d38e2 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsInstanceContext.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/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 91941bdb69..dfc561ecd7 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsModelContext.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/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index 0df183a038..107e7165ab 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsModelContext.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/xmloff/source/xforms/XFormsModelExport.hxx b/xmloff/source/xforms/XFormsModelExport.hxx
index fd21ad3198..a9de5028c4 100644
--- a/xmloff/source/xforms/XFormsModelExport.hxx
+++ b/xmloff/source/xforms/XFormsModelExport.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsModelExport.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/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 1c4be38f8c..2b28a06254 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsSubmissionContext.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/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 834def1db6..bdb70b79c1 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XFormsSubmissionContext.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/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk
index dc4286678f..f1238a6036 100644
--- a/xmloff/source/xforms/makefile.mk
+++ b/xmloff/source/xforms/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index b7df909679..45238ba65f 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsapi.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/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 078b802f29..d7ce776f0a 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsapi.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index d89906ffd8..1473c4b69c 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsexport.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/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index dbe575e1d3..f43ec10ca2 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xformsimport.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/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index bc93c1d429..a7060d7950 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/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.32 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmloff/util/makefile.pmk b/xmloff/util/makefile.pmk
index 8a3e723b32..faf070e2d5 100644
--- a/xmloff/util/makefile.pmk
+++ b/xmloff/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/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd
index 5ee7834f08..020ceedd5a 100644
--- a/xmlscript/dtd/dialog.dtd
+++ b/xmlscript/dtd/dialog.dtd
@@ -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: dialog.dtd,v $
- 
-  $Revision: 1.28 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean "(true|false)">
diff --git a/xmlscript/dtd/libraries.dtd b/xmlscript/dtd/libraries.dtd
index 92dd5c726c..383f37e213 100644
--- a/xmlscript/dtd/libraries.dtd
+++ b/xmlscript/dtd/libraries.dtd
@@ -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: libraries.dtd,v $
- 
-  $Revision: 1.5 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean "(true|false)">
diff --git a/xmlscript/dtd/library.dtd b/xmlscript/dtd/library.dtd
index 86ddeb01cc..80f687b9bf 100644
--- a/xmlscript/dtd/library.dtd
+++ b/xmlscript/dtd/library.dtd
@@ -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: library.dtd,v $
- 
-  $Revision: 1.4 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ENTITY % boolean "(true|false)">
diff --git a/xmlscript/dtd/module.dtd b/xmlscript/dtd/module.dtd
index 7607b65558..e0e7c843d4 100644
--- a/xmlscript/dtd/module.dtd
+++ b/xmlscript/dtd/module.dtd
@@ -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: module.dtd,v $
- 
-  $Revision: 1.3 $
- 
   This file is part of OpenOffice.org.
  
   OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +23,7 @@
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
   for a copy of the LGPLv3 License.
- 
+
 -->
 
 <!ELEMENT script:module (#PCDATA)>
diff --git a/xmlscript/inc/makefile.mk b/xmlscript/inc/makefile.mk
index 7a97646e7c..4141e88a28 100644
--- a/xmlscript/inc/makefile.mk
+++ b/xmlscript/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/xmlscript/inc/pch/precompiled_xmlscript.cxx b/xmlscript/inc/pch/precompiled_xmlscript.cxx
index 8bd253a6ad..df4d160df1 100644
--- a/xmlscript/inc/pch/precompiled_xmlscript.cxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_xmlscript.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/xmlscript/inc/pch/precompiled_xmlscript.hxx b/xmlscript/inc/pch/precompiled_xmlscript.hxx
index 080583a073..98a93aff92 100644
--- a/xmlscript/inc/pch/precompiled_xmlscript.hxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_xmlscript.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/xmlscript/inc/xmlscript/xml_helper.hxx
index d492d126e2..2a4e48bede 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/xmlscript/inc/xmlscript/xml_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: xml_helper.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/xmlscript/inc/xmlscript/xml_import.hxx b/xmlscript/inc/xmlscript/xml_import.hxx
index edd49d6508..59107cc001 100644
--- a/xmlscript/inc/xmlscript/xml_import.hxx
+++ b/xmlscript/inc/xmlscript/xml_import.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xml_import.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/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 9e5d443d3d..2fe6f352dc 100644
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldlg_imexp.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/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
index e890049abe..463e986296 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmllib_imexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmllib_imexp.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/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
index 7052bee52f..33f091cd41 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlmod_imexp.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/xmlscript/inc/xmlscript/xmlns.h b/xmlscript/inc/xmlscript/xmlns.h
index 0917b12cd7..629abac85d 100644
--- a/xmlscript/inc/xmlscript/xmlns.h
+++ b/xmlscript/inc/xmlscript/xmlns.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlns.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/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index e5c8ce0e5b..11146d9353 100644
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: misc.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/xmlscript/source/misc/makefile.mk b/xmlscript/source/misc/makefile.mk
index fbd7b0b098..dfac81bfa6 100644
--- a/xmlscript/source/misc/makefile.mk
+++ b/xmlscript/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/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 891fe518a0..6209df3751 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoservices.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/xmlscript/source/xml_helper/makefile.mk b/xmlscript/source/xml_helper/makefile.mk
index e5e96ff686..7b48695bae 100644
--- a/xmlscript/source/xml_helper/makefile.mk
+++ b/xmlscript/source/xml_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.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index b2aa0d0217..144394fac0 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_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: xml_byteseq.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/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 26fd9c30d3..7989f2be1b 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xml_element.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/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index afab81e404..b381852c62 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xml_impctx.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/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx
index 4cf3b2ff5d..5a41608c2a 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/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: common.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/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index 9d5ab99635..eceedfb6d2 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: exp_share.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/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 8c5645335b..ce9e43fd05 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imp_share.hxx,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/xmlscript/source/xmldlg_imexp/makefile.mk b/xmlscript/source/xmldlg_imexp/makefile.mk
index 86b57a27f6..e0583aa78d 100644
--- a/xmlscript/source/xmldlg_imexp/makefile.mk
+++ b/xmlscript/source/xmldlg_imexp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index af119ec99c..0a5d74ae9a 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldlg_addfunc.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/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index ef8f8526f7..bf49fb1445 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldlg_expmodels.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/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index f5c660c53e..588e30a657 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_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: xmldlg_export.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/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 47a79a5453..5f73dc93a4 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldlg_impmodels.cxx,v $
- * $Revision: 1.44 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 99a8361141..f3c0e551f1 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmldlg_import.cxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlscript/source/xmlflat_imexp/makefile.mk b/xmlscript/source/xmlflat_imexp/makefile.mk
index 8d6f9fbfa9..ed4d434afb 100644
--- a/xmlscript/source/xmlflat_imexp/makefile.mk
+++ b/xmlscript/source/xmlflat_imexp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 7a8b980d4c..2034e8b302 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_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: xmlbas_export.cxx,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/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index 7821452886..86cdc8c198 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_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: xmlbas_export.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/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index c1feece98d..58ac14ee2f 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbas_import.cxx,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/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 543b4f1a1e..cc46525d4e 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlbas_import.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/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx
index d602103fa7..a29ab1508a 100644
--- a/xmlscript/source/xmllib_imexp/imp_share.hxx
+++ b/xmlscript/source/xmllib_imexp/imp_share.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imp_share.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/xmlscript/source/xmllib_imexp/makefile.mk b/xmlscript/source/xmllib_imexp/makefile.mk
index 2d29c3d2d4..c6ef65a433 100644
--- a/xmlscript/source/xmllib_imexp/makefile.mk
+++ b/xmlscript/source/xmllib_imexp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmlscript/source/xmllib_imexp/xmllib_export.cxx b/xmlscript/source/xmllib_imexp/xmllib_export.cxx
index e7d40405bf..919f0742d5 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_export.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_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: xmllib_export.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/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index b533d37c53..3c18da1aa5 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmllib_import.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/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index f7f4e248ad..2b75021d3e 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imp_share.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/xmlscript/source/xmlmod_imexp/makefile.mk b/xmlscript/source/xmlmod_imexp/makefile.mk
index 96d74a41dd..174bf94c75 100644
--- a/xmlscript/source/xmlmod_imexp/makefile.mk
+++ b/xmlscript/source/xmlmod_imexp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun 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/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
index a14f62e8f9..fd6a3d2b2d 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_export.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_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: xmlmod_export.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/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index 61b636b382..e17da69ce0 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: xmlmod_import.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/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index ae4853b118..1b0ccb31ae 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: imexp.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/xmlscript/test/makefile.mk b/xmlscript/test/makefile.mk
index e831544e39..2bf8f21161 100644
--- a/xmlscript/test/makefile.mk
+++ b/xmlscript/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
index ae1479cd5b..3ccf63dc3b 100644
--- a/xmlscript/util/makefile.mk
+++ b/xmlscript/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.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xmlscript/util/target.pmk b/xmlscript/util/target.pmk
index 900943dba1..907ec41dd9 100644
--- a/xmlscript/util/target.pmk
+++ b/xmlscript/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify